diff --git a/.gitignore b/.gitignore
index 205c5938..a0928ae2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,4 @@ js/
 node_modules/
 vendor/
 img/twemoji/
-composer/*
-!composer/composer.json
-!composer/composer.lock
+vendor/
diff --git a/composer/composer.json b/composer.json
similarity index 92%
rename from composer/composer.json
rename to composer.json
index 2e394046..e197b04d 100644
--- a/composer/composer.json
+++ b/composer.json
@@ -13,14 +13,14 @@
     "platform": {
       "php": "7.0.0"
     },
-    "vendor-dir": ".",
+    "vendor-dir": "composer/",
     "optimize-autoloader": true,
     "classmap-authoritative": true,
     "autoloader-suffix": "Social"
   },
   "autoload": {
     "psr-4": {
-      "OCA\\Social\\": "../lib/"
+      "OCA\\Social\\": "lib/"
     }
   },
   "require": {
diff --git a/composer/composer.lock b/composer.lock
similarity index 100%
rename from composer/composer.lock
rename to composer.lock