diff --git a/cmd/icingadb-migrate/misc.go b/cmd/icingadb-migrate/misc.go
index b8d358ff..4d3a9298 100644
--- a/cmd/icingadb-migrate/misc.go
+++ b/cmd/icingadb-migrate/misc.go
@@ -5,7 +5,7 @@ import (
 	"crypto/sha1"
 	"github.com/icinga/icingadb/pkg/contracts"
 	"github.com/icinga/icingadb/pkg/icingadb"
-	"github.com/icinga/icingadb/pkg/icingadb/objectpacker"
+	"github.com/icinga/icingadb/pkg/objectpacker"
 	icingadbTypes "github.com/icinga/icingadb/pkg/types"
 	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
diff --git a/pkg/icingadb/v1/customvar.go b/pkg/icingadb/v1/customvar.go
index 462b87c4..ca490338 100644
--- a/pkg/icingadb/v1/customvar.go
+++ b/pkg/icingadb/v1/customvar.go
@@ -6,7 +6,7 @@ import (
 	"github.com/icinga/icingadb/pkg/com"
 	"github.com/icinga/icingadb/pkg/contracts"
 	"github.com/icinga/icingadb/pkg/flatten"
-	"github.com/icinga/icingadb/pkg/icingadb/objectpacker"
+	"github.com/icinga/icingadb/pkg/objectpacker"
 	"github.com/icinga/icingadb/pkg/types"
 	"github.com/icinga/icingadb/pkg/utils"
 	"golang.org/x/sync/errgroup"
diff --git a/pkg/icingadb/objectpacker/objectpacker.go b/pkg/objectpacker/objectpacker.go
similarity index 100%
rename from pkg/icingadb/objectpacker/objectpacker.go
rename to pkg/objectpacker/objectpacker.go
diff --git a/pkg/icingadb/objectpacker/objectpacker_test.go b/pkg/objectpacker/objectpacker_test.go
similarity index 100%
rename from pkg/icingadb/objectpacker/objectpacker_test.go
rename to pkg/objectpacker/objectpacker_test.go