diff --git a/src/yggdrasil/address.go b/src/address/address.go
similarity index 100%
rename from src/yggdrasil/address.go
rename to src/address/address.go
diff --git a/src/yggdrasil/crypto.go b/src/crypto/crypto.go
similarity index 100%
rename from src/yggdrasil/crypto.go
rename to src/crypto/crypto.go
diff --git a/src/yggdrasil/util.go b/src/util/util.go
similarity index 100%
rename from src/yggdrasil/util.go
rename to src/util/util.go
diff --git a/src/yggdrasil/core.go b/src/yggdrasil/core.go
index 13609ce..bf42548 100644
--- a/src/yggdrasil/core.go
+++ b/src/yggdrasil/core.go
@@ -8,7 +8,9 @@ import (
 	"net"
 	"regexp"
 
+	"github.com/yggdrasil-network/yggdrasil-go/src/address"
 	"github.com/yggdrasil-network/yggdrasil-go/src/config"
+	"github.com/yggdrasil-network/yggdrasil-go/src/crypto"
 	"github.com/yggdrasil-network/yggdrasil-go/src/defaults"
 )