diff --git a/.github/workflows/php-core.yml b/.github/workflows/php-core.yml
index 650b770..a20733e 100644
--- a/.github/workflows/php-core.yml
+++ b/.github/workflows/php-core.yml
@@ -3,8 +3,8 @@ name: Build PHP Core
 on:
   push:
     paths:
-      - php/php-core
-      - php/Dockerfile.Core
+      - 'php/core/**'
+      - 'php/Dockerfile.Core'
   workflow_run:
     workflows:
       - Build Marshall
diff --git a/.github/workflows/php-flavours.yml b/.github/workflows/php-flavours.yml
index ca6acea..9929af5 100644
--- a/.github/workflows/php-flavours.yml
+++ b/.github/workflows/php-flavours.yml
@@ -3,9 +3,9 @@ name: Build PHP Flavours
 on:
   push:
     paths:
-      - 'php/php+apache/**'
-      - 'php/php+cli/**'
-      - 'php/php+nginx/**'
+      - 'php/apache/**'
+      - 'php/cli/**'
+      - 'php/nginx/**'
       - 'php/Dockerfile.Flavours'
   workflow_run:
     workflows:
diff --git a/php/Dockerfile.Core b/php/Dockerfile.Core
index a967e78..b2137ba 100644
--- a/php/Dockerfile.Core
+++ b/php/Dockerfile.Core
@@ -3,7 +3,7 @@ FROM benzine/marshall:latest AS php-core
 LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \
       org.label-schema.vcs-url="https://github.com/benzine-framework/docker"
 ARG PHP_PACKAGES
-COPY php-core/install-report.sh /usr/bin/install-report
+COPY core/install-report.sh /usr/bin/install-report
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN echo "APT::Acquire::Retries \"5\";" > /etc/apt/apt.conf.d/80-retries && \
     echo "Acquire::http::No-Cache=true;" > /etc/apt/apt.conf.d/80-no-cache && \
diff --git a/php/php+apache/ApacheConfig.conf b/php/apache/ApacheConfig.conf
similarity index 100%
rename from php/php+apache/ApacheConfig.conf
rename to php/apache/ApacheConfig.conf
diff --git a/php/php+apache/apache.runit b/php/apache/apache.runit
similarity index 100%
rename from php/php+apache/apache.runit
rename to php/apache/apache.runit
diff --git a/php/php+apache/apache2.conf b/php/apache/apache2.conf
similarity index 100%
rename from php/php+apache/apache2.conf
rename to php/apache/apache2.conf
diff --git a/php/php+apache/envvars b/php/apache/envvars
similarity index 100%
rename from php/php+apache/envvars
rename to php/apache/envvars
diff --git a/php/php+apache/show_logs.runit b/php/apache/show_logs.runit
similarity index 100%
rename from php/php+apache/show_logs.runit
rename to php/apache/show_logs.runit
diff --git a/php/php+cli/psysh-config.php b/php/cli/psysh-config.php
similarity index 100%
rename from php/php+cli/psysh-config.php
rename to php/cli/psysh-config.php
diff --git a/php/php-core/install-report.sh b/php/core/install-report.sh
similarity index 100%
rename from php/php-core/install-report.sh
rename to php/core/install-report.sh
diff --git a/php/php+nginx/NginxDefault b/php/nginx/NginxDefault
similarity index 100%
rename from php/php+nginx/NginxDefault
rename to php/nginx/NginxDefault
diff --git a/php/php+nginx/NginxSSL b/php/nginx/NginxSSL
similarity index 100%
rename from php/php+nginx/NginxSSL
rename to php/nginx/NginxSSL
diff --git a/php/php+nginx/letsencrypt.runit b/php/nginx/letsencrypt.runit
similarity index 100%
rename from php/php+nginx/letsencrypt.runit
rename to php/nginx/letsencrypt.runit
diff --git a/php/php+nginx/logs-nginx-access.runit b/php/nginx/logs-nginx-access.runit
similarity index 100%
rename from php/php+nginx/logs-nginx-access.runit
rename to php/nginx/logs-nginx-access.runit
diff --git a/php/php+nginx/logs-nginx-error.runit b/php/nginx/logs-nginx-error.runit
similarity index 100%
rename from php/php+nginx/logs-nginx-error.runit
rename to php/nginx/logs-nginx-error.runit
diff --git a/php/php+nginx/logs-phpfpm-error.runit b/php/nginx/logs-phpfpm-error.runit
similarity index 100%
rename from php/php+nginx/logs-phpfpm-error.runit
rename to php/nginx/logs-phpfpm-error.runit
diff --git a/php/php+nginx/nginx.runit b/php/nginx/nginx.runit
similarity index 100%
rename from php/php+nginx/nginx.runit
rename to php/nginx/nginx.runit
diff --git a/php/php+nginx/php-fpm.runit b/php/nginx/php-fpm.runit
similarity index 100%
rename from php/php+nginx/php-fpm.runit
rename to php/nginx/php-fpm.runit