diff --git a/cmd/hepto/config.go b/cmd/hepto/config.go
index 6d54de808e102a6de72a8f53bfb3548c92e4ffb7..7cbba093a962b5f160756298f3c8ab7d934e7c6f 100644
--- a/cmd/hepto/config.go
+++ b/cmd/hepto/config.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/go-logr/zapr"
-	"go.acides.org/hepto/pkg/services"
+	"go.acides.org/hepto/services"
 	"go.acides.org/selfcontain"
 )
 
diff --git a/cmd/hepto/service.go b/cmd/hepto/service.go
index 91dc18fcbee9dc3566ba5272264d9dab5695cc0a..2dc4343a8d7a4df4246374ccad5ad93bb2a36ef3 100644
--- a/cmd/hepto/service.go
+++ b/cmd/hepto/service.go
@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
-	"go.acides.org/hepto/pkg/services"
+	"go.acides.org/hepto/services"
 	"go.acides.org/selfcontain"
 	"k8s.io/component-base/version/verflag"
 	"k8s.io/component-helpers/node/util/sysctl"
diff --git a/pkg/services/certs.go b/services/certs.go
similarity index 100%
rename from pkg/services/certs.go
rename to services/certs.go
diff --git a/pkg/services/containerd.go b/services/containerd.go
similarity index 98%
rename from pkg/services/containerd.go
rename to services/containerd.go
index e4e2aaaee26703e94137f86c38272383de00eacb..7a0b75129f125c7c37f42377f43ad4378e4966f2 100644
--- a/pkg/services/containerd.go
+++ b/services/containerd.go
@@ -32,7 +32,7 @@ import (
 	_ "github.com/containerd/containerd/services/tasks"
 	_ "github.com/containerd/containerd/services/version"
 	_ "github.com/containerd/containerd/snapshots/overlay/plugin"
-	"go.acides.org/hepto/pkg/utils"
+	"go.acides.org/hepto/utils"
 )
 
 var ContainerdPath = "/containerd"
diff --git a/pkg/services/discovery.go b/services/discovery.go
similarity index 100%
rename from pkg/services/discovery.go
rename to services/discovery.go
diff --git a/pkg/services/etcd.go b/services/etcd.go
similarity index 100%
rename from pkg/services/etcd.go
rename to services/etcd.go
diff --git a/pkg/services/k8s.go b/services/k8s.go
similarity index 99%
rename from pkg/services/k8s.go
rename to services/k8s.go
index 6a4ddeea1ed6e0c1089bf10dd36221f2e60dd061..bef45aa0d8e2eed12c69cd323e654ba0ff56be09 100644
--- a/pkg/services/k8s.go
+++ b/services/k8s.go
@@ -6,7 +6,7 @@ import (
 	"path"
 
 	"github.com/spf13/pflag"
-	"go.acides.org/hepto/pkg/utils"
+	"go.acides.org/hepto/utils"
 	"k8s.io/apiserver/pkg/util/feature"
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/component-base/cli/flag"
diff --git a/pkg/services/manager.go b/services/manager.go
similarity index 98%
rename from pkg/services/manager.go
rename to services/manager.go
index d84cc734ce9b9daa9b26d2cfb64db074c2527a3c..665ffd2d24bbb9830882fa88125b03d37c26b668 100644
--- a/pkg/services/manager.go
+++ b/services/manager.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/go-logr/logr"
 	"go.acides.org/daeman"
-	"go.acides.org/hepto/pkg/utils"
-	"go.acides.org/hepto/pkg/wg"
+	"go.acides.org/hepto/utils"
+	"go.acides.org/hepto/wg"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/services/meta.go b/services/meta.go
similarity index 100%
rename from pkg/services/meta.go
rename to services/meta.go
diff --git a/pkg/services/vpn.go b/services/vpn.go
similarity index 94%
rename from pkg/services/vpn.go
rename to services/vpn.go
index 16b4df211ca0a31480de1e495765c38fab328528..2830ffa93dcf042912fabd17b8dcfe12ec835638 100644
--- a/pkg/services/vpn.go
+++ b/services/vpn.go
@@ -3,7 +3,7 @@ package services
 import (
 	"context"
 
-	"go.acides.org/hepto/pkg/wg"
+	"go.acides.org/hepto/wg"
 )
 
 var vpn = &Unit{
diff --git a/pkg/utils/config.go b/utils/config.go
similarity index 100%
rename from pkg/utils/config.go
rename to utils/config.go
diff --git a/pkg/utils/net.go b/utils/net.go
similarity index 100%
rename from pkg/utils/net.go
rename to utils/net.go
diff --git a/pkg/wg/peer.go b/wg/peer.go
similarity index 100%
rename from pkg/wg/peer.go
rename to wg/peer.go
diff --git a/pkg/wg/wireguard.go b/wg/wireguard.go
similarity index 100%
rename from pkg/wg/wireguard.go
rename to wg/wireguard.go