diff --git a/internal/client/client.go b/client/client.go
similarity index 98%
rename from internal/client/client.go
rename to client/client.go
index 7ae5513..4a20c8b 100644
--- a/internal/client/client.go
+++ b/client/client.go
@@ -3,7 +3,7 @@ package client
 import (
 	"errors"
 	"fmt"
-	"git.xdrm.io/schastsp/internal/client/keyset"
+	"git.xdrm.io/schastsp/internal/keyset"
 	"git.xdrm.io/schastsp/context"
 	"git.xdrm.io/schastsp/util/scha"
 	"io"
diff --git a/internal/client/client.internal.go b/client/client.internal.go
similarity index 99%
rename from internal/client/client.internal.go
rename to client/client.internal.go
index a66df1e..4fe67c2 100644
--- a/internal/client/client.internal.go
+++ b/client/client.internal.go
@@ -3,7 +3,7 @@ package client
 import (
 	"encoding/binary"
 	"fmt"
-	"git.xdrm.io/schastsp/internal/client/keyset"
+	"git.xdrm.io/schastsp/internal/keyset"
 	"git.xdrm.io/schastsp/util/scha"
 	"git.xdrm.io/schastsp/util/timeid"
 	"git.xdrm.io/schastsp/util/xor"
diff --git a/internal/client/config.go b/client/config.go
similarity index 98%
rename from internal/client/config.go
rename to client/config.go
index fdc1e9a..a04974b 100644
--- a/internal/client/config.go
+++ b/client/config.go
@@ -1,7 +1,7 @@
 package client;
 
 import (
-	"git.xdrm.io/schastsp/internal/client/keyset"
+	"git.xdrm.io/schastsp/internal/keyset"
 	"fmt"
 	"path/filepath"
 	"errors"
diff --git a/cmd/client/client.go b/cmd/client/client.go
index 83ca082..98bfd71 100644
--- a/cmd/client/client.go
+++ b/cmd/client/client.go
@@ -6,7 +6,7 @@ import (
 	"flag"
 	"fmt"
 	"git.xdrm.io/schastsp/context"
-	"git.xdrm.io/schastsp/internal/client"
+	"git.xdrm.io/schastsp/client"
 )
 
 func main(){
diff --git a/cmd/server/server.go b/cmd/server/server.go
index 1f216b6..567f673 100644
--- a/cmd/server/server.go
+++ b/cmd/server/server.go
@@ -7,7 +7,7 @@ import (
 	"flag"
 	"fmt"
 	"git.xdrm.io/schastsp/context"
-	"git.xdrm.io/schastsp/internal/server"
+	"git.xdrm.io/schastsp/server"
 )
 
 func main(){
diff --git a/cmd/simple/simple.go b/cmd/simple/simple.go
index dd4c1cb..f77f16f 100644
--- a/cmd/simple/simple.go
+++ b/cmd/simple/simple.go
@@ -7,8 +7,8 @@ import (
 	"flag"
 	"fmt"
 	"git.xdrm.io/schastsp/context"
-	"git.xdrm.io/schastsp/internal/client"
-	"git.xdrm.io/schastsp/internal/server"
+	"git.xdrm.io/schastsp/client"
+	"git.xdrm.io/schastsp/server"
 )
 
 /* Store target config paths */
diff --git a/internal/client/keyset/keyset.go b/internal/keyset/keyset.go
similarity index 100%
rename from internal/client/keyset/keyset.go
rename to internal/keyset/keyset.go
diff --git a/internal/client/keyset/keyset.internal.go b/internal/keyset/keyset.internal.go
similarity index 100%
rename from internal/client/keyset/keyset.internal.go
rename to internal/keyset/keyset.internal.go
diff --git a/internal/client/keyset/keyset_test.go b/internal/keyset/keyset_test.go
similarity index 100%
rename from internal/client/keyset/keyset_test.go
rename to internal/keyset/keyset_test.go
diff --git a/internal/server/server.go b/server/server.go
similarity index 100%
rename from internal/server/server.go
rename to server/server.go
diff --git a/internal/server/server.internal.go b/server/server.internal.go
similarity index 100%
rename from internal/server/server.internal.go
rename to server/server.internal.go