diff --git a/composer.json b/composer.json
index e9e77c7..43c5bc9 100644
--- a/composer.json
+++ b/composer.json
@@ -6,12 +6,8 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "behat/behat": "^3.4",
-        "behat/mink": "^1.7",
-        "behat/mink-goutte-driver": "^1.2",
         "composer/installers": "^1.7",
         "cweagans/composer-patches": "^1.0",
-        "drupal-composer/drupal-scaffold": "^2.0.0",
         "drupal/allowed_formats": "^1.1",
         "drupal/antibot": "^1.2",
         "drupal/ckeditorheight": "^1.3",
@@ -51,6 +47,11 @@
         "wikimedia/composer-merge-plugin": "^1.4",
         "zaporylie/composer-drupal-optimizations": "^1.0"
     },
+    "require-dev": {
+        "behat/behat": "^3.4",
+        "behat/mink": "^1.7",
+        "behat/mink-goutte-driver": "^1.2"
+    },
     "repositories": {
         "drupal": {
             "type": "composer",
@@ -73,35 +74,28 @@
             "url": "git@gitlab.com:agaric/drupal/twigsuggest.git"
         }
     },
-    "scripts": {
-        "post-install-cmd": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
-        "post-update-cmd": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
-        "nuke": "rm -rf vendor web/core web/modules/contrib web/profiles/contrib drush/contrib",
-        "quick-start": [
-            "composer install",
-            "php docroot/core/scripts/drupal quick-start drutopia --no-interaction"
-        ]
+    "config": {
+        "sort-packages": true,
+        "process-timeout": 600
+    },
+    "conflict": {
+        "drupal/drupal": "*"
     },
     "extra": {
+        "drupal-scaffold": {
+            "locations": {
+                "web-root": "web/"
+            }
+        },
         "installer-paths": {
-            "web/core": [
-                "drupal/core"
-            ],
-            "web/modules/contrib/{$name}": [
-                "type:drupal-module"
-            ],
-            "web/profiles/contrib/{$name}": [
-                "type:drupal-profile"
-            ],
-            "web/themes/contrib/{$name}": [
-                "type:drupal-theme"
-            ],
-            "web/libraries/{$name}": [
-                "type:drupal-library"
-            ],
-            "drush/contrib/{$name}": [
-                "type:drupal-drush"
-            ]
+            "web/core": ["type:drupal-core"],
+            "web/libraries/{$name}": ["type:drupal-library"],
+            "web/modules/contrib/{$name}": ["type:drupal-module"],
+            "web/profiles/contrib/{$name}": ["type:drupal-profile"],
+            "web/themes/contrib/{$name}": ["type:drupal-theme"],
+            "drush/Commands/contrib/{$name}": ["type:drupal-drush"],
+            "web/modules/custom/{$name}": ["type:drupal-custom-module"],
+            "web/themes/custom/{$name}": ["type:drupal-custom-theme"]
         },
         "merge-plugin": {
             "include": [
@@ -122,10 +116,13 @@
             "drupal/ds": {
                 "Template suggestions does not work": "https://www.drupal.org/files/issues/2018-08-27/2887778-9.patch"
             }
-	    }
+	      }
     },
-    "config": {
-        "sort-packages": true,
-        "process-timeout": 600
+    "scripts": {
+        "nuke": "rm -rf vendor web/core web/modules/contrib web/profiles/contrib drush/contrib",
+        "quick-start": [
+            "composer install",
+            "php docroot/core/scripts/drupal quick-start drutopia --no-interaction"
+        ]
     }
 }