diff --git a/composer.json b/composer.json
index f9ab1b73d44ca367411c1466b810cf324056a8f2..b15918c3edd5bb839df0cb7bb147fa513727f38d 100644
--- a/composer.json
+++ b/composer.json
@@ -30,24 +30,25 @@
         "wpackagist-theme/minimalism": "1.0.3",
         "wpackagist-plugin/disable-wordpress-updates": "^1.6",
         "wpackagist-plugin/hyperdb": "^1.6"
-    },
-    "config": {
-        "vendor-dir": "app/vendor"
-    },
+    },    
     "extra": {
         "wordpress-install-dir": "app/wp",
-        "installer-paths": {
-            "mu-plugins-src/{$name}": ["wpackagist-plugin/hyperdb", "wpackagist-plugin/disable-wordpress-updates"],
-            "app/content/mu-plugins/{$name}/" : ["type:wordpress-muplugin"],
+        "installer-paths": {            
+            "mu-plugins-src/{$name}": [
+                "wpackagist-plugin/hyperdb",
+                "wpackagist-plugin/disable-wordpress-updates",
+                "type:wordpress-muplugin"],
+            "app/{$name}": ["type:wordpress-dropin"],
             "app/content/plugins/{$name}/": ["type:wordpress-plugin"],
             "app/content/themes/{$name}/": ["type:wordpress-theme"]
         },
-        "wordpress-language-dir": "content/languages/",
+        "wordpress-language-dir": "app/content/languages/",
         "wordpress-languages": [ "en_GB", "it_IT" ],
         "patches-file": "composer.patches.json",        
         "dropin-paths": {
-            "app/content/": ["package:wpackagist-plugin/hyperdb:db.php"],
-            "app/content/mu-plugins/" : ["package:wpackagist-plugin/disable-wordpress-updates:disable-updates.php"]
+            "app/content/mu-plugins" : ["package:wpackagist-plugin/disable-wordpress-updates:disable-updates.php"],
+            "app/content": ["package:wpackagist-plugin/hyperdb:db.php"],
+            "app": ["package:lucha/r2db:db-config.php,nginx-map/wp-nginx-map-json.php,nginx-map/wp-nginx-map.php"]
         }
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index 83ded90d34c737f1fcff22e521072dfb37900e3b..74a5baf89a65f25b1bad9eb7df37e566e93c81a8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "89537593d5cc46b09253a3c802eec2a3",
+    "content-hash": "565f78e14e14ca0d9c05a68231bb78f3",
     "packages": [
         {
             "name": "bjornjohansen/wplang",
@@ -464,77 +464,18 @@
         }
     ],
     "packages-dev": [
-        {
-            "name": "flexihash/flexihash",
-            "version": "v2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pda/flexihash.git",
-                "reference": "497ba5782606d998f8ab0b4e5942e3a799bec018"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pda/flexihash/zipball/497ba5782606d998f8ab0b4e5942e3a799bec018",
-                "reference": "497ba5782606d998f8ab0b4e5942e3a799bec018",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8",
-                "satooshi/php-coveralls": "~1.0",
-                "squizlabs/php_codesniffer": "^2.3",
-                "symfony/config": "^2.0.0",
-                "symfony/console": "^2.0.0",
-                "symfony/filesystem": "^2.0.0",
-                "symfony/stopwatch": "^2.0.0",
-                "symfony/yaml": "^2.0.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Flexihash\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Paul Annesley",
-                    "email": "paul@annesley.cc",
-                    "homepage": "http://paul.annesley.cc"
-                },
-                {
-                    "name": "Dom Morgan",
-                    "email": "dom@d3r.com",
-                    "homepage": "https://d3r.com"
-                }
-            ],
-            "description": "Flexihash is a small PHP library which implements consistent hashing",
-            "homepage": "https://github.com/pda/flexihash",
-            "time": "2016-04-22T21:03:23+00:00"
-        },
         {
             "name": "lucha/r2db",
             "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "git@git.autistici.org:lucha/r2db.git",
-                "reference": "24bf8c45749c08e155dc31dbcd3d070fbc12024f"
+                "reference": "636019a5fd859f54c1e2fe0db8be181fd185c855"
             },
             "require": {
-                "flexihash/flexihash": "^2.0"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "db-hash.php",
-                    "db-backends.php"
-                ]
+                "composer/installers": "^1.9"
             },
+            "type": "wordpress-dropin",
             "license": [
                 "MIT"
             ],
@@ -545,7 +486,7 @@
                 }
             ],
             "description": "r2db wordpress database",
-            "time": "2020-05-23T21:30:55+00:00"
+            "time": "2020-05-23T22:04:37+00:00"
         }
     ],
     "aliases": [],