diff --git a/.idea/modules.xml b/.idea/modules.xml
index 95a8a34..0bbabac 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/maf-webserver.iml" filepath="$PROJECT_DIR$/.idea/maf-webserver.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/webserver.iml" filepath="$PROJECT_DIR$/.idea/webserver.iml" />
     </modules>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/.idea/maf-webserver.iml b/.idea/webserver.iml
similarity index 87%
rename from .idea/maf-webserver.iml
rename to .idea/webserver.iml
index c956989..5e764c4 100644
--- a/.idea/maf-webserver.iml
+++ b/.idea/webserver.iml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
diff --git a/go.mod b/go.mod
index 965aff6..2943062 100644
--- a/go.mod
+++ b/go.mod
@@ -2,14 +2,14 @@ module netgarden.dev/maf/webserver
 
 go 1.24.1
 
-replace netgarden.dev/maf/core => ../core
+replace netgarden.dev/maf/maf => ../maf
 
 replace netgarden.dev/maf/mergefs => ../mergefs
 
 require (
 	github.com/flosch/pongo2/v6 v6.0.0
 	github.com/labstack/echo/v4 v4.13.3
-	netgarden.dev/maf/core v0.0.0-00010101000000-000000000000
+	netgarden.dev/maf/maf v0.0.0-00010101000000-000000000000
 	netgarden.dev/maf/mergefs v0.0.0-00010101000000-000000000000
 )
 
diff --git a/interfaces.go b/interfaces.go
index f2e8b30..a26aa7e 100644
--- a/interfaces.go
+++ b/interfaces.go
@@ -3,7 +3,7 @@ package webserver
 import (
 	"github.com/flosch/pongo2/v6"
 	"io/fs"
-	"netgarden.dev/netgarden/maf"
+	"netgarden.dev/maf/maf"
 )
 
 type Controller interface {
diff --git a/module.go b/module.go
index 5d65cfd..e13ffab 100644
--- a/module.go
+++ b/module.go
@@ -3,8 +3,8 @@ package webserver
 import (
 	"github.com/flosch/pongo2/v6"
 	"io/fs"
-	"netgarden.dev/netgarden/maf"
-	"netgarden.dev/netgarden/mergefs"
+	"netgarden.dev/maf/maf"
+	"netgarden.dev/maf/mergefs"
 )
 
 func NewModule(moduleConfig *ModuleConfig) *Module {