diff --git a/composer.json b/composer.json
index 7eeb26887..784c6d123 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,9 @@
     "autoload": {
         "psr-4": {
             "App\\": "src/",
-            "" : "src/"
+			"" : "src/",
+			"GPBMetadata\\": "src/GPBMetadata",
+            "Model\\Messages\\Gradido\\" : "src/Model/Messages/Gradido"
         }
     },
     "autoload-dev": {
diff --git a/src/Model/Messages/GPBMetadata/BasicTypes.php b/src/GPBMetadata/BasicTypes.php
similarity index 100%
rename from src/Model/Messages/GPBMetadata/BasicTypes.php
rename to src/GPBMetadata/BasicTypes.php
diff --git a/src/Model/Messages/GPBMetadata/StateCreateGroup.php b/src/GPBMetadata/StateCreateGroup.php
similarity index 100%
rename from src/Model/Messages/GPBMetadata/StateCreateGroup.php
rename to src/GPBMetadata/StateCreateGroup.php
diff --git a/src/Model/Messages/GPBMetadata/StateGroupChangeParent.php b/src/GPBMetadata/StateGroupChangeParent.php
similarity index 100%
rename from src/Model/Messages/GPBMetadata/StateGroupChangeParent.php
rename to src/GPBMetadata/StateGroupChangeParent.php
diff --git a/src/Model/Messages/GPBMetadata/Transaction.php b/src/GPBMetadata/Transaction.php
similarity index 100%
rename from src/Model/Messages/GPBMetadata/Transaction.php
rename to src/GPBMetadata/Transaction.php
diff --git a/src/Model/Messages/GPBMetadata/TransactionBody.php b/src/GPBMetadata/TransactionBody.php
similarity index 100%
rename from src/Model/Messages/GPBMetadata/TransactionBody.php
rename to src/GPBMetadata/TransactionBody.php
diff --git a/src/Model/Messages/GPBMetadata/TransactionCreation.php b/src/GPBMetadata/TransactionCreation.php
similarity index 100%
rename from src/Model/Messages/GPBMetadata/TransactionCreation.php
rename to src/GPBMetadata/TransactionCreation.php
diff --git a/src/Model/Messages/GPBMetadata/Transfer.php b/src/GPBMetadata/Transfer.php
similarity index 100%
rename from src/Model/Messages/GPBMetadata/Transfer.php
rename to src/GPBMetadata/Transfer.php