diff --git a/.github/Dockerfile b/.github/Dockerfile
index 63653562..3d78a0c9 100644
--- a/.github/Dockerfile
+++ b/.github/Dockerfile
@@ -34,9 +34,6 @@ EXPOSE 3306 33060
 # Install sudo (required for Gitpod)
 RUN apt-get install -y --no-install-recommends sudo
 
-# Install Pages
-COPY --chown=$APP_USER:$APP_USER ./config/pages $APP_DATA/config/pages
-
 # Install MySQL
 COPY ./config/s6/mysql-init.d /etc/mysql-init.d/
 COPY ./config/mysql /etc/mysql/
diff --git a/config/composer.json b/config/composer.json
deleted file mode 100755
index 9c36ba58..00000000
--- a/config/composer.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "name": "joomlatools/server",
-  "type": "project",
-  "homepage": "https://github.com/joomlatools/joomlatools-server",
-  "authors": [
-    {
-      "name": "Johan Janssens",
-      "email": "johan@janssens.me",
-      "homepage": "http://about.me/johanjanssens"
-    },
-    {
-      "name": "Timble",
-      "email": "info@timble.net",
-      "homepage": "http://www.timble.net"
-    }
-  ],
-  "require": {
-    "phpmailer/phpmailer": "^6.5",
-    "michelf/php-markdown": "^1.9",
-    "voku/html-min": "^4.0",
-    "matthiasmullie/minify": "^1.3",
-    "foliolabs/folioshell": "dev-feature/10-refactor as 1.1.x-dev",
-    "joomlatools/console": "dev-master as 1.6.x-dev",
-    "joomlatools/framework": "dev-master as 3.5.x-dev",
-    "joomlatools/pages": "dev-master as 0.22.x-dev"
-  }
-}
diff --git a/config/composer.stub b/config/composer.stub
deleted file mode 100644
index 8b137891..00000000
--- a/config/composer.stub
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/config/composer/pages.json b/config/composer/pages.json
new file mode 100755
index 00000000..78142c75
--- /dev/null
+++ b/config/composer/pages.json
@@ -0,0 +1,10 @@
+{
+  "require": {
+    "phpmailer/phpmailer": "^6.5",
+    "michelf/php-markdown": "^1.9",
+    "voku/html-min": "^4.0",
+    "matthiasmullie/minify": "^1.3",
+    "joomlatools/framework": "dev-master as 3.5.x-dev",
+    "joomlatools/pages": "dev-master as 0.22.x-dev"
+  }
+}
diff --git a/config/composer/shell.json b/config/composer/shell.json
new file mode 100755
index 00000000..1de60c6a
--- /dev/null
+++ b/config/composer/shell.json
@@ -0,0 +1,6 @@
+{
+  "require": {
+    "foliolabs/folioshell": "dev-feature/10-refactor as 1.1.x-dev",
+    "joomlatools/console": "dev-master as 1.6.x-dev"
+  }
+}
\ No newline at end of file
diff --git a/config/preload_ignore.php b/config/opcache/preload_ignore.php
similarity index 100%
rename from config/preload_ignore.php
rename to config/opcache/preload_ignore.php
diff --git a/config/pages/koowa.php b/config/vendor/koowa.php
similarity index 100%
rename from config/pages/koowa.php
rename to config/vendor/koowa.php
diff --git a/config/pages/pages.php b/config/vendor/pages.php
similarity index 100%
rename from config/pages/pages.php
rename to config/vendor/pages.php