diff --git a/Classes/Flowpack/SimpleSearch/Domain/Service/IndexInterface.php b/Classes/Domain/Service/IndexInterface.php
similarity index 100%
rename from Classes/Flowpack/SimpleSearch/Domain/Service/IndexInterface.php
rename to Classes/Domain/Service/IndexInterface.php
diff --git a/Classes/Flowpack/SimpleSearch/Domain/Service/SqLiteIndex.php b/Classes/Domain/Service/SqLiteIndex.php
similarity index 100%
rename from Classes/Flowpack/SimpleSearch/Domain/Service/SqLiteIndex.php
rename to Classes/Domain/Service/SqLiteIndex.php
diff --git a/Classes/Flowpack/SimpleSearch/Exception.php b/Classes/Exception.php
similarity index 100%
rename from Classes/Flowpack/SimpleSearch/Exception.php
rename to Classes/Exception.php
diff --git a/Classes/Flowpack/SimpleSearch/Factory/IndexFactory.php b/Classes/Factory/IndexFactory.php
similarity index 100%
rename from Classes/Flowpack/SimpleSearch/Factory/IndexFactory.php
rename to Classes/Factory/IndexFactory.php
diff --git a/Classes/Flowpack/SimpleSearch/Search/QueryBuilderInterface.php b/Classes/Search/QueryBuilderInterface.php
similarity index 100%
rename from Classes/Flowpack/SimpleSearch/Search/QueryBuilderInterface.php
rename to Classes/Search/QueryBuilderInterface.php
diff --git a/Classes/Flowpack/SimpleSearch/Search/SqLiteQueryBuilder.php b/Classes/Search/SqLiteQueryBuilder.php
similarity index 100%
rename from Classes/Flowpack/SimpleSearch/Search/SqLiteQueryBuilder.php
rename to Classes/Search/SqLiteQueryBuilder.php
diff --git a/composer.json b/composer.json
index c57e1fe..21dbc27 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,11 @@
 {
     "name": "flowpack/simplesearch",
-    "type": "typo3-flow-package",
+    "type": "neos-package",
     "description": "Plain PHP search engine using sqlite3 as storage backend.",
     "license": "MIT",
     "autoload": {
-        "psr-0": {
-            "Flowpack\\SimpleSearch": "Classes"
+        "psr-4": {
+            "Flowpack\\SimpleSearch\\": "Classes"
         }
     },
     "extra": {