diff --git a/isolated/server/main.go b/cmd/server/main.go
similarity index 92%
rename from isolated/server/main.go
rename to cmd/server/main.go
index b881fbf..7f3a38d 100644
--- a/isolated/server/main.go
+++ b/cmd/server/main.go
@@ -9,7 +9,7 @@ import (
 
 	"git.hrafn.xyz/aether/gotes/internal/repository"
 	"git.hrafn.xyz/aether/gotes/internal/store/sqlite"
-	"git.hrafn.xyz/aether/gotes/server"
+	"git.hrafn.xyz/aether/gotes/internal/cli/server"
 )
 
 func main() {
diff --git a/isolated/simplecli/main.go b/cmd/simplecli/main.go
similarity index 97%
rename from isolated/simplecli/main.go
rename to cmd/simplecli/main.go
index 8f177f7..664d8ed 100644
--- a/isolated/simplecli/main.go
+++ b/cmd/simplecli/main.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"os"
 
-	"git.hrafn.xyz/aether/gotes/client"
+	"git.hrafn.xyz/aether/gotes/internal/cli/client"
 )
 
 func main() {
diff --git a/client/client.go b/internal/cli/client/client.go
similarity index 100%
rename from client/client.go
rename to internal/cli/client/client.go
diff --git a/server/server.go b/internal/cli/server/server.go
similarity index 100%
rename from server/server.go
rename to internal/cli/server/server.go