diff --git a/spinifex/nbd/nbd.go b/spinifex/runtime/compute/nbd/nbd.go
similarity index 100%
rename from spinifex/nbd/nbd.go
rename to spinifex/runtime/compute/nbd/nbd.go
diff --git a/spinifex/nbd/nbd_test.go b/spinifex/runtime/compute/nbd/nbd_test.go
similarity index 100%
rename from spinifex/nbd/nbd_test.go
rename to spinifex/runtime/compute/nbd/nbd_test.go
diff --git a/spinifex/nbd/wal_base_dir_test.go b/spinifex/runtime/compute/nbd/wal_base_dir_test.go
similarity index 100%
rename from spinifex/nbd/wal_base_dir_test.go
rename to spinifex/runtime/compute/nbd/wal_base_dir_test.go
diff --git a/spinifex/services/viperblockd/provider_handlers.go b/spinifex/services/viperblockd/provider_handlers.go
index 5522804ba..3efb59110 100644
--- a/spinifex/services/viperblockd/provider_handlers.go
+++ b/spinifex/services/viperblockd/provider_handlers.go
@@ -18,8 +18,8 @@ import (
 	"github.com/mulgadc/bluebottle/pkg/safecast"
 	"github.com/mulgadc/spinifex/spinifex/admin"
 	"github.com/mulgadc/spinifex/spinifex/ebsprovider"
-	"github.com/mulgadc/spinifex/spinifex/nbd"
 	"github.com/mulgadc/spinifex/spinifex/objectstore"
+	"github.com/mulgadc/spinifex/spinifex/runtime/compute/nbd"
 	"github.com/mulgadc/spinifex/spinifex/types"
 	"github.com/mulgadc/spinifex/spinifex/utils"
 	vbtypes "github.com/mulgadc/viperblock/types"