diff --git a/src/FederationServer/Classes/Enums/Method.php b/src/FederationServer/Classes/Enums/Method.php
index ebc8d28..ae51264 100644
--- a/src/FederationServer/Classes/Enums/Method.php
+++ b/src/FederationServer/Classes/Enums/Method.php
@@ -3,16 +3,16 @@
     namespace FederationServer\Classes\Enums;
 
     use FederationServer\Exceptions\RequestException;
-    use FederationServer\Methods\ManageBlacklistPermission;
-    use FederationServer\Methods\ManageClientPermission;
-    use FederationServer\Methods\ManageOperatorsPermission;
-    use FederationServer\Methods\CreateOperator;
-    use FederationServer\Methods\DeleteOperator;
-    use FederationServer\Methods\DownloadAttachment;
-    use FederationServer\Methods\EnableOperator;
-    use FederationServer\Methods\GetOperator;
-    use FederationServer\Methods\RefreshOperatorApiKey;
-    use FederationServer\Methods\UploadAttachment;
+    use FederationServer\Methods\Attachments\DownloadAttachment;
+    use FederationServer\Methods\Attachments\UploadAttachment;
+    use FederationServer\Methods\Operators\CreateOperator;
+    use FederationServer\Methods\Operators\DeleteOperator;
+    use FederationServer\Methods\Operators\EnableOperator;
+    use FederationServer\Methods\Operators\GetOperator;
+    use FederationServer\Methods\Operators\ManageBlacklistPermission;
+    use FederationServer\Methods\Operators\ManageClientPermission;
+    use FederationServer\Methods\Operators\ManageOperatorsPermission;
+    use FederationServer\Methods\Operators\RefreshOperatorApiKey;
 
     enum Method
     {
diff --git a/src/FederationServer/Methods/DownloadAttachment.php b/src/FederationServer/Methods/Attachments/DownloadAttachment.php
similarity index 98%
rename from src/FederationServer/Methods/DownloadAttachment.php
rename to src/FederationServer/Methods/Attachments/DownloadAttachment.php
index 981f93e..a8ad400 100644
--- a/src/FederationServer/Methods/DownloadAttachment.php
+++ b/src/FederationServer/Methods/Attachments/DownloadAttachment.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace FederationServer\Methods;
+    namespace FederationServer\Methods\Attachments;
 
     use FederationServer\Classes\Configuration;
     use FederationServer\Classes\Managers\EvidenceManager;
diff --git a/src/FederationServer/Methods/UploadAttachment.php b/src/FederationServer/Methods/Attachments/UploadAttachment.php
similarity index 99%
rename from src/FederationServer/Methods/UploadAttachment.php
rename to src/FederationServer/Methods/Attachments/UploadAttachment.php
index a9eb527..f97a507 100644
--- a/src/FederationServer/Methods/UploadAttachment.php
+++ b/src/FederationServer/Methods/Attachments/UploadAttachment.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace FederationServer\Methods;
+    namespace FederationServer\Methods\Attachments;
 
     use FederationServer\Classes\Configuration;
     use FederationServer\Classes\Enums\AuditLogType;
diff --git a/src/FederationServer/Methods/CreateOperator.php b/src/FederationServer/Methods/Operators/CreateOperator.php
similarity index 97%
rename from src/FederationServer/Methods/CreateOperator.php
rename to src/FederationServer/Methods/Operators/CreateOperator.php
index 611e298..d006768 100644
--- a/src/FederationServer/Methods/CreateOperator.php
+++ b/src/FederationServer/Methods/Operators/CreateOperator.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace FederationServer\Methods;
+    namespace FederationServer\Methods\Operators;
 
     use FederationServer\Classes\Enums\AuditLogType;
     use FederationServer\Classes\Logger;
diff --git a/src/FederationServer/Methods/DeleteOperator.php b/src/FederationServer/Methods/Operators/DeleteOperator.php
similarity index 97%
rename from src/FederationServer/Methods/DeleteOperator.php
rename to src/FederationServer/Methods/Operators/DeleteOperator.php
index 1600f1a..6b8b895 100644
--- a/src/FederationServer/Methods/DeleteOperator.php
+++ b/src/FederationServer/Methods/Operators/DeleteOperator.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace FederationServer\Methods;
+    namespace FederationServer\Methods\Operators;
 
     use FederationServer\Classes\Enums\AuditLogType;
     use FederationServer\Classes\Logger;
diff --git a/src/FederationServer/Methods/EnableOperator.php b/src/FederationServer/Methods/Operators/EnableOperator.php
similarity index 98%
rename from src/FederationServer/Methods/EnableOperator.php
rename to src/FederationServer/Methods/Operators/EnableOperator.php
index fd75f02..f2d51f7 100644
--- a/src/FederationServer/Methods/EnableOperator.php
+++ b/src/FederationServer/Methods/Operators/EnableOperator.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace FederationServer\Methods;
+    namespace FederationServer\Methods\Operators;
 
     use FederationServer\Classes\Enums\AuditLogType;
     use FederationServer\Classes\Logger;
diff --git a/src/FederationServer/Methods/GetOperator.php b/src/FederationServer/Methods/Operators/GetOperator.php
similarity index 97%
rename from src/FederationServer/Methods/GetOperator.php
rename to src/FederationServer/Methods/Operators/GetOperator.php
index d17cda0..faa53ef 100644
--- a/src/FederationServer/Methods/GetOperator.php
+++ b/src/FederationServer/Methods/Operators/GetOperator.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace FederationServer\Methods;
+    namespace FederationServer\Methods\Operators;
 
     use FederationServer\Classes\Logger;
     use FederationServer\Classes\Managers\OperatorManager;
diff --git a/src/FederationServer/Methods/ManageBlacklistPermission.php b/src/FederationServer/Methods/Operators/ManageBlacklistPermission.php
similarity index 97%
rename from src/FederationServer/Methods/ManageBlacklistPermission.php
rename to src/FederationServer/Methods/Operators/ManageBlacklistPermission.php
index d208303..7b0689c 100644
--- a/src/FederationServer/Methods/ManageBlacklistPermission.php
+++ b/src/FederationServer/Methods/Operators/ManageBlacklistPermission.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace FederationServer\Methods;
+    namespace FederationServer\Methods\Operators;
 
     use FederationServer\Classes\Logger;
     use FederationServer\Classes\Managers\OperatorManager;
diff --git a/src/FederationServer/Methods/ManageClientPermission.php b/src/FederationServer/Methods/Operators/ManageClientPermission.php
similarity index 97%
rename from src/FederationServer/Methods/ManageClientPermission.php
rename to src/FederationServer/Methods/Operators/ManageClientPermission.php
index 184de56..979de48 100644
--- a/src/FederationServer/Methods/ManageClientPermission.php
+++ b/src/FederationServer/Methods/Operators/ManageClientPermission.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace FederationServer\Methods;
+    namespace FederationServer\Methods\Operators;
 
     use FederationServer\Classes\Logger;
     use FederationServer\Classes\Managers\OperatorManager;
diff --git a/src/FederationServer/Methods/ManageOperatorsPermission.php b/src/FederationServer/Methods/Operators/ManageOperatorsPermission.php
similarity index 97%
rename from src/FederationServer/Methods/ManageOperatorsPermission.php
rename to src/FederationServer/Methods/Operators/ManageOperatorsPermission.php
index 483c7f9..ba4f2e7 100644
--- a/src/FederationServer/Methods/ManageOperatorsPermission.php
+++ b/src/FederationServer/Methods/Operators/ManageOperatorsPermission.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace FederationServer\Methods;
+    namespace FederationServer\Methods\Operators;
 
     use FederationServer\Classes\Logger;
     use FederationServer\Classes\Managers\OperatorManager;
diff --git a/src/FederationServer/Methods/RefreshOperatorApiKey.php b/src/FederationServer/Methods/Operators/RefreshOperatorApiKey.php
similarity index 97%
rename from src/FederationServer/Methods/RefreshOperatorApiKey.php
rename to src/FederationServer/Methods/Operators/RefreshOperatorApiKey.php
index 2b0f851..7196f4a 100644
--- a/src/FederationServer/Methods/RefreshOperatorApiKey.php
+++ b/src/FederationServer/Methods/Operators/RefreshOperatorApiKey.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace FederationServer\Methods;
+    namespace FederationServer\Methods\Operators;
 
     use FederationServer\Classes\Logger;
     use FederationServer\Classes\Managers\OperatorManager;