diff --git a/.gitignore b/.gitignore
index 1d7881a..228093c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,4 @@ out/*.zip
 out/*/**
 *.iml
 
-src/test/scala/com/williamslea/engage/recordings/*.scala
+src/test/scala/com/organziation/recordings/*.scala
diff --git a/Dockerfile b/Dockerfile
index 85ce0d4..e38f159 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ WORKDIR /build
 COPY pom.xml .
 
 COPY src/ /build/src
-COPY docker-entrypoint-script.sh .
+COPY docker/docker-entrypoint-script.sh .
 
 RUN mvn clean install
 
diff --git a/aws-run.ps1 b/aws/aws-run.ps1
similarity index 100%
rename from aws-run.ps1
rename to aws/aws-run.ps1
diff --git a/buildspec.yml b/aws/buildspec.yml
similarity index 100%
rename from buildspec.yml
rename to aws/buildspec.yml
diff --git a/docker-entrypoint-script.sh b/docker/docker-entrypoint-script.sh
similarity index 100%
rename from docker-entrypoint-script.sh
rename to docker/docker-entrypoint-script.sh
diff --git a/docker-run.ps1 b/docker/docker-run.ps1
similarity index 100%
rename from docker-run.ps1
rename to docker/docker-run.ps1
diff --git a/docker-run.sh b/docker/docker-run.sh
similarity index 100%
rename from docker-run.sh
rename to docker/docker-run.sh