diff --git a/Makefile b/Makefile
index 92e4115..3ae3fc0 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,11 @@ build: generate
 	go build -tags "embed"
 
 generate:
-	yaber --pkg "assettemplates" templates/
-	mv asset_* src/assettemplates/
-	yaber --pkg "assetstatic" static/
-	mv asset_* src/assetstatic/
+	cd src/assettemplates/  && yaber --pkg "assettemplates" -strip "../../"  ../../templates/
+	cd src/assetstatic && yaber --pkg "assetstatic" -strip "../../" ../../static/
 
-test_run: generate
+test_run:
 	go run ss13.go -verbose run
 
-test_run_embed: generate
+test_run_embed:
 	go run -tags "embed" ss13.go -verbose run