diff --git a/documents/folders.txt b/documents/folders.txt
index f9980f7..08e6a6d 100644
--- a/documents/folders.txt
+++ b/documents/folders.txt
@@ -33,8 +33,6 @@ tts_framework/src
 │   │   ├── help_load.php (fetch_lazy Generator)
 │   │   ├── help_save.php (Model used to save into DB)
 │   │   ├── paginate.php (PDO DB query to create links)
-│   │   ├── run_sql.php (trait for sqlite/MySQL/PG helper to get fields/tables)
-│   │   └── validation.php (trait to validate mysql fields)
 │   ├── enum
 │   │   ├── app_environment.php (fetch if is_production environment)
 │   │   └── same_site.php (same_site: Lax, Strict, None)
@@ -77,8 +75,12 @@ tts_framework/src
 │   ├── time_zone_selection.php (Builds HTML to Pick your Time Zone from Select Box)
 │   ├── time_zones.php (Convert UTC into Users TimeZone)
 │   ├── traits
-│   │   ├── csrf_token_functions.php (Get an Cross-Site Request Forge - Prevention Token)
-│   │   └── session_hijacking_functions.php (Prevent SESSION Hijacking and Fixation in PHP)
+│   │   ├── database
+│   │   │   ├── run_sql.php (sqlite/MySQL/PG Helper to get fields/tables)
+│   │   │   └── validation.php (Validate mysql fields)
+│   │   └── security
+│   │       ├── csrf_token_functions.php (Get an Cross-Site Request Forge - Prevention Token)
+│   │       └── session_hijacking_functions.php (Prevent SESSION Hijacking and Fixation in PHP)
 │   ├── url_encode.php (base64url Encode/Decode)
 │   └── view.php (Loads view files from common folders you defined)
 ├── main.inc.php (Bootstraps App, sets configure, registry, di, and name-spaces)
diff --git a/src/classes/database/help_save.php b/src/classes/database/help_save.php
index da02252..e2d12e9 100644
--- a/src/classes/database/help_save.php
+++ b/src/classes/database/help_save.php
@@ -6,8 +6,8 @@ namespace tts\database;
 
 final class help_save {
     
-    use run_sql;
-    use validation;
+    use \tts\traits\database\run_sql;
+    use \tts\traits\database\validation;
 
     const successful_save = 1;
     const duplicate_found = 2;
diff --git a/src/classes/security.php b/src/classes/security.php
index 960f0be..36732a0 100644
--- a/src/classes/security.php
+++ b/src/classes/security.php
@@ -6,8 +6,8 @@ namespace tts;
 
 final class security {
 
-    use traits\csrf_token_functions;
-    use traits\session_hijacking_functions;
+    use traits\security\csrf_token_functions;
+    use traits\security\session_hijacking_functions;
 
     /**
      * Get unique IDs for database
diff --git a/src/classes/database/run_sql.php b/src/classes/traits/database/run_sql.php
similarity index 98%
rename from src/classes/database/run_sql.php
rename to src/classes/traits/database/run_sql.php
index 487b32b..e37ae25 100644
--- a/src/classes/database/run_sql.php
+++ b/src/classes/traits/database/run_sql.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace tts\database;
+namespace tts\traits\database;
 
 trait run_sql {
     
diff --git a/src/classes/database/validation.php b/src/classes/traits/database/validation.php
similarity index 99%
rename from src/classes/database/validation.php
rename to src/classes/traits/database/validation.php
index a717fd3..6f1dca2 100644
--- a/src/classes/database/validation.php
+++ b/src/classes/traits/database/validation.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace tts\database;
+namespace tts\traits\database;
 
 trait validation {
 
diff --git a/src/classes/traits/csrf_token_functions.php b/src/classes/traits/security/csrf_token_functions.php
similarity index 98%
rename from src/classes/traits/csrf_token_functions.php
rename to src/classes/traits/security/csrf_token_functions.php
index db9e2f5..9d29002 100644
--- a/src/classes/traits/csrf_token_functions.php
+++ b/src/classes/traits/security/csrf_token_functions.php
@@ -1,7 +1,7 @@
 <?php
 
 declare(strict_types=1);
-namespace tts\traits;
+namespace tts\traits\security;
 
 trait csrf_token_functions {
 
diff --git a/src/classes/traits/session_hijacking_functions.php b/src/classes/traits/security/session_hijacking_functions.php
similarity index 99%
rename from src/classes/traits/session_hijacking_functions.php
rename to src/classes/traits/security/session_hijacking_functions.php
index 0ec4cdb..ddf05c0 100644
--- a/src/classes/traits/session_hijacking_functions.php
+++ b/src/classes/traits/security/session_hijacking_functions.php
@@ -1,7 +1,7 @@
 <?php
 
 declare(strict_types=1);
-namespace tts\traits;
+namespace tts\traits\security;
 
 /**
  * @site https://gist.github.com/ohidxy/cc361bb40fb3fbb3fe9112c99d51f69e