diff --git a/composer.json b/composer.json
index 173fa4d..b122758 100644
--- a/composer.json
+++ b/composer.json
@@ -25,8 +25,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Meritoo\\LimeSurvey\\": "src/Meritoo/LimeSurvey/",
-            "Meritoo\\LimeSurvey\\Test\\": "tests/Meritoo/LimeSurvey/Test/"
+            "Meritoo\\LimeSurvey\\ApiClient\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Meritoo\\LimeSurvey\\Test\\ApiClient\\": "tests/"
         }
     }
 }
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Base/Result/BaseItem.php b/src/Base/Result/BaseItem.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Base/Result/BaseItem.php
rename to src/Base/Result/BaseItem.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Client/Client.php b/src/Client/Client.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Client/Client.php
rename to src/Client/Client.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Configuration/ConnectionConfiguration.php b/src/Configuration/ConnectionConfiguration.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Configuration/ConnectionConfiguration.php
rename to src/Configuration/ConnectionConfiguration.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Exception/CannotProcessDataException.php b/src/Exception/CannotProcessDataException.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Exception/CannotProcessDataException.php
rename to src/Exception/CannotProcessDataException.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Exception/CreateSessionKeyFailedException.php b/src/Exception/CreateSessionKeyFailedException.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Exception/CreateSessionKeyFailedException.php
rename to src/Exception/CreateSessionKeyFailedException.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Exception/InvalidResultOfMethodRunException.php b/src/Exception/InvalidResultOfMethodRunException.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Exception/InvalidResultOfMethodRunException.php
rename to src/Exception/InvalidResultOfMethodRunException.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Exception/UnknownInstanceOfResultItem.php b/src/Exception/UnknownInstanceOfResultItem.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Exception/UnknownInstanceOfResultItem.php
rename to src/Exception/UnknownInstanceOfResultItem.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Exception/UnknownMethodException.php b/src/Exception/UnknownMethodException.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Exception/UnknownMethodException.php
rename to src/Exception/UnknownMethodException.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Manager/JsonRpcClientManager.php b/src/Manager/JsonRpcClientManager.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Manager/JsonRpcClientManager.php
rename to src/Manager/JsonRpcClientManager.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Manager/SessionManager.php b/src/Manager/SessionManager.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Manager/SessionManager.php
rename to src/Manager/SessionManager.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Result/Collection/Participants.php b/src/Result/Collection/Participants.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Result/Collection/Participants.php
rename to src/Result/Collection/Participants.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Result/Item/Participant.php b/src/Result/Item/Participant.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Result/Item/Participant.php
rename to src/Result/Item/Participant.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Result/Item/ParticipantShort.php b/src/Result/Item/ParticipantShort.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Result/Item/ParticipantShort.php
rename to src/Result/Item/ParticipantShort.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Result/Item/Question.php b/src/Result/Item/Question.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Result/Item/Question.php
rename to src/Result/Item/Question.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Result/Item/QuestionShort.php b/src/Result/Item/QuestionShort.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Result/Item/QuestionShort.php
rename to src/Result/Item/QuestionShort.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Result/Item/Survey.php b/src/Result/Item/Survey.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Result/Item/Survey.php
rename to src/Result/Item/Survey.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Result/Processor/ResultProcessor.php b/src/Result/Processor/ResultProcessor.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Result/Processor/ResultProcessor.php
rename to src/Result/Processor/ResultProcessor.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Result/Result.php b/src/Result/Result.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Result/Result.php
rename to src/Result/Result.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Service/ParticipantService.php b/src/Service/ParticipantService.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Service/ParticipantService.php
rename to src/Service/ParticipantService.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Service/SurveyService.php b/src/Service/SurveyService.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Service/SurveyService.php
rename to src/Service/SurveyService.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Type/MethodType.php b/src/Type/MethodType.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Type/MethodType.php
rename to src/Type/MethodType.php
diff --git a/src/Meritoo/LimeSurvey/ApiClient/Type/SystemMethodType.php b/src/Type/SystemMethodType.php
similarity index 100%
rename from src/Meritoo/LimeSurvey/ApiClient/Type/SystemMethodType.php
rename to src/Type/SystemMethodType.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Base/Result/BaseItemTest.php b/tests/Base/Result/BaseItemTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Base/Result/BaseItemTest.php
rename to tests/Base/Result/BaseItemTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Client/ClientTest.php b/tests/Client/ClientTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Client/ClientTest.php
rename to tests/Client/ClientTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Configuration/ConnectionConfigurationTest.php b/tests/Configuration/ConnectionConfigurationTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Configuration/ConnectionConfigurationTest.php
rename to tests/Configuration/ConnectionConfigurationTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Exception/CannotProcessDataExceptionTest.php b/tests/Exception/CannotProcessDataExceptionTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Exception/CannotProcessDataExceptionTest.php
rename to tests/Exception/CannotProcessDataExceptionTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Exception/CreateSessionKeyFailedExceptionTest.php b/tests/Exception/CreateSessionKeyFailedExceptionTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Exception/CreateSessionKeyFailedExceptionTest.php
rename to tests/Exception/CreateSessionKeyFailedExceptionTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Exception/InvalidResultOfMethodRunExceptionTest.php b/tests/Exception/InvalidResultOfMethodRunExceptionTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Exception/InvalidResultOfMethodRunExceptionTest.php
rename to tests/Exception/InvalidResultOfMethodRunExceptionTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Exception/UnknownInstanceOfResultItemTest.php b/tests/Exception/UnknownInstanceOfResultItemTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Exception/UnknownInstanceOfResultItemTest.php
rename to tests/Exception/UnknownInstanceOfResultItemTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Exception/UnknownMethodExceptionTest.php b/tests/Exception/UnknownMethodExceptionTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Exception/UnknownMethodExceptionTest.php
rename to tests/Exception/UnknownMethodExceptionTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Manager/JsonRpcClientManagerTest.php b/tests/Manager/JsonRpcClientManagerTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Manager/JsonRpcClientManagerTest.php
rename to tests/Manager/JsonRpcClientManagerTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Manager/SessionManagerTest.php b/tests/Manager/SessionManagerTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Manager/SessionManagerTest.php
rename to tests/Manager/SessionManagerTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Collection/ParticipantsTest.php b/tests/Result/Collection/ParticipantsTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Collection/ParticipantsTest.php
rename to tests/Result/Collection/ParticipantsTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Item/ParticipantShortTest.php b/tests/Result/Item/ParticipantShortTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Item/ParticipantShortTest.php
rename to tests/Result/Item/ParticipantShortTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Item/ParticipantTest.php b/tests/Result/Item/ParticipantTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Item/ParticipantTest.php
rename to tests/Result/Item/ParticipantTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Item/QuestionShortTest.php b/tests/Result/Item/QuestionShortTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Item/QuestionShortTest.php
rename to tests/Result/Item/QuestionShortTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Item/QuestionTest.php b/tests/Result/Item/QuestionTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Item/QuestionTest.php
rename to tests/Result/Item/QuestionTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Item/SurveyTest.php b/tests/Result/Item/SurveyTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Item/SurveyTest.php
rename to tests/Result/Item/SurveyTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Processor/ResultProcessorTest.php b/tests/Result/Processor/ResultProcessorTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Processor/ResultProcessorTest.php
rename to tests/Result/Processor/ResultProcessorTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/ResultTest.php b/tests/Result/ResultTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Result/ResultTest.php
rename to tests/Result/ResultTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Service/ParticipantServiceTest.php b/tests/Service/ParticipantServiceTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Service/ParticipantServiceTest.php
rename to tests/Service/ParticipantServiceTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Service/SurveyServiceTest.php b/tests/Service/SurveyServiceTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Service/SurveyServiceTest.php
rename to tests/Service/SurveyServiceTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Type/MethodTypeTest.php b/tests/Type/MethodTypeTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Type/MethodTypeTest.php
rename to tests/Type/MethodTypeTest.php
diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Type/SystemMethodTypeTest.php b/tests/Type/SystemMethodTypeTest.php
similarity index 100%
rename from tests/Meritoo/LimeSurvey/Test/ApiClient/Type/SystemMethodTypeTest.php
rename to tests/Type/SystemMethodTypeTest.php