diff --git a/Classes/DigiComp/SettingValidator/Package.php b/Classes/Package.php
similarity index 100%
rename from Classes/DigiComp/SettingValidator/Package.php
rename to Classes/Package.php
diff --git a/Classes/DigiComp/SettingValidator/Validation/Validator/SettingsValidator.php b/Classes/Validation/Validator/SettingsValidator.php
similarity index 98%
rename from Classes/DigiComp/SettingValidator/Validation/Validator/SettingsValidator.php
rename to Classes/Validation/Validator/SettingsValidator.php
index 7132f62..112bdc4 100644
--- a/Classes/DigiComp/SettingValidator/Validation/Validator/SettingsValidator.php
+++ b/Classes/Validation/Validator/SettingsValidator.php
@@ -93,8 +93,7 @@ class SettingsValidator extends AbstractValidator
                 $this->result->forProperty($validatorConfig['property'])->merge(
                     $validator->validate(ObjectAccess::getPropertyPath($value, $validatorConfig['property']))
                 );
-            }
-            else {
+            } else {
                 $this->result->merge($validator->validate($value));
             }
         }
diff --git a/composer.json b/composer.json
index f8551f2..20f8488 100644
--- a/composer.json
+++ b/composer.json
@@ -21,8 +21,8 @@
         "neos/flow": "~4.1"
     },
     "autoload": {
-        "psr-0": {
-            "DigiComp\\SettingValidator": "Classes"
+        "psr-4": {
+            "DigiComp\\SettingValidator\\": "Classes"
         }
     },
     "extra": {