diff --git a/singleuser-builder-conda/Dockerfile b/s2i-builders/conda/Dockerfile
similarity index 100%
rename from singleuser-builder-conda/Dockerfile
rename to s2i-builders/conda/Dockerfile
diff --git a/singleuser-builder-conda/Makefile b/s2i-builders/conda/Makefile
similarity index 100%
rename from singleuser-builder-conda/Makefile
rename to s2i-builders/conda/Makefile
diff --git a/singleuser-builder-conda/README.md b/s2i-builders/conda/README.md
similarity index 100%
rename from singleuser-builder-conda/README.md
rename to s2i-builders/conda/README.md
diff --git a/singleuser-builder-conda/environment.yml b/s2i-builders/conda/environment.yml
similarity index 100%
rename from singleuser-builder-conda/environment.yml
rename to s2i-builders/conda/environment.yml
diff --git a/singleuser-builder-conda/install-miniconda.bash b/s2i-builders/conda/install-miniconda.bash
similarity index 100%
rename from singleuser-builder-conda/install-miniconda.bash
rename to s2i-builders/conda/install-miniconda.bash
diff --git a/singleuser-builder-conda/s2i/bin/assemble b/s2i-builders/conda/s2i/bin/assemble
similarity index 100%
rename from singleuser-builder-conda/s2i/bin/assemble
rename to s2i-builders/conda/s2i/bin/assemble
diff --git a/singleuser-builder-conda/s2i/bin/run b/s2i-builders/conda/s2i/bin/run
similarity index 100%
rename from singleuser-builder-conda/s2i/bin/run
rename to s2i-builders/conda/s2i/bin/run
diff --git a/singleuser-builder-conda/s2i/bin/save-artifacts b/s2i-builders/conda/s2i/bin/save-artifacts
similarity index 100%
rename from singleuser-builder-conda/s2i/bin/save-artifacts
rename to s2i-builders/conda/s2i/bin/save-artifacts
diff --git a/singleuser-builder-conda/s2i/bin/usage b/s2i-builders/conda/s2i/bin/usage
similarity index 100%
rename from singleuser-builder-conda/s2i/bin/usage
rename to s2i-builders/conda/s2i/bin/usage
diff --git a/singleuser-builder-conda/test/run b/s2i-builders/conda/test/run
similarity index 100%
rename from singleuser-builder-conda/test/run
rename to s2i-builders/conda/test/run
diff --git a/singleuser-builder-conda/test/test-app/index.html b/s2i-builders/conda/test/test-app/index.html
similarity index 100%
rename from singleuser-builder-conda/test/test-app/index.html
rename to s2i-builders/conda/test/test-app/index.html
diff --git a/singleuser-builder-conda/version b/s2i-builders/conda/version
similarity index 100%
rename from singleuser-builder-conda/version
rename to s2i-builders/conda/version
diff --git a/singleuser-builder/Dockerfile b/s2i-builders/venv/Dockerfile
similarity index 100%
rename from singleuser-builder/Dockerfile
rename to s2i-builders/venv/Dockerfile
diff --git a/singleuser-builder/Dockerfile.py2 b/s2i-builders/venv/Dockerfile.py2
similarity index 100%
rename from singleuser-builder/Dockerfile.py2
rename to s2i-builders/venv/Dockerfile.py2
diff --git a/singleuser-builder/Makefile b/s2i-builders/venv/Makefile
similarity index 100%
rename from singleuser-builder/Makefile
rename to s2i-builders/venv/Makefile
diff --git a/singleuser-builder/README.md b/s2i-builders/venv/README.md
similarity index 100%
rename from singleuser-builder/README.md
rename to s2i-builders/venv/README.md
diff --git a/singleuser-builder/s2i/bin/assemble b/s2i-builders/venv/s2i/bin/assemble
similarity index 100%
rename from singleuser-builder/s2i/bin/assemble
rename to s2i-builders/venv/s2i/bin/assemble
diff --git a/singleuser-builder/s2i/bin/run b/s2i-builders/venv/s2i/bin/run
similarity index 100%
rename from singleuser-builder/s2i/bin/run
rename to s2i-builders/venv/s2i/bin/run
diff --git a/singleuser-builder/s2i/bin/save-artifacts b/s2i-builders/venv/s2i/bin/save-artifacts
similarity index 100%
rename from singleuser-builder/s2i/bin/save-artifacts
rename to s2i-builders/venv/s2i/bin/save-artifacts
diff --git a/singleuser-builder/s2i/bin/usage b/s2i-builders/venv/s2i/bin/usage
similarity index 100%
rename from singleuser-builder/s2i/bin/usage
rename to s2i-builders/venv/s2i/bin/usage
diff --git a/singleuser-builder/test/run b/s2i-builders/venv/test/run
similarity index 100%
rename from singleuser-builder/test/run
rename to s2i-builders/venv/test/run
diff --git a/singleuser-builder/test/test-app/index.html b/s2i-builders/venv/test/test-app/index.html
similarity index 100%
rename from singleuser-builder/test/test-app/index.html
rename to s2i-builders/venv/test/test-app/index.html
diff --git a/singleuser-builder/version b/s2i-builders/venv/version
similarity index 100%
rename from singleuser-builder/version
rename to s2i-builders/venv/version