diff --git a/.gitignore b/.gitignore
index 4d3b6a20e..713406857 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,14 +7,12 @@ composer.lock
 *.cache
 cs-fixer.phar
 *.log
-src/app/storage
-app/storage
 /release/
 php-cs-fixer-v2.phar
-app/sto
-app/config/*
+App/sto
+App/Config/*
 .idea/*
-!/app/config/config-with-err-00.json
+!/App/Config/config-with-err-00.json
 *.Identifier
 tests/clover.xml
 /.vscode
diff --git a/app/apis/.gitkeep b/App/Apis/.gitkeep
similarity index 100%
rename from app/apis/.gitkeep
rename to App/Apis/.gitkeep
diff --git a/app/apis/RoutingTestClass.php b/App/Apis/RoutingTestClass.php
similarity index 95%
rename from app/apis/RoutingTestClass.php
rename to App/Apis/RoutingTestClass.php
index 1c55d9453..f605ba9ee 100644
--- a/app/apis/RoutingTestClass.php
+++ b/App/Apis/RoutingTestClass.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\apis;
+namespace App\Apis;
 
 use WebFiori\Http\Response;
 
diff --git a/app/apis/super/temp b/App/Apis/super/temp
similarity index 100%
rename from app/apis/super/temp
rename to App/Apis/super/temp
diff --git a/app/commands/.gitkeep b/App/Commands/.gitkeep
similarity index 100%
rename from app/commands/.gitkeep
rename to App/Commands/.gitkeep
diff --git a/app/config/config-with-err-00.json b/App/Config/config-with-err-00.json
similarity index 100%
rename from app/config/config-with-err-00.json
rename to App/Config/config-with-err-00.json
diff --git a/app/database/Test2Table.php b/App/Database/Test2Table.php
similarity index 95%
rename from app/database/Test2Table.php
rename to App/Database/Test2Table.php
index 64dd684e7..7fee0f764 100644
--- a/app/database/Test2Table.php
+++ b/App/Database/Test2Table.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database;
+namespace App\Database;
 
 use WebFiori\Database\MySql\MySQLTable;
 /**
diff --git a/app/database/TestTable.php b/App/Database/TestTable.php
similarity index 96%
rename from app/database/TestTable.php
rename to App/Database/TestTable.php
index 6442238ad..cc72a7bbd 100644
--- a/app/database/TestTable.php
+++ b/App/Database/TestTable.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database;
+namespace App\Database;
 
 use WebFiori\Database\MySql\MySQLTable;
 /**
diff --git a/app/database/empl/temp b/App/Database/empl/temp
similarity index 100%
rename from app/database/empl/temp
rename to App/Database/empl/temp
diff --git a/app/database/migrations/.gitkeep b/App/Database/migrations/.gitkeep
similarity index 100%
rename from app/database/migrations/.gitkeep
rename to App/Database/migrations/.gitkeep
diff --git a/app/database/migrations/commands/.gitkeep b/App/Database/migrations/commands/.gitkeep
similarity index 100%
rename from app/database/migrations/commands/.gitkeep
rename to App/Database/migrations/commands/.gitkeep
diff --git a/app/database/migrations/emptyRunner/XRunner.php b/App/Database/migrations/emptyRunner/XRunner.php
similarity index 76%
rename from app/database/migrations/emptyRunner/XRunner.php
rename to App/Database/migrations/emptyRunner/XRunner.php
index a9ba1e018..da684d498 100644
--- a/app/database/migrations/emptyRunner/XRunner.php
+++ b/App/Database/migrations/emptyRunner/XRunner.php
@@ -1,8 +1,8 @@
 <?php
-namespace app\database\migrations\emptyRunner;
+namespace App\Database\Migrations\EmptyRunner;
 
 use WebFiori\Database\Schema\SchemaRunner;
-use webfiori\framework\App;
+use WebFiori\Framework\App;
 
 class XRunner extends SchemaRunner {
     
diff --git a/app/database/migrations/multi/Migration000.php b/App/Database/migrations/multi/Migration000.php
similarity index 95%
rename from app/database/migrations/multi/Migration000.php
rename to App/Database/migrations/multi/Migration000.php
index b9a41915c..f3f9c4cb7 100644
--- a/app/database/migrations/multi/Migration000.php
+++ b/App/Database/migrations/multi/Migration000.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database\migrations\multi;
+namespace App\Database\Migrations\Multi;
 
 use WebFiori\Database\Database;
 use WebFiori\Database\Schema\AbstractMigration;
diff --git a/app/database/migrations/multi/Migration001.php b/App/Database/migrations/multi/Migration001.php
similarity index 95%
rename from app/database/migrations/multi/Migration001.php
rename to App/Database/migrations/multi/Migration001.php
index 5b92cecb3..12e3b8759 100644
--- a/app/database/migrations/multi/Migration001.php
+++ b/App/Database/migrations/multi/Migration001.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database\migrations\multi;
+namespace App\Database\Migrations\Multi;
 
 use WebFiori\Database\Database;
 use WebFiori\Database\Schema\AbstractMigration;
diff --git a/app/database/migrations/multi/Migration002.php b/App/Database/migrations/multi/Migration002.php
similarity index 95%
rename from app/database/migrations/multi/Migration002.php
rename to App/Database/migrations/multi/Migration002.php
index ca4e6d4e6..f8aa4de91 100644
--- a/app/database/migrations/multi/Migration002.php
+++ b/App/Database/migrations/multi/Migration002.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database\migrations\multi;
+namespace App\Database\Migrations\Multi;
 
 use WebFiori\Database\Database;
 use WebFiori\Database\Schema\AbstractMigration;
diff --git a/app/database/migrations/multi/MultiRunner.php b/App/Database/migrations/multi/MultiRunner.php
similarity index 93%
rename from app/database/migrations/multi/MultiRunner.php
rename to App/Database/migrations/multi/MultiRunner.php
index deb8aced2..f59e898aa 100644
--- a/app/database/migrations/multi/MultiRunner.php
+++ b/App/Database/migrations/multi/MultiRunner.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database\migrations\multi;
+namespace App\Database\Migrations\Multi;
 
 use PHPUnit\TextUI\XmlConfiguration\Migration;
 use WebFiori\Database\ConnectionInfo;
diff --git a/app/database/migrations/multiDownErr/Migration000.php b/App/Database/migrations/multiDownErr/Migration000.php
similarity index 94%
rename from app/database/migrations/multiDownErr/Migration000.php
rename to App/Database/migrations/multiDownErr/Migration000.php
index 8c38c7d6f..88d232e46 100644
--- a/app/database/migrations/multiDownErr/Migration000.php
+++ b/App/Database/migrations/multiDownErr/Migration000.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database\migrations\multiDownErr;
+namespace App\Database\Migrations\MultiDownErr;
 
 use WebFiori\Database\Database;
 use WebFiori\Database\migration\AbstractMigration;
diff --git a/app/database/migrations/multiDownErr/Migration001.php b/App/Database/migrations/multiDownErr/Migration001.php
similarity index 94%
rename from app/database/migrations/multiDownErr/Migration001.php
rename to App/Database/migrations/multiDownErr/Migration001.php
index 8cecde0c3..d0bacdc3f 100644
--- a/app/database/migrations/multiDownErr/Migration001.php
+++ b/App/Database/migrations/multiDownErr/Migration001.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database\migrations\multiDownErr;
+namespace App\Database\Migrations\MultiDownErr;
 
 use WebFiori\Database\Database;
 use WebFiori\Database\migration\AbstractMigration;
diff --git a/app/database/migrations/multiDownErr/Migration002.php b/App/Database/migrations/multiDownErr/Migration002.php
similarity index 95%
rename from app/database/migrations/multiDownErr/Migration002.php
rename to App/Database/migrations/multiDownErr/Migration002.php
index f30ca42e4..a507d52a5 100644
--- a/app/database/migrations/multiDownErr/Migration002.php
+++ b/App/Database/migrations/multiDownErr/Migration002.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database\migrations\multiDownErr;
+namespace App\Database\Migrations\MultiDownErr;
 
 use WebFiori\Database\Database;
 use WebFiori\Database\migration\AbstractMigration;
diff --git a/app/database/migrations/multiDownErr/MultiErrRunner.php b/App/Database/migrations/multiDownErr/MultiErrRunner.php
similarity index 89%
rename from app/database/migrations/multiDownErr/MultiErrRunner.php
rename to App/Database/migrations/multiDownErr/MultiErrRunner.php
index bd4a09af5..ae0d847ab 100644
--- a/app/database/migrations/multiDownErr/MultiErrRunner.php
+++ b/App/Database/migrations/multiDownErr/MultiErrRunner.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database\migrations\multiDownErr;
+namespace App\Database\Migrations\MultiDownErr;
 
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Database\Schema\SchemaRunner;
diff --git a/app/database/migrations/multiErr/Migration000.php b/App/Database/migrations/multiErr/Migration000.php
similarity index 94%
rename from app/database/migrations/multiErr/Migration000.php
rename to App/Database/migrations/multiErr/Migration000.php
index 17b0b3ca5..bff12de45 100644
--- a/app/database/migrations/multiErr/Migration000.php
+++ b/App/Database/migrations/multiErr/Migration000.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database\migrations\multiErr;
+namespace App\Database\Migrations\MultiErr;
 
 use WebFiori\Database\Database;
 use WebFiori\Database\migration\AbstractMigration;
diff --git a/app/database/migrations/multiErr/Migration001.php b/App/Database/migrations/multiErr/Migration001.php
similarity index 95%
rename from app/database/migrations/multiErr/Migration001.php
rename to App/Database/migrations/multiErr/Migration001.php
index 8bf05a6fc..b3efc20ba 100644
--- a/app/database/migrations/multiErr/Migration001.php
+++ b/App/Database/migrations/multiErr/Migration001.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database\migrations\multiErr;
+namespace App\Database\Migrations\MultiErr;
 
 use WebFiori\Database\Database;
 use WebFiori\Database\migration\AbstractMigration;
diff --git a/app/database/migrations/multiErr/Migration002.php b/App/Database/migrations/multiErr/Migration002.php
similarity index 95%
rename from app/database/migrations/multiErr/Migration002.php
rename to App/Database/migrations/multiErr/Migration002.php
index 28c877d2d..91a834270 100644
--- a/app/database/migrations/multiErr/Migration002.php
+++ b/App/Database/migrations/multiErr/Migration002.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database\migrations\multiErr;
+namespace App\Database\Migrations\MultiErr;
 
 use WebFiori\Database\Database;
 use WebFiori\Database\migration\AbstractMigration;
diff --git a/app/database/migrations/multiErr/MultiErrRunner.php b/App/Database/migrations/multiErr/MultiErrRunner.php
similarity index 90%
rename from app/database/migrations/multiErr/MultiErrRunner.php
rename to App/Database/migrations/multiErr/MultiErrRunner.php
index d37ebf9ea..af74e7d4c 100644
--- a/app/database/migrations/multiErr/MultiErrRunner.php
+++ b/App/Database/migrations/multiErr/MultiErrRunner.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database\migrations\multiErr;
+namespace App\Database\Migrations\MultiErr;
 
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Database\Schema\SchemaRunner;
diff --git a/app/database/migrations/noConn/Migration000.php b/App/Database/migrations/noConn/Migration000.php
similarity index 95%
rename from app/database/migrations/noConn/Migration000.php
rename to App/Database/migrations/noConn/Migration000.php
index fcc798eab..2d463f004 100644
--- a/app/database/migrations/noConn/Migration000.php
+++ b/App/Database/migrations/noConn/Migration000.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database\migrations\noConn;
+namespace App\Database\Migrations\NoConn;
 
 use WebFiori\Database\Database;
 use WebFiori\Database\migration\AbstractMigration;
diff --git a/app/database/migrations/noConn/XRunner.php b/App/Database/migrations/noConn/XRunner.php
similarity index 80%
rename from app/database/migrations/noConn/XRunner.php
rename to App/Database/migrations/noConn/XRunner.php
index b50f8f555..44715da99 100644
--- a/app/database/migrations/noConn/XRunner.php
+++ b/App/Database/migrations/noConn/XRunner.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\database\migrations\noConn;
+namespace App\Database\Migrations\NoConn;
 
 use WebFiori\Database\Schema\SchemaRunner;
 
diff --git a/app/database/sql-file.sql b/App/Database/sql-file.sql
similarity index 100%
rename from app/database/sql-file.sql
rename to App/Database/sql-file.sql
diff --git a/app/database/super/temp b/App/Database/super/temp
similarity index 100%
rename from app/database/super/temp
rename to App/Database/super/temp
diff --git a/app/entity/WithException.php b/App/Entity/WithException.php
similarity index 89%
rename from app/entity/WithException.php
rename to App/Entity/WithException.php
index 3379ea304..56f09bf7a 100644
--- a/app/entity/WithException.php
+++ b/App/Entity/WithException.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\entity;
+namespace App\Entity;
 
 /**
  * Description of WithException
diff --git a/app/entity/super/temp b/App/Entity/super/temp
similarity index 100%
rename from app/entity/super/temp
rename to App/Entity/super/temp
diff --git a/app/entity/temp b/App/Entity/temp
similarity index 100%
rename from app/entity/temp
rename to App/Entity/temp
diff --git a/app/ini/InitAutoLoad.php b/App/Init/InitAutoLoad.php
similarity index 81%
rename from app/ini/InitAutoLoad.php
rename to App/Init/InitAutoLoad.php
index fd82a61a2..463d2d4c3 100644
--- a/app/ini/InitAutoLoad.php
+++ b/App/Init/InitAutoLoad.php
@@ -1,12 +1,13 @@
 <?php
-namespace app\ini;
+
+namespace App\Init;
 
 class InitAutoLoad {
     /**
      * Add user-defined directories to the set of directories at which the framework will search for classes.
      *
-     * @since 1.0
-     */
+     **/
     public static function init() {
+            
     }
 }
diff --git a/app/ini/InitCliCommands.php b/App/Init/InitCliCommands.php
similarity index 89%
rename from app/ini/InitCliCommands.php
rename to App/Init/InitCliCommands.php
index 0ad06579d..06668345b 100644
--- a/app/ini/InitCliCommands.php
+++ b/App/Init/InitCliCommands.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\ini;
+namespace App\Ini;
 
 class InitCliCommands {
     /**
diff --git a/app/ini/InitCommands.php b/App/Init/InitCommands.php
similarity index 76%
rename from app/ini/InitCommands.php
rename to App/Init/InitCommands.php
index 17988d15e..884fe2931 100644
--- a/app/ini/InitCommands.php
+++ b/App/Init/InitCommands.php
@@ -1,12 +1,13 @@
 <?php
-namespace app\ini;
+
+namespace App\Init;
 
 class InitCommands {
     /**
      * A method that can be used to initialize CLI commands.
      *
-     * @since 1.0
-     */
+     **/
     public static function init() {
+            
     }
 }
diff --git a/app/ini/InitMiddleware.php b/App/Init/InitMiddleware.php
similarity index 69%
rename from app/ini/InitMiddleware.php
rename to App/Init/InitMiddleware.php
index 889948220..3f5ed59f4 100644
--- a/app/ini/InitMiddleware.php
+++ b/App/Init/InitMiddleware.php
@@ -1,12 +1,13 @@
 <?php
-namespace app\ini;
+
+namespace App\Init;
 
 class InitMiddleware {
     /**
-     * Register middleware which are created outside the folder 'app/middleware'.
+     * Register middleware which are created outside the folder '[APP_DIR]/Middleware'.
      *
-     * @since 1.0
-     */
+     **/
     public static function init() {
+            
     }
 }
diff --git a/app/ini/InitPrivileges.php b/App/Init/InitPrivileges.php
similarity index 75%
rename from app/ini/InitPrivileges.php
rename to App/Init/InitPrivileges.php
index 8cd2cfb6c..23ebbdd04 100644
--- a/app/ini/InitPrivileges.php
+++ b/App/Init/InitPrivileges.php
@@ -1,12 +1,13 @@
 <?php
-namespace app\ini;
+
+namespace App\Init;
 
 class InitPrivileges {
     /**
      * Initialize user groups and privileges.
      *
-     * @since 1.0
-     */
+     **/
     public static function init() {
+            
     }
 }
diff --git a/app/ini/InitTasks.php b/App/Init/InitTasks.php
similarity index 76%
rename from app/ini/InitTasks.php
rename to App/Init/InitTasks.php
index 5aaf956b7..e4b7397a6 100644
--- a/app/ini/InitTasks.php
+++ b/App/Init/InitTasks.php
@@ -1,12 +1,13 @@
 <?php
-namespace app\ini;
+
+namespace App\Init;
 
 class InitTasks {
     /**
      * A method that can be used to register background tasks.
      *
-     * @since 1.0
-     */
+     **/
     public static function init() {
+            
     }
 }
diff --git a/app/ini/routes/APIsRoutes.php b/App/Init/routes/APIsRoutes.php
similarity index 84%
rename from app/ini/routes/APIsRoutes.php
rename to App/Init/routes/APIsRoutes.php
index c7aeb3600..1b57abaab 100644
--- a/app/ini/routes/APIsRoutes.php
+++ b/App/Init/routes/APIsRoutes.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\ini\routes;
+namespace App\Ini\Routes;
 
 class APIsRoutes {
     /**
diff --git a/app/ini/routes/ClosureRoutes.php b/App/Init/routes/ClosureRoutes.php
similarity index 85%
rename from app/ini/routes/ClosureRoutes.php
rename to App/Init/routes/ClosureRoutes.php
index 6f42deae7..ed17b061c 100644
--- a/app/ini/routes/ClosureRoutes.php
+++ b/App/Init/routes/ClosureRoutes.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\ini\routes;
+namespace App\Ini\Routes;
 
 class ClosureRoutes {
     /**
diff --git a/app/ini/routes/OtherRoutes.php b/App/Init/routes/OtherRoutes.php
similarity index 84%
rename from app/ini/routes/OtherRoutes.php
rename to App/Init/routes/OtherRoutes.php
index a189d6af5..73cbb7941 100644
--- a/app/ini/routes/OtherRoutes.php
+++ b/App/Init/routes/OtherRoutes.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\ini\routes;
+namespace App\Ini\Routes;
 
 class OtherRoutes {
     /**
diff --git a/app/ini/routes/PagesRoutes.php b/App/Init/routes/PagesRoutes.php
similarity index 84%
rename from app/ini/routes/PagesRoutes.php
rename to App/Init/routes/PagesRoutes.php
index a1f2ad0ea..42eae3a66 100644
--- a/app/ini/routes/PagesRoutes.php
+++ b/App/Init/routes/PagesRoutes.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\ini\routes;
+namespace App\Ini\Routes;
 
 class PagesRoutes {
     /**
diff --git a/app/langs/LangAR.php b/App/Langs/LangAR.php
similarity index 86%
rename from app/langs/LangAR.php
rename to App/Langs/LangAR.php
index 085af6624..a9ef78009 100644
--- a/app/langs/LangAR.php
+++ b/App/Langs/LangAR.php
@@ -1,7 +1,7 @@
 <?php
-namespace app\langs;
+namespace App\Langs;
 
-use webfiori\framework\Lang;
+use WebFiori\Framework\Lang;
 /**
  * A class which holds language information for the language which has code 'AR'.
  */
diff --git a/app/langs/LangEN.php b/App/Langs/LangEN.php
similarity index 90%
rename from app/langs/LangEN.php
rename to App/Langs/LangEN.php
index 468ce7120..56b0e6567 100644
--- a/app/langs/LangEN.php
+++ b/App/Langs/LangEN.php
@@ -1,7 +1,7 @@
 <?php
-namespace app\langs;
+namespace App\Langs;
 
-use webfiori\framework\Lang;
+use WebFiori\Framework\Lang;
 /**
  * A class which holds language information for the language which has code 'EN'.
  */
diff --git a/app/langs/LangFR.php b/App/Langs/LangFR.php
similarity index 53%
rename from app/langs/LangFR.php
rename to App/Langs/LangFR.php
index 8adc666af..0063c592a 100644
--- a/app/langs/LangFR.php
+++ b/App/Langs/LangFR.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\langs;
+namespace App\Langs;
 
 class LangFR {
 }
diff --git a/App/Langs/LangGB.php b/App/Langs/LangGB.php
new file mode 100644
index 000000000..79a49da96
--- /dev/null
+++ b/App/Langs/LangGB.php
@@ -0,0 +1,2 @@
+<?php
+namespace App\Langs;
diff --git a/app/langs/LangJP.php b/App/Langs/LangJP.php
similarity index 72%
rename from app/langs/LangJP.php
rename to App/Langs/LangJP.php
index 4f4255749..196a4111f 100644
--- a/app/langs/LangJP.php
+++ b/App/Langs/LangJP.php
@@ -1,7 +1,7 @@
 <?php
-namespace app\langs;
+namespace App\Langs;
 
-use webfiori\framework\Lang;
+use WebFiori\Framework\Lang;
 
 class LangJP extends Lang {
     public function __construct() {
diff --git a/app/middleware/CoolMiddleware.php b/App/Middleware/CoolMiddleware.php
similarity index 94%
rename from app/middleware/CoolMiddleware.php
rename to App/Middleware/CoolMiddleware.php
index b49ccddcd..f8aa0453d 100644
--- a/app/middleware/CoolMiddleware.php
+++ b/App/Middleware/CoolMiddleware.php
@@ -1,7 +1,7 @@
 <?php
-namespace app\middleware;
+namespace App\Middleware;
 
-use webfiori\framework\middleware\AbstractMiddleware;
+use WebFiori\Framework\Middleware\AbstractMiddleware;
 use WebFiori\Http\Request;
 use WebFiori\Http\Response;
 /**
diff --git a/app/middleware/temp b/App/Middleware/temp
similarity index 100%
rename from app/middleware/temp
rename to App/Middleware/temp
diff --git a/app/tasks/Fail1TestTask.php b/App/Tasks/Fail1TestTask.php
similarity index 91%
rename from app/tasks/Fail1TestTask.php
rename to App/Tasks/Fail1TestTask.php
index dd0b326a5..7327813a6 100644
--- a/app/tasks/Fail1TestTask.php
+++ b/App/Tasks/Fail1TestTask.php
@@ -1,8 +1,8 @@
 <?php
-namespace app\tasks;
+namespace App\Tasks;
 
-use webfiori\framework\scheduler\AbstractTask;
-use webfiori\framework\scheduler\TasksManager;
+use WebFiori\Framework\Scheduler\AbstractTask;
+use WebFiori\Framework\Scheduler\TasksManager;
 /**
  * A background process which was created using the command "create".
  *
@@ -34,7 +34,7 @@ public function __construct() {
     public function afterExec() {
         //TODO: Implement the action to perform when the job finishes to execute.
         //$email = new TasStatusEmail('no-reply', [
-        //    'webfiori@example.com' => 'Ibrahim Ali'
+        //    'WebFiori@example.com' => 'Ibrahim Ali'
         //]);
     }
     /**
diff --git a/app/tasks/Fail2TestTask.php b/App/Tasks/Fail2TestTask.php
similarity index 90%
rename from app/tasks/Fail2TestTask.php
rename to App/Tasks/Fail2TestTask.php
index c0d9dc9f1..c71ca727b 100644
--- a/app/tasks/Fail2TestTask.php
+++ b/App/Tasks/Fail2TestTask.php
@@ -1,8 +1,8 @@
 <?php
-namespace app\tasks;
+namespace App\Tasks;
 
-use webfiori\framework\scheduler\AbstractTask;
-use webfiori\framework\scheduler\TaskStatusEmail;
+use WebFiori\Framework\Scheduler\AbstractTask;
+use WebFiori\Framework\Scheduler\TaskStatusEmail;
 /**
  * A background process which was created using the command "create".
  *
@@ -34,7 +34,7 @@ public function __construct() {
     public function afterExec() {
         //TODO: Implement the action to perform when the job finishes to execute.
         //$email = new TaskStatusEmail('no-reply', [
-        //    'webfiori@example.com' => 'Ibrahim Ali'
+        //    'WebFiori@example.com' => 'Ibrahim Ali'
         //]);
     }
     /**
diff --git a/app/tasks/Fail3TestTask.php b/App/Tasks/Fail3TestTask.php
similarity index 92%
rename from app/tasks/Fail3TestTask.php
rename to App/Tasks/Fail3TestTask.php
index b4c5f0857..128dfa6fc 100644
--- a/app/tasks/Fail3TestTask.php
+++ b/App/Tasks/Fail3TestTask.php
@@ -1,7 +1,7 @@
 <?php
-namespace app\tasks;
+namespace App\Tasks;
 
-use webfiori\framework\scheduler\AbstractTask;
+use WebFiori\Framework\Scheduler\AbstractTask;
 /**
  * A background process which was created using the command "create".
  *
@@ -33,7 +33,7 @@ public function __construct() {
     public function afterExec() {
         //TODO: Implement the action to perform when the job finishes to execute.
         //$email = new TaskStatusEmail('no-reply', [
-        //    'webfiori@example.com' => 'Ibrahim Ali'
+        //    'WebFiori@example.com' => 'Ibrahim Ali'
         //]);
     }
     /**
diff --git a/app/tasks/SuccessTestEveryMinute.php b/App/Tasks/SuccessTestEveryMinute.php
similarity index 92%
rename from app/tasks/SuccessTestEveryMinute.php
rename to App/Tasks/SuccessTestEveryMinute.php
index 0daf38164..2f51faa81 100644
--- a/app/tasks/SuccessTestEveryMinute.php
+++ b/App/Tasks/SuccessTestEveryMinute.php
@@ -1,8 +1,8 @@
 <?php
-namespace app\tasks;
+namespace App\Tasks;
 
-use webfiori\framework\scheduler\AbstractTask;
-use webfiori\framework\scheduler\TasksManager;
+use WebFiori\Framework\Scheduler\AbstractTask;
+use WebFiori\Framework\Scheduler\TasksManager;
 /**
  * A background process which was created using the command "create".
  *
@@ -43,7 +43,7 @@ public function __construct() {
     public function afterExec() {
         //TODO: Implement the action to perform when the job finishes to execute.
         //$email = new TaskStatusEmail('no-reply', [
-        //    'webfiori@example.com' => 'Ibrahim Ali'
+        //    'WebFiori@example.com' => 'Ibrahim Ali'
         //]);
     }
     /**
diff --git a/app/tasks/SuccessTestTask.php b/App/Tasks/SuccessTestTask.php
similarity index 95%
rename from app/tasks/SuccessTestTask.php
rename to App/Tasks/SuccessTestTask.php
index 339730e8c..96d7972a1 100644
--- a/app/tasks/SuccessTestTask.php
+++ b/App/Tasks/SuccessTestTask.php
@@ -1,7 +1,7 @@
 <?php
-namespace app\tasks;
+namespace App\Tasks;
 
-use webfiori\framework\scheduler\AbstractTask;
+use WebFiori\Framework\Scheduler\AbstractTask;
 /**
  * A background process which was created using the command "create".
  *
@@ -43,7 +43,7 @@ public function __construct() {
     public function afterExec() {
         //TODO: Implement the action to perform when the job finishes to execute.
         //$email = new TaskStatusEmail('no-reply', [
-        //    'webfiori@example.com' => 'Ibrahim Ali'
+        //    'WebFiori@example.com' => 'Ibrahim Ali'
         //]);
     }
     /**
diff --git a/app/tasks/temp b/App/Tasks/temp
similarity index 100%
rename from app/tasks/temp
rename to App/Tasks/temp
diff --git a/app/themes/cool/temp b/App/Themes/cool/temp
similarity index 100%
rename from app/themes/cool/temp
rename to App/Themes/cool/temp
diff --git a/Themes/Fiori/.gitkeep b/Themes/Fiori/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/themes/fioriTheme/AsideSection.php b/Themes/FioriTheme/AsideSection.php
similarity index 84%
rename from themes/fioriTheme/AsideSection.php
rename to Themes/FioriTheme/AsideSection.php
index 7da8bbc13..971b953a3 100644
--- a/themes/fioriTheme/AsideSection.php
+++ b/Themes/FioriTheme/AsideSection.php
@@ -1,7 +1,7 @@
 <?php
-namespace themes\fioriTheme;
+namespace Themes\FioriTheme;
 
-use WebFiori\UI\HTMLNode;
+use WebFiori\Ui\HTMLNode;
 
 /**
  * A class that represents aside area of the theme.
diff --git a/themes/fioriTheme/FooterSection.php b/Themes/FioriTheme/FooterSection.php
similarity index 84%
rename from themes/fioriTheme/FooterSection.php
rename to Themes/FioriTheme/FooterSection.php
index df811fdf1..9af9ac245 100644
--- a/themes/fioriTheme/FooterSection.php
+++ b/Themes/FioriTheme/FooterSection.php
@@ -1,7 +1,7 @@
 <?php
-namespace themes\fioriTheme;
+namespace Themes\FioriTheme;
 
-use WebFiori\UI\HTMLNode;
+use WebFiori\Ui\HTMLNode;
 
 /**
  * A class that represents footer section of the theme.
diff --git a/themes/fioriTheme/HeadSection.php b/Themes/FioriTheme/HeadSection.php
similarity index 84%
rename from themes/fioriTheme/HeadSection.php
rename to Themes/FioriTheme/HeadSection.php
index c96bf58e6..e8da3d802 100644
--- a/themes/fioriTheme/HeadSection.php
+++ b/Themes/FioriTheme/HeadSection.php
@@ -1,7 +1,7 @@
 <?php
-namespace themes\fioriTheme;
+namespace Themes\FioriTheme;
 
-use WebFiori\UI\HeadNode;
+use WebFiori\Ui\HeadNode;
 
 /**
  * A class that represents "head" tag of the theme.
diff --git a/themes/fioriTheme/HeaderSection.php b/Themes/FioriTheme/HeaderSection.php
similarity index 85%
rename from themes/fioriTheme/HeaderSection.php
rename to Themes/FioriTheme/HeaderSection.php
index 25a87a99c..5684aaef2 100644
--- a/themes/fioriTheme/HeaderSection.php
+++ b/Themes/FioriTheme/HeaderSection.php
@@ -1,7 +1,7 @@
 <?php
-namespace themes\fioriTheme;
+namespace Themes\FioriTheme;
 
-use WebFiori\UI\HTMLNode;
+use WebFiori\Ui\HTMLNode;
 
 /**
  * A class that represents the top section of the theme.
diff --git a/themes/fioriTheme/NewFTestTheme.php b/Themes/FioriTheme/NewFTestTheme.php
similarity index 98%
rename from themes/fioriTheme/NewFTestTheme.php
rename to Themes/FioriTheme/NewFTestTheme.php
index 3d9966168..2f3850b4f 100644
--- a/themes/fioriTheme/NewFTestTheme.php
+++ b/Themes/FioriTheme/NewFTestTheme.php
@@ -1,9 +1,9 @@
 <?php
-namespace themes\fioriTheme;
+namespace Themes\FioriTheme;
 
-use webfiori\framework\Theme;
-use WebFiori\UI\HeadNode;
-use WebFiori\UI\HTMLNode;
+use WebFiori\Framework\Theme;
+use WebFiori\Ui\HeadNode;
+use WebFiori\Ui\HTMLNode;
 class NewFTestTheme extends Theme {
     /**
      * Creates new instance of the class.
diff --git a/themes/fioriTheme/assets/css/main.css b/Themes/FioriTheme/assets/css/main.css
similarity index 100%
rename from themes/fioriTheme/assets/css/main.css
rename to Themes/FioriTheme/assets/css/main.css
diff --git a/themes/fioriTheme/assets/images/favicon.png b/Themes/FioriTheme/assets/images/favicon.png
similarity index 100%
rename from themes/fioriTheme/assets/images/favicon.png
rename to Themes/FioriTheme/assets/images/favicon.png
diff --git a/themes/fioriTheme/assets/js/main.js b/Themes/FioriTheme/assets/js/main.js
similarity index 100%
rename from themes/fioriTheme/assets/js/main.js
rename to Themes/FioriTheme/assets/js/main.js
diff --git a/themes/fioriTheme2/AsideSection.php b/Themes/FioriTheme2/AsideSection.php
similarity index 84%
rename from themes/fioriTheme2/AsideSection.php
rename to Themes/FioriTheme2/AsideSection.php
index cb356ac9b..03b70f3a0 100644
--- a/themes/fioriTheme2/AsideSection.php
+++ b/Themes/FioriTheme2/AsideSection.php
@@ -1,7 +1,7 @@
 <?php
-namespace themes\fioriTheme2;
+namespace Themes\FioriTheme2;
 
-use WebFiori\UI\HTMLNode;
+use WebFiori\Ui\HTMLNode;
 
 /**
  * A class that represents aside area of the theme.
diff --git a/themes/fioriTheme2/FooterSection.php b/Themes/FioriTheme2/FooterSection.php
similarity index 84%
rename from themes/fioriTheme2/FooterSection.php
rename to Themes/FioriTheme2/FooterSection.php
index a61c70411..beea52606 100644
--- a/themes/fioriTheme2/FooterSection.php
+++ b/Themes/FioriTheme2/FooterSection.php
@@ -1,7 +1,7 @@
 <?php
-namespace themes\fioriTheme2;
+namespace Themes\FioriTheme2;
 
-use WebFiori\UI\HTMLNode;
+use WebFiori\Ui\HTMLNode;
 
 /**
  * A class that represents footer section of the theme.
diff --git a/themes/fioriTheme2/HeadSection.php b/Themes/FioriTheme2/HeadSection.php
similarity index 84%
rename from themes/fioriTheme2/HeadSection.php
rename to Themes/FioriTheme2/HeadSection.php
index 7d5f27a1e..7f07a3eb8 100644
--- a/themes/fioriTheme2/HeadSection.php
+++ b/Themes/FioriTheme2/HeadSection.php
@@ -1,7 +1,7 @@
 <?php
-namespace themes\fioriTheme2;
+namespace Themes\FioriTheme2;
 
-use WebFiori\UI\HeadNode;
+use WebFiori\Ui\HeadNode;
 
 /**
  * A class that represents "head" tag of the theme.
diff --git a/themes/fioriTheme2/HeaderSection.php b/Themes/FioriTheme2/HeaderSection.php
similarity index 84%
rename from themes/fioriTheme2/HeaderSection.php
rename to Themes/FioriTheme2/HeaderSection.php
index e1501beec..a467ac3b2 100644
--- a/themes/fioriTheme2/HeaderSection.php
+++ b/Themes/FioriTheme2/HeaderSection.php
@@ -1,7 +1,7 @@
 <?php
-namespace themes\fioriTheme2;
+namespace Themes\FioriTheme2;
 
-use WebFiori\UI\HTMLNode;
+use WebFiori\Ui\HTMLNode;
 
 /**
  * A class that represents the top section of the theme.
diff --git a/themes/fioriTheme2/NewTestTheme2.php b/Themes/FioriTheme2/NewTestTheme2.php
similarity index 95%
rename from themes/fioriTheme2/NewTestTheme2.php
rename to Themes/FioriTheme2/NewTestTheme2.php
index 3fd326f73..9a7f7d7db 100644
--- a/themes/fioriTheme2/NewTestTheme2.php
+++ b/Themes/FioriTheme2/NewTestTheme2.php
@@ -1,9 +1,9 @@
 <?php
-namespace themes\fioriTheme2;
+namespace Themes\FioriTheme2;
 
-use webfiori\framework\Theme;
-use WebFiori\UI\HeadNode;
-use WebFiori\UI\HTMLNode;
+use WebFiori\Framework\Theme;
+use WebFiori\Ui\HeadNode;
+use WebFiori\Ui\HTMLNode;
 class NewTestTheme2 extends Theme {
     /**
      * Creates new instance of the class.
diff --git a/webfiori/framework/Access.php b/WebFiori/Framework/Access.php
similarity index 99%
rename from webfiori/framework/Access.php
rename to WebFiori/Framework/Access.php
index 1ab19b434..4cc6ead8e 100644
--- a/webfiori/framework/Access.php
+++ b/WebFiori/Framework/Access.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework;
+namespace WebFiori\Framework;
 
 /**
  * A class to manage user groups and privileges.
diff --git a/webfiori/framework/App.php b/WebFiori/Framework/App.php
similarity index 85%
rename from webfiori/framework/App.php
rename to WebFiori/Framework/App.php
index f5bdadf30..4113dfcac 100644
--- a/webfiori/framework/App.php
+++ b/WebFiori/Framework/App.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework;
+namespace WebFiori\Framework;
 
 use Error;
 use Exception;
@@ -17,19 +17,19 @@
 use WebFiori\Error\Handler;
 use WebFiori\File\exceptions\FileException;
 use WebFiori\File\File;
-use webfiori\framework\autoload\ClassLoader;
-use webfiori\framework\config\ConfigurationDriver;
-use webfiori\framework\config\Controller;
-use webfiori\framework\exceptions\InitializationException;
-use webfiori\framework\handlers\APICallErrHandler;
-use webfiori\framework\handlers\CLIErrHandler;
-use webfiori\framework\handlers\HTTPErrHandler;
-use webfiori\framework\middleware\AbstractMiddleware;
-use webfiori\framework\middleware\MiddlewareManager;
-use webfiori\framework\middleware\StartSessionMiddleware;
-use webfiori\framework\router\Router;
-use webfiori\framework\router\RouterUri;
-use webfiori\framework\scheduler\TasksManager;
+use WebFiori\Framework\Autoload\ClassLoader;
+use WebFiori\Framework\Config\ConfigurationDriver;
+use WebFiori\Framework\Config\Controller;
+use WebFiori\Framework\Exceptions\InitializationException;
+use WebFiori\Framework\Handlers\APICallErrHandler;
+use WebFiori\Framework\Handlers\CLIErrHandler;
+use WebFiori\Framework\Handlers\HTTPErrHandler;
+use WebFiori\Framework\Middleware\AbstractMiddleware;
+use WebFiori\Framework\Middleware\MiddlewareManager;
+use WebFiori\Framework\Middleware\StartSessionMiddleware;
+use WebFiori\Framework\Router\Router;
+use WebFiori\Framework\Router\RouterUri;
+use WebFiori\Framework\Scheduler\TasksManager;
 use WebFiori\Http\Request;
 use WebFiori\Http\Response;
 /**
@@ -91,7 +91,7 @@ class App {
      *
      * @var string
      */
-    private static $ConfigDriver = 'webfiori\\framework\\config\\JsonDriver';
+    private static $ConfigDriver = 'WebFiori\\Framework\\Config\\JsonDriver';
     /**
      * A single instance of the class.
      *
@@ -127,12 +127,12 @@ private function __construct() {
 
         $this->initThemesPath();
         
-        if (!class_exists(APP_DIR.'\ini\InitPrivileges')) {
+        if (!class_exists(APP_DIR.'\\Init\\InitPrivileges')) {
             Ini::get()->createIniClass('InitPrivileges', 'Initialize user groups and privileges.');
         }
         //Initialize privileges.
         //This step must be done before initializing anything.
-        self::call(APP_DIR.'\ini\InitPrivileges::init');
+        self::call(APP_DIR.'\\Init\\InitPrivileges::init');
 
         $this->initMiddleware();
         $this->initRoutes();
@@ -168,8 +168,7 @@ private function __construct() {
      * Register CLI commands or background tasks.
      *
      * @param string $folder The name of the folder that contains the jobs or
-     * commands. It must be a folder inside 'app' folder or the folder which is defined
-     * by the constant 'APP_DIR'.
+     * commands. It must be a folder inside [APP_DIR].
      *
      * @param callable $regCallback A callback which is used to register the
      * classes of the folder.
@@ -274,10 +273,10 @@ public static function getConfigDriver() : string {
     }
     private static function getRoot() {
         //Following lines of code assumes that the class exist on the folder: 
-        //\vendor\webfiori\framework\webfiori\framework
+        //\vendor\WebFiori\framework\WebFiori\Framework
         //Its used to construct the folder at which index file will exist at
         $DS = DIRECTORY_SEPARATOR;
-        $vendorPath = $DS.'vendor'.$DS.'webfiori'.$DS.'framework'.$DS.'webfiori'.$DS.'framework';
+        $vendorPath = $DS.'vendor'.$DS.'webFiori'.$DS.'framework'.$DS.'WebFiori'.$DS.'Framework';
         $rootPath = substr(__DIR__, 0, strlen(__DIR__) - strlen($vendorPath));
         return $rootPath;
     }
@@ -291,7 +290,7 @@ public static function handle() {
         
         if (self::$ClassStatus == self::STATUS_NONE) {
             $publicFolderName = 'public';
-            self::initiate('app', $publicFolderName, self::getRoot().DIRECTORY_SEPARATOR.$publicFolderName);
+            self::initiate('App', $publicFolderName, self::getRoot().DIRECTORY_SEPARATOR.$publicFolderName);
         }
         if (self::$ClassStatus == self::STATUS_INITIATED) {
             self::start();
@@ -321,7 +320,7 @@ public static function handle() {
      * @param string $indexDir The directory at which index file exist at.
      * Usually, its the value of the constant __DIR__.
      */
-    public static function initiate(string $appFolder = 'app', string $publicFolder = 'public', string $indexDir = __DIR__) {
+    public static function initiate(string $appFolder = 'App', string $publicFolder = 'public', string $indexDir = __DIR__) {
         /**
          * Change encoding of mb_ functions to UTF-8
          */
@@ -368,7 +367,7 @@ public static function initiate(string $appFolder = 'app', string $publicFolder
             /**
              * Path to WebFiori's core library.
              */
-            define('WF_CORE_PATH', ROOT_PATH.DS.'vendor'.DS.'webfiori'.DS.'framework'.DS.'webfiori'.DS.'framework');
+            define('WF_CORE_PATH', ROOT_PATH.DS.'vendor'.DS.'WebFiori'.DS.'framework'.DS.'WebFiori'.DS.'framework');
         }
         self::initAutoLoader();
         self::checkStandardLibs();
@@ -384,7 +383,7 @@ public static function initiate(string $appFolder = 'app', string $publicFolder
      * @throws FileException
      */
     public static function getRunner() : Runner {
-        if (!class_exists(APP_DIR.'\ini\InitCommands')) {
+        if (!class_exists(APP_DIR.'\Init\InitCommands')) {
             Ini::get()->createIniClass('InitCommands', 'A method that can be used to initialize CLI commands.');
         }
 
@@ -417,25 +416,25 @@ public static function getRunner() : Runner {
             self::$CliRunner->setBeforeStart(function (Runner $r)
             {
                 $commands = [
-                    '\\webfiori\\framework\\cli\commands\\WHelpCommand',
-                    '\\webfiori\\framework\\cli\\commands\\VersionCommand',
-                    '\\webfiori\\framework\\cli\\commands\\SettingsCommand',
-                    '\\webfiori\\framework\\cli\\commands\\SchedulerCommand',
-                    '\\webfiori\\framework\\cli\\commands\\CreateCommand',
-                    '\\webfiori\\framework\\cli\\commands\\AddCommand',
-                    '\\webfiori\\framework\\cli\\commands\\ListRoutesCommand',
-                    '\\webfiori\\framework\\cli\\commands\\ListThemesCommand',
-                    '\\webfiori\\framework\\cli\\commands\\RunSQLQueryCommand',
-                    '\\webfiori\\framework\\cli\\commands\\UpdateSettingsCommand',
-                    '\\webfiori\\framework\\cli\\commands\\UpdateTableCommand',
-                    '\\webfiori\\framework\\cli\\commands\\RunMigrationsCommand',
+                    '\\WebFiori\\Framework\\Cli\\Commands\\WHelpCommand',
+                    '\\WebFiori\\Framework\\Cli\\Commands\\VersionCommand',
+                    '\\WebFiori\\Framework\\Cli\\Commands\\SettingsCommand',
+                    '\\WebFiori\\Framework\\Cli\\Commands\\SchedulerCommand',
+                    '\\WebFiori\\Framework\\Cli\\Commands\\CreateCommand',
+                    '\\WebFiori\\Framework\\Cli\\Commands\\AddCommand',
+                    '\\WebFiori\\Framework\\Cli\\Commands\\ListRoutesCommand',
+                    '\\WebFiori\\Framework\\Cli\\Commands\\ListThemesCommand',
+                    '\\WebFiori\\Framework\\Cli\\Commands\\RunSQLQueryCommand',
+                    '\\WebFiori\\Framework\\Cli\\Commands\\UpdateSettingsCommand',
+                    '\\WebFiori\\Framework\\Cli\\Commands\\UpdateTableCommand',
+                    '\\WebFiori\\Framework\\Cli\\Commands\\RunMigrationsCommand',
                 ];
 
                 foreach ($commands as $c) {
                     $r->register(new $c());
                 }
                 $r->setDefaultCommand('help');
-                self::call(APP_DIR.'\ini\InitCommands::init');
+                self::call(APP_DIR.'\Init\InitCommands::init');
             });
         }
 
@@ -519,7 +518,7 @@ private function checkAppDir() {
              *
              * @since 2.2.1
              */
-            define('APP_DIR','app');
+            define('APP_DIR','App');
         }
 
         if (strpos(APP_DIR, ' ') !== false || strpos(APP_DIR, '-')) {
@@ -548,16 +547,16 @@ private function checkAppDir() {
      */
     private static function checkStandardLibs() {
         $standardLibsClasses = [
-            'webfiori/collections' => 'WebFiori\\Collections\\Node',
-            'webfiori/ui' => 'WebFiori\\UI\\HTMLNode',
-            'webfiori/jsonx' => 'WebFiori\\Json\\Json',
-            'webfiori/database' => 'WebFiori\\Database\\ResultSet',
-            'webfiori/http' => 'WebFiori\\Http\\Response',
-            'webfiori/file' => 'WebFiori\\File\\File',
-            'webfiori/mailer' => 'WebFiori\\Mail\\SMTPAccount',
-            'webfiori/cli' => 'WebFiori\\Cli\\Command',
-
-            'webfiori/cache' => 'WebFiori\\Cache\\Cache'
+            'WebFiori/collections' => 'WebFiori\\Collections\\Node',
+            'WebFiori/ui' => 'WebFiori\\Ui\\HTMLNode',
+            'WebFiori/jsonx' => 'WebFiori\\Json\\Json',
+            'WebFiori/database' => 'WebFiori\\Database\\ResultSet',
+            'WebFiori/http' => 'WebFiori\\Http\\Response',
+            'WebFiori/file' => 'WebFiori\\File\\File',
+            'WebFiori/mailer' => 'WebFiori\\Mail\\SMTPAccount',
+            'WebFiori/cli' => 'WebFiori\\Cli\\Command',
+
+            'WebFiori/cache' => 'WebFiori\\Cache\\Cache'
         ];
 
         foreach ($standardLibsClasses as $lib => $class) {
@@ -615,17 +614,17 @@ private static function initAutoLoader() {
         /**
          * Initialize autoloader.
          */
-        if (!class_exists('webfiori\framework\autoload\ClassLoader',false)) {
-            $autoloader = WF_CORE_PATH.DIRECTORY_SEPARATOR.'autoload'.DIRECTORY_SEPARATOR.'ClassLoader.php';
+        if (!class_exists('WebFiori\Framework\Autoload\ClassLoader',false)) {
+            $autoloader = WF_CORE_PATH.DIRECTORY_SEPARATOR.'Autoload'.DIRECTORY_SEPARATOR.'ClassLoader.php';
             require_once $autoloader;
         }
         self::$AU = ClassLoader::get();
 
-        if (!class_exists(APP_DIR.'\ini\InitAutoLoad')) {
+        if (!class_exists(APP_DIR.'\\Init\\InitAutoLoad')) {
             Ini::createAppDirs();
             Ini::get()->createIniClass('InitAutoLoad', 'Add user-defined directories to the set of directories at which the framework will search for classes.');
         }
-        self::call(APP_DIR.'\ini\InitAutoLoad::init');
+        self::call(APP_DIR.'\\Init\\InitAutoLoad::init');
     }
     /**
      * Initialize global constants which has information about framework version.
@@ -643,7 +642,7 @@ public static function initFrameworkVersionInfo() {
          *
          * @since 2.1
          */
-        define('WF_VERSION', '3.0.0-Beta.28');
+        define('WF_VERSION', '3.0.0-Beta.29');
         /**
          * A constant that tells the type of framework version.
          *
@@ -659,7 +658,7 @@ public static function initFrameworkVersionInfo() {
          *
          * @since 2.1
          */
-        define('WF_RELEASE_DATE', '2025-08-04');
+        define('WF_RELEASE_DATE', '2025-10-09');
     }
 
     /**
@@ -671,11 +670,11 @@ private function initMiddleware() {
             MiddlewareManager::register($inst);
         });
 
-        if (!class_exists(APP_DIR.'\ini\InitMiddleware')) {
-            Ini::get()->createIniClass('InitMiddleware', 'Register middleware which are created outside the folder \'[APP_DIR]/middleware\'.');
+        if (!class_exists(APP_DIR.'\Init\InitMiddleware')) {
+            Ini::get()->createIniClass('InitMiddleware', 'Register middleware which are created outside the folder \'[APP_DIR]/Middleware\'.');
         }
         MiddlewareManager::register(new StartSessionMiddleware());
-        self::call(APP_DIR.'\ini\InitMiddleware::init');
+        self::call(APP_DIR.'\Init\InitMiddleware::init');
     }
     /**
      * @throws FileException
@@ -684,10 +683,10 @@ private function initRoutes() {
         $routesClasses = ['APIsRoutes', 'PagesRoutes', 'ClosureRoutes', 'OtherRoutes'];
 
         foreach ($routesClasses as $className) {
-            if (!class_exists(APP_DIR.'\\ini\\routes\\'.$className)) {
+            if (!class_exists(APP_DIR.'\\Init\\Routes\\'.$className)) {
                 Ini::get()->createRoutesClass($className);
             }
-            self::call(APP_DIR.'\ini\routes\\'.$className.'::create');
+            self::call(APP_DIR.'\Init\Routes\\'.$className.'::create');
         }
 
         if (Router::routesCount() != 0) {
@@ -706,7 +705,7 @@ private function initScheduler() {
         $uriObj = new RouterUri(Request::getRequestedURI(), '');
         $pathArr = $uriObj->getPathArray();
 
-        if (!class_exists(APP_DIR.'\ini\InitTasks')) {
+        if (!class_exists(APP_DIR.'\Init\InitTasks')) {
             Ini::get()->createIniClass('InitTasks', 'A method that can be used to register background tasks.');
         }
 
@@ -716,13 +715,13 @@ private function initScheduler() {
             }
             TasksManager::getPassword(self::getConfig()->getSchedulerPassword());
             //initialize scheduler tasks only if in CLI or scheduler is enabled through HTTP.
-            self::call(APP_DIR.'\ini\InitTasks::init');
+            self::call(APP_DIR.'\Init\InitTasks::init');
             TasksManager::registerTasks();
         }
     }
     private function initThemesPath() {
         if (!defined('THEMES_PATH')) {
-            $themesDirName = 'themes';
+            $themesDirName = 'Themes';
             $themesPath = ROOT_PATH.DS.$themesDirName;
             /**
              * This constant represents the directory at which themes exist.
diff --git a/webfiori/framework/autoload/ClassInfo.php b/WebFiori/Framework/Autoload/ClassInfo.php
similarity index 95%
rename from webfiori/framework/autoload/ClassInfo.php
rename to WebFiori/Framework/Autoload/ClassInfo.php
index a54da9fff..b952a79ed 100644
--- a/webfiori/framework/autoload/ClassInfo.php
+++ b/WebFiori/Framework/Autoload/ClassInfo.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\autoload;
+namespace WebFiori\Framework\Autoload;
 
 /**
  * A class that contains the names of indices that are used by loaded class info array.
diff --git a/webfiori/framework/autoload/ClassLoader.php b/WebFiori/Framework/Autoload/ClassLoader.php
similarity index 98%
rename from webfiori/framework/autoload/ClassLoader.php
rename to WebFiori/Framework/Autoload/ClassLoader.php
index 980e2f049..34715a4a3 100644
--- a/webfiori/framework/autoload/ClassLoader.php
+++ b/WebFiori/Framework/Autoload/ClassLoader.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\autoload;
+namespace WebFiori\Framework\Autoload;
 
 use Exception;
 /**
@@ -232,23 +232,22 @@ public static function get(array $options = [
 
         if (self::$loader === null) {
             if (!defined('APP_DIR')) {
-                define('APP_DIR', 'app');
+                define('APP_DIR', 'App');
             }
             $appFolder = APP_DIR;
             $frameworkSearchFolders = [
                 '',
-                $DS.'webfiori'.$DS.'framework',
-                $DS.'framework'.$DS.'exceptions',
-                $DS.'framework'.$DS.'cli',
-                $DS.'framework'.$DS.'ui',
-                $DS.'framework',
-                $DS.'themes',
-                $DS.'logic',
-                $DS.'apis',
-                $DS.'pages',
-                $DS.'ini',
-                $DS.'libs',
-                $DS.'config',
+                $DS.'WebFiori'.$DS.'Framework',
+                $DS.'Framework'.$DS.'Exceptions',
+                $DS.'Framework'.$DS.'Cli',
+                $DS.'Framework'.$DS.'Ui',
+                $DS.'Framework',
+                $DS.'Themes',
+                $DS.'Apis',
+                $DS.'Pages',
+                $DS.'Ini',
+                $DS.'Libs',
+                $DS.'Config',
                 $DS.$appFolder
             ];
 
@@ -258,7 +257,7 @@ public static function get(array $options = [
                 }
             }
             $defineRoot = isset($options['define-root']) && $options['define-root'] === true;
-            $root = isset($options['root']) ? trim($options['root'],'\\/') : trim(substr(__DIR__, 0, strlen(__DIR__) - strlen('\entity')),'\\/');
+            $root = isset($options['root']) ? trim($options['root'],'\\/') : trim(substr(__DIR__, 0, strlen(__DIR__) - strlen('\Entity')),'\\/');
 
             if (strlen($root) != 0 && explode($DS, $root)[0] == 'home') {
                 //linux
diff --git a/webfiori/framework/autoload/ClassLoaderException.php b/WebFiori/Framework/Autoload/ClassLoaderException.php
similarity index 92%
rename from webfiori/framework/autoload/ClassLoaderException.php
rename to WebFiori/Framework/Autoload/ClassLoaderException.php
index 412f188c5..f45a27a37 100644
--- a/webfiori/framework/autoload/ClassLoaderException.php
+++ b/WebFiori/Framework/Autoload/ClassLoaderException.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\autoload;
+namespace WebFiori\Framework\Autoload;
 
 use Exception;
 /**
diff --git a/webfiori/framework/cli/CLITestCase.php b/WebFiori/Framework/Cli/CLITestCase.php
similarity index 97%
rename from webfiori/framework/cli/CLITestCase.php
rename to WebFiori/Framework/Cli/CLITestCase.php
index 84ecf4c66..54305f9c1 100644
--- a/webfiori/framework/cli/CLITestCase.php
+++ b/WebFiori/Framework/Cli/CLITestCase.php
@@ -8,12 +8,12 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli;
+namespace WebFiori\Framework\Cli;
 
 use WebFiori\Cli\Command;
 use WebFiori\Cli\CommandTestCase;
 use WebFiori\File\File;
-use webfiori\framework\App;
+use WebFiori\Framework\App;
 
 /**
  * A base test case class that can be used to write command line commands test cases.
diff --git a/webfiori/framework/cli/CLIUtils.php b/WebFiori/Framework/Cli/CLIUtils.php
similarity index 98%
rename from webfiori/framework/cli/CLIUtils.php
rename to WebFiori/Framework/Cli/CLIUtils.php
index dc11d0416..31fefb8bf 100644
--- a/webfiori/framework/cli/CLIUtils.php
+++ b/WebFiori/Framework/Cli/CLIUtils.php
@@ -1,11 +1,11 @@
 <?php
-namespace webfiori\framework\cli;
+namespace WebFiori\Framework\Cli;
 
 use WebFiori\Cli\Command;
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Database\Table;
-use webfiori\framework\App;
-use webfiori\framework\writers\ClassWriter;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Writers\ClassWriter;
 /**
  * A class which is used to hold common CLI methods for reading inputs.
  *
diff --git a/webfiori/framework/cli/commands/AddCommand.php b/WebFiori/Framework/Cli/Commands/AddCommand.php
similarity index 97%
rename from webfiori/framework/cli/commands/AddCommand.php
rename to WebFiori/Framework/Cli/Commands/AddCommand.php
index 8d38b9f18..60c08c4b6 100644
--- a/webfiori/framework/cli/commands/AddCommand.php
+++ b/WebFiori/Framework/Cli/Commands/AddCommand.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\commands;
+namespace WebFiori\Framework\Cli\Commands;
 
 use WebFiori\Cli\Command;
 use WebFiori\Database\ConnectionInfo;
@@ -16,9 +16,9 @@
 use WebFiori\Mail\Exceptions\SMTPException;
 use WebFiori\Mail\SMTPAccount;
 use WebFiori\Mail\SMTPServer;
-use webfiori\framework\App;
-use webfiori\framework\DB;
-use webfiori\framework\writers\LangClassWriter;
+use WebFiori\Framework\App;
+use WebFiori\Framework\DB;
+use WebFiori\Framework\Writers\LangClassWriter;
 
 /**
  * A command which is used to add a database connection or SMTP account.
@@ -128,7 +128,7 @@ private function addLang(): int {
         $writer = new LangClassWriter($langCode, $writingDir);
         $writer->writeClass();
         $this->success('Language added. Also, a class for the language '
-                .'is created at "'.APP_DIR.'\langs" for that language.');
+                .'is created at "'.APP_DIR.'\Langs" for that language.');
 
         return 0;
     }
diff --git a/webfiori/framework/cli/commands/CreateCommand.php b/WebFiori/Framework/Cli/Commands/CreateCommand.php
similarity index 88%
rename from webfiori/framework/cli/commands/CreateCommand.php
rename to WebFiori/Framework/Cli/Commands/CreateCommand.php
index ef0fc2608..bc5c2d3d6 100644
--- a/webfiori/framework/cli/commands/CreateCommand.php
+++ b/WebFiori/Framework/Cli/Commands/CreateCommand.php
@@ -8,22 +8,22 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\commands;
+namespace WebFiori\Framework\Cli\Commands;
 
 use WebFiori\Cli\Argument;
 use WebFiori\Cli\Command;
-use webfiori\framework\cli\CLIUtils;
-use webfiori\framework\cli\helpers\ClassInfoReader;
-use webfiori\framework\cli\helpers\CreateAPITestCase;
-use webfiori\framework\cli\helpers\CreateBackgroundTask;
-use webfiori\framework\cli\helpers\CreateCLIClassHelper;
-use webfiori\framework\cli\helpers\CreateDBAccessHelper;
-use webfiori\framework\cli\helpers\CreateFullRESTHelper;
-use webfiori\framework\cli\helpers\CreateMiddleware;
-use webfiori\framework\cli\helpers\CreateMigration;
-use webfiori\framework\cli\helpers\CreateTableObj;
-use webfiori\framework\cli\helpers\CreateThemeHelper;
-use webfiori\framework\cli\helpers\CreateWebService;
+use WebFiori\Framework\Cli\CLIUtils;
+use WebFiori\Framework\Cli\Helpers\ClassInfoReader;
+use WebFiori\Framework\Cli\Helpers\CreateAPITestCase;
+use WebFiori\Framework\Cli\Helpers\CreateBackgroundTask;
+use WebFiori\Framework\Cli\Helpers\CreateCLIClassHelper;
+use WebFiori\Framework\Cli\Helpers\CreateDBAccessHelper;
+use WebFiori\Framework\Cli\Helpers\CreateFullRESTHelper;
+use WebFiori\Framework\Cli\Helpers\CreateMiddleware;
+use WebFiori\Framework\Cli\Helpers\CreateMigration;
+use WebFiori\Framework\Cli\Helpers\CreateTableObj;
+use WebFiori\Framework\Cli\Helpers\CreateThemeHelper;
+use WebFiori\Framework\Cli\Helpers\CreateWebService;
 /**
  * A command which is used to automate some common tasks such as
  * creating table classes or controllers.
@@ -44,7 +44,7 @@ public function __construct() {
     }
     public function createEntityFromQuery(): int {
         $tableObj = CLIUtils::readTable($this);
-        $defaultNs = APP_DIR.'\\entity';
+        $defaultNs = APP_DIR.'\\Entity';
         $this->println('We need from you to give us entity class information.');
         $infoReader = new ClassInfoReader($this);
         $classInfo = $infoReader->readClassInfo($defaultNs);
@@ -142,7 +142,7 @@ private function getWhat() {
         $answer = null;
 
         if ($what !== null) {
-            $answer = $options[$what] ?? null;
+            $answer = $options[strtolower($what)] ?? null;
 
             if ($answer === null) {
                 $this->warning('The argument --c has invalid value.');
diff --git a/webfiori/framework/cli/commands/ListRoutesCommand.php b/WebFiori/Framework/Cli/Commands/ListRoutesCommand.php
similarity index 94%
rename from webfiori/framework/cli/commands/ListRoutesCommand.php
rename to WebFiori/Framework/Cli/Commands/ListRoutesCommand.php
index 048abb80f..7bd0db0ec 100644
--- a/webfiori/framework/cli/commands/ListRoutesCommand.php
+++ b/WebFiori/Framework/Cli/Commands/ListRoutesCommand.php
@@ -8,10 +8,10 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\commands;
+namespace WebFiori\Framework\Cli\Commands;
 
 use WebFiori\Cli\Command;
-use webfiori\framework\router\Router;
+use WebFiori\Framework\Router\Router;
 /**
  * A CLI command which is used to show a list of all added routes.
  *
diff --git a/webfiori/framework/cli/commands/ListThemesCommand.php b/WebFiori/Framework/Cli/Commands/ListThemesCommand.php
similarity index 97%
rename from webfiori/framework/cli/commands/ListThemesCommand.php
rename to WebFiori/Framework/Cli/Commands/ListThemesCommand.php
index ffeb7b300..f3ad23b6a 100644
--- a/webfiori/framework/cli/commands/ListThemesCommand.php
+++ b/WebFiori/Framework/Cli/Commands/ListThemesCommand.php
@@ -8,11 +8,11 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\commands;
+namespace WebFiori\Framework\Cli\Commands;
 
 use WebFiori\Cli\Argument;
 use WebFiori\Cli\Command;
-use webfiori\framework\ThemeManager;
+use WebFiori\Framework\ThemeManager;
 
 /**
  * A CLI command which is used to list all registered themes.
diff --git a/webfiori/framework/cli/commands/RunMigrationsCommand.php b/WebFiori/Framework/Cli/Commands/RunMigrationsCommand.php
similarity index 98%
rename from webfiori/framework/cli/commands/RunMigrationsCommand.php
rename to WebFiori/Framework/Cli/Commands/RunMigrationsCommand.php
index e7bf83f91..fb65f9de2 100644
--- a/webfiori/framework/cli/commands/RunMigrationsCommand.php
+++ b/WebFiori/Framework/Cli/Commands/RunMigrationsCommand.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\commands;
+namespace WebFiori\Framework\Cli\Commands;
 
 use Throwable;
 use WebFiori\Cli\Argument;
@@ -17,8 +17,8 @@
 use WebFiori\Database\Database;
 use WebFiori\Database\migration\AbstractMigration;
 use WebFiori\Database\Schema\SchemaRunner;
-use webfiori\framework\App;
-use webfiori\framework\cli\CLIUtils;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Cli\CLIUtils;
 
 /**
  * Command for executing database migrations.
diff --git a/webfiori/framework/cli/commands/RunSQLQueryCommand.php b/WebFiori/Framework/Cli/Commands/RunSQLQueryCommand.php
similarity index 97%
rename from webfiori/framework/cli/commands/RunSQLQueryCommand.php
rename to WebFiori/Framework/Cli/Commands/RunSQLQueryCommand.php
index 427a6417d..da514fda4 100644
--- a/webfiori/framework/cli/commands/RunSQLQueryCommand.php
+++ b/WebFiori/Framework/Cli/Commands/RunSQLQueryCommand.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\commands;
+namespace WebFiori\Framework\Cli\Commands;
 
 use WebFiori\Cli\Argument;
 use WebFiori\Cli\Command;
@@ -16,9 +16,9 @@
 use WebFiori\Database\DatabaseException;
 use WebFiori\Database\Table;
 use WebFiori\File\File;
-use webfiori\framework\App;
-use webfiori\framework\cli\CLIUtils;
-use webfiori\framework\DB;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Cli\CLIUtils;
+use WebFiori\Framework\DB;
 /**
  * A command which can be used to execute SQL queries on
  * specific database.
@@ -31,7 +31,7 @@ class RunSQLQueryCommand extends Command {
     public function __construct() {
         parent::__construct('run-query', [
             new Argument('--connection', 'Database connection that the query will be executed on.', true),
-            new Argument('--schema', 'The namespace of a class that extends the class "webfiori\\framework\\DB" which represents database schema.', true),
+            new Argument('--schema', 'The namespace of a class that extends the class "WebFiori\\Framework\\DB" which represents database schema.', true),
             new Argument('--create', 'This option is used alongside the option --table and --schema. If it is provided, this means initiate the process of creating the database or the Table.', true),
             new Argument('--table', 'Table class to run query on.', true),
             new Argument('--file', 'The path to SQL file that holds SQL query.', true),
@@ -267,7 +267,7 @@ private function schemaBased($schema) {
         if ($schemaInst instanceof DB) {
             return $this->queryOnSchema($schemaInst);
         } else {
-            $this->error('Given class is not an instance of "webfiori\\framework\\DB"!');
+            $this->error('Given class is not an instance of "WebFiori\\Framework\\DB"!');
 
             return -1;
         }
diff --git a/webfiori/framework/cli/commands/SchedulerCommand.php b/WebFiori/Framework/Cli/Commands/SchedulerCommand.php
similarity index 98%
rename from webfiori/framework/cli/commands/SchedulerCommand.php
rename to WebFiori/Framework/Cli/Commands/SchedulerCommand.php
index b3e901ff4..ca2f80ed3 100644
--- a/webfiori/framework/cli/commands/SchedulerCommand.php
+++ b/WebFiori/Framework/Cli/Commands/SchedulerCommand.php
@@ -8,12 +8,12 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\commands;
+namespace WebFiori\Framework\Cli\Commands;
 
 use WebFiori\Cli\Argument;
 use WebFiori\Cli\Command;
-use webfiori\framework\scheduler\AbstractTask;
-use webfiori\framework\scheduler\TasksManager;
+use WebFiori\Framework\Scheduler\AbstractTask;
+use WebFiori\Framework\Scheduler\TasksManager;
 /**
  * A CLI command which is related to executing
  * background tasks or performing operations on them.
diff --git a/webfiori/framework/cli/commands/SettingsCommand.php b/WebFiori/Framework/Cli/Commands/SettingsCommand.php
similarity index 97%
rename from webfiori/framework/cli/commands/SettingsCommand.php
rename to WebFiori/Framework/Cli/Commands/SettingsCommand.php
index ce9067a31..181f57a87 100644
--- a/webfiori/framework/cli/commands/SettingsCommand.php
+++ b/WebFiori/Framework/Cli/Commands/SettingsCommand.php
@@ -8,10 +8,10 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\commands;
+namespace WebFiori\Framework\Cli\Commands;
 
 use WebFiori\Cli\Command;
-use webfiori\framework\App;
+use WebFiori\Framework\App;
 /**
  * A CLI command which is used to show framework configuration.
  *
diff --git a/webfiori/framework/cli/commands/UpdateSettingsCommand.php b/WebFiori/Framework/Cli/Commands/UpdateSettingsCommand.php
similarity index 97%
rename from webfiori/framework/cli/commands/UpdateSettingsCommand.php
rename to WebFiori/Framework/Cli/Commands/UpdateSettingsCommand.php
index c34763101..e18f49122 100644
--- a/webfiori/framework/cli/commands/UpdateSettingsCommand.php
+++ b/WebFiori/Framework/Cli/Commands/UpdateSettingsCommand.php
@@ -8,16 +8,16 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\commands;
+namespace WebFiori\Framework\Cli\Commands;
 
 use Throwable;
 use WebFiori\Cli\Argument;
 use WebFiori\Cli\Command;
 use WebFiori\Cli\InputValidator;
-use webfiori\framework\App;
-use webfiori\framework\config\Controller;
-use webfiori\framework\router\Router;
-use webfiori\framework\Theme;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Config\Controller;
+use WebFiori\Framework\Router\Router;
+use WebFiori\Framework\Theme;
 /**
  * This class implements a CLI command which is used to update the settings which are
  * stored in the class 'AppConfing' of the application.
diff --git a/webfiori/framework/cli/commands/UpdateTableCommand.php b/WebFiori/Framework/Cli/Commands/UpdateTableCommand.php
similarity index 91%
rename from webfiori/framework/cli/commands/UpdateTableCommand.php
rename to WebFiori/Framework/Cli/Commands/UpdateTableCommand.php
index a84009375..ad238f16c 100644
--- a/webfiori/framework/cli/commands/UpdateTableCommand.php
+++ b/WebFiori/Framework/Cli/Commands/UpdateTableCommand.php
@@ -8,13 +8,13 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\commands;
+namespace WebFiori\Framework\Cli\Commands;
 
 use WebFiori\Cli\Argument;
 use WebFiori\Cli\Command;
-use webfiori\framework\cli\CLIUtils;
-use webfiori\framework\cli\helpers\CreateTableObj;
-use webfiori\framework\cli\helpers\TableObjHelper;
+use WebFiori\Framework\Cli\CLIUtils;
+use WebFiori\Framework\Cli\Helpers\CreateTableObj;
+use WebFiori\Framework\Cli\Helpers\TableObjHelper;
 /**
  * A command which is used to update the properties of database table class.
  *
diff --git a/webfiori/framework/cli/commands/VersionCommand.php b/WebFiori/Framework/Cli/Commands/VersionCommand.php
similarity index 95%
rename from webfiori/framework/cli/commands/VersionCommand.php
rename to WebFiori/Framework/Cli/Commands/VersionCommand.php
index b395cf90c..3e9934c6f 100644
--- a/webfiori/framework/cli/commands/VersionCommand.php
+++ b/WebFiori/Framework/Cli/Commands/VersionCommand.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\commands;
+namespace WebFiori\Framework\Cli\Commands;
 
 use WebFiori\Cli\Command;
 /**
diff --git a/webfiori/framework/cli/commands/WHelpCommand.php b/WebFiori/Framework/Cli/Commands/WHelpCommand.php
similarity index 94%
rename from webfiori/framework/cli/commands/WHelpCommand.php
rename to WebFiori/Framework/Cli/Commands/WHelpCommand.php
index a39a2f81b..f0ddf589f 100644
--- a/webfiori/framework/cli/commands/WHelpCommand.php
+++ b/WebFiori/Framework/Cli/Commands/WHelpCommand.php
@@ -8,9 +8,9 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\commands;
+namespace WebFiori\Framework\Cli\Commands;
 
-use WebFiori\Cli\commands\HelpCommand;
+use WebFiori\Cli\Commands\HelpCommand;
 /**
  * Description of WHelpCommand
  *
diff --git a/webfiori/framework/cli/helpers/ClassInfoReader.php b/WebFiori/Framework/Cli/Helpers/ClassInfoReader.php
similarity index 97%
rename from webfiori/framework/cli/helpers/ClassInfoReader.php
rename to WebFiori/Framework/Cli/Helpers/ClassInfoReader.php
index e8fa230ab..a40869c7c 100644
--- a/webfiori/framework/cli/helpers/ClassInfoReader.php
+++ b/WebFiori/Framework/Cli/Helpers/ClassInfoReader.php
@@ -8,12 +8,12 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\helpers;
+namespace WebFiori\Framework\Cli\Helpers;
 
 use InvalidArgumentException;
 use WebFiori\Cli\Command;
-use webfiori\framework\cli\CLIUtils;
-use webfiori\framework\Util;
+use WebFiori\Framework\Cli\CLIUtils;
+use WebFiori\Framework\Util;
 /**
  * A class which is used to read class information as prompt from any input stream
  * which is set by the class 'Runner'.
diff --git a/webfiori/framework/cli/helpers/CreateAPITestCase.php b/WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php
similarity index 93%
rename from webfiori/framework/cli/helpers/CreateAPITestCase.php
rename to WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php
index 56c90e156..6a8d10742 100644
--- a/webfiori/framework/cli/helpers/CreateAPITestCase.php
+++ b/WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php
@@ -8,10 +8,10 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\helpers;
+namespace WebFiori\Framework\Cli\Helpers;
 
-use webfiori\framework\cli\commands\CreateCommand;
-use webfiori\framework\writers\APITestCaseWriter;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
+use WebFiori\Framework\Writers\APITestCaseWriter;
 use WebFiori\Http\WebServicesManager;
 /**
  * A helper class which is used to help in creating test cases for web APIs classes using CLI.
@@ -44,7 +44,7 @@ public function readClassInfo() {
         array_pop($nsArr);
         $ns = implode('\\', $nsArr);
         $this->setClassName($this->writer->getServiceName().'Test');
-        $this->setNamespace('tests\\'.$ns);
+        $this->setNamespace($ns);
         $this->setPath(ROOT_PATH.DS.'tests'.DS.implode(DS, $nsArr));
 
 
@@ -67,7 +67,8 @@ private function checkPlace($ns) {
             $this->writeClass();
         } else {
             $this->writer->setPhpUnitVersion($this->getCommand()->readInteger('PHPUnit Version:', 11));
-            $this->setClassInfo('tests\\'.$ns, 'Test');
+            $this->setClassInfo($ns, 'Test');
+            $this->setPath(ROOT_PATH.DS.'tests'.DS.$this->writer->getNamespace());    
             $this->writeClass();
         }
     }
diff --git a/webfiori/framework/cli/helpers/CreateBackgroundTask.php b/WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php
similarity index 89%
rename from webfiori/framework/cli/helpers/CreateBackgroundTask.php
rename to WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php
index 1888aa0da..26d6b1cc3 100644
--- a/webfiori/framework/cli/helpers/CreateBackgroundTask.php
+++ b/WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php
@@ -8,14 +8,14 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\helpers;
+namespace WebFiori\Framework\Cli\Helpers;
 
 use InvalidArgumentException;
 use WebFiori\Cli\InputValidator;
-use webfiori\framework\cli\commands\CreateCommand;
-use webfiori\framework\scheduler\BaseTask;
-use webfiori\framework\scheduler\TaskArgument;
-use webfiori\framework\writers\SchedulerTaskClassWriter;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
+use WebFiori\Framework\Scheduler\BaseTask;
+use WebFiori\Framework\Scheduler\TaskArgument;
+use WebFiori\Framework\Writers\SchedulerTaskClassWriter;
 /**
  * A helper class which is used to help in creating scheduler tasks classes using CLI.
  *
@@ -38,7 +38,7 @@ public function __construct(CreateCommand $command) {
         $this->taskWriter = $this->getWriter();
     }
     public function readClassInfo() {
-        $this->setClassInfo(APP_DIR.'\\tasks', 'Task');
+        $this->setClassInfo(APP_DIR.'\\Tasks', 'Task');
         $taskName = $this->getTaskName();
         $taskDesc = $this->getTaskDesc();
 
diff --git a/webfiori/framework/cli/helpers/CreateCLIClassHelper.php b/WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php
similarity index 94%
rename from webfiori/framework/cli/helpers/CreateCLIClassHelper.php
rename to WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php
index 7557d1aa0..7b05ff331 100644
--- a/webfiori/framework/cli/helpers/CreateCLIClassHelper.php
+++ b/WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php
@@ -8,11 +8,11 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\helpers;
+namespace WebFiori\Framework\Cli\Helpers;
 
 use WebFiori\Cli\InputValidator;
-use webfiori\framework\cli\commands\CreateCommand;
-use webfiori\framework\writers\CommandClassWriter;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
+use WebFiori\Framework\Writers\CommandClassWriter;
 /**
  * A helper class which is used to help in creating CLI command classes using CLI.
  *
@@ -35,7 +35,7 @@ public function __construct(CreateCommand $command) {
         $this->cliWriter = $this->getWriter();
     }
     public function readClassInfo() {
-        $this->setClassInfo(APP_DIR.'\\commands', 'Command');
+        $this->setClassInfo(APP_DIR.'\\Commands', 'Command');
         $commandName = $this->getCommandName();
         $commandDesc = $this->getInput('Give a short description of the command:');
 
diff --git a/webfiori/framework/cli/helpers/CreateClassHelper.php b/WebFiori/Framework/Cli/Helpers/CreateClassHelper.php
similarity index 98%
rename from webfiori/framework/cli/helpers/CreateClassHelper.php
rename to WebFiori/Framework/Cli/Helpers/CreateClassHelper.php
index be0024db6..46ecbeaed 100644
--- a/webfiori/framework/cli/helpers/CreateClassHelper.php
+++ b/WebFiori/Framework/Cli/Helpers/CreateClassHelper.php
@@ -8,12 +8,12 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\helpers;
+namespace WebFiori\Framework\Cli\Helpers;
 
 use WebFiori\Cli\Command;
 use WebFiori\Cli\InputValidator;
-use webfiori\framework\cli\commands\CreateCommand;
-use webfiori\framework\writers\ClassWriter;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
+use WebFiori\Framework\Writers\ClassWriter;
 /**
  * A wrapper class which helps in creating classes using CLI.
  *
diff --git a/webfiori/framework/cli/helpers/CreateDBAccessHelper.php b/WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php
similarity index 93%
rename from webfiori/framework/cli/helpers/CreateDBAccessHelper.php
rename to WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php
index 5d8770220..a7b592991 100644
--- a/webfiori/framework/cli/helpers/CreateDBAccessHelper.php
+++ b/WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php
@@ -8,12 +8,12 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\helpers;
+namespace WebFiori\Framework\Cli\Helpers;
 
 use WebFiori\Database\Table;
-use webfiori\framework\App;
-use webfiori\framework\cli\commands\CreateCommand;
-use webfiori\framework\writers\DBClassWriter;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
+use WebFiori\Framework\Writers\DBClassWriter;
 
 /**
  * Description of CreateDBAccessHelper
@@ -51,7 +51,7 @@ public function getTable() : Table {
      * the namespace at which the class will be added to.
      */
     public function readDbClassInfo() {
-        $info = $this->getClassInfo(APP_DIR.'\\database', 'DB');
+        $info = $this->getClassInfo(APP_DIR.'\\Database', 'DB');
         $this->getWriter()->setNamespace($info['namespace']);
         $this->getWriter()->setPath(ROOT_PATH.DS.$info['namespace']);
         $this->getWriter()->setClassName($info['name']);
@@ -62,7 +62,7 @@ public function readEntityInfo() {
         $t = $this->getTable();
         $m = $t->getEntityMapper();
         $m->setEntityName($this->getCommand()->readClassName('Entity class name:', null));
-        $m->setNamespace($this->getCommand()->readNamespace('Entity namespace:',  APP_DIR.'\\entity'));
+        $m->setNamespace($this->getCommand()->readNamespace('Entity namespace:',  APP_DIR.'\\Entity'));
     }
     public function readTable() {
         $tableClassNameValidity = false;
diff --git a/webfiori/framework/cli/helpers/CreateFullRESTHelper.php b/WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php
similarity index 96%
rename from webfiori/framework/cli/helpers/CreateFullRESTHelper.php
rename to WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php
index d9333e3b3..a15324ece 100644
--- a/webfiori/framework/cli/helpers/CreateFullRESTHelper.php
+++ b/WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php
@@ -8,20 +8,20 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\helpers;
+namespace WebFiori\Framework\Cli\Helpers;
 
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Database\MsSql\MSSQLTable;
 use WebFiori\Database\MySql\MySQLTable;
 use WebFiori\Database\Table;
-use webfiori\framework\cli\CLIUtils;
-use webfiori\framework\writers\DBClassWriter;
-use webfiori\framework\writers\ServiceHolder;
-use webfiori\framework\writers\TableClassWriter;
-use webfiori\framework\writers\WebServiceWriter;
+use WebFiori\Framework\Cli\CLIUtils;
+use WebFiori\Framework\Writers\DBClassWriter;
+use WebFiori\Framework\Writers\ServiceHolder;
+use WebFiori\Framework\Writers\TableClassWriter;
+use WebFiori\Framework\Writers\WebServiceWriter;
 use WebFiori\Json\Json;
 /**
- * A helper class for creating database tables classes.
+ * A helper class for creating database Tables classes.
  *
  * @author Ibrahim
  */
@@ -207,11 +207,11 @@ private function IncludeAPISetProps(WebServiceWriter $w, $type) {
     }
 
     private function readAPIInfo() {
-        $this->apisNs = CLIUtils::readNamespace($this->getCommand(), APP_DIR.'\\apis',"Last thing needed is to provide us with namespace for web services:");
+        $this->apisNs = CLIUtils::readNamespace($this->getCommand(), APP_DIR.'\\Apis',"Last thing needed is to provide us with namespace for web services:");
     }
     private function readEntityInfo() {
         $this->println("First thing, we need entity class information.");
-        $entityInfo = $this->getClassInfo(APP_DIR.'\\entity');
+        $entityInfo = $this->getClassInfo(APP_DIR.'\\Entity');
         $entityInfo['implement-jsoni'] = $this->confirm('Would you like from your entity class to implement the interface JsonI?', true);
         $this->tableObjWriter->setEntityInfo($entityInfo['name'], $entityInfo['namespace'], $entityInfo['path'], $entityInfo['implement-jsoni']);
 
@@ -230,7 +230,7 @@ private function readEntityInfo() {
     }
     private function readTableInfo() {
         $this->println("Now, time to collect database table information.");
-        $ns = CLIUtils::readNamespace($this->getCommand(), APP_DIR.'\\database', 'Provide us with a namespace for table class:');
+        $ns = CLIUtils::readNamespace($this->getCommand(), APP_DIR.'\\Database', 'Provide us with a namespace for table class:');
         $this->tableObjWriter->setNamespace($ns);
         $this->tableObjWriter->setPath(ROOT_PATH.DS.$ns);
 
diff --git a/webfiori/framework/cli/helpers/CreateMiddleware.php b/WebFiori/Framework/Cli/Helpers/CreateMiddleware.php
similarity index 90%
rename from webfiori/framework/cli/helpers/CreateMiddleware.php
rename to WebFiori/Framework/Cli/Helpers/CreateMiddleware.php
index ae3698501..32b7fbe35 100644
--- a/webfiori/framework/cli/helpers/CreateMiddleware.php
+++ b/WebFiori/Framework/Cli/Helpers/CreateMiddleware.php
@@ -8,11 +8,11 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\helpers;
+namespace WebFiori\Framework\Cli\Helpers;
 
 use WebFiori\Cli\InputValidator;
-use webfiori\framework\cli\commands\CreateCommand;
-use webfiori\framework\writers\MiddlewareClassWriter;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
+use WebFiori\Framework\Writers\MiddlewareClassWriter;
 /**
  * A helper class that works with the create command to create a middleware.
  *
@@ -35,7 +35,7 @@ public function __construct(CreateCommand $command) {
         $this->mdWriter = $this->getWriter();
     }
     public function readClassInfo() {
-        $this->setClassInfo(APP_DIR.'\\middleware', 'Middleware');
+        $this->setClassInfo(APP_DIR.'\\Middleware', 'Middleware');
 
         $middlewareName = $this->getMiddlewareName();
         $priority = $this->getCommand()->readInteger('Enter middleware priority:', 0);
diff --git a/webfiori/framework/cli/helpers/CreateMigration.php b/WebFiori/Framework/Cli/Helpers/CreateMigration.php
similarity index 83%
rename from webfiori/framework/cli/helpers/CreateMigration.php
rename to WebFiori/Framework/Cli/Helpers/CreateMigration.php
index a50d8f7b8..b208ce1e8 100644
--- a/webfiori/framework/cli/helpers/CreateMigration.php
+++ b/WebFiori/Framework/Cli/Helpers/CreateMigration.php
@@ -8,12 +8,12 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\helpers;
+namespace WebFiori\Framework\Cli\Helpers;
 
 use WebFiori\Database\Schema\SchemaRunner;
-use webfiori\framework\cli\CLIUtils;
-use webfiori\framework\cli\commands\CreateCommand;
-use webfiori\framework\writers\DatabaseMigrationWriter;
+use WebFiori\Framework\Cli\CLIUtils;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
+use WebFiori\Framework\Writers\DatabaseMigrationWriter;
 /**
  * A helper class which is used to help in creating scheduler tasks classes using CLI.
  *
@@ -29,7 +29,7 @@ class CreateMigration extends CreateClassHelper {
      * @param CreateCommand $command A command that is used to call the class.
      */
     public function __construct(CreateCommand $command) {
-        $ns = APP_DIR.'\\database\\migrations';
+        $ns = APP_DIR.'\\Database\\migrations';
         if (!$command->isArgProvided('--defaults')) {
             $ns = CLIUtils::readNamespace($command, $ns , 'Migration namespace:');
         }
diff --git a/webfiori/framework/cli/helpers/CreateTableObj.php b/WebFiori/Framework/Cli/Helpers/CreateTableObj.php
similarity index 88%
rename from webfiori/framework/cli/helpers/CreateTableObj.php
rename to WebFiori/Framework/Cli/Helpers/CreateTableObj.php
index a0df9f673..2d0111eee 100644
--- a/webfiori/framework/cli/helpers/CreateTableObj.php
+++ b/WebFiori/Framework/Cli/Helpers/CreateTableObj.php
@@ -8,17 +8,17 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\helpers;
+namespace WebFiori\Framework\Cli\Helpers;
 
 use WebFiori\Cli\Command;
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Database\MsSql\MSSQLTable;
 use WebFiori\Database\MySql\MySQLTable;
-use webfiori\framework\cli\commands\CreateCommand;
-use webfiori\framework\writers\TableClassWriter;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
+use WebFiori\Framework\Writers\TableClassWriter;
 use WebFiori\Json\CaseConverter;
 /**
- * A helper class for creating database tables classes.
+ * A helper class for creating database Tables classes.
  *
  * @author Ibrahim
  */
@@ -43,7 +43,7 @@ public function readClassInfo() {
             $tempTable = new MSSQLTable();
         }
         $this->getWriter()->setTable($tempTable);
-        $this->setClassInfo(APP_DIR.'\\database', 'Table');
+        $this->setClassInfo(APP_DIR.'\\Database', 'Table');
 
         $tableHelper = new TableObjHelper($this, $tempTable);
         $tableHelper->setTableName(CaseConverter::toSnakeCase($this->getWriter()->getName()));
diff --git a/webfiori/framework/cli/helpers/CreateThemeHelper.php b/WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php
similarity index 80%
rename from webfiori/framework/cli/helpers/CreateThemeHelper.php
rename to WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php
index be3663dae..5a487d7cf 100644
--- a/webfiori/framework/cli/helpers/CreateThemeHelper.php
+++ b/WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php
@@ -8,10 +8,10 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\helpers;
+namespace WebFiori\Framework\Cli\Helpers;
 
-use webfiori\framework\cli\commands\CreateCommand;
-use webfiori\framework\writers\ThemeClassWriter;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
+use WebFiori\Framework\Writers\ThemeClassWriter;
 /**
  * Description of CreateTheme
  *
@@ -27,7 +27,7 @@ public function __construct(CreateCommand $command) {
         parent::__construct($command, new ThemeClassWriter('New Theme'));
     }
     public function readClassInfo() {
-        $this->setClassInfo('themes', 'Theme');
+        $this->setClassInfo('Themes', 'Theme');
 
         $this->println('Creating theme at "'.$this->getWriter()->getPath().'"...');
         $this->writeClass();
diff --git a/webfiori/framework/cli/helpers/CreateWebService.php b/WebFiori/Framework/Cli/Helpers/CreateWebService.php
similarity index 95%
rename from webfiori/framework/cli/helpers/CreateWebService.php
rename to WebFiori/Framework/Cli/Helpers/CreateWebService.php
index 1fcb6e992..6792c0e72 100644
--- a/webfiori/framework/cli/helpers/CreateWebService.php
+++ b/WebFiori/Framework/Cli/Helpers/CreateWebService.php
@@ -8,11 +8,11 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\helpers;
+namespace WebFiori\Framework\Cli\Helpers;
 
-use webfiori\framework\cli\commands\CreateCommand;
-use webfiori\framework\writers\ServiceHolder;
-use webfiori\framework\writers\WebServiceWriter;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
+use WebFiori\Framework\Writers\ServiceHolder;
+use WebFiori\Framework\Writers\WebServiceWriter;
 use WebFiori\Http\ParamType;
 use WebFiori\Http\RequestMethod;
 use WebFiori\Http\RequestParameter;
@@ -49,7 +49,7 @@ public function addRequestMethods() {
         }
     }
     public function readClassInfo() {
-        $this->setClassInfo(APP_DIR.'\\apis', 'Service');
+        $this->setClassInfo(APP_DIR.'\\Apis', 'Service');
 
         $this->setServiceName();
         $this->serviceObj->setDescription($this->getInput('Description:'));
diff --git a/webfiori/framework/cli/helpers/TableObjHelper.php b/WebFiori/Framework/Cli/Helpers/TableObjHelper.php
similarity index 98%
rename from webfiori/framework/cli/helpers/TableObjHelper.php
rename to WebFiori/Framework/Cli/Helpers/TableObjHelper.php
index 5cd70a1e9..fbff68dc6 100644
--- a/webfiori/framework/cli/helpers/TableObjHelper.php
+++ b/WebFiori/Framework/Cli/Helpers/TableObjHelper.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\cli\helpers;
+namespace WebFiori\Framework\Cli\Helpers;
 
 use Throwable;
 use WebFiori\Cli\Command;
@@ -18,9 +18,9 @@
 use WebFiori\Database\MySql\MySQLColumn;
 use WebFiori\Database\MySql\MySQLTable;
 use WebFiori\Database\Table;
-use webfiori\framework\App;
-use webfiori\framework\cli\commands\UpdateTableCommand;
-use webfiori\framework\DB;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Cli\Commands\UpdateTableCommand;
+use WebFiori\Framework\DB;
 
 /**
  * A CLI class helper which has methods to help in creating and
@@ -189,7 +189,7 @@ public function copyCheck() {
         $helper = $this->getCreateHelper();
 
         if ($helper->confirm('Would you like to update same class or create a copy with the update?', false)) {
-            $info = $helper->getClassInfo(APP_DIR.'\\database', 'Table');
+            $info = $helper->getClassInfo(APP_DIR.'\\Database', 'Table');
             $helper->setClassName($info['name']);
             $helper->setNamespace($info['namespace']);
             $helper->setPath($info['path']);
@@ -203,7 +203,7 @@ public function copyCheck() {
      */
     public function createEntity() {
         $helper = $this->getCreateHelper();
-        $entityInfo = $helper->getClassInfo(APP_DIR.'\\entity');
+        $entityInfo = $helper->getClassInfo(APP_DIR.'\\Entity');
         $entityInfo['implement-jsoni'] = $helper->confirm('Would you like from your entity class to implement the interface JsonI?', true);
         $helper->getWriter()->setEntityInfo($entityInfo['name'], $entityInfo['namespace'], $entityInfo['path'], $entityInfo['implement-jsoni']);
 
diff --git a/webfiori/framework/config/ClassDriver.php b/WebFiori/Framework/Config/ClassDriver.php
similarity index 99%
rename from webfiori/framework/config/ClassDriver.php
rename to WebFiori/Framework/Config/ClassDriver.php
index 7d63becfa..3c4647836 100644
--- a/webfiori/framework/config/ClassDriver.php
+++ b/WebFiori/Framework/Config/ClassDriver.php
@@ -1,25 +1,25 @@
 <?php
-namespace webfiori\framework\config;
+namespace WebFiori\Framework\Config;
 
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Mail\SMTPAccount;
 use WebFiori\File\exceptions\FileException;
 use WebFiori\File\File;
-use webfiori\framework\writers\LangClassWriter;
+use WebFiori\Framework\Writers\LangClassWriter;
 use WebFiori\Http\Uri;
 
 /**
  * A configuration driver which is used to store configuration on PHP class.
  *
  * This driver will
- * create a class called 'AppConfig' on the directory APP_DIR/config and
+ * create a class called 'AppConfig' on the directory APP_DIR/Config and
  * use it to read and write configurations.
  *
  * @author Ibrahim
  */
 class ClassDriver implements ConfigurationDriver {
-    const CONFIG_FILE_PATH = APP_PATH.'config'.DIRECTORY_SEPARATOR.'AppConfig.php';
-    const CONFIG_NS = APP_DIR.'\\config\\AppConfig';
+    const CONFIG_FILE_PATH = APP_PATH.'Config'.DIRECTORY_SEPARATOR.'AppConfig.php';
+    const CONFIG_NS = APP_DIR.'\\Config\\AppConfig';
     const NL = "\n";
     private $blockEnd;
     private $configVars;
@@ -960,9 +960,9 @@ private function writeAppConfigAttrs($cFile) {
         self::a($cFile, "");
         self::a($cFile, "namespace ".APP_DIR."\\config;");
         self::a($cFile, "");
-        self::a($cFile, "use webfiori\\database\\ConnectionInfo;");
-        self::a($cFile, "use webfiori\\email\\SMTPAccount;");
-        self::a($cFile, "use webfiori\\http\\Uri;");
+        self::a($cFile, "use WebFiori\\database\\ConnectionInfo;");
+        self::a($cFile, "use WebFiori\\email\\SMTPAccount;");
+        self::a($cFile, "use WebFiori\\http\\Uri;");
         self::a($cFile, "/**");
         self::a($cFile, " * Configuration class of the application");
         self::a($cFile, " *");
@@ -1302,7 +1302,7 @@ private function writeSiteTitles($cFile) {
             $title = str_replace("'", "\'", $title);
             self::a($cFile, "            '$langCode' => '$title',");
 
-            if (!class_exists(APP_DIR.'\\langs\\Lang'.$langCode)) {
+            if (!class_exists(APP_DIR.'\\Langs\\Lang'.$langCode)) {
                 //This requires a fix in the future
                 $dir = $langCode == 'AR' ? 'rtl' : 'ltr';
 
diff --git a/webfiori/framework/config/ConfigurationDriver.php b/WebFiori/Framework/Config/ConfigurationDriver.php
similarity index 99%
rename from webfiori/framework/config/ConfigurationDriver.php
rename to WebFiori/Framework/Config/ConfigurationDriver.php
index 9c29a0b21..93382a08b 100644
--- a/webfiori/framework/config/ConfigurationDriver.php
+++ b/WebFiori/Framework/Config/ConfigurationDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace webfiori\framework\config;
+namespace WebFiori\Framework\Config;
 
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Mail\SMTPAccount;
diff --git a/webfiori/framework/config/Controller.php b/WebFiori/Framework/Config/Controller.php
similarity index 97%
rename from webfiori/framework/config/Controller.php
rename to WebFiori/Framework/Config/Controller.php
index 0229e65c0..367a44b5d 100644
--- a/webfiori/framework/config/Controller.php
+++ b/WebFiori/Framework/Config/Controller.php
@@ -1,9 +1,9 @@
 <?php
-namespace webfiori\framework\config;
+namespace WebFiori\Framework\Config;
 
 use Exception;
-use webfiori\framework\App;
-use webfiori\framework\exceptions\InitializationException;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Exceptions\InitializationException;
 
 /**
  * A class which acts as an interface between the application and configuration
diff --git a/webfiori/framework/config/JsonDriver.php b/WebFiori/Framework/Config/JsonDriver.php
similarity index 98%
rename from webfiori/framework/config/JsonDriver.php
rename to WebFiori/Framework/Config/JsonDriver.php
index dc0252f5d..831a0594d 100644
--- a/webfiori/framework/config/JsonDriver.php
+++ b/WebFiori/Framework/Config/JsonDriver.php
@@ -1,10 +1,10 @@
 <?php
-namespace webfiori\framework\config;
+namespace WebFiori\Framework\Config;
 
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Mail\SMTPAccount;
 use WebFiori\File\File;
-use webfiori\framework\exceptions\InitializationException;
+use WebFiori\Framework\Exceptions\InitializationException;
 use WebFiori\Http\Uri;
 use WebFiori\Json\Json;
 
@@ -12,7 +12,7 @@
  * Application configuration driver which is used to read and write application
  * configuration from JSON file.
  *
- * The driver will create a JSON file in the path 'APP_PATH/config' with
+ * The driver will create a JSON file in the path 'APP_PATH/Config' with
  * the name 'app-config.json'. The developer can use the file to
  * modify application configuration. The name of the file can be changed as needed.
  *
@@ -24,7 +24,7 @@ class JsonDriver implements ConfigurationDriver {
      * Returns the path to JSON configuration files.
      */
     public static function getConfigPath(): string {
-        return APP_PATH.'config'.DIRECTORY_SEPARATOR;
+        return APP_PATH.'Config'.DIRECTORY_SEPARATOR;
     }
     /**
      * The name of JSON configuration file.
@@ -597,7 +597,7 @@ public function setBaseURL(string $url) {
     /**
      * Sets the name of the file that configuration values will be taken from.
      *
-     * The file must exist on the directory [APP_PATH]/config/ .
+     * The file must exist on the directory [APP_PATH]/Config/ .
      *
      * @param string $name
      */
diff --git a/webfiori/framework/DB.php b/WebFiori/Framework/DB.php
similarity index 91%
rename from webfiori/framework/DB.php
rename to WebFiori/Framework/DB.php
index d1d9ed4a0..fec4bfa8a 100644
--- a/webfiori/framework/DB.php
+++ b/WebFiori/Framework/DB.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework;
+namespace WebFiori\Framework;
 
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Database\Database;
@@ -66,7 +66,7 @@ public function __construct($connName) {
      * @param bool $updateOwnerDb If the owner database of the table is already
      * set and this parameter is set to true, the owner database will be
      * updated to the database specified in the instance. This parameter
-     * is used to maintain foreign key relationships between tables which
+     * is used to maintain foreign key relationships between Tables which
      * belongs to different databases.
      *
      * @return boolean If the table is added, the method will return true. False
@@ -89,16 +89,16 @@ public function addTable(Table $table, bool $updateOwnerDb = true) : bool {
         return false;
     }
     /**
-     * Auto-register database tables which exist on a specific directory.
+     * Auto-register database Tables which exist on a specific directory.
      *
-     * Note that the classes which represents tables must be suffixed
+     * Note that the classes which represents Tables must be suffixed
      * with the word 'Table' (e.g. UsersTable). Also, the registration will depend
      * on the database that the connection is for. For example, if the connection
-     * is for MySQL database, then only tables of type 'MySQLTable'.
+     * is for MySQL database, then only Tables of type 'MySQLTable'.
      *
      * @param string $pathToScan A path which is relative to application source
      * code. For example, If your application folder name is 'app'
-     * and if tables classes exist in the folder 'app\database', then the value of this
+     * and if Tables classes exist in the folder 'App\Database', then the value of this
      * argument must be 'database'.
      *
      * @since 1.0.1
diff --git a/webfiori/framework/EmailMessage.php b/WebFiori/Framework/EmailMessage.php
similarity index 97%
rename from webfiori/framework/EmailMessage.php
rename to WebFiori/Framework/EmailMessage.php
index 419ab3f88..9e50b9835 100644
--- a/webfiori/framework/EmailMessage.php
+++ b/WebFiori/Framework/EmailMessage.php
@@ -8,12 +8,12 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework;
+namespace WebFiori\Framework;
 
 use WebFiori\Mail\Email;
 use WebFiori\Mail\Exceptions\SMTPException;
 use WebFiori\Mail\SMTPAccount;
-use webfiori\framework\exceptions\MissingLangException;
+use WebFiori\Framework\Exceptions\MissingLangException;
 /**
  * A class that can be used to write HTML formatted Email messages.
  *
diff --git a/webfiori/framework/exceptions/ArrayIndexOutOfBoundsException.php b/WebFiori/Framework/Exceptions/ArrayIndexOutOfBoundsException.php
similarity index 91%
rename from webfiori/framework/exceptions/ArrayIndexOutOfBoundsException.php
rename to WebFiori/Framework/Exceptions/ArrayIndexOutOfBoundsException.php
index 12ab2a0e3..3251befa0 100644
--- a/webfiori/framework/exceptions/ArrayIndexOutOfBoundsException.php
+++ b/WebFiori/Framework/Exceptions/ArrayIndexOutOfBoundsException.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\exceptions;
+namespace WebFiori\Framework\Exceptions;
 
 use Exception;
 /**
diff --git a/webfiori/framework/exceptions/InitializationException.php b/WebFiori/Framework/Exceptions/InitializationException.php
similarity index 90%
rename from webfiori/framework/exceptions/InitializationException.php
rename to WebFiori/Framework/Exceptions/InitializationException.php
index b1aea2881..143f95c97 100644
--- a/webfiori/framework/exceptions/InitializationException.php
+++ b/WebFiori/Framework/Exceptions/InitializationException.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\exceptions;
+namespace WebFiori\Framework\Exceptions;
 
 use Exception;
 /**
diff --git a/webfiori/framework/exceptions/InvalidCRONExprException.php b/WebFiori/Framework/Exceptions/InvalidCRONExprException.php
similarity index 91%
rename from webfiori/framework/exceptions/InvalidCRONExprException.php
rename to WebFiori/Framework/Exceptions/InvalidCRONExprException.php
index 01a4e25cf..95eac152a 100644
--- a/webfiori/framework/exceptions/InvalidCRONExprException.php
+++ b/WebFiori/Framework/Exceptions/InvalidCRONExprException.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\exceptions;
+namespace WebFiori\Framework\Exceptions;
 
 use Exception;
 /**
diff --git a/webfiori/framework/exceptions/MissingLangException.php b/WebFiori/Framework/Exceptions/MissingLangException.php
similarity index 91%
rename from webfiori/framework/exceptions/MissingLangException.php
rename to WebFiori/Framework/Exceptions/MissingLangException.php
index d26b3b636..50d95c9f0 100644
--- a/webfiori/framework/exceptions/MissingLangException.php
+++ b/WebFiori/Framework/Exceptions/MissingLangException.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\exceptions;
+namespace WebFiori\Framework\Exceptions;
 
 use Exception;
 /**
diff --git a/webfiori/framework/exceptions/NoSuchThemeException.php b/WebFiori/Framework/Exceptions/NoSuchThemeException.php
similarity index 91%
rename from webfiori/framework/exceptions/NoSuchThemeException.php
rename to WebFiori/Framework/Exceptions/NoSuchThemeException.php
index 751a3d2b1..c65e00bec 100644
--- a/webfiori/framework/exceptions/NoSuchThemeException.php
+++ b/WebFiori/Framework/Exceptions/NoSuchThemeException.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\exceptions;
+namespace WebFiori\Framework\Exceptions;
 
 use Exception;
 /**
diff --git a/webfiori/framework/exceptions/RoutingException.php b/WebFiori/Framework/Exceptions/RoutingException.php
similarity index 91%
rename from webfiori/framework/exceptions/RoutingException.php
rename to WebFiori/Framework/Exceptions/RoutingException.php
index 54c17b39e..ff6b240ef 100644
--- a/webfiori/framework/exceptions/RoutingException.php
+++ b/WebFiori/Framework/Exceptions/RoutingException.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\exceptions;
+namespace WebFiori\Framework\Exceptions;
 
 use Exception;
 
diff --git a/webfiori/framework/exceptions/SessionException.php b/WebFiori/Framework/Exceptions/SessionException.php
similarity index 91%
rename from webfiori/framework/exceptions/SessionException.php
rename to WebFiori/Framework/Exceptions/SessionException.php
index bd37f057e..f576f0ad1 100644
--- a/webfiori/framework/exceptions/SessionException.php
+++ b/WebFiori/Framework/Exceptions/SessionException.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\exceptions;
+namespace WebFiori\Framework\Exceptions;
 
 use Exception;
 /**
diff --git a/webfiori/framework/exceptions/UIException.php b/WebFiori/Framework/Exceptions/UIException.php
similarity index 91%
rename from webfiori/framework/exceptions/UIException.php
rename to WebFiori/Framework/Exceptions/UIException.php
index b08452f8d..a21f14e2b 100644
--- a/webfiori/framework/exceptions/UIException.php
+++ b/WebFiori/Framework/Exceptions/UIException.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\exceptions;
+namespace WebFiori\Framework\Exceptions;
 
 use Exception;
 /**
diff --git a/webfiori/framework/ExtendedWebServicesManager.php b/WebFiori/Framework/ExtendedWebServicesManager.php
similarity index 98%
rename from webfiori/framework/ExtendedWebServicesManager.php
rename to WebFiori/Framework/ExtendedWebServicesManager.php
index 3607155b6..40e8015c2 100644
--- a/webfiori/framework/ExtendedWebServicesManager.php
+++ b/WebFiori/Framework/ExtendedWebServicesManager.php
@@ -8,9 +8,9 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework;
+namespace WebFiori\Framework;
 
-use webfiori\framework\session\SessionsManager;
+use WebFiori\Framework\Session\SessionsManager;
 use WebFiori\Http\AbstractWebService;
 use WebFiori\Http\Request;
 use WebFiori\Http\WebServicesManager;
@@ -180,7 +180,7 @@ public function getTranslation() {
         return $this->translation;
     }
     /**
-     * Auto-register services tables which exist on a specific directory.
+     * Auto-register services Tables which exist on a specific directory.
      *
      * The classes which represents web services must be suffixed
      * with the word 'Service' in order to register them (e.g. RegisterUserService).
diff --git a/webfiori/framework/handlers/APICallErrHandler.php b/WebFiori/Framework/Handlers/APICallErrHandler.php
similarity index 96%
rename from webfiori/framework/handlers/APICallErrHandler.php
rename to WebFiori/Framework/Handlers/APICallErrHandler.php
index b32bed9ee..50db4ba3a 100644
--- a/webfiori/framework/handlers/APICallErrHandler.php
+++ b/WebFiori/Framework/Handlers/APICallErrHandler.php
@@ -8,11 +8,11 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\handlers;
+namespace WebFiori\Framework\Handlers;
 
 use WebFiori\Error\AbstractHandler;
-use webfiori\framework\App;
-use webfiori\framework\router\Router;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Router\Router;
 use WebFiori\Http\Request;
 use WebFiori\Http\Response;
 use WebFiori\Json\Json;
diff --git a/webfiori/framework/handlers/CLIErrHandler.php b/WebFiori/Framework/Handlers/CLIErrHandler.php
similarity index 96%
rename from webfiori/framework/handlers/CLIErrHandler.php
rename to WebFiori/Framework/Handlers/CLIErrHandler.php
index d3ec23de3..8014afbe6 100644
--- a/webfiori/framework/handlers/CLIErrHandler.php
+++ b/WebFiori/Framework/Handlers/CLIErrHandler.php
@@ -8,13 +8,13 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\handlers;
+namespace WebFiori\Framework\Handlers;
 
 use WebFiori\Cli\Formatter;
 use WebFiori\Cli\Runner;
 use WebFiori\Error\AbstractHandler;
-use webfiori\framework\App;
-use webfiori\framework\scheduler\TasksManager;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Scheduler\TasksManager;
 /**
  * Exceptions handler which is used to handle exceptions in case of running
  * CLI applications.
diff --git a/webfiori/framework/handlers/HTTPErrHandler.php b/WebFiori/Framework/Handlers/HTTPErrHandler.php
similarity index 93%
rename from webfiori/framework/handlers/HTTPErrHandler.php
rename to WebFiori/Framework/Handlers/HTTPErrHandler.php
index 49834d1fc..bd8de0c38 100644
--- a/webfiori/framework/handlers/HTTPErrHandler.php
+++ b/WebFiori/Framework/Handlers/HTTPErrHandler.php
@@ -8,12 +8,12 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\handlers;
+namespace WebFiori\Framework\Handlers;
 
 use WebFiori\Error\AbstractHandler;
-use webfiori\framework\App;
-use webfiori\framework\router\Router;
-use webfiori\framework\ui\serverErrPage\ServerErrPage;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Router\Router;
+use WebFiori\Framework\Ui\ServerErrPage\ServerErrPage;
 use WebFiori\Http\Request;
 use WebFiori\Http\Response;
 /**
diff --git a/webfiori/framework/Ini.php b/WebFiori/Framework/Ini.php
similarity index 82%
rename from webfiori/framework/Ini.php
rename to WebFiori/Framework/Ini.php
index c5b7e20a8..053c8b96c 100644
--- a/webfiori/framework/Ini.php
+++ b/WebFiori/Framework/Ini.php
@@ -8,11 +8,11 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework;
+namespace WebFiori\Framework;
 
 use WebFiori\File\exceptions\FileException;
 use WebFiori\File\File;
-use webfiori\framework\config\ClassDriver;
+use WebFiori\Framework\Config\ClassDriver;
 use WebFiori\Json\Json;
 /**
  * A class which is used to create application initialization classes.
@@ -48,15 +48,15 @@ private function __construct() {
     public static function createAppDirs() {
         $DS = DIRECTORY_SEPARATOR;
         self::mkdir(ROOT_PATH.$DS.APP_DIR);
-        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'ini');
-        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'ini'.$DS.'routes');
-        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'pages');
-        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'commands');
-        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'tasks');
-        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'middleware');
-        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'langs');
-        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'apis');
-        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'config');
+        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Init');
+        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Init'.$DS.'Routes');
+        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Pages');
+        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Commands');
+        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Tasks');
+        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Middleware');
+        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Langs');
+        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Apis');
+        self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'Config');
         self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'sto');
         self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'sto'.$DS.'uploads');
         self::mkdir(ROOT_PATH.$DS.APP_DIR.$DS.'sto'.$DS.'logs');
@@ -79,13 +79,13 @@ public static function createAppDirs() {
      * @throws FileException
      */
     public function createIniClass(string $className, string $comment) {
-        $cFile = new File("$className.php", APP_PATH.'ini');
+        $cFile = new File("$className.php", APP_PATH.'Init');
         $cFile->remove();
         $cFile->create();
         ClassDriver::a($cFile, [
             "<?php",
             '',
-            "namespace ".APP_DIR."\\ini;",
+            "namespace ".APP_DIR."\\Init;",
             '',
             "class $className {",
 
@@ -102,7 +102,7 @@ public function createIniClass(string $className, string $comment) {
         ClassDriver::a($cFile, "}");
         $cFile->create(true);
         $cFile->write();
-        require_once APP_PATH.'ini'.DS."$className.php";
+        require_once APP_PATH.'Init'.DS."$className.php";
     }
 
     /**
@@ -117,13 +117,13 @@ public function createIniClass(string $className, string $comment) {
      * @throws FileException
      */
     public function createRoutesClass(string $className) {
-        $cFile = new File("$className.php", APP_PATH.'ini'.DS.'routes');
+        $cFile = new File("$className.php", APP_PATH.'Init'.DS.'Routes');
         $cFile->remove();
         ClassDriver::a($cFile, "<?php");
         ClassDriver::a($cFile, "");
-        ClassDriver::a($cFile, "namespace ".APP_DIR."\\ini\\routes;");
+        ClassDriver::a($cFile, "namespace ".APP_DIR."\\Init\\Routes;");
         ClassDriver::a($cFile, "");
-        ClassDriver::a($cFile, "use webfiori\\framework\\router\\Router;");
+        ClassDriver::a($cFile, "use WebFiori\\Framework\\Router\\Router;");
         ClassDriver::a($cFile, "");
         ClassDriver::a($cFile, "class $className {");
         ClassDriver::a($cFile, $this->docStart, 1);
diff --git a/webfiori/framework/Lang.php b/WebFiori/Framework/Lang.php
similarity index 98%
rename from webfiori/framework/Lang.php
rename to WebFiori/Framework/Lang.php
index aa4ed3576..54113e361 100644
--- a/webfiori/framework/Lang.php
+++ b/WebFiori/Framework/Lang.php
@@ -8,10 +8,10 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework;
+namespace WebFiori\Framework;
 
-use webfiori\framework\exceptions\MissingLangException;
-use webfiori\framework\session\SessionsManager;
+use WebFiori\Framework\Exceptions\MissingLangException;
+use WebFiori\Framework\Session\SessionsManager;
 use WebFiori\Http\Request;
 
 /**
@@ -310,7 +310,7 @@ public static function loadTranslation(string $langCode) {
 
             return self::getActive();
         }
-        $langClassName = APP_DIR.'\\langs\\Lang'.$uLangCode;
+        $langClassName = APP_DIR.'\\Langs\\Lang'.$uLangCode;
 
         if (!class_exists($langClassName)) {
             throw new MissingLangException('No language class was found for the language \''.$uLangCode.'\'.');
diff --git a/webfiori/framework/middleware/AbstractMiddleware.php b/WebFiori/Framework/Middleware/AbstractMiddleware.php
similarity index 98%
rename from webfiori/framework/middleware/AbstractMiddleware.php
rename to WebFiori/Framework/Middleware/AbstractMiddleware.php
index 8f26b6be8..ef034b0cd 100644
--- a/webfiori/framework/middleware/AbstractMiddleware.php
+++ b/WebFiori/Framework/Middleware/AbstractMiddleware.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\middleware;
+namespace WebFiori\Framework\Middleware;
 
 use WebFiori\Collections\Comparable;
 use WebFiori\Http\Request;
@@ -17,7 +17,7 @@
 /**
  * An abstract class that can be used to implement custom middleware.
  *
- * Every middleware the developer write must be placed in the folder 'app/middleware'
+ * Every middleware the developer write must be placed in the folder '[APP_DIR]/Middleware'
  * of the framework in order for the framework to auto-register the middleware.
  * If the middleware is placed in another place, then the developer must register
  * it manually using the method MiddlewareManager::register() before adding
diff --git a/webfiori/framework/middleware/CacheMiddleware.php b/WebFiori/Framework/Middleware/CacheMiddleware.php
similarity index 96%
rename from webfiori/framework/middleware/CacheMiddleware.php
rename to WebFiori/Framework/Middleware/CacheMiddleware.php
index 4dc4572de..696a6592c 100644
--- a/webfiori/framework/middleware/CacheMiddleware.php
+++ b/WebFiori/Framework/Middleware/CacheMiddleware.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace webfiori\framework\middleware;
+namespace WebFiori\Framework\Middleware;
 
 use WebFiori\Cache\Cache;
-use webfiori\framework\router\Router;
-use webfiori\framework\session\SessionsManager;
+use WebFiori\Framework\Router\Router;
+use WebFiori\Framework\Session\SessionsManager;
 use WebFiori\Http\Request;
 use WebFiori\Http\Response;
 
diff --git a/webfiori/framework/middleware/MiddlewareManager.php b/WebFiori/Framework/Middleware/MiddlewareManager.php
similarity index 98%
rename from webfiori/framework/middleware/MiddlewareManager.php
rename to WebFiori/Framework/Middleware/MiddlewareManager.php
index 17e4e6313..098cc5450 100644
--- a/webfiori/framework/middleware/MiddlewareManager.php
+++ b/WebFiori/Framework/Middleware/MiddlewareManager.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\middleware;
+namespace WebFiori\Framework\Middleware;
 
 use Exception;
 
diff --git a/webfiori/framework/middleware/StartSessionMiddleware.php b/WebFiori/Framework/Middleware/StartSessionMiddleware.php
similarity index 92%
rename from webfiori/framework/middleware/StartSessionMiddleware.php
rename to WebFiori/Framework/Middleware/StartSessionMiddleware.php
index 4ea9dadc3..ac06cd40e 100644
--- a/webfiori/framework/middleware/StartSessionMiddleware.php
+++ b/WebFiori/Framework/Middleware/StartSessionMiddleware.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace webfiori\framework\middleware;
+namespace WebFiori\Framework\Middleware;
 
 use Error;
-use webfiori\framework\session\SessionsManager;
+use WebFiori\Framework\Session\SessionsManager;
 use WebFiori\Http\Request;
 use WebFiori\Http\Response;
 /**
diff --git a/webfiori/framework/Privilege.php b/WebFiori/Framework/Privilege.php
similarity index 99%
rename from webfiori/framework/Privilege.php
rename to WebFiori/Framework/Privilege.php
index b74311471..e603e8f67 100644
--- a/webfiori/framework/Privilege.php
+++ b/WebFiori/Framework/Privilege.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework;
+namespace WebFiori\Framework;
 
 use WebFiori\Json\Json;
 use WebFiori\Json\JsonI;
diff --git a/webfiori/framework/PrivilegesGroup.php b/WebFiori/Framework/PrivilegesGroup.php
similarity index 99%
rename from webfiori/framework/PrivilegesGroup.php
rename to WebFiori/Framework/PrivilegesGroup.php
index a939fc485..e8c5a0af2 100644
--- a/webfiori/framework/PrivilegesGroup.php
+++ b/WebFiori/Framework/PrivilegesGroup.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework;
+namespace WebFiori\Framework;
 
 use WebFiori\Json\Json;
 use WebFiori\Json\JsonI;
diff --git a/webfiori/framework/router/RouteOption.php b/WebFiori/Framework/Router/RouteOption.php
similarity index 98%
rename from webfiori/framework/router/RouteOption.php
rename to WebFiori/Framework/Router/RouteOption.php
index 4bcbd3835..ef8dc0280 100644
--- a/webfiori/framework/router/RouteOption.php
+++ b/WebFiori/Framework/Router/RouteOption.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\router;
+namespace WebFiori\Framework\Router;
 
 /**
  * A class which is used to hold route options as constants.
diff --git a/webfiori/framework/router/Router.php b/WebFiori/Framework/Router/Router.php
similarity index 99%
rename from webfiori/framework/router/Router.php
rename to WebFiori/Framework/Router/Router.php
index 62d8967b0..e59ac5034 100644
--- a/webfiori/framework/router/Router.php
+++ b/WebFiori/Framework/Router/Router.php
@@ -8,23 +8,23 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\router;
+namespace WebFiori\Framework\Router;
 
 use Error;
 use Exception;
 use WebFiori\Cli\Runner;
 use WebFiori\File\exceptions\FileException;
 use WebFiori\File\File;
-use webfiori\framework\exceptions\RoutingException;
-use webfiori\framework\ui\HTTPCodeView;
-use webfiori\framework\ui\StarterPage;
-use webfiori\framework\ui\WebPage;
+use WebFiori\Framework\Exceptions\RoutingException;
+use WebFiori\Framework\Ui\HTTPCodeView;
+use WebFiori\Framework\Ui\StarterPage;
+use WebFiori\Framework\Ui\WebPage;
 use WebFiori\Http\Request;
 use WebFiori\Http\Response;
 use WebFiori\Http\Uri;
 use WebFiori\Http\WebServicesManager;
 use WebFiori\Json\Json;
-use WebFiori\UI\HTMLNode;
+use WebFiori\Ui\HTMLNode;
 /**
  * The basic class that is used to route user requests to the correct
  * location.
diff --git a/webfiori/framework/router/RouterUri.php b/WebFiori/Framework/Router/RouterUri.php
similarity index 99%
rename from webfiori/framework/router/RouterUri.php
rename to WebFiori/Framework/Router/RouterUri.php
index cf47db3d0..1651116a4 100644
--- a/webfiori/framework/router/RouterUri.php
+++ b/WebFiori/Framework/Router/RouterUri.php
@@ -8,13 +8,13 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\router;
+namespace WebFiori\Framework\Router;
 
 use Closure;
 use InvalidArgumentException;
-use webfiori\framework\middleware\MiddlewareManager;
+use WebFiori\Framework\Middleware\MiddlewareManager;
 use WebFiori\Http\Uri;
-use WebFiori\UI\HTMLNode;
+use WebFiori\Ui\HTMLNode;
 /**
  * A class that is used to split URIs and get their parameters.
  *
diff --git a/webfiori/framework/scheduler/AbstractTask.php b/WebFiori/Framework/Scheduler/AbstractTask.php
similarity index 99%
rename from webfiori/framework/scheduler/AbstractTask.php
rename to WebFiori/Framework/Scheduler/AbstractTask.php
index 868843218..d417b125d 100644
--- a/webfiori/framework/scheduler/AbstractTask.php
+++ b/WebFiori/Framework/Scheduler/AbstractTask.php
@@ -8,16 +8,16 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\scheduler;
+namespace WebFiori\Framework\Scheduler;
 
 use Exception;
 use InvalidArgumentException;
 use Throwable;
 use WebFiori\Cli\Runner;
 use WebFiori\Collections\Queue;
-use webfiori\framework\cli\commands\SchedulerCommand;
-use webfiori\framework\exceptions\InvalidCRONExprException;
-use webfiori\framework\Util;
+use WebFiori\Framework\Cli\Commands\SchedulerCommand;
+use WebFiori\Framework\Exceptions\InvalidCRONExprException;
+use WebFiori\Framework\Util;
 use WebFiori\Http\Request;
 use WebFiori\Json\Json;
 use WebFiori\Json\JsonI;
diff --git a/webfiori/framework/scheduler/BaseTask.php b/WebFiori/Framework/Scheduler/BaseTask.php
similarity index 99%
rename from webfiori/framework/scheduler/BaseTask.php
rename to WebFiori/Framework/Scheduler/BaseTask.php
index 23c4ea185..f9ce96f5f 100644
--- a/webfiori/framework/scheduler/BaseTask.php
+++ b/WebFiori/Framework/Scheduler/BaseTask.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\scheduler;
+namespace WebFiori\Framework\Scheduler;
 
 use Exception;
 
diff --git a/webfiori/framework/scheduler/TaskArgument.php b/WebFiori/Framework/Scheduler/TaskArgument.php
similarity index 99%
rename from webfiori/framework/scheduler/TaskArgument.php
rename to WebFiori/Framework/Scheduler/TaskArgument.php
index 4ea130503..5cef347cc 100644
--- a/webfiori/framework/scheduler/TaskArgument.php
+++ b/WebFiori/Framework/Scheduler/TaskArgument.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\scheduler;
+namespace WebFiori\Framework\Scheduler;
 
 use InvalidArgumentException;
 use WebFiori\Json\Json;
diff --git a/webfiori/framework/scheduler/TaskStatusEmail.php b/WebFiori/Framework/Scheduler/TaskStatusEmail.php
similarity index 97%
rename from webfiori/framework/scheduler/TaskStatusEmail.php
rename to WebFiori/Framework/Scheduler/TaskStatusEmail.php
index b1b4d7f3f..2f4f42288 100644
--- a/webfiori/framework/scheduler/TaskStatusEmail.php
+++ b/WebFiori/Framework/Scheduler/TaskStatusEmail.php
@@ -8,13 +8,13 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\scheduler;
+namespace WebFiori\Framework\Scheduler;
 
 use WebFiori\File\File;
-use webfiori\framework\App;
-use webfiori\framework\EmailMessage;
-use WebFiori\UI\HTMLNode;
-use WebFiori\UI\TableRow;
+use WebFiori\Framework\App;
+use WebFiori\Framework\EmailMessage;
+use WebFiori\Ui\HTMLNode;
+use WebFiori\Ui\TableRow;
 /**
  * A class which can be used to send an email regarding the status of
  * background task execution.
diff --git a/webfiori/framework/scheduler/TasksManager.php b/WebFiori/Framework/Scheduler/TasksManager.php
similarity index 98%
rename from webfiori/framework/scheduler/TasksManager.php
rename to WebFiori/Framework/Scheduler/TasksManager.php
index 629cfc243..cb61da33d 100644
--- a/webfiori/framework/scheduler/TasksManager.php
+++ b/WebFiori/Framework/Scheduler/TasksManager.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\scheduler;
+namespace WebFiori\Framework\Scheduler;
 
 use const DS;
 use Exception;
@@ -16,22 +16,22 @@
 use WebFiori\Cli\Runner;
 use WebFiori\Collections\Queue;
 use WebFiori\File\File;
-use webfiori\framework\App;
-use webfiori\framework\cli\commands\SchedulerCommand;
-use webfiori\framework\router\Router;
-use webfiori\framework\scheduler\webServices\TasksServicesManager;
-use webfiori\framework\scheduler\webUI\ListTasksPage;
-use webfiori\framework\scheduler\webUI\SetPasswordPage;
-use webfiori\framework\scheduler\webUI\TasksLoginPage;
-use webfiori\framework\session\SessionsManager;
-use webfiori\framework\Util;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Cli\Commands\SchedulerCommand;
+use WebFiori\Framework\Router\Router;
+use WebFiori\Framework\Scheduler\WebServices\TasksServicesManager;
+use WebFiori\Framework\Scheduler\WebUI\ListTasksPage;
+use WebFiori\Framework\Scheduler\WebUI\SetPasswordPage;
+use WebFiori\Framework\Scheduler\WebUI\TasksLoginPage;
+use WebFiori\Framework\Session\SessionsManager;
+use WebFiori\Framework\Util;
 /**
  * A class that is used to manage scheduled background tasks.
  *
  * It is used to create tasks, schedule them and execute them. In order to run
  * the tasks automatically, the developer must add an entry in the following
  * format in crontab:
- * <p><code>* * * * *  /usr/bin/php path/to/webfiori --scheduler check p=&lt;password&gt;</code></p>
+ * <p><code>* * * * *  /usr/bin/php path/to/WebFiori --scheduler check p=&lt;password&gt;</code></p>
  * Where &lt;password&gt; is the password
  * that was set by the developer to protect the tasks from unauthorized access.
  * If no password is set, then it can be removed from the command.
@@ -586,7 +586,7 @@ public static function monthlyTask(int $dayNumber, string $time, string $name, c
      */
     public static function registerTasks() {
         if (Runner::isCLI() || (defined('SCHEDULER_THROUGH_HTTP') && SCHEDULER_THROUGH_HTTP === true)) {
-            App::autoRegister('tasks', function (AbstractTask $task)
+            App::autoRegister('Tasks', function (AbstractTask $task)
             {
                 TasksManager::scheduleTask($task);
             });
diff --git a/webfiori/framework/scheduler/webServices/ForceTaskExecutionService.php b/WebFiori/Framework/Scheduler/WebServices/ForceTaskExecutionService.php
similarity index 94%
rename from webfiori/framework/scheduler/webServices/ForceTaskExecutionService.php
rename to WebFiori/Framework/Scheduler/WebServices/ForceTaskExecutionService.php
index 55614882f..97484a268 100644
--- a/webfiori/framework/scheduler/webServices/ForceTaskExecutionService.php
+++ b/WebFiori/Framework/Scheduler/WebServices/ForceTaskExecutionService.php
@@ -8,9 +8,9 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\scheduler\webServices;
+namespace WebFiori\Framework\Scheduler\WebServices;
 
-use webfiori\framework\scheduler\TasksManager;
+use WebFiori\Framework\Scheduler\TasksManager;
 use WebFiori\Http\RequestParameter;
 use WebFiori\Http\WebServicesManager;
 use WebFiori\Json\Json;
diff --git a/webfiori/framework/scheduler/webServices/GetTasksService.php b/WebFiori/Framework/Scheduler/WebServices/GetTasksService.php
similarity index 88%
rename from webfiori/framework/scheduler/webServices/GetTasksService.php
rename to WebFiori/Framework/Scheduler/WebServices/GetTasksService.php
index e8f7b5e52..a338cda21 100644
--- a/webfiori/framework/scheduler/webServices/GetTasksService.php
+++ b/WebFiori/Framework/Scheduler/WebServices/GetTasksService.php
@@ -8,9 +8,9 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\scheduler\webServices;
+namespace WebFiori\Framework\Scheduler\WebServices;
 
-use webfiori\framework\scheduler\TasksManager;
+use WebFiori\Framework\Scheduler\TasksManager;
 use WebFiori\Json\Json;
 /**
  * A web service which is used to fetch a list of all scheduled tasks.
diff --git a/webfiori/framework/scheduler/webServices/PrivateSchedulerService.php b/WebFiori/Framework/Scheduler/WebServices/PrivateSchedulerService.php
similarity index 86%
rename from webfiori/framework/scheduler/webServices/PrivateSchedulerService.php
rename to WebFiori/Framework/Scheduler/WebServices/PrivateSchedulerService.php
index d9e2b3f37..09ebe6eb5 100644
--- a/webfiori/framework/scheduler/webServices/PrivateSchedulerService.php
+++ b/WebFiori/Framework/Scheduler/WebServices/PrivateSchedulerService.php
@@ -1,7 +1,7 @@
 <?php
-namespace webfiori\framework\scheduler\webServices;
+namespace WebFiori\Framework\Scheduler\WebServices;
 
-use webfiori\framework\session\SessionsManager;
+use WebFiori\Framework\Session\SessionsManager;
 use WebFiori\Http\AbstractWebService;
 
 /**
diff --git a/webfiori/framework/scheduler/webServices/SetupPasswordService.php b/WebFiori/Framework/Scheduler/WebServices/SetupPasswordService.php
similarity index 88%
rename from webfiori/framework/scheduler/webServices/SetupPasswordService.php
rename to WebFiori/Framework/Scheduler/WebServices/SetupPasswordService.php
index 04bd3ba21..270ff73f8 100644
--- a/webfiori/framework/scheduler/webServices/SetupPasswordService.php
+++ b/WebFiori/Framework/Scheduler/WebServices/SetupPasswordService.php
@@ -8,10 +8,10 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\scheduler\webServices;
+namespace WebFiori\Framework\Scheduler\WebServices;
 
-use webfiori\framework\App;
-use webfiori\framework\scheduler\TasksManager;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Scheduler\TasksManager;
 use WebFiori\Http\AbstractWebService;
 use WebFiori\Http\RequestParameter;
 /**
diff --git a/webfiori/framework/scheduler/webServices/TasksLoginService.php b/WebFiori/Framework/Scheduler/WebServices/TasksLoginService.php
similarity index 88%
rename from webfiori/framework/scheduler/webServices/TasksLoginService.php
rename to WebFiori/Framework/Scheduler/WebServices/TasksLoginService.php
index d0a9d708a..f8c03056f 100644
--- a/webfiori/framework/scheduler/webServices/TasksLoginService.php
+++ b/WebFiori/Framework/Scheduler/WebServices/TasksLoginService.php
@@ -8,10 +8,10 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\scheduler\webServices;
+namespace WebFiori\Framework\Scheduler\WebServices;
 
-use webfiori\framework\scheduler\TasksManager;
-use webfiori\framework\session\SessionsManager;
+use WebFiori\Framework\Scheduler\TasksManager;
+use WebFiori\Framework\Session\SessionsManager;
 use WebFiori\Http\AbstractWebService;
 use WebFiori\Http\RequestParameter;
 /**
diff --git a/webfiori/framework/scheduler/webServices/TasksLogoutService.php b/WebFiori/Framework/Scheduler/WebServices/TasksLogoutService.php
similarity index 87%
rename from webfiori/framework/scheduler/webServices/TasksLogoutService.php
rename to WebFiori/Framework/Scheduler/WebServices/TasksLogoutService.php
index ec8b63101..324d63423 100644
--- a/webfiori/framework/scheduler/webServices/TasksLogoutService.php
+++ b/WebFiori/Framework/Scheduler/WebServices/TasksLogoutService.php
@@ -8,9 +8,9 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\scheduler\webServices;
+namespace WebFiori\Framework\Scheduler\WebServices;
 
-use webfiori\framework\session\SessionsManager;
+use WebFiori\Framework\Session\SessionsManager;
 use WebFiori\Http\AbstractWebService;
 /**
  * A service which is used to log out user in scheduler web interface.
diff --git a/webfiori/framework/scheduler/webServices/TasksServicesManager.php b/WebFiori/Framework/Scheduler/WebServices/TasksServicesManager.php
similarity index 94%
rename from webfiori/framework/scheduler/webServices/TasksServicesManager.php
rename to WebFiori/Framework/Scheduler/WebServices/TasksServicesManager.php
index b54fc7955..dad12edea 100644
--- a/webfiori/framework/scheduler/webServices/TasksServicesManager.php
+++ b/WebFiori/Framework/Scheduler/WebServices/TasksServicesManager.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\scheduler\webServices;
+namespace WebFiori\Framework\Scheduler\WebServices;
 
 use WebFiori\Http\WebServicesManager;
 /**
diff --git a/webfiori/framework/scheduler/webUI/BaseTasksPage.php b/WebFiori/Framework/Scheduler/WebUI/BaseTasksPage.php
similarity index 94%
rename from webfiori/framework/scheduler/webUI/BaseTasksPage.php
rename to WebFiori/Framework/Scheduler/WebUI/BaseTasksPage.php
index 4df0e5870..543942495 100644
--- a/webfiori/framework/scheduler/webUI/BaseTasksPage.php
+++ b/WebFiori/Framework/Scheduler/WebUI/BaseTasksPage.php
@@ -8,13 +8,13 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\scheduler\webUI;
+namespace WebFiori\Framework\Scheduler\WebUI;
 
-use webfiori\framework\App;
-use webfiori\framework\ui\WebPage;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Ui\WebPage;
 use WebFiori\Json\Json;
-use WebFiori\UI\HTMLNode;
-use WebFiori\UI\JsCode;
+use WebFiori\Ui\HTMLNode;
+use WebFiori\Ui\JsCode;
 /**
  * A generic view for scheduler related operations.
  *
@@ -112,7 +112,7 @@ private function changePageStructure() {
         {
             $page->getDocument()->getBody()->addChild('script', [
                 'type' => 'text/javascript',
-                'src' => 'https://cdn.jsdelivr.net/gh/webfiori/framework@'.WF_VERSION.'/assets/js/scheduler-logic.js',
+                'src' => 'https://cdn.jsdelivr.net/gh/WebFiori/framework@'.WF_VERSION.'/assets/js/scheduler-logic.js',
             ]);
         });
     }
diff --git a/webfiori/framework/scheduler/webUI/ListTasksPage.php b/WebFiori/Framework/Scheduler/WebUI/ListTasksPage.php
similarity index 98%
rename from webfiori/framework/scheduler/webUI/ListTasksPage.php
rename to WebFiori/Framework/Scheduler/WebUI/ListTasksPage.php
index 6a326834d..5117fdcf3 100644
--- a/webfiori/framework/scheduler/webUI/ListTasksPage.php
+++ b/WebFiori/Framework/Scheduler/WebUI/ListTasksPage.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\scheduler\webUI;
+namespace WebFiori\Framework\Scheduler\WebUI;
 
 use WebFiori\File\File;
 use WebFiori\Http\Response;
diff --git a/webfiori/framework/scheduler/webUI/SetPasswordPage.php b/WebFiori/Framework/Scheduler/WebUI/SetPasswordPage.php
similarity index 84%
rename from webfiori/framework/scheduler/webUI/SetPasswordPage.php
rename to WebFiori/Framework/Scheduler/WebUI/SetPasswordPage.php
index 8fe6dcf5e..8b8741119 100644
--- a/webfiori/framework/scheduler/webUI/SetPasswordPage.php
+++ b/WebFiori/Framework/Scheduler/WebUI/SetPasswordPage.php
@@ -1,7 +1,7 @@
 <?php
-namespace webfiori\framework\scheduler\webUI;
+namespace WebFiori\Framework\Scheduler\WebUI;
 
-use webfiori\framework\scheduler\TasksManager;
+use WebFiori\Framework\Scheduler\TasksManager;
 use WebFiori\Http\Response;
 
 /**
diff --git a/webfiori/framework/scheduler/webUI/TasksLoginPage.php b/WebFiori/Framework/Scheduler/WebUI/TasksLoginPage.php
similarity index 92%
rename from webfiori/framework/scheduler/webUI/TasksLoginPage.php
rename to WebFiori/Framework/Scheduler/WebUI/TasksLoginPage.php
index 8a07c9c51..0a903c913 100644
--- a/webfiori/framework/scheduler/webUI/TasksLoginPage.php
+++ b/WebFiori/Framework/Scheduler/WebUI/TasksLoginPage.php
@@ -8,9 +8,9 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\scheduler\webUI;
+namespace WebFiori\Framework\Scheduler\WebUI;
 
-use webfiori\framework\scheduler\TasksManager;
+use WebFiori\Framework\Scheduler\TasksManager;
 use WebFiori\Http\Response;
 /**
  * A page which is used to show login form to enter login information to
diff --git a/webfiori/framework/scheduler/webUI/TasksTable.php b/WebFiori/Framework/Scheduler/WebUI/TasksTable.php
similarity index 97%
rename from webfiori/framework/scheduler/webUI/TasksTable.php
rename to WebFiori/Framework/Scheduler/WebUI/TasksTable.php
index 992fbc49f..5293d2cf6 100644
--- a/webfiori/framework/scheduler/webUI/TasksTable.php
+++ b/WebFiori/Framework/Scheduler/WebUI/TasksTable.php
@@ -8,10 +8,10 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\scheduler\webUI;
+namespace WebFiori\Framework\Scheduler\WebUI;
 
-use WebFiori\UI\exceptions\InvalidNodeNameException;
-use WebFiori\UI\HTMLNode;
+use WebFiori\Ui\exceptions\InvalidNodeNameException;
+use WebFiori\Ui\HTMLNode;
 
 /**
  * A table which is used to list all scheduled background tasks.
diff --git a/webfiori/framework/scheduler/webUI/templates/job-execution-status-dialog.html b/WebFiori/Framework/Scheduler/WebUI/templates/job-execution-status-dialog.html
similarity index 100%
rename from webfiori/framework/scheduler/webUI/templates/job-execution-status-dialog.html
rename to WebFiori/Framework/Scheduler/WebUI/templates/job-execution-status-dialog.html
diff --git a/webfiori/framework/scheduler/webUI/templates/job-output-dialog.html b/WebFiori/Framework/Scheduler/WebUI/templates/job-output-dialog.html
similarity index 100%
rename from webfiori/framework/scheduler/webUI/templates/job-output-dialog.html
rename to WebFiori/Framework/Scheduler/WebUI/templates/job-output-dialog.html
diff --git a/webfiori/framework/scheduler/webUI/templates/login-form.html b/WebFiori/Framework/Scheduler/WebUI/templates/login-form.html
similarity index 100%
rename from webfiori/framework/scheduler/webUI/templates/login-form.html
rename to WebFiori/Framework/Scheduler/WebUI/templates/login-form.html
diff --git a/webfiori/framework/scheduler/webUI/templates/message-dialog.html b/WebFiori/Framework/Scheduler/WebUI/templates/message-dialog.html
similarity index 100%
rename from webfiori/framework/scheduler/webUI/templates/message-dialog.html
rename to WebFiori/Framework/Scheduler/WebUI/templates/message-dialog.html
diff --git a/webfiori/framework/scheduler/webUI/templates/scheduler-head.php b/WebFiori/Framework/Scheduler/WebUI/templates/scheduler-head.php
similarity index 95%
rename from webfiori/framework/scheduler/webUI/templates/scheduler-head.php
rename to WebFiori/Framework/Scheduler/WebUI/templates/scheduler-head.php
index 58534b59d..e2b4d78d1 100644
--- a/webfiori/framework/scheduler/webUI/templates/scheduler-head.php
+++ b/WebFiori/Framework/Scheduler/WebUI/templates/scheduler-head.php
@@ -1,5 +1,5 @@
 <?php
-namespace webfiori\framework\scheduler\webUI\templates;
+namespace WebFiori\Framework\Scheduler\WebUI\Templates;
 
 ?>
 <head>
diff --git a/webfiori/framework/scheduler/webUI/templates/set-password-form.html b/WebFiori/Framework/Scheduler/WebUI/templates/set-password-form.html
similarity index 100%
rename from webfiori/framework/scheduler/webUI/templates/set-password-form.html
rename to WebFiori/Framework/Scheduler/WebUI/templates/set-password-form.html
diff --git a/webfiori/framework/scheduler/webUI/templates/tasks-table.html b/WebFiori/Framework/Scheduler/WebUI/templates/tasks-table.html
similarity index 100%
rename from webfiori/framework/scheduler/webUI/templates/tasks-table.html
rename to WebFiori/Framework/Scheduler/WebUI/templates/tasks-table.html
diff --git a/webfiori/framework/session/DatabaseSessionStorage.php b/WebFiori/Framework/Session/DatabaseSessionStorage.php
similarity index 93%
rename from webfiori/framework/session/DatabaseSessionStorage.php
rename to WebFiori/Framework/Session/DatabaseSessionStorage.php
index eec797eb6..daf0a1f43 100644
--- a/webfiori/framework/session/DatabaseSessionStorage.php
+++ b/WebFiori/Framework/Session/DatabaseSessionStorage.php
@@ -8,10 +8,10 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\session;
+namespace WebFiori\Framework\Session;
 
 use WebFiori\Database\DatabaseException;
-use webfiori\framework\exceptions\SessionException;
+use WebFiori\Framework\Exceptions\SessionException;
 
 /**
  * A session storage engine which uses database to store session state.
@@ -47,9 +47,9 @@ public function __construct() {
         }
     }
     /**
-     * Drop the tables which are used to store session information.
+     * Drop the Tables which are used to store session information.
      *
-     * The method will drop two tables, the table 'session_data' and the
+     * The method will drop two Tables, the table 'session_data' and the
      * table 'sessions'.
      */
     public function dropTables() {
diff --git a/webfiori/framework/session/DefaultSessionStorage.php b/WebFiori/Framework/Session/DefaultSessionStorage.php
similarity index 98%
rename from webfiori/framework/session/DefaultSessionStorage.php
rename to WebFiori/Framework/Session/DefaultSessionStorage.php
index d379e44e5..496116b25 100644
--- a/webfiori/framework/session/DefaultSessionStorage.php
+++ b/WebFiori/Framework/Session/DefaultSessionStorage.php
@@ -8,12 +8,12 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\session;
+namespace WebFiori\Framework\Session;
 
 use WebFiori\Cli\Runner;
 use WebFiori\File\exceptions\FileException;
 use WebFiori\File\File;
-use webfiori\framework\exceptions\SessionException;
+use WebFiori\Framework\Exceptions\SessionException;
 /**
  * The default sessions storage engine.
  *
diff --git a/webfiori/framework/session/MSSQLSessionDataTable.php b/WebFiori/Framework/Session/MSSQLSessionDataTable.php
similarity index 97%
rename from webfiori/framework/session/MSSQLSessionDataTable.php
rename to WebFiori/Framework/Session/MSSQLSessionDataTable.php
index 73d4d01fc..6d6d322a5 100644
--- a/webfiori/framework/session/MSSQLSessionDataTable.php
+++ b/WebFiori/Framework/Session/MSSQLSessionDataTable.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\session;
+namespace WebFiori\Framework\Session;
 
 use WebFiori\Database\MsSql\MSSQLTable;
 
diff --git a/webfiori/framework/session/MSSQLSessionsTable.php b/WebFiori/Framework/Session/MSSQLSessionsTable.php
similarity index 97%
rename from webfiori/framework/session/MSSQLSessionsTable.php
rename to WebFiori/Framework/Session/MSSQLSessionsTable.php
index 6e6fcee3c..db7504239 100644
--- a/webfiori/framework/session/MSSQLSessionsTable.php
+++ b/WebFiori/Framework/Session/MSSQLSessionsTable.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\session;
+namespace WebFiori\Framework\Session;
 
 use WebFiori\Database\MsSql\MSSQLTable;
 /**
diff --git a/webfiori/framework/session/MySQLSessionDataTable.php b/WebFiori/Framework/Session/MySQLSessionDataTable.php
similarity index 97%
rename from webfiori/framework/session/MySQLSessionDataTable.php
rename to WebFiori/Framework/Session/MySQLSessionDataTable.php
index 2413bc4a1..7ca18429f 100644
--- a/webfiori/framework/session/MySQLSessionDataTable.php
+++ b/WebFiori/Framework/Session/MySQLSessionDataTable.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\session;
+namespace WebFiori\Framework\Session;
 
 use WebFiori\Database\MySql\MySQLTable;
 
diff --git a/webfiori/framework/session/MySQLSessionsTable.php b/WebFiori/Framework/Session/MySQLSessionsTable.php
similarity index 97%
rename from webfiori/framework/session/MySQLSessionsTable.php
rename to WebFiori/Framework/Session/MySQLSessionsTable.php
index a7ab4f303..0d36515c8 100644
--- a/webfiori/framework/session/MySQLSessionsTable.php
+++ b/WebFiori/Framework/Session/MySQLSessionsTable.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\session;
+namespace WebFiori\Framework\Session;
 
 use WebFiori\Database\MySql\MySQLTable;
 
diff --git a/webfiori/framework/session/Session.php b/WebFiori/Framework/Session/Session.php
similarity index 99%
rename from webfiori/framework/session/Session.php
rename to WebFiori/Framework/Session/Session.php
index adae7c5b1..6aac552c3 100644
--- a/webfiori/framework/session/Session.php
+++ b/WebFiori/Framework/Session/Session.php
@@ -8,10 +8,10 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\session;
+namespace WebFiori\Framework\Session;
 
-use webfiori\framework\App;
-use webfiori\framework\exceptions\SessionException;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Exceptions\SessionException;
 use WebFiori\Http\HttpCookie;
 use WebFiori\Http\Request;
 use WebFiori\Json\Json;
diff --git a/webfiori/framework/session/SessionDB.php b/WebFiori/Framework/Session/SessionDB.php
similarity index 98%
rename from webfiori/framework/session/SessionDB.php
rename to WebFiori/Framework/Session/SessionDB.php
index f3bcd5948..792ddd75c 100644
--- a/webfiori/framework/session/SessionDB.php
+++ b/WebFiori/Framework/Session/SessionDB.php
@@ -8,10 +8,10 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\session;
+namespace WebFiori\Framework\Session;
 
 use WebFiori\Database\DatabaseException;
-use webfiori\framework\DB;
+use WebFiori\Framework\DB;
 /**
  * A class which includes all database related operations to add, update,
  * and delete sessions from a database.
@@ -155,7 +155,7 @@ public function removeSession(string $sId) {
         $this->table('sessions')->delete()->where('s-id', $sId)->execute();
     }
     /**
-     * Removes database tables which are used to store session information.
+     * Removes database Tables which are used to store session information.
      */
     public function removeTables() {
         $this->transaction(function (DB $db)
diff --git a/webfiori/framework/session/SessionOption.php b/WebFiori/Framework/Session/SessionOption.php
similarity index 96%
rename from webfiori/framework/session/SessionOption.php
rename to WebFiori/Framework/Session/SessionOption.php
index a78065346..a7953a634 100644
--- a/webfiori/framework/session/SessionOption.php
+++ b/WebFiori/Framework/Session/SessionOption.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\session;
+namespace WebFiori\Framework\Session;
 
 /**
  * A class which is used to hold the options names that are supported during
diff --git a/webfiori/framework/session/SessionStatus.php b/WebFiori/Framework/Session/SessionStatus.php
similarity index 96%
rename from webfiori/framework/session/SessionStatus.php
rename to WebFiori/Framework/Session/SessionStatus.php
index 460037183..bb4a840f4 100644
--- a/webfiori/framework/session/SessionStatus.php
+++ b/WebFiori/Framework/Session/SessionStatus.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\session;
+namespace WebFiori\Framework\Session;
 
 /**
  * A class which is used to hold constants which represents different statuses
diff --git a/webfiori/framework/session/SessionStorage.php b/WebFiori/Framework/Session/SessionStorage.php
similarity index 97%
rename from webfiori/framework/session/SessionStorage.php
rename to WebFiori/Framework/Session/SessionStorage.php
index 3ce1085ca..9a106d4da 100644
--- a/webfiori/framework/session/SessionStorage.php
+++ b/WebFiori/Framework/Session/SessionStorage.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\session;
+namespace WebFiori\Framework\Session;
 
 /**
  * An interface which can be used to implement different types of sessions storage.
diff --git a/webfiori/framework/session/SessionUser.php b/WebFiori/Framework/Session/SessionUser.php
similarity index 97%
rename from webfiori/framework/session/SessionUser.php
rename to WebFiori/Framework/Session/SessionUser.php
index 45759f167..198a95665 100644
--- a/webfiori/framework/session/SessionUser.php
+++ b/WebFiori/Framework/Session/SessionUser.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\session;
+namespace WebFiori\Framework\Session;
 
 /**
  * An interface which is used to tell if an entity can represents session
diff --git a/webfiori/framework/session/SessionsManager.php b/WebFiori/Framework/Session/SessionsManager.php
similarity index 98%
rename from webfiori/framework/session/SessionsManager.php
rename to WebFiori/Framework/Session/SessionsManager.php
index 929843086..6d9905559 100644
--- a/webfiori/framework/session/SessionsManager.php
+++ b/WebFiori/Framework/Session/SessionsManager.php
@@ -8,9 +8,9 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\session;
+namespace WebFiori\Framework\Session;
 
-use webfiori\framework\exceptions\SessionException;
+use WebFiori\Framework\Exceptions\SessionException;
 use WebFiori\Http\Request;
 /**
  * A class which is used to manage user sessions.
@@ -65,10 +65,10 @@ private function __construct() {
             $constructor = WF_SESSION_STORAGE.'';
             $classObj = new $constructor();
 
-            if (is_subclass_of($classObj, '\webfiori\framework\session\SessionStorage')) {
+            if (is_subclass_of($classObj, '\WebFiori\Framework\Session\SessionStorage')) {
                 $this->sessionStorage = $classObj;
             } else {
-                throw new SessionException('The class "'.WF_SESSION_STORAGE.'" does not implement "\webfiori\framework\session\SessionStorage".');
+                throw new SessionException('The class "'.WF_SESSION_STORAGE.'" does not implement "\WebFiori\Framework\Session\SessionStorage".');
             }
         }
 
diff --git a/webfiori/framework/Theme.php b/WebFiori/Framework/Theme.php
similarity index 99%
rename from webfiori/framework/Theme.php
rename to WebFiori/Framework/Theme.php
index 930c13e4a..a5dafc576 100644
--- a/webfiori/framework/Theme.php
+++ b/WebFiori/Framework/Theme.php
@@ -8,15 +8,15 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework;
+namespace WebFiori\Framework;
 
 use ReflectionClass;
-use webfiori\framework\ui\WebPage;
+use WebFiori\Framework\Ui\WebPage;
 use WebFiori\Json\Json;
 use WebFiori\Json\JsonI;
-use WebFiori\UI\exceptions\InvalidNodeNameException;
-use WebFiori\UI\HeadNode;
-use WebFiori\UI\HTMLNode;
+use WebFiori\Ui\exceptions\InvalidNodeNameException;
+use WebFiori\Ui\HeadNode;
+use WebFiori\Ui\HTMLNode;
 /**
  * A base class that is used to construct website UI.
  *
diff --git a/webfiori/framework/ThemeManager.php b/WebFiori/Framework/ThemeManager.php
similarity index 97%
rename from webfiori/framework/ThemeManager.php
rename to WebFiori/Framework/ThemeManager.php
index 05758292d..527208bd8 100644
--- a/webfiori/framework/ThemeManager.php
+++ b/WebFiori/Framework/ThemeManager.php
@@ -8,15 +8,15 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework;
+namespace WebFiori\Framework;
 
 use Error;
 use Exception;
-use webfiori\file\File;
-use webfiori\framework\exceptions\NoSuchThemeException;
-use webfiori\framework\router\RouteOption;
-use webfiori\framework\router\Router;
-use webfiori\http\Response;
+use WebFiori\file\File;
+use WebFiori\Framework\Exceptions\NoSuchThemeException;
+use WebFiori\Framework\Router\RouteOption;
+use WebFiori\Framework\Router\Router;
+use WebFiori\http\Response;
 
 /**
  * A class which manages theme registration and loading.
diff --git a/webfiori/framework/ui/BeforeRenderCallback.php b/WebFiori/Framework/Ui/BeforeRenderCallback.php
similarity index 99%
rename from webfiori/framework/ui/BeforeRenderCallback.php
rename to WebFiori/Framework/Ui/BeforeRenderCallback.php
index f381feaed..059c34066 100644
--- a/webfiori/framework/ui/BeforeRenderCallback.php
+++ b/WebFiori/Framework/Ui/BeforeRenderCallback.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\ui;
+namespace WebFiori\Framework\Ui;
 
 use WebFiori\Collections\Comparable;
 /**
diff --git a/webfiori/framework/ui/HTTPCodeView.php b/WebFiori/Framework/Ui/HTTPCodeView.php
similarity index 92%
rename from webfiori/framework/ui/HTTPCodeView.php
rename to WebFiori/Framework/Ui/HTTPCodeView.php
index 316251778..6c3e8c989 100644
--- a/webfiori/framework/ui/HTTPCodeView.php
+++ b/WebFiori/Framework/Ui/HTTPCodeView.php
@@ -8,10 +8,10 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\ui;
+namespace WebFiori\Framework\Ui;
 
-use webfiori\framework\App;
-use WebFiori\UI\HTMLNode;
+use WebFiori\Framework\App;
+use WebFiori\Ui\HTMLNode;
 /**
  * A basic view which is used to display HTTP error codes taken from
  * language file.
diff --git a/webfiori/framework/ui/MessageBox.php b/WebFiori/Framework/Ui/MessageBox.php
similarity index 96%
rename from webfiori/framework/ui/MessageBox.php
rename to WebFiori/Framework/Ui/MessageBox.php
index af849fae2..6b562711c 100644
--- a/webfiori/framework/ui/MessageBox.php
+++ b/WebFiori/Framework/Ui/MessageBox.php
@@ -8,9 +8,9 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\ui;
+namespace WebFiori\Framework\Ui;
 
-use WebFiori\UI\HTMLNode;
+use WebFiori\Ui\HTMLNode;
 /**
  * A generic class for showing a floating box in web pages that can have any content
  * in its body.
@@ -138,13 +138,13 @@ private function _init() {
             $css = new HTMLNode('link');
             $css->setAttributes([
                 'rel' => 'stylesheet',
-                'href' => 'https://cdn.jsdelivr.net/gh/webfiori/app@'.WF_VERSION.'/public/assets/css/message-box.css'
+                'href' => 'https://cdn.jsdelivr.net/gh/WebFiori/app@'.WF_VERSION.'/public/assets/css/message-box.css'
             ]);
             $this->addChild($css);
             $js = new HTMLNode('script');
             $js->setAttributes([
                 'type' => 'text/javascript',
-                'src' => 'https://cdn.jsdelivr.net/gh/webfiori/app@'.WF_VERSION.'/public/assets/js/message-box.js'
+                'src' => 'https://cdn.jsdelivr.net/gh/WebFiori/app@'.WF_VERSION.'/public/assets/js/message-box.js'
             ]);
             $this->addChild($js);
         }
diff --git a/webfiori/framework/ui/serverErrPage/ServerErrPage.php b/WebFiori/Framework/Ui/ServerErrPage/ServerErrPage.php
similarity index 93%
rename from webfiori/framework/ui/serverErrPage/ServerErrPage.php
rename to WebFiori/Framework/Ui/ServerErrPage/ServerErrPage.php
index 1120e1360..3f4525e25 100644
--- a/webfiori/framework/ui/serverErrPage/ServerErrPage.php
+++ b/WebFiori/Framework/Ui/ServerErrPage/ServerErrPage.php
@@ -8,11 +8,11 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\ui\serverErrPage;
+namespace WebFiori\Framework\Ui\ServerErrPage;
 
 use WebFiori\Error\AbstractHandler;
-use webfiori\framework\ui\WebPage;
-use WebFiori\UI\HTMLNode;
+use WebFiori\Framework\Ui\WebPage;
+use WebFiori\Ui\HTMLNode;
 /**
  * A page which is used to display exception information when it is thrown or
  * any other errors.
@@ -41,7 +41,7 @@ public function __construct(AbstractHandler $throwableOrErr) {
         $this->addBeforeRender(function (WebPage $p)
         {
             $p->getDocument()->getBody()->addChild('script', [
-                'src' => 'https://cdn.jsdelivr.net/gh/webfiori/framework@'.WF_VERSION.'/assets/js/server-err.js',
+                'src' => 'https://cdn.jsdelivr.net/gh/WebFiori/framework@'.WF_VERSION.'/assets/js/server-err.js',
                 'type' => 'text/javascript'
             ]);
         });
diff --git a/webfiori/framework/ui/serverErrPage/error-details.php b/WebFiori/Framework/Ui/ServerErrPage/error-details.php
similarity index 97%
rename from webfiori/framework/ui/serverErrPage/error-details.php
rename to WebFiori/Framework/Ui/ServerErrPage/error-details.php
index 1a3a2a3d1..3cd680f8a 100644
--- a/webfiori/framework/ui/serverErrPage/error-details.php
+++ b/WebFiori/Framework/Ui/ServerErrPage/error-details.php
@@ -1,5 +1,5 @@
 <?php
-namespace webfiori\framework\ui\serverErrPage;
+namespace WebFiori\Framework\Ui\ServerErrPage;
 
 if (!defined('WF_VERBOSE') || WF_VERBOSE === false) {
     return;
diff --git a/webfiori/framework/ui/serverErrPage/server-err-head.php b/WebFiori/Framework/Ui/ServerErrPage/server-err-head.php
similarity index 95%
rename from webfiori/framework/ui/serverErrPage/server-err-head.php
rename to WebFiori/Framework/Ui/ServerErrPage/server-err-head.php
index a7d31c50f..2ce17d151 100644
--- a/webfiori/framework/ui/serverErrPage/server-err-head.php
+++ b/WebFiori/Framework/Ui/ServerErrPage/server-err-head.php
@@ -1,5 +1,5 @@
 <?php
-namespace webfiori\framework\ui\serverErrPage;
+namespace WebFiori\Framework\Ui\ServerErrPage;
 
 ?>
 <head>
diff --git a/webfiori/framework/ui/serverErrPage/server-err-header.php b/WebFiori/Framework/Ui/ServerErrPage/server-err-header.php
similarity index 92%
rename from webfiori/framework/ui/serverErrPage/server-err-header.php
rename to WebFiori/Framework/Ui/ServerErrPage/server-err-header.php
index 79603599f..ef7813919 100644
--- a/webfiori/framework/ui/serverErrPage/server-err-header.php
+++ b/WebFiori/Framework/Ui/ServerErrPage/server-err-header.php
@@ -1,5 +1,5 @@
 <?php
-namespace webfiori\framework\ui\serverErrPage;
+namespace WebFiori\Framework\Ui\ServerErrPage;
 
 ?>
 <v-col cols=12>
diff --git a/webfiori/framework/ui/serverErrPage/server-err-stack-trace.php b/WebFiori/Framework/Ui/ServerErrPage/server-err-stack-trace.php
similarity index 93%
rename from webfiori/framework/ui/serverErrPage/server-err-stack-trace.php
rename to WebFiori/Framework/Ui/ServerErrPage/server-err-stack-trace.php
index fd7c16234..2b871f1b8 100644
--- a/webfiori/framework/ui/serverErrPage/server-err-stack-trace.php
+++ b/WebFiori/Framework/Ui/ServerErrPage/server-err-stack-trace.php
@@ -1,5 +1,5 @@
 <?php
-namespace webfiori\framework\ui\serverErrPage;
+namespace WebFiori\Framework\Ui\ServerErrPage;
 
 if (!defined('WF_VERBOSE') || WF_VERBOSE === false) {
     return;
diff --git a/webfiori/framework/ui/StarterPage.php b/WebFiori/Framework/Ui/StarterPage.php
similarity index 94%
rename from webfiori/framework/ui/StarterPage.php
rename to WebFiori/Framework/Ui/StarterPage.php
index 41fa3a602..091d95996 100644
--- a/webfiori/framework/ui/StarterPage.php
+++ b/WebFiori/Framework/Ui/StarterPage.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\ui;
+namespace WebFiori\Framework\Ui;
 
 /**
  * A page which is shown to the framework users when the developer has not
@@ -36,7 +36,7 @@ public function __construct() {
         $this->setTitle('Welcome to WebFiori');
         $div = $this->insert('div');
         $div->addChild('img', [
-            'src' => 'https://webfiori.com/assets/images/WFLogo512.png',
+            'src' => 'https://WebFiori.com/assets/images/WFLogo512.png',
             'style' => 'width:250px;height:250px;border-radius:250px;background-color:black'
         ]);
         $div->setStyle([
@@ -56,7 +56,7 @@ public function __construct() {
         $cardsRow = $row->addChild('v-col', [
             'cols' => 12,
         ])->addChild('v-row');
-        $this->createCard('https://webfiori.com/learn',
+        $this->createCard('https://WebFiori.com/learn',
             'mdi-book-open-variant',
             'Learn',
             'Documentation is always the first place where developers can find what they need.'
@@ -66,7 +66,7 @@ public function __construct() {
             .'experience with it, we recommend the '
             .'documentation as they will help in a way or another.',
             $cardsRow->addChild('v-col', ['cols' => 12, 'md' => 6, 'sm' => 12]));
-        $this->createCard('https://webfiori.com/docs/webfiori',
+        $this->createCard('https://WebFiori.com/docs/WebFiori',
             'mdi-book-check-outline',
             'API Reference',
             'This reference has all information about core framework classes that a developer '
@@ -74,14 +74,14 @@ public function __construct() {
             .'uses of every public class attribute and method. It can be handy when developers starts '
             .'using advanced features of the framework.',
             $cardsRow->addChild('v-col', ['cols' => 12, 'md' => 6, 'sm' => 12]));
-        $this->createCard('https://webfiori.com/contribute',
+        $this->createCard('https://WebFiori.com/contribute',
             'mdi-comment-plus-outline',
             'Support The Project',
             'Want to help in development of the framework or contribute? This place is for you. It holds '
             .'basic instructions on how you may help in supporting the framework in many ways.',
             $cardsRow->addChild('v-col', ['cols' => 12, 'md' => 6, 'sm' => 12]));
     }
-    private function createCard($link, $icon, $cardTitle, $paragraph, \WebFiori\UI\HTMLNode $el) {
+    private function createCard($link, $icon, $cardTitle, $paragraph, \WebFiori\Ui\HTMLNode $el) {
         $card = $el->addChild('v-card', [
             'hover',
             'height' => '220px',
diff --git a/webfiori/framework/ui/WebPage.php b/WebFiori/Framework/Ui/WebPage.php
similarity index 98%
rename from webfiori/framework/ui/WebPage.php
rename to WebFiori/Framework/Ui/WebPage.php
index 58d0efb15..20283c9b7 100644
--- a/webfiori/framework/ui/WebPage.php
+++ b/WebFiori/Framework/Ui/WebPage.php
@@ -8,30 +8,30 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\ui;
+namespace WebFiori\Framework\Ui;
 
 use Error;
 use Exception;
 use TypeError;
 use WebFiori\Collections\LinkedList;
-use webfiori\framework\App;
-use webfiori\framework\exceptions\InitializationException;
-use webfiori\framework\exceptions\MissingLangException;
-use webfiori\framework\exceptions\SessionException;
-use webfiori\framework\exceptions\UIException;
-use webfiori\framework\Lang;
-use webfiori\framework\router\Router;
-use webfiori\framework\session\Session;
-use webfiori\framework\session\SessionsManager;
-use webfiori\framework\Theme;
-use webfiori\framework\ThemeManager;
-use webfiori\framework\Util;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Exceptions\InitializationException;
+use WebFiori\Framework\Exceptions\MissingLangException;
+use WebFiori\Framework\Exceptions\SessionException;
+use WebFiori\Framework\Exceptions\UIException;
+use WebFiori\Framework\Lang;
+use WebFiori\Framework\Router\Router;
+use WebFiori\Framework\Session\Session;
+use WebFiori\Framework\Session\SessionsManager;
+use WebFiori\Framework\Theme;
+use WebFiori\Framework\ThemeManager;
+use WebFiori\Framework\Util;
 use WebFiori\Http\Request;
 use WebFiori\Http\Response;
 use WebFiori\Json\Json;
-use WebFiori\UI\HeadNode;
-use WebFiori\UI\HTMLDoc;
-use WebFiori\UI\HTMLNode;
+use WebFiori\Ui\HeadNode;
+use WebFiori\Ui\HTMLDoc;
+use WebFiori\Ui\HTMLNode;
 require_once 'ui-functions.php';
 /**
  * A base class that can be used to implement web pages.
@@ -1174,7 +1174,7 @@ private function _getComponent($methToCall, $nodeId) {
         }
 
         throw new UIException('The the method "'.get_class($loadedTheme).'::'.$methToCall.'()" did not return '
-                    .'an instance of the class "webfiori\\ui\\HTMLNode".');
+                    .'an instance of the class "WebFiori\\ui\\HTMLNode".');
     }
     /**
      * Sets the language of the page based on session language or
@@ -1235,7 +1235,7 @@ private function getHead() {
 
             if (!($headNode instanceof HeadNode)) {
                 throw new UIException('The method "'.get_class($loadedTheme).'::getHeadNode()" did not return '
-                        .'an instance of the class "webfiori\\ui\\HeadNode".');
+                        .'an instance of the class "WebFiori\\ui\\HeadNode".');
             }
         }
         $headNode->addMeta('charset','UTF-8',true);
diff --git a/webfiori/framework/ui/ui-functions.php b/WebFiori/Framework/Ui/ui-functions.php
similarity index 95%
rename from webfiori/framework/ui/ui-functions.php
rename to WebFiori/Framework/Ui/ui-functions.php
index b0aa17fe1..f284a8d36 100644
--- a/webfiori/framework/ui/ui-functions.php
+++ b/WebFiori/Framework/Ui/ui-functions.php
@@ -9,12 +9,12 @@
  *
  */
 
-use webfiori\framework\exceptions\MissingLangException;
-use webfiori\framework\Lang;
-use webfiori\framework\ui\WebPage;
+use WebFiori\Framework\Exceptions\MissingLangException;
+use WebFiori\Framework\Lang;
+use WebFiori\Framework\Ui\WebPage;
 use WebFiori\Http\Response;
 use WebFiori\Json\JsonI;
-use WebFiori\UI\HTMLNode;
+use WebFiori\Ui\HTMLNode;
 
 /**
  * This file contains functions that can be used inside PHP templates. The
diff --git a/webfiori/framework/User.php b/WebFiori/Framework/User.php
similarity index 99%
rename from webfiori/framework/User.php
rename to WebFiori/Framework/User.php
index 7772c24b8..ca3f579fd 100644
--- a/webfiori/framework/User.php
+++ b/WebFiori/Framework/User.php
@@ -8,9 +8,9 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework;
+namespace WebFiori\Framework;
 
-use webfiori\framework\session\SessionUser;
+use WebFiori\Framework\Session\SessionUser;
 use WebFiori\Json\Json;
 use WebFiori\Json\JsonI;
 /**
diff --git a/webfiori/framework/Util.php b/WebFiori/Framework/Util.php
similarity index 99%
rename from webfiori/framework/Util.php
rename to WebFiori/Framework/Util.php
index cf3fc9d56..99928cc13 100644
--- a/webfiori/framework/Util.php
+++ b/WebFiori/Framework/Util.php
@@ -8,10 +8,10 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework;
+namespace WebFiori\Framework;
 
-use webfiori\framework\cli\Runner;
-use webfiori\framework\ui\MessageBox;
+use WebFiori\Framework\Cli\Runner;
+use WebFiori\Framework\Ui\MessageBox;
 use WebFiori\Http\Response;
 /**
  * Framework utility class.
diff --git a/webfiori/framework/writers/APITestCaseWriter.php b/WebFiori/Framework/Writers/APITestCaseWriter.php
similarity index 99%
rename from webfiori/framework/writers/APITestCaseWriter.php
rename to WebFiori/Framework/Writers/APITestCaseWriter.php
index e1972c1fa..770b7c2a2 100644
--- a/webfiori/framework/writers/APITestCaseWriter.php
+++ b/WebFiori/Framework/Writers/APITestCaseWriter.php
@@ -1,5 +1,5 @@
 <?php
-namespace webfiori\framework\writers;
+namespace WebFiori\Framework\Writers;
 
 use WebFiori\Http\AbstractWebService;
 use WebFiori\Http\APITestCase;
@@ -31,7 +31,7 @@ class APITestCaseWriter extends ClassWriter {
      * will be based on.
      */
     public function __construct(?WebServicesManager $manager = null, null|string|AbstractWebService $service = null) {
-        parent::__construct('WebService', ROOT_PATH.DS.'tests'.DS.'apis', 'tests\\apis');
+        parent::__construct('WebService', ROOT_PATH.DS.'tests'.DS.'Apis', 'tests\\Apis');
         $this->setSuffix('Test');
 
         if ($manager !== null) {
diff --git a/webfiori/framework/writers/ClassWriter.php b/WebFiori/Framework/Writers/ClassWriter.php
similarity index 99%
rename from webfiori/framework/writers/ClassWriter.php
rename to WebFiori/Framework/Writers/ClassWriter.php
index 32c5e53fd..ed7675442 100644
--- a/webfiori/framework/writers/ClassWriter.php
+++ b/WebFiori/Framework/Writers/ClassWriter.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\writers;
+namespace WebFiori\Framework\Writers;
 
 use WebFiori\File\File;
 /**
diff --git a/webfiori/framework/writers/CommandClassWriter.php b/WebFiori/Framework/Writers/CommandClassWriter.php
similarity index 96%
rename from webfiori/framework/writers/CommandClassWriter.php
rename to WebFiori/Framework/Writers/CommandClassWriter.php
index 52ac159f5..cbbb39649 100644
--- a/webfiori/framework/writers/CommandClassWriter.php
+++ b/WebFiori/Framework/Writers/CommandClassWriter.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\writers;
+namespace WebFiori\Framework\Writers;
 
 /**
  * A class which is used to write CLI Commands classes.
@@ -28,7 +28,7 @@ class CommandClassWriter extends ClassWriter {
      * <li><b>name</b>: The name of the class that will be created. If not provided, the
      * string 'NewClass' is used.</li>
      * <li><b>namespace</b>: The namespace that the class will belong to. If not provided,
-     * the namespace 'webfiori' is used.</li>
+     * the namespace 'WebFiori' is used.</li>
      * <li><b>path</b>: The location at which the class will be created on. If not
      * provided, the constant ROOT_PATH is used. </li>
      *
@@ -41,12 +41,12 @@ class CommandClassWriter extends ClassWriter {
      * the command will have.
      */
     public function __construct() {
-        parent::__construct('NewCommand', APP_PATH.'commands', APP_DIR.'\\commands');
+        parent::__construct('NewCommand', APP_PATH.'Commands', APP_DIR.'\\Commands');
         $this->name = 'new-command';
         $this->args = [];
         $this->desc = '';
         $this->setSuffix('Command');
-        $this->setNamespace(APP_DIR.'\\commands');
+        $this->setNamespace(APP_DIR.'\\Commands');
         $this->addUseStatement([
             'WebFiori\\Cli\\Command'
         ]);
diff --git a/webfiori/framework/writers/DBClassWriter.php b/WebFiori/Framework/Writers/DBClassWriter.php
similarity index 99%
rename from webfiori/framework/writers/DBClassWriter.php
rename to WebFiori/Framework/Writers/DBClassWriter.php
index 3113d9787..8ab043da5 100644
--- a/webfiori/framework/writers/DBClassWriter.php
+++ b/WebFiori/Framework/Writers/DBClassWriter.php
@@ -8,14 +8,14 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\writers;
+namespace WebFiori\Framework\Writers;
 
 use WebFiori\Database\Column;
 use WebFiori\Database\EntityMapper;
 use WebFiori\Database\MsSql\MSSQLColumn;
 use WebFiori\Database\MsSql\MSSQLTable;
 use WebFiori\Database\Table;
-use webfiori\framework\DB;
+use WebFiori\Framework\DB;
 /**
  * A class which is used to create a database access controller.
  *
diff --git a/webfiori/framework/writers/DatabaseMigrationWriter.php b/WebFiori/Framework/Writers/DatabaseMigrationWriter.php
similarity index 97%
rename from webfiori/framework/writers/DatabaseMigrationWriter.php
rename to WebFiori/Framework/Writers/DatabaseMigrationWriter.php
index ed807c230..355952ee8 100644
--- a/webfiori/framework/writers/DatabaseMigrationWriter.php
+++ b/WebFiori/Framework/Writers/DatabaseMigrationWriter.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\writers;
+namespace WebFiori\Framework\Writers;
 
 use WebFiori\Database\Database;
 use WebFiori\Database\Schema\AbstractMigration;
@@ -35,7 +35,7 @@ public function __construct(?SchemaRunner $runner) {
         
         $this->setClassName($name);
         
-        parent::__construct($name, APP_PATH.'database'.DS.'migrations', APP_DIR.'\\database\\migrations');
+        parent::__construct($name, APP_PATH.'Database'.DS.'Migrations', APP_DIR.'\\Database\\Migrations');
         $this->addUseStatement([
             Database::class,
             AbstractMigration::class,
diff --git a/webfiori/framework/writers/LangClassWriter.php b/WebFiori/Framework/Writers/LangClassWriter.php
similarity index 91%
rename from webfiori/framework/writers/LangClassWriter.php
rename to WebFiori/Framework/Writers/LangClassWriter.php
index 35fa00312..9b9514ffa 100644
--- a/webfiori/framework/writers/LangClassWriter.php
+++ b/WebFiori/Framework/Writers/LangClassWriter.php
@@ -8,9 +8,9 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\writers;
+namespace WebFiori\Framework\Writers;
 
-use webfiori\framework\Lang;
+use WebFiori\Framework\Lang;
 /**
  * A writer which is used to write any class that represents a language class.
  *
@@ -34,7 +34,7 @@ class LangClassWriter extends ClassWriter {
      * @since 1.0
      */
     public function __construct($langCode, $writingDir) {
-        parent::__construct('Lang'.$langCode, APP_PATH.'langs', APP_DIR."\\langs");
+        parent::__construct('Lang'.$langCode, APP_PATH.'Langs', APP_DIR."\\Langs");
         $this->code = $langCode;
         $this->dir = $writingDir;
         $this->addUseStatement(Lang::class);
diff --git a/webfiori/framework/writers/MiddlewareClassWriter.php b/WebFiori/Framework/Writers/MiddlewareClassWriter.php
similarity index 95%
rename from webfiori/framework/writers/MiddlewareClassWriter.php
rename to WebFiori/Framework/Writers/MiddlewareClassWriter.php
index 1fd6867a3..3eb89a583 100644
--- a/webfiori/framework/writers/MiddlewareClassWriter.php
+++ b/WebFiori/Framework/Writers/MiddlewareClassWriter.php
@@ -8,10 +8,10 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\writers;
+namespace WebFiori\Framework\Writers;
 
-use webfiori\framework\middleware\AbstractMiddleware;
-use webfiori\framework\session\SessionsManager;
+use WebFiori\Framework\Middleware\AbstractMiddleware;
+use WebFiori\Framework\Session\SessionsManager;
 use WebFiori\Http\Request;
 use WebFiori\Http\Response;
 /**
@@ -32,7 +32,7 @@ class MiddlewareClassWriter extends ClassWriter {
      * <li><b>name</b>: The name of the class that will be created. If not provided, the
      * string 'NewClass' is used.</li>
      * <li><b>namespace</b>: The namespace that the class will belong to. If not provided,
-     * the namespace 'webfiori' is used.</li>
+     * the namespace 'WebFiori' is used.</li>
      * <li><b>path</b>: The location at which the class will be created on. If not
      * provided, the constant ROOT_PATH is used. </li>
      *
@@ -47,7 +47,7 @@ class MiddlewareClassWriter extends ClassWriter {
      * will be added to.
      */
     public function __construct($middlewareName = '', $priority = 0, array $groupsArr = []) {
-        parent::__construct('NewMiddleware', APP_PATH.'middleware', APP_DIR.'\\middleware');
+        parent::__construct('NewMiddleware', APP_PATH.'Middleware', APP_DIR.'\\Middleware');
         $this->setSuffix('Middleware');
         $this->addUseStatement([
                 AbstractMiddleware::class,
diff --git a/webfiori/framework/writers/SchedulerTaskClassWriter.php b/WebFiori/Framework/Writers/SchedulerTaskClassWriter.php
similarity index 94%
rename from webfiori/framework/writers/SchedulerTaskClassWriter.php
rename to WebFiori/Framework/Writers/SchedulerTaskClassWriter.php
index acc015798..e4438c8b3 100644
--- a/webfiori/framework/writers/SchedulerTaskClassWriter.php
+++ b/WebFiori/Framework/Writers/SchedulerTaskClassWriter.php
@@ -8,13 +8,13 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\writers;
+namespace WebFiori\Framework\Writers;
 
-use webfiori\framework\scheduler\AbstractTask;
-use webfiori\framework\scheduler\BaseTask;
-use webfiori\framework\scheduler\TaskArgument;
-use webfiori\framework\scheduler\TasksManager;
-use webfiori\framework\scheduler\TaskStatusEmail;
+use WebFiori\Framework\Scheduler\AbstractTask;
+use WebFiori\Framework\Scheduler\BaseTask;
+use WebFiori\Framework\Scheduler\TaskArgument;
+use WebFiori\Framework\Scheduler\TasksManager;
+use WebFiori\Framework\Scheduler\TaskStatusEmail;
 /**
  * A class which is used to write scheduler tasks classes.
  *
@@ -37,7 +37,7 @@ class SchedulerTaskClassWriter extends ClassWriter {
      * the task needs.
      */
     public function __construct(string $className = 'NewTask', $taskName = '', $taskDesc = '', array $argsArr = []) {
-        parent::__construct($className, APP_PATH.'tasks', APP_DIR.'\\tasks');
+        parent::__construct($className, APP_PATH.'Tasks', APP_DIR.'\\Tasks');
         $this->task = new BaseTask();
 
         if (!$this->setTaskName($taskName)) {
@@ -158,7 +158,7 @@ public function writeClassBody() {
 
         $this->append('//TODO: Implement the action to perform when the task finishes to execute.', 2);
         $this->append("//\$email = new TaskStatusEmail('no-reply', [", 2);
-        $this->append("//    'webfiori@example.com' => 'Ibrahim Ali'", 2);
+        $this->append("//    'WebFiori@example.com' => 'Ibrahim Ali'", 2);
         $this->append('//]);', 2);
         $this->append('}', 1);
 
diff --git a/webfiori/framework/writers/ServiceHolder.php b/WebFiori/Framework/Writers/ServiceHolder.php
similarity index 96%
rename from webfiori/framework/writers/ServiceHolder.php
rename to WebFiori/Framework/Writers/ServiceHolder.php
index 1154b281f..4b9ca3510 100644
--- a/webfiori/framework/writers/ServiceHolder.php
+++ b/WebFiori/Framework/Writers/ServiceHolder.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\writers;
+namespace WebFiori\Framework\Writers;
 
 use WebFiori\Http\AbstractWebService;
 /**
diff --git a/webfiori/framework/writers/TableClassWriter.php b/WebFiori/Framework/Writers/TableClassWriter.php
similarity index 99%
rename from webfiori/framework/writers/TableClassWriter.php
rename to WebFiori/Framework/Writers/TableClassWriter.php
index 92d739e62..13aec8e6b 100644
--- a/webfiori/framework/writers/TableClassWriter.php
+++ b/WebFiori/Framework/Writers/TableClassWriter.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\writers;
+namespace WebFiori\Framework\Writers;
 
 use const APP_DIR;
 use const APP_PATH;
@@ -57,7 +57,7 @@ class TableClassWriter extends ClassWriter {
      * <li><b>name</b>: The name of the class that will be created. If not provided, the
      * string 'NewClass' is used.</li>
      * <li><b>namespace</b>: The namespace that the class will belong to. If not provided,
-     * the namespace 'webfiori' is used.</li>
+     * the namespace 'WebFiori' is used.</li>
      * <li><b>path</b>: The location at which the query will be created on. If not
      * provided, the constant ROOT_PATH is used. </li>
      * <li><b>entity-info</b>: A sub associative array that contains information about the entity
@@ -76,7 +76,7 @@ class TableClassWriter extends ClassWriter {
      * @since 1.0
      */
     public function __construct(?Table $tableObj = null) {
-        parent::__construct('NewTable', APP_PATH.'database', APP_DIR.'\\database');
+        parent::__construct('NewTable', APP_PATH.'Database', APP_DIR.'\\Database');
         $this->setSuffix('Table');
 
         if ($tableObj === null) {
diff --git a/webfiori/framework/writers/ThemeClassWriter.php b/WebFiori/Framework/Writers/ThemeClassWriter.php
similarity index 97%
rename from webfiori/framework/writers/ThemeClassWriter.php
rename to WebFiori/Framework/Writers/ThemeClassWriter.php
index 8072c7f5a..959c33bf4 100644
--- a/webfiori/framework/writers/ThemeClassWriter.php
+++ b/WebFiori/Framework/Writers/ThemeClassWriter.php
@@ -8,12 +8,12 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\writers;
+namespace WebFiori\Framework\Writers;
 
 use WebFiori\File\File;
-use webfiori\framework\Theme;
-use WebFiori\UI\HeadNode;
-use WebFiori\UI\HTMLNode;
+use WebFiori\Framework\Theme;
+use WebFiori\Ui\HeadNode;
+use WebFiori\Ui\HTMLNode;
 
 /**
  * A class which is used to create basic theme skeleton.
@@ -34,7 +34,7 @@ class ThemeClassWriter extends ClassWriter {
      * </ul>
      */
     public function __construct(string $themeName = '') {
-        parent::__construct('NewTheme', APP_PATH.'themes', APP_DIR.'\\themes\\new');
+        parent::__construct('NewTheme', APP_PATH.'Themes', APP_DIR.'\\Themes\\new');
 
         if (!$this->setThemeName($themeName)) {
             $this->setThemeName('New Theme');
diff --git a/webfiori/framework/writers/ThemeComponentWriter.php b/WebFiori/Framework/Writers/ThemeComponentWriter.php
similarity index 98%
rename from webfiori/framework/writers/ThemeComponentWriter.php
rename to WebFiori/Framework/Writers/ThemeComponentWriter.php
index a14e96f3b..7588d1bc0 100644
--- a/webfiori/framework/writers/ThemeComponentWriter.php
+++ b/WebFiori/Framework/Writers/ThemeComponentWriter.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\writers;
+namespace WebFiori\Framework\Writers;
 
 /**
  * A helper class which is used in generating theme template.
diff --git a/webfiori/framework/writers/WebServiceWriter.php b/WebFiori/Framework/Writers/WebServiceWriter.php
similarity index 98%
rename from webfiori/framework/writers/WebServiceWriter.php
rename to WebFiori/Framework/Writers/WebServiceWriter.php
index 59129c6ad..ff34e67a5 100644
--- a/webfiori/framework/writers/WebServiceWriter.php
+++ b/WebFiori/Framework/Writers/WebServiceWriter.php
@@ -8,7 +8,7 @@
  * https://github.com/WebFiori/.github/blob/main/LICENSE
  *
  */
-namespace webfiori\framework\writers;
+namespace WebFiori\Framework\Writers;
 
 use WebFiori\Http\AbstractWebService;
 use WebFiori\Http\ParamOption;
@@ -41,13 +41,13 @@ class WebServiceWriter extends ClassWriter {
      * <li><b>name</b>: The name of the class that will be created. If not provided, the
      * string 'NewClass' is used.</li>
      * <li><b>namespace</b>: The namespace that the class will belong to. If not provided,
-     * the namespace 'webfiori' is used.</li>
+     * the namespace 'WebFiori' is used.</li>
      * <li><b>path</b>: The location at which the query will be created on. If not
      * provided, the constant ROOT_PATH is used. </li>
      * </ul>
      */
     public function __construct(?AbstractWebService $webServicesObj = null) {
-        parent::__construct('NewWebService', APP_PATH.'apis', APP_DIR.'\\apis');
+        parent::__construct('NewWebService', APP_PATH.'Apis', APP_DIR.'\\Apis');
 
         $this->setSuffix('Service');
         $this->addUseStatement(AbstractWebService::class);
diff --git a/app/langs/LangGB.php b/app/langs/LangGB.php
deleted file mode 100644
index 45c0d2dd0..000000000
--- a/app/langs/LangGB.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-namespace app\langs;
diff --git a/composer.json b/composer.json
index 1f1453bab..9fa4d3792 100644
--- a/composer.json
+++ b/composer.json
@@ -26,11 +26,11 @@
         "webfiori/http": "v4.0.*",
         "webfiori/file": "v2.0.*",
         "webfiori/jsonx": "v4.0.*",
-        "webfiori/ui": "v3.0.*",
+        "webfiori/ui": "v4.0.*",
         "webfiori/collections": "v2.0.*",
         "webfiori/database": "v1.1.*",
         "webfiori/cli": "v2.0.*",
-        "webfiori/mailer": "v2.0.*",
+        "webfiori/mailer": "v2.1.*",
         "webfiori/err": "v2.0.*"
     },
     "scripts": {
@@ -42,12 +42,12 @@
     },
     "autoload": {
         "psr-4": {
-            "webfiori\\framework\\": "webfiori/framework/"
+            "WebFiori\\Framework\\": "WebFiori/Framework/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "webfiori\\tests\\": "tests/"
+            "WebFiori\\Tests\\": "tests/"
         }
     },
     "keywords": [
diff --git a/public/index.php b/public/index.php
index 09da46ee1..88e752ebc 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,19 +1,19 @@
 <?php
-namespace webfiori;
+namespace WebFiori;
 
 use Exception;
-use webfiori\framework\App;
-use webfiori\framework\router\Router;
-use webfiori\framework\session\SessionsManager;
-use webfiori\http\Request;
-use webfiori\http\Response;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Router\Router;
+use WebFiori\Framework\Session\SessionsManager;
+use WebFiori\http\Request;
+use WebFiori\http\Response;
 /**
  * The name of the directory at which the developer will have his own application
  * code.
  *
  * @since 2.3.0
  */
-define('APP_DIR', 'app');
+define('APP_DIR', 'App');
 
 
 /**
@@ -71,7 +71,7 @@ public static function create() {
      */
     private function loadAppClass() {
         $DS = DIRECTORY_SEPARATOR;
-        $frameworkPath = ROOT_PATH.$DS.'webfiori'.$DS.'framework';
+        $frameworkPath = ROOT_PATH.$DS.'WebFiori'.$DS.'framework';
         $corePath = $frameworkPath;
         $rootClass = $DS.'App.php';
 
diff --git a/release-commit.php b/release-commit.php
index 3cb8f8f04..3b69a7aa8 100644
--- a/release-commit.php
+++ b/release-commit.php
@@ -1,7 +1,7 @@
 <?php
 
 require __DIR__.DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'autoload.php';
-webfiori\framework\App::initFrameworkVersionInfo();
+WebFiori\Framework\App::initFrameworkVersionInfo();
 echo "Creating Commit...\n";
 $commit = 'git commit --allow-empty -m "chore: release v'.WF_VERSION.'" -m "Release-As: v'.WF_VERSION.'"';
 echo $commit."\n";
diff --git a/tests/apis/emptyService/EmptyServicesManager.php b/tests/Apis/EmptyService/EmptyServicesManager.php
similarity index 87%
rename from tests/apis/emptyService/EmptyServicesManager.php
rename to tests/Apis/EmptyService/EmptyServicesManager.php
index 3a1dbad6a..aba06f4cc 100644
--- a/tests/apis/emptyService/EmptyServicesManager.php
+++ b/tests/Apis/EmptyService/EmptyServicesManager.php
@@ -1,5 +1,5 @@
 <?php
-namespace tests\apis\emptyService;
+namespace Apis\EmptyService;
 
 use WebFiori\Http\WebServicesManager;
 /**
diff --git a/tests/apis/multiple/ServicesManager00.php b/tests/Apis/Multiple/ServicesManager00.php
similarity index 91%
rename from tests/apis/multiple/ServicesManager00.php
rename to tests/Apis/Multiple/ServicesManager00.php
index 8dbc2d25b..565f2e3d2 100644
--- a/tests/apis/multiple/ServicesManager00.php
+++ b/tests/Apis/Multiple/ServicesManager00.php
@@ -1,5 +1,5 @@
 <?php
-namespace tests\apis\multiple;
+namespace Apis\Multiple;
 
 use WebFiori\Http\WebServicesManager;
 /**
diff --git a/tests/apis/multiple/WebService00.php b/tests/Apis/Multiple/WebService00.php
similarity index 98%
rename from tests/apis/multiple/WebService00.php
rename to tests/Apis/Multiple/WebService00.php
index be431d799..39860c736 100644
--- a/tests/apis/multiple/WebService00.php
+++ b/tests/Apis/Multiple/WebService00.php
@@ -1,5 +1,5 @@
 <?php
-namespace tests\apis\multiple;
+namespace Apis\Multiple;
 
 use WebFiori\Http\AbstractWebService;
 use WebFiori\Http\ParamType;
diff --git a/tests/apis/multiple/WebService01.php b/tests/Apis/Multiple/WebService01.php
similarity index 97%
rename from tests/apis/multiple/WebService01.php
rename to tests/Apis/Multiple/WebService01.php
index a0f8a6ab1..b2b4ad8df 100644
--- a/tests/apis/multiple/WebService01.php
+++ b/tests/Apis/Multiple/WebService01.php
@@ -1,5 +1,5 @@
 <?php
-namespace tests\apis\multiple;
+namespace Apis\Multiple;
 
 use WebFiori\Http\AbstractWebService;
 use WebFiori\Http\RequestMethod;
diff --git a/tests/tables/EmployeeInfoTable.php b/tests/Tables/EmployeeInfoTable.php
similarity index 98%
rename from tests/tables/EmployeeInfoTable.php
rename to tests/Tables/EmployeeInfoTable.php
index 8fd4a8ce5..d137fba25 100644
--- a/tests/tables/EmployeeInfoTable.php
+++ b/tests/Tables/EmployeeInfoTable.php
@@ -1,5 +1,5 @@
 <?php
-namespace tables;
+namespace Tables;
 
 use WebFiori\Database\MySql\MySQLTable;
 
diff --git a/tests/tables/PositionInfoTable.php b/tests/Tables/PositionInfoTable.php
similarity index 98%
rename from tests/tables/PositionInfoTable.php
rename to tests/Tables/PositionInfoTable.php
index 657c224fb..7b439703c 100644
--- a/tests/tables/PositionInfoTable.php
+++ b/tests/Tables/PositionInfoTable.php
@@ -1,5 +1,5 @@
 <?php
-namespace tables;
+namespace Tables;
 
 use WebFiori\Database\MySql\MySQLTable;
 
diff --git a/tests/tables/Schema.php b/tests/Tables/Schema.php
similarity index 83%
rename from tests/tables/Schema.php
rename to tests/Tables/Schema.php
index 26fe9ee41..ab9bb5db0 100644
--- a/tests/tables/Schema.php
+++ b/tests/Tables/Schema.php
@@ -1,7 +1,7 @@
 <?php
-namespace tables;
+namespace Tables;
 
-use webfiori\framework\DB;
+use WebFiori\Framework\DB;
 /**
  * Description of Schema
  *
diff --git a/tests/tables/Schema2.php b/tests/Tables/Schema2.php
similarity index 83%
rename from tests/tables/Schema2.php
rename to tests/Tables/Schema2.php
index 21c99ade6..f059efe76 100644
--- a/tests/tables/Schema2.php
+++ b/tests/Tables/Schema2.php
@@ -1,7 +1,7 @@
 <?php
-namespace tables;
+namespace Tables;
 
-use webfiori\framework\DB;
+use WebFiori\Framework\DB;
 /**
  * Description of Schema
  *
diff --git a/tests/tables/Schema3.php b/tests/Tables/Schema3.php
similarity index 83%
rename from tests/tables/Schema3.php
rename to tests/Tables/Schema3.php
index c9d200087..c5fb382a1 100644
--- a/tests/tables/Schema3.php
+++ b/tests/Tables/Schema3.php
@@ -1,7 +1,7 @@
 <?php
-namespace tables;
+namespace Tables;
 
-use webfiori\framework\DB;
+use WebFiori\Framework\DB;
 /**
  * Description of Schema
  *
diff --git a/tests/tables/UserInfoTable.php b/tests/Tables/UserInfoTable.php
similarity index 96%
rename from tests/tables/UserInfoTable.php
rename to tests/Tables/UserInfoTable.php
index 0d9500b2d..6b7c4f95f 100644
--- a/tests/tables/UserInfoTable.php
+++ b/tests/Tables/UserInfoTable.php
@@ -1,5 +1,5 @@
 <?php
-namespace tables;
+namespace Tables;
 
 use WebFiori\Database\MySql\MySQLTable;
 
diff --git a/tests/test-entities/TestMiddleware.php b/tests/TestEntities/TestMiddleware.php
similarity index 90%
rename from tests/test-entities/TestMiddleware.php
rename to tests/TestEntities/TestMiddleware.php
index eb16d4b01..10a9995d8 100644
--- a/tests/test-entities/TestMiddleware.php
+++ b/tests/TestEntities/TestMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-use webfiori\framework\middleware\AbstractMiddleware;
+use WebFiori\Framework\Middleware\AbstractMiddleware;
 use WebFiori\Http\Request;
 use WebFiori\Http\Response;
 
diff --git a/tests/test-entities/UserContactInfo.php b/tests/TestEntities/UserContactInfo.php
similarity index 94%
rename from tests/test-entities/UserContactInfo.php
rename to tests/TestEntities/UserContactInfo.php
index 37d66a0b3..8d46b1436 100644
--- a/tests/test-entities/UserContactInfo.php
+++ b/tests/TestEntities/UserContactInfo.php
@@ -1,5 +1,5 @@
 <?php
-namespace webfiori\tests\database;
+namespace WebFiori\Tests\Database;
 
 use phMysql\MySQLColumn;
 use phMysql\MySQLQuery;
@@ -29,7 +29,7 @@ public function __construct() {
         $this->getCol('contact-type')->setIsUnique(false);
         $this->getCol('contact-type')->setIsPrimary(true);
         $this->table->addColumn('contact-info', new MySQLColumn('contact_info', 'varchar',320));
-        $this->table->addReference('webfiori\tests\database\UsersQuery', [
+        $this->table->addReference('WebFiori\Tests\Database\UsersQuery', [
             'user-id' => 'user-id'
         ], 'user_contact_info_fk', 'cadcade', 'cascade');
         $this->setTable($this->table);
diff --git a/tests/test-entities/UserWithContact.php b/tests/TestEntities/UserWithContact.php
similarity index 87%
rename from tests/test-entities/UserWithContact.php
rename to tests/TestEntities/UserWithContact.php
index ce225b968..cccaf6426 100644
--- a/tests/test-entities/UserWithContact.php
+++ b/tests/TestEntities/UserWithContact.php
@@ -1,7 +1,7 @@
 <?php
-namespace webfiori\tests\testEntity;
+namespace WebFiori\Tests\TestEntity;
 
-use webfiori\framework\User;
+use WebFiori\Framework\User;
 
 /**
  * Description of UserWithContact
diff --git a/tests/test-entities/UsersQuery.php b/tests/TestEntities/UsersQuery.php
similarity index 94%
rename from tests/test-entities/UsersQuery.php
rename to tests/TestEntities/UsersQuery.php
index 1dfaf11b7..83156db3a 100644
--- a/tests/test-entities/UsersQuery.php
+++ b/tests/TestEntities/UsersQuery.php
@@ -1,10 +1,10 @@
 <?php
-namespace webfiori\tests\database;
+namespace WebFiori\Tests\Database;
 
 use phMysql\MySQLColumn;
 use phMysql\MySQLQuery;
 use phMysql\MySQLTable;
-use webfiori\framework\User;
+use WebFiori\Framework\User;
 /**
  * Description of UsersQuery
  *
diff --git a/tests/webfiori/benchmark/RouterBench.php b/tests/WebFiori/Benchmark/RouterBench.php
similarity index 79%
rename from tests/webfiori/benchmark/RouterBench.php
rename to tests/WebFiori/Benchmark/RouterBench.php
index 69ba0471d..9fa501165 100644
--- a/tests/webfiori/benchmark/RouterBench.php
+++ b/tests/WebFiori/Benchmark/RouterBench.php
@@ -1,7 +1,7 @@
 <?php
-namespace webfiori\benchmark;
+namespace WebFiori\Benchmark;
 
-use webfiori\framework\router\Router;
+use WebFiori\Framework\Router\Router;
 
 /**
  * Description of RouterBench
@@ -16,7 +16,7 @@ class RouterBench {
     public function benchAddRoute() {
         if (!defined('DS')) {
             define('DS', DIRECTORY_SEPARATOR);
-            define('APP_DIR','app');
+            define('APP_DIR','App');
         }
         Router::closure([
             'path' => 'hello',
diff --git a/tests/webfiori/framework/test/AccessTest.php b/tests/WebFiori/Framework/Tests/AccessTest.php
similarity index 98%
rename from tests/webfiori/framework/test/AccessTest.php
rename to tests/WebFiori/Framework/Tests/AccessTest.php
index cbfd4d3a9..1cd487788 100644
--- a/tests/webfiori/framework/test/AccessTest.php
+++ b/tests/WebFiori/Framework/Tests/AccessTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace webfiori\framework\test;
+namespace WebFiori\Framework\Test;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\Access;
-use webfiori\framework\User;
+use WebFiori\Framework\Access;
+use WebFiori\Framework\User;
 /**
- * A test class for testing the class 'webfiori\framework\Access'.
+ * A test class for testing the class 'WebFiori\Framework\Access'.
  *
  * @author Ibrahim
  */
diff --git a/tests/webfiori/framework/test/ClassUtilTest.php b/tests/WebFiori/Framework/Tests/ClassUtilTest.php
similarity index 97%
rename from tests/webfiori/framework/test/ClassUtilTest.php
rename to tests/WebFiori/Framework/Tests/ClassUtilTest.php
index 7d3c2db8d..2fb153024 100644
--- a/tests/webfiori/framework/test/ClassUtilTest.php
+++ b/tests/WebFiori/Framework/Tests/ClassUtilTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace webfiori\framework\test;
+namespace WebFiori\Framework\Test;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\Util as U;
+use WebFiori\Framework\Util as U;
 /**
- * A unit test class for testing the class webfiori/entity/Util.
+ * A unit test class for testing the class WebFiori/entity/Util.
  *
  * @author Ibrahim
  */
diff --git a/tests/webfiori/framework/test/cli/AddCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/AddCommandTest.php
similarity index 94%
rename from tests/webfiori/framework/test/cli/AddCommandTest.php
rename to tests/WebFiori/Framework/Tests/Cli/AddCommandTest.php
index 5aa86efe3..35559ab3d 100644
--- a/tests/webfiori/framework/test/cli/AddCommandTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/AddCommandTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
 use WebFiori\File\File;
-use webfiori\framework\App;
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\AddCommand;
-use webfiori\framework\config\Controller;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\AddCommand;
+use WebFiori\Framework\Config\Controller;
 
 /**
  * Description of TestAddCommand
@@ -75,7 +75,7 @@ public function testAddDBConnection01() {
         $connName = 'db-connection-'.(count(App::getConfig()->getDBConnections()) + 1);
         
         $output = $this->executeSingleCommand(new AddCommand(), [
-            'webfiori',
+            'WebFiori',
             'add'
         ], [
             '0',
@@ -121,7 +121,7 @@ public function testAddDBConnection02() {
         $connName = 'db-connection-'.($count + 1);
         
         $output = $this->executeSingleCommand(new AddCommand(), [
-            'webfiori',
+            'WebFiori',
             'add'
         ], [
             '0',
@@ -169,8 +169,8 @@ public function testAddLang00() {
         $langCode = chr(65 + ($langCode[0] % 26)) . chr(65 + ($langCode[1] % 26));
         
         // Clean up if it exists from previous runs
-        if (class_exists('\\app\\langs\\Lang' . $langCode)) {
-            $this->removeClass('\\app\\langs\\Lang' . $langCode);
+        if (class_exists('\\App\\Langs\\Lang' . $langCode)) {
+            $this->removeClass('\\App\\Langs\\Lang' . $langCode);
         }
         
         $output = $this->executeSingleCommand(new AddCommand(), [], [
@@ -196,10 +196,10 @@ public function testAddLang00() {
             "Select writing direction:\n",
             "0: ltr\n",
             "1: rtl\n",
-            "Success: Language added. Also, a class for the language is created at \"".APP_DIR."\langs\" for that language.\n"
+            "Success: Language added. Also, a class for the language is created at \"".APP_DIR."\Langs\" for that language.\n"
         ], $output);
-        $this->assertTrue(class_exists('\\app\\langs\\Lang' . $langCode));
-        $this->removeClass('\\app\\langs\\Lang' . $langCode);
+        $this->assertTrue(class_exists('\\App\\Langs\\Lang' . $langCode));
+        $this->removeClass('\\App\\Langs\\Lang' . $langCode);
         Controller::getDriver()->initialize();
     }
     /**
@@ -242,7 +242,7 @@ public function testAddLang02() {
             "Language code:\n",
             "Error: Invalid language code.\n",
         ], $output);
-        $this->removeClass('\\app\\langs\\LanguageFK');
+        $this->removeClass('\\App\\Langs\\LanguageFK');
     }
     /**
      * @test
@@ -251,7 +251,7 @@ public function testAddSMTPConnection00() {
         $connName = 'smtp-connection-'.count(App::getConfig()->getSMTPConnections());
         
         $output = $this->executeSingleCommand(new AddCommand(), [
-            'webfiori',
+            'WebFiori',
             'add'
         ], [
             '1',
diff --git a/tests/webfiori/framework/test/cli/CreateAPITestCaseTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php
similarity index 70%
rename from tests/webfiori/framework/test/cli/CreateAPITestCaseTest.php
rename to tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php
index ee53c02d1..cae0f8241 100644
--- a/tests/webfiori/framework/test/cli/CreateAPITestCaseTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/CreateAPITestCaseTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\CreateCommand;
-use webfiori\framework\scheduler\webServices\TasksServicesManager;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
+use WebFiori\Framework\Scheduler\WebServices\TasksServicesManager;
 use WebFiori\Http\WebServicesManager;
 /**
  * @author Ibrahim
@@ -27,7 +27,7 @@ public function testCreateAPITestCase00() {
      * @test
      */
     public function testCreateAPITestCase01() {
-        $path = ROOT_PATH.DS."tests".DS."webfiori".DS."framework".DS."scheduler".DS."webServices";
+        $path = ROOT_PATH.DS.'tests'.DS."WebFiori".DS."Framework".DS."Scheduler".DS."WebServices";
         $this->assertEquals([
             "Info: Selected services manager has no service with name 'c'.\n",
             "Which service you would like to have a test case for?\n",
@@ -38,7 +38,7 @@ public function testCreateAPITestCase01() {
             "4: set-password\n",
             "Test case will be created with following parameters:\n",
             "PHPUnit Version: 9\n",
-            'Name: tests\webfiori\\framework\scheduler\webServices\\TasksLoginServiceTest'."\n",
+            'Name: WebFiori\\Framework\Scheduler\WebServices\\TasksLoginServiceTest'."\n",
             "Path: ".$path."\n",
             "Would you like to use default parameters?(Y/n)\n",
             "Info: New class was created at \"".$path."\".\n"
@@ -53,17 +53,17 @@ public function testCreateAPITestCase01() {
         ]));
         
         $this->assertEquals(0, $this->getExitCode());
-        $clazz = '\\tests\webfiori\\framework\scheduler\webServices\\TasksLoginServiceTest';
+        $clazz = '\\WebFiori\\Framework\Scheduler\WebServices\\TasksLoginServiceTest';
         $this->assertTrue(file_exists($path.DS.'TasksLoginServiceTest.php'));
         require_once $path.DS.'TasksLoginServiceTest.php';
         $this->assertTrue(class_exists($clazz));
-        $this->removeClass($clazz);
+        $this->removeClass('tests\\WebFiori\\Framework\\Scheduler\\WebServices\\TasksLoginServiceTest');
     }
     /**
      * @test
      */
     public function testCreateAPITestCase02() {
-        $path = ROOT_PATH.DS."tests".DS."webfiori".DS."framework".DS."scheduler".DS."webServices";
+        $path = ROOT_PATH.DS."tests".DS."WebFiori".DS."Framework".DS."Scheduler".DS."WebServices";
         $this->assertEquals([
             "Info: New class was created at \"".$path."\".\n"
         ], $this->executeMultiCommand([
@@ -74,34 +74,35 @@ public function testCreateAPITestCase02() {
             '--defaults'
         ]));
         $this->assertEquals(0, $this->getExitCode());
-        $clazz = '\\tests\webfiori\\framework\scheduler\webServices\\GetTasksServiceTest';
+        $clazz = '\\WebFiori\\Framework\Scheduler\WebServices\\GetTasksServiceTest';
         $this->assertTrue(file_exists($path.DS.'GetTasksServiceTest.php'));
         require_once $path.DS.'GetTasksServiceTest.php';
         $this->assertTrue(class_exists($clazz));
-        $this->removeClass($clazz);
+        $this->removeClass('tests\\WebFiori\\Framework\\Scheduler\\WebServices\\GetTasksServiceTest');
     }
     /**
      * @test
      */
     public function testCreateAPITestCase03() {
-        $path = ROOT_PATH.DS."tests".DS."webfiori".DS."framework".DS."scheduler".DS."webServices";
+        $path = ROOT_PATH.DS."tests".DS."WebFiori".DS."Framework".DS."Scheduler".DS."WebServices";
+        $name = 'GetTasksServiceTest';
         $this->assertEquals([
             "Please enter services manager information:\n",
             "Test case will be created with following parameters:\n",
             "PHPUnit Version: 9\n",
-            'Name: tests\webfiori\\framework\scheduler\webServices\\GetTasksServiceTest'."\n",
+            'Name: WebFiori\\Framework\Scheduler\WebServices\\'.$name."\n",
             "Path: ".$path."\n",
             "Would you like to use default parameters?(Y/n)\n",
             "PHPUnit Version: Enter = '11'\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'tests\webfiori\\framework\scheduler\webServices'\n",
+            "Enter an optional namespace for the class: Enter = 'WebFiori\\Framework\Scheduler\WebServices'\n",
             "Info: New class was created at \"".$path."\".\n"
         ], $this->executeMultiCommand([
             CreateCommand::class,
             '--c' => 'api-test',
             '--service' => 'get-tasks',
         ], [
-            '\webfiori\\framework\scheduler\webServices\\TasksServicesManager',
+            '\WebFiori\\Framework\Scheduler\WebServices\\TasksServicesManager',
             'n',
             '10',
             '',
@@ -109,34 +110,35 @@ public function testCreateAPITestCase03() {
         ]));
         $this->assertEquals(0, $this->getExitCode());
 
-        $clazz = '\\tests\webfiori\\framework\scheduler\webServices\\GetTasksServiceTest';
+        $clazz = '\\WebFiori\\Framework\Scheduler\WebServices\\GetTasksServiceTest';
         $this->assertTrue(file_exists($path.DS.'GetTasksServiceTest.php'));
         require_once $path.DS.'GetTasksServiceTest.php';
         $this->assertTrue(class_exists($clazz));
-        $this->removeClass($clazz);
+        $this->removeClass('tests\\WebFiori\\Framework\\Scheduler\\WebServices\\GetTasksServiceTest');
     }
     /**
      * @test
      */
     public function testCreateAPITestCase04() {
-        $path = ROOT_PATH.DS."tests".DS."tests".DS."apis".DS."multiple";
+        $path = ROOT_PATH.DS."tests".DS."Apis".DS."Multiple";
+        $name = 'WebService00Test';
         $this->assertEquals([
             "Please enter services manager information:\n",
             "Test case will be created with following parameters:\n",
             "PHPUnit Version: 9\n",
-            'Name: tests\tests\apis\multiple\WebService00Test'."\n",
+            'Name: Apis\Multiple\\'.$name."\n",
             "Path: ".$path."\n",
             "Would you like to use default parameters?(Y/n)\n",
             "PHPUnit Version: Enter = '11'\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'tests\\tests\apis\multiple'\n",
+            "Enter an optional namespace for the class: Enter = 'Apis\Multiple'\n",
             "Info: New class was created at \"".$path."\".\n"
         ], $this->executeMultiCommand([
             CreateCommand::class,
             '--c' => 'api-test',
             '--service' => 'say-hi-service',
         ], [
-            '\\tests\\apis\\multiple\\ServicesManager00',
+            '\\Apis\\Multiple\\ServicesManager00',
             'n',
             '10',
             '',
@@ -144,11 +146,11 @@ public function testCreateAPITestCase04() {
         ]));
         $this->assertEquals(0, $this->getExitCode());
 
-        $clazz = '\\tests\\tests\\apis\\multiple\\WebService00Test';
-        $this->assertTrue(file_exists($path.DS.'WebService00Test.php'));
-        require_once $path.DS.'WebService00Test.php';
+        $clazz = '\\Apis\\Multiple\\'.$name;
+        $this->assertTrue(file_exists($path.DS.$name.'.php'));
+        require_once $path.DS.$name.'.php';
         $this->assertTrue(class_exists($clazz));
-        $this->removeClass($clazz);
+        $this->removeClass('tests\\Apis\\Multiple\\'.$name);
     }
     
     /**
@@ -160,7 +162,7 @@ public function testCreateAPITestCase05() {
         ], $this->executeMultiCommand([
             CreateCommand::class,
             '--c' => 'api-test',
-            '--manager' => '\\tests\\apis\\emptyService\\EmptyServicesManager',
+            '--manager' => '\\Apis\\EmptyService\\EmptyServicesManager',
         ]));
         $this->assertEquals(-1, $this->getExitCode());
     }
@@ -168,49 +170,50 @@ public function testCreateAPITestCase05() {
      * @test
      */
     public function testCreateAPITestCase06() {
-        $path = ROOT_PATH.DS."tests".DS."tests".DS."apis".DS."multiple";
+        $path = ROOT_PATH.DS."tests".DS."Apis".DS."Multiple";
+        $name = 'WebService00Test'; 
         $this->assertEquals([
             "Please enter services manager information:\n",
             "Error: Provided class is not an instance of ".WebServicesManager::class."\n",
             "Please enter services manager information:\n",
             "Test case will be created with following parameters:\n",
             "PHPUnit Version: 9\n",
-            'Name: tests\tests\apis\multiple\WebService00Test'."\n",
+            'Name: Apis\Multiple\\'.$name."\n",
             "Path: ".$path."\n",
             "Would you like to use default parameters?(Y/n)\n",
             "PHPUnit Version: Enter = '11'\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'tests\\tests\apis\multiple'\n",
+            "Enter an optional namespace for the class: Enter = 'Apis\Multiple'\n",
             "Info: New class was created at \"".$path."\".\n"
         ], $this->executeMultiCommand([
             CreateCommand::class,
             '--c' => 'api-test',
             '--service' => 'say-hi-service',
         ], [
-            '\\tests\\apis\\multiple\\WebService00',
-            '\\tests\\apis\\multiple\\ServicesManager00',
+            '\\Apis\\Multiple\\WebService00',
+            '\\Apis\\Multiple\\ServicesManager00',
             'n',
             '10',
             '',
             '',
         ]));
         $this->assertEquals(0, $this->getExitCode());
-        $clazz = '\\tests\\tests\\apis\\multiple\\WebService00Test';
+        $clazz = '\\Apis\\Multiple\\'.$name;
         $this->assertTrue(file_exists($path.DS.'WebService00Test.php'));
-        require_once $path.DS.'WebService00Test.php';
+        require_once $path.DS.$name.'.php';
         $this->assertTrue(class_exists($clazz));
-        $this->removeClass($clazz);
+        $this->removeClass('tests\\Apis\\Multiple\\'.$name);
     }
     /**
      * @test
      */
     public function testCreateAPITestCase07() {
         $this->assertEquals([
-            "Error: The argument --manager has invalid value: Not a class: \\tests\\apis\\emptyService\\Xyz\n",
+            "Error: The argument --manager has invalid value: Not a class: \\tests\\Apis\\EmptyService\\Xyz\n",
         ], $this->executeMultiCommand([
             CreateCommand::class,
             '--c' => 'api-test',
-            '--manager' => '\\tests\\apis\\emptyService\\Xyz',
+            '--manager' => '\\tests\\Apis\\EmptyService\\Xyz',
         ]));
         $this->assertEquals(-1, $this->getExitCode());
     }
@@ -218,21 +221,22 @@ public function testCreateAPITestCase07() {
      * @test
      */
     public function testCreateAPITestCase08() {
-        $path = ROOT_PATH.DS."tests".DS."tests".DS."apis".DS."multiple";
+        $path = ROOT_PATH.DS."tests".DS."Apis".DS."Multiple";
         $this->assertEquals([
             "Info: New class was created at \"".$path."\".\n"
         ], $this->executeMultiCommand([
             CreateCommand::class,
             '--c' => 'api-test',
             '--service' => 'say-hi-service-2',
-            '--manager' => '\\tests\\apis\\multiple\\ServicesManager00',
+            '--manager' => '\\Apis\\Multiple\\ServicesManager00',
             '--defaults'
         ]));
         $this->assertEquals(0, $this->getExitCode());
-        $clazz = '\\tests\\tests\\apis\\multiple\\WebService01Test';
-        $this->assertTrue(file_exists($path.DS.'WebService01Test.php'));
-        require_once $path.DS.'WebService01Test.php';
+        $name = 'WebService01Test';
+        $clazz = '\\Apis\\Multiple\\'.$name;
+        $this->assertTrue(file_exists($path.DS.$name.'.php'));
+        require_once $path.DS.$name.'.php';
         $this->assertTrue(class_exists($clazz));
-        $this->removeClass($clazz);
+        $this->removeClass('tests\\Apis\\Multiple\\'.$name);
     }
 }
diff --git a/tests/webfiori/framework/test/cli/CreateCLICommandTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php
similarity index 86%
rename from tests/webfiori/framework/test/cli/CreateCLICommandTest.php
rename to tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php
index 4f27c91d5..8257947b3 100644
--- a/tests/webfiori/framework/test/cli/CreateCLICommandTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/CreateCLICommandTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
 use WebFiori\Cli\Command;
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\CreateCommand;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
 
 /**
  * @author Ibrahim
@@ -14,12 +14,12 @@ class CreateCLICommandTest extends CLITestCase {
      */
     public function testCreateCommand00() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create'
         ], [
             '5',
             'NewCLI',
-            'app\commands',
+            'App\Commands',
             'print-hello',
             'Prints \'Hello World\' in the console.',
             'N',
@@ -42,32 +42,32 @@ public function testCreateCommand00() {
             "10: Database migration.\n",
             "11: Quit. <--\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\commands'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Commands'\n",
             "Enter a name for the command:\n",
             "Give a short description of the command:\n",
             "Would you like to add arguments to the command?(y/N)\n",
-            'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."commands\".\n",
+            'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Commands\".\n",
         ], $output);
-        $this->assertTrue(class_exists('\\app\\commands\\NewCLICommand'));
-        $this->removeClass('\\app\\commands\\NewCLICommand');
+        $this->assertTrue(class_exists('\\App\\Commands\\NewCLICommand'));
+        $this->removeClass('\\App\\Commands\\NewCLICommand');
     }
     
     /**
      * @test
      */
     public function testCreateCommand01() {
-        $clazz = '\\app\\commands\\DoItCommand';
+        $clazz = '\\App\\Commands\\DoItCommand';
         if (class_exists($clazz)) {
             $this->removeClass($clazz);
         }
         
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
             '--c' => 'command'
         ], [
             'DoIt',
-            'app\commands',
+            'App\Commands',
             'do-it',
             'Do something amazing.',
             'y',
@@ -88,7 +88,7 @@ public function testCreateCommand01() {
         $this->assertEquals(0, $this->getExitCode());
         $this->assertEquals([
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\commands'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Commands'\n",
             "Enter a name for the command:\n",
             "Give a short description of the command:\n",
             "Would you like to add arguments to the command?(y/N)\n",
@@ -105,7 +105,7 @@ public function testCreateCommand01() {
             "Is this argument optional or not?(Y/n)\n",
             "Enter default value:\n",
             "Would you like to add more arguments?(y/N)\n",
-            'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."commands\".\n",
+            'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Commands\".\n",
         ], $output);
         
         $this->assertTrue(class_exists($clazz));
diff --git a/tests/webfiori/framework/test/cli/CreateCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateCommandTest.php
similarity index 91%
rename from tests/webfiori/framework/test/cli/CreateCommandTest.php
rename to tests/WebFiori/Framework/Tests/Cli/CreateCommandTest.php
index b60a4b452..eacb03f84 100644
--- a/tests/webfiori/framework/test/cli/CreateCommandTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/CreateCommandTest.php
@@ -1,8 +1,8 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\CreateCommand;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
 
 /**
  * Description of CreateCommandTest
@@ -15,7 +15,7 @@ class CreateCommandTest extends CLITestCase {
      */
     public function testCreate00() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create'
         ], [
             '11',
@@ -44,7 +44,7 @@ public function testCreate00() {
      */
     public function testCreate01() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create'
         ], [
             "\n", // Hit Enter to pick default value (quit)
diff --git a/tests/webfiori/framework/test/cli/CreateDBAccessTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php
similarity index 73%
rename from tests/webfiori/framework/test/cli/CreateDBAccessTest.php
rename to tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php
index 13664f854..65a4d38e2 100644
--- a/tests/webfiori/framework/test/cli/CreateDBAccessTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/CreateDBAccessTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
 use WebFiori\Database\ConnectionInfo;
-use webfiori\framework\App;
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\CreateCommand;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
 
 /**
  * Description of CreateDBAccessTest
@@ -19,15 +19,15 @@ public function test00() {
         App::getConfig()->removeAllDBConnections();
         
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
             '--c' => 'db'
         ], [
-            'tables\\EmployeeInfoTable',
+            'Tables\\EmployeeInfoTable',
             'EmployeeOperations',
-            "\n", // Hit Enter to pick default value (app\database)
+            "\n", // Hit Enter to pick default value (App\Database)
             'SuperUser',
-            "\n", // Hit Enter to pick default value (app\entity)
+            "\n", // Hit Enter to pick default value (App\Entity)
             'n'
         ]);
 
@@ -36,15 +36,15 @@ public function test00() {
             "Enter database table class name (include namespace):\n",
             "We need from you to give us class information.\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\database'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Database'\n",
             "Warning: No database connections were found. Make sure to specify connection later inside the class.\n",
             "We need from you to give us entity class information.\n",
             "Entity class name:\n",
-            "Entity namespace: Enter = 'app\\entity'\n",
+            "Entity namespace: Enter = 'App\\Entity'\n",
             "Would you like to have update methods for every single column?(y/N)\n",
-            "Info: New class was created at \"". ROOT_PATH.DS."app".DS."database\".\n"
+            "Info: New class was created at \"". ROOT_PATH.DS."App".DS."Database\".\n"
         ], $output);
-        $clazz = '\\app\\database\\EmployeeOperationsDB';
+        $clazz = '\\App\\Database\\EmployeeOperationsDB';
         $this->assertTrue(class_exists($clazz));
         $this->removeClass($clazz);
     }
@@ -54,15 +54,15 @@ public function test00() {
      */
     public function test01() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
             '--c' => 'db'
         ], [
-            'tables\\EmployeeInfoTable',
+            'Tables\\EmployeeInfoTable',
             'EmployeeS',
-            'app\\database\\empl',
+            "\n",
             'SuperHero',
-            'app\\entity\\subs',
+            "\n",
             'y'
         ]);
 
@@ -71,15 +71,15 @@ public function test01() {
             "Enter database table class name (include namespace):\n",
             "We need from you to give us class information.\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\database'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Database'\n",
             "Warning: No database connections were found. Make sure to specify connection later inside the class.\n",
             "We need from you to give us entity class information.\n",
             "Entity class name:\n",
-            "Entity namespace: Enter = 'app\\entity'\n",
+            "Entity namespace: Enter = 'App\\Entity'\n",
             "Would you like to have update methods for every single column?(y/N)\n",
-            "Info: New class was created at \"". ROOT_PATH.DS."app".DS."database".DS."empl\".\n"
+            "Info: New class was created at \"". ROOT_PATH.DS."App".DS."Database\".\n"
         ], $output);
-        $clazz = '\\app\\database\\empl\\EmployeeSDB';
+        $clazz = '\\App\\Database\\EmployeeSDB';
         $this->assertTrue(class_exists($clazz));
         $this->removeClass($clazz);
     }
@@ -94,16 +94,16 @@ public function test02() {
         App::getConfig()->addOrUpdateDBConnection($conn);
 
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
             '--c' => 'db'
         ], [
-            'tables\\PositionInfoTable',
+            'Tables\\PositionInfoTable',
             'Position2x',
-            'app\\database',
+            'App\\Database',
             '0',
             'SuperPosition',
-            'app\\entity\\subs',
+            'App\\Entity\\subs',
             'y'
         ]);
 
@@ -112,17 +112,17 @@ public function test02() {
             "Enter database table class name (include namespace):\n",
             "We need from you to give us class information.\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\database'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Database'\n",
             "Select database connecion to use with the class:\n",
             "0: Test Connection\n",
             "1: None <--\n",
             "We need from you to give us entity class information.\n",
             "Entity class name:\n",
-            "Entity namespace: Enter = 'app\\entity'\n",
+            "Entity namespace: Enter = 'App\\Entity'\n",
             "Would you like to have update methods for every single column?(y/N)\n",
-            "Info: New class was created at \"". ROOT_PATH.DS."app".DS."database\".\n"
+            "Info: New class was created at \"". ROOT_PATH.DS."App".DS."Database\".\n"
         ], $output);
-        $clazz = '\\app\\database\\Position2xDB';
+        $clazz = '\\App\\Database\\Position2xDB';
         $this->assertTrue(class_exists($clazz));
         $this->removeClass($clazz);
     }
diff --git a/tests/webfiori/framework/test/cli/CreateEntityTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php
similarity index 86%
rename from tests/webfiori/framework/test/cli/CreateEntityTest.php
rename to tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php
index f0d107ffa..625099f03 100644
--- a/tests/webfiori/framework/test/cli/CreateEntityTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/CreateEntityTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
-use app\database\TestTable;
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\CreateCommand;
+use App\Database\TestTable;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
 
 class CreateEntityTest extends CLITestCase {
     /**
@@ -11,13 +11,13 @@ class CreateEntityTest extends CLITestCase {
      */
     public function testCreateEntity00() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
-            '--c' => 'entity',
+            '--c' => 'Entity',
             '--table' => TestTable::class
         ], [
             'NeEntity',
-            "\n", // Hit Enter to pick default value (app\entity)
+            "\n", // Hit Enter to pick default value (App\Entity)
             'y',
             'y',
             'superNewAttr',
@@ -32,7 +32,7 @@ public function testCreateEntity00() {
         $this->assertEquals([
             "We need from you to give us entity class information.\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\\entity'\n",
+            "Enter an optional namespace for the class: Enter = 'App\\Entity'\n",
             "Would you like from your class to implement the interface JsonI?(Y/n)\n",
             "Would you like to add extra attributes to the entity?(y/N)\n",
             "Enter attribute name:\n",
@@ -48,8 +48,8 @@ public function testCreateEntity00() {
             "Generating your entity...\n",
             "Success: Entity class created.\n"
         ], $output);
-        $this->assertTrue(class_exists('\\app\\entity\\NeEntity'));
-        $this->removeClass('\\app\\entity\\NeEntity');
+        $this->assertTrue(class_exists('\\App\\Entity\\NeEntity'));
+        $this->removeClass('\\App\\Entity\\NeEntity');
     }
     
     /**
@@ -57,7 +57,7 @@ public function testCreateEntity00() {
      */
     public function testCreateEntity01() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
             '--c' => 'entiy', // Invalid command value
             '--table' => TestTable::class
@@ -93,7 +93,7 @@ public function testCreateEntity01() {
             "11: Quit. <--\n",
             "We need from you to give us entity class information.\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\\entity'\n",
+            "Enter an optional namespace for the class: Enter = 'App\\Entity'\n",
             "Would you like from your class to implement the interface JsonI?(Y/n)\n",
             "Would you like to add extra attributes to the entity?(y/N)\n",
             "Enter attribute name:\n",
@@ -109,7 +109,7 @@ public function testCreateEntity01() {
             "Generating your entity...\n",
             "Success: Entity class created.\n"
         ], $output);
-        $this->assertTrue(class_exists('\\app\\entity\\NewEntity'));
-        $this->removeClass('\\app\\entity\\NewEntity');
+        $this->assertTrue(class_exists('\\App\\Entity\\NewEntity'));
+        $this->removeClass('\\App\\Entity\\NewEntity');
     }
 }
diff --git a/tests/webfiori/framework/test/cli/CreateMiddlewareTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php
similarity index 79%
rename from tests/webfiori/framework/test/cli/CreateMiddlewareTest.php
rename to tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php
index 68c2b3d71..cde392827 100644
--- a/tests/webfiori/framework/test/cli/CreateMiddlewareTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/CreateMiddlewareTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
-use webfiori\framework\App;
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\CreateCommand;
-use webfiori\framework\middleware\AbstractMiddleware;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
+use WebFiori\Framework\Middleware\AbstractMiddleware;
 
 /**
  * Description of CreateMiddlewareTest
@@ -17,12 +17,12 @@ class CreateMiddlewareTest extends CLITestCase {
      */
     public function testCreateMiddleware00() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create'
         ], [
             '4',
             'NewCoolMd',
-            'app\middleware',
+            'App\Middleware',
             'Check is authorized',
             '22',
             "\n", // Hit Enter to pick default value (no group)
@@ -44,14 +44,14 @@ public function testCreateMiddleware00() {
             "10: Database migration.\n",
             "11: Quit. <--\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\middleware'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Middleware'\n",
             "Enter a name for the middleware:\n",
             "Enter middleware priority: Enter = '0'\n",
             "Would you like to add the middleware to a group?(y/N)\n",
-            'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."middleware\".\n",
+            'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Middleware\".\n",
         ], $output);
-        $this->assertTrue(class_exists('\\app\\middleware\\NewCoolMdMiddleware'));
-        $this->removeClass('\\app\\middleware\\NewCoolMdMiddleware');
+        $this->assertTrue(class_exists('\\App\\Middleware\\NewCoolMdMiddleware'));
+        $this->removeClass('\\App\\Middleware\\NewCoolMdMiddleware');
     }
     
     /**
@@ -59,12 +59,12 @@ public function testCreateMiddleware00() {
      */
     public function testCreateMiddleware01() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
-            '--c' => 'middleware'
+            '--c' => 'Middleware'
         ], [
             'NewCool',
-            'app\middleware',
+            'App\Middleware',
             '  ', // Invalid input (spaces only)
             'Check is cool',
             '22',
@@ -76,7 +76,7 @@ public function testCreateMiddleware01() {
         $this->assertEquals(0, $this->getExitCode());
         $this->assertEquals([
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\middleware'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Middleware'\n",
             "Enter a name for the middleware:\n",
             "Error: Invalid input is given. Try again.\n",
             "Enter a name for the middleware:\n",
@@ -84,10 +84,10 @@ public function testCreateMiddleware01() {
             "Would you like to add the middleware to a group?(y/N)\n",
             "Enter group name:\n",
             "Would you like to add the middleware to another group?(y/N)\n",
-            'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."middleware\".\n",
+            'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Middleware\".\n",
         ], $output);
         
-        $clazz = '\\app\\middleware\\NewCoolMiddleware';
+        $clazz = '\\App\\Middleware\\NewCoolMiddleware';
         $this->assertTrue(class_exists($clazz));
         $clazzObj = new $clazz();
         $this->assertTrue($clazzObj instanceof AbstractMiddleware);
diff --git a/tests/webfiori/framework/test/cli/CreateMigrationTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php
similarity index 65%
rename from tests/webfiori/framework/test/cli/CreateMigrationTest.php
rename to tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php
index 0ef67a48e..7dff77f2d 100644
--- a/tests/webfiori/framework/test/cli/CreateMigrationTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/CreateMigrationTest.php
@@ -1,17 +1,26 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
 use WebFiori\Database\Schema\SchemaRunner;
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\CreateCommand;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
 /**
  * @author Ibrahim
  */
 class CreateMigrationTest extends CLITestCase {
     
+    protected function setUp(): void {
+        parent::setUp();
+        // Ensure migrations directory exists
+        $migrationsDir = APP_PATH . DS . 'Database' . DS . 'Migrations';
+        if (!is_dir($migrationsDir)) {
+            mkdir($migrationsDir, 0755, true);
+        }
+    }
+    
     protected function tearDown(): void {
         // Clean up only specific migration files created by this test
-        $migrationsDir = APP_PATH . DS . 'database' . DS . 'migrations';
+        $migrationsDir = APP_PATH . DS . 'Database' . DS . 'Migrations';
         if (is_dir($migrationsDir)) {
             // Only remove Migration files directly in the migrations directory
             $files = glob($migrationsDir . DS . 'Migration[0-9][0-9][0-9].php');
@@ -36,12 +45,12 @@ protected function tearDown(): void {
     public function testCreateMigration01() {
         $name = 'CoolMigration';
         
-        $clazz = '\\app\\database\\migrations\\'.$name;
+        $clazz = '\\App\\Database\\Migrations\\'.$name;
         
         $this->assertEquals([
-            "Migration namespace: Enter = 'app\database\migrations'\n",
+            "Migration namespace: Enter = 'App\Database\migrations'\n",
             "Provide a name for the class that will have migration logic:\n",
-            'Info: New class was created at "'. APP_PATH .'database'.DS.'migrations".'."\n",
+            'Info: New class was created at "'. APP_PATH .'Database'.DS.'Migrations".'."\n",
         ], $this->executeMultiCommand([
             CreateCommand::class,
             '--c' => 'migration',
@@ -52,6 +61,11 @@ public function testCreateMigration01() {
             "11"
         ]));
         $this->assertEquals(0, $this->getExitCode());
+        
+        // Check if file was written and require it
+        $filePath = APP_PATH . 'Database' . DS . 'Migrations' . DS . $name . '.php';
+        $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath");
+        require_once $filePath;
         $this->assertTrue(class_exists($clazz));
         $this->removeClass($clazz);
     }
diff --git a/tests/webfiori/framework/test/cli/CreateRESTTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateRESTTest.php
similarity index 83%
rename from tests/webfiori/framework/test/cli/CreateRESTTest.php
rename to tests/WebFiori/Framework/Tests/Cli/CreateRESTTest.php
index 7c7273492..dbcad0935 100644
--- a/tests/webfiori/framework/test/cli/CreateRESTTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/CreateRESTTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\File\File;
-use webfiori\framework\App;
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\CreateCommand;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
 
 /**
  * Description of CreateRESTTest
@@ -20,16 +20,16 @@ public function test00() {
         App::getConfig()->removeAllDBConnections();
         
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
             '--c' => 'rest'
         ], [
             '0',
             'SuperUser',
-            'app\\entity\\super',
+            'App\\Entity\\super',
             'y',
             'n',
-            "app\\database\\super",
+            "App\\Database\\super",
             "super_users",
             "A table to hold super users information.",
             "id",
@@ -57,7 +57,7 @@ public function test00() {
             "n",
             'n',
             "y",
-            "app\\apis\\super"
+            "App\\Apis\\super"
         ]);
 
         $this->assertEquals(0, $this->getExitCode());
@@ -69,11 +69,11 @@ public function test00() {
             "1: mssql\n",
             "First thing, we need entity class information.\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\\entity'\n",
+            "Enter an optional namespace for the class: Enter = 'App\\Entity'\n",
             "Would you like from your entity class to implement the interface JsonI?(Y/n)\n",
             "Would you like to add extra attributes to the entity?(y/N)\n",
             "Now, time to collect database table information.\n",
-            "Provide us with a namespace for table class: Enter = 'app\database'\n",
+            "Provide us with a namespace for table class: Enter = 'App\Database'\n",
             "Enter database table name:\n",
             "Enter your optional comment about the table:\n",
             "Now you have to add columns to the table.\n",
@@ -108,7 +108,7 @@ public function test00() {
             "Would you like to add another column?(y/N)\n",
             "Would you like to add foreign keys to the table?(y/N)\n",
             "Would you like to have update methods for every single column?(y/N)\n",
-            "Last thing needed is to provide us with namespace for web services: Enter = 'app\\apis'\n",
+            "Last thing needed is to provide us with namespace for web services: Enter = 'App\\Apis'\n",
             "Creating entity class...\n",
             "Creating database table class...\n",
             "Creating database access class...\n",
@@ -116,17 +116,17 @@ public function test00() {
             "Done.\n"
         ]), $output);
         
-        $tableClazz = '\\app\\database\\super\\SuperUserTable';
-        $entityClazz = '\\app\\entity\\super\\SuperUser';
-        $dbClazz = "\\app\\database\\super\\SuperUserDB";
+        $tableClazz = '\\App\\Database\\super\\SuperUserTable';
+        $entityClazz = '\\App\\Entity\\super\\SuperUser';
+        $dbClazz = "\\App\\Database\\super\\SuperUserDB";
         $apiClazzes = [
-            '\\app\\apis\\super\\AddSuperUserService',
-            '\\app\\apis\\super\\DeleteSuperUserService',
-            '\\app\\apis\\super\\GetAllSuperUsersService',
-            '\\app\\apis\\super\\GetSuperUserService',
-            '\\app\\apis\\super\\UpdateSuperUserService',
-            '\\app\\apis\\super\\UpdateFirstNameOfSuperUserService',
-            '\\app\\apis\\super\\UpdateIsHappyOfSuperUserService'
+            '\\App\\Apis\\super\\AddSuperUserService',
+            '\\App\\Apis\\super\\DeleteSuperUserService',
+            '\\App\\Apis\\super\\GetAllSuperUsersService',
+            '\\App\\Apis\\super\\GetSuperUserService',
+            '\\App\\Apis\\super\\UpdateSuperUserService',
+            '\\App\\Apis\\super\\UpdateFirstNameOfSuperUserService',
+            '\\App\\Apis\\super\\UpdateIsHappyOfSuperUserService'
         ];
 
         foreach ($apiClazzes as $clazz) {
@@ -152,16 +152,16 @@ public function test01() {
         App::getConfig()->removeAllDBConnections();
         
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
             '--c' => 'rest'
         ], [
             '0',
             'SuperUserX',
-            'app\\entity\\super',
+            'App\\Entity\\super',
             'y',
             'n',
-            "app\\database\\super",
+            "App\\Database\\super",
             "super_users",
             "A table to hold super users information.",
             "id",
@@ -191,7 +191,7 @@ public function test01() {
             "n",
             'n',
             "y",
-            "app\\apis\\super"
+            "App\\Apis\\super"
         ]);
 
         $this->assertEquals(0, $this->getExitCode());
@@ -202,11 +202,11 @@ public function test01() {
             "1: mssql\n",
             "First thing, we need entity class information.\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\\entity'\n",
+            "Enter an optional namespace for the class: Enter = 'App\\Entity'\n",
             "Would you like from your entity class to implement the interface JsonI?(Y/n)\n",
             "Would you like to add extra attributes to the entity?(y/N)\n",
             "Now, time to collect database table information.\n",
-            "Provide us with a namespace for table class: Enter = 'app\database'\n",
+            "Provide us with a namespace for table class: Enter = 'App\Database'\n",
             "Enter database table name:\n",
             "Enter your optional comment about the table:\n",
             "Now you have to add columns to the table.\n",
@@ -243,7 +243,7 @@ public function test01() {
             "Would you like to add another column?(y/N)\n",
             "Would you like to add foreign keys to the table?(y/N)\n",
             "Would you like to have update methods for every single column?(y/N)\n",
-            "Last thing needed is to provide us with namespace for web services: Enter = 'app\\apis'\n",
+            "Last thing needed is to provide us with namespace for web services: Enter = 'App\\Apis'\n",
             "Creating entity class...\n",
             "Creating database table class...\n",
             "Creating database access class...\n",
@@ -251,18 +251,18 @@ public function test01() {
             "Done.\n"
         ]), $output);
         
-        $tableClazz = '\\app\\database\\super\\SuperUserXTable';
-        $entityClazz = '\\app\\entity\\super\\SuperUserX';
-        $dbClazz = "\\app\\database\\super\\SuperUserXDB";
+        $tableClazz = '\\App\\Database\\super\\SuperUserXTable';
+        $entityClazz = '\\App\\Entity\\super\\SuperUserX';
+        $dbClazz = "\\App\\Database\\super\\SuperUserXDB";
         $apiClazzes = [
-            '\\app\\apis\\super\\AddSuperUserXService',
-            '\\app\\apis\\super\\DeleteSuperUserXService',
-            '\\app\\apis\\super\\GetAllSuperUserXsService',
-            '\\app\\apis\\super\\GetSuperUserXService',
-            '\\app\\apis\\super\\UpdateSuperUserXService',
-            '\\app\\apis\\super\\UpdateFirstNameOfSuperUserXService',
-            '\\app\\apis\\super\\UpdateIsHappyOfSuperUserXService',
-            '\\app\\apis\\super\\UpdateIdOfSuperUserXService'
+            '\\App\\Apis\\super\\AddSuperUserXService',
+            '\\App\\Apis\\super\\DeleteSuperUserXService',
+            '\\App\\Apis\\super\\GetAllSuperUserXsService',
+            '\\App\\Apis\\super\\GetSuperUserXService',
+            '\\App\\Apis\\super\\UpdateSuperUserXService',
+            '\\App\\Apis\\super\\UpdateFirstNameOfSuperUserXService',
+            '\\App\\Apis\\super\\UpdateIsHappyOfSuperUserXService',
+            '\\App\\Apis\\super\\UpdateIdOfSuperUserXService'
         ];
 
         foreach ($apiClazzes as $clazz) {
@@ -291,16 +291,16 @@ public function test02() {
         App::getConfig()->addOrUpdateDBConnection($conn);
         
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
             '--c' => 'rest',
         ], [
             'Super Connection',
             'SuperUserX9',
-            'app\\entity\\super',
+            'App\\Entity\\super',
             'y',
             'n',
-            "app\\database\\super",
+            "App\\Database\\super",
             "super_users",
             "A table to hold super users information.",
             "id",
@@ -330,7 +330,7 @@ public function test02() {
             "n",
             'n',
             "y",
-            "app\\apis\\super"
+            "App\\Apis\\super"
         ]);
 
         $this->assertEquals(0, $this->getExitCode());
@@ -339,11 +339,11 @@ public function test02() {
             "0: Super Connection <--\n",
             "First thing, we need entity class information.\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\\entity'\n",
+            "Enter an optional namespace for the class: Enter = 'App\\Entity'\n",
             "Would you like from your entity class to implement the interface JsonI?(Y/n)\n",
             "Would you like to add extra attributes to the entity?(y/N)\n",
             "Now, time to collect database table information.\n",
-            "Provide us with a namespace for table class: Enter = 'app\database'\n",
+            "Provide us with a namespace for table class: Enter = 'App\Database'\n",
             "Enter database table name:\n",
             "Enter your optional comment about the table:\n",
             "Now you have to add columns to the table.\n",
@@ -378,7 +378,7 @@ public function test02() {
             "Would you like to add another column?(y/N)\n",
             "Would you like to add foreign keys to the table?(y/N)\n",
             "Would you like to have update methods for every single column?(y/N)\n",
-            "Last thing needed is to provide us with namespace for web services: Enter = 'app\\apis'\n",
+            "Last thing needed is to provide us with namespace for web services: Enter = 'App\\Apis'\n",
             "Creating entity class...\n",
             "Creating database table class...\n",
             "Creating database access class...\n",
@@ -386,19 +386,19 @@ public function test02() {
             "Done.\n"
         ]), $output);
         
-        $tableClazz = '\\app\\database\\super\\SuperUserX9Table';
-        $entityClazz = '\\app\\entity\\super\\SuperUserX9';
-        $dbClazz = "\\app\\database\\super\\SuperUserX9DB";
+        $tableClazz = '\\App\\Database\\super\\SuperUserX9Table';
+        $entityClazz = '\\App\\Entity\\super\\SuperUserX9';
+        $dbClazz = "\\App\\Database\\super\\SuperUserX9DB";
         $apiClazzes = [
-            '\\app\\apis\\super\\AddSuperUserX9Service',
-            '\\app\\apis\\super\\DeleteSuperUserX9Service',
-            '\\app\\apis\\super\\GetAllSuperUserX9sService',
-            '\\app\\apis\\super\\GetSuperUserX9Service',
-            '\\app\\apis\\super\\UpdateSuperUserX9Service',
-            '\\app\\apis\\super\\UpdateFirstNameOfSuperUserX9Service',
-            '\\app\\apis\\super\\UpdateIsHappyOfSuperUserX9Service',
-            '\\app\\apis\\super\\UpdateIdOfSuperUserX9Service',
-            '\\app\\apis\\super\\UpdateIsHappyOfSuperUserX9Service'
+            '\\App\\Apis\\super\\AddSuperUserX9Service',
+            '\\App\\Apis\\super\\DeleteSuperUserX9Service',
+            '\\App\\Apis\\super\\GetAllSuperUserX9sService',
+            '\\App\\Apis\\super\\GetSuperUserX9Service',
+            '\\App\\Apis\\super\\UpdateSuperUserX9Service',
+            '\\App\\Apis\\super\\UpdateFirstNameOfSuperUserX9Service',
+            '\\App\\Apis\\super\\UpdateIsHappyOfSuperUserX9Service',
+            '\\App\\Apis\\super\\UpdateIdOfSuperUserX9Service',
+            '\\App\\Apis\\super\\UpdateIsHappyOfSuperUserX9Service'
         ];
 
         foreach ($apiClazzes as $clazz) {
diff --git a/tests/webfiori/framework/test/cli/CreateTableTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php
similarity index 89%
rename from tests/webfiori/framework/test/cli/CreateTableTest.php
rename to tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php
index e94674e7b..0f7d4a28d 100644
--- a/tests/webfiori/framework/test/cli/CreateTableTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/CreateTableTest.php
@@ -1,13 +1,13 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
 use WebFiori\Database\DataType;
 use WebFiori\Database\MsSql\MSSQLTable;
 use WebFiori\Database\MySql\MySQLTable;
 use WebFiori\Database\Table;
 use WebFiori\File\File;
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\CreateCommand;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
 
 /**
  * Description of CreateTableTest
@@ -66,13 +66,13 @@ class CreateTableTest extends CLITestCase {
      */
     public function testCreateTable00() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
             '--c' => 'table'
         ], [
             'mysql',
             'Cool00Table',
-            "\n", // Hit Enter to pick default value (app\database)
+            "\n", // Hit Enter to pick default value (App\database)
             'cool_table_00',
             'This is the first cool table that was created using CLI.',
             'id',
@@ -87,8 +87,8 @@ public function testCreateTable00() {
         ]);
 
         $this->assertEquals(0, $this->getExitCode());
-        $this->assertTrue(class_exists('\\app\\database\\Cool00Table'));
-        $clazz = '\\app\\database\\Cool00Table';
+        $this->assertTrue(class_exists('\\App\\Database\\Cool00Table'));
+        $clazz = '\\App\\Database\\Cool00Table';
         $this->removeClass($clazz);
         $testObj = new $clazz();
         $this->assertTrue($testObj instanceof MySQLTable);
@@ -107,7 +107,7 @@ public function testCreateTable00() {
             "0: mysql\n",
             "1: mssql\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\database'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Database'\n",
             "Enter database table name: Enter = 'cool_00_table'\n",
             "Enter your optional comment about the table:\n",
             "Now you have to add columns to the table.\n",
@@ -120,7 +120,7 @@ public function testCreateTable00() {
             "Would you like to add another column?(y/N)\n",
             "Would you like to add foreign keys to the table?(y/N)\n",
             "Would you like to create an entity class that maps to the database table?(y/N)\n",
-            'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."database\".\n",
+            'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Database\".\n",
         ]), $output);
     }
     
@@ -129,13 +129,13 @@ public function testCreateTable00() {
      */
     public function testCreateTable01() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
             '--c' => 'table'
         ], [
             'mssql',
             'Cool01Table',
-            "\n", // Hit Enter to pick default value (app\database)
+            "\n", // Hit Enter to pick default value (App\database)
             'cool_table_01',
             'This is the first cool table that was created using CLI.',
             'id',
@@ -149,7 +149,7 @@ public function testCreateTable01() {
         ]);
 
         $this->assertEquals(0, $this->getExitCode());
-        $clazz = '\\app\\database\\Cool01Table';
+        $clazz = '\\App\\Database\\Cool01Table';
         $this->assertTrue(class_exists($clazz));
         $this->removeClass($clazz);
         $testObj = new $clazz();
@@ -172,7 +172,7 @@ public function testCreateTable01() {
             "0: mysql\n",
             "1: mssql\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\database'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Database'\n",
             "Enter database table name: Enter = 'cool_01_table'\n",
             "Enter your optional comment about the table:\n",
             "Now you have to add columns to the table.\n",
@@ -184,7 +184,7 @@ public function testCreateTable01() {
             "Would you like to add another column?(y/N)\n",
             "Would you like to add foreign keys to the table?(y/N)\n",
             "Would you like to create an entity class that maps to the database table?(y/N)\n",
-            'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."database\".\n",
+            'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Database\".\n",
         ]), $output);
     }
     
@@ -193,13 +193,13 @@ public function testCreateTable01() {
      */
     public function testCreateTable02() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
             '--c' => 'table'
         ], [
             'mysql',
             'Cool02Table',
-            "\n", // Hit Enter to pick default value (app\database)
+            "\n", // Hit Enter to pick default value (App\database)
             'cool_table_02',
             "\n", // Hit Enter to pick default value (empty comment)
             'id',
@@ -225,8 +225,8 @@ public function testCreateTable02() {
         ]);
 
         $this->assertEquals(0, $this->getExitCode());
-        $this->assertTrue(class_exists('\\app\\database\\Cool02Table'));
-        $clazz = '\\app\\database\\Cool02Table';
+        $this->assertTrue(class_exists('\\App\\Database\\Cool02Table'));
+        $clazz = '\\App\\Database\\Cool02Table';
         $this->removeClass($clazz);
         $testObj = new $clazz();
         $this->assertTrue($testObj instanceof MySQLTable);
@@ -247,7 +247,7 @@ public function testCreateTable02() {
             "0: mysql\n",
             "1: mssql\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\database'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Database'\n",
             "Enter database table name: Enter = 'cool_02_table'\n",
             "Enter your optional comment about the table:\n",
             "Now you have to add columns to the table.\n",
@@ -272,7 +272,7 @@ public function testCreateTable02() {
             "Would you like to add another column?(y/N)\n",
             "Would you like to add foreign keys to the table?(y/N)\n",
             "Would you like to create an entity class that maps to the database table?(y/N)\n",
-            'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."database\".\n",
+            'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Database\".\n",
         ]), $output);
     }
     
diff --git a/tests/webfiori/framework/test/cli/CreateTaskTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php
similarity index 87%
rename from tests/webfiori/framework/test/cli/CreateTaskTest.php
rename to tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php
index 17acb7f10..d09f79541 100644
--- a/tests/webfiori/framework/test/cli/CreateTaskTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/CreateTaskTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
-use webfiori\framework\App;
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\CreateCommand;
-use webfiori\framework\scheduler\AbstractTask;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
+use WebFiori\Framework\Scheduler\AbstractTask;
 
 /**
  * Description of CreateTaskTest
@@ -17,12 +17,12 @@ class CreateTaskTest extends CLITestCase {
      */
     public function test00() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create'
         ], [
             '3',
             'SuperCoolTask',
-            'app\tasks',
+            'App\Tasks',
             'The Greatest task',
             'The task will do nothing.',
             'N',
@@ -45,13 +45,13 @@ public function test00() {
             "10: Database migration.\n",
             "11: Quit. <--\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\\tasks'\n",
+            "Enter an optional namespace for the class: Enter = 'App\\Tasks'\n",
             "Enter a name for the task:\n",
             "Provide short description of what does the task will do:\n",
             "Would you like to add arguments to the task?(y/N)\n",
-            "Info: New class was created at \"".ROOT_PATH.DS.'app'.DS."tasks\".\n",
+            "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."Tasks\".\n",
         ], $output);
-        $clazz = '\\app\\tasks\\SuperCoolTask';
+        $clazz = '\\App\\Tasks\\SuperCoolTask';
         $this->assertTrue(class_exists($clazz));
         $this->removeClass($clazz);
     }
@@ -61,14 +61,14 @@ public function test00() {
      */
     public function test01() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create'
         ], [
             '3',
             'SuperCoolTask',
-            'app\tasks',
+            'App\Tasks',
             'SuperCool2',
-            'app\tasks',
+            'App\Tasks',
             'The Greatest task',
             'The task will do nothing.',
             'N',
@@ -91,18 +91,18 @@ public function test01() {
             "10: Database migration.\n",
             "11: Quit. <--\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\\tasks'\n",
+            "Enter an optional namespace for the class: Enter = 'App\\Tasks'\n",
             "Error: A class in the given namespace which has the given name was found.\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\\tasks'\n",
+            "Enter an optional namespace for the class: Enter = 'App\\Tasks'\n",
             "Enter a name for the task:\n",
             "Provide short description of what does the task will do:\n",
             "Would you like to add arguments to the task?(y/N)\n",
-            "Info: New class was created at \"".ROOT_PATH.DS.'app'.DS."tasks\".\n",
+            "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."Tasks\".\n",
         ], $output);
-        $clazz = '\\app\\tasks\\SuperCool2Task';
+        $clazz = '\\App\\Tasks\\SuperCool2Task';
         $this->assertTrue(class_exists($clazz));
-        $this->removeClass('\\app\\tasks\\SuperCoolTask');
+        $this->removeClass('\\App\\Tasks\\SuperCoolTask');
         $this->removeClass($clazz);
     }
 
@@ -111,12 +111,12 @@ public function test01() {
      */
     public function test02() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create'
         ], [
             '3',
             'NewRound',
-            'app\tasks',
+            'App\Tasks',
             '', // Invalid empty name
             'Invalid#', // Invalid name with special character
             'Create Round task',
@@ -142,7 +142,7 @@ public function test02() {
             "10: Database migration.\n",
             "11: Quit. <--\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\\tasks'\n",
+            "Enter an optional namespace for the class: Enter = 'App\\Tasks'\n",
             "Enter a name for the task:\n",
             "Error: Provided name is invalid!\n",
             "Enter a name for the task:\n",
@@ -152,9 +152,9 @@ public function test02() {
             "Error: Invalid input is given. Try again.\n",
             "Provide short description of what does the task will do:\n",
             "Would you like to add arguments to the task?(y/N)\n",
-            "Info: New class was created at \"".ROOT_PATH.DS.'app'.DS."tasks\".\n",
+            "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."Tasks\".\n",
         ], $output);
-        $clazz = '\\app\\tasks\\NewRoundTask';
+        $clazz = '\\App\\Tasks\\NewRoundTask';
         $this->assertTrue(class_exists($clazz));
         $this->removeClass($clazz);
     }
@@ -164,12 +164,12 @@ public function test02() {
      */
     public function test03() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
             '--c' => 'task'
         ], [
             'SendDailyReport',
-            'app\tasks',
+            'App\Tasks',
             'Send Sales Report',
             'The task will execute every day to send sales report to management.',
             'y',
@@ -190,7 +190,7 @@ public function test03() {
         $this->assertEquals(0, $this->getExitCode());
         $this->assertEquals([
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\\tasks'\n",
+            "Enter an optional namespace for the class: Enter = 'App\\Tasks'\n",
             "Enter a name for the task:\n",
             "Provide short description of what does the task will do:\n",
             "Would you like to add arguments to the task?(y/N)\n",
@@ -208,9 +208,9 @@ public function test03() {
             "Enter argument name:\n",
             "Error: Invalid argument name: <empty string>\n",
             "Would you like to add more arguments?(y/N)\n",
-            "Info: New class was created at \"".ROOT_PATH.DS.'app'.DS."tasks\".\n",
+            "Info: New class was created at \"".ROOT_PATH.DS.'App'.DS."Tasks\".\n",
         ], $output);
-        $clazz = '\\app\\tasks\\SendDailyReportTask';
+        $clazz = '\\App\\Tasks\\SendDailyReportTask';
         $this->assertTrue(class_exists($clazz));
         $this->removeClass($clazz);
         $task = new $clazz();
diff --git a/tests/webfiori/framework/test/cli/CreateThemeTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php
similarity index 60%
rename from tests/webfiori/framework/test/cli/CreateThemeTest.php
rename to tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php
index dc8bf311b..30c682b1e 100644
--- a/tests/webfiori/framework/test/cli/CreateThemeTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/CreateThemeTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
-use webfiori\framework\App;
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\CreateCommand;
-use webfiori\framework\ThemeManager;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
+use WebFiori\Framework\ThemeManager;
 
 /**
  * Description of CreateThemeTest
@@ -12,17 +12,43 @@
  * @author Ibrahim
  */
 class CreateThemeTest extends CLITestCase {
-    /**
+    
+    protected function tearDown(): void {
+        // Clean up theme assets from public directory
+        $assetsPath = ROOT_PATH . DS . PUBLIC_FOLDER . DS . 'assets';
+        if (is_dir($assetsPath)) {
+            $themeDirs = ['FioriTheme', 'FioriTheme2', 'Cool'];
+            foreach ($themeDirs as $themeDir) {
+                $themePath = $assetsPath . DS . $themeDir;
+                if (is_dir($themePath)) {
+                    $this->removeDirectory($themePath);
+                }
+            }
+        }
+        parent::tearDown();
+    }
+    
+    private function removeDirectory($dir) {
+        if (!is_dir($dir)) {
+            return;
+        }
+        $files = array_diff(scandir($dir), ['.', '..']);
+        foreach ($files as $file) {
+            $path = $dir . DS . $file;
+            is_dir($path) ? $this->removeDirectory($path) : unlink($path);
+        }
+        rmdir($dir);
+    }    /**
      * @test
      */
     public function testCreateTheme00() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create'
         ], [
             '6',
             'NewTest',
-            'themes\\fiori',
+            'Themes\\Fiori',
             "\n", // Hit Enter to pick default value
         ]);
         $this->assertEquals(0, $this->getExitCode());
@@ -41,18 +67,18 @@ public function testCreateTheme00() {
             "10: Database migration.\n",
             "11: Quit. <--\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'themes'\n",
-            'Creating theme at "'.ROOT_PATH.DS.'themes'.DS."fiori\"...\n",
-            'Info: New class was created at "'.ROOT_PATH.DS.'themes'.DS."fiori\".\n",
+            "Enter an optional namespace for the class: Enter = 'Themes'\n",
+            'Creating theme at "'.ROOT_PATH.DS.'Themes'.DS."Fiori\"...\n",
+            'Info: New class was created at "'.ROOT_PATH.DS.'Themes'.DS."Fiori\".\n",
         ], $output);
 
-        $this->assertTrue(class_exists('\\themes\\fiori\\NewTestTheme'));
+        $this->assertTrue(class_exists('\\Themes\\Fiori\\NewTestTheme'));
         
-        $this->removeClass('\\themes\\fiori\\NewTestTheme');
-        $this->removeClass('\\themes\\fiori\\AsideSection');
-        $this->removeClass('\\themes\\fiori\\FooterSection');
-        $this->removeClass('\\themes\\fiori\\HeadSection');
-        $this->removeClass('\\themes\\fiori\\HeaderSection');
+        $this->removeClass('\\Themes\\Fiori\\NewTestTheme');
+        $this->removeClass('\\Themes\\Fiori\\AsideSection');
+        $this->removeClass('\\Themes\\Fiori\\FooterSection');
+        $this->removeClass('\\Themes\\Fiori\\HeadSection');
+        $this->removeClass('\\Themes\\Fiori\\HeaderSection');
     }
     
     /**
@@ -60,14 +86,14 @@ public function testCreateTheme00() {
      */
     public function testCreateThemeWithExistingName() {
         $runner = App::getRunner();
-        $ns = '\\themes\\fioriTheme';
+        $ns = '\\Themes\\FioriTheme';
         $name = 'NewFTestTheme';
 
-        $ns2 = '\\themes\\cool';
+        $ns2 = '\\Themes\\Cool';
         $name2 = 'NewFTestTheme';
         
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create'
         ], [
             '6',
@@ -94,12 +120,12 @@ public function testCreateThemeWithExistingName() {
             "10: Database migration.\n",
             "11: Quit. <--\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'themes'\n",
+            "Enter an optional namespace for the class: Enter = 'Themes'\n",
             "Error: A class in the given namespace which has the given name was found.\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'themes'\n",
-            'Creating theme at "'.ROOT_PATH.DS.'themes'.DS."cool\"...\n",
-            'Info: New class was created at "'.ROOT_PATH.DS.'themes'.DS."cool\".\n",
+            "Enter an optional namespace for the class: Enter = 'Themes'\n",
+            'Creating theme at "'.ROOT_PATH.DS.'Themes'.DS."Cool\"...\n",
+            'Info: New class was created at "'.ROOT_PATH.DS.'Themes'.DS."Cool\".\n",
         ], $output);
         $this->assertEquals(0, $this->getExitCode());
         $this->removeClass($ns2.'\\'.$name2);
diff --git a/tests/webfiori/framework/test/cli/CreateWebServiceTest.php b/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php
similarity index 92%
rename from tests/webfiori/framework/test/cli/CreateWebServiceTest.php
rename to tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php
index 092738710..8c7f5d941 100644
--- a/tests/webfiori/framework/test/cli/CreateWebServiceTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/CreateWebServiceTest.php
@@ -1,8 +1,8 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\CreateCommand;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\CreateCommand;
 use WebFiori\Http\AbstractWebService;
 use WebFiori\Http\ParamOption;
 use WebFiori\Http\ParamType;
@@ -19,12 +19,12 @@ class CreateWebServiceTest extends CLITestCase {
      */
     public function test00() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create'
         ], [
             '2',
             'NewWeb',
-            "\n", // Hit Enter to pick default value (app\apis)
+            "\n", // Hit Enter to pick default value (App\Apis)
             'get-hello',
             'Service Desc',
             "\n", // Hit Enter to pick default value (GET method)
@@ -55,7 +55,7 @@ public function test00() {
             "10: Database migration.\n",
             "11: Quit. <--\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\apis'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Apis'\n",
             "Enter a name for the new web service:\n",
             "Description:\n",
             "Request method:\n",
@@ -87,13 +87,13 @@ public function test00() {
             "Success: New parameter added.\n",
             "Would you like to add another parameter?(y/N)\n",
             "Creating the class...\n",
-            'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."apis\".\n",
+            'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Apis\".\n",
             "Info: Don't forget to add the service to a services manager.\n",
         ], $output);
         
-        $clazz = '\\app\\apis\\NewWebService';
+        $clazz = '\\App\\Apis\\NewWebService';
         $this->assertTrue(class_exists($clazz));
-        $this->removeClass('\\app\\apis\\NewWebService');
+        $this->removeClass('\\App\\Apis\\NewWebService');
         $instance = new $clazz();
         $instance instanceof AbstractWebService;
         $this->assertEquals('get-hello', $instance->getName());
@@ -120,12 +120,12 @@ public function test00() {
      */
     public function test01() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
             '--c' => 'web-service'
         ], [
             'NewWeb2',
-            "\n", // Hit Enter to pick default value (app\apis)
+            "\n", // Hit Enter to pick default value (App\Apis)
             'get-hello-2',
             'Service\'s Desc',
             "\n", // Hit Enter to pick default value (GET method)
@@ -144,7 +144,7 @@ public function test01() {
         $this->assertEquals(0, $this->getExitCode());
         $this->assertEquals([
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\apis'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Apis'\n",
             "Enter a name for the new web service:\n",
             "Description:\n",
             "Request method:\n",
@@ -186,13 +186,13 @@ public function test01() {
             "Success: New parameter added.\n",
             "Would you like to add another parameter?(y/N)\n",
             "Creating the class...\n",
-            'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."apis\".\n",
+            'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Apis\".\n",
             "Info: Don't forget to add the service to a services manager.\n",
         ], $output);
         
-        $clazz = '\\app\\apis\\NewWeb2Service';
+        $clazz = '\\App\\Apis\\NewWeb2Service';
         $this->assertTrue(class_exists($clazz));
-        $this->removeClass('\\app\\apis\\NewWeb2Service');
+        $this->removeClass('\\App\\Apis\\NewWeb2Service');
         $instance = new $clazz();
         $instance instanceof AbstractWebService;
         $this->assertEquals('get-hello-2', $instance->getName());
@@ -219,12 +219,12 @@ public function test01() {
      */
     public function test02() {
         $output = $this->executeSingleCommand(new CreateCommand(), [
-            'webfiori',
+            'WebFiori',
             'create',
             '--c' => 'web-service'
         ], [
             'NewWeb3',
-            "\n", // Hit Enter to pick default value (app\apis)
+            "\n", // Hit Enter to pick default value (App\Apis)
             'get-hello-3',
             'Service\'s Desc',
             "\n", // Hit Enter to pick default value (GET method)
@@ -243,7 +243,7 @@ public function test02() {
         $this->assertEquals(0, $this->getExitCode());
         $this->assertEquals([
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\apis'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Apis'\n",
             "Enter a name for the new web service:\n",
             "Description:\n",
             "Request method:\n",
@@ -285,11 +285,11 @@ public function test02() {
             "Success: New parameter added.\n",
             "Would you like to add another parameter?(y/N)\n",
             "Creating the class...\n",
-            'Info: New class was created at "'.ROOT_PATH.DS.'app'.DS."apis\".\n",
+            'Info: New class was created at "'.ROOT_PATH.DS.'App'.DS."Apis\".\n",
             "Info: Don't forget to add the service to a services manager.\n",
         ], $output);
         
-        $clazz = '\\app\\apis\\NewWeb3Service';
+        $clazz = '\\App\\Apis\\NewWeb3Service';
         $this->assertTrue(class_exists($clazz));
         $this->removeClass($clazz);
         $instance = new $clazz();
diff --git a/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php b/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php
new file mode 100644
index 000000000..f34ade04b
--- /dev/null
+++ b/tests/WebFiori/Framework/Tests/Cli/DBClassWritterTest.php
@@ -0,0 +1,107 @@
+<?php
+namespace WebFiori\Framework\Test\Cli;
+
+use Tables\EmployeeInfoTable;
+use Tables\PositionInfoTable;
+use Tables\UserInfoTable;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Writers\DBClassWriter;
+
+/**
+ * Description of DBClassWritterTest
+ *
+ * @author Ibrahim
+ */
+class DBClassWritterTest extends CLITestCase {
+    
+    protected function setUp(): void {
+        parent::setUp();
+        // Ensure directories exist for DB classes
+        $dirs = [
+            ROOT_PATH . DS . 'WebFiori' . DS . 'Db',
+            ROOT_PATH . DS . 'WebFiori' . DS . 'Entity'
+        ];
+        foreach ($dirs as $dir) {
+            if (!is_dir($dir)) {
+                mkdir($dir, 0755, true);
+            }
+        }
+    }
+    /**
+     * @test
+     */
+    public function test00() {
+        $table = new UserInfoTable();
+        $mapper = $table->getEntityMapper();
+        $mapper->setEntityName('CoolUser');
+        $mapper->setNamespace('WebFiori\\Entity');
+        $writter = new DBClassWriter('UserDBClass', 'WebFiori\\Db', $table);
+        $writter->writeClass();
+        
+        // Check if file was written and require it
+        $filePath = $writter->getPath() . DS . $writter->getName() . '.php';
+        $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath");
+        require_once $filePath;
+        $this->assertTrue(class_exists($writter->getName(true)));
+        $this->removeClass($writter->getName(true));
+    }
+    
+    /**
+     * @test
+     */
+    public function test01() {
+        $table = new EmployeeInfoTable();
+        $mapper = $table->getEntityMapper();
+        $mapper->setEntityName('Employee');
+        $mapper->setNamespace('WebFiori\\Entity');
+        $writter = new DBClassWriter('EmployeeDB', 'WebFiori\\Db', $table);
+        $writter->writeClass();
+        
+        // Check if file was written and require it
+        $filePath = $writter->getPath() . DS . $writter->getName() . '.php';
+        $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath");
+        require_once $filePath;
+        $this->assertTrue(class_exists($writter->getName(true)));
+        $this->removeClass($writter->getName(true));
+    }
+    
+    /**
+     * @test
+     */
+    public function test02() {
+        $table = new PositionInfoTable();
+        $mapper = $table->getEntityMapper();
+        $mapper->setEntityName('Position');
+        $mapper->setNamespace('WebFiori\\Entity');
+        $writter = new DBClassWriter('PositionDB', 'WebFiori\\Db', $table);
+        $writter->writeClass();
+        
+        // Check if file was written and require it
+        $filePath = $writter->getPath() . DS . $writter->getName() . '.php';
+        $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath");
+        require_once $filePath;
+        $this->assertTrue(class_exists($writter->getName(true)));
+        $this->removeClass($writter->getName(true));
+    }
+    
+    /**
+     * @test
+     */
+    public function test03() {
+        $table = new PositionInfoTable();
+        $writter = new DBClassWriter('PositionDB2', 'WebFiori\\Db', $table);
+        $writter->setConnection('  ');
+        $this->assertNull($writter->getConnectionName());
+        $writter->setConnection('ok-connection');
+        $this->assertEquals('ok-connection', $writter->getConnectionName());
+        $writter->includeColumnsUpdate();
+        $writter->writeClass();
+        
+        // Check if file was written and require it
+        $filePath = $writter->getPath() . DS . $writter->getName() . '.php';
+        $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath");
+        require_once $filePath;
+        $this->assertTrue(class_exists($writter->getName(true)));
+        $this->removeClass($writter->getName(true));
+    }
+}
diff --git a/tests/webfiori/framework/test/cli/HelpCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/HelpCommandTest.php
similarity index 95%
rename from tests/webfiori/framework/test/cli/HelpCommandTest.php
rename to tests/WebFiori/Framework/Tests/Cli/HelpCommandTest.php
index 299ee050e..917064faf 100644
--- a/tests/webfiori/framework/test/cli/HelpCommandTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/HelpCommandTest.php
@@ -1,7 +1,7 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
-use webfiori\framework\cli\CLITestCase;
+use WebFiori\Framework\Cli\CLITestCase;
 /**
  * @author Ibrahim
  */
diff --git a/tests/webfiori/framework/test/cli/ListRoutesCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/ListRoutesCommandTest.php
similarity index 85%
rename from tests/webfiori/framework/test/cli/ListRoutesCommandTest.php
rename to tests/WebFiori/Framework/Tests/Cli/ListRoutesCommandTest.php
index 93bd00723..bb6efee5e 100644
--- a/tests/webfiori/framework/test/cli/ListRoutesCommandTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/ListRoutesCommandTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\App;
-use webfiori\framework\router\Router;
-use webfiori\framework\ui\WebPage;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Router\Router;
+use WebFiori\Framework\Ui\WebPage;
 /**
  * Description of ListRoutesCommandTest
  *
@@ -19,7 +19,7 @@ public function test00() {
         $runner = App::getRunner();
         $runner->setInputs();
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'list-routes'
         ]);
         $runner->start();
@@ -34,7 +34,7 @@ public function test01() {
         $runner = App::getRunner();
         $runner->setInputs();
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'list-routes'
         ]);
         Router::addRoute([
diff --git a/tests/webfiori/framework/test/cli/ListThemesCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/ListThemesCommandTest.php
similarity index 92%
rename from tests/webfiori/framework/test/cli/ListThemesCommandTest.php
rename to tests/WebFiori/Framework/Tests/Cli/ListThemesCommandTest.php
index 32f1c0657..53357ae3b 100644
--- a/tests/webfiori/framework/test/cli/ListThemesCommandTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/ListThemesCommandTest.php
@@ -1,8 +1,8 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\App;
+use WebFiori\Framework\App;
 
 /**
  * Description of ListRoutesCommandTest
@@ -17,7 +17,7 @@ public function test00() {
         $runner = App::getRunner();
         $runner->setInputs();
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'list-themes'
         ]);
         $runner->start();
@@ -33,7 +33,7 @@ public function test01() {
         $runner = App::getRunner();
         $runner->setInputs();
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'list-themes',
             '--theme-name' => "New Super Theme"
         ]);
@@ -54,7 +54,7 @@ public function test02() {
         $runner = App::getRunner();
         $runner->setInputs();
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'list-themes',
             '--theme-name="Not Exist"'
         ]);
diff --git a/tests/webfiori/framework/test/cli/RunMigrationsCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/RunMigrationsCommandTest.php
similarity index 97%
rename from tests/webfiori/framework/test/cli/RunMigrationsCommandTest.php
rename to tests/WebFiori/Framework/Tests/Cli/RunMigrationsCommandTest.php
index bdb059c82..0a8adc45b 100644
--- a/tests/webfiori/framework/test/cli/RunMigrationsCommandTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/RunMigrationsCommandTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Database\Schema\SchemaRunner;
-use webfiori\framework\App;
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\RunMigrationsCommand;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\RunMigrationsCommand;
 
 /**
  * Test cases for RunMigrationsCommand.
diff --git a/tests/webfiori/framework/test/cli/RunSQLCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/RunSQLCommandTest.php
similarity index 91%
rename from tests/webfiori/framework/test/cli/RunSQLCommandTest.php
rename to tests/WebFiori/Framework/Tests/Cli/RunSQLCommandTest.php
index 1886b416d..30641d498 100644
--- a/tests/webfiori/framework/test/cli/RunSQLCommandTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/RunSQLCommandTest.php
@@ -1,14 +1,14 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
-use tables\Schema;
-use tables\Schema2;
+use Tables\Schema;
+use Tables\Schema2;
 use WebFiori\Database\ConnectionInfo;
-use webfiori\framework\App;
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\RunSQLQueryCommand;
-use webfiori\framework\config\Controller;
-use webfiori\framework\config\JsonDriver;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\RunSQLQueryCommand;
+use WebFiori\Framework\Config\Controller;
+use WebFiori\Framework\Config\JsonDriver;
 
 class RunSQLCommandTest extends CLITestCase {
     /**
@@ -83,7 +83,7 @@ public function testQueryFromFile00() {
         App::getConfig()->removeAllDBConnections();
         
         $output = $this->executeSingleCommand(new RunSQLQueryCommand(), [
-            'webfiori',
+            'WebFiori',
             'run-query',
             '--connection' => 'testing-connection',
             '--no-confirm',
@@ -105,7 +105,7 @@ public function testQueryFromFile01() {
         App::getConfig()->addOrUpdateDBConnection($conn);
 
         $output = $this->executeSingleCommand(new RunSQLQueryCommand(), [
-            'webfiori',
+            'WebFiori',
             'run-query',
             '--connection' => 'testing-connection',
             '--no-confirm',
@@ -130,7 +130,7 @@ public function testQueryFromFile02() {
             'run-query',
             '--connection' => 'testing-connection',
             '--no-confirm',
-            '--file' => 'app\\database\\Test2Table.php'
+            '--file' => 'App\\Database\\Test2Table.php'
         ], []);
 
         $this->assertEquals(-1, $this->getExitCode());
@@ -151,7 +151,7 @@ public function testQueryFromFile03() {
             'run-query',
             '--connection' => 'testing-connection',
             '--no-confirm',
-            '--file' => 'app\\database\\sql-file.sql'
+            '--file' => 'App\\Database\\sql-file.sql'
         ], []);
         
         $this->assertEquals(0, $this->getExitCode());
diff --git a/tests/webfiori/framework/test/cli/SchedulerCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/SchedulerCommandTest.php
similarity index 87%
rename from tests/webfiori/framework/test/cli/SchedulerCommandTest.php
rename to tests/WebFiori/Framework/Tests/Cli/SchedulerCommandTest.php
index 223cfd540..9bb2d5fdb 100644
--- a/tests/webfiori/framework/test/cli/SchedulerCommandTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/SchedulerCommandTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\SchedulerCommand;
-use webfiori\framework\scheduler\TasksManager;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\SchedulerCommand;
+use WebFiori\Framework\Scheduler\TasksManager;
 
 /**
  * Description of SchedulerCommandTest
@@ -22,7 +22,7 @@ public function setUp() : void {
      */
     public function testRunWithoutRequiredOptions() {
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
         ], []);
 
@@ -39,7 +39,7 @@ public function testCheckScheduledTasks() {
         TasksManager::setPassword('123456');
         
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
             '--check',
             'p' => '123456'
@@ -63,7 +63,7 @@ public function testCheckScheduledTasks() {
      */
     public function testCheckWithoutPassword() {
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
             '--check',
         ], []);
@@ -80,7 +80,7 @@ public function testCheckWithoutPassword() {
     public function testForceTaskExecution() {
         
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
             '--force',
             'p' => '123456'
@@ -111,7 +111,7 @@ public function testForceTaskExecution() {
      */
     public function testForceTaskWithLogging() {
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
             '--force',
             '--show-log',
@@ -132,11 +132,11 @@ public function testForceTaskWithLogging() {
             "Running task(s) check...\n",
             "Forcing task 'Fail 1' to execute...\n",
             "Active task: \"Fail 1\" ...\n",
-            "Calling the method app\\tasks\Fail1TestTask::execute()\n",
+            "Calling the method App\\Tasks\Fail1TestTask::execute()\n",
             "Info: Task Fail 1 Is executing...\n",
-            "Calling the method app\\tasks\Fail1TestTask::onFail()\n",
+            "Calling the method App\\Tasks\Fail1TestTask::onFail()\n",
             "Error: Task Fail 1 Failed.\n",
-            "Calling the method app\\tasks\Fail1TestTask::afterExec()\n",
+            "Calling the method App\\Tasks\Fail1TestTask::afterExec()\n",
             "Check finished.\n",
             "Total number of tasks: 5\n",
             "Executed Tasks: 1\n",
@@ -152,7 +152,7 @@ public function testForceTaskWithLogging() {
      */
     public function testForceTaskWithExceptionLogging() {
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
             '--force',
             '--show-log',
@@ -173,20 +173,20 @@ public function testForceTaskWithExceptionLogging() {
             "Running task(s) check...\n",
             "Forcing task 'Fail 2' to execute...\n",
             "Active task: \"Fail 2\" ...\n",
-            "Calling the method app\\tasks\Fail2TestTask::execute()\n",
-            "WARNING: An exception was thrown while performing the operation app\\tasks\Fail2TestTask::execute. The output of the task might be not as expected.\n",
+            "Calling the method App\\Tasks\Fail2TestTask::execute()\n",
+            "WARNING: An exception was thrown while performing the operation App\\Tasks\Fail2TestTask::execute. The output of the task might be not as expected.\n",
             "Exception class: Error\n",
-            "Exception message: Call to undefined method app\\tasks\Fail2TestTask::undefined()\n",
+            "Exception message: Call to undefined method App\\Tasks\Fail2TestTask::undefined()\n",
             "Thrown in: Fail2TestTask",
             "Line: 44",
             "Stack Trace:",
-            "#0 At class webfiori\\framework\\scheduler\\AbstractTask Line:",
-            "#1 At class webfiori\\framework\\scheduler\\AbstractTask Line:",
-            "#2 At class webfiori\\framework\\scheduler\\AbstractTask Line:",
-            "#3 At class webfiori\\framework\\scheduler\\TasksManager Line:",
-            "#4 At class webfiori\\framework\\scheduler\\TasksManager Line:",
-            "#5 At class webfiori\\framework\\cli\\commands\\SchedulerCommand Line:",
-            "#6 At class webfiori\\framework\\cli\\commands\\SchedulerCommand Line:",
+            "#0 At class WebFiori\\Framework\\Scheduler\\AbstractTask Line:",
+            "#1 At class WebFiori\\Framework\\Scheduler\\AbstractTask Line:",
+            "#2 At class WebFiori\\Framework\\Scheduler\\AbstractTask Line:",
+            "#3 At class WebFiori\\Framework\\Scheduler\\TasksManager Line:",
+            "#4 At class WebFiori\\Framework\\Scheduler\\TasksManager Line:",
+            "#5 At class WebFiori\\Framework\\Cli\\Commands\\SchedulerCommand Line:",
+            "#6 At class WebFiori\\Framework\\Cli\\Commands\\SchedulerCommand Line:",
             "#7 At class WebFiori\\Cli\\Command Line:",
             "#8 At class WebFiori\\Cli\\Runner Line:",
             "#9 At class WebFiori\\Cli\\Runner Line:",
@@ -210,7 +210,7 @@ public function testForceTaskWithExceptionLogging() {
     public function testForceSpecificTaskByName() {
         $this->getRunner(true);
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
             '--force',
             '--show-log',
@@ -226,12 +226,12 @@ public function testForceSpecificTaskByName() {
             "Running task(s) check...\n",
             "Forcing task 'Success 1' to execute...\n",
             "Active task: \"Success 1\" ...\n",
-            "Calling the method app\\tasks\SuccessTestTask::execute()\n",
+            "Calling the method App\\Tasks\SuccessTestTask::execute()\n",
             "Start: 2021-07-08\n",
             "End: \n",
             "The task was forced.\n",
-            "Calling the method app\\tasks\SuccessTestTask::onSuccess()\n",
-            "Calling the method app\\tasks\SuccessTestTask::afterExec()\n",
+            "Calling the method App\\Tasks\SuccessTestTask::onSuccess()\n",
+            "Calling the method App\\Tasks\SuccessTestTask::afterExec()\n",
             "Check finished.\n",
             "Total number of tasks: 5\n",
             "Executed Tasks: 1\n",
@@ -249,7 +249,7 @@ public function testForceTaskWithCustomArguments() {
         TasksManager::execLog(true);
         $this->getRunner(true);
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
             '--force',
             '--show-log',
@@ -267,12 +267,12 @@ public function testForceTaskWithCustomArguments() {
             "Running task(s) check...\n",
             "Forcing task 'Success 1' to execute...\n",
             "Active task: \"Success 1\" ...\n",
-            "Calling the method app\\tasks\SuccessTestTask::execute()\n",
+            "Calling the method App\\Tasks\SuccessTestTask::execute()\n",
             "Start: 2021\n",
             "End: 2022\n",
             "The task was forced.\n",
-            "Calling the method app\\tasks\SuccessTestTask::onSuccess()\n",
-            "Calling the method app\\tasks\SuccessTestTask::afterExec()\n",
+            "Calling the method App\\Tasks\SuccessTestTask::onSuccess()\n",
+            "Calling the method App\\Tasks\SuccessTestTask::afterExec()\n",
             "Check finished.\n",
             "Total number of tasks: 5\n",
             "Executed Tasks: 1\n",
@@ -293,7 +293,7 @@ public function testForceTaskWithIncorrectPassword() {
         TasksManager::registerTasks();
 
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
             '--force',
             '--task-name' => 'Success 1',
@@ -318,7 +318,7 @@ public function testForceTaskWithIncorrectPassword() {
      */
     public function testShowTaskArguments() {
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
             '--task-name' => 'Success 1',
             '--show-task-args',
@@ -338,7 +338,7 @@ public function testShowTaskArguments() {
      */
     public function testShowTaskArgumentsWithSelection() {
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
             '--show-task-args',
             'p' => '123456'
@@ -364,7 +364,7 @@ public function testShowTaskArgumentsWithSelection() {
      */
     public function testListAllScheduledTasks() {
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
             '--list'
         ], []);
@@ -396,7 +396,7 @@ public function testListAllScheduledTasks() {
     public function testCheckWithValidPassword() {
         TasksManager::setPassword('123456');
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
             '--check',
             'p' => '123456'
@@ -425,7 +425,7 @@ public function testForceTaskWithInteractiveArguments() {
         TasksManager::registerTasks();
 
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
             '--force',
             '--task-name' => 'Success 1',
@@ -454,9 +454,9 @@ public function testForceTaskWithInteractiveArguments() {
             'Running task(s) check...',
             "Forcing task 'Success 1' to execute...",
             "Active task: \"Success 1\" ...",
-            "Calling the method app\\tasks\SuccessTestTask::execute()",
-            "Calling the method app\\tasks\SuccessTestTask::onSuccess()",
-            "Calling the method app\\tasks\SuccessTestTask::afterExec()",
+            "Calling the method App\\Tasks\SuccessTestTask::execute()",
+            "Calling the method App\\Tasks\SuccessTestTask::onSuccess()",
+            "Calling the method App\\Tasks\SuccessTestTask::afterExec()",
             "Check finished.",
         ], TasksManager::getLogArray());
     }
@@ -466,7 +466,7 @@ public function testForceTaskWithInteractiveArguments() {
      */
     public function testCancelTaskSelection() {
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
             '--force',
             'p' => '123456'
@@ -491,7 +491,7 @@ public function testCancelTaskSelection() {
      */
     public function testForceNonExistentTask() {
         $output = $this->executeSingleCommand(new SchedulerCommand(), [
-            'webfiori',
+            'WebFiori',
             'scheduler',
             '--force',
             '--task-name="Rand"',
diff --git a/tests/webfiori/framework/test/cli/SettingsCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/SettingsCommandTest.php
similarity index 93%
rename from tests/webfiori/framework/test/cli/SettingsCommandTest.php
rename to tests/WebFiori/Framework/Tests/Cli/SettingsCommandTest.php
index 3f8344780..1ffe500b8 100644
--- a/tests/webfiori/framework/test/cli/SettingsCommandTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/SettingsCommandTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\App;
-use webfiori\framework\config\ClassDriver;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Config\ClassDriver;
 
 class SettingsCommandTest extends TestCase {
     /**
@@ -16,7 +16,7 @@ public function test00() {
         $runner = App::getRunner();
         $runner->setInputs();
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'show-settings'
         ]);
         $runner->start();
diff --git a/tests/webfiori/framework/test/cli/UpdateSettingsCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/UpdateSettingsCommandTest.php
similarity index 92%
rename from tests/webfiori/framework/test/cli/UpdateSettingsCommandTest.php
rename to tests/WebFiori/Framework/Tests/Cli/UpdateSettingsCommandTest.php
index 83b866786..43538d969 100644
--- a/tests/webfiori/framework/test/cli/UpdateSettingsCommandTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/UpdateSettingsCommandTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\App;
-use webfiori\framework\config\Controller;
-use webfiori\framework\config\JsonDriver;
-use webfiori\framework\router\Router;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Config\Controller;
+use WebFiori\Framework\Config\JsonDriver;
+use WebFiori\Framework\Router\Router;
 
 /**
  * Description of TestUpdateSettingsCommand
@@ -22,7 +22,7 @@ public function test00() {
         App::getConfig()->initialize(true);
         $runner = App::getRunner();
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'q'
         ]);
@@ -44,7 +44,7 @@ public function testUpdateAppName00() {
             'Super App',
         ]);
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'app-name'
         ]);
@@ -73,7 +73,7 @@ public function testUpdateAppName01() {
         ]);
 
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'app-name'
         ]);
@@ -109,7 +109,7 @@ public function testUpdateAppName02() {
         ]);
 
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'app-name'
         ]);
@@ -137,7 +137,7 @@ public function testUpdateHomePage00() {
         $runner->setInputs();
 
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'home-page'
         ]);
@@ -161,7 +161,7 @@ public function testUpdateHomePage01() {
         ]);
 
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'home-page'
         ]);
@@ -185,7 +185,7 @@ public function testUpdatePageDescription00() {
         ]);
 
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'page-description'
         ]);
@@ -211,7 +211,7 @@ public function testUpdatePageTitle00() {
         ]);
 
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'page-title'
         ]);
@@ -229,7 +229,7 @@ public function testUpdatePageTitle00() {
     public function testUpdatePrimaryLang() {
         $runner = App::getRunner();
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'primary-lang'
         ]);
@@ -254,7 +254,7 @@ public function testUpdatePrimaryLang00() {
             'NEW PAGE DESCRIPTION'
         ]);
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'page-description'
         ]);
@@ -275,11 +275,11 @@ public function testUpdatePrimaryLang00() {
     public function testUpdatePrimaryTheme00() {
         $runner = App::getRunner();
         $runner->setInputs([
-            'themes\\fioriTheme2\\NewTestTheme2'
+            'Themes\\FioriTheme2\\NewTestTheme2'
         ]);
 
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'theme'
         ]);
@@ -290,7 +290,7 @@ public function testUpdatePrimaryTheme00() {
             "Success: Theme successfully updated.\n"
         ], $runner->getOutput());
 
-        $this->assertEquals('themes\\fioriTheme2\\NewTestTheme2', App::getConfig()->getTheme());
+        $this->assertEquals('Themes\\FioriTheme2\\NewTestTheme2', App::getConfig()->getTheme());
     }
     /**
      * @test
@@ -300,10 +300,10 @@ public function testUpdatePrimaryTheme01() {
         $runner->setInputs([
             'themes\\greeny\\NotATheme',
             '',
-            'themes\\fioriTheme2\\NewTestTheme2'
+            'Themes\\FioriTheme2\\NewTestTheme2'
         ]);
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'theme'
         ]);
@@ -318,7 +318,7 @@ public function testUpdatePrimaryTheme01() {
             "Success: Theme successfully updated.\n"
         ], $runner->getOutput());
 
-        $this->assertEquals('themes\\fioriTheme2\\NewTestTheme2', App::getConfig()->getTheme());
+        $this->assertEquals('Themes\\FioriTheme2\\NewTestTheme2', App::getConfig()->getTheme());
     }
     /**
      * @test
@@ -326,11 +326,11 @@ public function testUpdatePrimaryTheme01() {
     public function testUpdatePrimaryTheme02() {
         $runner = App::getRunner();
         $runner->setInputs([
-            'webfiori\\framework\\Privilege',
-            'themes\\fioriTheme2\\NewTestTheme2'
+            'WebFiori\\Framework\\Privilege',
+            'Themes\\FioriTheme2\\NewTestTheme2'
         ]);
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'theme'
         ]);
@@ -343,7 +343,7 @@ public function testUpdatePrimaryTheme02() {
             "Success: Theme successfully updated.\n"
         ], $runner->getOutput());
 
-        $this->assertEquals('themes\\fioriTheme2\\NewTestTheme2', App::getConfig()->getTheme());
+        $this->assertEquals('Themes\\FioriTheme2\\NewTestTheme2', App::getConfig()->getTheme());
     }
     /**
      * @test
@@ -351,11 +351,11 @@ public function testUpdatePrimaryTheme02() {
     public function testUpdatePrimaryTheme03() {
         $runner = App::getRunner();
         $runner->setInputs([
-            'webfiori\\framework\\App',
-            'themes\\fioriTheme2\\NewTestTheme2'
+            'WebFiori\\Framework\\App',
+            'Themes\\FioriTheme2\\NewTestTheme2'
         ]);
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'theme'
         ]);
@@ -368,7 +368,7 @@ public function testUpdatePrimaryTheme03() {
             "Success: Theme successfully updated.\n"
         ], $runner->getOutput());
 
-        $this->assertEquals('themes\\fioriTheme2\\NewTestTheme2', App::getConfig()->getTheme());
+        $this->assertEquals('Themes\\FioriTheme2\\NewTestTheme2', App::getConfig()->getTheme());
     }
     /**
      * @test
@@ -380,7 +380,7 @@ public function testUpdateSchedulerPass00() {
         ]);
 
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'scheduler-pass',
         ]);
@@ -403,7 +403,7 @@ public function testUpdateSchedulerPass01() {
         ]);
 
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'scheduler-pass',
         ]);
@@ -428,7 +428,7 @@ public function testUpdateTitleSep00() {
         ]);
 
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'xyz'
         ]);
@@ -458,7 +458,7 @@ public function testUpdateTitleSep00() {
     public function testUpdateVersion00() {
         $runner = App::getRunner();
         $runner->setArgsVector([
-            'webfiori',
+            'WebFiori',
             'update-settings',
             '--w' => 'version'
         ]);
diff --git a/tests/webfiori/framework/test/cli/UpdateTableCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/UpdateTableCommandTest.php
similarity index 90%
rename from tests/webfiori/framework/test/cli/UpdateTableCommandTest.php
rename to tests/WebFiori/Framework/Tests/Cli/UpdateTableCommandTest.php
index 722f5d1d8..cfa412ef4 100644
--- a/tests/webfiori/framework/test/cli/UpdateTableCommandTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/UpdateTableCommandTest.php
@@ -1,20 +1,20 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
 use WebFiori\Database\Table;
 use WebFiori\File\File;
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\UpdateTableCommand;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\UpdateTableCommand;
 
 class UpdateTableCommandTest extends CLITestCase {
     public function test00() {
         $output = $this->executeSingleCommand(new UpdateTableCommand(), [
-            'webfiori',
+            'WebFiori',
             'update-table',
         ], [
             '   ', // Invalid class name
             'ok\\y\\Super', // Invalid class name
-            'app\\database\\TestTable',
+            'App\\Database\\TestTable',
             '0',
             'new-col',
             '1',
@@ -26,7 +26,7 @@ public function test00() {
             'Cool new column.',
             'y',
             'ModifiedO',
-            "\n" // Hit Enter to pick default value (app\database)
+            "\n" // Hit Enter to pick default value (App\database)
         ]);
 
         $this->assertEquals(0, $this->getExitCode());
@@ -70,11 +70,11 @@ public function test00() {
             "Enter your optional comment about the column:\n",
             "Would you like to update same class or create a copy with the update?(y/N)\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\database'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Database'\n",
             "Success: Column added.\n",
         ], $output);
 
-        $clazz = '\\app\\database\\ModifiedOTable';
+        $clazz = '\\App\\Database\\ModifiedOTable';
         $this->assertTrue(class_exists($clazz));
         $file = new File(ROOT_PATH.$clazz.'.php');
         $file->remove();
@@ -91,10 +91,10 @@ public function test00() {
      */
     public function test01() {
         $output = $this->executeSingleCommand(new UpdateTableCommand(), [
-            'webfiori',
+            'WebFiori',
             'update-table',
         ], [
-            'app\\database\\TestTable',
+            'App\\Database\\TestTable',
             '2',
             'id',
             'user-id',
@@ -107,7 +107,7 @@ public function test01() {
             'Cool modifiyed column.',
             'y',
             'Modified',
-            "\n" // Hit Enter to pick default value (app\database)
+            "\n" // Hit Enter to pick default value (App\database)
         ]);
 
         $this->assertEquals(0, $this->getExitCode());
@@ -149,11 +149,11 @@ public function test01() {
             "Enter your optional comment about the column:\n",
             "Would you like to update same class or create a copy with the update?(y/N)\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\database'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Database'\n",
             "Success: Column updated.\n",
         ], $output);
         
-        $clazz = '\\app\\database\\ModifiedTable';
+        $clazz = '\\App\\Database\\ModifiedTable';
         $this->assertTrue(class_exists($clazz));
         $file = new File(ROOT_PATH.$clazz.'.php');
         $file->remove();
@@ -167,15 +167,15 @@ public function test01() {
 
     public function test02() {
         $output = $this->executeSingleCommand(new UpdateTableCommand(), [
-            'webfiori',
+            'WebFiori',
             'update-table',
         ], [
-            'app\\database\\Test2Table',
+            'App\\Database\\Test2Table',
             '4',
             '0',
             'y',
             'Modified2',
-            "\n" // Hit Enter to pick default value (app\database)
+            "\n" // Hit Enter to pick default value (App\database)
         ]);
 
         $this->assertEquals(0, $this->getExitCode());
@@ -191,11 +191,11 @@ public function test02() {
             "0: user_id_fk\n",
             "Would you like to update same class or create a copy with the update?(y/N)\n",
             "Enter a name for the new class:\n",
-            "Enter an optional namespace for the class: Enter = 'app\database'\n",
+            "Enter an optional namespace for the class: Enter = 'App\Database'\n",
             "Success: Table updated.\n",
         ], $output);
         
-        $clazz = '\\app\\database\\Modified2Table';
+        $clazz = '\\App\\Database\\Modified2Table';
         $this->assertTrue(class_exists($clazz));
         $file = new File(ROOT_PATH.$clazz.'.php');
         $file->remove();
diff --git a/tests/webfiori/framework/test/cli/VersionCommandTest.php b/tests/WebFiori/Framework/Tests/Cli/VersionCommandTest.php
similarity index 88%
rename from tests/webfiori/framework/test/cli/VersionCommandTest.php
rename to tests/WebFiori/Framework/Tests/Cli/VersionCommandTest.php
index 4bdb4baa5..d40a98a80 100644
--- a/tests/webfiori/framework/test/cli/VersionCommandTest.php
+++ b/tests/WebFiori/Framework/Tests/Cli/VersionCommandTest.php
@@ -1,8 +1,8 @@
 <?php
-namespace webfiori\framework\test\cli;
+namespace WebFiori\Framework\Test\Cli;
 
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\cli\commands\VersionCommand;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Cli\Commands\VersionCommand;
 
 /**
  * Description of VersionCommandTest
diff --git a/tests/webfiori/framework/test/config/JsonDriverTest.php b/tests/WebFiori/Framework/Tests/Config/JsonDriverTest.php
similarity index 99%
rename from tests/webfiori/framework/test/config/JsonDriverTest.php
rename to tests/WebFiori/Framework/Tests/Config/JsonDriverTest.php
index f31473622..732a41328 100644
--- a/tests/webfiori/framework/test/config/JsonDriverTest.php
+++ b/tests/WebFiori/Framework/Tests/Config/JsonDriverTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace webfiori\framework\test\config;
+namespace WebFiori\Framework\Test\Config;
 
 use PHPUnit\Framework\TestCase;
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Mail\SMTPAccount;
 use WebFiori\File\File;
-use webfiori\framework\config\JsonDriver;
+use WebFiori\Framework\Config\JsonDriver;
 use const DS;
 /**
  *
diff --git a/tests/webfiori/framework/test/DBTest.php b/tests/WebFiori/Framework/Tests/DBTest.php
similarity index 90%
rename from tests/webfiori/framework/test/DBTest.php
rename to tests/WebFiori/Framework/Tests/DBTest.php
index 320d66f87..57dd6de40 100644
--- a/tests/webfiori/framework/test/DBTest.php
+++ b/tests/WebFiori/Framework/Tests/DBTest.php
@@ -1,12 +1,12 @@
 <?php
-namespace webfiori\framework\test;
+namespace WebFiori\Framework\Test;
 
-use app\database\TestTable;
+use App\Database\TestTable;
 use PHPUnit\Framework\TestCase;
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Database\DatabaseException;
-use webfiori\framework\App;
-use webfiori\framework\DB;
+use WebFiori\Framework\App;
+use WebFiori\Framework\DB;
 
 /**
  * Description of DBTest
@@ -52,7 +52,7 @@ public function test03() {
         $conn = new ConnectionInfo('mysql', 'root', '123456', 'testing_db');
         $db = new DB($conn);
         $this->assertEquals(0, count($db->getTables()));
-        $db->register('database');
+        $db->register('Database');
         $this->assertEquals(2, count($db->getTables()));
     }
     /**
@@ -64,7 +64,7 @@ public function test04() {
         App::getConfig()->addOrUpdateDBConnection($conn);
         $db = new DB('default-conn');
         $this->assertEquals(0, count($db->getTables()));
-        $db->register('database');
+        $db->register('Database');
         $this->assertEquals(2, count($db->getTables()));
         App::getConfig()->removeAllDBConnections();
     }
diff --git a/tests/webfiori/framework/test/langs/LanguageTest.php b/tests/WebFiori/Framework/Tests/Langs/LanguageTest.php
similarity index 97%
rename from tests/webfiori/framework/test/langs/LanguageTest.php
rename to tests/WebFiori/Framework/Tests/Langs/LanguageTest.php
index ad47bc6c4..c51562374 100644
--- a/tests/webfiori/framework/test/langs/LanguageTest.php
+++ b/tests/WebFiori/Framework/Tests/Langs/LanguageTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace webfiori\tests\entity;
+namespace WebFiori\Tests\Entity;
 
 use Exception;
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\Lang;
-use webfiori\framework\session\SessionsManager;
-use webfiori\framework\session\DefaultSessionStorage;
+use WebFiori\Framework\Lang;
+use WebFiori\Framework\Session\SessionsManager;
+use WebFiori\Framework\Session\DefaultSessionStorage;
 /**
  * Description of LanguageTest
  *
@@ -210,7 +210,7 @@ public function testLoadTranslation01() {
      */
     public function testLoadTranslation02() {
         $this->expectException(Exception::class);
-        $this->expectExceptionMessage('A language class for the language \'FR\' was found. But it is not a sub class of \'webfiori\framework\Lang\'.');
+        $this->expectExceptionMessage('A language class for the language \'FR\' was found. But it is not a sub class of \'WebFiori\Framework\Lang\'.');
         Lang::loadTranslation('fr');
     }
     /**
@@ -221,7 +221,7 @@ public function testLoadTranslation02() {
      */
     public function testLoadTranslation03() {
         $this->expectException(Exception::class);
-        $this->expectExceptionMessage('The translation file was found. But no object of type \'webfiori\framework\Lang\' is stored. Make sure that the parameter '
+        $this->expectExceptionMessage('The translation file was found. But no object of type \'WebFiori\Framework\Lang\' is stored. Make sure that the parameter '
                                 .'$addtoLoadedAfterCreate is set to true when creating the language object.');
         Lang::loadTranslation('Jp');
     }
diff --git a/tests/webfiori/framework/test/mail/EmailMessageTest.php b/tests/WebFiori/Framework/Tests/Mail/EmailMessageTest.php
similarity index 96%
rename from tests/webfiori/framework/test/mail/EmailMessageTest.php
rename to tests/WebFiori/Framework/Tests/Mail/EmailMessageTest.php
index ec3f159e4..4049abfc0 100644
--- a/tests/webfiori/framework/test/mail/EmailMessageTest.php
+++ b/tests/WebFiori/Framework/Tests/Mail/EmailMessageTest.php
@@ -1,14 +1,14 @@
 <?php
-namespace webfiori\framework\test\mail;
+namespace WebFiori\Framework\Test\Mail;
 
 use Exception;
 use PHPUnit\Framework\TestCase;
 use WebFiori\Mail\SMTPAccount;
-use webfiori\framework\App;
-use webfiori\framework\EmailMessage;
-use webfiori\framework\exceptions\MissingLangException;
+use WebFiori\Framework\App;
+use WebFiori\Framework\EmailMessage;
+use WebFiori\Framework\Exceptions\MissingLangException;
 /**
- * A test class for testing the class 'webfiori\framework\mail\EmailMessage'.
+ * A test class for testing the class 'WebFiori\Framework\Mail\EmailMessage'.
  *
  * @author Ibrahim
  */
diff --git a/tests/webfiori/framework/test/PageTest.php b/tests/WebFiori/Framework/Tests/PageTest.php
similarity index 97%
rename from tests/webfiori/framework/test/PageTest.php
rename to tests/WebFiori/Framework/Tests/PageTest.php
index 83f99a83b..98490a19d 100644
--- a/tests/webfiori/framework/test/PageTest.php
+++ b/tests/WebFiori/Framework/Tests/PageTest.php
@@ -1,17 +1,17 @@
 <?php
-namespace webfiori\framework\test;
+namespace WebFiori\Framework\Test;
 
 use Exception;
 use PHPUnit\Framework\TestCase;
-use themes\fioriTheme\NewFTestTheme;
-use webfiori\framework\Access;
-use webfiori\framework\App;
-use webfiori\framework\Lang;
-use webfiori\framework\session\SessionsManager;
-use webfiori\framework\ThemeManager;
-use webfiori\framework\ui\WebPage;
-use webfiori\framework\User;
-use WebFiori\UI\HTMLNode;
+use Themes\FioriTheme\NewFTestTheme;
+use WebFiori\Framework\Access;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Lang;
+use WebFiori\Framework\Session\SessionsManager;
+use WebFiori\Framework\ThemeManager;
+use WebFiori\Framework\Ui\WebPage;
+use WebFiori\Framework\User;
+use WebFiori\Ui\HTMLNode;
 /**
  * Description of PageTest
  *
@@ -27,11 +27,11 @@ protected function setUp(): void {
         $themeNames = array_keys($registeredThemes);
         
         if (!in_array('New Theme 2', $themeNames)) {
-            ThemeManager::register(new \themes\fioriTheme2\NewTestTheme2());
+            ThemeManager::register(new \Themes\FioriTheme2\NewTestTheme2());
         }
         
         if (!in_array('New Super Theme', $themeNames)) {
-            ThemeManager::register(new \themes\fioriTheme\NewFTestTheme());
+            ThemeManager::register(new \Themes\FioriTheme\NewFTestTheme());
         }
     }
     
@@ -40,7 +40,7 @@ protected function tearDown(): void {
         $assetsPath = ROOT_PATH . DS . PUBLIC_FOLDER . DS . 'assets';
         if (is_dir($assetsPath)) {
             // Only remove theme directories, not the entire assets folder
-            $themeDirs = ['fioriTheme', 'fioriTheme2', 'NewTestTheme2', 'NewFTestTheme'];
+            $themeDirs = ['FioriTheme', 'FioriTheme2', 'NewTestTheme2', 'NewFTestTheme'];
             foreach ($themeDirs as $themeDir) {
                 $themePath = $assetsPath . DS . $themeDir;
                 if (is_dir($themePath)) {
@@ -764,7 +764,7 @@ public function testTheme02() {
         $page->setTheme('      New Super Theme      ');
         $theme3 = $page->getTheme();
         
-        $this->assertTrue($theme3 instanceof \webfiori\framework\Theme);
+        $this->assertTrue($theme3 instanceof \WebFiori\Framework\Theme);
     }
     /**
      * @test
diff --git a/tests/webfiori/framework/test/PrivilegeTest.php b/tests/WebFiori/Framework/Tests/PrivilegeTest.php
similarity index 91%
rename from tests/webfiori/framework/test/PrivilegeTest.php
rename to tests/WebFiori/Framework/Tests/PrivilegeTest.php
index b5e976293..b60755797 100644
--- a/tests/webfiori/framework/test/PrivilegeTest.php
+++ b/tests/WebFiori/Framework/Tests/PrivilegeTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace webfiori\framework\test;
+namespace WebFiori\Framework\Test;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\Privilege;
+use WebFiori\Framework\Privilege;
 /**
- * A test class for testing the class 'webfiori\framework\Privilege'.
+ * A test class for testing the class 'WebFiori\Framework\Privilege'.
  *
  * @author Ibrahim
  */
diff --git a/tests/webfiori/framework/test/PrivilegesGroupTest.php b/tests/WebFiori/Framework/Tests/PrivilegesGroupTest.php
similarity index 97%
rename from tests/webfiori/framework/test/PrivilegesGroupTest.php
rename to tests/WebFiori/Framework/Tests/PrivilegesGroupTest.php
index ecbe8adc0..4ba3f94dc 100644
--- a/tests/webfiori/framework/test/PrivilegesGroupTest.php
+++ b/tests/WebFiori/Framework/Tests/PrivilegesGroupTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace webfiori\framework\test;
+namespace WebFiori\Framework\Test;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\Privilege;
-use webfiori\framework\PrivilegesGroup;
+use WebFiori\Framework\Privilege;
+use WebFiori\Framework\PrivilegesGroup;
 
 /**
  *
diff --git a/tests/webfiori/framework/test/ResponseTest.php b/tests/WebFiori/Framework/Tests/ResponseTest.php
similarity index 98%
rename from tests/webfiori/framework/test/ResponseTest.php
rename to tests/WebFiori/Framework/Tests/ResponseTest.php
index c03367fa3..35b963ed7 100644
--- a/tests/webfiori/framework/test/ResponseTest.php
+++ b/tests/WebFiori/Framework/Tests/ResponseTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace webfiori\framework\test;
+namespace WebFiori\Framework\Test;
 
 use PHPUnit\Framework\TestCase;
 use WebFiori\Http\Response;
diff --git a/tests/webfiori/framework/test/router/RouterTest.php b/tests/WebFiori/Framework/Tests/Router/RouterTest.php
similarity index 98%
rename from tests/webfiori/framework/test/router/RouterTest.php
rename to tests/WebFiori/Framework/Tests/Router/RouterTest.php
index bc09b7b8c..d63919f1f 100644
--- a/tests/webfiori/framework/test/router/RouterTest.php
+++ b/tests/WebFiori/Framework/Tests/Router/RouterTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace webfiori\framework\test\router;
+namespace WebFiori\Framework\Test\Router;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\router\RouteOption;
-use webfiori\framework\router\Router;
-use webfiori\framework\router\RouterUri;
-use webfiori\framework\Util;
+use WebFiori\Framework\Router\RouteOption;
+use WebFiori\Framework\Router\Router;
+use WebFiori\Framework\Router\RouterUri;
+use WebFiori\Framework\Util;
 use WebFiori\Http\RequestMethod;
 use WebFiori\Http\Response;
 /**
@@ -500,7 +500,7 @@ public function testClassRoute00() {
         Response::clear();
         Router::addRoute([
                 RouteOption::PATH => 'home',
-                RouteOption::TO => \app\apis\RoutingTestClass::class
+                RouteOption::TO => \App\Apis\RoutingTestClass::class
         ]);
         Router::route('https://127.0.0.1/home');
         
@@ -514,7 +514,7 @@ public function testClassRoute02() {
         Router::removeAll();
         Router::addRoute([
                 RouteOption::PATH => 'home',
-                RouteOption::TO => \app\apis\RoutingTestClass::class,
+                RouteOption::TO => \App\Apis\RoutingTestClass::class,
                 RouteOption::ACTION => 'doSomething'
         ]);
         Router::route('https://127.0.0.1/home');
diff --git a/tests/webfiori/framework/test/router/RouterUriTest.php b/tests/WebFiori/Framework/Tests/Router/RouterUriTest.php
similarity index 98%
rename from tests/webfiori/framework/test/router/RouterUriTest.php
rename to tests/WebFiori/Framework/Tests/Router/RouterUriTest.php
index acac72694..40aff9616 100644
--- a/tests/webfiori/framework/test/router/RouterUriTest.php
+++ b/tests/WebFiori/Framework/Tests/Router/RouterUriTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace webfiori\framework\test\router;
+namespace WebFiori\Framework\Test\Router;
 
 use PHPUnit\Framework\TestCase;
 use TestMiddleware;
-use webfiori\framework\middleware\MiddlewareManager;
-use webfiori\framework\router\Router;
-use webfiori\framework\router\RouterUri;
+use WebFiori\Framework\Middleware\MiddlewareManager;
+use WebFiori\Framework\Router\Router;
+use WebFiori\Framework\Router\RouterUri;
 /**
  * Description of TestRouterUri
  *
diff --git a/tests/webfiori/framework/test/scheduler/JobArgumentTest.php b/tests/WebFiori/Framework/Tests/Scheduler/JobArgumentTest.php
similarity index 95%
rename from tests/webfiori/framework/test/scheduler/JobArgumentTest.php
rename to tests/WebFiori/Framework/Tests/Scheduler/JobArgumentTest.php
index 9678bdb4a..8474c7e92 100644
--- a/tests/webfiori/framework/test/scheduler/JobArgumentTest.php
+++ b/tests/WebFiori/Framework/Tests/Scheduler/JobArgumentTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace webfiori\framework\test\scheduler;
+namespace WebFiori\Framework\Test\Scheduler;
 
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\scheduler\TaskArgument;
+use WebFiori\Framework\Scheduler\TaskArgument;
 /**
  *
  * @author Ibrahim
diff --git a/tests/webfiori/framework/test/scheduler/SchedulerTaskTest.php b/tests/WebFiori/Framework/Tests/Scheduler/SchedulerTaskTest.php
similarity index 99%
rename from tests/webfiori/framework/test/scheduler/SchedulerTaskTest.php
rename to tests/WebFiori/Framework/Tests/Scheduler/SchedulerTaskTest.php
index 425e1e34d..04aa3eb4a 100644
--- a/tests/webfiori/framework/test/scheduler/SchedulerTaskTest.php
+++ b/tests/WebFiori/Framework/Tests/Scheduler/SchedulerTaskTest.php
@@ -1,14 +1,14 @@
 <?php
-namespace webfiori\framework\test\scheduler;
+namespace WebFiori\Framework\Test\Scheduler;
 
 use Exception;
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\exceptions\InvalidCRONExprException;
-use webfiori\framework\Privilege;
-use webfiori\framework\scheduler\BaseTask;
-use webfiori\framework\scheduler\TaskArgument;
-use webfiori\framework\scheduler\TasksManager;
+use WebFiori\Framework\Exceptions\InvalidCRONExprException;
+use WebFiori\Framework\Privilege;
+use WebFiori\Framework\Scheduler\BaseTask;
+use WebFiori\Framework\Scheduler\TaskArgument;
+use WebFiori\Framework\Scheduler\TasksManager;
 /**
  *
  * @author Ibrahim
@@ -79,7 +79,7 @@ public function testAttributes05() {
      */
     public function testAttributes06() {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid argument type. Expected 'string' or 'webfiori\\framework\\scheduler\\TaskArgument'");
+        $this->expectExceptionMessage("Invalid argument type. Expected 'string' or 'WebFiori\\Framework\\Scheduler\\TaskArgument'");
         $job = new BaseTask();
         $job->addExecutionArg(new Privilege());
     }
diff --git a/tests/webfiori/framework/test/scheduler/SchedulerTest.php b/tests/WebFiori/Framework/Tests/Scheduler/SchedulerTest.php
similarity index 94%
rename from tests/webfiori/framework/test/scheduler/SchedulerTest.php
rename to tests/WebFiori/Framework/Tests/Scheduler/SchedulerTest.php
index 396f0bf3d..e3a136314 100644
--- a/tests/webfiori/framework/test/scheduler/SchedulerTest.php
+++ b/tests/WebFiori/Framework/Tests/Scheduler/SchedulerTest.php
@@ -1,12 +1,12 @@
 <?php
-namespace webfiori\framework\test\scheduler;
+namespace WebFiori\Framework\Test\Scheduler;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\router\Router;
-use webfiori\framework\scheduler\TasksManager;
-use webfiori\framework\scheduler\webServices\TasksServicesManager;
-use webfiori\framework\scheduler\webUI\ListTasksPage;
-use webfiori\framework\scheduler\webUI\TasksLoginPage;
+use WebFiori\Framework\Router\Router;
+use WebFiori\Framework\Scheduler\TasksManager;
+use WebFiori\Framework\Scheduler\WebServices\TasksServicesManager;
+use WebFiori\Framework\Scheduler\WebUI\ListTasksPage;
+use WebFiori\Framework\Scheduler\WebUI\TasksLoginPage;
 /**
  *
  * @author Ibrahim
diff --git a/tests/webfiori/framework/test/session/SessionTest.php b/tests/WebFiori/Framework/Tests/Session/SessionTest.php
similarity index 97%
rename from tests/webfiori/framework/test/session/SessionTest.php
rename to tests/WebFiori/Framework/Tests/Session/SessionTest.php
index ea7a93f01..1b6475a40 100644
--- a/tests/webfiori/framework/test/session/SessionTest.php
+++ b/tests/WebFiori/Framework/Tests/Session/SessionTest.php
@@ -1,13 +1,13 @@
 <?php
-namespace webfiori\framework\test\session;
+namespace WebFiori\Framework\Test\Session;
 
 use PHPUnit\Framework\TestCase;
 use WebFiori\File\File;
-use webfiori\framework\exceptions\SessionException;
-use webfiori\framework\session\Session;
-use webfiori\framework\session\SessionStatus;
-use webfiori\framework\session\SessionsManager;
-use webfiori\framework\session\DefaultSessionStorage;
+use WebFiori\Framework\Exceptions\SessionException;
+use WebFiori\Framework\Session\Session;
+use WebFiori\Framework\Session\SessionStatus;
+use WebFiori\Framework\Session\SessionsManager;
+use WebFiori\Framework\Session\DefaultSessionStorage;
 /**
  * Description of SessionTest
  *
@@ -26,7 +26,7 @@ protected function setUp(): void {
      */
     public function testClose00($session) {
         $session->close();
-        $filePath = ROOT_PATH.DS.'app'.DS.'sto'.DS.'sessions'.DS.$session->getId();
+        $filePath = ROOT_PATH.DS.'App'.DS.'sto'.DS.'sessions'.DS.$session->getId();
         $this->assertTrue(File::isFileExist($filePath));
         $this->assertFalse($session->isRunning());
         $this->assertEquals(0,$session->getStartedAt());
diff --git a/tests/webfiori/framework/test/session/SessionsManagerTest.php b/tests/WebFiori/Framework/Tests/Session/SessionsManagerTest.php
similarity index 98%
rename from tests/webfiori/framework/test/session/SessionsManagerTest.php
rename to tests/WebFiori/Framework/Tests/Session/SessionsManagerTest.php
index f2ba0804f..e2fb4b3ee 100644
--- a/tests/webfiori/framework/test/session/SessionsManagerTest.php
+++ b/tests/WebFiori/Framework/Tests/Session/SessionsManagerTest.php
@@ -1,14 +1,14 @@
 <?php
-namespace webfiori\framework\test\session;
+namespace WebFiori\Framework\Test\Session;
 
 use PHPUnit\Framework\TestCase;
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Database\DatabaseException;
-use webfiori\framework\App;
-use webfiori\framework\exceptions\SessionException;
-use webfiori\framework\session\DatabaseSessionStorage;
-use webfiori\framework\session\SessionsManager;
-use webfiori\framework\session\SessionStatus;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Exceptions\SessionException;
+use WebFiori\Framework\Session\DatabaseSessionStorage;
+use WebFiori\Framework\Session\SessionsManager;
+use WebFiori\Framework\Session\SessionStatus;
 
 /**
  * Description of SessionsManagerTest
diff --git a/tests/webfiori/framework/test/TestAutoLoader.php b/tests/WebFiori/Framework/Tests/TestAutoLoader.php
similarity index 83%
rename from tests/webfiori/framework/test/TestAutoLoader.php
rename to tests/WebFiori/Framework/Tests/TestAutoLoader.php
index f10e18432..f9b2456b9 100644
--- a/tests/webfiori/framework/test/TestAutoLoader.php
+++ b/tests/WebFiori/Framework/Tests/TestAutoLoader.php
@@ -1,8 +1,8 @@
 <?php
-namespace webfiori\framework\test;
+namespace WebFiori\Framework\Test;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\autoload\ClassLoader;
+use WebFiori\Framework\Autoload\ClassLoader;
 /**
  * Description of TestAutoLoader
  *
@@ -19,7 +19,7 @@ public function test00() {
      * @test
      */
     public function test01() {
-        $cArr = explode('\\', 'webfiori\\framework\\autoload\\ClassLoader');
+        $cArr = explode('\\', 'WebFiori\\Framework\\Autoload\\ClassLoader');
         $className = $cArr[count($cArr) - 1];
         $classNs = implode('\\', array_slice($cArr, 0, count($cArr) - 1));
 
diff --git a/tests/webfiori/framework/test/theme/ThemeTest.php b/tests/WebFiori/Framework/Tests/Theme/ThemeTest.php
similarity index 72%
rename from tests/webfiori/framework/test/theme/ThemeTest.php
rename to tests/WebFiori/Framework/Tests/Theme/ThemeTest.php
index 6b0ac6454..d6b12b88d 100644
--- a/tests/webfiori/framework/test/theme/ThemeTest.php
+++ b/tests/WebFiori/Framework/Tests/Theme/ThemeTest.php
@@ -1,20 +1,46 @@
 <?php
-namespace webfiori\framework\test\theme;
+namespace WebFiori\Framework\Test\Theme;
 
 use const DS;
 use Exception;
 use PHPUnit\Framework\TestCase;
-use themes\fioriTheme\NewFTestTheme;
-use webfiori\framework\App;
-use webfiori\framework\Theme;
-use webfiori\framework\ThemeManager;
+use Themes\FioriTheme\NewFTestTheme;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Theme;
+use WebFiori\Framework\ThemeManager;
 /**
  * Description of ThemeTest
  *
  * @author Ibrahim
  */
 class ThemeTest extends TestCase {
-    public function testAvailableThemes00() {
+    
+    protected function tearDown(): void {
+        // Clean up theme assets from public directory
+        $assetsPath = ROOT_PATH . DS . PUBLIC_FOLDER . DS . 'assets';
+        if (is_dir($assetsPath)) {
+            $themeDirs = ['FioriTheme', 'FioriTheme2'];
+            foreach ($themeDirs as $themeDir) {
+                $themePath = $assetsPath . DS . $themeDir;
+                if (is_dir($themePath)) {
+                    $this->removeDirectory($themePath);
+                }
+            }
+        }
+        parent::tearDown();
+    }
+    
+    private function removeDirectory($dir) {
+        if (!is_dir($dir)) {
+            return;
+        }
+        $files = array_diff(scandir($dir), ['.', '..']);
+        foreach ($files as $file) {
+            $path = $dir . DS . $file;
+            is_dir($path) ? $this->removeDirectory($path) : unlink($path);
+        }
+        rmdir($dir);
+    }    public function testAvailableThemes00() {
         $themes = ThemeManager::getRegisteredThemes();
         $this->assertEquals(2, count($themes));
     }
@@ -60,7 +86,7 @@ public function testToJson00() {
     public function testUseTheme00() {
         $themeName = 'New Theme 2';
         ThemeManager::resetRegistered();
-        ThemeManager::register(new \themes\fioriTheme2\NewTestTheme2());
+        ThemeManager::register(new \Themes\FioriTheme2\NewTestTheme2());
         //$this->assertFalse(Theme::isThemeLoaded($themeName));
         $theme = ThemeManager::usingTheme($themeName);
         $this->assertTrue($theme instanceof Theme);
@@ -71,9 +97,9 @@ public function testUseTheme00() {
         $this->assertEquals('https://opensource.org/licenses/MIT',$theme->getLicenseUrl());
         $this->assertEquals('MIT',$theme->getLicenseName());
         $this->assertEquals(1,count(ThemeManager::getRegisteredThemes()));
-        $this->assertEquals('fioriTheme2', $theme->getDirectoryName());
+        $this->assertEquals('FioriTheme2', $theme->getDirectoryName());
         $this->assertEquals('https://my-theme-side.com', $theme->getUrl());
-        $this->assertEquals(ROOT_PATH.DS.'themes'.DS.'fioriTheme2'.DS, $theme->getAbsolutePath());
+        $this->assertEquals(ROOT_PATH.DS.'Themes'.DS.'FioriTheme2'.DS, $theme->getAbsolutePath());
         $this->assertEquals('css', $theme->getCssDirName());
         $this->assertEquals('js', $theme->getJsDirName());
         $this->assertEquals('images', $theme->getImagesDirName());
diff --git a/tests/webfiori/framework/test/UserTest.php b/tests/WebFiori/Framework/Tests/UserTest.php
similarity index 97%
rename from tests/webfiori/framework/test/UserTest.php
rename to tests/WebFiori/Framework/Tests/UserTest.php
index c563b4d1a..4577872b2 100644
--- a/tests/webfiori/framework/test/UserTest.php
+++ b/tests/WebFiori/Framework/Tests/UserTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace webfiori\framework\test;
+namespace WebFiori\Framework\Test;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\Access;
-use webfiori\framework\User;
+use WebFiori\Framework\Access;
+use WebFiori\Framework\User;
 /**
- * A test class for testing the class 'webfiori\framework\User'.
+ * A test class for testing the class 'WebFiori\Framework\User'.
  *
  * @author Ibrahim
  */
diff --git a/tests/webfiori/framework/test/UtilTest.php b/tests/WebFiori/Framework/Tests/UtilTest.php
similarity index 83%
rename from tests/webfiori/framework/test/UtilTest.php
rename to tests/WebFiori/Framework/Tests/UtilTest.php
index 13e257cbf..673da9222 100644
--- a/tests/webfiori/framework/test/UtilTest.php
+++ b/tests/WebFiori/Framework/Tests/UtilTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace webfiori\framework\test;
+namespace WebFiori\Framework\Test;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\Util;
+use WebFiori\Framework\Util;
 /**
- * A test class for testing the class 'webfiori\framework\Util'.
+ * A test class for testing the class 'WebFiori\Framework\Util'.
  *
  * @author Ibrahim
  */
diff --git a/tests/webfiori/framework/test/writers/BackgroundTaskWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/BackgroundTaskWritterTest.php
similarity index 78%
rename from tests/webfiori/framework/test/writers/BackgroundTaskWritterTest.php
rename to tests/WebFiori/Framework/Tests/Writers/BackgroundTaskWritterTest.php
index 06030d581..99fd654e0 100644
--- a/tests/webfiori/framework/test/writers/BackgroundTaskWritterTest.php
+++ b/tests/WebFiori/Framework/Tests/Writers/BackgroundTaskWritterTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace webfiori\framework\test\writers;
+namespace WebFiori\Framework\Test\Writers;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\scheduler\AbstractTask;
-use webfiori\framework\scheduler\TaskArgument;
-use webfiori\framework\writers\SchedulerTaskClassWriter;
+use WebFiori\Framework\Scheduler\AbstractTask;
+use WebFiori\Framework\Scheduler\TaskArgument;
+use WebFiori\Framework\Writers\SchedulerTaskClassWriter;
 /**
  *
  * @author Ibrahim
@@ -16,12 +16,12 @@ class BackgroundTaskWritterTest extends TestCase {
     public function test00() {
         $writter = new SchedulerTaskClassWriter();
         $this->assertEquals('NewTask', $writter->getName());
-        $this->assertEquals('app\\tasks', $writter->getNamespace());
+        $this->assertEquals('App\\Tasks', $writter->getNamespace());
         $this->assertEquals('Task', $writter->getSuffix());
         $this->assertEquals([
-            "webfiori\\framework\\scheduler\\AbstractTask",
-            "webfiori\\framework\\scheduler\\TaskStatusEmail",
-            "webfiori\\framework\\scheduler\\TasksManager",
+            "WebFiori\\Framework\\Scheduler\\AbstractTask",
+            "WebFiori\\Framework\\Scheduler\\TaskStatusEmail",
+            "WebFiori\\Framework\\Scheduler\\TasksManager",
         ], $writter->getUseStatements());
         $this->assertEquals('No Description', $writter->getTaskDescription());
         $this->assertEquals(0, count($writter->getTask()->getArguments()));
@@ -33,12 +33,12 @@ public function test01() {
         $writter = new SchedulerTaskClassWriter();
         $writter->setClassName('NewOk');
         $this->assertEquals('NewOkTask', $writter->getName());
-        $this->assertEquals('app\\tasks', $writter->getNamespace());
+        $this->assertEquals('App\\Tasks', $writter->getNamespace());
         $this->assertEquals('Task', $writter->getSuffix());
         $this->assertEquals([
-            "webfiori\\framework\\scheduler\\AbstractTask",
-            "webfiori\\framework\\scheduler\\TaskStatusEmail",
-            "webfiori\\framework\\scheduler\\TasksManager",
+            "WebFiori\\Framework\\Scheduler\\AbstractTask",
+            "WebFiori\\Framework\\Scheduler\\TaskStatusEmail",
+            "WebFiori\\Framework\\Scheduler\\TasksManager",
         ], $writter->getUseStatements());
         $this->assertEquals('No Description', $writter->getTaskDescription());
         $this->assertEquals(0, count($writter->getTask()->getArguments()));
@@ -63,12 +63,12 @@ public function test02() {
 
         $this->assertEquals('NewOk2BTask', $writter->getName());
         
-        $this->assertEquals('app\\tasks', $writter->getNamespace());
+        $this->assertEquals('App\\Tasks', $writter->getNamespace());
         $this->assertEquals('Task', $writter->getSuffix());
         $this->assertEquals([
-            "webfiori\\framework\\scheduler\\AbstractTask",
-            "webfiori\\framework\\scheduler\\TaskStatusEmail",
-            "webfiori\\framework\\scheduler\\TasksManager",
+            "WebFiori\\Framework\\Scheduler\\AbstractTask",
+            "WebFiori\\Framework\\Scheduler\\TaskStatusEmail",
+            "WebFiori\\Framework\\Scheduler\\TasksManager",
         ], $writter->getUseStatements());
         $this->assertEquals('A test Task', $writter->getTaskDescription());
         $this->assertEquals(1, count($writter->getTask()->getArguments()));
diff --git a/tests/webfiori/framework/test/writers/CLICommandClassWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php
similarity index 90%
rename from tests/webfiori/framework/test/writers/CLICommandClassWriterTest.php
rename to tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php
index 8d88d7d86..9c02dc46a 100644
--- a/tests/webfiori/framework/test/writers/CLICommandClassWriterTest.php
+++ b/tests/WebFiori/Framework/Tests/Writers/CLICommandClassWriterTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace webfiori\framework\test\writers;
+namespace WebFiori\Framework\Test\Writers;
 
 use PHPUnit\Framework\TestCase;
 use WebFiori\Cli\Command;
-use webfiori\framework\writers\CommandClassWriter;
+use WebFiori\Framework\Writers\CommandClassWriter;
 
 class CLICommandClassWriterTest extends TestCase {
     /**
@@ -12,8 +12,8 @@ class CLICommandClassWriterTest extends TestCase {
     public function test00() {
         $writer = new CommandClassWriter();
         $this->assertEquals('NewCommand', $writer->getName());
-        $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'commands'.DS.'NewCommand.php', $writer->getAbsolutePath());
-        $this->assertEquals('app\\commands', $writer->getNamespace());
+        $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'Commands'.DS.'NewCommand.php', $writer->getAbsolutePath());
+        $this->assertEquals('App\\Commands', $writer->getNamespace());
         $this->assertEquals('new-command', $writer->getCommandName());
         $this->assertEquals('', $writer->getDescription());
         $this->assertEquals([], $writer->getArgs());
@@ -37,8 +37,8 @@ public function test01() {
         $this->assertFalse($writer->setClassName('   '));
         $this->assertTrue($writer->setClassName('DoItXCommand'));
         $this->assertEquals('DoItXCommand', $writer->getName());
-        $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'commands'.DS.'DoItXCommand.php', $writer->getAbsolutePath());
-        $this->assertEquals('app\\commands', $writer->getNamespace());
+        $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'Commands'.DS.'DoItXCommand.php', $writer->getAbsolutePath());
+        $this->assertEquals('App\\Commands', $writer->getNamespace());
         $this->assertEquals('Lets-Do-It', $writer->getCommandName());
         $this->assertEquals('', $writer->getDescription());
         $this->assertEquals([], $writer->getArgs());
@@ -80,8 +80,8 @@ public function test02() {
         $this->assertFalse($writer->setClassName('   '));
         $this->assertTrue($writer->setClassName('DoItX2Command'));
         $this->assertEquals('DoItX2Command', $writer->getName());
-        $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'commands'.DS.'DoItX2Command.php', $writer->getAbsolutePath());
-        $this->assertEquals('app\\commands', $writer->getNamespace());
+        $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'Commands'.DS.'DoItX2Command.php', $writer->getAbsolutePath());
+        $this->assertEquals('App\\Commands', $writer->getNamespace());
         $this->assertEquals('Lets-Do-It', $writer->getCommandName());
         $this->assertEquals('', $writer->getDescription());
         $this->assertEquals([], $writer->getArgs());
diff --git a/tests/webfiori/framework/test/writers/DatabaseMigrationWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php
similarity index 63%
rename from tests/webfiori/framework/test/writers/DatabaseMigrationWriterTest.php
rename to tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php
index e3568798b..e02dab022 100644
--- a/tests/webfiori/framework/test/writers/DatabaseMigrationWriterTest.php
+++ b/tests/WebFiori/Framework/Tests/Writers/DatabaseMigrationWriterTest.php
@@ -1,20 +1,29 @@
 <?php
-namespace webfiori\framework\test\writers;
+namespace WebFiori\Framework\Test\Writers;
 
 use PHPUnit\Framework\TestCase;
 use WebFiori\Database\Schema\AbstractMigration;
 use WebFiori\Database\Schema\SchemaRunner;
 use WebFiori\File\File;
-use webfiori\framework\writers\DatabaseMigrationWriter;
+use WebFiori\Framework\Writers\DatabaseMigrationWriter;
 
 /**
  * @author Ibrahim
  */
 class DatabaseMigrationWriterTest extends TestCase {
     
+    protected function setUp(): void {
+        parent::setUp();
+        // Ensure migrations directory exists
+        $migrationsDir = APP_PATH . DS . 'Database' . DS . 'Migrations';
+        if (!is_dir($migrationsDir)) {
+            mkdir($migrationsDir, 0755, true);
+        }
+    }
+    
     protected function tearDown(): void {
         // Clean up only the Migration files created by this test (Migration000, Migration001, etc.)
-        $migrationsDir = APP_PATH . DS . 'database' . DS . 'migrations';
+        $migrationsDir = APP_PATH . DS . 'Database' . DS . 'Migrations';
         if (is_dir($migrationsDir)) {
             // Only remove Migration files directly in the migrations directory, not in subdirectories
             $files = glob($migrationsDir . DS . 'Migration[0-9][0-9][0-9].php');
@@ -31,14 +40,14 @@ protected function tearDown(): void {
      */
     public function test00() {
         DatabaseMigrationWriter::resetCounter();
-        $path = APP_PATH.DS.'database'.DS.'migrations';
-        $ns = '\\app\\database\\migrations';
-        $clazz = "\\app\\database\\migrations\\Migration000";
+        $path = APP_PATH.DS.'Database'.DS.'Migrations';
+        $ns = '\\App\\Database\\Migrations';
+        $clazz = "\\App\\Database\\Migrations\\Migration000";
         $this->removeClass($clazz);
         $runner = new SchemaRunner(null);
         $writter = new DatabaseMigrationWriter($runner);
         $this->assertEquals('Migration000', $writter->getName());
-        $this->assertEquals('app\\database\\migrations', $writter->getNamespace());
+        $this->assertEquals('App\\Database\\Migrations', $writter->getNamespace());
         $this->assertEquals('', $writter->getSuffix());
         $this->assertEquals([
             "WebFiori\Database\Database",
@@ -46,6 +55,10 @@ public function test00() {
         ], $writter->getUseStatements());
         $writter->writeClass();
         
+        // Check if file was written and require it
+        $filePath = $writter->getPath() . DS . $writter->getName() . '.php';
+        $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath");
+        require_once $filePath;
         $this->assertTrue(class_exists($clazz));
         $runner->register($clazz);
             $allClasses[] = $clazz;
@@ -53,7 +66,7 @@ public function test00() {
         $this->assertEquals(1, count($migrations));
         $m00 = $migrations[0];
         $this->assertTrue($m00 instanceof AbstractMigration);
-        $this->assertEquals('app\\database\\migrations\\Migration000', $m00->getName());
+        $this->assertEquals('App\\Database\\Migrations\\Migration000', $m00->getName());
         $this->removeClass($clazz);
         $runner = new SchemaRunner(null);
     }
@@ -63,15 +76,20 @@ public function test00() {
     public function test01() {
         DatabaseMigrationWriter::resetCounter();
         $runner = new SchemaRunner(null);
-        $path = APP_PATH.DS.'database'.DS.'migrations';
-        $ns = '\\app\\database\\migrations';
+        $path = APP_PATH.DS.'Database'.DS.'Migrations';
+        $ns = '\\App\\Database\\Migrations';
         $writter = new DatabaseMigrationWriter($runner);
         $writter->setClassName('MyMigration');
         $this->assertEquals('MyMigration', $writter->getName());
-        $this->assertEquals('app\\database\\migrations', $writter->getNamespace());
+        $this->assertEquals('App\\Database\\Migrations', $writter->getNamespace());
 
         $writter->writeClass();
-        $clazz = "\\app\\database\\migrations\\MyMigration";
+        $clazz = "\\App\\Database\\Migrations\\MyMigration";
+        
+        // Check if file was written and require it
+        $filePath = $writter->getPath() . DS . $writter->getName() . '.php';
+        $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath");
+        require_once $filePath;
         $this->assertTrue(class_exists($clazz));
         $runner->register($clazz);
             $allClasses[] = $clazz;
@@ -79,7 +97,7 @@ public function test01() {
         $this->assertEquals(1, count($migrations));
         $m00 = $migrations[0];
         $this->assertTrue($m00 instanceof AbstractMigration);
-        $this->assertEquals('app\\database\\migrations\\MyMigration', $m00->getName());
+        $this->assertEquals('App\\Database\\Migrations\\MyMigration', $m00->getName());
         $this->removeClass($clazz);
         $runner = new SchemaRunner(null);
     }
@@ -89,12 +107,17 @@ public function test01() {
     public function test02() {
         DatabaseMigrationWriter::resetCounter();
         $runner = new SchemaRunner(null);
-        $path = APP_PATH.DS.'database'.DS.'migrations';
-        $ns = '\\app\\database\\migrations';
+        $path = APP_PATH.DS.'Database'.DS.'Migrations';
+        $ns = '\\App\\Database\\Migrations';
         $writter = new DatabaseMigrationWriter($runner);
         $this->assertEquals('Migration000', $writter->getName());
         $writter->writeClass();
-        $clazz = "\\app\\database\\migrations\\Migration000";
+        $clazz = "\\App\\Database\\Migrations\\Migration000";
+        
+        // Check if file was written and require it
+        $filePath = $writter->getPath() . DS . $writter->getName() . '.php';
+        $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath");
+        require_once $filePath;
         $this->assertTrue(class_exists($clazz));
         $runner->register($clazz);
             $allClasses[] = $clazz;
@@ -104,13 +127,18 @@ public function test02() {
         $this->assertEquals(1, count($migrations));
         $m00 = $migrations[0];
         $this->assertTrue($m00 instanceof AbstractMigration);
-        $this->assertEquals('app\\database\\migrations\\Migration000', $m00->getName());
+        $this->assertEquals('App\\Database\\Migrations\\Migration000', $m00->getName());
         
         $writter2 = new DatabaseMigrationWriter($runner2);
         $this->assertEquals('Migration001', $writter2->getName());
         $writter2->writeClass();
-        $clazz2 = "\\app\\database\\migrations\\Migration001";
-        $this->assertTrue(class_exists($clazz));
+        $clazz2 = "\\App\\Database\\Migrations\\Migration001";
+        
+        // Check if file was written and require it
+        $filePath2 = $writter2->getPath() . DS . $writter2->getName() . '.php';
+        $this->assertTrue(file_exists($filePath2), "Class file was not created: $filePath2");
+        require_once $filePath2;
+        $this->assertTrue(class_exists($clazz2));
         $runner->register($clazz);
             $allClasses[] = $clazz;
         $runner3 = new SchemaRunner(null);
@@ -120,7 +148,7 @@ public function test02() {
         $this->assertEquals(2, count($migrations2));
         $m01 = $migrations2[1];
         $this->assertTrue($m00 instanceof AbstractMigration);
-        $this->assertEquals('app\\database\\migrations\\Migration001', $m01->getName());
+        $this->assertEquals('App\\Database\\Migrations\\Migration001', $m01->getName());
         $this->removeClass($clazz);
         $runner = new SchemaRunner(null);
         $this->removeClass($clazz2);
@@ -131,8 +159,8 @@ public function test02() {
     public function test03() {
         DatabaseMigrationWriter::resetCounter();
         $runner = new SchemaRunner(null);
-        $path = APP_PATH.DS.'database'.DS.'migrations';
-        $ns = '\\app\\database\\migrations';
+        $path = APP_PATH.DS.'Database'.DS.'Migrations';
+        $ns = '\\App\\Database\\Migrations';
         $allClasses = [];
         for ($x = 0 ; $x < 110 ; $x++) {
             $writter = new DatabaseMigrationWriter($runner);
@@ -145,7 +173,12 @@ public function test03() {
             }
             $this->assertEquals($name, $writter->getName());
             $writter->writeClass();
-            $clazz = "\\app\\database\\migrations\\".$name;
+            $clazz = "\\App\\Database\\Migrations\\".$name;
+            
+            // Check if file was written and require it
+            $filePath = $writter->getPath() . DS . $writter->getName() . '.php';
+            $this->assertTrue(file_exists($filePath), "Class file was not created: $filePath");
+            require_once $filePath;
             $this->assertTrue(class_exists($clazz));
         $runner->register($clazz);
             $allClasses[] = $clazz;
@@ -158,10 +191,10 @@ public function test03() {
             $this->assertEquals($x + 1, count($migrations));
             $m = $migrations[$x];
             $this->assertTrue($m instanceof AbstractMigration);
-            $this->assertEquals("app\\database\\migrations\\" . $name, $m->getName());
+            $this->assertEquals("App\\Database\\Migrations\\" . $name, $m->getName());
         }
         foreach ($migrations as $m) {
-            $this->removeClass("\\app\\database\\migrations\\".$m->getName());
+            $this->removeClass("\\App\\Database\\Migrations\\".$m->getName());
         }
     }
     private function removeClass($classPath) {
diff --git a/tests/webfiori/framework/test/writers/LangWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/LangWritterTest.php
similarity index 71%
rename from tests/webfiori/framework/test/writers/LangWritterTest.php
rename to tests/WebFiori/Framework/Tests/Writers/LangWritterTest.php
index 99cf77370..e4257d4f2 100644
--- a/tests/webfiori/framework/test/writers/LangWritterTest.php
+++ b/tests/WebFiori/Framework/Tests/Writers/LangWritterTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace webfiori\framework\test\writers;
+namespace WebFiori\Framework\Test\Writers;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\Lang;
-use webfiori\framework\writers\LangClassWriter;
+use WebFiori\Framework\Lang;
+use WebFiori\Framework\Writers\LangClassWriter;
 /**
  *
  * @author Ibrahim
@@ -15,7 +15,7 @@ class LangWritterTest extends TestCase {
     public function test00() {
         $writter = new LangClassWriter('EN', 'ltr');
         $this->assertEquals('LangEN', $writter->getName());
-        $this->assertEquals('app\\langs', $writter->getNamespace());
+        $this->assertEquals('App\\Langs', $writter->getNamespace());
         $this->assertEquals('', $writter->getSuffix());
         $this->assertEquals([
                 Lang::class
diff --git a/tests/webfiori/framework/test/writers/MiddlewareWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/MiddlewareWritterTest.php
similarity index 78%
rename from tests/webfiori/framework/test/writers/MiddlewareWritterTest.php
rename to tests/WebFiori/Framework/Tests/Writers/MiddlewareWritterTest.php
index 26b9fd894..9d91cbabc 100644
--- a/tests/webfiori/framework/test/writers/MiddlewareWritterTest.php
+++ b/tests/WebFiori/Framework/Tests/Writers/MiddlewareWritterTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace webfiori\framework\test\writers;
+namespace WebFiori\Framework\Test\Writers;
 
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\middleware\AbstractMiddleware;
-use webfiori\framework\writers\MiddlewareClassWriter;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Middleware\AbstractMiddleware;
+use WebFiori\Framework\Writers\MiddlewareClassWriter;
 /**
  *
  * @author Ibrahim
@@ -15,11 +15,11 @@ class MiddlewareWritterTest extends CLITestCase {
     public function test00() {
         $writter = new MiddlewareClassWriter();
         $this->assertEquals('NewMiddleware', $writter->getName());
-        $this->assertEquals('app\\middleware', $writter->getNamespace());
+        $this->assertEquals('App\\Middleware', $writter->getNamespace());
         $this->assertEquals('Middleware', $writter->getSuffix());
         $this->assertEquals([
-            "webfiori\\framework\\middleware\\AbstractMiddleware",
-            "webfiori\\framework\\session\\SessionsManager",
+            "WebFiori\\Framework\\Middleware\\AbstractMiddleware",
+            "WebFiori\\Framework\\Session\\SessionsManager",
             "WebFiori\\Http\\Request",
             "WebFiori\\Http\\Response",
         ], $writter->getUseStatements());
@@ -39,11 +39,11 @@ public function test01() {
         $writter->addGroup('two-group');
         $writter->addGroup('global');
         $this->assertEquals('XMdMiddleware', $writter->getName());
-        $this->assertEquals('app\\middleware', $writter->getNamespace());
+        $this->assertEquals('App\\Middleware', $writter->getNamespace());
         $this->assertEquals('Middleware', $writter->getSuffix());
         $this->assertEquals([
-            "webfiori\\framework\\middleware\\AbstractMiddleware",
-            "webfiori\\framework\\session\\SessionsManager",
+            "WebFiori\\Framework\\Middleware\\AbstractMiddleware",
+            "WebFiori\\Framework\\Session\\SessionsManager",
             "WebFiori\\Http\\Request",
             "WebFiori\\Http\\Response",
         ], $writter->getUseStatements());
diff --git a/tests/webfiori/framework/test/writers/TableWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/TableWritterTest.php
similarity index 92%
rename from tests/webfiori/framework/test/writers/TableWritterTest.php
rename to tests/WebFiori/Framework/Tests/Writers/TableWritterTest.php
index 966e6aa3f..1f4d76278 100644
--- a/tests/webfiori/framework/test/writers/TableWritterTest.php
+++ b/tests/WebFiori/Framework/Tests/Writers/TableWritterTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace webfiori\framework\test\writers;
+namespace WebFiori\Framework\Test\Writers;
 
 use WebFiori\Database\MsSql\MSSQLTable;
 use WebFiori\Database\MySql\MySQLColumn;
 use WebFiori\Database\MySql\MySQLTable;
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\writers\TableClassWriter;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Writers\TableClassWriter;
 /**
  *
  * @author Ibrahim
@@ -17,7 +17,7 @@ class TableWritterTest extends CLITestCase {
     public function test00() {
         $writter = new TableClassWriter();
         $this->assertEquals('NewTable', $writter->getName());
-        $this->assertEquals('app\\database', $writter->getNamespace());
+        $this->assertEquals('App\\Database', $writter->getNamespace());
         $this->assertEquals('Table', $writter->getSuffix());
         $this->assertEquals([
 
@@ -34,16 +34,16 @@ public function test00() {
     public function test01() {
         $writter = new TableClassWriter();
         $writter->setClassName('CoolT');
-        $writter->setEntityInfo('MyEntity', 'app\\entity', ROOT_PATH.DS.APP_DIR.DS.'entity', true);
+        $writter->setEntityInfo('MyEntity', 'App\\Entity', ROOT_PATH.DS.APP_DIR.DS.'Entity', true);
         $this->assertEquals('CoolTTable', $writter->getName());
-        $this->assertEquals('app\\database', $writter->getNamespace());
+        $this->assertEquals('App\\Database', $writter->getNamespace());
         $this->assertEquals('Table', $writter->getSuffix());
         $this->assertEquals([
 
         ], $writter->getUseStatements());
         $this->assertEquals('MyEntity', $writter->getEntityName());
-        $this->assertEquals('app\\entity', $writter->getEntityNamespace());
-        $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'entity', $writter->getEntityPath());
+        $this->assertEquals('App\\Entity', $writter->getEntityNamespace());
+        $this->assertEquals(ROOT_PATH.DS.APP_DIR.DS.'Entity', $writter->getEntityPath());
         $this->assertTrue($writter->getTable() instanceof MySQLTable);
         $this->assertFalse($writter->getTable() instanceof MSSQLTable);
         $writter->writeClass();
@@ -54,7 +54,7 @@ public function test01() {
         $this->assertTrue($clazzObj instanceof MySQLTable);
         $this->assertEquals('`new_table`', $clazzObj->getName());
         $this->assertEquals(0, $clazzObj->getColsCount());
-        $this->removeClass('app\\entity\\MyEntity');
+        $this->removeClass('App\\Entity\\MyEntity');
     }
     /**
      * @test
@@ -63,7 +63,7 @@ public function test02() {
         $writter = new TableClassWriter();
         $writter->setClassName('CoolT2Table');
         $writter->setTableType('mssql');
-        $writter->setEntityInfo('MyEntity', 'app\\entity', ROOT_PATH.DS.APP_DIR.DS.'entity', true);
+        $writter->setEntityInfo('MyEntity', 'App\\Entity', ROOT_PATH.DS.APP_DIR.DS.'Entity', true);
         $this->assertEquals('CoolT2Table', $writter->getName());
 
         $this->assertFalse($writter->getTable() instanceof MySQLTable);
@@ -76,7 +76,7 @@ public function test02() {
         $this->assertTrue($clazzObj instanceof MSSQLTable);
         $this->assertEquals('[new_table]', $clazzObj->getName());
         $this->assertEquals(0, $clazzObj->getColsCount());
-        $this->removeClass('app\\entity\\MyEntity');
+        $this->removeClass('App\\Entity\\MyEntity');
     }
     /**
      * @test
diff --git a/tests/webfiori/framework/test/writers/ThemeWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/ThemeWritterTest.php
similarity index 78%
rename from tests/webfiori/framework/test/writers/ThemeWritterTest.php
rename to tests/WebFiori/Framework/Tests/Writers/ThemeWritterTest.php
index a34a81687..596c220a6 100644
--- a/tests/webfiori/framework/test/writers/ThemeWritterTest.php
+++ b/tests/WebFiori/Framework/Tests/Writers/ThemeWritterTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace webfiori\framework\test\writers;
+namespace WebFiori\Framework\Test\Writers;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\Theme;
-use webfiori\framework\writers\ThemeClassWriter;
+use WebFiori\Framework\Theme;
+use WebFiori\Framework\Writers\ThemeClassWriter;
 /**
  *
  * @author Ibrahim
@@ -15,7 +15,7 @@ class ThemeWritterTest extends TestCase {
     public function test00() {
         $writter = new ThemeClassWriter();
         $this->assertEquals('NewTheme', $writter->getName());
-        $this->assertEquals('app\\themes\\new', $writter->getNamespace());
+        $this->assertEquals('App\\Themes\\new', $writter->getNamespace());
         $this->assertEquals('Theme', $writter->getSuffix());
         $this->assertEquals([
         ], $writter->getUseStatements());
@@ -29,9 +29,9 @@ public function test01() {
         $writter->setClassName('SuperHotNew');
         $writter->setThemeName('Cool Theme');
         $this->assertEquals('SuperHotNewTheme', $writter->getName());
-        $writter->setNamespace('app\\themes\\cool');
-        $writter->setPath(ROOT_PATH.DS.APP_DIR.DS.'themes'.DS.'cool');
-        $this->assertEquals('app\\themes\\cool', $writter->getNamespace());
+        $writter->setNamespace('App\\Themes\\cool');
+        $writter->setPath(ROOT_PATH.DS.APP_DIR.DS.'Themes'.DS.'cool');
+        $this->assertEquals('App\\Themes\\cool', $writter->getNamespace());
         $this->assertEquals('Theme', $writter->getSuffix());
         $this->assertEquals([
         ], $writter->getUseStatements());
diff --git a/tests/webfiori/framework/test/writers/WebServiceTestCaseWriterTest.php b/tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php
similarity index 75%
rename from tests/webfiori/framework/test/writers/WebServiceTestCaseWriterTest.php
rename to tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php
index 8351f70d1..c7c75435a 100644
--- a/tests/webfiori/framework/test/writers/WebServiceTestCaseWriterTest.php
+++ b/tests/WebFiori/Framework/Tests/Writers/WebServiceTestCaseWriterTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace webfiori\framework\test\writers;
+namespace WebFiori\Framework\Test\Writers;
 
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\scheduler\webServices\ForceTaskExecutionService;
-use webfiori\framework\scheduler\webServices\TasksServicesManager;
-use webfiori\framework\writers\APITestCaseWriter;
+use WebFiori\Framework\Cli\CLITestCase;
+use WebFiori\Framework\Scheduler\WebServices\ForceTaskExecutionService;
+use WebFiori\Framework\Scheduler\WebServices\TasksServicesManager;
+use WebFiori\Framework\Writers\APITestCaseWriter;
 /**
  *
  * @author Ibrahim
@@ -15,9 +15,9 @@ class WebServiceTestCaseWriterTest extends CLITestCase {
      */
     public function test00() {
         $w = new APITestCaseWriter(new TasksServicesManager(), ForceTaskExecutionService::class);
-        $this->assertEquals('tests\\apis\\WebServiceTest', $w->getName(true));
+        $this->assertEquals('tests\\Apis\\WebServiceTest', $w->getName(true));
         $this->assertEquals(9, $w->getPhpUnitVersion());
-        $this->assertEquals(ROOT_PATH.DS.'tests'.DS.'apis'.DS.'WebServiceTest.php', $w->getAbsolutePath());
+        $this->assertEquals(ROOT_PATH.DS.'tests'.DS.'Apis'.DS.'WebServiceTest.php', $w->getAbsolutePath());
         $w->writeClass();
         $this->assertTrue(class_exists('\\'.$w->getName(true)));
         unlink($w->getAbsolutePath());
diff --git a/tests/webfiori/framework/test/writers/WebServiceWritterTest.php b/tests/WebFiori/Framework/Tests/Writers/WebServiceWritterTest.php
similarity index 94%
rename from tests/webfiori/framework/test/writers/WebServiceWritterTest.php
rename to tests/WebFiori/Framework/Tests/Writers/WebServiceWritterTest.php
index 10a5362fe..139c7ef0d 100644
--- a/tests/webfiori/framework/test/writers/WebServiceWritterTest.php
+++ b/tests/WebFiori/Framework/Tests/Writers/WebServiceWritterTest.php
@@ -1,8 +1,8 @@
 <?php
-namespace webfiori\framework\test\writers;
+namespace WebFiori\Framework\Test\Writers;
 
 use PHPUnit\Framework\TestCase;
-use webfiori\framework\writers\WebServiceWriter;
+use WebFiori\Framework\Writers\WebServiceWriter;
 use WebFiori\Http\AbstractWebService;
 /**
  * @author Ibrahim
@@ -14,7 +14,7 @@ class WebServiceWritterTest extends TestCase {
     public function test00() {
         $writter = new WebServiceWriter();
         $this->assertEquals('NewWebService', $writter->getName());
-        $this->assertEquals('app\\apis', $writter->getNamespace());
+        $this->assertEquals('App\\Apis', $writter->getNamespace());
         $this->assertEquals('Service', $writter->getSuffix());
         $this->assertEquals([
             "WebFiori\Http\AbstractWebService",
@@ -30,7 +30,7 @@ public function test01() {
         $writter = new WebServiceWriter();
         $writter->setClassName('SuperService');
         $this->assertEquals('SuperService', $writter->getName());
-        $this->assertEquals('app\\apis', $writter->getNamespace());
+        $this->assertEquals('App\\Apis', $writter->getNamespace());
         $this->assertEquals('Service', $writter->getSuffix());
         $this->assertEquals([
             "WebFiori\Http\AbstractWebService",
@@ -58,7 +58,7 @@ public function test02() {
         $writter = new WebServiceWriter();
         $writter->setClassName('Super2Service');
         $this->assertEquals('Super2Service', $writter->getName());
-        $this->assertEquals('app\\apis', $writter->getNamespace());
+        $this->assertEquals('App\\Apis', $writter->getNamespace());
         $this->assertEquals('Service', $writter->getSuffix());
         $this->assertEquals([
             "WebFiori\Http\AbstractWebService",
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index aa22286c9..16ef1fe6e 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -9,12 +9,12 @@
 
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Database\Schema\SchemaRunner;
-use webfiori\framework\App;
-use webfiori\framework\autoload\ClassLoader;
-use webfiori\framework\config\JsonDriver;
-use webfiori\framework\ThemeManager;
-use themes\fioriTheme\NewFTestTheme;
-use themes\fioriTheme2\NewTestTheme2;
+use WebFiori\Framework\App;
+use WebFiori\Framework\Autoload\ClassLoader;
+use WebFiori\Framework\Config\JsonDriver;
+use WebFiori\Framework\ThemeManager;
+use Themes\FioriTheme\NewFTestTheme;
+use Themes\FioriTheme2\NewTestTheme2;
 
 $DS = DIRECTORY_SEPARATOR;
 
@@ -30,8 +30,8 @@
 //WebFiori Framework might exist.
 //Add and remove directories as needed.
 $WebFioriFrameworkDirs = [
-    __DIR__.$DS.'..'.$DS.'webfiori',
-    __DIR__.$DS.'..'.$DS.'vendor'.$DS.'webfiori'.$DS.'webfiori'
+    __DIR__.$DS.'..'.$DS.'WebFiori',
+    __DIR__.$DS.'..'.$DS.'vendor'.$DS.'WebFiori'.$DS.'WebFiori'
 ];
 fprintf(STDOUT, "PHP Version: '".PHP_VERSION."'\n");
 fprintf(STDOUT, "Version ID: '".PHP_VERSION_ID."'\n");
@@ -48,7 +48,7 @@
 
     foreach ($WebFioriFrameworkDirs as $dir) {
         //linux
-        $file = $DS.$dir.'framework'.$DS.'autoload'.$DS.'ClassLoader.php';
+        $file = $DS.$dir.$DS.'Framework'.$DS.'Autoload'.$DS.'ClassLoader.php';
         fprintf(STDOUT,"Checking if file '$file' is exist...\n");
 
         if (file_exists($file)) {
@@ -62,7 +62,7 @@
 
     foreach ($WebFioriFrameworkDirs as $dir) {
         //other
-        $file = $dir.$DS.'framework'.$DS.'autoload'.$DS.'ClassLoader.php';
+        $file = $dir.$DS.'Framework'.$DS.'Autoload'.$DS.'ClassLoader.php';
         fprintf(STDOUT,"Checking if file '$file' is exist...\n");
 
         if (file_exists($file)) {
@@ -83,9 +83,10 @@
 ClassLoader::get([
     'search-folders' => [
         'tests',
-        'webfiori',
+        'WebFiori',
         'vendor',
-        'app'
+        'App',
+        'Themes'
     ],
     'define-root' => true,
     'root' => $ROOT,
@@ -94,7 +95,7 @@
 fprintf(STDOUT,'Autoloader Initialized.'."\n");
 fprintf(STDOUT,"---------------------------------\n");
 fprintf(STDOUT,"Initializing application...\n");
-App::initiate('app', 'public', $ROOT);
+App::initiate('App', 'public', $ROOT);
 App::start();
 fprintf(STDOUT,'Done.'."\n");
 fprintf(STDOUT,'Autoload Root Directory: \''.ClassLoader::get()->root().'\'.'."\n");
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 720bfee7f..61b04087b 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -5,82 +5,82 @@
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">
             
-            <file>../webfiori/framework/Access.php</file>
-            <file>../webfiori/framework/DB.php</file>
-            <file>../webfiori/framework/Language.php</file>
+            <file>../WebFiori/Framework/Access.php</file>
+            <file>../WebFiori/Framework/DB.php</file>
+            <file>../WebFiori/Framework/Language.php</file>
             
-            <file>../webfiori/framework/config/JsonDriver.php</file>
-            <file>../webfiori/framework/config/ClassDriver.php</file>
+            <file>../WebFiori/Framework/Config/JsonDriver.php</file>
+            <file>../WebFiori/Framework/Config/ClassDriver.php</file>
             
-            <file>../webfiori/framework/Privilege.php</file>
-            <file>../webfiori/framework/PrivilegesGroup.php</file>
-            <file>../webfiori/framework/User.php</file>
-            <file>../webfiori/framework/Theme.php</file>
+            <file>../WebFiori/Framework/Privilege.php</file>
+            <file>../WebFiori/Framework/PrivilegesGroup.php</file>
+            <file>../WebFiori/Framework/User.php</file>
+            <file>../WebFiori/Framework/Theme.php</file>
             
-            <file>../webfiori/framework/ui/BeforeRenderCallback.php</file>
-            <file>../webfiori/framework/ui/WebPage.php</file>
+            <file>../WebFiori/Framework/ui/BeforeRenderCallback.php</file>
+            <file>../WebFiori/Framework/ui/WebPage.php</file>
             
-            <file>../webfiori/framework/scheduler/BaseTask.php</file>
-            <file>../webfiori/framework/scheduler/AbstractTask.php</file>
-            <file>../webfiori/framework/scheduler/TasksManager.php</file>
-            <file>../webfiori/framework/scheduler/TaskArgument.php</file>
+            <file>../WebFiori/Framework/Scheduler/BaseTask.php</file>
+            <file>../WebFiori/Framework/Scheduler/AbstractTask.php</file>
+            <file>../WebFiori/Framework/Scheduler/TasksManager.php</file>
+            <file>../WebFiori/Framework/Scheduler/TaskArgument.php</file>
             
-            <file>../webfiori/framework/router/RouterUri.php</file>
-            <file>../webfiori/framework/router/Router.php</file>
+            <file>../WebFiori/Framework/Router/RouterUri.php</file>
+            <file>../WebFiori/Framework/Router/Router.php</file>
             
-            <file>../webfiori/framework/middleware/AbstractMiddleware.php</file>
-            <file>../webfiori/framework/middleware/MiddlewareManager.php</file>
-            <file>../webfiori/framework/middleware/CacheMiddleware.php</file>
-            <file>../webfiori/framework/middleware/StartSessionMiddleware.php</file>
+            <file>../WebFiori/Framework/Middleware/AbstractMiddleware.php</file>
+            <file>../WebFiori/Framework/Middleware/MiddlewareManager.php</file>
+            <file>../WebFiori/Framework/Middleware/CacheMiddleware.php</file>
+            <file>../WebFiori/Framework/Middleware/StartSessionMiddleware.php</file>
             
-            <file>../webfiori/framework/session/Session.php</file>
-            <file>../webfiori/framework/session/SessionsManager.php</file>
-            <file>../webfiori/framework/session/DefaultSessionStorage.php</file>
-            <file>../webfiori/framework/session/DatabaseSessionStorage.php</file>
-            <file>../webfiori/framework/session/SessionDB.php</file>
+            <file>../WebFiori/Framework/Session/Session.php</file>
+            <file>../WebFiori/Framework/Session/SessionsManager.php</file>
+            <file>../WebFiori/Framework/Session/DefaultSessionStorage.php</file>
+            <file>../WebFiori/Framework/Session/DatabaseSessionStorage.php</file>
+            <file>../WebFiori/Framework/Session/SessionDB.php</file>
             
-            <file>../webfiori/framework/cli/commands/AddCommand.php</file>
-            <file>../webfiori/framework/cli/commands/CreateCommand.php</file>
-            <file>../webfiori/framework/cli/commands/ListRoutesCommand.php</file>
-            <file>../webfiori/framework/cli/commands/ListThemesCommand.php</file>
-            <file>../webfiori/framework/cli/commands/RunSQLQueryCommand.php</file>
-            <file>../webfiori/framework/cli/commands/SchedulerCommand.php</file>
-            <file>../webfiori/framework/cli/commands/SettingsCommand.php</file>
-            <file>../webfiori/framework/cli/commands/UpdateSettingsCommand.php</file>
-            <file>../webfiori/framework/cli/commands/UpdateTableCommand.php</file>
-            <file>../webfiori/framework/cli/commands/VersionCommand.php</file>
-            <file>../webfiori/framework/cli/commands/WHelpCommand.php</file>
-            <file>../webfiori/framework/cli/commands/RunMigrationsCommand.php</file>
-            <file>../webfiori/framework/cli/CLITestCase.php</file>
-            <file>../webfiori/framework/cli/CLIUtils.php</file>
+            <file>../WebFiori/Framework/Cli/Commands/AddCommand.php</file>
+            <file>../WebFiori/Framework/Cli/Commands/CreateCommand.php</file>
+            <file>../WebFiori/Framework/Cli/Commands/ListRoutesCommand.php</file>
+            <file>../WebFiori/Framework/Cli/Commands/ListThemesCommand.php</file>
+            <file>../WebFiori/Framework/Cli/Commands/RunSQLQueryCommand.php</file>
+            <file>../WebFiori/Framework/Cli/Commands/SchedulerCommand.php</file>
+            <file>../WebFiori/Framework/Cli/Commands/SettingsCommand.php</file>
+            <file>../WebFiori/Framework/Cli/Commands/UpdateSettingsCommand.php</file>
+            <file>../WebFiori/Framework/Cli/Commands/UpdateTableCommand.php</file>
+            <file>../WebFiori/Framework/Cli/Commands/VersionCommand.php</file>
+            <file>../WebFiori/Framework/Cli/Commands/WHelpCommand.php</file>
+            <file>../WebFiori/Framework/Cli/Commands/RunMigrationsCommand.php</file>
+            <file>../WebFiori/Framework/cli/CLITestCase.php</file>
+            <file>../WebFiori/Framework/cli/CLIUtils.php</file>
             
-            <file>../webfiori/framework/cli/helpers/ClassInfoReader.php</file>
-            <file>../webfiori/framework/cli/helpers/CreateBackgroundTask.php</file>
-            <file>../webfiori/framework/cli/helpers/CreateCLIClassHelper.php</file>
-            <file>../webfiori/framework/cli/helpers/CreateClassHelper.php</file>
-            <file>../webfiori/framework/cli/helpers/CreateDBAccessHelper.php</file>
-            <file>../webfiori/framework/cli/helpers/CreateFullRESTHelper.php</file>
-            <file>../webfiori/framework/cli/helpers/CreateMiddleware.php</file>
-            <file>../webfiori/framework/cli/helpers/CreateTableObj.php</file>
-            <file>../webfiori/framework/cli/helpers/CreateThemeHelper.php</file>
-            <file>../webfiori/framework/cli/helpers/CreateWebService.php</file>
-            <file>../webfiori/framework/cli/helpers/TableObjHelper.php</file>
-            <file>../webfiori/framework/cli/helpers/CreateAPITestCase.php</file>
-            <file>../webfiori/framework/cli/helpers/CreateMigration.php</file>
+            <file>../WebFiori/Framework/Cli/Helpers/ClassInfoReader.php</file>
+            <file>../WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php</file>
+            <file>../WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php</file>
+            <file>../WebFiori/Framework/Cli/Helpers/CreateClassHelper.php</file>
+            <file>../WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php</file>
+            <file>../WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php</file>
+            <file>../WebFiori/Framework/Cli/Helpers/CreateMiddleware.php</file>
+            <file>../WebFiori/Framework/Cli/Helpers/CreateTableObj.php</file>
+            <file>../WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php</file>
+            <file>../WebFiori/Framework/Cli/Helpers/CreateWebService.php</file>
+            <file>../WebFiori/Framework/Cli/Helpers/TableObjHelper.php</file>
+            <file>../WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php</file>
+            <file>../WebFiori/Framework/Cli/Helpers/CreateMigration.php</file>
             
             
-            <file>../webfiori/framework/writers/CLICommandClassWriter.php</file>
-            <file>../webfiori/framework/writers/ClassWriter.php</file>
-            <file>../webfiori/framework/writers/DBClassWriter.php</file>
-            <file>../webfiori/framework/writers/LangClassWriter.php</file>
-            <file>../webfiori/framework/writers/MiddlewareClassWriter.php</file>
-            <file>../webfiori/framework/writers/SchedulerTaskClassWriter.php</file>
-            <file>../webfiori/framework/writers/TableClassWriter.php</file>
-            <file>../webfiori/framework/writers/ThemeClassWriter.php</file>
-            <file>../webfiori/framework/writers/ThemeComponentWriter.php</file>
-            <file>../webfiori/framework/writers/WebServiceWriter.php</file>
-            <file>../webfiori/framework/writers/APITestCaseWriter.php</file>
-            <file>../webfiori/framework/writers/DatabaseMigrationWriter.php</file>
+            <file>../WebFiori/Framework/Writers/CLICommandClassWriter.php</file>
+            <file>../WebFiori/Framework/Writers/ClassWriter.php</file>
+            <file>../WebFiori/Framework/Writers/DBClassWriter.php</file>
+            <file>../WebFiori/Framework/Writers/LangClassWriter.php</file>
+            <file>../WebFiori/Framework/Writers/MiddlewareClassWriter.php</file>
+            <file>../WebFiori/Framework/Writers/SchedulerTaskClassWriter.php</file>
+            <file>../WebFiori/Framework/Writers/TableClassWriter.php</file>
+            <file>../WebFiori/Framework/Writers/ThemeClassWriter.php</file>
+            <file>../WebFiori/Framework/Writers/ThemeComponentWriter.php</file>
+            <file>../WebFiori/Framework/Writers/WebServiceWriter.php</file>
+            <file>../WebFiori/Framework/Writers/APITestCaseWriter.php</file>
+            <file>../WebFiori/Framework/Writers/DatabaseMigrationWriter.php</file>
             
         </whitelist>
     </filter>
@@ -89,42 +89,42 @@
     </logging>
     <testsuites>
         <testsuite name="General Tests">
-            <directory>./webfiori/framework/test</directory>
-            <exclude>./webfiori/framework/test/langs</exclude>
-            <exclude>./webfiori/framework/test/router</exclude>
-            <exclude>./webfiori/framework/test/mail</exclude>
-            <exclude>./webfiori/framework/test/writers</exclude>
-            <exclude>./webfiori/framework/test/cli</exclude>
-            <exclude>./webfiori/framework/test/theme</exclude>
-            <exclude>./webfiori/framework/test/scheduler</exclude>
-            <exclude>./webfiori/framework/test/session</exclude>
+            <directory>./WebFiori/Framework/Tests</directory>
+            <exclude>./WebFiori/Framework/Tests/Langs</exclude>
+            <exclude>./WebFiori/Framework/Tests/Router</exclude>
+            <exclude>./WebFiori/Framework/Tests/Mail</exclude>
+            <exclude>./WebFiori/Framework/Tests/Writers</exclude>
+            <exclude>./WebFiori/Framework/Tests/Cli</exclude>
+            <exclude>./WebFiori/Framework/Tests/Theme</exclude>
+            <exclude>./WebFiori/Framework/Tests/Scheduler</exclude>
+            <exclude>./WebFiori/Framework/Tests/Session</exclude>
         </testsuite>
         <testsuite name="Database Tests">
-            <file>./webfiori/framework/test/DBTest.php</file>
+            <file>./WebFiori/Framework/Tests/DBTest.php</file>
         </testsuite>
         <testsuite name="I18n Tests">
-            <directory>./webfiori/framework/test/langs</directory>
+            <directory>./WebFiori/Framework/Tests/Langs</directory>
         </testsuite>
         <testsuite name="Router Tests">
-            <directory>./webfiori/framework/test/router</directory>
+            <directory>./WebFiori/Framework/Tests/Router</directory>
         </testsuite>
         <testsuite name="EMail Tests">
-            <directory>./webfiori/framework/test/mail</directory>
+            <directory>./WebFiori/Framework/Tests/Mail</directory>
         </testsuite>
         <testsuite name="Writers Tests">
-            <directory>./webfiori/framework/test/writers</directory>
+            <directory>./WebFiori/Framework/Tests/Writers</directory>
         </testsuite>
         <testsuite name="CLI Tests">
-            <directory>./webfiori/framework/test/cli</directory>
+            <directory>./WebFiori/Framework/Tests/Cli</directory>
         </testsuite>
         <testsuite name="Themes Tests">
-            <directory>./webfiori/framework/test/theme</directory>
+            <directory>./WebFiori/Framework/Tests/Theme</directory>
         </testsuite>
         <testsuite name="Scheduler Tests">
-            <directory>./webfiori/framework/test/scheduler</directory>
+            <directory>./WebFiori/Framework/Tests/Scheduler</directory>
         </testsuite>
         <testsuite name="Session Tests">
-            <directory>./webfiori/framework/test/session</directory>
+            <directory>./WebFiori/Framework/Tests/Session</directory>
         </testsuite>
     </testsuites>
 </phpunit>
\ No newline at end of file
diff --git a/tests/phpunit10.xml b/tests/phpunit10.xml
index b9b55e805..ff5539c00 100644
--- a/tests/phpunit10.xml
+++ b/tests/phpunit10.xml
@@ -10,111 +10,111 @@
   <logging/>
   <testsuites>
     <testsuite name="General Tests">
-      <directory>./webfiori/framework/test</directory>
-      <exclude>./webfiori/framework/test/theme</exclude>
-      <exclude>./webfiori/framework/test/cli</exclude>
-      <exclude>./webfiori/framework/test/langs</exclude>
-      <exclude>./webfiori/framework/test/router</exclude>
-      <exclude>./webfiori/framework/test/mail</exclude>
-      <exclude>./webfiori/framework/test/writers</exclude>
-      <exclude>./webfiori/framework/test/scheduler</exclude>
-      <exclude>./webfiori/framework/test/session</exclude>
+      <directory>./WebFiori/Framework/Tests</directory>
+      <exclude>./WebFiori/Framework/Tests/Theme</exclude>
+      <exclude>./WebFiori/Framework/Tests/Cli</exclude>
+      <exclude>./WebFiori/Framework/Tests/Langs</exclude>
+      <exclude>./WebFiori/Framework/Tests/Router</exclude>
+      <exclude>./WebFiori/Framework/Tests/Mail</exclude>
+      <exclude>./WebFiori/Framework/Tests/Writers</exclude>
+      <exclude>./WebFiori/Framework/Tests/Scheduler</exclude>
+      <exclude>./WebFiori/Framework/Tests/Session</exclude>
     </testsuite>
     <testsuite name="Database Tests">
-      <file>./webfiori/framework/test/DBTest.php</file>
+      <file>./WebFiori/Framework/Tests/DBTest.php</file>
     </testsuite>
     <testsuite name="I18n Tests">
-      <directory>./webfiori/framework/test/langs</directory>
+      <directory>./WebFiori/Framework/Tests/Langs</directory>
     </testsuite>
     <testsuite name="Router Tests">
-      <directory>./webfiori/framework/test/router</directory>
+      <directory>./WebFiori/Framework/Tests/Router</directory>
     </testsuite>
     <testsuite name="EMail Tests">
-      <directory>./webfiori/framework/test/mail</directory>
+      <directory>./WebFiori/Framework/Tests/Mail</directory>
     </testsuite>
     <testsuite name="Writers Tests">
-      <directory>./webfiori/framework/test/writers</directory>
+      <directory>./WebFiori/Framework/Tests/Writers</directory>
     </testsuite>
     <testsuite name="CLI Tests">
-      <directory>./webfiori/framework/test/cli</directory>
+      <directory>./WebFiori/Framework/Tests/Cli</directory>
     </testsuite>
     <testsuite name="Themes Tests">
-      <directory>./webfiori/framework/test/theme</directory>
+      <directory>./WebFiori/Framework/Tests/Theme</directory>
     </testsuite>
     <testsuite name="Scheduler Tests">
-      <directory>./webfiori/framework/test/scheduler</directory>
+      <directory>./WebFiori/Framework/Tests/Scheduler</directory>
     </testsuite>
     <testsuite name="Session Tests">
-      <directory>./webfiori/framework/test/session</directory>
+      <directory>./WebFiori/Framework/Tests/Session</directory>
     </testsuite>
   </testsuites>
   <source>
     <include>
-      <file>../webfiori/framework/Access.php</file>
-      <file>../webfiori/framework/DB.php</file>
-      <file>../webfiori/framework/Language.php</file>
-      <file>../webfiori/framework/config/JsonDriver.php</file>
-      <file>../webfiori/framework/config/ClassDriver.php</file>
-      <file>../webfiori/framework/Privilege.php</file>
-      <file>../webfiori/framework/PrivilegesGroup.php</file>
-      <file>../webfiori/framework/User.php</file>
-      <file>../webfiori/framework/Theme.php</file>
-      <file>../webfiori/framework/ui/BeforeRenderCallback.php</file>
-      <file>../webfiori/framework/ui/WebPage.php</file>
-      <file>../webfiori/framework/scheduler/BaseTask.php</file>
-      <file>../webfiori/framework/scheduler/AbstractTask.php</file>
-      <file>../webfiori/framework/scheduler/TasksManager.php</file>
-      <file>../webfiori/framework/scheduler/TaskArgument.php</file>
-      <file>../webfiori/framework/router/RouterUri.php</file>
-      <file>../webfiori/framework/router/Router.php</file>
-      <file>../webfiori/framework/middleware/AbstractMiddleware.php</file>
-      <file>../webfiori/framework/middleware/MiddlewareManager.php</file>
-      <file>../webfiori/framework/middleware/CacheMiddleware.php</file>
-      <file>../webfiori/framework/middleware/StartSessionMiddleware.php</file>
-      <file>../webfiori/framework/session/Session.php</file>
-      <file>../webfiori/framework/session/SessionsManager.php</file>
-      <file>../webfiori/framework/session/DefaultSessionStorage.php</file>
-      <file>../webfiori/framework/session/DatabaseSessionStorage.php</file>
-      <file>../webfiori/framework/session/SessionDB.php</file>
-      <file>../webfiori/framework/cli/commands/AddCommand.php</file>
-      <file>../webfiori/framework/cli/commands/CreateCommand.php</file>
-      <file>../webfiori/framework/cli/commands/ListRoutesCommand.php</file>
-      <file>../webfiori/framework/cli/commands/ListThemesCommand.php</file>
-      <file>../webfiori/framework/cli/commands/RunSQLQueryCommand.php</file>
-      <file>../webfiori/framework/cli/commands/SchedulerCommand.php</file>
-      <file>../webfiori/framework/cli/commands/SettingsCommand.php</file>
-      <file>../webfiori/framework/cli/commands/UpdateSettingsCommand.php</file>
-      <file>../webfiori/framework/cli/commands/UpdateTableCommand.php</file>
-      <file>../webfiori/framework/cli/commands/VersionCommand.php</file>
-      <file>../webfiori/framework/cli/commands/WHelpCommand.php</file>
-      <file>../webfiori/framework/cli/commands/RunMigrationsCommand.php</file>
-      <file>../webfiori/framework/cli/CLITestCase.php</file>
-      <file>../webfiori/framework/cli/CLIUtils.php</file>
-      <file>../webfiori/framework/cli/helpers/ClassInfoReader.php</file>
-      <file>../webfiori/framework/cli/helpers/CreateBackgroundTask.php</file>
-      <file>../webfiori/framework/cli/helpers/CreateCLIClassHelper.php</file>
-      <file>../webfiori/framework/cli/helpers/CreateClassHelper.php</file>
-      <file>../webfiori/framework/cli/helpers/CreateDBAccessHelper.php</file>
-      <file>../webfiori/framework/cli/helpers/CreateFullRESTHelper.php</file>
-      <file>../webfiori/framework/cli/helpers/CreateMiddleware.php</file>
-      <file>../webfiori/framework/cli/helpers/CreateTableObj.php</file>
-      <file>../webfiori/framework/cli/helpers/CreateThemeHelper.php</file>
-      <file>../webfiori/framework/cli/helpers/CreateWebService.php</file>
-      <file>../webfiori/framework/cli/helpers/TableObjHelper.php</file>
-      <file>../webfiori/framework/cli/helpers/CreateAPITestCase.php</file>
-      <file>../webfiori/framework/cli/helpers/CreateMigration.php</file>
-      <file>../webfiori/framework/writers/CLICommandClassWriter.php</file>
-      <file>../webfiori/framework/writers/ClassWriter.php</file>
-      <file>../webfiori/framework/writers/DBClassWriter.php</file>
-      <file>../webfiori/framework/writers/LangClassWriter.php</file>
-      <file>../webfiori/framework/writers/MiddlewareClassWriter.php</file>
-      <file>../webfiori/framework/writers/SchedulerTaskClassWriter.php</file>
-      <file>../webfiori/framework/writers/TableClassWriter.php</file>
-      <file>../webfiori/framework/writers/ThemeClassWriter.php</file>
-      <file>../webfiori/framework/writers/ThemeComponentWriter.php</file>
-      <file>../webfiori/framework/writers/WebServiceWriter.php</file>
-      <file>../webfiori/framework/writers/APITestCaseWriter.php</file>
-      <file>../webfiori/framework/writers/DatabaseMigrationWriter.php</file>
+      <file>../WebFiori/Framework/Access.php</file>
+      <file>../WebFiori/Framework/DB.php</file>
+      <file>../WebFiori/Framework/Language.php</file>
+      <file>../WebFiori/Framework/Config/JsonDriver.php</file>
+      <file>../WebFiori/Framework/Config/ClassDriver.php</file>
+      <file>../WebFiori/Framework/Privilege.php</file>
+      <file>../WebFiori/Framework/PrivilegesGroup.php</file>
+      <file>../WebFiori/Framework/User.php</file>
+      <file>../WebFiori/Framework/Theme.php</file>
+      <file>../WebFiori/Framework/ui/BeforeRenderCallback.php</file>
+      <file>../WebFiori/Framework/ui/WebPage.php</file>
+      <file>../WebFiori/Framework/Scheduler/BaseTask.php</file>
+      <file>../WebFiori/Framework/Scheduler/AbstractTask.php</file>
+      <file>../WebFiori/Framework/Scheduler/TasksManager.php</file>
+      <file>../WebFiori/Framework/Scheduler/TaskArgument.php</file>
+      <file>../WebFiori/Framework/Router/RouterUri.php</file>
+      <file>../WebFiori/Framework/Router/Router.php</file>
+      <file>../WebFiori/Framework/Middleware/AbstractMiddleware.php</file>
+      <file>../WebFiori/Framework/Middleware/MiddlewareManager.php</file>
+      <file>../WebFiori/Framework/Middleware/CacheMiddleware.php</file>
+      <file>../WebFiori/Framework/Middleware/StartSessionMiddleware.php</file>
+      <file>../WebFiori/Framework/Session/Session.php</file>
+      <file>../WebFiori/Framework/Session/SessionsManager.php</file>
+      <file>../WebFiori/Framework/Session/DefaultSessionStorage.php</file>
+      <file>../WebFiori/Framework/Session/DatabaseSessionStorage.php</file>
+      <file>../WebFiori/Framework/Session/SessionDB.php</file>
+      <file>../WebFiori/Framework/Cli/Commands/AddCommand.php</file>
+      <file>../WebFiori/Framework/Cli/Commands/CreateCommand.php</file>
+      <file>../WebFiori/Framework/Cli/Commands/ListRoutesCommand.php</file>
+      <file>../WebFiori/Framework/Cli/Commands/ListThemesCommand.php</file>
+      <file>../WebFiori/Framework/Cli/Commands/RunSQLQueryCommand.php</file>
+      <file>../WebFiori/Framework/Cli/Commands/SchedulerCommand.php</file>
+      <file>../WebFiori/Framework/Cli/Commands/SettingsCommand.php</file>
+      <file>../WebFiori/Framework/Cli/Commands/UpdateSettingsCommand.php</file>
+      <file>../WebFiori/Framework/Cli/Commands/UpdateTableCommand.php</file>
+      <file>../WebFiori/Framework/Cli/Commands/VersionCommand.php</file>
+      <file>../WebFiori/Framework/Cli/Commands/WHelpCommand.php</file>
+      <file>../WebFiori/Framework/Cli/Commands/RunMigrationsCommand.php</file>
+      <file>../WebFiori/Framework/Cli/CLITestCase.php</file>
+      <file>../WebFiori/Framework/Cli/CLIUtils.php</file>
+      <file>../WebFiori/Framework/Cli/Helpers/ClassInfoReader.php</file>
+      <file>../WebFiori/Framework/Cli/Helpers/CreateBackgroundTask.php</file>
+      <file>../WebFiori/Framework/Cli/Helpers/CreateCLIClassHelper.php</file>
+      <file>../WebFiori/Framework/Cli/Helpers/CreateClassHelper.php</file>
+      <file>../WebFiori/Framework/Cli/Helpers/CreateDBAccessHelper.php</file>
+      <file>../WebFiori/Framework/Cli/Helpers/CreateFullRESTHelper.php</file>
+      <file>../WebFiori/Framework/Cli/Helpers/CreateMiddleware.php</file>
+      <file>../WebFiori/Framework/Cli/Helpers/CreateTableObj.php</file>
+      <file>../WebFiori/Framework/Cli/Helpers/CreateThemeHelper.php</file>
+      <file>../WebFiori/Framework/Cli/Helpers/CreateWebService.php</file>
+      <file>../WebFiori/Framework/Cli/Helpers/TableObjHelper.php</file>
+      <file>../WebFiori/Framework/Cli/Helpers/CreateAPITestCase.php</file>
+      <file>../WebFiori/Framework/Cli/Helpers/CreateMigration.php</file>
+      <file>../WebFiori/Framework/Writers/CLICommandClassWriter.php</file>
+      <file>../WebFiori/Framework/Writers/ClassWriter.php</file>
+      <file>../WebFiori/Framework/Writers/DBClassWriter.php</file>
+      <file>../WebFiori/Framework/Writers/LangClassWriter.php</file>
+      <file>../WebFiori/Framework/Writers/MiddlewareClassWriter.php</file>
+      <file>../WebFiori/Framework/Writers/SchedulerTaskClassWriter.php</file>
+      <file>../WebFiori/Framework/Writers/TableClassWriter.php</file>
+      <file>../WebFiori/Framework/Writers/ThemeClassWriter.php</file>
+      <file>../WebFiori/Framework/Writers/ThemeComponentWriter.php</file>
+      <file>../WebFiori/Framework/Writers/WebServiceWriter.php</file>
+      <file>../WebFiori/Framework/Writers/APITestCaseWriter.php</file>
+      <file>../WebFiori/Framework/Writers/DatabaseMigrationWriter.php</file>
     </include>
   </source>
 </phpunit>
diff --git a/tests/webfiori/framework/scheduler/webServices/temp b/tests/webfiori/framework/scheduler/webServices/temp
deleted file mode 100644
index 8b1378917..000000000
--- a/tests/webfiori/framework/scheduler/webServices/temp
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/webfiori/framework/test/cli/DBClassWritterTest.php b/tests/webfiori/framework/test/cli/DBClassWritterTest.php
deleted file mode 100644
index 2f520d683..000000000
--- a/tests/webfiori/framework/test/cli/DBClassWritterTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-namespace webfiori\framework\test\cli;
-
-use tables\EmployeeInfoTable;
-use tables\PositionInfoTable;
-use tables\UserInfoTable;
-use webfiori\framework\cli\CLITestCase;
-use webfiori\framework\writers\DBClassWriter;
-
-/**
- * Description of DBClassWritterTest
- *
- * @author Ibrahim
- */
-class DBClassWritterTest extends CLITestCase {
-    /**
-     * @test
-     */
-    public function test00() {
-        $table = new UserInfoTable();
-        $mapper = $table->getEntityMapper();
-        $mapper->setEntityName('CoolUser');
-        $mapper->setNamespace('webfiori\\entity');
-        $writter = new DBClassWriter('UserDBClass', 'webfiori\\db', $table);
-        $writter->writeClass();
-        $this->assertTrue(class_exists($writter->getName(true)));
-        $this->removeClass($writter->getName(true));
-    }
-    
-    /**
-     * @test
-     */
-    public function test01() {
-        $table = new EmployeeInfoTable();
-        $mapper = $table->getEntityMapper();
-        $mapper->setEntityName('Employee');
-        $mapper->setNamespace('webfiori\\entity');
-        $writter = new DBClassWriter('EmployeeDB', 'webfiori\\db', $table);
-        $writter->writeClass();
-        $this->assertTrue(class_exists($writter->getName(true)));
-        $this->removeClass($writter->getName(true));
-    }
-    
-    /**
-     * @test
-     */
-    public function test02() {
-        $table = new PositionInfoTable();
-        $mapper = $table->getEntityMapper();
-        $mapper->setEntityName('Position');
-        $mapper->setNamespace('webfiori\\entity');
-        $writter = new DBClassWriter('PositionDB', 'webfiori\\db', $table);
-        $writter->writeClass();
-        $this->assertTrue(class_exists($writter->getName(true)));
-        $this->removeClass($writter->getName(true));
-    }
-    
-    /**
-     * @test
-     */
-    public function test03() {
-        $table = new PositionInfoTable();
-        $writter = new DBClassWriter('PositionDB2', 'webfiori\\db', $table);
-        $writter->setConnection('  ');
-        $this->assertNull($writter->getConnectionName());
-        $writter->setConnection('ok-connection');
-        $this->assertEquals('ok-connection', $writter->getConnectionName());
-        $writter->includeColumnsUpdate();
-        $writter->writeClass();
-        $this->assertTrue(class_exists($writter->getName(true)));
-        $this->removeClass($writter->getName(true));
-    }
-}
diff --git a/themes/fiori/.gitkeep b/themes/fiori/.gitkeep
deleted file mode 100644
index 8b1378917..000000000
--- a/themes/fiori/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/webfiori/db/temp b/webfiori/db/temp
deleted file mode 100644
index 8b1378917..000000000
--- a/webfiori/db/temp
+++ /dev/null
@@ -1 +0,0 @@
-