diff --git a/src/assets/assetsfs.go b/src/assets/assetsfs.go
index b622478..e59d76c 100644
--- a/src/assets/assetsfs.go
+++ b/src/assets/assetsfs.go
@@ -15,9 +15,10 @@ var static embed.FS
 var templates embed.FS
 
 func Templates() *template.Template {
-    return template.Must(template.ParseFS(templates, "*.html"))
+    return template.Must(template.ParseFS(templates, "templates/*.html"))
 }
 
 func StaticFS() fs.FS {
-    return static
+	fs, _ := fs.Sub(static, "static")
+	return fs
 }
diff --git a/src/server/routes_test.go b/src/server/routes_test.go
index 52ee1e0..6eaa16d 100644
--- a/src/server/routes_test.go
+++ b/src/server/routes_test.go
@@ -16,7 +16,7 @@ import (
 
 func TestStatic(t *testing.T) {
 	handler := NewServer(nil, "127.0.0.1:8000").handler()
-	url := "/static/javascripts/app.js"
+	url := "/static/bundle.js"
 
 	recorder := httptest.NewRecorder()
 	request := httptest.NewRequest("GET", url, nil)
@@ -31,7 +31,7 @@ func TestStaticWithBase(t *testing.T) {
 	server.BasePath = "/sub"
 
 	handler := server.handler()
-	url := "/sub/static/javascripts/app.js"
+	url := "/sub/static/bundle.js"
 
 	recorder := httptest.NewRecorder()
 	request := httptest.NewRequest("GET", url, nil)