diff --git a/src/Socialbox/Classes/StandardMethods/AddressBookAddContact.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookAddContact.php
similarity index 97%
rename from src/Socialbox/Classes/StandardMethods/AddressBookAddContact.php
rename to src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookAddContact.php
index ebad0d1..91558c8 100644
--- a/src/Socialbox/Classes/StandardMethods/AddressBookAddContact.php
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookAddContact.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\AddressBook;
 
     use InvalidArgumentException;
     use Socialbox\Abstracts\Method;
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBookDeleteContact.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookDeleteContact.php
similarity index 93%
rename from src/Socialbox/Classes/StandardMethods/AddressBookDeleteContact.php
rename to src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookDeleteContact.php
index 9ec51a9..0490b40 100644
--- a/src/Socialbox/Classes/StandardMethods/AddressBookDeleteContact.php
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookDeleteContact.php
@@ -1,11 +1,10 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\AddressBook;
 
     use InvalidArgumentException;
     use Socialbox\Abstracts\Method;
     use Socialbox\Enums\StandardError;
-    use Socialbox\Enums\Types\ContactRelationshipType;
     use Socialbox\Exceptions\DatabaseOperationException;
     use Socialbox\Exceptions\StandardException;
     use Socialbox\Interfaces\SerializableInterface;
@@ -13,7 +12,6 @@
     use Socialbox\Objects\ClientRequest;
     use Socialbox\Objects\PeerAddress;
     use Socialbox\Objects\RpcRequest;
-    use Socialbox\Socialbox;
 
     class AddressBookDeleteContact extends Method
     {
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBookGetContact.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContact.php
similarity index 96%
rename from src/Socialbox/Classes/StandardMethods/AddressBookGetContact.php
rename to src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContact.php
index 8bb51d5..4da647f 100644
--- a/src/Socialbox/Classes/StandardMethods/AddressBookGetContact.php
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContact.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\AddressBook;
 
     use InvalidArgumentException;
     use Socialbox\Abstracts\Method;
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBookGetContacts.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContacts.php
similarity index 97%
rename from src/Socialbox/Classes/StandardMethods/AddressBookGetContacts.php
rename to src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContacts.php
index ed355d1..135b5ab 100644
--- a/src/Socialbox/Classes/StandardMethods/AddressBookGetContacts.php
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContacts.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\AddressBook;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Classes\Configuration;
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBookTrustSignature.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookTrustSignature.php
similarity index 95%
rename from src/Socialbox/Classes/StandardMethods/AddressBookTrustSignature.php
rename to src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookTrustSignature.php
index 93f4b4e..3db9592 100644
--- a/src/Socialbox/Classes/StandardMethods/AddressBookTrustSignature.php
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookTrustSignature.php
@@ -1,11 +1,10 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\AddressBook;
 
     use InvalidArgumentException;
     use Socialbox\Abstracts\Method;
     use Socialbox\Enums\StandardError;
-    use Socialbox\Enums\Types\ContactRelationshipType;
     use Socialbox\Exceptions\DatabaseOperationException;
     use Socialbox\Exceptions\StandardException;
     use Socialbox\Interfaces\SerializableInterface;
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBookUpdateRelationship.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookUpdateRelationship.php
similarity index 97%
rename from src/Socialbox/Classes/StandardMethods/AddressBookUpdateRelationship.php
rename to src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookUpdateRelationship.php
index cd913ec..70197bf 100644
--- a/src/Socialbox/Classes/StandardMethods/AddressBookUpdateRelationship.php
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookUpdateRelationship.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\AddressBook;
 
     use InvalidArgumentException;
     use Socialbox\Abstracts\Method;
diff --git a/src/Socialbox/Classes/StandardMethods/GetAllowedMethods.php b/src/Socialbox/Classes/StandardMethods/Core/GetAllowedMethods.php
similarity index 95%
rename from src/Socialbox/Classes/StandardMethods/GetAllowedMethods.php
rename to src/Socialbox/Classes/StandardMethods/Core/GetAllowedMethods.php
index 2baf0cd..7babe2a 100644
--- a/src/Socialbox/Classes/StandardMethods/GetAllowedMethods.php
+++ b/src/Socialbox/Classes/StandardMethods/Core/GetAllowedMethods.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Core;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Enums\StandardError;
diff --git a/src/Socialbox/Classes/StandardMethods/GetSessionState.php b/src/Socialbox/Classes/StandardMethods/Core/GetSessionState.php
similarity index 90%
rename from src/Socialbox/Classes/StandardMethods/GetSessionState.php
rename to src/Socialbox/Classes/StandardMethods/Core/GetSessionState.php
index dc45964..0d70b53 100644
--- a/src/Socialbox/Classes/StandardMethods/GetSessionState.php
+++ b/src/Socialbox/Classes/StandardMethods/Core/GetSessionState.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Core;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Interfaces\SerializableInterface;
diff --git a/src/Socialbox/Classes/StandardMethods/Ping.php b/src/Socialbox/Classes/StandardMethods/Core/Ping.php
similarity index 89%
rename from src/Socialbox/Classes/StandardMethods/Ping.php
rename to src/Socialbox/Classes/StandardMethods/Core/Ping.php
index 4fe2094..c870d89 100644
--- a/src/Socialbox/Classes/StandardMethods/Ping.php
+++ b/src/Socialbox/Classes/StandardMethods/Core/Ping.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Core;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Interfaces\SerializableInterface;
diff --git a/src/Socialbox/Classes/StandardMethods/ResolvePeer.php b/src/Socialbox/Classes/StandardMethods/Core/ResolvePeer.php
similarity index 89%
rename from src/Socialbox/Classes/StandardMethods/ResolvePeer.php
rename to src/Socialbox/Classes/StandardMethods/Core/ResolvePeer.php
index f2be123..e0a6fc4 100644
--- a/src/Socialbox/Classes/StandardMethods/ResolvePeer.php
+++ b/src/Socialbox/Classes/StandardMethods/Core/ResolvePeer.php
@@ -1,18 +1,14 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Core;
 
     use Exception;
     use InvalidArgumentException;
     use Socialbox\Abstracts\Method;
-    use Socialbox\Classes\Configuration;
     use Socialbox\Enums\ReservedUsernames;
     use Socialbox\Enums\StandardError;
-    use Socialbox\Exceptions\DatabaseOperationException;
-    use Socialbox\Exceptions\RpcException;
     use Socialbox\Exceptions\StandardException;
     use Socialbox\Interfaces\SerializableInterface;
-    use Socialbox\Managers\RegisteredPeerManager;
     use Socialbox\Objects\ClientRequest;
     use Socialbox\Objects\PeerAddress;
     use Socialbox\Objects\RpcRequest;
diff --git a/src/Socialbox/Classes/StandardMethods/ResolvePeerSignature.php b/src/Socialbox/Classes/StandardMethods/Core/ResolvePeerSignature.php
similarity index 97%
rename from src/Socialbox/Classes/StandardMethods/ResolvePeerSignature.php
rename to src/Socialbox/Classes/StandardMethods/Core/ResolvePeerSignature.php
index be46141..56384bf 100644
--- a/src/Socialbox/Classes/StandardMethods/ResolvePeerSignature.php
+++ b/src/Socialbox/Classes/StandardMethods/Core/ResolvePeerSignature.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Core;
 
     use Exception;
     use InvalidArgumentException;
diff --git a/src/Socialbox/Classes/StandardMethods/AcceptCommunityGuidelines.php b/src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptCommunityGuidelines.php
similarity index 95%
rename from src/Socialbox/Classes/StandardMethods/AcceptCommunityGuidelines.php
rename to src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptCommunityGuidelines.php
index 0bb9370..bb40cd6 100644
--- a/src/Socialbox/Classes/StandardMethods/AcceptCommunityGuidelines.php
+++ b/src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptCommunityGuidelines.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\ServerDocuments;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Enums\Flags\SessionFlags;
diff --git a/src/Socialbox/Classes/StandardMethods/AcceptPrivacyPolicy.php b/src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptPrivacyPolicy.php
similarity index 95%
rename from src/Socialbox/Classes/StandardMethods/AcceptPrivacyPolicy.php
rename to src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptPrivacyPolicy.php
index feb5811..72b1d86 100644
--- a/src/Socialbox/Classes/StandardMethods/AcceptPrivacyPolicy.php
+++ b/src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptPrivacyPolicy.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\ServerDocuments;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Enums\Flags\SessionFlags;
diff --git a/src/Socialbox/Classes/StandardMethods/AcceptTermsOfService.php b/src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptTermsOfService.php
similarity index 95%
rename from src/Socialbox/Classes/StandardMethods/AcceptTermsOfService.php
rename to src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptTermsOfService.php
index c79f643..369d427 100644
--- a/src/Socialbox/Classes/StandardMethods/AcceptTermsOfService.php
+++ b/src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptTermsOfService.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\ServerDocuments;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Enums\Flags\SessionFlags;
diff --git a/src/Socialbox/Classes/StandardMethods/GetCommunityGuidelines.php b/src/Socialbox/Classes/StandardMethods/ServerDocuments/GetCommunityGuidelines.php
similarity index 92%
rename from src/Socialbox/Classes/StandardMethods/GetCommunityGuidelines.php
rename to src/Socialbox/Classes/StandardMethods/ServerDocuments/GetCommunityGuidelines.php
index 9b4abb0..0b32e38 100644
--- a/src/Socialbox/Classes/StandardMethods/GetCommunityGuidelines.php
+++ b/src/Socialbox/Classes/StandardMethods/ServerDocuments/GetCommunityGuidelines.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\ServerDocuments;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Classes\Configuration;
diff --git a/src/Socialbox/Classes/StandardMethods/GetPrivacyPolicy.php b/src/Socialbox/Classes/StandardMethods/ServerDocuments/GetPrivacyPolicy.php
similarity index 92%
rename from src/Socialbox/Classes/StandardMethods/GetPrivacyPolicy.php
rename to src/Socialbox/Classes/StandardMethods/ServerDocuments/GetPrivacyPolicy.php
index 53c6136..ffb0eb6 100644
--- a/src/Socialbox/Classes/StandardMethods/GetPrivacyPolicy.php
+++ b/src/Socialbox/Classes/StandardMethods/ServerDocuments/GetPrivacyPolicy.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\ServerDocuments;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Classes\Configuration;
diff --git a/src/Socialbox/Classes/StandardMethods/GetTermsOfService.php b/src/Socialbox/Classes/StandardMethods/ServerDocuments/GetTermsOfService.php
similarity index 92%
rename from src/Socialbox/Classes/StandardMethods/GetTermsOfService.php
rename to src/Socialbox/Classes/StandardMethods/ServerDocuments/GetTermsOfService.php
index c0c9224..525ada4 100644
--- a/src/Socialbox/Classes/StandardMethods/GetTermsOfService.php
+++ b/src/Socialbox/Classes/StandardMethods/ServerDocuments/GetTermsOfService.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\ServerDocuments;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Classes\Configuration;
diff --git a/src/Socialbox/Classes/StandardMethods/SettingsAddInformationField.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsAddInformationField.php
similarity index 99%
rename from src/Socialbox/Classes/StandardMethods/SettingsAddInformationField.php
rename to src/Socialbox/Classes/StandardMethods/Settings/SettingsAddInformationField.php
index 782ede0..909b996 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsAddInformationField.php
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsAddInformationField.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Settings;
 
     use Exception;
     use Socialbox\Abstracts\Method;
diff --git a/src/Socialbox/Classes/StandardMethods/SettingsAddSignature.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsAddSignature.php
similarity index 97%
rename from src/Socialbox/Classes/StandardMethods/SettingsAddSignature.php
rename to src/Socialbox/Classes/StandardMethods/Settings/SettingsAddSignature.php
index f4a1b5a..c731825 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsAddSignature.php
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsAddSignature.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Settings;
 
     use Exception;
     use InvalidArgumentException;
diff --git a/src/Socialbox/Classes/StandardMethods/SettingsDeleteInformationField.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteInformationField.php
similarity index 98%
rename from src/Socialbox/Classes/StandardMethods/SettingsDeleteInformationField.php
rename to src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteInformationField.php
index 92c537c..91f5a26 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsDeleteInformationField.php
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteInformationField.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Settings;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Classes\Configuration;
diff --git a/src/Socialbox/Classes/StandardMethods/SettingsDeleteOtp.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteOtp.php
similarity index 96%
rename from src/Socialbox/Classes/StandardMethods/SettingsDeleteOtp.php
rename to src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteOtp.php
index d36b5ce..9668547 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsDeleteOtp.php
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteOtp.php
@@ -1,19 +1,17 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Settings;
 
     use Exception;
     use Socialbox\Abstracts\Method;
     use Socialbox\Classes\Configuration;
     use Socialbox\Classes\Cryptography;
-    use Socialbox\Enums\Flags\SessionFlags;
     use Socialbox\Enums\StandardError;
     use Socialbox\Exceptions\DatabaseOperationException;
     use Socialbox\Exceptions\StandardException;
     use Socialbox\Interfaces\SerializableInterface;
     use Socialbox\Managers\OneTimePasswordManager;
     use Socialbox\Managers\PasswordManager;
-    use Socialbox\Managers\SessionManager;
     use Socialbox\Objects\ClientRequest;
     use Socialbox\Objects\RpcRequest;
 
diff --git a/src/Socialbox/Classes/StandardMethods/SettingsDeletePassword.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeletePassword.php
similarity index 98%
rename from src/Socialbox/Classes/StandardMethods/SettingsDeletePassword.php
rename to src/Socialbox/Classes/StandardMethods/Settings/SettingsDeletePassword.php
index 82ff41d..a771879 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsDeletePassword.php
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeletePassword.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Settings;
 
     use Exception;
     use Socialbox\Abstracts\Method;
diff --git a/src/Socialbox/Classes/StandardMethods/SettingsDeleteSignature.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteSignature.php
similarity index 94%
rename from src/Socialbox/Classes/StandardMethods/SettingsDeleteSignature.php
rename to src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteSignature.php
index 0e86af9..8a2a1ab 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsDeleteSignature.php
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteSignature.php
@@ -1,12 +1,11 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Settings;
 
     use Exception;
     use InvalidArgumentException;
     use ncc\ThirdParty\Symfony\Uid\Uuid;
     use Socialbox\Abstracts\Method;
-    use Socialbox\Classes\Configuration;
     use Socialbox\Enums\StandardError;
     use Socialbox\Exceptions\StandardException;
     use Socialbox\Interfaces\SerializableInterface;
diff --git a/src/Socialbox/Classes/StandardMethods/SettingsGetInformationField.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetInformationField.php
similarity index 96%
rename from src/Socialbox/Classes/StandardMethods/SettingsGetInformationField.php
rename to src/Socialbox/Classes/StandardMethods/Settings/SettingsGetInformationField.php
index 640e12e..ae63224 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsGetInformationField.php
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetInformationField.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Settings;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Enums\StandardError;
diff --git a/src/Socialbox/Classes/StandardMethods/SettingsGetInformationFields.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetInformationFields.php
similarity index 94%
rename from src/Socialbox/Classes/StandardMethods/SettingsGetInformationFields.php
rename to src/Socialbox/Classes/StandardMethods/Settings/SettingsGetInformationFields.php
index 9a90643..375ba5f 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsGetInformationFields.php
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetInformationFields.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Settings;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Enums\StandardError;
diff --git a/src/Socialbox/Classes/StandardMethods/SettingsGetSigningKey.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetSigningKey.php
similarity index 96%
rename from src/Socialbox/Classes/StandardMethods/SettingsGetSigningKey.php
rename to src/Socialbox/Classes/StandardMethods/Settings/SettingsGetSigningKey.php
index e004dea..358ccad 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsGetSigningKey.php
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetSigningKey.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Settings;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Enums\StandardError;
diff --git a/src/Socialbox/Classes/StandardMethods/SettingsGetSigningKeys.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetSigningKeys.php
similarity index 95%
rename from src/Socialbox/Classes/StandardMethods/SettingsGetSigningKeys.php
rename to src/Socialbox/Classes/StandardMethods/Settings/SettingsGetSigningKeys.php
index 615aac4..57e755b 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsGetSigningKeys.php
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetSigningKeys.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Settings;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Enums\StandardError;
diff --git a/src/Socialbox/Classes/StandardMethods/SettingsSetOtp.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsSetOtp.php
similarity index 98%
rename from src/Socialbox/Classes/StandardMethods/SettingsSetOtp.php
rename to src/Socialbox/Classes/StandardMethods/Settings/SettingsSetOtp.php
index be07301..7da0714 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsSetOtp.php
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsSetOtp.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Settings;
 
     use Exception;
     use Socialbox\Abstracts\Method;
diff --git a/src/Socialbox/Classes/StandardMethods/SettingsSetPassword.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsSetPassword.php
similarity index 97%
rename from src/Socialbox/Classes/StandardMethods/SettingsSetPassword.php
rename to src/Socialbox/Classes/StandardMethods/Settings/SettingsSetPassword.php
index 73eca67..21c4b10 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsSetPassword.php
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsSetPassword.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Settings;
 
     use Exception;
     use Socialbox\Abstracts\Method;
diff --git a/src/Socialbox/Classes/StandardMethods/SettingsUpdateInformationField.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdateInformationField.php
similarity index 97%
rename from src/Socialbox/Classes/StandardMethods/SettingsUpdateInformationField.php
rename to src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdateInformationField.php
index 684fbf2..3b3de31 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsUpdateInformationField.php
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdateInformationField.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Settings;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Enums\StandardError;
diff --git a/src/Socialbox/Classes/StandardMethods/SettingsUpdateInformationPrivacy.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdateInformationPrivacy.php
similarity index 97%
rename from src/Socialbox/Classes/StandardMethods/SettingsUpdateInformationPrivacy.php
rename to src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdateInformationPrivacy.php
index a63f494..5e80cda 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsUpdateInformationPrivacy.php
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdateInformationPrivacy.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Settings;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Enums\PrivacyState;
diff --git a/src/Socialbox/Classes/StandardMethods/SettingsUpdatePassword.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdatePassword.php
similarity index 98%
rename from src/Socialbox/Classes/StandardMethods/SettingsUpdatePassword.php
rename to src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdatePassword.php
index d62339d..4668144 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsUpdatePassword.php
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdatePassword.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Settings;
 
     use Exception;
     use Socialbox\Abstracts\Method;
diff --git a/src/Socialbox/Classes/StandardMethods/Authenticate.php b/src/Socialbox/Classes/StandardMethods/Verification/Authenticate.php
similarity index 95%
rename from src/Socialbox/Classes/StandardMethods/Authenticate.php
rename to src/Socialbox/Classes/StandardMethods/Verification/Authenticate.php
index 0ede4b4..2fb452a 100644
--- a/src/Socialbox/Classes/StandardMethods/Authenticate.php
+++ b/src/Socialbox/Classes/StandardMethods/Verification/Authenticate.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Verification;
 
     use Exception;
     use Socialbox\Abstracts\Method;
diff --git a/src/Socialbox/Classes/StandardMethods/VerificationAnswerImageCaptcha.php b/src/Socialbox/Classes/StandardMethods/Verification/VerificationAnswerImageCaptcha.php
similarity index 97%
rename from src/Socialbox/Classes/StandardMethods/VerificationAnswerImageCaptcha.php
rename to src/Socialbox/Classes/StandardMethods/Verification/VerificationAnswerImageCaptcha.php
index e0d627e..27c0425 100644
--- a/src/Socialbox/Classes/StandardMethods/VerificationAnswerImageCaptcha.php
+++ b/src/Socialbox/Classes/StandardMethods/Verification/VerificationAnswerImageCaptcha.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Verification;
 
     use Socialbox\Abstracts\Method;
     use Socialbox\Enums\Flags\SessionFlags;
diff --git a/src/Socialbox/Classes/StandardMethods/VerificationGetImageCaptcha.php b/src/Socialbox/Classes/StandardMethods/Verification/VerificationGetImageCaptcha.php
similarity index 97%
rename from src/Socialbox/Classes/StandardMethods/VerificationGetImageCaptcha.php
rename to src/Socialbox/Classes/StandardMethods/Verification/VerificationGetImageCaptcha.php
index cfbc27e..e0debbf 100644
--- a/src/Socialbox/Classes/StandardMethods/VerificationGetImageCaptcha.php
+++ b/src/Socialbox/Classes/StandardMethods/Verification/VerificationGetImageCaptcha.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Verification;
 
     use Gregwar\Captcha\CaptchaBuilder;
     use Socialbox\Abstracts\Method;
diff --git a/src/Socialbox/Classes/StandardMethods/VerificationOtpAuthentication.php b/src/Socialbox/Classes/StandardMethods/Verification/VerificationOtpAuthentication.php
similarity index 97%
rename from src/Socialbox/Classes/StandardMethods/VerificationOtpAuthentication.php
rename to src/Socialbox/Classes/StandardMethods/Verification/VerificationOtpAuthentication.php
index f92c23e..af61e65 100644
--- a/src/Socialbox/Classes/StandardMethods/VerificationOtpAuthentication.php
+++ b/src/Socialbox/Classes/StandardMethods/Verification/VerificationOtpAuthentication.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Verification;
 
     use Exception;
     use Socialbox\Abstracts\Method;
diff --git a/src/Socialbox/Classes/StandardMethods/VerificationPasswordAuthentication.php b/src/Socialbox/Classes/StandardMethods/Verification/VerificationPasswordAuthentication.php
similarity index 97%
rename from src/Socialbox/Classes/StandardMethods/VerificationPasswordAuthentication.php
rename to src/Socialbox/Classes/StandardMethods/Verification/VerificationPasswordAuthentication.php
index 7108403..f1d56c4 100644
--- a/src/Socialbox/Classes/StandardMethods/VerificationPasswordAuthentication.php
+++ b/src/Socialbox/Classes/StandardMethods/Verification/VerificationPasswordAuthentication.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Socialbox\Classes\StandardMethods;
+    namespace Socialbox\Classes\StandardMethods\Verification;
 
     use Exception;
     use Socialbox\Abstracts\Method;
diff --git a/src/Socialbox/Enums/StandardMethods.php b/src/Socialbox/Enums/StandardMethods.php
index 775da0a..11f5f2a 100644
--- a/src/Socialbox/Enums/StandardMethods.php
+++ b/src/Socialbox/Enums/StandardMethods.php
@@ -3,41 +3,41 @@
     namespace Socialbox\Enums;
 
     use Socialbox\Classes\Configuration;
-    use Socialbox\Classes\StandardMethods\AcceptCommunityGuidelines;
-    use Socialbox\Classes\StandardMethods\AcceptPrivacyPolicy;
-    use Socialbox\Classes\StandardMethods\AcceptTermsOfService;
-    use Socialbox\Classes\StandardMethods\AddressBookAddContact;
-    use Socialbox\Classes\StandardMethods\AddressBookDeleteContact;
-    use Socialbox\Classes\StandardMethods\AddressBookGetContacts;
-    use Socialbox\Classes\StandardMethods\AddressBookUpdateRelationship;
-    use Socialbox\Classes\StandardMethods\Authenticate;
-    use Socialbox\Classes\StandardMethods\GetAllowedMethods;
-    use Socialbox\Classes\StandardMethods\GetCommunityGuidelines;
-    use Socialbox\Classes\StandardMethods\GetPrivacyPolicy;
-    use Socialbox\Classes\StandardMethods\GetSessionState;
-    use Socialbox\Classes\StandardMethods\GetTermsOfService;
-    use Socialbox\Classes\StandardMethods\Ping;
-    use Socialbox\Classes\StandardMethods\ResolvePeer;
-    use Socialbox\Classes\StandardMethods\ResolvePeerSignature;
-    use Socialbox\Classes\StandardMethods\SettingsAddInformationField;
-    use Socialbox\Classes\StandardMethods\SettingsAddSignature;
-    use Socialbox\Classes\StandardMethods\SettingsDeleteInformationField;
-    use Socialbox\Classes\StandardMethods\SettingsDeleteOtp;
-    use Socialbox\Classes\StandardMethods\SettingsDeletePassword;
-    use Socialbox\Classes\StandardMethods\SettingsDeleteSignature;
-    use Socialbox\Classes\StandardMethods\SettingsGetInformationField;
-    use Socialbox\Classes\StandardMethods\SettingsGetInformationFields;
-    use Socialbox\Classes\StandardMethods\SettingsGetSigningKey;
-    use Socialbox\Classes\StandardMethods\SettingsGetSigningKeys;
-    use Socialbox\Classes\StandardMethods\SettingsSetOtp;
-    use Socialbox\Classes\StandardMethods\SettingsSetPassword;
-    use Socialbox\Classes\StandardMethods\SettingsUpdateInformationField;
-    use Socialbox\Classes\StandardMethods\SettingsUpdateInformationPrivacy;
-    use Socialbox\Classes\StandardMethods\SettingsUpdatePassword;
-    use Socialbox\Classes\StandardMethods\VerificationAnswerImageCaptcha;
-    use Socialbox\Classes\StandardMethods\VerificationGetImageCaptcha;
-    use Socialbox\Classes\StandardMethods\VerificationOtpAuthentication;
-    use Socialbox\Classes\StandardMethods\VerificationPasswordAuthentication;
+    use Socialbox\Classes\StandardMethods\AddressBook\AddressBookAddContact;
+    use Socialbox\Classes\StandardMethods\AddressBook\AddressBookDeleteContact;
+    use Socialbox\Classes\StandardMethods\AddressBook\AddressBookGetContacts;
+    use Socialbox\Classes\StandardMethods\AddressBook\AddressBookUpdateRelationship;
+    use Socialbox\Classes\StandardMethods\Core\GetAllowedMethods;
+    use Socialbox\Classes\StandardMethods\Core\GetSessionState;
+    use Socialbox\Classes\StandardMethods\Core\Ping;
+    use Socialbox\Classes\StandardMethods\Core\ResolvePeer;
+    use Socialbox\Classes\StandardMethods\Core\ResolvePeerSignature;
+    use Socialbox\Classes\StandardMethods\ServerDocuments\AcceptCommunityGuidelines;
+    use Socialbox\Classes\StandardMethods\ServerDocuments\AcceptPrivacyPolicy;
+    use Socialbox\Classes\StandardMethods\ServerDocuments\AcceptTermsOfService;
+    use Socialbox\Classes\StandardMethods\ServerDocuments\GetCommunityGuidelines;
+    use Socialbox\Classes\StandardMethods\ServerDocuments\GetPrivacyPolicy;
+    use Socialbox\Classes\StandardMethods\ServerDocuments\GetTermsOfService;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsAddInformationField;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsAddSignature;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsDeleteInformationField;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsDeleteOtp;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsDeletePassword;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsDeleteSignature;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsGetInformationField;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsGetInformationFields;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsGetSigningKey;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsGetSigningKeys;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsSetOtp;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsSetPassword;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsUpdateInformationField;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsUpdateInformationPrivacy;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsUpdatePassword;
+    use Socialbox\Classes\StandardMethods\Verification\Authenticate;
+    use Socialbox\Classes\StandardMethods\Verification\VerificationAnswerImageCaptcha;
+    use Socialbox\Classes\StandardMethods\Verification\VerificationGetImageCaptcha;
+    use Socialbox\Classes\StandardMethods\Verification\VerificationOtpAuthentication;
+    use Socialbox\Classes\StandardMethods\Verification\VerificationPasswordAuthentication;
     use Socialbox\Enums\Flags\SessionFlags;
     use Socialbox\Exceptions\DatabaseOperationException;
     use Socialbox\Exceptions\StandardException;