diff --git a/composer.json b/composer.json
index 727bc31..eeed42c 100644
--- a/composer.json
+++ b/composer.json
@@ -6,9 +6,6 @@
     "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",
@@ -58,6 +55,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",
@@ -68,39 +70,23 @@
             "url": "https://github.com/drutopia/drutopia"
         }
     },
-    "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": {
         "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": [
@@ -108,20 +94,23 @@
             ]
         },
         "enable-patching": true,
-	    "patches": {
-	        "drupal/search404": {
-                "Remove search module dependency": "https://www.drupal.org/files/issues/2018-07-09/search404-core-search-dependency-9.patch"
-	        },
-	        "drupal/coffee": {
-		        "Allow user to specify keyboard shortcut.": "https://www.drupal.org/files/issues/2018-11-11/1734898-14.coffee-hotkeys-plus-g.patch"
-	        },
-	        "drupal/wysiwyg_linebreaks": {
-                "Excess line breaks keep getting added": "https://www.drupal.org/files/issues/2018-11-18/excess-line-breaks-keep-getting-added-3013853-5.patch"
+        "patches": {
+            "drupal/search404": {
+                  "Remove search module dependency": "https://www.drupal.org/files/issues/2018-07-09/search404-core-search-dependency-9.patch"
+            },
+            "drupal/coffee": {
+              "Allow user to specify keyboard shortcut.": "https://www.drupal.org/files/issues/2018-11-11/1734898-14.coffee-hotkeys-plus-g.patch"
+            },
+            "drupal/wysiwyg_linebreaks": {
+                  "Excess line breaks keep getting added": "https://www.drupal.org/files/issues/2018-11-18/excess-line-breaks-keep-getting-added-3013853-5.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"
+        ]
     }
 }