diff --git a/cal/go.mod b/cal/go.mod
index 2625d68..f72abd1 100644
--- a/cal/go.mod
+++ b/cal/go.mod
@@ -1,25 +1,5 @@
-module code.ewintr.nl/planner/cal
+module go-mod.ewintr.nl/planner/cal
 
 go 1.21.5
 
-require (
-	code.ewintr.nl/planner/sync v0.0.0-20240912051930-423effa1b447
-	github.com/google/uuid v1.6.0
-)
-
-require (
-	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/ncruces/go-strftime v0.1.9 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
-	modernc.org/mathutil v1.6.0 // indirect
-	modernc.org/memory v1.8.0 // indirect
-	modernc.org/sqlite v1.33.0 // indirect
-	modernc.org/strutil v1.2.0 // indirect
-	modernc.org/token v1.1.0 // indirect
-)
-
-replace code.ewintr.nl/planner/sync => ../sync
+require github.com/google/uuid v1.6.0
diff --git a/cal/go.sum b/cal/go.sum
index 26299b6..7790d7c 100644
--- a/cal/go.sum
+++ b/cal/go.sum
@@ -1,37 +1,2 @@
-github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
-github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo=
-github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
-github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
-github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
-golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
-golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
-modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
-modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
-modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 h1:5D53IMaUuA5InSeMu9eJtlQXS2NxAhyWQvkKEgXZhHI=
-modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
-modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
-modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
-modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=
-modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU=
-modernc.org/sqlite v1.33.0 h1:WWkA/T2G17okiLGgKAj4/RMIvgyMT19yQ038160IeYk=
-modernc.org/sqlite v1.33.0/go.mod h1:9uQ9hF/pCZoYZK73D/ud5Z7cIRIILSZI8NdIemVMTX8=
-modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
-modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
-modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
-modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
diff --git a/cal/planner.go b/cal/planner.go
index 903562a..e3a05ab 100644
--- a/cal/planner.go
+++ b/cal/planner.go
@@ -1,4 +1,4 @@
-package main
+package service
 
 import (
 	"time"
diff --git a/cal/client.go b/sync/client/client.go
similarity index 99%
rename from cal/client.go
rename to sync/client/client.go
index 46e2b53..d2a2c51 100644
--- a/cal/client.go
+++ b/sync/client/client.go
@@ -1,4 +1,4 @@
-package main
+package client
 
 import (
 	"bytes"
diff --git a/sync/go.mod b/sync/go.mod
index eb45cd4..28d5c8f 100644
--- a/sync/go.mod
+++ b/sync/go.mod
@@ -1,4 +1,4 @@
-module code.ewintr.nl/planner/sync
+module go-mod.ewintr.nl/planner/sync
 
 go 1.21.5
 
diff --git a/sync/main.go b/sync/main.go
index 963cf5e..d89ec8a 100644
--- a/sync/main.go
+++ b/sync/main.go
@@ -8,6 +8,8 @@ import (
 	"os/signal"
 	"strconv"
 	"syscall"
+
+	"go-mod.ewintr.nl/sync/service"
 )
 
 func main() {
@@ -27,7 +29,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	repo, err := NewSqlite(dbPath)
+	repo, err := service.NewSqlite(dbPath)
 	if err != nil {
 		fmt.Printf("could not open sqlite db: %s", err.Error())
 		os.Exit(1)
@@ -41,7 +43,7 @@ func main() {
 	})
 
 	address := fmt.Sprintf(":%d", port)
-	srv := NewServer(repo, apiKey, logger)
+	srv := service.NewServer(repo, apiKey, logger)
 	go http.ListenAndServe(address, srv)
 
 	logger.Info("service started")
diff --git a/sync/handler.go b/sync/service/handler.go
similarity index 99%
rename from sync/handler.go
rename to sync/service/handler.go
index b7a862c..47c1eb6 100644
--- a/sync/handler.go
+++ b/sync/service/handler.go
@@ -1,4 +1,4 @@
-package main
+package service
 
 import (
 	"encoding/json"
diff --git a/sync/handler_test.go b/sync/service/handler_test.go
similarity index 99%
rename from sync/handler_test.go
rename to sync/service/handler_test.go
index 6cb17a4..5526265 100644
--- a/sync/handler_test.go
+++ b/sync/service/handler_test.go
@@ -1,4 +1,4 @@
-package main
+package service
 
 import (
 	"bytes"
diff --git a/sync/memory.go b/sync/service/memory.go
similarity index 97%
rename from sync/memory.go
rename to sync/service/memory.go
index b6ae65c..7475285 100644
--- a/sync/memory.go
+++ b/sync/service/memory.go
@@ -1,4 +1,4 @@
-package main
+package service
 
 import (
 	"slices"
diff --git a/sync/memory_test.go b/sync/service/memory_test.go
similarity index 99%
rename from sync/memory_test.go
rename to sync/service/memory_test.go
index 717161d..4c17a97 100644
--- a/sync/memory_test.go
+++ b/sync/service/memory_test.go
@@ -1,4 +1,4 @@
-package main
+package service
 
 import (
 	"testing"
diff --git a/sync/planner.go b/sync/service/planner.go
similarity index 96%
rename from sync/planner.go
rename to sync/service/planner.go
index 903562a..e3a05ab 100644
--- a/sync/planner.go
+++ b/sync/service/planner.go
@@ -1,4 +1,4 @@
-package main
+package service
 
 import (
 	"time"
diff --git a/sync/sqlite.go b/sync/service/sqlite.go
similarity index 99%
rename from sync/sqlite.go
rename to sync/service/sqlite.go
index 50ecc38..8b6c1f2 100644
--- a/sync/sqlite.go
+++ b/sync/service/sqlite.go
@@ -1,4 +1,4 @@
-package main
+package service
 
 import (
 	"database/sql"
diff --git a/sync/storage.go b/sync/service/storage.go
similarity index 91%
rename from sync/storage.go
rename to sync/service/storage.go
index 62152ad..82eae2b 100644
--- a/sync/storage.go
+++ b/sync/service/storage.go
@@ -1,4 +1,4 @@
-package main
+package service
 
 import (
 	"errors"