diff --git a/composer.json b/composer.json
index f0b96124df9d5305d53cbd7fa43b7b44700abede..118b03fd38d504de43699317c77ade212a06a6d2 100644
--- a/composer.json
+++ b/composer.json
@@ -118,7 +118,7 @@
         "wpackagist-plugin/katex": "^2.1"
     },    
     "extra": {
-        "wordpress-install-dir": "app/wp-core",
+        "wordpress-install-dir": "app",
 	"installer-types": ["bower-asset", "npm-asset"],
         "installer-paths": {            
             "mu-plugins-tmp/{$name}": [
@@ -127,26 +127,26 @@
                 "wpackagist-plugin/wpmu-new-blog-defaults",
                 "wpackagist-plugin/disable-emojis",                
                 "type:wordpress-muplugin"],
-            "app/wp-core/{$name}": ["type:wordpress-dropin"],
-            "app/wp-core/wp-content/plugins/{$name}/": ["type:wordpress-plugin"],
-            "app/wp-core/wp-content/themes/{$name}/": ["type:wordpress-theme"],
-	    "app/wp-core/wp-includes/js/{$name}/": ["type:npm-asset", "type:bower-asset"]
+            "app/{$name}": ["type:wordpress-dropin"],
+            "app/wp-content/plugins/{$name}/": ["type:wordpress-plugin"],
+            "app/wp-content/themes/{$name}/": ["type:wordpress-theme"],
+	    "app/wp-includes/js/{$name}/": ["type:npm-asset", "type:bower-asset"]
         },
-        "wordpress-language-dir": "app/wp-core/wp-content/languages/",
+        "wordpress-language-dir": "app/wp-content/languages/",
         "wordpress-languages": ["ar", "ca","cy","da_DK","de_DE","el", "en_GB", "es_ES","fi","fr_FR", "it_IT","ja", "nl_NL", "nn_NO","pt_PT","ru_RU","sk_SK", "sv_SE", "ro_RO"],
         "patches-file": "composer.patches.json",        
         "dropin-paths": {
-            "app/wp-core/wp-content/mu-plugins" : [
+            "app/wp-content/mu-plugins" : [
                 "package:wpackagist-plugin/disable-wordpress-updates",
                 "package:wpackagist-plugin/wpmu-new-blog-defaults",
                 "package:wpackagist-plugin/disable-emojis",
 		"type:wordpress-muplugin"
             ],
-	    "app/wp-core/wp-content/themes" : [
+	    "app/wp-content/themes" : [
 		"package:noblogs/themes-child"
 	    ],
-            "app/wp-core/wp-content": ["package:wpackagist-plugin/hyperdb:db.php", "package:wpackagist-plugin/wp-super-cache:advanced-cache.php"],
-            "app/wp-core": ["package:noblogs/r2db:db-config.php,nginx-map/wp-nginx-map-json.php,nginx-map/wp-nginx-map.php"]
+            "app/wp-content": ["package:wpackagist-plugin/hyperdb:db.php", "package:wpackagist-plugin/wp-super-cache:advanced-cache.php"],
+            "app": ["package:noblogs/r2db:db-config.php,nginx-map/wp-nginx-map-json.php,nginx-map/wp-nginx-map.php"]
         }
     }
 }