diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..90bf051
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.DS_Store
+.aider*
+.vscode
+.idea
+bin
+tmp
diff --git a/Makefile b/Makefile
index dea8f50..eac3f82 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,10 @@ export RELEASE_DATE="$(date +%Y).$(date +%V).$(date +%u)"
 all: install test
 
 build: go.sum
-	go build -o build/hway .
+	go build -o bin/hway .
 
 install: go.sum
-	go install -mod=readonly ./cmd/hway
+	go install -mod=readonly .
 
 ########################################
 ### Tools & dependencies
diff --git a/x/health/handlers/api.go b/x/home/handlers/api.go
similarity index 100%
rename from x/health/handlers/api.go
rename to x/home/handlers/api.go
diff --git a/x/health/handlers/data.go b/x/home/handlers/data.go
similarity index 100%
rename from x/health/handlers/data.go
rename to x/home/handlers/data.go
diff --git a/x/health/handlers/view.go b/x/home/handlers/view.go
similarity index 100%
rename from x/health/handlers/view.go
rename to x/home/handlers/view.go
diff --git a/x/health/routes.go b/x/home/routes.go
similarity index 100%
rename from x/health/routes.go
rename to x/home/routes.go
diff --git a/x/index/handlers/api.go b/x/spawn/handlers/api.go
similarity index 100%
rename from x/index/handlers/api.go
rename to x/spawn/handlers/api.go
diff --git a/x/index/handlers/data.go b/x/spawn/handlers/data.go
similarity index 100%
rename from x/index/handlers/data.go
rename to x/spawn/handlers/data.go
diff --git a/x/index/handlers/view.go b/x/spawn/handlers/view.go
similarity index 100%
rename from x/index/handlers/view.go
rename to x/spawn/handlers/view.go
diff --git a/x/index/routes.go b/x/spawn/routes.go
similarity index 100%
rename from x/index/routes.go
rename to x/spawn/routes.go