diff --git a/Dockerfile b/app/Dockerfile
similarity index 100%
rename from Dockerfile
rename to app/Dockerfile
diff --git a/entrypoint.sh b/app/entrypoint.sh
similarity index 100%
rename from entrypoint.sh
rename to app/entrypoint.sh
diff --git a/image-chooser.py b/app/image-chooser.py
similarity index 100%
rename from image-chooser.py
rename to app/image-chooser.py
diff --git a/requirements.txt b/app/requirements.txt
similarity index 100%
rename from requirements.txt
rename to app/requirements.txt
diff --git a/build.sh b/build.sh
index 1261950..6064735 100755
--- a/build.sh
+++ b/build.sh
@@ -13,5 +13,5 @@ else
     exit 1
 fi
 
-$CMD build -t $IMAGE .
+$CMD build -t $IMAGE app
 $CMD push $IMAGE
diff --git a/main.auto.tfvars b/terraform/main.auto.tfvars
similarity index 100%
rename from main.auto.tfvars
rename to terraform/main.auto.tfvars
diff --git a/main.tf b/terraform/main.tf
similarity index 100%
rename from main.tf
rename to terraform/main.tf
diff --git a/variables.tf b/terraform/variables.tf
similarity index 100%
rename from variables.tf
rename to terraform/variables.tf