diff --git a/AroMVC/Base/Controller.php b/AroMVC/Base/Controller.php
new file mode 100644
index 0000000..f6af385
--- /dev/null
+++ b/AroMVC/Base/Controller.php
@@ -0,0 +1,6 @@
+<?php
+namespace AroMVC\Base;
+
+class Controller {
+
+}
\ No newline at end of file
diff --git a/AroMVC/Model.php b/AroMVC/Base/Model.php
similarity index 71%
rename from AroMVC/Model.php
rename to AroMVC/Base/Model.php
index 48b9971..c288ae2 100644
--- a/AroMVC/Model.php
+++ b/AroMVC/Base/Model.php
@@ -1,6 +1,6 @@
 <?php
-namespace AroMVC\Core;
-use AroMVC\Core\Database as db;
+namespace AroMVC\Base;
+use AroMVC\Database\Database as db;
 
 abstract class Model {
     protected $rawData = [];
@@ -14,7 +14,7 @@ abstract class Model {
 
     public function __construct() {}
     public static function withId(int $id) {
-        $new = new static();
+        $new = new static;
         $new->initialize();
 
         return $new;
@@ -29,8 +29,8 @@ abstract class Model {
     }
 
     protected abstract function initialize();
-    protected function setTable(string $tableName) {
-        $this->table = $tableName;
+    protected static function getTable(): string {
+        return self::$table ?? get_class(new static);
     }
 
     protected function get(string $name) {
@@ -53,11 +53,15 @@ abstract class Model {
         $name = strtolower($name);
 
         if(array_key_exists($name, $this->associations))
-            $rawData[$this->associations[$name]] = $value;
+            $modified = $this->associations[$name];
         else if(array_key_exists($name, $this->rawData))
-            $rawData[$name] = $value;
+            $modified = $name;
         else
             throw new \Exception("Cannot set the value for property '$name'.");
+
+        $rawData[$modified] = $value;
+        if(!in_array($modified, $this->modified))
+            $this->modified[] = $modified;
     }
 
     protected function addHook(string $name, $func) {
@@ -69,14 +73,22 @@ abstract class Model {
     }
 
     public static function select(): Selectable {
-        return db::select("*", new static)->from(self::$table);
+        return db::select("*", new static)->from(self::getTable());
     }
 
     public function update() {
+        if(count($this->modified) == 0)
+            return;
 
+        var $query = db::update(self::getTable());
+        foreach($this->modified as $field)
+            // TODO set ... value
+
+        db::batchQuery($query);
+        $this->modified = [];
     }
 
-    public function delete() {
+    public function delete(): void {
 
     }
 }
\ No newline at end of file
diff --git a/AroMVC/ConfigSection.php b/AroMVC/Configuration/ConfigSection.php
similarity index 95%
rename from AroMVC/ConfigSection.php
rename to AroMVC/Configuration/ConfigSection.php
index 13af851..a53f473 100644
--- a/AroMVC/ConfigSection.php
+++ b/AroMVC/Configuration/ConfigSection.php
@@ -1,5 +1,5 @@
 <?php
-namespace AroMVC\Core;
+namespace AroMVC\Configuration;
 
 class ConfigSection {
     protected $name = null;
diff --git a/AroMVC/Configuration.php b/AroMVC/Configuration/Configuration.php
similarity index 95%
rename from AroMVC/Configuration.php
rename to AroMVC/Configuration/Configuration.php
index 956e3f6..12f093c 100644
--- a/AroMVC/Configuration.php
+++ b/AroMVC/Configuration/Configuration.php
@@ -1,5 +1,5 @@
 <?php
-namespace AroMVC\Core;
+namespace AroMVC\Configuration;
 
 define("AMVC_CNF_DB", "Database");
 define("AMVC_CNF_DB_DSN", "dsn");
diff --git a/AroMVC/Database.php b/AroMVC/Database/Database.php
similarity index 97%
rename from AroMVC/Database.php
rename to AroMVC/Database/Database.php
index 2bde838..a37b5f6 100644
--- a/AroMVC/Database.php
+++ b/AroMVC/Database/Database.php
@@ -1,6 +1,6 @@
 <?php
-namespace AroMVC\Core;
-use AroMVC\Core\Configuration as conf;
+namespace AroMVC\Database;
+use AroMVC\Configuration\Configuration as conf;
 
 define("AMVC_DB_FETCH_VOID",   0);
 define("AMVC_DB_FETCH_SCALAR",  1);
diff --git a/AroMVC/Deletable.php b/AroMVC/Database/Deletable.php
similarity index 61%
rename from AroMVC/Deletable.php
rename to AroMVC/Database/Deletable.php
index 4842b47..9b4d747 100644
--- a/AroMVC/Deletable.php
+++ b/AroMVC/Database/Deletable.php
@@ -1,5 +1,5 @@
 <?php
-namespace AroMVC\Core;
+namespace AroMVC\Database;
 
 class Deletable extends Queryable {
 
diff --git a/AroMVC/Insertable.php b/AroMVC/Database/Insertable.php
similarity index 61%
rename from AroMVC/Insertable.php
rename to AroMVC/Database/Insertable.php
index 20b3da2..1d78af1 100644
--- a/AroMVC/Insertable.php
+++ b/AroMVC/Database/Insertable.php
@@ -1,5 +1,5 @@
 <?php
-namespace AroMVC\Core;
+namespace AroMVC\Database;
 
 class Insertable extends Queryable {
 
diff --git a/AroMVC/Modifiable.php b/AroMVC/Database/Modifiable.php
similarity index 61%
rename from AroMVC/Modifiable.php
rename to AroMVC/Database/Modifiable.php
index d1702a9..8f57e49 100644
--- a/AroMVC/Modifiable.php
+++ b/AroMVC/Database/Modifiable.php
@@ -1,5 +1,5 @@
 <?php
-namespace AroMVC\Core;
+namespace AroMVC\Database;
 
 class Modifiable extends Queryable {
 
diff --git a/AroMVC/Queryable.php b/AroMVC/Database/Queryable.php
similarity index 98%
rename from AroMVC/Queryable.php
rename to AroMVC/Database/Queryable.php
index 5896741..6912343 100644
--- a/AroMVC/Queryable.php
+++ b/AroMVC/Database/Queryable.php
@@ -1,5 +1,5 @@
 <?php
-namespace AroMVC\Core;
+namespace AroMVC\Database;
 use AroMVC\Core\Database as db;
 
 abstract class Queryable {
diff --git a/AroMVC/Selectable.php b/AroMVC/Database/Selectable.php
similarity index 99%
rename from AroMVC/Selectable.php
rename to AroMVC/Database/Selectable.php
index 4244e48..3b94599 100644
--- a/AroMVC/Selectable.php
+++ b/AroMVC/Database/Selectable.php
@@ -1,5 +1,5 @@
 <?php
-namespace AroMVC\Core;
+namespace AroMVC\Database;
 
 define("AMVC_QRY_SEL_LCK_JOIN", 1);
 
diff --git a/AroMVC/IO/Directory.php b/AroMVC/IO/Directory.php
new file mode 100644
index 0000000..a1e97a7
--- /dev/null
+++ b/AroMVC/IO/Directory.php
@@ -0,0 +1,6 @@
+<?php
+namespace AroMVC\IO;
+
+class Directory {
+
+}
\ No newline at end of file
diff --git a/AroMVC/IO/File.php b/AroMVC/IO/File.php
new file mode 100644
index 0000000..596ccac
--- /dev/null
+++ b/AroMVC/IO/File.php
@@ -0,0 +1,6 @@
+<?php
+namespace AroMVC\IO;
+
+class File {
+
+}
\ No newline at end of file
diff --git a/AroMVC/Router.php b/AroMVC/Routing/Router.php
similarity index 50%
rename from AroMVC/Router.php
rename to AroMVC/Routing/Router.php
index 1c985bf..9f4ef15 100644
--- a/AroMVC/Router.php
+++ b/AroMVC/Routing/Router.php
@@ -1,5 +1,5 @@
 <?php
-namespace AroMVC\Core;
+namespace AroMVC\Routing;
 
 class Router { 
     
diff --git a/conf.ini b/conf.ini
index 22c2b7b..68606b8 100644
--- a/conf.ini
+++ b/conf.ini
@@ -1,3 +1,6 @@
+[Project]
+namespace   = "Fire"
+
 [Database]
 dsn         = "mysql:host=localhost;dbname=test"
 username    = "root"
diff --git a/index.php b/index.php
index cebad37..9e7a9d3 100644
--- a/index.php
+++ b/index.php
@@ -1,33 +1,36 @@
 <?php
 namespace AroMVC;
-use AroMVC\Core\Configuration;
-use AroMVC\Core\Database;
-use AroMVC\Core\Selectable;
+use AroMVC\Configuration\Configuration as conf;
+use AroMVC\Database\Database as db;
+use AroMVC\Database\Selectable;
 use AroMVC\Models\Company;
 
+conf::initialize(file_get_contents("conf.ini"));
+db::initialize();
+
 spl_autoload_register(function($class) {
+    $userns = Configuration::section("Project")->value("namespace");
+
     $class = str_replace("_", "\\", $class);
     $class = ltrim($class, '\\');
 
     $parts = explode("\\", $class);
     if($parts[0] == "AroMVC") {
-        if(count($parts) < 3)
+        if(count($parts) < 2)
             die("Autoloader failed: malformed class name $class");
 
         if($parts[1] == "Core")
             require_once "AroMVC". DIRECTORY_SEPARATOR . $parts[2] .".php";
-        else if(in_array($parts[1], ["Controllers", "Models", "ViewModels"]))
-            require_once $parts[1]. DIRECTORY_SEPARATOR. $parts[2] .".php";
         else
             die("Autoloader failed: malformed class name $class");
+    } else if($parts[0] == $userns) {
+        if(in_array($parts[1], ["Controllers", "Models", "ViewModels"]))
+            require_once $parts[1]. DIRECTORY_SEPARATOR. $parts[2] .".php";
     }
 });
 
 // TODO write error handler
 
-Configuration::initialize(file_get_contents("conf.ini"));
-Database::initialize();
-
 $tmp = new Selectable("*");
 
 $tmp->from("Companies")