diff --git a/Makefile b/Makefile
index 5d5db15..d8e521d 100755
--- a/Makefile
+++ b/Makefile
@@ -5,15 +5,16 @@ build:
 
 embed:
 	echo "embedding css and js into binary"
-	cp main.go gossa.go
-	perl -pe 's/css_will_be_here/`cat style.css`/ge' -i gossa.go
-	perl -pe 's/js_will_be_here/`cat script.js`/ge' -i gossa.go
+	cp src/main.go gossa.go
+	perl -pe 's/css_will_be_here/`cat src\/style.css`/ge' -i gossa.go
+	perl -pe 's/js_will_be_here/`cat src\/script.js`/ge' -i gossa.go
 
 run:
 	make build
 	./gossa fixture
 
 ci:
+	cd src
 	go fmt
 	go vet
 	timeout 5 make run &
diff --git a/main.go b/src/main.go
similarity index 100%
rename from main.go
rename to src/main.go
diff --git a/main_test.go b/src/main_test.go
similarity index 100%
rename from main_test.go
rename to src/main_test.go
diff --git a/script.js b/src/script.js
similarity index 100%
rename from script.js
rename to src/script.js
diff --git a/style.css b/src/style.css
similarity index 100%
rename from style.css
rename to src/style.css