--- a/conduitdemo/docker-compose.yml
+++ b/conduitdemo/docker-compose.yml
@@ -2,17 +2,17 @@
 # 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:
 
   demo:
     build:
-      context: ./docker-vct-hg
+      context: docker/vct-hg
       dockerfile: ./Dockerfile
 
   ## staginghgserver
   hgserver:
     build:
       context: ../staginghgserver
       dockerfile: ./docker/Dockerfile
     volumes:
@@ -51,15 +51,15 @@ services:
 
   mountebank:
     build:
       context: ../docker/mountebank/
     command: start --logfile /mb.log --debug --mock
 
   bmo:
     build:
-      context: ../bmo
+      context: docker/bmo
       dockerfile: ./docker/dockerfile-dev
     ports:
       - "7777:80"
 
 volumes:
   data-volume:

rename from bmo/README.md
rename to conduitdemo/docker/bmo/README.md

rename from bmo/docker-compose.yml
rename to conduitdemo/docker/bmo/docker-compose.yml

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

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

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

rename from bmo/docker/dockerfile-dev
rename to conduitdemo/docker/bmo/docker/dockerfile-dev

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

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

rename from conduitdemo/docker-vct-hg/Dockerfile
rename to conduitdemo/docker/vct-hg/Dockerfile

rename from conduitdemo/docker-vct-hg/hgrc
rename to conduitdemo/docker/vct-hg/hgrc