diff --git a/bin/bedrock.php b/bin/Bedrock.php
similarity index 99%
rename from bin/bedrock.php
rename to bin/Bedrock.php
index a7542c9..dd8253b 100644
--- a/bin/bedrock.php
+++ b/bin/Bedrock.php
@@ -12,7 +12,7 @@
  * @link    https://TheTempusProject.com/Core
  * @license https://opensource.org/licenses/MIT [MIT LICENSE]
  */
-namespace TheTempusProject\Bedrock;
+namespace TheTempusProject\Bedrock\bin;
 
 use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Hermes\Functions\Route as Routes;
diff --git a/classes/config.php b/classes/Config.php
similarity index 100%
rename from classes/config.php
rename to classes/Config.php
diff --git a/classes/controller.php b/classes/Controller.php
similarity index 100%
rename from classes/controller.php
rename to classes/Controller.php
diff --git a/classes/custom_exception.php b/classes/CustomException.php
similarity index 100%
rename from classes/custom_exception.php
rename to classes/CustomException.php
diff --git a/classes/database.php b/classes/Database.php
similarity index 100%
rename from classes/database.php
rename to classes/Database.php
diff --git a/classes/database_model.php b/classes/DatabaseModel.php
similarity index 100%
rename from classes/database_model.php
rename to classes/DatabaseModel.php
diff --git a/classes/model.php b/classes/Model.php
similarity index 100%
rename from classes/model.php
rename to classes/Model.php
diff --git a/classes/pagination.php b/classes/Pagination.php
similarity index 100%
rename from classes/pagination.php
rename to classes/Pagination.php
diff --git a/functions/check.php b/functions/Check.php
similarity index 100%
rename from functions/check.php
rename to functions/Check.php
diff --git a/functions/code.php b/functions/Code.php
similarity index 100%
rename from functions/code.php
rename to functions/Code.php
diff --git a/functions/cookie.php b/functions/Cookie.php
similarity index 100%
rename from functions/cookie.php
rename to functions/Cookie.php
diff --git a/functions/date.php b/functions/Date.php
similarity index 100%
rename from functions/date.php
rename to functions/Date.php
diff --git a/functions/hash.php b/functions/Hash.php
similarity index 100%
rename from functions/hash.php
rename to functions/Hash.php
diff --git a/functions/input.php b/functions/Input.php
similarity index 100%
rename from functions/input.php
rename to functions/Input.php
diff --git a/functions/sanitize.php b/functions/Sanitize.php
similarity index 100%
rename from functions/sanitize.php
rename to functions/Sanitize.php
diff --git a/functions/session.php b/functions/Session.php
similarity index 100%
rename from functions/session.php
rename to functions/Session.php
diff --git a/functions/token.php b/functions/Token.php
similarity index 100%
rename from functions/token.php
rename to functions/Token.php
diff --git a/functions/upload.php b/functions/Upload.php
similarity index 100%
rename from functions/upload.php
rename to functions/Upload.php