diff --git a/Makefile b/Makefile
index 2ac67bf..ef79abd 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,11 @@ OUTPUT_IMAGE=$(shell find output/base -type f -name '*.ova' | head -1)
 all: output/unifi/
 
 output/base/:
-	packer build -var root_password=$(ROOT_PASSWORD) base.json
+	packer build -var root_password=$(ROOT_PASSWORD) packer/base.json
 
 output/unifi/: output/base/
 	packer build -var root_password=$(ROOT_PASSWORD) \
-		-var source_image=$(OUTPUT_IMAGE) provision.json
+		-var source_image=$(OUTPUT_IMAGE) packer/provision.json
 
 clean: clean_base clean_provisioned
 clean_base:
diff --git a/base.json b/packer/base.json
similarity index 100%
rename from base.json
rename to packer/base.json
diff --git a/provision.json b/packer/provision.json
similarity index 94%
rename from provision.json
rename to packer/provision.json
index 9bb39a1..1cebeeb 100644
--- a/provision.json
+++ b/packer/provision.json
@@ -36,7 +36,7 @@
       "type": "ansible",
       "extra_arguments": [],
       "user": "root",
-      "playbook_file": "./setup.yml"
+      "playbook_file": "./provisioning/setup.yml"
     }
   ]
 }
\ No newline at end of file
diff --git a/setup.yml b/provisioning/setup.yml
similarity index 100%
rename from setup.yml
rename to provisioning/setup.yml
diff --git a/templates/init.d/unifi b/provisioning/templates/init.d/unifi
similarity index 100%
rename from templates/init.d/unifi
rename to provisioning/templates/init.d/unifi
diff --git a/templates/unifi/log/run b/provisioning/templates/unifi/log/run
similarity index 100%
rename from templates/unifi/log/run
rename to provisioning/templates/unifi/log/run
diff --git a/templates/unifi/run b/provisioning/templates/unifi/run
similarity index 100%
rename from templates/unifi/run
rename to provisioning/templates/unifi/run