diff --git a/.gitattributes b/.gitattributes
deleted file mode 100755
index 6f75f5e..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-.git/ export-ignore
-package/ export-ignore
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 814174e..d8e3a1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ pub/img
 views/home/about.php
 views/home/contact.php
 
+.data/*
\ No newline at end of file
diff --git a/.idea/Romano.iml b/.idea/Romano.iml
index c956989..2373288 100644
--- a/.idea/Romano.iml
+++ b/.idea/Romano.iml
@@ -1,7 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="Romano\" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/instantiator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/myclabs/deep-copy" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/version" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-common" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/type-resolver" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpspec/php-diff" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpspec/phpspec" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpspec/prophecy" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-code-coverage" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-file-iterator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-text-template" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-timer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-token-stream" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/diff" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/environment" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/exporter" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/global-state" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/object-enumerator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/object-reflector" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/recursion-context" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/resource-operations" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/version" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/console" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/contracts" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/event-dispatcher" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/finder" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-ctype" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/process" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/yaml" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/theseer/tokenizer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/twig/twig" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 5946e9c..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="c679963c-6003-4a99-ad5e-aab145c1b79e" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/DB.php" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/Validate.php" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/template/default/base.php" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/template/default/theme.php" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/config.php" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/dev.php" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/core.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/dev.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/libs/PHPMailerAutoload.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/libs/class.phpmailer.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/libs/class.pop3.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/libs/class.resize.img.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/libs/class.smtp.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/models/crud.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/models/database.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/models/photo.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/models/post.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/models/user.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config.example.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/controllers/admin.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/controllers/api.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/controllers/blog.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/controllers/gallery.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/controllers/home.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/controllers/users.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/css/default.css" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/css/gallery_default.css" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/css/login.css" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/css/pygments-manni.css" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/favicon.ico" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/img/blank.gif" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/img/body.png" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/img/facebook.png" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/img/glyphicons-halflings-white.png" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/img/glyphicons-halflings.png" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/img/google.png" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/img/thijsdp.jpg" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/img/twitter.png" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/js/html5shiv.js" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/js/respond.min.js" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/pub/robot.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/romano.sql" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/admin/add.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/api/default.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/blog/article.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/blog/index.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/gallery/album.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/gallery/create.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/gallery/edit.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/gallery/index.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/gallery/manage.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/gallery/picture.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/gallery/select.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/home/index.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/home/login.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/page.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/users/activate.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/users/login.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/users/lost.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/users/register.php" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/views/users/reset.php" afterPath="" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/views/home/example.txt" afterPath="$PROJECT_DIR$/app/views/home/example.txt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pub/index.php" afterPath="$PROJECT_DIR$/pub/index.php" />
-    </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="540">
-              <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="864">
-                <caret line="48" column="29" lean-forward="false" selection-start-line="48" selection-start-column="29" selection-end-line="48" selection-end-column="29" />
-                <folding />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/.gitignore" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
-  <component name="ProjectFrameBounds" extendedState="4">
-    <option name="width" value="1744" />
-    <option name="height" value="1392" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="Romano" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Romano" type="2a2b976b:PhpTreeStructureProvider$1" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-      <pane id="Scratches" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="c679963c-6003-4a99-ad5e-aab145c1b79e" name="Default" comment="" />
-      <created>1510402923501</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1510402923501</updated>
-      <workItem from="1510402926289" duration="138000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="223000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1744" height="1392" extended-state="4" />
-    <editor active="true" />
-    <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16399083" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager />
-    <watches-manager />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="540">
-          <caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="1065">
-            <caret line="67" column="0" lean-forward="true" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="864">
-            <caret line="48" column="29" lean-forward="false" selection-start-line="48" selection-start-column="29" selection-end-line="48" selection-end-column="29" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="540">
-          <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
new file mode 100644
index 0000000..30ce453
--- /dev/null
+++ b/.phpunit.result.cache
@@ -0,0 +1 @@
+C:30:"PHPUnit\Runner\TestResultCache":1866:{a:2:{s:7:"defects";a:8:{s:76:"Tests\Romano\Framework\Utils\MatroskaTest::test_it_should_unflatten_an_array";i:3;s:74:"Tests\Romano\Framework\Utils\MatroskaTest::it_should_get_the_correct_value";i:3;s:67:"Tests\Romano\Framework\Utils\MatroskaTest::it_should_remove_a_value";i:3;s:71:"Tests\Romano\Framework\Utils\MatroskaTest::it_should_unflatten_an_array";i:3;s:88:"Tests\Romano\Framework\Utils\MatroskaTest::it_should_start_from_a_multidimensional_array";i:3;s:65:"Tests\Romano\Framework\Utils\MatroskaTest::it_should_check_values";i:3;s:74:"Tests\Romano\Framework\Utils\ApplicationTest::it_should_unflatten_an_array";i:5;s:76:"Tests\Romano\Framework\Utils\ApplicationTest::it_should_build_the_path_array";i:3;}s:5:"times";a:13:{s:76:"Tests\Romano\Framework\Utils\MatroskaTest::test_it_should_unflatten_an_array";d:0.002;s:71:"Tests\Romano\Framework\Utils\MatroskaTest::it_should_unflatten_an_array";d:0;s:74:"Tests\Romano\Framework\Utils\MatroskaTest::it_should_get_the_correct_value";d:0;s:67:"Tests\Romano\Framework\Utils\MatroskaTest::it_should_remove_a_value";d:0;s:65:"Tests\Romano\Framework\Utils\MatroskaTest::it_should_have_a_value";d:0;s:65:"Tests\Romano\Framework\Utils\MatroskaTest::it_should_check_values";d:0;s:88:"Tests\Romano\Framework\Utils\MatroskaTest::it_should_start_from_a_multidimensional_array";d:0;s:74:"Tests\Romano\Framework\Utils\ApplicationTest::it_should_unflatten_an_array";d:0.002;s:77:"Tests\Romano\Framework\Utils\ApplicationTest::it_should_get_the_correct_value";d:0.001;s:70:"Tests\Romano\Framework\Utils\ApplicationTest::it_should_remove_a_value";d:0;s:68:"Tests\Romano\Framework\Utils\ApplicationTest::it_should_check_values";d:0;s:91:"Tests\Romano\Framework\Utils\ApplicationTest::it_should_start_from_a_multidimensional_array";d:0;s:76:"Tests\Romano\Framework\Utils\ApplicationTest::it_should_build_the_path_array";d:0.003;}}}
\ No newline at end of file
diff --git a/README.md b/README.md
index 0bc2c32..75c6524 100755
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ it still needs a lot more global functionality before it would serve any useful
 
 Experimental version
 --------------------
-The framework is not ment to be ready for public use as of today,
+The framework is not meant to be ready for public use as of today,
 but serves more as a minor display of the Romano framework, a proof of concept.
 The site blog example
 
diff --git a/pub/.htaccess b/_old/.htaccess
similarity index 100%
rename from pub/.htaccess
rename to _old/.htaccess
diff --git a/src/Romano/ClassFunctions.php b/_old/ClassFunctions.php
similarity index 100%
rename from src/Romano/ClassFunctions.php
rename to _old/ClassFunctions.php
diff --git a/src/Romano/Container.php b/_old/ContaineroLD.php
similarity index 82%
rename from src/Romano/Container.php
rename to _old/ContaineroLD.php
index f7f87cc..4f02f1c 100644
--- a/src/Romano/Container.php
+++ b/_old/ContaineroLD.php
@@ -1,16 +1,21 @@
 <?php
 
+namespace Framework;
 
-
-class Container
+class Container implements ContainerInterface
 {
-    private static $container = array();
+    private static $container = [];
 
     public static function getAll($name)
     {
         return self::$container[$name];
     }
 
+    public static function create(array $values): self
+    {
+        return new self($values);
+    }
+
     public static function get(array $name)
     {
         return (isset(self::$container[$name[0]][$name[1]])) ? self::$container[$name[0]][$name[1]] : '';
@@ -25,6 +30,7 @@ public static function set($key, array $values)
     {
         if (!isset(self::$container[$key])) {
             self::$container[$key] = $values;
+
             return;
         }
         self::$container[$key] = array_merge(self::$container[$key], $values);
diff --git a/app/template/default/base.php b/_old/default/base.php
similarity index 100%
rename from app/template/default/base.php
rename to _old/default/base.php
diff --git a/app/template/default/theme.php b/_old/default/theme.php
similarity index 100%
rename from app/template/default/theme.php
rename to _old/default/theme.php
diff --git a/pub/index.php b/_old/index.php
similarity index 93%
rename from pub/index.php
rename to _old/index.php
index bf49731..710bd80 100755
--- a/pub/index.php
+++ b/_old/index.php
@@ -1,7 +1,10 @@
 <?php
+
+use Romano\Infrastructure\DB;
+
 define('TIME', microtime(true));
 session_start();
-require ('../config.php');
+require('../config.php');
 /*
 * My basic global functions
 */
diff --git a/src/Romano/Auth.php b/_old/src/_todo/Auth.php
similarity index 98%
rename from src/Romano/Auth.php
rename to _old/src/_todo/Auth.php
index d222a4b..a7d61de 100755
--- a/src/Romano/Auth.php
+++ b/_old/src/_todo/Auth.php
@@ -15,6 +15,8 @@
 */
 
 
+use Framework\Infrastructure\Query;
+use Romano\Infrastructure\DB;
 
 class Auth
 {
diff --git a/src/Romano/Cache.php b/_old/src/_todo/Cache.php
similarity index 100%
rename from src/Romano/Cache.php
rename to _old/src/_todo/Cache.php
diff --git a/src/Romano/Crypt.php b/_old/src/_todo/Crypt.php
similarity index 84%
rename from src/Romano/Crypt.php
rename to _old/src/_todo/Crypt.php
index 991e7fd..c684242 100755
--- a/src/Romano/Crypt.php
+++ b/_old/src/_todo/Crypt.php
@@ -20,12 +20,12 @@ static function dynSalt($string = null, $salt = null)
 
     static function token()
     {
-        return Session::put(App::getInstance()->get('config', array('session', 'token'), self::unique()));
+        return Session::put(App::getInstance()->get('ConfigurationManager', array('session', 'token'), self::unique()));
     }
 
     static function check($token)
     {
-        $token_name = App::getInstance()->get('config', array('session', 'token'));
+        $token_name = App::getInstance()->get('ConfigurationManager', array('session', 'token'));
 
         if (Session::get($token_name) && $token === Session::get($token_name)) {
             Session::delete($token_name);
diff --git a/src/Romano/Elastic.php b/_old/src/_todo/Elastic.php
similarity index 100%
rename from src/Romano/Elastic.php
rename to _old/src/_todo/Elastic.php
diff --git a/src/Romano/Filter.php b/_old/src/_todo/Filter.php
similarity index 91%
rename from src/Romano/Filter.php
rename to _old/src/_todo/Filter.php
index 3e7fbeb..35e1a21 100755
--- a/src/Romano/Filter.php
+++ b/_old/src/_todo/Filter.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
-* Filter library
-* -------------
-* creator/source : Thijs De Paepe
-*/
-
-
-
 Class Filter
 {
 
diff --git a/src/Romano/Output.php b/_old/src/_todo/Output.php
similarity index 100%
rename from src/Romano/Output.php
rename to _old/src/_todo/Output.php
diff --git a/src/Romano/Parse.php b/_old/src/_todo/Parse.php
similarity index 100%
rename from src/Romano/Parse.php
rename to _old/src/_todo/Parse.php
diff --git a/src/Romano/Send.php b/_old/src/_todo/Send.php
similarity index 62%
rename from src/Romano/Send.php
rename to _old/src/_todo/Send.php
index fe823c5..25038c7 100755
--- a/src/Romano/Send.php
+++ b/_old/src/_todo/Send.php
@@ -17,19 +17,19 @@ static function mail($email, $subject, $body)
         $mail->do_debug = 0; // disable error msg
         $mail->SMTPDebug = 0;
 
-        $mail->Host = Config::$array['EMAIL']['HOST'];
+        $mail->Host = ConfigurationManager::$array['EMAIL']['HOST'];
         $mail->SMTPAuth = true;
         $mail->SMTPSecure = "ssl";
-        $mail->Username = Config::$array['EMAIL']['USER'];
-        $mail->Password = Config::$array['EMAIL']['PASS'];
+        $mail->Username = ConfigurationManager::$array['EMAIL']['USER'];
+        $mail->Password = ConfigurationManager::$array['EMAIL']['PASS'];
         $mail->Port = 465;
         $mail->AddAddress($email);
         $mail->Subject = $subject;
         $mail->Body = $body;
-        $mail->From = Config::$array['EMAIL']['FWRD'];
-        $mail->FromName=Config::$array['EMAIL']['FWRD'];
-        $mail->AddReplyTo(Config::$array['EMAIL']['FWRD'], title);
-        $mail->SetFrom(Config::$array['EMAIL']['FWRD'], title);
+        $mail->From = ConfigurationManager::$array['EMAIL']['FWRD'];
+        $mail->FromName=ConfigurationManager::$array['EMAIL']['FWRD'];
+        $mail->AddReplyTo(ConfigurationManager::$array['EMAIL']['FWRD'], title);
+        $mail->SetFrom(ConfigurationManager::$array['EMAIL']['FWRD'], title);
         //$mail->IsHTML(true);
         if($attachment) {
             $mail->AddAttachment($attachment);
diff --git a/src/Romano/SimpleDB.php b/_old/src/_todo/SimpleDB.php
similarity index 99%
rename from src/Romano/SimpleDB.php
rename to _old/src/_todo/SimpleDB.php
index 0b2007a..50cdb4e 100755
--- a/src/Romano/SimpleDB.php
+++ b/_old/src/_todo/SimpleDB.php
@@ -21,7 +21,7 @@ class SSDBException extends Exception
 class SimpleDB extends SSDB
 {
     function __construct($DB = null, $timeout_ms=2000){
-        if ($DB === null) $DB = App::getInstance()->get(array('config', 'SSDB'));
+        if ($DB === null) $DB = App::getInstance()->get(array('ConfigurationManager', 'SSDB'));
         parent::__construct($DB['HOST'], $DB['PORT'], $timeout_ms);
         $this->easy();
     }
diff --git a/_old/src/_todo/Singleton.php b/_old/src/_todo/Singleton.php
new file mode 100644
index 0000000..123eeb8
--- /dev/null
+++ b/_old/src/_todo/Singleton.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Romano\Framework;
+
+class Singleton
+{
+    private static $uniqueInstance = [];
+
+    /**
+     * @param object $object
+     * @param string|null $reference
+     */
+    public static function setInstance(object $object, string $reference = null): void
+    {
+        $objectName = $reference ?: \get_class($object);
+        static::$uniqueInstance[$objectName] = $object;
+    }
+
+    /**
+     * @param string $objectName
+     *
+     * @return object $object
+     *
+     * @throws Exception\UnknownObjectException
+     */
+    public static function getInstance(string $objectName)
+    {
+        if (!isset(static::$uniqueInstance[$objectName])) {
+            throw new Exception\UnknownObjectException($objectName);
+        }
+
+        return static::$uniqueInstance[$objectName];
+    }
+
+    public static function clearInstance(string $objectName): void
+    {
+        unset(static::$uniqueInstance[$objectName]);
+    }
+
+    private function  __construct(){}
+    private function __clone(){}
+}
diff --git a/src/Romano/Track.php b/_old/src/_todo/Track.php
similarity index 100%
rename from src/Romano/Track.php
rename to _old/src/_todo/Track.php
diff --git a/src/Romano/TwitterBS.php b/_old/src/_todo/TwitterBS.php
similarity index 100%
rename from src/Romano/TwitterBS.php
rename to _old/src/_todo/TwitterBS.php
diff --git a/_old/src/_todo/libs/DB.php b/_old/src/_todo/libs/DB.php
new file mode 100644
index 0000000..b538351
--- /dev/null
+++ b/_old/src/_todo/libs/DB.php
@@ -0,0 +1,135 @@
+<?php
+
+class DB //extends PDO
+{
+    private static $_instance = null;
+    private $_pdo;
+    private $_stmt;
+    private $_error;
+
+    public function __construct($dsn = null, $username = null, $password = null, $options = [])
+    {
+        try {
+            $options = $options + [
+                PDO::ATTR_EMULATE_PREPARES, false,
+                PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+            ];
+            //$this->_pdo = new PDO($dsn,$username,$password,$options);
+            //parent::__construct($dsn,$username,$password,$options);
+        } catch (PDOException $e) {
+            throw $e;
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
+
+    public static function getInstance()
+    {
+        if (!isset(\Romano\Infrastructure\self::$_instance)) {
+            \Romano\Infrastructure\self::$_instance = new PDO(
+              $dsn = ConfigurationManager::$array['DB']['DSN'],
+              $username = ConfigurationManager::$array['DB']['USER'],
+              $password = ConfigurationManager::$array['DB']['PASS']
+            );
+
+            return \Romano\Infrastructure\self::$_instance;
+        }
+    }
+
+    public function exec($sql, $params)
+    {
+        $this->stmt = null;
+        if ($this->_stmt = $this->prepare($sql)) {
+            if ($params) {
+                foreach ($params as $key => $param) {
+                    $this->_stmt->bindvalue(':'.$key, $param);
+                }
+            }
+            $this->_stmt->execute();
+        }
+    }
+
+    public function get($table, $where, $arg = [])
+    {
+        $action = $this->action($table, $where, $arg = $this->arguments($arg + ['split' => ' AND ']));
+        $sql = "SELECT {$arg['field']} FROM {$table} WHERE {$action['Framework\Infrastructure\Query']}";
+        if (!$this->exec($sql, $action['values'])) {
+            return $this;
+        }
+    }
+
+    public function delete($table, $where, $arg = [])
+    {
+        $action = $this->action($table, $where, $arg = $this->arguments($arg + ['split' => ' AND ']));
+        $sql = "DELETE {$arg['field']} FROM {$table} WHERE {$action['Framework\Infrastructure\Query']}";
+        if (!$this->exec($sql, $action['values'])) {
+            return $this;
+        }
+    }
+
+    public function insert($table, $fields, $arg = [])
+    {
+        $action = $this->action($table, $fields, $arg = $this->arguments($arg));
+        $sql = "INSERT INTO {$table} (`".implode('`, `', array_keys($action['values'])).'`) VALUES (:'.implode('`, `:', array_keys($action['values'])).')';
+        if ($this->exec($sql, $action['values'])) {
+            return true;
+        }
+    }
+
+    public function update($table, $fields, $id, $arg = [])
+    {
+        $action = $this->action($table, $fields, $arg = $this->arguments($arg + ['split' => '`, `']));
+        $sql = "UPDATE {$table} SET {$action['Framework\Infrastructure\Query']} WHERE `uid` = {$id}";
+        if ($this->exec($sql, $action['values'])) {
+            return true;
+        }
+    }
+
+    public function save($table, $fields, $id, $arg = [])
+    {
+        if (!$this->update($table, $fields, $id, $arg)) {
+            $this->insert($table, $fields, $arg);
+        }
+    }
+
+    public function fetch()
+    {
+        return $this->_stmt->fetch(PDO::FETCH_ASSOC);
+    }
+
+    public function fetchAll()
+    {
+        return $this->_stmt->fetchAll(PDO::FETCH_ASSOC);
+    }
+
+    private function arguments($arg)
+    {
+        return array_merge([
+            'field' => '*',
+            'operator' => '=',
+            'order' => '1',
+            'limit' => 50,
+        ], $arg);
+    }
+
+    private function action($table, $array, $arg)
+    {
+        if ($i = count($array)) {
+            $query = null;
+            $values = [];
+            $x = 1;
+            foreach ($array as $key => $value) {
+                $query .= "`{$key}` {$arg['operator']} :{$key}";
+                if ($x < $i) {
+                    $query .= $arg['split'];
+                    ++$x;
+                }
+                $values[$key] = $value;
+            }
+
+            return ['Framework\Infrastructure\Query' => $query, 'values' => $values];
+        }
+
+        return false;
+    }
+}
diff --git a/app/libs/Validate.php b/_old/src/_todo/libs/Validate.php
similarity index 98%
rename from app/libs/Validate.php
rename to _old/src/_todo/libs/Validate.php
index b371b0d..4bfaa0a 100644
--- a/app/libs/Validate.php
+++ b/_old/src/_todo/libs/Validate.php
@@ -1,5 +1,6 @@
 <?php
-/*
+
+/**
 * Validation library 11/2013
 * --------------------------
 * creator/source : Alex Garrett
@@ -9,7 +10,8 @@
 * dependencies : needs DB layer/wrapper for "unique check"
 */
 
-class Validate {
+class Validate 
+{
 	private $_passed = false,
 			$_errors = array(),
 			$_db = null;
diff --git a/app/views/home/example.txt b/_old/views/home/example.txt
similarity index 100%
rename from app/views/home/example.txt
rename to _old/views/home/example.txt
diff --git a/app/controllers/.DS_Store b/app/controllers/.DS_Store
deleted file mode 100755
index 5008ddf..0000000
Binary files a/app/controllers/.DS_Store and /dev/null differ
diff --git a/app/libs/.DS_Store b/app/libs/.DS_Store
deleted file mode 100755
index 5008ddf..0000000
Binary files a/app/libs/.DS_Store and /dev/null differ
diff --git a/app/libs/DB.php b/app/libs/DB.php
deleted file mode 100644
index efad80f..0000000
--- a/app/libs/DB.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
-* DB wrapper Tacito
-* 
-*/
-class DB //extends PDO
-{
-  private static $_instance = null;
-  private $_pdo, $_stmt, $_error;
-
-  function __construct($dsn = null, $username = null, $password = null, $options = array() )
-  {
-    try {
-      $options = $options + array(
-        PDO::ATTR_EMULATE_PREPARES, false,
-        PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
-      );
-      //$this->_pdo = new PDO($dsn,$username,$password,$options);
-      //parent::__construct($dsn,$username,$password,$options); 
-    } catch (PDOException $e) {
-        throw $e;
-    } catch(Exception $e) {
-        throw $e;
-    }
-  }
-  static function getInstance()
-  {
-    if (!isset(self::$_instance) ) {
-      self::$_instance = new PDO(
-        $dsn      = Config::$array['DB']['DSN'],
-        $username = Config::$array['DB']['USER'],
-        $password = Config::$array['DB']['PASS']
-      );
-      return self::$_instance;
-    } 
-  }
-  private function arguments($arg)
-  {
-    return array_merge(array(
-      'field' => '*',
-      'operator' => '=',
-      'order' => '1',
-      'limit' => 50
-      ), $arg);
-  }
-  private function action($table, $array, $arg)
-  {
-    if ($i = count($array)) {
-      $query = null;
-      $values = array();
-      $x = 1;
-      foreach ($array as $key => $value) {
-        $query .= "`{$key}` {$arg['operator']} :{$key}";
-        if ($x < $i) {
-          $query .= $arg['split'];
-          $x++;
-        }
-        $values[$key] = $value;
-      }
-      return array('query' => $query, 'values' => $values); 
-    }
-    return false;
-  }
-  function exec($sql, $params)
-  {
-    $this->stmt = null;
-    if ($this->_stmt = $this->prepare($sql)) {
-      if ($params) {
-        foreach ($params as $key => $param) {
-          $this->_stmt->bindvalue(':'.$key, $param);
-        }
-      }
-      $this->_stmt->execute();
-    }
-  }
-  function get($table, $where, $arg = array() )
-  {
-    $action = $this->action($table, $where, $arg = $this->arguments($arg + array('split' => ' AND ' )) );
-    $sql = "SELECT {$arg['field']} FROM {$table} WHERE {$action['query']}";
-    if (!$this->exec($sql, $action['values']) ) {
-      return $this;
-    }
-  }
-  function delete($table, $where, $arg = array() )
-  {
-    $action = $this->action($table, $where, $arg = $this->arguments($arg + array('split' => ' AND ' )) );
-    $sql = "DELETE {$arg['field']} FROM {$table} WHERE {$action['query']}";
-    if (!$this->exec($sql, $action['values']) ) {
-      return $this;
-    }
-  }
-  function insert($table, $fields, $arg = array() )
-  {
-    $action = $this->action($table, $fields, $arg = $this->arguments($arg) );
-    $sql = "INSERT INTO {$table} (`" . implode('`, `', array_keys($action['values'])) . "`) VALUES (:". implode('`, `:', array_keys($action['values'])) .")";
-    if ($this->exec($sql, $action['values']) ) {
-      return true;
-    }
-  }
-  function update($table, $fields, $id, $arg = array() )
-  {
-    $action = $this->action($table, $fields, $arg = $this->arguments($arg + array('split' => '`, `')) );
-    $sql = "UPDATE {$table} SET {$action['query']} WHERE `uid` = {$id}";
-    if ($this->exec($sql, $action['values']) ) {
-      return true;
-    } 
-  }
-  function save($table, $fields, $id, $arg = array() )
-  {
-    if (!$this->update($table, $fields, $id, $arg)) {
-      $this->insert($table, $fields, $arg);
-    }
-  }
-  function fetch()
-  {
-    return $this->_stmt->fetch(PDO::FETCH_ASSOC);
-  }
-  function fetchAll()
-  {
-    return $this->_stmt->fetchAll(PDO::FETCH_ASSOC);
-  }
-}
\ No newline at end of file
diff --git a/app/models/.DS_Store b/app/models/.DS_Store
deleted file mode 100755
index 5008ddf..0000000
Binary files a/app/models/.DS_Store and /dev/null differ
diff --git a/app/template/default/.DS_Store b/app/template/default/.DS_Store
deleted file mode 100755
index 5008ddf..0000000
Binary files a/app/template/default/.DS_Store and /dev/null differ
diff --git a/app/views/.DS_Store b/app/views/.DS_Store
deleted file mode 100755
index fa389b5..0000000
Binary files a/app/views/.DS_Store and /dev/null differ
diff --git a/app/views/home/.DS_Store b/app/views/home/.DS_Store
deleted file mode 100644
index 29315cb..0000000
Binary files a/app/views/home/.DS_Store and /dev/null differ
diff --git a/bin/phpspec b/bin/phpspec
new file mode 120000
index 0000000..22e0618
--- /dev/null
+++ b/bin/phpspec
@@ -0,0 +1 @@
+../vendor/phpspec/phpspec/bin/phpspec
\ No newline at end of file
diff --git a/bin/phpunit b/bin/phpunit
new file mode 120000
index 0000000..4ba3256
--- /dev/null
+++ b/bin/phpunit
@@ -0,0 +1 @@
+../vendor/phpunit/phpunit/phpunit
\ No newline at end of file
diff --git a/bootstrap.php b/bootstrap.php
deleted file mode 100755
index 2010e84..0000000
--- a/bootstrap.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-
-// set the root directory
-chdir(dirname(__FILE__));
-
-/**
- * Include Core Classes
- */
-
- // in order for the application to work we need to bootstrap a couple of
- // none of it's functionality can work without it.
- // classes :: container,
-
-require 'src/Romano/Container.php';
-require 'src/Romano/Request.php';
-require 'src/Romano/Config.php';
-require 'src/Romano/Application.php';
-
-// require 'src/Romano/App.php';
-require 'vendor/autoload.php';
-
-/**
- * Set of Global functions
- * Mostly incapsulating static methods
- */
-
-function timestamp()
-{
-    return (float) round((round(microtime(true), 4) - $_SERVER['REQUEST_TIME_FLOAT']) * 1000, 1);
-}
-
-function stamp($from)
-{
-    Container::setParam(array('stamp', $from, timestamp()));
-}
-
-// we need to move this to autoload
-spl_autoload_register(function ($class) {
-    foreach (path('autoload') as $path) {
-        if (file_exists($found = $path.$class.'.php')) {
-            stamp($class);
-            return require $found;
-        }
-    }
-});
-
-function path($path)
-{
-    return Container::get(array('path', $path));
-}
-
-function config($config, $name = null)
-{
-    return (!empty($name))
-        ? Container::getParam(array('config', $config, $name))
-        : Container::get(array('config', $config));
-}
-
-function url($url = null, array $params = array())
-{
-    if (strpos($url, '@') !== false) {
-        if ($nurl = Container::get(array('url', $url))) {
-            if ($params) {
-                $glu = implode('_', array_keys($params));
-                $route = $nurl['dynamic'][$glu];
-                foreach ($params as $key => $value) {
-                    $route = str_replace('{'.$key.'}', $value, $route);
-                }
-                return $route;
-            }
-            if (!isset($nurl['static'])) {
-                return $url.' route doesn\'t exist as static';
-            }
-            // only return the first static route
-            return array_values($nurl['static'])[0];
-        }
-        // dead end
-        return 'no route found for '.$url;
-    }
-
-    // asset connection
-    $nurl = Container::get(array('url', 'home@index'));
-    return array_values($nurl['static'])[0].$url; // asset_folder index
-}
-
-function view($result, $debug = true)
-{
-    $debugMode = (config('kernel_debug') === $debug);
-    $loader = new \Twig_Loader_Filesystem(array(path('view_cache'), path('view'), path('view').'/base') );
-    $twig = new \Twig_Environment(
-        $loader,
-        array(
-        'cache' => path('cache') . ($debugMode ? 'twig_dev/' : 'twig_prod/' ),
-        'debug' => $debugMode,
-        )
-    );
-    $twig->addFilter(new \Twig_SimpleFilter('lng', array('Lang', 'get')));
-    $twig->addFunction(new \Twig_SimpleFunction('url', function ($string) {
-        return src/Romano/Container::get(array('url', $string));
-    }));
-    Container::delete('config');
-    Container::delete('path');
-    echo $twig->render($result['path'], $result['data']);
-}
-
-function leave($msg)
-{
-    $trace = debug_backtrace();
-    dump($msg);
-    dump("Called by {$trace[1]['class']} @ {$trace[1]['function']}");
-    massdump("");
-}
-
-function crc32b($str)
-{
-    return hash('crc32b', $str);
-}
-
-function stringToId($string, $replacers = array('-','_','.','/','%2520',' '))
-{
-    $nums = '';
-    $string = str_replace($replacers, '', strtolower(trim($string)));
-    $string = (strlen($string) > 10) ? crc32b($string) : $string;
-    $az = array_flip(str_split('etaoinsrhldcumfpgwybvkxjqz'));
-    foreach (str_split($string) as $split) {
-        $nums .= (is_numeric($split)) ?  $split : $az[$split];
-    }
-    return $nums;
-}
-
-
-if (isset($_SERVER['APP_ENV']) && $_SERVER['APP_ENV'] === 'dev') {
-    require 'settings/dev.php';
-    stamp('Application');
-}
diff --git a/composer.json b/composer.json
index 7c72a95..6e35509 100755
--- a/composer.json
+++ b/composer.json
@@ -12,15 +12,22 @@
         }
     ],
     "require": {
-        "twig/twig": "1.*",
-        "php": ">=5.3.3"
+        "php": ">=7.2.0",
+        "ext-json": "*",
+        "ext-fileinfo": "*",
+        "ext-gd": "*",
+        "twig/twig": "^2.6"
     },
     "autoload": {
         "psr-4": {
-            "Romano\\": "src/Romano/",
-            "App\\": "app/",
-            "modules\\": "modules/",
-            "scr\\": "scr/"
+            "Romano\\": "src/"
         }
+    },
+    "require-dev": {
+        "phpspec/phpspec": "^5.1",
+        "phpunit/phpunit": "^8.0"
+    },
+    "config": {
+      "bin-dir": "bin"
     }
 }
diff --git a/composer.lock b/composer.lock
index 059e44c..c617ee9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,42 +1,164 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "hash": "3779b7c7fb2b598e65252b388d04002d",
-    "content-hash": "8200fdc327c8f464c044ad2cec359f8d",
+    "content-hash": "31b09a2a1e07046a191f8f7d67d2a66f",
     "packages": [
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
+                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                },
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "time": "2018-08-06T14:22:27+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
+                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2018-09-21T13:07:52+00:00"
+        },
         {
             "name": "twig/twig",
-            "version": "v1.22.1",
+            "version": "v2.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "b7fc2469fa009897871fb95b68237286fc54a5ad"
+                "reference": "7d7342c8a4059fefb9b8d07db0cc14007021f9b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/b7fc2469fa009897871fb95b68237286fc54a5ad",
-                "reference": "b7fc2469fa009897871fb95b68237286fc54a5ad",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/7d7342c8a4059fefb9b8d07db0cc14007021f9b7",
+                "reference": "7d7342c8a4059fefb9b8d07db0cc14007021f9b7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.2.7"
+                "php": "^7.0",
+                "symfony/polyfill-ctype": "^1.8",
+                "symfony/polyfill-mbstring": "^1.3"
             },
             "require-dev": {
-                "symfony/debug": "~2.7",
-                "symfony/phpunit-bridge": "~2.7"
+                "psr/container": "^1.0",
+                "symfony/debug": "^2.7",
+                "symfony/phpunit-bridge": "^3.4.19|^4.1.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.22-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
                 "psr-0": {
                     "Twig_": "lib/"
+                },
+                "psr-4": {
+                    "Twig\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -57,24 +179,1920 @@
                 },
                 {
                     "name": "Twig Team",
-                    "homepage": "http://twig.sensiolabs.org/contributors",
+                    "homepage": "https://twig.symfony.com/contributors",
                     "role": "Contributors"
                 }
             ],
             "description": "Twig, the flexible, fast, and secure template language for PHP",
-            "homepage": "http://twig.sensiolabs.org",
+            "homepage": "https://twig.symfony.com",
             "keywords": [
                 "templating"
             ],
-            "time": "2015-09-15 06:50:16"
+            "time": "2019-01-14T15:00:48+00:00"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "^6.2.3",
+                "squizlabs/php_codesniffer": "^3.0.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2017-07-22T11:58:36+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "replace": {
+                "myclabs/deep-copy": "self.version"
+            },
+            "require-dev": {
+                "doctrine/collections": "^1.0",
+                "doctrine/common": "^2.6",
+                "phpunit/phpunit": "^7.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                },
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2018-06-11T23:09:50+00:00"
+        },
+        {
+            "name": "phar-io/manifest",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/manifest.git",
+                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-phar": "*",
+                "phar-io/version": "^2.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "time": "2018-07-08T19:23:20+00:00"
+        },
+        {
+            "name": "phar-io/version",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Library for handling version information and constraints",
+            "time": "2018-07-08T19:19:57+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2017-09-11T18:02:19+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "4.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "phpdocumentor/reflection-common": "^1.0.0",
+                "phpdocumentor/type-resolver": "^0.4.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "doctrine/instantiator": "~1.0.5",
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^6.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2017-11-30T07:14:17+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "time": "2017-07-14T14:27:02+00:00"
+        },
+        {
+            "name": "phpspec/php-diff",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/php-diff.git",
+                "reference": "0464787bfa7cd13576c5a1e318709768798bec6a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/php-diff/zipball/0464787bfa7cd13576c5a1e318709768798bec6a",
+                "reference": "0464787bfa7cd13576c5a1e318709768798bec6a",
+                "shasum": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Diff": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Boulton",
+                    "homepage": "http://github.com/chrisboulton"
+                }
+            ],
+            "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).",
+            "time": "2016-04-07T12:29:16+00:00"
+        },
+        {
+            "name": "phpspec/phpspec",
+            "version": "5.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/phpspec.git",
+                "reference": "4badea737c34a6c8e2921fca0f6a1cbe4f724f2f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/phpspec/zipball/4badea737c34a6c8e2921fca0f6a1cbe4f724f2f",
+                "reference": "4badea737c34a6c8e2921fca0f6a1cbe4f724f2f",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.5",
+                "ext-tokenizer": "*",
+                "php": "^7.1, <7.4",
+                "phpspec/php-diff": "^1.0.0",
+                "phpspec/prophecy": "^1.7",
+                "sebastian/exporter": "^1.0 || ^2.0 || ^3.0",
+                "symfony/console": "^3.4 || ^4.0",
+                "symfony/event-dispatcher": "^3.4 || ^4.0",
+                "symfony/finder": "^3.4 || ^4.0",
+                "symfony/process": "^3.4 || ^4.0",
+                "symfony/yaml": "^3.4 || ^4.0"
+            },
+            "require-dev": {
+                "behat/behat": "^3.3",
+                "phpunit/phpunit": "^5.7 || ^6.0",
+                "symfony/filesystem": "^3.4 || ^4.0"
+            },
+            "suggest": {
+                "phpspec/nyan-formatters": "Adds Nyan formatters"
+            },
+            "bin": [
+                "bin/phpspec"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "PhpSpec": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "homepage": "http://marcelloduarte.net/"
+                },
+                {
+                    "name": "Ciaran McNulty",
+                    "homepage": "https://ciaranmcnulty.com/"
+                }
+            ],
+            "description": "Specification-oriented BDD framework for PHP 5.6+",
+            "homepage": "http://phpspec.net/",
+            "keywords": [
+                "BDD",
+                "SpecBDD",
+                "TDD",
+                "spec",
+                "specification",
+                "testing",
+                "tests"
+            ],
+            "time": "2018-10-29T08:12:52+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
+                "sebastian/comparator": "^1.1|^2.0|^3.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5|^3.2",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2018-08-05T17:53:17+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "7.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "4832739a02c418397e404da6c3e4fe680b7a4de7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4832739a02c418397e404da6c3e4fe680b7a4de7",
+                "reference": "4832739a02c418397e404da6c3e4fe680b7a4de7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.2",
+                "phpunit/php-file-iterator": "^2.0.2",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-token-stream": "^3.0.1",
+                "sebastian/code-unit-reverse-lookup": "^1.0.1",
+                "sebastian/environment": "^4.1",
+                "sebastian/version": "^2.0.1",
+                "theseer/tokenizer": "^1.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.0"
+            },
+            "suggest": {
+                "ext-xdebug": "^2.6.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "7.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2019-02-01T07:29:14+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "050bedf145a257b1ff02746c31894800e5122946"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
+                "reference": "050bedf145a257b1ff02746c31894800e5122946",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2018-09-13T20:33:42+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21T13:50:34+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f",
+                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2018-02-01T13:07:23+00:00"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18",
+                "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2018-10-30T05:52:18+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "8.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "d64e502503bcfab5d46c0b74ffd41f4986831dc7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d64e502503bcfab5d46c0b74ffd41f4986831dc7",
+                "reference": "d64e502503bcfab5d46c0b74ffd41f4986831dc7",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.1",
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "ext-xmlwriter": "*",
+                "myclabs/deep-copy": "^1.7",
+                "phar-io/manifest": "^1.0.2",
+                "phar-io/version": "^2.0",
+                "php": "^7.2",
+                "phpspec/prophecy": "^1.7",
+                "phpunit/php-code-coverage": "^7.0",
+                "phpunit/php-file-iterator": "^2.0.1",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-timer": "^2.0",
+                "sebastian/comparator": "^3.0",
+                "sebastian/diff": "^3.0",
+                "sebastian/environment": "^4.1",
+                "sebastian/exporter": "^3.1",
+                "sebastian/global-state": "^3.0",
+                "sebastian/object-enumerator": "^3.0.3",
+                "sebastian/resource-operations": "^2.0",
+                "sebastian/version": "^2.0.1"
+            },
+            "require-dev": {
+                "ext-pdo": "*"
+            },
+            "suggest": {
+                "ext-soap": "*",
+                "ext-xdebug": "*",
+                "phpunit/php-invoker": "^2.0"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "8.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2019-02-07T14:17:09+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "time": "2017-03-04T06:30:41+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "3.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1",
+                "sebastian/diff": "^3.0",
+                "sebastian/exporter": "^3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2018-07-12T15:12:46+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "3.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
+                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.5 || ^8.0",
+                "symfony/process": "^2 || ^3.3 || ^4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff",
+                "udiff",
+                "unidiff",
+                "unified diff"
+            ],
+            "time": "2019-02-04T06:01:07+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "4.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6fda8ce1974b62b14935adc02a9ed38252eca656",
+                "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.5"
+            },
+            "suggest": {
+                "ext-posix": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2019-02-01T05:27:49+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
+                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "sebastian/recursion-context": "^3.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2017-04-03T13:19:02+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4",
+                "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2",
+                "sebastian/object-reflector": "^1.1.1",
+                "sebastian/recursion-context": "^3.0"
+            },
+            "require-dev": {
+                "ext-dom": "*",
+                "phpunit/phpunit": "^8.0"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2019-02-01T05:30:01+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
+                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "sebastian/object-reflector": "^1.1.1",
+                "sebastian/recursion-context": "^3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "time": "2017-08-03T12:35:26+00:00"
+        },
+        {
+            "name": "sebastian/object-reflector",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "773f97c67f28de00d397be301821b06708fca0be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
+                "reference": "773f97c67f28de00d397be301821b06708fca0be",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "time": "2017-03-29T09:07:27+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2017-03-03T06:23:57+00:00"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
+                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "time": "2018-10-04T04:07:39+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2016-10-03T07:35:21+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v4.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4",
+                "reference": "1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3",
+                "symfony/contracts": "^1.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<3.4",
+                "symfony/process": "<3.3"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~3.4|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/event-dispatcher": "~3.4|~4.0",
+                "symfony/lock": "~3.4|~4.0",
+                "symfony/process": "~3.4|~4.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/lock": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "https://symfony.com",
+            "time": "2019-01-25T14:35:16+00:00"
+        },
+        {
+            "name": "symfony/contracts",
+            "version": "v1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/contracts.git",
+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf",
+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "require-dev": {
+                "psr/cache": "^1.0",
+                "psr/container": "^1.0"
+            },
+            "suggest": {
+                "psr/cache": "When using the Cache contracts",
+                "psr/container": "When using the Service contracts",
+                "symfony/cache-contracts-implementation": "",
+                "symfony/service-contracts-implementation": "",
+                "symfony/translation-contracts-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\": ""
+                },
+                "exclude-from-classmap": [
+                    "**/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A set of abstractions extracted out of the Symfony components",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "time": "2018-12-05T08:06:11+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v4.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "bd09ad265cd50b2b9d09d65ce6aba2d29bc81fe1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/bd09ad265cd50b2b9d09d65ce6aba2d29bc81fe1",
+                "reference": "bd09ad265cd50b2b9d09d65ce6aba2d29bc81fe1",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3",
+                "symfony/contracts": "^1.0"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<3.4"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~3.4|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/expression-language": "~3.4|~4.0",
+                "symfony/stopwatch": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony EventDispatcher Component",
+            "homepage": "https://symfony.com",
+            "time": "2019-01-16T20:35:37+00:00"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v4.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "ef71816cbb264988bb57fe6a73f610888b9aa70c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/ef71816cbb264988bb57fe6a73f610888b9aa70c",
+                "reference": "ef71816cbb264988bb57fe6a73f610888b9aa70c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "https://symfony.com",
+            "time": "2019-01-16T20:35:37+00:00"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v4.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "6c05edb11fbeff9e2b324b4270ecb17911a8b7ad"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/6c05edb11fbeff9e2b324b4270ecb17911a8b7ad",
+                "reference": "6c05edb11fbeff9e2b324b4270ecb17911a8b7ad",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Process Component",
+            "homepage": "https://symfony.com",
+            "time": "2019-01-24T22:05:03+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v4.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "d461670ee145092b7e2a56c1da7118f19cadadb0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/d461670ee145092b7e2a56c1da7118f19cadadb0",
+                "reference": "d461670ee145092b7e2a56c1da7118f19cadadb0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "conflict": {
+                "symfony/console": "<3.4"
+            },
+            "require-dev": {
+                "symfony/console": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2019-01-16T20:35:37+00:00"
+        },
+        {
+            "name": "theseer/tokenizer",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
+                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "time": "2017-04-07T12:08:54+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0",
+                "symfony/polyfill-ctype": "^1.8"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2018-12-25T11:19:39+00:00"
         }
     ],
-    "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
+    "platform": {
+        "php": ">=7.3"
+    },
     "platform-dev": []
 }
diff --git a/config.php b/config.php
deleted file mode 100755
index 3b44d0d..0000000
--- a/config.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-chdir (__DIR__);
-
-/*
-*     this file only hosts the settings
-* ----------------- WARNING ------------------
-*      if you change these settings on
-* a running site the whole site will be broken
-*                SO BE WARNED
-*/
-
-class Config
-{
-  public static $array = array(
-    'DB' => array( 
-      'DSN' => 'mysql:host=localhost;dbname=thijzer',
-      'PASS' => 'mysql',
-      'USER' => 'root'
-  ));
-  //public static function get() {
-  //    return self::$_array;
-  //}
-}
-spl_autoload_register(function($class) {
-  require_once 'app/libs/'. $class . '.php';
-});
-
-// uncomment this dev.php to enable development mode
-require ('dev.php');
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 17f755e..b821024 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,6 @@ services:
       - ./CODE/:/app
  
   db:
-    image: mysql
+    image: mysql:5.7
     volumes:
       - ./.data/mysql:/var/lib/mysql
\ No newline at end of file
diff --git a/modules/thijzer/Blog/Controllers/Blog.php b/modules/thijzer/Blog/Controllers/Blog.php
deleted file mode 100755
index ee51087..0000000
--- a/modules/thijzer/Blog/Controllers/Blog.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-class Blog extends Ctrlr
-{
-    private $post;
-
-    public function __construct()
-    {
-        parent::__construct();
-        $this->post = new Post();
-    }
-
-    public function index()
-    {
-        $pages = $this->pagination($this->post->getRowCount(), 0, 4, 'page/');
-        $response['pages'] = $pages;
-        $response['post'] = $this->post->getPosts($pages['limit'], $pages['offset']);
-        return $response;
-    }
-
-    public function article()
-    {
-        $articleId = (int) $this->param('id');
-        $title = (string) $this->param('title');
-
-        if (!$this->post->exists($articleId)) {
-            Output::page(404, 'from article');
-        }
-
-        $post = $this->post->getPost($articleId);
-        if ($post['slug'] !== $title) {
-            Output::redirect($this->route['path'].'/'.$articleId.'/'.$post['slug']);
-        }
-        $response['post'] = $post;
-        return $response;
-    }
-
-    public function recentArticles()
-    {
-        $view['titles'] = $this->post->getTitles();
-        return $view;
-    }
-
-    public function getAllArticlesFromUser()
-    {
-        $user = (string) $this->params['user'];
-
-        if ($user) {
-            $response['post'] = $this->post->getArticlesFromUser($user);
-            return $response;
-        }
-        Output::page(404);
-    }
-
-    public function getArchivedArticles()
-    {
-        $response['archived'] = $this->post->getArchivedArticles();
-        return $response;
-    }
-}
-//$app->set('comments', $post->getComments($route['controller']));
-
-/*
-if (Input::get('body') AND isset(Input::get('user'))) {
-    $post->addComment($route['controller'], Input::get('user'), Input::get('body'));
-}
-*/
diff --git a/modules/thijzer/Blog/Models/Post.php b/modules/thijzer/Blog/Models/Post.php
deleted file mode 100755
index 3c27c1e..0000000
--- a/modules/thijzer/Blog/Models/Post.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-class Post
-{
-    private $posts;
-    private $type;
-
-    const TABLE = 'posts';
-    const CONTENT = 'posts_content';
-
-    function __construct($type = 'blog')
-    {
-        $this->type = $type;
-    }
-
-    function getPosts($limit = 4, $offset = 0)
-    {
-        $lim = (int) $limit;
-        $off = (int) $offset;
-
-        return DB::run(['query' =>
-            "SELECT p.id, pc.title, p.author, p.slug,
-            LEFT(pc.body, 300) AS preview,
-            DATE_FORMAT(p.published_on, '%d/%m/%Y') AS date,
-            DATE_FORMAT(p.published_on, '%H:%i:%s') AS time
-            FROM posts AS p
-            INNER JOIN posts_content AS pc ON pc.id = p.id
-            WHERE p.is_public = 1 AND p.is_public = 1 AND p.type = '{$this->type}'
-            ORDER BY p.published_on DESC LIMIT {$off} ,{$lim}"]
-        )->fetchAll();
-    }
-
-    function getRowCount()
-    {
-        return DB::run(
-          ['query' => "SELECT COUNT(*) AS count FROM ".self::TABLE." WHERE type = '{$this->type}'"]
-        )->get('count');
-    }
-
-    function getPost($postId)
-    {
-      if (!isset($this->posts[$postId])) {
-          $post = DB::run(
-              Query::table(self::TABLE, 'p')
-              ->join(self::CONTENT, 'pc', 'p.id = pc.id')
-              ->where(array('p.id' => (int) $postId, 'p.is_public' => '1', 'p.type' => $this->type))
-              ->build()
-          )->fetch();
-          $this->posts[$postId] = $post;
-      }
-      return $this->posts[$postId];
-    }
-
-    function exists($postId)
-    {
-        return ($this->getPost($postId));
-    }
-
-    function getArchivedArticles()
-    {
-        return DB::run(
-            Query::table(self::TABLE)
-            ->select(array('id', 'title', 'uri'))
-            ->where(array('is_public' => '1', 'type' => $this->type))
-            ->endQuery('Group by date')
-            ->build()
-        )->fetch();
-    }
-
-    function getArticlesFromUser($author)
-    {
-        return DB::run(
-            Query::table(self::TABLE)
-            ->where(array('author' => $author, 'is_public' => '1', 'type' => $this->type))
-            ->build()
-        )->fetchAll();
-    }
-
-    private function getIdFromSLug($slug, $author)
-    {
-        return DB::run(
-            Query::table(self::TABLE)
-                ->where(array('slug' => $slug, 'type' => $this->type))
-        )->getId();
-    }
-
-    // function editPost($tags)
-    // {
-    //     if (isset($_POST['public'])) $public = '1';
-    //     DB::connect(TABLE)->edit(array('title' => $_POST['title'], 'body' => $_POST['body'], 'tag' => $tags, 'public' => $public ));
-    // }
-    //
-    // // add a new blog entry
-    // function addPost($tags)
-    // {
-    //     if (isset($_POST['public'])) $public = '1';
-    //     DB::connect(TABLE)->add(array('title' => $_POST['title'], 'uid' => $_SESSION['uid'], 'author' => $_SESSION['username'], 'body' => $_POST['body'], 'tag' => $tags, 'public' => $public ));
-    // }
-
-    function getTitles()
-    {
-        return DB::run(['query' =>
-            "SELECT pc.title, p.id, p.slug
-             FROM posts AS p
-             INNER JOIN posts_content AS pc ON pc.id = p.id
-             WHERE p.is_public = '1' AND p.type = '{$this->type}'
-             ORDER BY p.published_on
-             DESC LIMIT 5"]
-        )->fetchAll();
-    }
-
-    function getLastId()
-    {
-        return DB::run()->lastInsertId();
-    }
-
-    function getComments($postId)
-    {
-        return DB::run(
-            ['query' => "SELECT `body`,`author`, DATE_FORMAT(`date`, '%d/%m/%Y %H:%i:%s') AS `date` FROM `comments` WHERE `id` = '$postId'"]
-        )->fetchAll();
-    }
-
-    function addComment($postId, $author, $body)
-    {
-        DB::run(
-            Query::table('comments')
-                ->add(array('id' => $postId, 'author' => $author, 'body' => $body))
-        );
-    }
-}
diff --git a/modules/thijzer/Blog/Resources/Views/RecentPost.twig b/modules/thijzer/Blog/Resources/Views/RecentPost.twig
deleted file mode 100755
index ae3a0c3..0000000
--- a/modules/thijzer/Blog/Resources/Views/RecentPost.twig
+++ /dev/null
@@ -1,8 +0,0 @@
-<div>
-  <h3 class="widget-title">{{ 'lbl.recent.post'|lng|capitalize }}</h3>
-  <ul>
-    {% for title in titles %}
-    <li><a href="{{ meta.site }}blog/article/{{ title.id }}/{{ title.uri }}">{{ title.title }}</a></li>
-    {% endfor %}
-  </ul>
-</div>
diff --git a/modules/thijzer/Blog/Resources/views/Archived.twig b/modules/thijzer/Blog/Resources/views/Archived.twig
deleted file mode 100755
index 87bd253..0000000
--- a/modules/thijzer/Blog/Resources/views/Archived.twig
+++ /dev/null
@@ -1,8 +0,0 @@
-<div>
-  <h3 class="widget-title">{{ 'lbl.archived'|lng|capitalize }}</h3>
-  <ul>
-    {% for title in titles %}
-    <li><a href="{{ meta.site }}archived/{{ title.id }}">{{ title.title }}</a></li>
-    {% endfor %}
-  </ul>
-</div>
diff --git a/modules/thijzer/Blog/Resources/views/RecentPost.twig b/modules/thijzer/Blog/Resources/views/RecentPost.twig
deleted file mode 100755
index ae3a0c3..0000000
--- a/modules/thijzer/Blog/Resources/views/RecentPost.twig
+++ /dev/null
@@ -1,8 +0,0 @@
-<div>
-  <h3 class="widget-title">{{ 'lbl.recent.post'|lng|capitalize }}</h3>
-  <ul>
-    {% for title in titles %}
-    <li><a href="{{ meta.site }}blog/article/{{ title.id }}/{{ title.uri }}">{{ title.title }}</a></li>
-    {% endfor %}
-  </ul>
-</div>
diff --git a/modules/thijzer/Files/Controllers/Files.php b/modules/thijzer/Files/Controllers/Files.php
deleted file mode 100644
index b4208c4..0000000
--- a/modules/thijzer/Files/Controllers/Files.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-class Files extends Ctrlr
-{
-    public function index()
-    {
-        $fm = new FileManager(path('cache').'test');
-        $pages = $this->pagination($fm->getFileCount(), 0, 100);
-        $response['pages'] = $pages;
-        $response['files'] = $fm->getFiles($pages['limit'], $pages['offset']);
-        return $response;
-    }
-
-    public function detail()
-    {
-    }
-}
diff --git a/phpspec.yml.dist b/phpspec.yml.dist
new file mode 100644
index 0000000..16e7f9d
--- /dev/null
+++ b/phpspec.yml.dist
@@ -0,0 +1,8 @@
+suites:
+  Main:
+    namespace: Romano
+    psr4_prefix: Romano
+    src_path: "%paths.config%/src"
+    spec_path: "%paths.config%/tests"
+
+formatter.name: pretty
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..ac72ff0
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+        <env name="APP_ENV" value="test" />
+        <env name="APP_DEBUG" value="1" />
+        <!-- define your env variables for the test env here -->
+    </php>
+
+    <testsuites>
+        <testsuite name="Common Tests">
+            <directory>tests/unit/</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
\ No newline at end of file
diff --git a/pub/.DS_Store b/pub/.DS_Store
deleted file mode 100755
index 1c25d4d..0000000
Binary files a/pub/.DS_Store and /dev/null differ
diff --git a/pub/css/.DS_Store b/pub/css/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
Binary files a/pub/css/.DS_Store and /dev/null differ
diff --git a/src/Component/Common/ClassNameReference.php b/src/Component/Common/ClassNameReference.php
new file mode 100644
index 0000000..6d1a073
--- /dev/null
+++ b/src/Component/Common/ClassNameReference.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Romano\Component\Common;
+
+class ClassNameReference
+{
+    /** @var string */
+    private $className;
+
+    public function __construct($object)
+    {
+        $this->className = \get_class($object);
+    }
+
+    /** @return string */
+    public function getClassName(): string
+    {
+        return $this->className;
+    }
+
+    /** @return bool|string */
+    public function getShortName()
+    {
+        return substr(strrchr($this->getClassName(), '\\'), 1);
+    }
+
+    /**
+     * @param object $object
+     *
+     * @return bool
+     */
+    public function equals(object $object): bool
+    {
+        return $this->is((new self($object))->getClassName());
+    }
+
+    /**
+     * @param string $className
+     *
+     * @return bool
+     */
+    public function is(string $className): bool
+    {
+        return $this->getClassName() === $className;
+    }
+
+    /** @return string */
+    public function __toString(): string
+    {
+        return $this->getClassName();
+    }
+}
diff --git a/src/Component/Common/ContainerInterface.php b/src/Component/Common/ContainerInterface.php
new file mode 100644
index 0000000..9b3fa5b
--- /dev/null
+++ b/src/Component/Common/ContainerInterface.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Romano\Component\Common;
+
+interface ContainerInterface
+{
+    /**
+     * Returns a result based from the key
+     *
+     * @param array ...$keys
+     *
+     * @return mixed
+     */
+    public function get(...$keys);
+    public function getAll(): array;
+
+    /**
+     * Multi dimensional key support
+     *
+     * @param array ...$keys
+     *
+     * @return bool
+     */
+    public function has(...$keys): bool;
+
+    /**
+     * Set any value based on multi dimensional key
+     * @param string $keys
+     * @param $value
+     */
+    public function add(string $keys, $value): void;
+    public function addAll(array $values): void;
+
+    /**
+     * @param string $key
+     */
+    public function remove(string $key): void;
+}
diff --git a/src/Romano/Lang.php b/src/Component/Common/Locale/Lang.php
similarity index 66%
rename from src/Romano/Lang.php
rename to src/Component/Common/Locale/Lang.php
index 662abe2..fc43daa 100644
--- a/src/Romano/Lang.php
+++ b/src/Component/Common/Locale/Lang.php
@@ -1,6 +1,6 @@
 <?php
 
-
+namespace Romano\Component\Common\Locale;
 
 class Lang
 {
@@ -10,19 +10,21 @@ public static function get($route, $replacers = array())
     {
         list($type, $slug) = explode('.', $route, 2);
         if (!isset(self::$array[$type][$slug])) {
-            return '!!! missing locale !!! : '.$route;
+            return '!!! missing locale !!! : ' . $route;
         }
-        $respons = self::$array[$type][$slug];
+
+        $response = self::$array[$type][$slug];
         if (!empty($replacers)) {
-            return str_replace(array_flip($replacers), $replacers, $respons);
+            return str_replace(array_flip($replacers), $replacers, $response);
         }
-        return $respons;
+
+        return $response;
     }
 
     public static function set(array $locale)
     {
         if (!self::$array) {
-             self::$array = $locale;
+            self::$array = $locale;
         }
     }
 }
diff --git a/src/Component/Common/Locale/LanguageSelector.php b/src/Component/Common/Locale/LanguageSelector.php
new file mode 100644
index 0000000..dbc3074
--- /dev/null
+++ b/src/Component/Common/Locale/LanguageSelector.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Romano\Component\Common\Locale;
+
+use Romano\Framework\Container;
+use Romano\Framework\Lang;
+
+class LanguageSelector
+{
+    public function setMultiLanguage()
+    {
+        $languages = $this->config->getParameter('site_languages');
+        $section = $this->request->getURLSection(0);
+        if ($this->hasLanguage($section, $languages)) {
+            $this->request->set('LANGUAGE', $languages[$section]);
+            $this->request->removeURLSection(0);
+            $this->currentLanguage = $section;
+            return;
+        }
+        // multi language
+        // Output::page(404);exit;
+    }
+
+    public function getLanguage()
+    {
+        if (!$this->request->get('LANGUAGE')) {
+            $languages = $this->config->getParameter('site_languages');
+            $default = $this->config->getParameter('default_language');
+            $this->request->set('LANGUAGE', $languages[$default]);
+        }
+        return $this->request->get('LANGUAGE');
+    }
+
+    public function setLanguage()
+    {
+        Container::setParam(array('path', 'url', path('url') . $this->getLanguage() . '.php'));
+        Container::setParam(array('path', 'Romano\Component\Common\Locale\Lang', path('Romano\Component\Common\Locale\Lang') . $this->getLanguage() . '.php'));
+        Container::setParam(array('path', 'routes', path('url')));
+
+        // setup locale language
+        Lang::set(require path('Romano\Component\Common\Locale\Lang'));
+    }
+
+    public function hasLanguage($language, $languages)
+    {
+        return (in_array($language, array_keys($languages)));
+    }
+}
\ No newline at end of file
diff --git a/src/Component/Common/Matroska.php b/src/Component/Common/Matroska.php
new file mode 100644
index 0000000..fba22c9
--- /dev/null
+++ b/src/Component/Common/Matroska.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Romano\Component\Common;
+
+use Romano\Component\Common\ContainerInterface;
+use Romano\Framework\Functions\ArrayFunctions as ArrayFunc;
+
+class Matroska implements ContainerInterface
+{
+    private $values = [];
+
+    public function __construct(array $values = [])
+    {
+        $this->addAll($values);
+    }
+
+    public function addAll(array $values): void
+    {
+        $this->values = array_merge($this->values, ArrayFunc::unflatten($values));
+    }
+
+    public function add(string $keys, $value): void
+    {
+        $this->values = array_replace_recursive($this->values, ArrayFunc::unflatten([$keys => $value]));
+    }
+
+    public function getAll(): array
+    {
+        return $this->values;
+    }
+
+    public static function create(array $values): Matroska
+    {
+        return new self($values);
+    }
+
+    public function get(...$keys)
+    {
+        return ArrayFunc::arrayGet($keys, $this->values);
+    }
+
+    public function remove($key): void
+    {
+        $this->add($key, null);
+    }
+
+    public function has(...$keys): bool
+    {
+        return $this->get(...$keys) !== null;
+    }
+}
diff --git a/src/Component/Common/Model/Collection.php b/src/Component/Common/Model/Collection.php
new file mode 100755
index 0000000..3ec1674
--- /dev/null
+++ b/src/Component/Common/Model/Collection.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Romano\Component\Common\Model;
+
+class Collection implements \Countable, \IteratorAggregate
+{
+    private $items;
+
+    public function __construct(array $items = [])
+    {
+        $this->items = $items;
+    }
+
+    public function add($item)
+    {
+        $this->items[] = $item;
+    }
+
+    public function each(callable $callback): void
+    {
+        foreach ($this->items as $key => $item) {
+            if (false === $callback($item, $key)) {
+                break;
+            }
+        }
+    }
+
+    public function filter(callable $callback): self
+    {
+        return new self(array_filter($this->items, $callback));
+    }
+
+    public function map(callable $callback): self
+    {
+        $keys = array_keys($this->items);
+        $items = array_map($callback, $this->items, $keys);
+
+        return new self(array_combine($keys, $items));
+    }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->items);
+    }
+
+    public function hasItems(): bool
+    {
+        return $this->count() > 0;
+    }
+
+    public function count(): int
+    {
+        return \count($this->items);
+    }
+
+    public function current()
+    {
+        return current($this->items);
+    }
+
+    public function end()
+    {
+        return end($this->items);
+    }
+}
diff --git a/src/Framework/Application.php b/src/Framework/Application.php
new file mode 100644
index 0000000..8b1f19c
--- /dev/null
+++ b/src/Framework/Application.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Romano\Framework;
+
+use Romano\Component\Common\Matroska;
+use Romano\Framework\Router\RouteFactory;
+use Romano\Framework\Router\Router;
+
+class Application
+{
+    private $request;
+    private $config;
+
+    private $currentLanguage = '';
+    private $defApp;
+
+    public function __construct(string $root, array $configurations)
+    {
+        $this->config = new ConfigurationManager(new Matroska($configurations));
+        $this->config->setParameter('root', $root.'/');
+    }
+
+    public function buildProject(): void
+    {
+        $config = $this->config->getAll();
+        $path['root'] = $config['root'];
+        $path['app'] = 'app/'.$config['app_name'].'/';
+        $path['src'] = 'src/';
+        $path['app_config'] = $path['app'].'config/';
+        $path['Romano\Component\Common\Locale\Lang'] = $path['app_config'].'Language/';
+        $path['url'] = $path['app_config'].'Url/';
+        $path['resource'] = $path['src'].'Resources/';
+        $path['cache'] = $path['src'].'Cache/';
+        $path['controller'] = $path['src'].'Controllers/';
+        $path['model'] = $path['src'].'Models/';
+
+        if (isset($config['head']['site'])) {
+            $path['root_url'] = $config['head']['site'];
+            $path['view'] = $path['app'].'Views/'.$config['view'].'/';
+            $path['view_cache'] = $path['cache'].$config['view'].'_view/';
+        }
+
+        $this->config->setParameter('path', $path);
+    }
+
+    /**
+     * @param Request $request
+     * Allow the request to decide which configuration set should be loaded
+     * This is important for example multi domain, locale based routes,
+     * The configuration should be hard backed (read-only) into the configuration
+     */
+    public function buildEnvironmentFromRequest(Request $request): void
+    {
+        $app = $this->config->getParameter('app');
+        $defHost = $this->config->getParameter('default_host');
+        $this->defApp = $this->config->getParameter('default_app');
+        $appEnv = $defHost.'/'.$this->defApp;
+
+        // look into the hostname
+        if (array_key_exists($request->get('HTTP_HOST'), $app)) {
+            $defHost = $request->getHostSection(0);
+        }
+
+        // look into the url
+        if (array_key_exists($request->getURLSection(0), $app[$defHost])) {
+            $this->defApp = $this->request->getURLSection(0);
+            $this->request->removeURLsection(0);
+        }
+
+        //$this->config->setConfiguration(require 'app/'.$appEnv.'/Config/Settings.php');
+
+        // we push the default view
+        if (!$request->get('VIEW')) {
+            $request->set('VIEW', $this->config->getParameter('view'));
+        }
+
+        $this->config->setParameter('app_name', $appEnv);
+        $this->config->setParameter('app_domain', $request->get('HTTP_HOST'));
+
+        $this->buildProject();
+
+        if ($this->config->getParameter('multi_language') === true) {
+            //$this->setMultiLanguage();
+        }
+        //$this->setLanguage();
+    }
+
+    public function buildRouter(): router
+    {
+        return RouteFactory::buildRouter($this->getProvisionedConfig());
+    }
+
+    public function getProvisionedConfig(): ConfigurationManager
+    {
+        return $this->config;
+    }
+
+    public function getConfig(): ConfigurationManager
+    {
+        return $this->config;
+    }
+}
diff --git a/src/Framework/ConfigurationManager.php b/src/Framework/ConfigurationManager.php
new file mode 100644
index 0000000..d2e741e
--- /dev/null
+++ b/src/Framework/ConfigurationManager.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Romano\Framework;
+
+use Romano\Component\Common\ContainerInterface;
+
+class ConfigurationManager
+{
+    private $configuration;
+
+    public function __construct(ContainerInterface $configuration)
+    {
+        $this->configuration = $configuration;
+    }
+
+    public function setConfiguration(array $parameters): void
+    {
+        $this->configuration->addAll($parameters);
+    }
+
+    public function getParameter(string $key)
+    {
+        return $this->configuration->get($key);
+    }
+
+    public function setParameter(string $key, $value): void
+    {
+        $this->configuration->add($key, $value);
+    }
+
+    public function getAll(): array
+    {
+        return $this->configuration->getAll();
+    }
+}
diff --git a/src/Framework/Controller/Controller.php b/src/Framework/Controller/Controller.php
new file mode 100644
index 0000000..c380e9a
--- /dev/null
+++ b/src/Framework/Controller/Controller.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Romano\Framework\Controller;
+
+abstract class Controller
+{
+    private $params;
+
+    public function __construct(array $params)
+    {
+        $this->params = $params;
+    }
+
+    public function param($name)
+    {
+        return $this->params[$name];
+    }
+
+//    public function getTemplateResponse(): Response
+//    {
+//        return new Response($this->template);
+//    }
+//
+//    public function getResourceResponse(): Response
+//    {
+//        return new Response($this->resource->render(), $this->resource->getScope());
+//    }
+}
diff --git a/src/Framework/Exception/UnknownObjectException.php b/src/Framework/Exception/UnknownObjectException.php
new file mode 100644
index 0000000..f4447a2
--- /dev/null
+++ b/src/Framework/Exception/UnknownObjectException.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Romano\Framework\Exception;
+
+use Throwable;
+
+class UnknownObjectException extends \Exception
+{
+    public function __construct(string $engine, int $code = 0, Throwable $previous = null)
+    {
+        parent::__construct(
+            sprintf('Cannot instantiate a unknown object of class %s', $engine),
+            $code,
+            $previous
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/Framework/Exception/UnknownTemplateEngineException.php b/src/Framework/Exception/UnknownTemplateEngineException.php
new file mode 100644
index 0000000..a6bb15a
--- /dev/null
+++ b/src/Framework/Exception/UnknownTemplateEngineException.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Romano\Framework\Exception;
+
+use Throwable;
+
+class UnknownTemplateEngineException extends \Exception
+{
+    public function __construct(string $engine, int $code = 0, Throwable $previous = null)
+    {
+        parent::__construct(
+            sprintf('Select a supported Template render engine, %s is unsupported', $engine),
+            $code,
+            $previous
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/Romano/File.php b/src/Framework/File/File.php
similarity index 88%
rename from src/Romano/File.php
rename to src/Framework/File/File.php
index 3611ada..8b4c83a 100644
--- a/src/Romano/File.php
+++ b/src/Framework/File/File.php
@@ -1,6 +1,8 @@
 <?php
 
-class File extends SPLFileInfo
+namespace Romano\Framework\File;
+
+class File extends \SPLFileInfo
 {
     private $fullPath;
     private $content;
@@ -14,7 +16,7 @@ public function __construct($fullPath, $content = null, $properties = null)
     {
         parent::__construct($fullPath);
 
-        if (is_array($properties)) {
+        if (\is_array($properties)) {
             foreach ($properties as $key => $value) {
                 $this->{$key} = $value;
             }
@@ -36,7 +38,7 @@ public function getFullPath()
 
     public function getFullPathHash()
     {
-        return crc32b($this->fullPath);
+        return \crc32($this->fullPath);
     }
 
     public function getContent()
@@ -50,14 +52,14 @@ public function setContent($content)
         return $this;
     }
 
-    public function getHash()
+    public function getHash(): FileHash
     {
-        return crc32b($this->getContent());
+        return FileHash::generate($this->getContent());
     }
 
     public function getMimeType()
     {
-        if (!$this->mimetype && $this->exsists()) {
+        if (!$this->mimetype && $this->exists()) {
             $finfo = finfo_open(FILEINFO_MIME_TYPE);
             $this->mimetype = finfo_file($finfo, $this->fullPath);
             finfo_close($finfo);
@@ -108,7 +110,7 @@ public function save()
                 $localFile = fopen($this->fullPath, 'w+');
                 fwrite($localFile, $this->getContent());
                 fclose($localFile);
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 die($e);
             }
         }
diff --git a/src/Framework/File/FileHash.php b/src/Framework/File/FileHash.php
new file mode 100644
index 0000000..6889fad
--- /dev/null
+++ b/src/Framework/File/FileHash.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Romano\Framework\File;
+
+class FileHash
+{
+    private $hash;
+
+    public static function generate(string $content): self
+    {
+        $fileHash = new self();
+        $fileHash->hash = hash('crc32b', $content);
+
+        return $fileHash;
+    }
+
+    public function getHash()
+    {
+        return $this->hash;
+    }
+
+    public function __toString(): string
+    {
+        return $this->getHash();
+    }
+
+    public function is(string $hash): bool
+    {
+        return $this->hash === $hash;
+    }
+
+    public function isGeneratedFrom(string $content): bool
+    {
+        return self::generate($content)->is($this->hash);
+    }
+
+    public function equal(FileHash $fileHash): bool
+    {
+        return $fileHash->is($this->hash);
+    }
+}
\ No newline at end of file
diff --git a/src/Romano/FileManager.php b/src/Framework/File/FileManager.php
similarity index 100%
rename from src/Romano/FileManager.php
rename to src/Framework/File/FileManager.php
diff --git a/src/Romano/FileOutput.php b/src/Framework/File/FileOutput.php
similarity index 100%
rename from src/Romano/FileOutput.php
rename to src/Framework/File/FileOutput.php
diff --git a/src/Romano/ResizeImage.php b/src/Framework/File/Image/ResizeImage.php
similarity index 96%
rename from src/Romano/ResizeImage.php
rename to src/Framework/File/Image/ResizeImage.php
index 1a05034..259ffb6 100755
--- a/src/Romano/ResizeImage.php
+++ b/src/Framework/File/Image/ResizeImage.php
@@ -1,13 +1,6 @@
 <?php
 
-/*
-*  Resize wrapper for GD
-*  original source : http://www.phproots.com/resizing-images-with-php/
-*
-*  added by Thijzer methods : icon, crop, store, getPath, getArray
-*/
-
-
+namespace Romano\Framework\File\Image;
 
 class ResizeImage
 {
diff --git a/src/Romano/IndexFile.php b/src/Framework/File/IndexFile.php
similarity index 100%
rename from src/Romano/IndexFile.php
rename to src/Framework/File/IndexFile.php
diff --git a/src/Romano/Form.php b/src/Framework/Form/Form.php
similarity index 100%
rename from src/Romano/Form.php
rename to src/Framework/Form/Form.php
diff --git a/src/Framework/Form/Input.php b/src/Framework/Form/Input.php
new file mode 100644
index 0000000..0a4ab77
--- /dev/null
+++ b/src/Framework/Form/Input.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Romano\Framework\Form;
+
+class Input
+{
+    private $submissions;
+    
+    public function __construct()
+    {
+        $this->submissions = $_REQUEST;
+    }
+
+    public function isSubmitted(string $fieldName): bool
+    {
+        return $this->get($fieldName) !== null;
+    }
+
+    public function get($fieldName = '', $default = null)
+    {
+        return $this->submissions[$fieldName] ?? $default;
+    }
+}
diff --git a/src/Romano/Validate.php b/src/Framework/Form/Validate.php
similarity index 88%
rename from src/Romano/Validate.php
rename to src/Framework/Form/Validate.php
index dba0690..d950b0e 100755
--- a/src/Romano/Validate.php
+++ b/src/Framework/Form/Validate.php
@@ -11,13 +11,18 @@
   * dependencies : needs DB layer/wrapper for "checkDB"
   */
 
-  
+
+namespace Romano\Framework\Form;
+
+use Romano\Infrastructure\DB;
+use Framework\Infrastructure\Query;
+use Romano\Component\Common\Locale\Lang;
 
 class Validate
 {
     private $gate;
     private $errors = array();
-    private $source =  array();
+    private $source = array();
     private $data = array();
 
     function __construct($data)
@@ -25,7 +30,7 @@ function __construct($data)
         $this->source = $data;
     }
 
-    public function check($item ,$rules = array() )
+    public function check($item, $rules = array())
     {
         $this->data[$item] = '';
         $this->gate = true;
@@ -34,8 +39,8 @@ public function check($item ,$rules = array() )
             if ($this->gate === true) {
                 switch ($rule) {
                     case 'required':
-                        if (empty($value) AND $rule_value === true ) {
-                            $this->addError($item ,Lang::get('error.valid.required', array('{{item}}' => $item)));
+                        if (empty($value) AND $rule_value === true) {
+                            $this->addError($item, Lang::get('error.valid.required', array('{{item}}' => $item)));
                         }
                         break;
                     case 'min':
@@ -54,11 +59,11 @@ public function check($item ,$rules = array() )
                         }
                         break;
                     case 'regex':
-                        if (!preg_match($rule_value, $value) ) {
+                        if (!preg_match($rule_value, $value)) {
                             $this->addError($item, Lang::get('error.valid.nomatch', array('{{item}}' => $item)));
                         }
                         break;
-                    case 'db':
+                    case 'Romano\Infrastructure\DB':
                         if (is_array($rule_value)) $this->checkDB($rule_value, strtolower($item), strtolower($value));
                         break;
                     default:
@@ -82,7 +87,7 @@ public function checkDB($array, $where_key, $where_val)
     {
         $result = DB::run(
             Query::table($array['table'])
-            ->where(array($where_key => $where_val))->build()
+                ->where(array($where_key => $where_val))->build()
         )->fetch();
 
         if ($result) {
@@ -96,8 +101,7 @@ public function checkDB($array, $where_key, $where_val)
                     case 'active':
                         if ($result['active'] === 1 AND $value === false) {
                             $this->addError($where_key, Lang::get('error.valid.db.active', array('{{item}}' => $where_key)));
-                        }
-                        elseif (empty($result['active']) AND $value === true) {
+                        } elseif (empty($result['active']) AND $value === true) {
                             $this->addError($where_key, Lang::get('error.valid.db.notactive', array('{{item}}' => $where_key)));
                         }
                         break;
diff --git a/src/Framework/Functions/ArrayFunctions.php b/src/Framework/Functions/ArrayFunctions.php
new file mode 100755
index 0000000..513907d
--- /dev/null
+++ b/src/Framework/Functions/ArrayFunctions.php
@@ -0,0 +1,190 @@
+<?php
+
+namespace Romano\Framework\Functions;
+
+class ArrayFunctions
+{
+    public const delimiter = '.';
+
+    public static function indexBy($newIndex, array $files)
+    {
+        if (!isset($files[0][$newIndex])) {
+            return [];
+        }
+        foreach ($files as $value) {
+            $tmp[$value[$newIndex]] = $value;
+        }
+        return $tmp;
+    }
+
+    /**
+     * returns an cleaned array on provided keys
+     */
+    static function returnOnKeys($rr, $keys) {
+        // arraflip rotates the array key => val to val => key
+        return array_intersect_key($rr, array_flip($keys));
+    }
+
+    /**
+     * returns an array with replaced values
+     */
+    public static function replaceValue($haystack, $needle, $replaceValue)
+    {
+        foreach (in_array($needle, $haystack) as $key) {
+            $haystack[$key] = $replaceValue;
+        }
+        return $haystack;
+    }
+
+    private function checkLastKey($rr, $key)
+    {
+        return ($key === self::getLastKey($rr));
+    }
+
+    /**
+     * @param array $array
+     *
+     * @return mixed
+     */
+    public static function getLastKey(array $array)
+    {
+        end($array);
+        return key($array);
+    }
+
+    /**
+     * @param array $array
+     *
+     * @return mixed
+     */
+    public static function getLastValue(array $array)
+    {
+        return $array[self::getLastKey($array)];
+    }
+
+    /**
+     * ISSUE with unflatten
+     * label-23 => becomes label[23]
+     * but label => resets label[] via overwriting.
+     *
+     * Reverse flatten an associative array to multidimensional one
+     * by separating keys on prefix.
+     *
+     * @param array  $array
+     * @param string $prefix
+     *
+     * @return array
+     */
+    public static function unflatten(array $array, string $prefix = '.')
+    {
+        $output = [];
+        foreach ($array as $key => $value) {
+            static::arraySet($output, $key, $value, $prefix);
+            if (\is_array($value) && !strpos($key, $prefix)) {
+                $nested = static::unflatten($value, $prefix);
+                $output[$key] = $nested;
+            }
+        }
+        return $output;
+    }
+
+    public static function arraySet(array &$array, string $keys, $value): array
+    {
+        $keys = \explode(self::delimiter, $keys);
+        while (\count($keys) > 1) {
+            $key = array_shift($keys);
+            if (!isset($array[$key]) || !\is_array($array[$key])) {
+                $array[$key] = [];
+            }
+            $array = &$array[$key];
+        }
+        $array[array_shift($keys)] = $value;
+//        foreach ($keys = \explode(self::delimiter, $keys) as $key) {
+//            if (!isset($array[$key]) || !\is_array($array[$key])) {
+//                $array[$key] = [];
+//            }
+//            $array = &$array[$key];
+//        }
+//        $array[end($keys)] = $value;
+
+        return $array;
+    }
+
+    public static function arrayGet(array $keys, array $searchableValues)
+    {
+        $keys = \count($keys) > 1 ? $keys : \explode(self::delimiter, current($keys));
+
+        foreach ($keys as $key) {
+            $searchableValues = $searchableValues[$key] ?? null;
+        }
+
+        return $searchableValues;
+    }
+
+    /**
+     * Checks weither the array is associative.
+     *
+     * @param array $arr
+     *
+     * @return bool
+     */
+    public static function isAssoc(array $arr)
+    {
+        if ([] === $arr) {
+            return false;
+        }
+        return array_keys($arr) !== range(0, \count($arr) - 1);
+    }
+    /**
+     * Flattens an multi-dimensional array to associative array
+     * by adding combining the keys with a prefix.
+     *
+     * @param array  $array
+     * @param string $prefix
+     * @param mixed  $separator
+     *
+     * @return array
+     */
+    public static function flatten(array $array, $separator = '.', $prefix = '')
+    {
+        $result = [];
+        foreach ($array as $key => $value) {
+            if (\is_array($value)) {
+                $result += self::flatten($value, $separator, $prefix.$key.$separator);
+                continue;
+            }
+            $result[$prefix.$key] = $value;
+        }
+        return $result;
+    }
+    public static function flattenSetKey(array &$array, $referenceKey, $value, $separator = '.')
+    {
+        $keys = explode($separator, $referenceKey);
+        foreach ($keys as $key) {
+            if (!\is_array($array[$key])) {
+                $array[$key] = $value;
+                return;
+            }
+            $array = &$array[$key];
+        }
+    }
+    /**
+     * Normalizes array keys to integers.
+     *
+     * @param array $param
+     *
+     * @return array
+     */
+    public static function normalizeKeys(array $param)
+    {
+        $keys = [];
+        foreach (new \RecursiveIteratorIterator(new \RecursiveArrayIterator($param)) as $key => $val) {
+            $keys[$key] = '';
+        }
+        $data = [];
+        foreach ($param as $values) {
+            $data[] = array_merge($keys, $values);
+        }
+        return $data;
+    }
+}
diff --git a/src/Framework/Functions/Characters.php b/src/Framework/Functions/Characters.php
new file mode 100644
index 0000000..8ee3893
--- /dev/null
+++ b/src/Framework/Functions/Characters.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Romano\Framework\Functions;
+
+class Characters
+{
+    private static $FOREIGN = ['ç','æ','œ','á','é','í','ó','ú','à','è','ì','ò','ù','ä','ë','ï','ö','ü','ÿ','â','ê','î','ô','û','å','e','i','ø','u'];
+    private static $FOREIGN_replacements = ['c','ae','oe','a','e','i','o','u','a','e','i','o','u','a','e','i','o','u','y','a','e','i','o','u','a','e','i','o','u'];
+
+    private static function getChars()
+    {
+        return array(
+            'specials' => array ("'",'’'),
+            'markUp' => array ('(',')','[',']','"','«','»',':','.','?','!',',',';','{','}','`'),
+            'html' => array ('<','>','/'),
+            'extras' => array ('~','@','$','%','^','&','|','+','='),
+            'markDown' => array ('#','-','*'),
+            'alfabet' => range('a', 'z'),
+            'alfabetCap' => range('A', 'Z'),
+            'numbers' => range(0, 9)
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/Framework/HTTP/Cookie.php b/src/Framework/HTTP/Cookie.php
new file mode 100755
index 0000000..a92f395
--- /dev/null
+++ b/src/Framework/HTTP/Cookie.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Romano\Framework\HTTP;
+
+class Cookie
+{
+    public static function set(string $name, $data, int $expiry): void
+    {
+        setcookie($name, \is_array($data) ? json_encode($data) : $data, $expiry);
+    }
+
+    public static function get(string $name): array
+    {
+        return (array) json_decode($_COOKIE[$name] ?? '');
+    }
+
+    public static function exists(string $name): bool
+    {
+        return isset($_COOKIE[$name]);
+    }
+
+    public static function delete($name): void
+    {
+        self::set($name, '', time() - 1);
+        unset($_COOKIE[$name]);
+    }
+}
diff --git a/src/Framework/HTTP/Request.php b/src/Framework/HTTP/Request.php
new file mode 100644
index 0000000..84c1d3f
--- /dev/null
+++ b/src/Framework/HTTP/Request.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Romano\Framework\HTTP;
+
+use Romano\Component\Common\ContainerInterface;
+use Romano\Component\Common\Matroska;
+
+class Request
+{
+    private $parameters;
+
+    public function __construct()
+    {
+        $this->parameters = new Matroska();
+        $this->parameters->addAll(array_merge($_SERVER, $_REQUEST));
+    }
+
+    public function getParameters(): ContainerInterface
+    {
+        return $this->parameters;
+    }
+
+    public function get(string $key)
+    {
+        return $this->parameters->get($key);
+    }
+
+    public function has(string $key): bool
+    {
+        return $this->parameters->has($key);
+    }
+
+    public function set(string $key, $value): void
+    {
+        $this->parameters->add($key, $value);
+    }
+
+    public function getURLSections(): array
+    {
+        return $this->parameters->get('SECTIONS');
+    }
+
+    public function getURLSection(int $section)
+    {
+        return $this->parameters->get('SECTIONS', $section);
+    }
+
+    public function getHostSection(string $section)
+    {
+        return $this->parameters->get('HOST_SECTION', $section);
+    }
+
+    public function removeURLSection($section): void
+    {
+        // todo removing source parts is not save, deprecate this part
+        $this->parameters->remove('HOST_SECTION.'.$section);
+        $this->parameters['SECTIONS'] = array_values($this->parameters['SECTIONS']);
+        $this->parameters['URI'] = implode('/', $this->parameters['SECTIONS']);
+    }
+
+    public function isMethod($method): bool
+    {
+        return strtoupper($method) === strtoupper($this->parameters->get('REQUEST_METHOD'));
+    }
+
+    public function isSubmitted($name = null): bool
+    {
+        return (null !== $name) ?
+            $this->parameters->has('REQUEST_METHOD', $name):
+            $this->parameters->has('REQUEST_METHOD')
+        ;
+    }
+}
diff --git a/src/Framework/HTTP/RequestParameterBuilder.php b/src/Framework/HTTP/RequestParameterBuilder.php
new file mode 100644
index 0000000..41267d9
--- /dev/null
+++ b/src/Framework/HTTP/RequestParameterBuilder.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Romano\Framework\HTTP;
+
+use Romano\Component\Common\ContainerInterface;
+use Romano\Component\Common\Matroska;
+
+class RequestParameterBuilder
+{
+    public static function buildParameters(array $server, array $resquest): ContainerInterface
+    {
+        $parameters = array_merge($server, $resquest);
+        $parameters['URI'] = trim(str_replace('?'.$server['QUERY_STRING'], '', $server['REQUEST_URI']), '/');
+        $parameters['SECTIONS'] = explode('/', $parameters['URI']);
+        $parameters['HOST_SECTIONS'] = explode('.', $parameters['HTTP_HOST']);
+        $parameters['LANGUAGE'] = '';
+        $parameters['VIEW'] = '';
+        $parts = pathinfo($parameters['URI']);
+        if (isset($parts['extension'])) {
+            $parameters['URI'] = str_replace('.'.$parts['extension'], '', $parameters['URI']);
+            $parameters['VIEW'] = $parts['extension'];
+            $parameters['SECTIONS'] = explode('/', $parameters['URI']);
+        }
+
+        parse_str($server['QUERY_STRING'], $parameters['PARAMS']);
+
+        return new Request(Matroska::create($parameters));
+    }
+}
diff --git a/src/Framework/HTTP/Response.php b/src/Framework/HTTP/Response.php
new file mode 100644
index 0000000..2410f44
--- /dev/null
+++ b/src/Framework/HTTP/Response.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Romano\Framework\HTTP;
+
+class Response
+{
+    /**
+     * @var string
+     */
+    private $path;
+    /**
+     * @var array
+     */
+    private $data;
+
+    public function __construct(string $path, array $data = [])
+    {
+        $this->path = $path;
+        $this->data = $data;
+    }
+
+    /**
+     * @return array
+     */
+    public function getArrayData(): array
+    {
+        return [
+            'path' => $this->path,
+            'data' => $this->data,
+        ];
+    }
+}
\ No newline at end of file
diff --git a/src/Romano/Session.php b/src/Framework/HTTP/Session.php
similarity index 76%
rename from src/Romano/Session.php
rename to src/Framework/HTTP/Session.php
index fdcdf2b..d908823 100644
--- a/src/Romano/Session.php
+++ b/src/Framework/HTTP/Session.php
@@ -1,18 +1,21 @@
 <?php
 
-
+namespace Romano\Framework\HTTP;
 
 class Session
 {
     private static $token = '';
+
     private static function token()
     {
         if (!self::$token) {
             self::$token = (string) config('session_token');
             session_start();
         }
+
         return self::$token;
     }
+
     public static function set($array)
     {
         $token = self::token();
@@ -20,23 +23,19 @@ public static function set($array)
             $_SESSION[$token][$key] = $value;
         }
     }
+
     public static function get($name)
     {
         $token = self::token();
+
         return (isset($_SESSION[$token][$name])) ? $_SESSION[$token][$name] : false;
     }
+
     public static function delete($name)
     {
         unset($_SESSION[self::token()][$name]);
     }
-    // public static function flash($name, $string)
-    // {
-    //     if ($session = self::get(array($name, $string))) {
-    //         self::delete($name);
-    //         return $session;
-    //     }
-    //     self::set(array($name, $string));
-    // }
+
     public static function destroy()
     {
         $_SESSION[self::token()] = array();
diff --git a/src/Framework/HTTP/Token.php b/src/Framework/HTTP/Token.php
new file mode 100755
index 0000000..73db104
--- /dev/null
+++ b/src/Framework/HTTP/Token.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Romano\Framework\HTTP;
+
+class Token
+{
+    /**
+     * @var string
+     */
+    private $tokenName;
+
+    public function __construct(string $tokenName)
+    {
+        $this->tokenName = $tokenName;
+    }
+
+    public function generate(): void
+	{
+		return Session::set($this->token, md5(uniqid()));
+	}
+
+	public function check(string $token): bool
+	{
+		if (Session::get($this->tokenName) && $token === Session::get($this->tokenName)) {
+			Session::delete($this->tokenName);
+
+			return true;
+		}
+
+		return false;
+	}
+}
diff --git a/src/Romano/Html.php b/src/Framework/Html/Html.php
similarity index 100%
rename from src/Romano/Html.php
rename to src/Framework/Html/Html.php
diff --git a/src/Framework/Resource/Resource.php b/src/Framework/Resource/Resource.php
new file mode 100644
index 0000000..7ec0d65
--- /dev/null
+++ b/src/Framework/Resource/Resource.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Romano\Framework\Resource;
+
+class Resource
+{
+    private $scopes = [];
+    private $blocks = [];
+    private $baseFile = 'default.twig';
+    private $blockName;
+    private $lock = false;
+
+    public function block(string $name): self
+    {
+        $this->blockName = $name;
+
+        return $this;
+    }
+
+    public function getBlocks(): array
+    {
+        return $this->blocks;
+    }
+
+    public function hasBlocks(): bool
+    {
+        return \count($this->blocks) > 0;
+    }
+
+    public function setBaseFile(string $baseFile): self
+    {
+        $this->baseFile = $baseFile;
+
+        return $this;
+    }
+
+    public function getBaseFile(): string
+    {
+        return $this->baseFile;
+    }
+
+    public function scope(string $controller): void
+    {
+        $this->scopes[$this->blockName][] = $controller;
+    }
+
+    public function getScopes(): array
+    {
+        return $this->scopes;
+    }
+
+    public function html($path): self
+    {
+        $this->blocks[$this->blockName][] = $path;
+
+        return $this;
+    }
+
+    public function getHtmlBlocks(): array
+    {
+        return $this->blocks;
+    }
+
+    public function lock(): void
+    {
+        $this->lock = true;
+    }
+
+    public function unlock(): void
+    {
+        $this->lock = false;
+    }
+
+    public function isLocked(): bool
+    {
+        return $this->lock;
+    }
+}
diff --git a/src/Framework/Resource/ResourceManager.php b/src/Framework/Resource/ResourceManager.php
new file mode 100644
index 0000000..2e87736
--- /dev/null
+++ b/src/Framework/Resource/ResourceManager.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Romano\Framework\Resource;
+
+use Romano\Framework\File\File;
+use Romano\Framework\Template\TemplateBuilder;
+
+class ResourceManager
+{
+    private $scopeCollection = [];
+    /** @var TemplateBuilder */
+    private $templateBuilder;
+
+    public function __construct(TemplateBuilder $templateBuilder)
+    {
+        $this->templateBuilder = $templateBuilder;
+    }
+
+    public function renderScopeData($controller)
+    {
+        if (isset($this->scopeCollection[$controller])) {
+            return $this->scopeCollection[$controller];
+        }
+
+        list($ctrl, $method) = explode('@', $controller);
+
+        if (\is_callable($class = ucfirst($ctrl), $method)) {
+            $class = new $class();
+            $this->scopeCollection[$controller] = $class->$method();
+        }
+    }
+
+    public function render(Resource $resource, string $storePath)
+    {
+        if (!$resource->hasBlocks()) {
+            leave('no html blocks defined');
+        }
+
+        $baseCacheFile = new File(path('view_cache'). $storePath);
+
+        $this->templateBuilder->addComment('Generated file from Resource :: '.date('F Y'));
+
+        $this->templateBuilder->extends($resource->getBaseFile());
+
+        if ($resource->isLocked()) {
+            $this->templateBuilder->addComment('locked');
+        }
+
+        foreach ($resource->getBlocks() as $blockName => $blockParts) {
+            $content = '';
+            foreach ($blockParts as $blockPart) {
+                if (!$blockPart->exists()) {
+                    leave($blockPart->filename.' is not a real block');
+                }
+                $content .= $blockPart->getContent();
+            }
+            $this->templateBuilder->addBlock([$blockName, $content]);
+        }
+
+        $render = $this->templateBuilder->render();
+
+//        if (!$baseCacheFile->exists()) {
+//            if (!is_dir($baseCacheFile->getDirectory())) {
+//                mkdir($baseCacheFile->getDirectory());
+//            }
+//            $baseCacheFile->setContent($render)->save();
+//        } elseif ($baseCacheFile->getHash()->isGeneratedFrom($render)) {
+//            $baseCacheFile->setContent($render)->save();
+//        }
+
+        return $render;
+    }
+
+    public function getCollectedData(Resource $resource): array
+    {
+        return array_merge(...array_map(function ($controller) {
+            return $this->renderScopeData($controller);
+        }, array_merge(...$resource->getScopes())));
+    }
+}
+
+
+//    public function addToScope($name, $scope): void
+//    {
+//        $this->collectedData = array_merge($this->collectedData, array($name => $scope));
+//    }
\ No newline at end of file
diff --git a/src/Framework/Router/Route.php b/src/Framework/Router/Route.php
new file mode 100644
index 0000000..0570e26
--- /dev/null
+++ b/src/Framework/Router/Route.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Romano\Framework\Router;
+
+class Route
+{
+    /** @var string */
+    private $url;
+    /** @var Resource */
+    private $resource;
+    /** @var string */
+    private $templatePath;
+
+    public function __construct(string $url, Resource $resource, string $templatePath)
+    {
+        $this->url = $url;
+        $this->resource = $resource;
+        $this->templatePath = $templatePath;
+    }
+
+    /** @return string */
+    public function getUrl(): string
+    {
+        return $this->url;
+    }
+
+    public function getTemplatePath(): string
+    {
+        return $this->templatePath;
+    }
+
+    public function getResource()
+    {
+        return $this->resource;
+    }
+}
\ No newline at end of file
diff --git a/src/Framework/Router/RouteFactory.php b/src/Framework/Router/RouteFactory.php
new file mode 100644
index 0000000..bbee401
--- /dev/null
+++ b/src/Framework/Router/RouteFactory.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Romano\Framework\Router;
+
+use Romano\Framework\ConfigurationManager;
+
+class RouteFactory
+{
+    public function getRoutes(): array
+    {
+        $routes = require path('routes');
+        $this->buildURL($routes['routes']);
+        return $routes['routes'];
+    }
+
+    private function buildURL($urlList)
+    {
+        $app = '/';
+        $app .= ($this->defApp !== 'default') ? $this->defApp.'/' : '';
+        $app .= ($this->currentLanguage) ? $this->currentLanguage.'/' : '';
+
+        $tmp = [];
+        foreach ($urlList as $key => $route) {
+            if (isset($route['params'])) {
+                preg_match_all('~{(.*?)}~', $key, $output);
+                $glu = implode('_', $output[1]);
+                $tmp[$route['resource']]['dynamic'][$glu] = $app.$key;
+                continue;
+            }
+
+            $tmp[$route['resource']]['static'][] = $app.$key;
+        }
+
+        $this->config->setParameter('url', $tmp);
+    }
+
+    public static function buildRouter(ConfigurationManager $config)
+    {
+        return new Router();
+    }
+}
\ No newline at end of file
diff --git a/src/Framework/Router/Router.php b/src/Framework/Router/Router.php
new file mode 100644
index 0000000..46eb535
--- /dev/null
+++ b/src/Framework/Router/Router.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace Romano\Framework\Router;
+
+use Romano\Framework\Request;
+use Romano\Framework\Router\Route;
+use Romano\Framework\Template\TemplateBuilder;
+
+class Router
+{
+    /** @var array */
+    private $routes;
+
+    private $r = [
+        'parameter' => [],
+        'path_view' => '',
+    ];
+
+    public function __construct(array $routes)
+    {
+        $this->routes = $routes;
+    }
+
+    private function findRoute(Request $request)
+    {
+        $routes = $this->routes;
+
+        // home
+        if (isset($routes['']) && $request->get('URI') === '') {
+             return $routes[''];
+        }
+        unset($routes['']);
+
+        // reduce the list based on the first section
+        $foundRoutes = preg_grep("/{$request->getURLSection(0)}/i", array_keys($routes));
+
+        foreach ($foundRoutes as $route) {
+            if (\count($param = \explode('/', $route)) === \count($request->getURLSections())) {
+
+                // string manipulation
+                preg_match_all("/\{(.*?)\}/", $route, $matches);
+
+                $value = str_replace($matches[0], '(.*)', $route);
+
+                // now we know we have the count and the first part is ok
+                if (preg_match('/' . str_replace('/', '\/', $value) . '$/', $request->get('URI'))) {
+                    $resource = $routes[$route];
+                    if ($matches[0]) {
+                        $this->r['parameter'] = (array) $this->params($request, $matches, $param);
+                    }
+                    $this->r['parameter'] = array_merge($request->get('PARAMS'), $this->r['parameter']);
+                    return $resource;
+                }
+            }
+        }
+
+        return [];
+    }
+
+    private function params(Request $request, $matches, $param)
+    {
+        foreach ($matches[0] as $key => $match) {
+            $par[$matches[1][$key]] = urlencode($request->getURLSection(\array_search($match, $param)));
+        }
+        return $par;
+    }
+
+    public function search(Request $request)
+    {
+        $route = $this->findRoute($request);
+        if (!isset($route['resource'])) {
+            return false;
+        }
+
+        // controller Action
+        list($route['controller'], $route['method']) = explode('@', $route['resource']);
+
+        // template Action
+        $route['template'] = isset($route['template']) ?: $route['controller'].'_'.$route['method'];
+
+        $route['path_view'] = $route['template'].'.twig';
+        $route['url'] = $request->get('URI');
+        $route['path_resource'] = $route['template'].'.php';
+
+        // we need to validate & generate the route
+
+//        return $this->r['path_view'];
+//
+//        if (is_file(path('view_cache').$this->r['path_view']) || is_file(path('view').$this->r['path_view'])) {
+//            return array(
+//                'path' => $this->r['path_view'],
+//                'data' => array()
+//            );
+//        }
+//
+//        $resource = path('resource').$this->r['path_resource'];
+//
+//        if (is_file($resource)) {
+//            $res = new Resource($this->r['path_view'], 'twig');
+//            require $resource;
+//            return array(
+//                'path' => $res->render(),
+//                'data' => (array) $res->getScope()
+//            );
+//        }
+
+        $route = array_merge($this->r, $route);
+
+        $url = $route['url'];
+        $resource = new Resource(new TemplateBuilder(), $route['path_resource']);
+        $viewPath = $route['path_view'];
+
+        return new Route($url, $resource, $viewPath);
+    }
+}
diff --git a/src/Framework/Template/TemplateBuilder.php b/src/Framework/Template/TemplateBuilder.php
new file mode 100644
index 0000000..250e2e2
--- /dev/null
+++ b/src/Framework/Template/TemplateBuilder.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Romano\Framework\Template;
+
+use Romano\Framework\Exception\UnknownTemplateEngineException;
+
+class TemplateBuilder
+{
+    private $renderBlocks;
+
+    private $options = [
+        'twig' => [
+            'extends' => '{% extends "$1" %}',
+            'block' => "{% block $1 %}\n$2{% endblock %}",
+            'include' => '{% include "$1" %}',
+            'comment' => "{# $1 #}\n\n",
+        ]
+    ];
+
+    /**
+     * TemplateBuilder constructor.
+     *
+     * @param string $engine
+     *
+     * @throws UnknownTemplateEngineException
+     */
+    public function __construct(string $engine = 'twig')
+    {
+        if (!isset($this->options[$engine])) {
+            throw new UnknownTemplateEngineException($engine);
+        }
+
+        $this->options = $this->options[$engine];
+    }
+
+    public function render(): string
+    {
+        $render = '';
+
+        foreach ($this->renderBlocks as $renderBlock) {
+            $blockType = key($renderBlock);
+            $blockValue = $renderBlock[$blockType];
+
+            switch ($blockType) {
+                case 'comment':
+                    $render .= str_replace('$1', $blockValue, $this->options['comment']);
+                    break;
+                case 'extends':
+                    $render .= str_replace('$1', $blockValue, $this->options['extends']);
+                    break;
+                case 'block':
+                    $render .= str_replace(['$1', '$2'], $blockValue, $this->options['block']). "\n";
+                    break;
+            }
+        }
+
+        return $render;
+    }
+
+    public function addComment(string $comment): void
+    {
+        $this->renderBlocks[]['comment'] = $comment;
+    }
+
+    public function addBlock(array $block): void
+    {
+        $this->renderBlocks[]['block'] = $block;
+    }
+
+    # only one extend is allowed
+    public function extends(string $extend): void
+    {
+        $this->renderBlocks[]['extends'] = $extend;
+    }
+}
\ No newline at end of file
diff --git a/src/Romano/DB.php b/src/Infrastructure/DB.php
similarity index 85%
rename from src/Romano/DB.php
rename to src/Infrastructure/DB.php
index be559ea..644a66e 100644
--- a/src/Romano/DB.php
+++ b/src/Infrastructure/DB.php
@@ -1,10 +1,15 @@
 <?php
 
+namespace Romano\Infrastructure;
+
+use Output;
+use Singleton;
+
 class DB extends \PDO
 {
     /**
-    * @var array
-    */
+     * @var array
+     */
     protected $stmt, $query, $params, $results;
     protected $options = array(\PDO::ATTR_EMULATE_PREPARES, false);
     protected $fetchMode = \PDO::FETCH_ASSOC;
@@ -12,13 +17,13 @@ class DB extends \PDO
     public function __construct($DB = array())
     {
         try {
-            $DB = array_merge(config('DB'), $DB);
+            $DB = array_merge(config('Romano\Infrastructure\DB'), $DB);
             parent::__construct($DB['DSN'], $DB['USER'], $DB['PASS'], $this->options);
         } catch (\PDOException $e) {
             if (DEV_ENV === true) {
                 throw dump($e->getMessage());
             }
-            throw Output::page('500','CONNECTION ERROR');
+            throw Output::page('500', 'CONNECTION ERROR');
         }
     }
 
@@ -37,8 +42,8 @@ private function processParams()
     public static function run(array $process)
     {
         $instance = Singleton::getInstance(get_class());
-        $instance->query = (string) $process['query'];
-        $instance->params = (isset($process['params'])?$process['params']:[]);
+        $instance->query = (string)$process['Framework\Infrastructure\Query'];
+        $instance->params = (isset($process['params']) ? $process['params'] : []);
         $instance->stmt = null;
         $instance->results[] = $process;
         $instance->processParams();
@@ -63,7 +68,7 @@ public function fetchAllBy($value)
     public function get($value)
     {
         $temp = $this->stmt->fetch($this->fetchMode);
-        return (isset($temp[$value])) ? $temp[$value] : dump($value.' is not set');
+        return (isset($temp[$value])) ? $temp[$value] : dump($value . ' is not set');
     }
 
     public function getId($id = 'id')
diff --git a/src/Romano/Ctrlr.php b/src/Infrastructure/PaginationAdapter.php
similarity index 67%
rename from src/Romano/Ctrlr.php
rename to src/Infrastructure/PaginationAdapter.php
index 8e4826b..25c2cbb 100644
--- a/src/Romano/Ctrlr.php
+++ b/src/Infrastructure/PaginationAdapter.php
@@ -1,19 +1,17 @@
 <?php
 
-abstract class Ctrlr
-{
-    function __construct()
-    {
-        $this->route = container::getAll('route');
-        $this->params = $this->route['parameter'];
-    }
+namespace Romano\Infrastructure;
 
-    function param($name)
+use Romano\Framework\Lang;
+use Romano\Framework\Output;
+
+class PaginationAdapter
+{
+    public function __construct()
     {
-        return $this->params[$name];
     }
 
-    function pagination($rowCount, $offset, $limit, $page = '?page=')
+    public function pagination($rowCount, $offset, $limit, $page = '?page=')
     {
         $requestedPage = 1;
         if (!isset($this->params['page'])) {
@@ -26,7 +24,7 @@ function pagination($rowCount, $offset, $limit, $page = '?page=')
         $requestedPage = (int) $this->params['page'];
         $options['num_pages'] = (int) ceil($options['num_items'] / $options['limit']);
 
-        if ($options['num_pages'] === 0) {
+        if (0 === $options['num_pages']) {
             $options['num_pages'] = 1;
         }
         if ($requestedPage > $options['num_pages'] || $requestedPage < 1) {
@@ -34,16 +32,17 @@ function pagination($rowCount, $offset, $limit, $page = '?page=')
         }
 
         $options['requested_page'] = $requestedPage;
-        $options['prev'] = $requestedPage-1;
-        $options['next'] = $requestedPage+1;
+        $options['prev'] = $requestedPage - 1;
+        $options['next'] = $requestedPage + 1;
         $options['url'] = '/';
-        if (strpos($page, '?') !== false) {
+        if (false !== strpos($page, '?')) {
             $options['url'] .= $this->route['url'];
         }
         $options['page'] = $page;
         $options['next_lbl'] = Lang::get('lbl.next');
         $options['prev_lbl'] = Lang::get('lbl.prev');
         $options['offset'] = ($options['requested_page'] * $options['limit']) - $options['limit'];
+
         return $options;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Romano/Query.php b/src/Infrastructure/Query.php
similarity index 86%
rename from src/Romano/Query.php
rename to src/Infrastructure/Query.php
index 8b98033..ea5634e 100755
--- a/src/Romano/Query.php
+++ b/src/Infrastructure/Query.php
@@ -1,15 +1,17 @@
 <?php
 
+namespace Framework\Infrastructure;
+
 class Query
 {
     /**
-    * @var bool
-    */
+     * @var bool
+     */
     protected $where = false;
 
     /**
-    * @var string
-    */
+     * @var string
+     */
     protected $table = null;
     protected $startQuery = null;
     protected $query = null;
@@ -17,8 +19,8 @@ class Query
     protected $parameter = null;
 
     /**
-    * @var array
-    */
+     * @var array
+     */
     protected $settings = array('namedParams' => true);
     protected $params = array();
     protected $paramKeys = array();
@@ -31,8 +33,8 @@ class Query
     );
 
     /**
-    * assembles the queries.
-    */
+     * assembles the queries.
+     */
     private function assembleQuery($array, $arg)
     {
         $array = array_filter((array)$array);
@@ -58,11 +60,11 @@ private function assembleQuery($array, $arg)
                         $query .= '' . $key . '' . $arg['operator'];
 
                         // optional key selection
-                        if($arg['type'] ==  'params') {
+                        if ($arg['type'] == 'params') {
                             $param = ':' . $key;
                             $this->params[$param] = $value;
 
-                        } elseif($arg['type'] == '?') {
+                        } elseif ($arg['type'] == '?') {
 
                             $this->params[] = $value;
                             $param = '?';
@@ -70,8 +72,7 @@ private function assembleQuery($array, $arg)
 
                         if ($arg['operator'] == ' LIKE ') {
                             $query .= "CONCAT('%', " . $param . ", '%')";
-                        }
-                        else $query .= $param;
+                        } else $query .= $param;
 
                         // new line
                         $query .= "\n";
@@ -113,11 +114,11 @@ private function setWhere($whereValue, $arg)
     {
         $arg = array_merge($this->arguments, $arg);
         if ($this->where === true) {
-            $this->query .= ' ' . $arg['split'] . ' ' . (string) $whereValue;
+            $this->query .= ' ' . $arg['split'] . ' ' . (string)$whereValue;
             return;
         }
         $this->where = true;
-        $this->query .= ' WHERE ' . (string) $whereValue;
+        $this->query .= ' WHERE ' . (string)$whereValue;
     }
 
     public function where(array $where, $arg = array())
@@ -132,7 +133,7 @@ public function where(array $where, $arg = array())
 
     static public function table($table, $nick = null)
     {
-        if ((string) $table) {
+        if ((string)$table) {
             $instance = new Query();
             $instance->table = $table;
             $instance->startQuery('SELECT * FROM ' . $table);
@@ -174,9 +175,9 @@ public function delete(array $where, $arg = array())
 
     public function insert($fields = array(), $arg = array())
     {
-        $this->assembleQuery((array) $fields, $arg = array_merge($this->arguments, $arg));
+        $this->assembleQuery((array)$fields, $arg = array_merge($this->arguments, $arg));
 
-        $placeholder = ($this->settings['namedParams'] ===  false) ? array_fill(0, count($this->paramKeys), '?') : array_keys($this->params);
+        $placeholder = ($this->settings['namedParams'] === false) ? array_fill(0, count($this->paramKeys), '?') : array_keys($this->params);
 
         $this->startQuery('INSERT INTO ' . $this->table .
             $this->sqlImplode($this->paramKeys, '`', '`') . 'VALUES' .
@@ -187,7 +188,9 @@ public function insert($fields = array(), $arg = array())
 
     public function sqlImplode(array $arr, $in = '', $out = '', $segment = ', ')
     {
-        array_walk($arr, function(&$x) use ($in, $out){ $x = $in . $x . $out; });
+        array_walk($arr, function (&$x) use ($in, $out) {
+            $x = $in . $x . $out;
+        });
         return ' (' . implode($segment, $arr) . ') ';
     }
 
@@ -201,7 +204,7 @@ public function update($fields = array(), $arg = array())
     public function build()
     {
         return array(
-            'query' => $this->startQuery . $this->query . $this->endQuery,
+            'Framework\Infrastructure\Query' => $this->startQuery . $this->query . $this->endQuery,
             'params' => $this->params
         );
     }
@@ -217,7 +220,7 @@ public function save($fields = array(), $id = 'id')
     {
         $query = $this->assembleQuery($fields, $arg = array_merge($this->arguments, array('type' => 'noParams')));
         $this->startQuery('INSERT INTO ' . $this->table . ' ' . $query);
-        if(in_array($id, array_flip($fields))) unset($fields[$id]); else exit('query::save no id in fields');
+        if (in_array($id, array_flip($fields))) unset($fields[$id]); else exit('query::save no id in fields');
 
         $q = "\n";
         foreach ($fields as $key => $value) {
diff --git a/src/Romano/Application.php b/src/Romano/Application.php
deleted file mode 100644
index 5094246..0000000
--- a/src/Romano/Application.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-class Application
-{
-    private $request;
-    private $config;
-    private $currentLanguage = '';
-
-    public function setRootConfiguration($root, $configurationFile)
-    {
-        $this->config = new Config(require $configurationFile);
-        $this->config->setParameter('root', $root.'/');
-    }
-
-    private function getModules($app, $modules)
-    {
-        $app = $app . 'modules/';
-        foreach ($modules as $module) {
-            $tmp[] = $app.$module."/Controllers/";
-            $tmp[] = $app.$module."/Models/";
-        }
-
-        return $tmp;
-    }
-
-    public function buildProject()
-    {
-        $config = $this->config->getConf();
-        $path['root'] = $config['root'];
-        $path['app'] = $config['root'].'app/'.$config['app_env'].'/';
-        $path['src'] = $config['root'].'src/Romano/';
-        $path['app_config'] = $path['app'].'Config/';
-        $path['lang'] = $path['app_config'].'Language/';
-        $path['url'] = $path['app_config'].'Url/';
-        $path['resource'] = $path['app'].'Resources/';
-        $path['cache'] = $path['app'].'Cache/';
-        $path['controller'] = $path['app'].'Controllers/';
-        $path['model'] = $path['app'].'Models/';
-
-        $path['autoload'] =  array_merge(
-            array($path['controller'], $path['model'], $path['src']),
-            $this->getModules($config['root'], $config['modules'])
-        );
-
-        if (isset($config['head']['site'])) {
-            $path['root_url'] = $config['head']['site'];
-            $path['view'] = $path['app'].'Views/'.$config['view'].'/';
-            $path['view_cache'] = $path['cache'].$config['view'].'_view/';
-        }
-
-        Container::set('path', $path);
-    }
-
-    private function buildURL($urlList)
-    {
-        $app = '/';
-        $app .= ($this->defApp !== 'default') ? $this->defApp.'/' : '';
-        $app .= ($this->currentLanguage) ? $this->currentLanguage.'/' : '';
-
-        foreach ($urlList as $key => $route) {
-            if (isset($route['params'])) {
-                preg_match_all('~{(.*?)}~', $key, $output);
-                $glu = implode('_', $output[1]);
-                $tmp[$route['resource']]['dynamic'][$glu] = $app.$key;
-                continue;
-            }
-
-            $tmp[$route['resource']]['static'][] = $app.$key;
-        }
-
-        Container::set('url', $tmp);
-    }
-
-    public function buildEnvironmentFromRequest(Request $request)
-    {
-        $this->request = $request;
-        $app = $this->config->getParameter('app');
-        $defHost = $this->config->getParameter('default_host');
-        $this->defApp = $this->config->getParameter('default_app');
-
-        // look into the hostname
-        if (in_array($this->request->get('HTTP_HOST'), array_keys($app))) {
-            $defHost = $this->request->getHostSection(0);
-        }
-
-        // look into the url
-        if (in_array($this->request->getURLSection(0), $app[$defHost])) {
-            $this->defApp = $this->request->getURLSection(0);
-            $this->request->removeURLsection(0);
-        }
-
-        $appEnv = $defHost.'/'.$this->defApp;
-        $this->config->setConfiguration(require 'app/'.$appEnv.'/Config/Settings.php');
-
-        // we push the default view
-        if (!$this->request->get('VIEW')) {
-            $this->request->set('VIEW', $this->config->getParameter('view'));
-        }
-
-        $this->config->setParameter('app_env', $appEnv);
-        $this->config->setParameter('app_domain', $this->request->get('HTTP_HOST'));
-
-        $this->buildProject();
-
-        if ($this->config->getParameter('multi_language') === true) {
-            $this->setMultiLanguage();
-        }
-        $this->setLanguage();
-    }
-
-    public function setMultiLanguage()
-    {
-        $languages = $this->config->getParameter('site_languages');
-        $section = $this->request->getURLSection(0);
-        if ($this->hasLanguage($section, $languages)) {
-            $this->request->set('LANGUAGE', $languages[$section]);
-            $this->request->removeURLSection(0);
-            $this->currentLanguage = $section;
-            return;
-        }
-        // multi language
-        // Output::page(404);exit;
-    }
-
-    public function getLanguage()
-    {
-        if (!$this->request->get('LANGUAGE')) {
-            $languages = $this->config->getParameter('site_languages');
-            $default = $this->config->getParameter('default_language');
-            $this->request->set('LANGUAGE', $languages[$default]);
-        }
-        return $this->request->get('LANGUAGE');
-    }
-
-    public function setLanguage()
-    {
-        Container::setParam(array('path', 'url', path('url') . $this->getLanguage() . '.php'));
-        Container::setParam(array('path', 'lang', path('lang') . $this->getLanguage() . '.php'));
-        Container::setParam(array('path', 'routes', path('url')));
-
-        // setup locale language
-        Lang::set(require path('lang'));
-    }
-
-    public function hasLanguage($language, $languages)
-    {
-        return (in_array($language, array_keys($languages)));
-    }
-
-    public function getRoutes()
-    {
-        $routes = require path('routes');
-        $this->buildURL($routes['routes']);
-        return $routes['routes'];
-    }
-}
diff --git a/src/Romano/Arrays.php b/src/Romano/Arrays.php
deleted file mode 100755
index 178c3ff..0000000
--- a/src/Romano/Arrays.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-
-
-class Arrays
-{
-    private static $array;
-
-    private static $foreignChars =  array(
-        'from' => array ('ç','æ','œ','á','é','í','ó','ú','à','è','ì','ò','ù','ä','ë','ï','ö','ü','ÿ','â','ê','î','ô','û','å','e','i','ø','u'),
-        'to' => array ('c','ae','oe','a','e','i','o','u','a','e','i','o','u','a','e','i','o','u','y','a','e','i','o','u','a','e','i','o','u')
-    );
-
-    private static function getChars()
-    {
-        return array(
-            'specials' => array ("'",'’'),
-            'markUp' => array ('(',')','[',']','"','«','»',':','.','?','!',',',';','{','}','`'),
-            'html' => array ('<','>','/'),
-            'extras' => array ('~','@','$','%','^','&','|','+','='),
-            'markDown' => array ('#','-','*'),
-            'alfabet' => range('a', 'z'),
-            'alfabetCap' => range('A', 'Z'),
-            'numbers' => range(0, 9)
-        );
-    }
-
-    /**
-     * return a glued array from arrays with a mutual key
-    */
-    static public function mergeOnKey($key, $array1, $array2)
-    {
-        $r = array();
-        // foreach(array_slice(func_get_args(), 1) as &$a) {
-        //     if(array_key_exists($key, $a)) {
-        //         $r[] = $a[$key];
-        //         continue;
-        //     }
-        // }
-        return $r;
-    }
-
-    public static function indexBy($newIndex, array $files)
-    {
-        if (!isset($files[0][$newIndex])) {
-            return [];
-        }
-        foreach ($files as $value) {
-            $tmp[$value[$newIndex]] = $value;
-        }
-        return $tmp;
-    }
-
-    /**
-     * returns an cleaned array on provided keys
-     */
-    static function returnOnKeys($rr, $keys) {
-        // arraflip rotates the array key => val to val => key
-        return array_intersect_key($rr, array_flip($keys));
-    }
-
-    /**
-     * returns an array with replaced values
-     */
-    public static function replaceValue($haystack, $needle, $replaceValue)
-    {
-        foreach (in_array($needle, $haystack) as $key) {
-            $haystack[$key] = $replaceValue;
-        }
-        return $haystack;
-    }
-
-    private function checkLastKey($rr, $key)
-    {
-        return ($key === self::getLastKey($rr));
-    }
-
-    public static function getLastKey($rr)
-    {
-        end($rr);
-        return key($rr);
-    }
-
-    public static function getLastValue($rr)
-    {
-        return $rr[self::getLastKey($rr)];
-    }
-}
diff --git a/src/Romano/Config.php b/src/Romano/Config.php
deleted file mode 100644
index 597dd4b..0000000
--- a/src/Romano/Config.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-class Config extends Container
-{
-    public function __construct($configurationFile)
-    {
-        $this->setConfiguration($configurationFile);
-    }
-
-    public function setConfiguration($configurationFile)
-    {
-        self::set('config', $configurationFile);
-    }
-
-    public function getConf()
-    {
-        return self::getAll('config');
-    }
-
-    public function setParameter($key, $value)
-    {
-        self::setParam(array('config', $key, $value));
-    }
-
-    public function getParameter($param)
-    {
-        return self::get(array('config', (string) $param));
-    }
-}
diff --git a/src/Romano/Cookie.php b/src/Romano/Cookie.php
deleted file mode 100755
index c58a9a0..0000000
--- a/src/Romano/Cookie.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-
-
-class Cookie
-{
-    static function set($name, $data, $expiry)
-    {
-        return setcookie($name, json_encode($data), $expiry);
-    }
-
-    static function get($name)
-    {
-        if (self::exists($name)) return (array) json_decode($_COOKIE[$name]);
-    }
-
-    static function exists($name)
-    {
-        return isset($_COOKIE[$name]);
-    }
-
-    static function delete($name)
-    {
-        self::set($name, '', time() - 1);
-        unset($_COOKIE[$name]);
-    }
-}
diff --git a/src/Romano/Input.php b/src/Romano/Input.php
deleted file mode 100644
index 93f1b8e..0000000
--- a/src/Romano/Input.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-
-
-class Input
-{
-    private static $submit = array();
-
-    public static function isSubmitted($input = '')
-    {
-        if (!self::$submit) {
-            self::$submit = $_REQUEST;
-        }
-        return (($input && isset(self::$submit[$input])) || self::$submit);
-    }
-
-    public static function get($input = '')
-    {
-        return (isset(self::$submit[$input])) ? self::$submit[$input] : '';
-    }
-
-    public static function getAll()
-    {
-        return self::$submit;
-    }
-}
diff --git a/src/Romano/Request.php b/src/Romano/Request.php
deleted file mode 100644
index 176c63e..0000000
--- a/src/Romano/Request.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-
-
-class Request
-{
-    private $req = array();
-
-    public function __construct(array $server, array $resquest)
-    {
-        $this->req = array_merge($server, $resquest);
-        $this->req['URI'] = trim(str_replace('?'.$server['QUERY_STRING'], '', $server['REQUEST_URI']), '/');
-        $this->req['SECTIONS'] = explode('/', $this->req['URI']);
-        $this->req['HOST_SECTIONS'] = explode('.', $this->req['HTTP_HOST']);
-        $this->req['LANGUAGE'] = '';
-        $this->req['VIEW'] = '';
-        $parts = pathinfo($this->req['URI']);
-        if (isset($parts['extension'])) {
-            $this->req['URI'] = str_replace('.'.$parts['extension'], '', $this->req['URI']);
-            $this->req['VIEW'] = $parts['extension'];
-            $this->req['SECTIONS'] = explode('/', $this->req['URI']);
-        }
-
-        parse_str($server['QUERY_STRING'], $this->req['PARAMS']);
-    }
-
-    public function get($name)
-    {
-        return $this->req[(string) $name];
-    }
-
-    public function set($name, $value)
-    {
-        return $this->req[(string) $name] = $value;
-    }
-    public function getURLSection($section)
-    {
-        return (!is_integer($section))?: $this->req['SECTIONS'][$section];
-    }
-
-    public function getHostSection($section)
-    {
-        return (!is_integer($section))?: $this->req['HOST_SECTION'][$section];
-    }
-
-    public function count($name)
-    {
-        return count($this->get($name));
-    }
-
-    public function removeURLSection($section)
-    {
-        unset($this->req['SECTIONS'][$section]);
-        $this->req['SECTIONS'] = array_values($this->req['SECTIONS']);
-        $this->req['URI'] = implode('/', $this->req['SECTIONS']);
-    }
-
-    public function isMethod($method)
-    {
-        return (strtoupper($method) === $this->get('REQUEST_METHOD'));
-    }
-
-    public function isSubmitted($name = 'submit')
-    {
-        if ($this->count('REQUEST_METHOD') > 0) {
-            return isset($this->req['REQUEST_METHOD'][$name]);
-        }
-    }
-}
diff --git a/src/Romano/Resource.php b/src/Romano/Resource.php
deleted file mode 100644
index 8b9d3c3..0000000
--- a/src/Romano/Resource.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-class Resource
-{
-    private $storePath = '';
-    private $scope = array();
-    private $render;
-    private $blocks;
-    private $caviar = array();
-    private $baseFile = 'default.twig';
-    private $name;
-    private $lock = false;
-    private $options = array(
-        'twig' => array(
-            'extends' => '{% extends "$1" %}',
-            'block' => "{% block $1 %}\n$2{% endblock %}",
-            'include' => '{% include "$1" %}',
-            'comment' => "{# $1 #}\n\n",
-        )
-    );
-
-    public function __construct($pathView, $engine)
-    {
-        if (!isset($this->options[$engine])) {
-            leave('select a proper render engine like twig');
-        }
-        $this->isDev = (DEV_ENV !== true);
-        $this->storePath = $pathView;
-        $this->options = $this->options[$engine];
-        $comment = "Generated file from Resource";
-        $comment .= ' :: '.date('F Y');
-        $this->render = str_replace('$1', $comment, $this->options['comment']);
-    }
-
-    public function block($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    public function setBaseFile($baseFile)
-    {
-        $this->baseFile = $baseFile;
-        return $this;
-    }
-
-    public function scope($controller)
-    {
-        if (isset($this->scope[$controller])) {
-            return $this->scope[$controller];
-        }
-
-        list($ctrl, $method) = explode('@', $controller);
-        if (is_callable($class = ucfirst($ctrl), $method)) {
-            $class = new $class();
-            $this->index[$ctrl] = $class;
-            $this->scope[$controller] = (array) $class->$method();
-            $this->caviar = array_merge($this->caviar, $this->scope[$controller]);
-            return $this;
-        }
-        leave('undefined scope '.$controller.' passed');
-    }
-
-    public function addToScope($name, $scope)
-    {
-        $this->caviar = array_merge($this->caviar, array($name => $scope));
-    }
-
-    public function html($path)
-    {
-        $blockPart = new File(path('view').$path.'.twig');
-        $this->blocks[$this->name][] = $blockPart;
-        return $this;
-    }
-
-    public function store($path)
-    {
-        $this->storePath = $path;
-    }
-
-    public function render()
-    {
-        $baseCacheFile = new File(path('view_cache'). $this->storePath);
-        if ($this->isDev && $baseCacheFile->exists()) {
-            return $this->storePath;
-        }
-
-        if (!$this->blocks) {
-            leave('no html blocks defined');
-        }
-
-        $this->render .= str_replace('$1', $this->baseFile, $this->options['extends']);
-
-        if ($this->lock === true) {
-            $this->render .= str_replace('$1', 'locked', $this->options['comment']);
-        }
-
-        foreach ($this->blocks as $key => $block) {
-            $tmp = '';
-            foreach ($block as $blockPart) {
-                if (!$blockPart->exists()) {
-                    leave($blockPart->filename.' is not a real block');
-                }
-                $tmp .= $blockPart->getContent();
-            }
-            $this->render .= str_replace(
-                ['$1', '$2'],
-                [$key, $tmp],
-                $this->options['block']
-            ) . "\n";
-        }
-
-        if (!$baseCacheFile->exists()) {
-            if (!is_dir($baseCacheFile->getDirectory())) {
-                mkdir($baseCacheFile->getDirectory());
-            }
-            $baseCacheFile->setContent($this->render)->save();
-        } elseif ($baseCacheFile->getHash() !== crc32b($this->render)) {
-            $baseCacheFile->setContent($this->render)->save();
-        }
-
-        return $this->storePath;
-    }
-
-    public function getScope()
-    {
-        return $this->caviar;
-    }
-
-    public function lock()
-    {
-        $this->lock = true;
-    }
-}
diff --git a/src/Romano/Route.php b/src/Romano/Route.php
deleted file mode 100644
index 4e6bc53..0000000
--- a/src/Romano/Route.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-
-class Route
-{
-    private $request;
-    private $r = array();
-
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-        $this->r['parameter'] = array();
-        $this->r['path_view'] = '';
-    }
-
-    private function findRoute(array $routes)
-    {
-        // home
-        if ($this->request->get('URI') == '' && isset($routes[''])) {
-             return $routes[''];
-        }
-        unset($routes['']);
-
-        // reduce the list based on the first section
-        $foundRoutes = (array) preg_grep("/{$this->request->getURLSection(0)}/i", array_keys($routes));
-
-        foreach ($foundRoutes as $route) {
-            if (count($param = explode('/', $route)) === $this->request->count('SECTIONS')) {
-
-                // string manipulation
-                preg_match_all("/\{(.*?)\}/i", $route, $matches);
-
-                $value = str_replace($matches[0], '(.*)', $route);
-
-                // now we know we have the count and the first part is ok
-                if (preg_match('/' . str_replace('/', '\/', $value) . '$/', $this->request->get('URI'))) {
-                    $resource = $routes[$route];
-                    if ($matches[0]) $this->r['parameter'] = (array) $this->params($matches, $param);
-                    $this->r['parameter'] = array_merge($this->request->get('PARAMS'), $this->r['parameter']);
-                    return $resource;
-                }
-            }
-        }
-        return array();
-    }
-
-    private function params($matches, $param)
-    {
-        foreach ($matches[0] as $key => $match) {
-            $par[$matches[1][$key]] = urlencode($this->request->getURLSection(array_search($match, $param)));
-        }
-        return $par;
-    }
-
-    public function search(array $routes)
-    {
-        $route = $this->findRoute($routes);
-        if (!isset($route['resource'])) {
-            return false;
-        }
-        list($route['controller'], $route['method']) = explode('@', $route['resource']);
-
-        $route['template'] = (isset($route['template'])) ?: $route['controller'].'_'.$route['method'];
-        $route['path_view'] = $route['template'].'.twig';
-        $route['url'] = $this->request->get('URI');
-        $route['path_resource'] = $route['template'].'.php';
-        $this->r = array_merge($this->r, $route);
-
-        Container::set('route', $this->r);
-        return true;
-    }
-
-    public function getTemplate()
-    {
-        if (is_file(path('view_cache').$this->r['path_view']) || is_file(path('view').$this->r['path_view'])) {
-            return array(
-                'path' => $this->r['path_view'],
-                'data' => array()
-            );
-        }
-    }
-
-    public function getResource()
-    {
-        $resource = path('resource').$this->r['path_resource'];
-
-        if (is_file($resource)) {
-            $res = new Resource($this->r['path_view'], 'twig');
-            require $resource;
-            return array(
-                'path' => $res->render(),
-                'data' => (array) $res->getScope()
-            );
-        }
-    }
-}
diff --git a/src/Romano/Singleton.php b/src/Romano/Singleton.php
deleted file mode 100644
index 7edf13a..0000000
--- a/src/Romano/Singleton.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-
-
-abstract class Singleton
-{
-    private static $storage = array();
-
-    public static function getInstance($cls)
-    {
-        if(!isset(static::$storage[$cls])) static::$storage[$cls] = new $cls();
-        return static::$storage[$cls];
-    }
-
-    private function  __construct(){}
-    private function __clone(){}
-}
diff --git a/src/Romano/Token.php b/src/Romano/Token.php
deleted file mode 100755
index 5bad510..0000000
--- a/src/Romano/Token.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
-* moved to Crypt
-*/
-
-
-
-class Token
-{
-	public static function generate()
-	{
-		return Session::set(Config::$array['session']['token'], md5(uniqid()));
-	}
-	public static function check($token)
-	{
-		$token_name = Config::$array['session']['token'];
-
-		if (Session::get($token_name) && $token === Session::get($token_name)) {
-			Session::delete($token_name);
-			return true;
-		}
-		return false;
-	}
-}
diff --git a/tests/spec/Framework/ClassNameReferenceSpec.php b/tests/spec/Framework/ClassNameReferenceSpec.php
new file mode 100644
index 0000000..6e7d1c2
--- /dev/null
+++ b/tests/spec/Framework/ClassNameReferenceSpec.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace spec\Romano\Framework;
+
+use PhpSpec\ObjectBehavior;
+
+class ClassNameReferenceSpec extends ObjectBehavior
+{
+    public function let()
+    {
+        $this->beConstructedWith(new TestObject);
+    }
+
+    public function it_should_return_tooString(): void
+    {
+        $this->__toString()->shouldReturn(TestObject::class);
+    }
+
+    public function it_should_return_GetShortName(): void
+    {
+        $this->getShortName()->shouldReturn('TestObject');
+    }
+
+    public function it_should_compare_to_string()
+    {
+        $this->is(TestObject::class)->shouldBe(true);
+    }
+
+    public function it_should_compare_to_className(): void
+    {
+        $this->getClassName()->shouldBe(TestObject::class);
+    }
+
+    public function it_should_compare_to_equals(): void
+    {
+        $this->equals(new TestObject())->shouldBe(true);
+    }
+}
+
+
+class TestObject{}
\ No newline at end of file
diff --git a/tests/spec/Framework/ConfigurationManagerSpec.php b/tests/spec/Framework/ConfigurationManagerSpec.php
new file mode 100644
index 0000000..5c77ff5
--- /dev/null
+++ b/tests/spec/Framework/ConfigurationManagerSpec.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace spec\Romano\Framework;
+
+use Romano\Framework\ConfigurationManager;
+use PhpSpec\ObjectBehavior;
+use Romano\Component\Common\ContainerInterface;
+
+class ConfigurationManagerSpec extends ObjectBehavior
+{
+    public function let(ContainerInterface $container)
+    {
+        $this->beConstructedWith($container);
+    }
+
+    public function it_should_SetConfiguration(ContainerInterface $container)
+    {
+        $this->setConfiguration($parameters = ['test']);
+
+        $container->addAll($parameters)->shouldBeCalled();
+    }
+
+    public function it_should_SetParameter(ContainerInterface $container)
+    {
+        $this->setParameter($key = 'key', $value = 'value');
+
+        $container->add($key, $value)->shouldBeCalled();
+    }
+
+    public function it_should_GetParameter(ContainerInterface $container)
+    {
+        $this->getParameter($key = 'key');
+
+        $container->get($key)->shouldBeCalled();
+    }
+
+    public function testGetAll(ContainerInterface $container)
+    {
+        $this->getAll();
+
+        $container->getAll()->shouldBeCalled();
+    }
+}
diff --git a/tests/spec/Framework/File/FileHashSpec.php b/tests/spec/Framework/File/FileHashSpec.php
new file mode 100644
index 0000000..2940aeb
--- /dev/null
+++ b/tests/spec/Framework/File/FileHashSpec.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace spec\Romano\Framework\File;
+
+use Romano\Framework\File\FileHash;
+use PhpSpec\ObjectBehavior;
+
+class FileHashSpec extends ObjectBehavior
+{
+    public function let()
+    {
+        $this->beConstructedThrough('generate', [
+            $content = 'content'
+        ]);
+    }
+
+    public function it_should_generate_a_hash()
+    {
+        $this->beConstructedThrough('generate', [
+            $content = 'content'
+        ]);
+
+        $this->getHash()->shouldBe($this->getHash());
+    }
+
+    public function it_should_compare_tooString()
+    {
+        $this->is($this->getHash())->shouldBe(true);
+    }
+
+    public function it_should_compare_as_equal()
+    {
+        $this->equal(FileHash::generate('content'))->shouldBe(true);
+    }
+
+    public function it_should_compare_as_is()
+    {
+        $this->is($this->getHash())->shouldBe(true);
+    }
+
+    public function it_should_IsGeneratedFrom()
+    {
+        $this->isGeneratedFrom('content')->shouldBe(true);
+    }
+}
diff --git a/tests/unit/Framework/ApplicationTest.php b/tests/unit/Framework/ApplicationTest.php
new file mode 100644
index 0000000..778d748
--- /dev/null
+++ b/tests/unit/Framework/ApplicationTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ *  This file is property of
+ *
+ *  (c) Thijs De Paepe <thijs.dp@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Tests\Romano\Framework\Utils;
+
+use PHPUnit\Framework\TestCase;
+use Romano\Framework\Application;
+use Romano\Component\Common\Matroska;
+
+class ApplicationTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function it_should_build_the_path_array(): void
+    {
+        $data = [
+            'app_name' => 'blog',
+        ];
+
+        $result = new Application(\dirname(__DIR__, 3), $data);
+
+        $result->buildProject();
+
+        $expected = [
+            'root' => '/home/thijzer/Sync/Projects/Romano/',
+            'app' => 'app/blog/',
+            'src'=> 'src/',
+            'app_config' => 'app/blog/config/',
+            'Romano\Component\Common\Locale\Lang' => 'app/blog/config/Language/',
+            'url' => 'app/blog/config/Url/',
+            'resource' => 'src/Resources/',
+            'cache' => 'src/Cache/',
+            'controller' => 'src/Controllers/',
+            'model' => 'src/Models/',
+        ];
+
+        $this->assertSame($expected, $result->getConfig()->getParameter('path'));
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/Framework/MatroskaTest.php b/tests/unit/Framework/MatroskaTest.php
new file mode 100644
index 0000000..2b8c019
--- /dev/null
+++ b/tests/unit/Framework/MatroskaTest.php
@@ -0,0 +1,179 @@
+<?php
+
+/**
+ *  This file is property of
+ *
+ *  (c) Thijs De Paepe <thijs.dp@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Tests\Romano\Framework\Utils;
+
+use PHPUnit\Framework\TestCase;
+use Romano\Component\Common\Matroska;
+
+class MatroskaTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function it_should_unflatten_an_array()
+    {
+        $data = [
+            'customer' => [
+                'name' => 'mark',
+                'address' => [
+                    'street' => 'Wall-street',
+                    'city' => 'New York',
+                ],
+            ],
+            'b' => 'alpha',
+            'c' => 'omega',
+        ];
+        $expected = [
+            'customer.name' => 'mark',
+            'customer.address.street' => 'Wall-street',
+            'customer.address.city' => 'New York',
+            'b' => 'alpha',
+            'c' => 'omega',
+        ];
+
+        $result = new Matroska($expected);
+
+        $this->assertSame($result->getAll(), $data);
+    }
+
+    /**
+     * @test
+     */
+    public function it_should_get_the_correct_value()
+    {
+        $expected = [
+            'customer.name' => 'mark',
+            'customer.address.street' => 'Wall-street',
+            'customer.address.city' => 'New York',
+            'b' => 'alpha',
+            'c' => 'omega',
+        ];
+
+        $result = new Matroska($expected);
+
+        $customer = [
+            'name' => 'mark',
+            'address' => [
+                'street' => 'Wall-street',
+                'city' => 'New York',
+            ]
+        ];
+
+        $this->assertSame($result->get('customer', 'name'), 'mark');
+        $this->assertSame($result->get('customer.name'), 'mark');
+        $this->assertSame($result->get('customer'), $customer);
+
+        $this->assertNull($result->get('customer.names'));
+
+        $result->add('customer.name', 'john');
+        $this->assertSame($result->get('customer.name'), 'john');
+    }
+
+    /**
+     * @test
+     */
+    public function it_should_remove_a_value()
+    {
+        $expected = [
+            'customer.name' => 'mark',
+            'customer.address.street' => 'Wall-street',
+            'customer.address.city' => 'New York',
+            'b' => 'alpha',
+            'c' => 'omega',
+        ];
+
+        $result = new Matroska($expected);
+
+        $result->remove('customer.name');
+
+        $this->assertNull($result->get('customer.name'));
+
+        $this->assertSame([
+            'name' => null,
+            'address' => [
+                'street' => 'Wall-street',
+                'city' => 'New York',
+            ]
+        ], $result->get('customer'));
+
+        $result->remove('customer');
+
+        $this->assertSame([
+            'customer' => null,
+            'b' => 'alpha',
+            'c' => 'omega',
+        ], $result->getAll());
+    }
+
+    /**
+     * @test
+     */
+    public function it_should_check_values()
+    {
+        $expected = [
+            'customer.name' => 'mark',
+            'customer.address.street' => 'Wall-street',
+            'customer.address.city' => 'New York',
+            'b' => 'alpha',
+            'c' => 'omega',
+        ];
+
+        $result = new Matroska($expected);
+
+        $this->assertTrue($result->has('customer.name'));
+
+        $this->assertTrue($result->has('customer'));
+
+        $this->assertTrue($result->has('customer.address.city'));
+
+        $this->assertFalse($result->has('customer.address.city.number'));
+    }
+
+    /**
+     * @test
+     */
+    public function it_should_start_from_a_multidimensional_array()
+    {
+        $data = [
+            'customer' => [
+                'name' => 'mark',
+                'address' => [
+                    'street' => 'Wall-street',
+                    'city' => 'New York',
+                ],
+            ]
+        ];
+
+        $result = new Matroska($data);
+
+        $result->addAll([
+            'a' => ['b' => 'alpha'],
+            'c' => 'omega',
+        ]);
+
+        $result->add('customer.name', 'john');
+
+        $data = [
+            'customer' => [
+                'name' => 'john',
+                'address' => [
+                    'street' => 'Wall-street',
+                    'city' => 'New York',
+                ],
+            ],
+            'a' => ['b' => 'alpha'],
+            'c' => 'omega',
+        ];
+
+        $this->assertSame($result->getAll(), $data);
+    }
+}
\ No newline at end of file
diff --git a/web/admin b/web/admin
deleted file mode 120000
index 73add73..0000000
--- a/web/admin
+++ /dev/null
@@ -1 +0,0 @@
-../app/www/admin/Assets/
\ No newline at end of file
diff --git a/web/default b/web/default
deleted file mode 120000
index ad1092e..0000000
--- a/web/default
+++ /dev/null
@@ -1 +0,0 @@
-../app/www/default/Assets/
\ No newline at end of file
diff --git a/dev.php b/web/dev.php
similarity index 100%
rename from dev.php
rename to web/dev.php
diff --git a/web/index.php b/web/index.php
index f9d8eb1..17330c9 100644
--- a/web/index.php
+++ b/web/index.php
@@ -1,30 +1,30 @@
 <?php
 
-require '../bootstrap.php';
+require __DIR__.'/../vendor/autoload.php';
+require __DIR__.'/../app/config.php';
 
-// start Request
-$request = new Request($_SERVER, $_REQUEST);
+use \Romano\Framework\HTTP\Request;
+use \Romano\Framework\Application;
 
-// start Application Environment
-$application = new Application();
-$application->setRootConfiguration(dirname(__DIR__), 'settings/globals.php');
+$request = new Request();
+$application = new Application(dirname(__DIR__), $configuration);
 $application->buildEnvironmentFromRequest($request);
+$router = $application->buildRouter();
 
-// start Routes
-$route = new Route($request);
-if (($route->search($application->getRoutes())) && ($result = $route->getResource())) {
+if ($route = $router->search($request)) {
     $view = $request->get('VIEW');
     //$track = Track::get()->fromClient();
-
-    // route view
-    if ($route->getTemplate() && $view === config('view')) {
-        view($result);
-    } elseif (config('kernel_debug') === true && $view === 'dev') {
-        stamp('View');
-        massdump($result);
-    }
-} else {
-    Output::page(404);
+    $response = $route->getResponse();
+
+//    // route view
+//    if ($route->getTemplate() && $view === config('view')) {
+//        view($result);
+//    } elseif (config('kernel_debug') === true && $view === 'dev') {
+//        stamp('View');
+//        massdump($result);
+//    }
+//} else {
+//    Output::page(404);
 }
 
 
diff --git a/web/timer b/web/timer
deleted file mode 120000
index 251c3de..0000000
--- a/web/timer
+++ /dev/null
@@ -1 +0,0 @@
-../app/www/timer/Assets/
\ No newline at end of file