--- a/conduitdemo/docker-compose.yml
+++ b/conduitdemo/docker-compose.yml
@@ -52,14 +52,14 @@ services:
   mountebank:
     build:
       context: ../docker/mountebank/
     command: start --logfile /mb.log --debug --mock
 
   bmo:
     build:
       context: docker/bmo
-      dockerfile: ./docker/dockerfile-dev
+      dockerfile: Dockerfile
     ports:
       - "7777:80"
 
 volumes:
   data-volume:

rename from conduitdemo/docker/bmo/docker/dockerfile-dev
rename to conduitdemo/docker/bmo/Dockerfile
--- a/conduitdemo/docker/bmo/docker/dockerfile-dev
+++ b/conduitdemo/docker/bmo/Dockerfile
@@ -8,30 +8,30 @@
 FROM mozillabteam/bmo-ci
 MAINTAINER David Lawrence <dkl@mozilla.com>
 
 ENV CONDUIT_LOGIN conduit@mozilla.bugs
 ENV CONDUIT_PASSWORD password
 ENV CONDUIT_API_KEY zQ5TSBzq7tTZMtKYq9K1ZqJMjifKx3cPL7pIGk9Q
 
 # Supervisor setup
-COPY docker/conf/supervisord.conf /etc/supervisord.conf
+COPY conf/supervisord.conf /etc/supervisord.conf
 RUN chmod 700 /etc/supervisord.conf
 
 # Apache configuration
-COPY docker/conf/bugzilla.conf /etc/httpd/conf.d/bugzilla.conf
+COPY conf/bugzilla.conf /etc/httpd/conf.d/bugzilla.conf
 
 # Copy setup scripts
-COPY docker/scripts/* /usr/local/bin/
+COPY scripts/* /usr/local/bin/
 RUN chmod 755 /usr/local/bin/*
 
 # Apache fixes
 RUN sed -e "s?^User apache?User $BUGZILLA_USER?" --in-place /etc/httpd/conf/httpd.conf
 RUN sed -e "s?^Group apache?Group $BUGZILLA_USER?" --in-place /etc/httpd/conf/httpd.conf
 
 # Development environment setup
 RUN rm -rf $BUGZILLA_ROOT \
     && git clone $GITHUB_BASE_GIT -b $GITHUB_BASE_BRANCH $BUGZILLA_ROOT \
     && ln -sf $BUGZILLA_LIB $BUGZILLA_ROOT/local
-COPY docker/conf/checksetup_answers.txt $BUGZILLA_ROOT/checksetup_answers.txt
+COPY conf/checksetup_answers.txt $BUGZILLA_ROOT/checksetup_answers.txt
 RUN bugzilla_config.sh
 
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]

deleted file mode 100644
--- a/conduitdemo/docker/bmo/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Test BMO (Bugzilla) Instance
-
-A Bugzilla system for attaching review requests to bug reports.
-
-## Building
-
-##### Prerequisites
-
- * `docker` (on OS X you will want `docker-machine`, too)
- * `docker-compose`
- * `pyinvoke` (v0.13+, can be installed on OS X with a [Homebrew formula](http://brewformulas.org/pyinvoke))

rename from conduitdemo/docker/bmo/docker/conf/bugzilla.conf
rename to conduitdemo/docker/bmo/conf/bugzilla.conf

rename from conduitdemo/docker/bmo/docker/conf/checksetup_answers.txt
rename to conduitdemo/docker/bmo/conf/checksetup_answers.txt

rename from conduitdemo/docker/bmo/docker/conf/supervisord.conf
rename to conduitdemo/docker/bmo/conf/supervisord.conf

deleted file mode 100644
--- a/conduitdemo/docker/bmo/docker-compose.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-version: '2'
-services:
-  bmo:
-    build:
-      context: ./
-      dockerfile: ./docker/dockerfile-dev
-    volumes:
-      - ./:/app
-    ports:
-      - "80:80"

rename from conduitdemo/docker/bmo/docker/scripts/bugzilla_config.sh
rename to conduitdemo/docker/bmo/scripts/bugzilla_config.sh

rename from conduitdemo/docker/bmo/docker/scripts/generate_conduit_data.pl
rename to conduitdemo/docker/bmo/scripts/generate_conduit_data.pl