diff --git a/cmd/client/client.go b/cmd/client/client.go
index 98bfd71..83ca082 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/client"
+	"git.xdrm.io/schastsp/internal/client"
 )
 
 func main(){
diff --git a/cmd/server/server.go b/cmd/server/server.go
index 7c48561..1f216b6 100644
--- a/cmd/server/server.go
+++ b/cmd/server/server.go
@@ -1,13 +1,13 @@
 package main
 
 import (
-	"git.xdrm.io/schastsp/pkg/scha"
+	"git.xdrm.io/schastsp/util/scha"
 	"time"
 	"os"
 	"flag"
 	"fmt"
 	"git.xdrm.io/schastsp/context"
-	"git.xdrm.io/schastsp/server"
+	"git.xdrm.io/schastsp/internal/server"
 )
 
 func main(){
diff --git a/internal/client/client.go b/internal/client/client.go
index 39c6f4a..7ae5513 100644
--- a/internal/client/client.go
+++ b/internal/client/client.go
@@ -3,7 +3,7 @@ package client
 import (
 	"errors"
 	"fmt"
-	"git.xdrm.io/schastsp/client/keyset"
+	"git.xdrm.io/schastsp/internal/client/keyset"
 	"git.xdrm.io/schastsp/context"
 	"git.xdrm.io/schastsp/util/scha"
 	"io"
diff --git a/internal/client/client.internal.go b/internal/client/client.internal.go
index 322d2b1..a66df1e 100644
--- a/internal/client/client.internal.go
+++ b/internal/client/client.internal.go
@@ -3,7 +3,7 @@ package client
 import (
 	"encoding/binary"
 	"fmt"
-	"git.xdrm.io/schastsp/client/keyset"
+	"git.xdrm.io/schastsp/internal/client/keyset"
 	"git.xdrm.io/schastsp/util/scha"
 	"git.xdrm.io/schastsp/util/timeid"
 	"git.xdrm.io/schastsp/util/xor"
diff --git a/util/scha/hash.go b/util/scha/hash.go
index 50ba779..70d621a 100644
--- a/util/scha/hash.go
+++ b/util/scha/hash.go
@@ -3,7 +3,7 @@ package scha
 import (
 	"errors"
 	"crypto/sha512"
-	"git.xdrm.io/schastsp/pkg/xor"
+	"git.xdrm.io/schastsp/util/xor"
 )
 
 /* (0) Static