diff --git a/.gitignore b/.gitignore
index ba89046..f5d6a52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,20 +14,20 @@ tests/README.md
 vendor/
 writable/
 
-application/index.html
-application/.htaccess
+app/index.html
+app/.htaccess
 
-application/Config/
-!application/Config/Aauth.php
+app/Config/*
+!app/Config/Aauth.php
 
-application/Filters/Throttle.php
-application/Filters/Honeypot.php
-application/Filters/CSRF.php
-application/Filters/DebugToolbar.php
+app/Filters/Throttle.php
+app/Filters/Honeypot.php
+app/Filters/CSRF.php
+app/Filters/DebugToolbar.php
 
-application/Views/errors/
-application/Views/welcome_message.php
-application/Views/form.php
+app/Views/errors/
+app/Views/welcome_message.php
+app/Views/form.php
 
 composer.lock
 spark
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59f2eb3..95d9188 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ variables:
   # Configure mysql environment variables (https://hub.docker.com/r/_/mysql/)
   MYSQL_DATABASE: aauth_v3_ci4_testing
   MYSQL_ROOT_PASSWORD: root
-  CODEIGNITER_VERSION: '4.0.0-alpha.3'
+  CODEIGNITER_VERSION: '4.0.0-alpha.4'
 
 # Run our tests
 # If Xdebug was installed you can generate a coverage report and see code coverage metrics.
diff --git a/application/Config/Aauth.php b/app/Config/Aauth.php
similarity index 100%
rename from application/Config/Aauth.php
rename to app/Config/Aauth.php
diff --git a/application/Controllers/Account/Edit.php b/app/Controllers/Account/Edit.php
similarity index 100%
rename from application/Controllers/Account/Edit.php
rename to app/Controllers/Account/Edit.php
diff --git a/application/Controllers/Account/Home.php b/app/Controllers/Account/Home.php
similarity index 100%
rename from application/Controllers/Account/Home.php
rename to app/Controllers/Account/Home.php
diff --git a/application/Controllers/Account/Login.php b/app/Controllers/Account/Login.php
similarity index 100%
rename from application/Controllers/Account/Login.php
rename to app/Controllers/Account/Login.php
diff --git a/application/Controllers/Account/Logout.php b/app/Controllers/Account/Logout.php
similarity index 100%
rename from application/Controllers/Account/Logout.php
rename to app/Controllers/Account/Logout.php
diff --git a/application/Controllers/Account/Register.php b/app/Controllers/Account/Register.php
similarity index 100%
rename from application/Controllers/Account/Register.php
rename to app/Controllers/Account/Register.php
diff --git a/application/Controllers/Account/Remind_password.php b/app/Controllers/Account/Remind_password.php
similarity index 100%
rename from application/Controllers/Account/Remind_password.php
rename to app/Controllers/Account/Remind_password.php
diff --git a/application/Controllers/Account/Reset_password.php b/app/Controllers/Account/Reset_password.php
similarity index 100%
rename from application/Controllers/Account/Reset_password.php
rename to app/Controllers/Account/Reset_password.php
diff --git a/application/Controllers/Account/Verification.php b/app/Controllers/Account/Verification.php
similarity index 100%
rename from application/Controllers/Account/Verification.php
rename to app/Controllers/Account/Verification.php
diff --git a/application/Controllers/Admin/Home.php b/app/Controllers/Admin/Home.php
similarity index 100%
rename from application/Controllers/Admin/Home.php
rename to app/Controllers/Admin/Home.php
diff --git a/application/Controllers/Admin/Migrate.php b/app/Controllers/Admin/Migrate.php
similarity index 100%
rename from application/Controllers/Admin/Migrate.php
rename to app/Controllers/Admin/Migrate.php
diff --git a/application/Controllers/Admin/Users.php b/app/Controllers/Admin/Users.php
similarity index 100%
rename from application/Controllers/Admin/Users.php
rename to app/Controllers/Admin/Users.php
diff --git a/application/Controllers/Home.php b/app/Controllers/Home.php
similarity index 100%
rename from application/Controllers/Home.php
rename to app/Controllers/Home.php
diff --git a/application/Database/Migrations/20181026042034_create_ci_sessions_table.php b/app/Database/Migrations/20181026042034_create_ci_sessions_table.php
similarity index 100%
rename from application/Database/Migrations/20181026042034_create_ci_sessions_table.php
rename to app/Database/Migrations/20181026042034_create_ci_sessions_table.php
diff --git a/application/Database/Migrations/20181026110732_create_users_table.php b/app/Database/Migrations/20181026110732_create_users_table.php
similarity index 100%
rename from application/Database/Migrations/20181026110732_create_users_table.php
rename to app/Database/Migrations/20181026110732_create_users_table.php
diff --git a/application/Database/Migrations/20181031062503_create_user_variables.php b/app/Database/Migrations/20181031062503_create_user_variables.php
similarity index 100%
rename from application/Database/Migrations/20181031062503_create_user_variables.php
rename to app/Database/Migrations/20181031062503_create_user_variables.php
diff --git a/application/Database/Migrations/20181031063113_create_login_attempts.php b/app/Database/Migrations/20181031063113_create_login_attempts.php
similarity index 100%
rename from application/Database/Migrations/20181031063113_create_login_attempts.php
rename to app/Database/Migrations/20181031063113_create_login_attempts.php
diff --git a/application/Database/Migrations/20181031063642_create_login_tokens.php b/app/Database/Migrations/20181031063642_create_login_tokens.php
similarity index 100%
rename from application/Database/Migrations/20181031063642_create_login_tokens.php
rename to app/Database/Migrations/20181031063642_create_login_tokens.php
diff --git a/application/Database/Migrations/20181031064211_create_groups.php b/app/Database/Migrations/20181031064211_create_groups.php
similarity index 100%
rename from application/Database/Migrations/20181031064211_create_groups.php
rename to app/Database/Migrations/20181031064211_create_groups.php
diff --git a/application/Database/Migrations/20181031064431_create_group_to_user.php b/app/Database/Migrations/20181031064431_create_group_to_user.php
similarity index 100%
rename from application/Database/Migrations/20181031064431_create_group_to_user.php
rename to app/Database/Migrations/20181031064431_create_group_to_user.php
diff --git a/application/Database/Migrations/20181031064550_create_group_to_group.php b/app/Database/Migrations/20181031064550_create_group_to_group.php
similarity index 100%
rename from application/Database/Migrations/20181031064550_create_group_to_group.php
rename to app/Database/Migrations/20181031064550_create_group_to_group.php
diff --git a/application/Database/Migrations/20181031064714_create_perms.php b/app/Database/Migrations/20181031064714_create_perms.php
similarity index 100%
rename from application/Database/Migrations/20181031064714_create_perms.php
rename to app/Database/Migrations/20181031064714_create_perms.php
diff --git a/application/Database/Migrations/20181031065111_create_perm_to_user.php b/app/Database/Migrations/20181031065111_create_perm_to_user.php
similarity index 100%
rename from application/Database/Migrations/20181031065111_create_perm_to_user.php
rename to app/Database/Migrations/20181031065111_create_perm_to_user.php
diff --git a/application/Database/Migrations/20181031065240_create_perm_to_group.php b/app/Database/Migrations/20181031065240_create_perm_to_group.php
similarity index 100%
rename from application/Database/Migrations/20181031065240_create_perm_to_group.php
rename to app/Database/Migrations/20181031065240_create_perm_to_group.php
diff --git a/application/Database/Migrations/20181031072542_create_default_groups.php b/app/Database/Migrations/20181031072542_create_default_groups.php
similarity index 100%
rename from application/Database/Migrations/20181031072542_create_default_groups.php
rename to app/Database/Migrations/20181031072542_create_default_groups.php
diff --git a/application/Database/Migrations/20181031072914_create_default_users.php b/app/Database/Migrations/20181031072914_create_default_users.php
similarity index 100%
rename from application/Database/Migrations/20181031072914_create_default_users.php
rename to app/Database/Migrations/20181031072914_create_default_users.php
diff --git a/application/Helpers/aauth_helper.php b/app/Helpers/aauth_helper.php
similarity index 100%
rename from application/Helpers/aauth_helper.php
rename to app/Helpers/aauth_helper.php
diff --git a/application/Language/de/Aauth.php b/app/Language/de/Aauth.php
similarity index 100%
rename from application/Language/de/Aauth.php
rename to app/Language/de/Aauth.php
diff --git a/application/Language/en/Aauth.php b/app/Language/en/Aauth.php
similarity index 100%
rename from application/Language/en/Aauth.php
rename to app/Language/en/Aauth.php
diff --git a/application/Language/en/Account.php b/app/Language/en/Account.php
similarity index 100%
rename from application/Language/en/Account.php
rename to app/Language/en/Account.php
diff --git a/application/Language/en/Admin.php b/app/Language/en/Admin.php
similarity index 100%
rename from application/Language/en/Admin.php
rename to app/Language/en/Admin.php
diff --git a/application/Language/es/Aauth.php b/app/Language/es/Aauth.php
similarity index 100%
rename from application/Language/es/Aauth.php
rename to app/Language/es/Aauth.php
diff --git a/application/Language/fa/Aauth.php b/app/Language/fa/Aauth.php
similarity index 100%
rename from application/Language/fa/Aauth.php
rename to app/Language/fa/Aauth.php
diff --git a/application/Language/fr/Aauth.php b/app/Language/fr/Aauth.php
similarity index 100%
rename from application/Language/fr/Aauth.php
rename to app/Language/fr/Aauth.php
diff --git a/application/Language/id/Aauth.php b/app/Language/id/Aauth.php
similarity index 100%
rename from application/Language/id/Aauth.php
rename to app/Language/id/Aauth.php
diff --git a/application/Language/ru/Aauth.php b/app/Language/ru/Aauth.php
similarity index 100%
rename from application/Language/ru/Aauth.php
rename to app/Language/ru/Aauth.php
diff --git a/application/Language/sv/Aauth.php b/app/Language/sv/Aauth.php
similarity index 100%
rename from application/Language/sv/Aauth.php
rename to app/Language/sv/Aauth.php
diff --git a/application/Language/zh-CN/Aauth.php b/app/Language/zh-CN/Aauth.php
similarity index 100%
rename from application/Language/zh-CN/Aauth.php
rename to app/Language/zh-CN/Aauth.php
diff --git a/application/Language/zh-TW/Aauth.php b/app/Language/zh-TW/Aauth.php
similarity index 100%
rename from application/Language/zh-TW/Aauth.php
rename to app/Language/zh-TW/Aauth.php
diff --git a/application/Libraries/Aauth.php b/app/Libraries/Aauth.php
similarity index 100%
rename from application/Libraries/Aauth.php
rename to app/Libraries/Aauth.php
diff --git a/application/Models/Aauth/GroupModel.php b/app/Models/Aauth/GroupModel.php
similarity index 100%
rename from application/Models/Aauth/GroupModel.php
rename to app/Models/Aauth/GroupModel.php
diff --git a/application/Models/Aauth/GroupToGroupModel.php b/app/Models/Aauth/GroupToGroupModel.php
similarity index 100%
rename from application/Models/Aauth/GroupToGroupModel.php
rename to app/Models/Aauth/GroupToGroupModel.php
diff --git a/application/Models/Aauth/GroupToUserModel.php b/app/Models/Aauth/GroupToUserModel.php
similarity index 100%
rename from application/Models/Aauth/GroupToUserModel.php
rename to app/Models/Aauth/GroupToUserModel.php
diff --git a/application/Models/Aauth/LoginAttemptModel.php b/app/Models/Aauth/LoginAttemptModel.php
similarity index 100%
rename from application/Models/Aauth/LoginAttemptModel.php
rename to app/Models/Aauth/LoginAttemptModel.php
diff --git a/application/Models/Aauth/LoginTokenModel.php b/app/Models/Aauth/LoginTokenModel.php
similarity index 100%
rename from application/Models/Aauth/LoginTokenModel.php
rename to app/Models/Aauth/LoginTokenModel.php
diff --git a/application/Models/Aauth/PermModel.php b/app/Models/Aauth/PermModel.php
similarity index 100%
rename from application/Models/Aauth/PermModel.php
rename to app/Models/Aauth/PermModel.php
diff --git a/application/Models/Aauth/PermToGroupModel.php b/app/Models/Aauth/PermToGroupModel.php
similarity index 100%
rename from application/Models/Aauth/PermToGroupModel.php
rename to app/Models/Aauth/PermToGroupModel.php
diff --git a/application/Models/Aauth/PermToUserModel.php b/app/Models/Aauth/PermToUserModel.php
similarity index 100%
rename from application/Models/Aauth/PermToUserModel.php
rename to app/Models/Aauth/PermToUserModel.php
diff --git a/application/Models/Aauth/UserModel.php b/app/Models/Aauth/UserModel.php
similarity index 100%
rename from application/Models/Aauth/UserModel.php
rename to app/Models/Aauth/UserModel.php
diff --git a/application/Models/Aauth/UserVariableModel.php b/app/Models/Aauth/UserVariableModel.php
similarity index 100%
rename from application/Models/Aauth/UserVariableModel.php
rename to app/Models/Aauth/UserVariableModel.php
diff --git a/application/Views/Aauth/RemindPassword.php b/app/Views/Aauth/RemindPassword.php
similarity index 100%
rename from application/Views/Aauth/RemindPassword.php
rename to app/Views/Aauth/RemindPassword.php
diff --git a/application/Views/Aauth/ResetPassword.php b/app/Views/Aauth/ResetPassword.php
similarity index 100%
rename from application/Views/Aauth/ResetPassword.php
rename to app/Views/Aauth/ResetPassword.php
diff --git a/application/Views/Aauth/Verification.php b/app/Views/Aauth/Verification.php
similarity index 100%
rename from application/Views/Aauth/Verification.php
rename to app/Views/Aauth/Verification.php
diff --git a/application/Views/Account/Edit.php b/app/Views/Account/Edit.php
similarity index 100%
rename from application/Views/Account/Edit.php
rename to app/Views/Account/Edit.php
diff --git a/application/Views/Account/Home.php b/app/Views/Account/Home.php
similarity index 100%
rename from application/Views/Account/Home.php
rename to app/Views/Account/Home.php
diff --git a/application/Views/Account/Login.php b/app/Views/Account/Login.php
similarity index 100%
rename from application/Views/Account/Login.php
rename to app/Views/Account/Login.php
diff --git a/application/Views/Account/Register.php b/app/Views/Account/Register.php
similarity index 100%
rename from application/Views/Account/Register.php
rename to app/Views/Account/Register.php
diff --git a/application/Views/Account/RemindPassword.php b/app/Views/Account/RemindPassword.php
similarity index 100%
rename from application/Views/Account/RemindPassword.php
rename to app/Views/Account/RemindPassword.php
diff --git a/application/Views/Account/ResetPassword.php b/app/Views/Account/ResetPassword.php
similarity index 100%
rename from application/Views/Account/ResetPassword.php
rename to app/Views/Account/ResetPassword.php
diff --git a/application/Views/Account/Verification.php b/app/Views/Account/Verification.php
similarity index 100%
rename from application/Views/Account/Verification.php
rename to app/Views/Account/Verification.php
diff --git a/application/Views/Admin/Home.php b/app/Views/Admin/Home.php
similarity index 100%
rename from application/Views/Admin/Home.php
rename to app/Views/Admin/Home.php
diff --git a/application/Views/Admin/Migrate.php b/app/Views/Admin/Migrate.php
similarity index 100%
rename from application/Views/Admin/Migrate.php
rename to app/Views/Admin/Migrate.php
diff --git a/application/Views/Admin/Users/Home.php b/app/Views/Admin/Users/Home.php
similarity index 100%
rename from application/Views/Admin/Users/Home.php
rename to app/Views/Admin/Users/Home.php
diff --git a/application/Views/Admin/Users/New.php b/app/Views/Admin/Users/New.php
similarity index 100%
rename from application/Views/Admin/Users/New.php
rename to app/Views/Admin/Users/New.php
diff --git a/application/Views/Home.php b/app/Views/Home.php
similarity index 100%
rename from application/Views/Home.php
rename to app/Views/Home.php
diff --git a/application/Views/Pagers/bootstrap_full.php b/app/Views/Pagers/bootstrap_full.php
similarity index 100%
rename from application/Views/Pagers/bootstrap_full.php
rename to app/Views/Pagers/bootstrap_full.php
diff --git a/application/Views/Templates/Footer.php b/app/Views/Templates/Footer.php
similarity index 100%
rename from application/Views/Templates/Footer.php
rename to app/Views/Templates/Footer.php
diff --git a/application/Views/Templates/FooterAdmin.php b/app/Views/Templates/FooterAdmin.php
similarity index 100%
rename from application/Views/Templates/FooterAdmin.php
rename to app/Views/Templates/FooterAdmin.php
diff --git a/application/Views/Templates/FooterBlank.php b/app/Views/Templates/FooterBlank.php
similarity index 100%
rename from application/Views/Templates/FooterBlank.php
rename to app/Views/Templates/FooterBlank.php
diff --git a/application/Views/Templates/Header.php b/app/Views/Templates/Header.php
similarity index 100%
rename from application/Views/Templates/Header.php
rename to app/Views/Templates/Header.php
diff --git a/application/Views/Templates/HeaderAdmin.php b/app/Views/Templates/HeaderAdmin.php
similarity index 100%
rename from application/Views/Templates/HeaderAdmin.php
rename to app/Views/Templates/HeaderAdmin.php
diff --git a/application/Views/Templates/HeaderBlank.php b/app/Views/Templates/HeaderBlank.php
similarity index 100%
rename from application/Views/Templates/HeaderBlank.php
rename to app/Views/Templates/HeaderBlank.php