refactor: rename directory structure hive → spinifex

- git mv hive/ → spinifex/
- git mv cmd/hive/ → cmd/spinifex/
- git mv services/hive/ → services/spinifex/
- git mv services/hiveui/ → services/spinifexui/
- Update package declarations and all internal import paths
- Update service.go switch cases for new service names

cmd/spinifex/cmd/admin.go

@@ -34,12 +34,12 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/iam"
-	"github.com/mulgadc/spinifex/hive/admin"
-	"github.com/mulgadc/spinifex/hive/config"
-	"github.com/mulgadc/spinifex/hive/formation"
-	handlers_ec2_vpc "github.com/mulgadc/spinifex/hive/handlers/ec2/vpc"
-	handlers_iam "github.com/mulgadc/spinifex/hive/handlers/iam"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/admin"
+	"github.com/mulgadc/spinifex/spinifex/config"
+	"github.com/mulgadc/spinifex/spinifex/formation"
+	handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc"
+	handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/mulgadc/viperblock/viperblock"
 	"github.com/mulgadc/viperblock/viperblock/backends/s3"
 	"github.com/mulgadc/viperblock/viperblock/v_utils"

cmd/spinifex/cmd/cluster.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mulgadc/spinifex/hive/daemon"
+	"github.com/mulgadc/spinifex/spinifex/daemon"
 	"github.com/nats-io/nats.go"
 	"github.com/spf13/cobra"
 )

cmd/spinifex/cmd/get.go

@@ -24,9 +24,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mulgadc/spinifex/hive/config"
-	"github.com/mulgadc/spinifex/hive/types"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/config"
+	"github.com/mulgadc/spinifex/spinifex/types"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/nats-io/nats.go"
 	"github.com/pterm/pterm"
 	"github.com/spf13/cobra"

cmd/spinifex/cmd/root.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/mulgadc/spinifex/hive/config"
+	"github.com/mulgadc/spinifex/spinifex/config"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )

cmd/spinifex/cmd/service.go

@@ -21,13 +21,13 @@ import (
 	"os"
 	"strings"
 
-	"github.com/mulgadc/spinifex/hive/config"
-	"github.com/mulgadc/spinifex/hive/service"
-	"github.com/mulgadc/spinifex/hive/services/hiveui"
-	"github.com/mulgadc/spinifex/hive/services/nats"
-	"github.com/mulgadc/spinifex/hive/services/predastore"
-	"github.com/mulgadc/spinifex/hive/services/viperblockd"
-	"github.com/mulgadc/spinifex/hive/services/vpcd"
+	"github.com/mulgadc/spinifex/spinifex/config"
+	"github.com/mulgadc/spinifex/spinifex/service"
+	"github.com/mulgadc/spinifex/spinifex/services/spinifexui"
+	"github.com/mulgadc/spinifex/spinifex/services/nats"
+	"github.com/mulgadc/spinifex/spinifex/services/predastore"
+	"github.com/mulgadc/spinifex/spinifex/services/viperblockd"
+	"github.com/mulgadc/spinifex/spinifex/services/vpcd"
 	"github.com/mulgadc/predastore/s3"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

cmd/spinifex/cmd/top.go

@@ -22,7 +22,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/mulgadc/spinifex/hive/types"
+	"github.com/mulgadc/spinifex/spinifex/types"
 	"github.com/pterm/pterm"
 	"github.com/spf13/cobra"
 )

cmd/spinifex/cmd/version.go

@@ -8,7 +8,7 @@ import (
 )
 
 // Version variables set via ldflags at build time.
-// Example: go build -ldflags "-X github.com/mulgadc/spinifex/cmd/hive/cmd.Version=v1.0.0"
+// Example: go build -ldflags "-X github.com/mulgadc/spinifex/cmd/spinifex/cmd.Version=v1.0.0"
 var (
 	Version = "dev"
 	Commit  = "unknown"

cmd/spinifex/main.go

@@ -15,7 +15,7 @@ limitations under the License.
 */
 package main
 
-import "github.com/mulgadc/spinifex/cmd/hive/cmd"
+import "github.com/mulgadc/spinifex/cmd/spinifex/cmd"
 
 func main() {
 	cmd.Execute()

spinifex/daemon/daemon.go

@@ -28,24 +28,24 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/go-chi/chi/v5"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	"github.com/mulgadc/spinifex/hive/config"
-	handlers_ec2_account "github.com/mulgadc/spinifex/hive/handlers/ec2/account"
-	handlers_ec2_eigw "github.com/mulgadc/spinifex/hive/handlers/ec2/eigw"
-	handlers_ec2_igw "github.com/mulgadc/spinifex/hive/handlers/ec2/igw"
-	handlers_ec2_image "github.com/mulgadc/spinifex/hive/handlers/ec2/image"
-	handlers_ec2_instance "github.com/mulgadc/spinifex/hive/handlers/ec2/instance"
-	handlers_ec2_key "github.com/mulgadc/spinifex/hive/handlers/ec2/key"
-	handlers_ec2_snapshot "github.com/mulgadc/spinifex/hive/handlers/ec2/snapshot"
-	handlers_ec2_tags "github.com/mulgadc/spinifex/hive/handlers/ec2/tags"
-	handlers_ec2_volume "github.com/mulgadc/spinifex/hive/handlers/ec2/volume"
-	handlers_ec2_vpc "github.com/mulgadc/spinifex/hive/handlers/ec2/vpc"
-	"github.com/mulgadc/spinifex/hive/instancetypes"
-	"github.com/mulgadc/spinifex/hive/objectstore"
-	"github.com/mulgadc/spinifex/hive/qmp"
-	"github.com/mulgadc/spinifex/hive/types"
-	"github.com/mulgadc/spinifex/hive/utils"
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/config"
+	handlers_ec2_account "github.com/mulgadc/spinifex/spinifex/handlers/ec2/account"
+	handlers_ec2_eigw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eigw"
+	handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw"
+	handlers_ec2_image "github.com/mulgadc/spinifex/spinifex/handlers/ec2/image"
+	handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance"
+	handlers_ec2_key "github.com/mulgadc/spinifex/spinifex/handlers/ec2/key"
+	handlers_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/handlers/ec2/snapshot"
+	handlers_ec2_tags "github.com/mulgadc/spinifex/spinifex/handlers/ec2/tags"
+	handlers_ec2_volume "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volume"
+	handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc"
+	"github.com/mulgadc/spinifex/spinifex/instancetypes"
+	"github.com/mulgadc/spinifex/spinifex/objectstore"
+	"github.com/mulgadc/spinifex/spinifex/qmp"
+	"github.com/mulgadc/spinifex/spinifex/types"
+	"github.com/mulgadc/spinifex/spinifex/utils"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 	"github.com/mulgadc/viperblock/viperblock"
 	"github.com/nats-io/nats.go"
 	"github.com/pelletier/go-toml/v2"

spinifex/daemon/daemon_handlers.go

@@ -7,10 +7,10 @@ import (
 	"net"
 	"time"
 
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	"github.com/mulgadc/spinifex/hive/types"
-	"github.com/mulgadc/spinifex/hive/utils"
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/types"
+	"github.com/mulgadc/spinifex/spinifex/utils"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/daemon/daemon_handlers_console.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/daemon/daemon_handlers_image.go

@@ -4,10 +4,10 @@ import (
 	"log/slog"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_image "github.com/mulgadc/spinifex/hive/handlers/ec2/image"
-	"github.com/mulgadc/spinifex/hive/utils"
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_image "github.com/mulgadc/spinifex/spinifex/handlers/ec2/image"
+	"github.com/mulgadc/spinifex/spinifex/utils"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/daemon/daemon_handlers_instance.go

@@ -10,11 +10,11 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	"github.com/mulgadc/spinifex/hive/qmp"
-	"github.com/mulgadc/spinifex/hive/types"
-	"github.com/mulgadc/spinifex/hive/utils"
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/qmp"
+	"github.com/mulgadc/spinifex/spinifex/types"
+	"github.com/mulgadc/spinifex/spinifex/utils"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/daemon/daemon_handlers_test.go

@@ -13,21 +13,21 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awss3 "github.com/aws/aws-sdk-go/service/s3"
 
-	"github.com/mulgadc/spinifex/hive/config"
-	handlers_ec2_account "github.com/mulgadc/spinifex/hive/handlers/ec2/account"
-	handlers_ec2_eigw "github.com/mulgadc/spinifex/hive/handlers/ec2/eigw"
-	handlers_ec2_igw "github.com/mulgadc/spinifex/hive/handlers/ec2/igw"
-	handlers_ec2_image "github.com/mulgadc/spinifex/hive/handlers/ec2/image"
-	handlers_ec2_instance "github.com/mulgadc/spinifex/hive/handlers/ec2/instance"
-	handlers_ec2_key "github.com/mulgadc/spinifex/hive/handlers/ec2/key"
-	handlers_ec2_snapshot "github.com/mulgadc/spinifex/hive/handlers/ec2/snapshot"
-	handlers_ec2_tags "github.com/mulgadc/spinifex/hive/handlers/ec2/tags"
-	handlers_ec2_volume "github.com/mulgadc/spinifex/hive/handlers/ec2/volume"
-	handlers_ec2_vpc "github.com/mulgadc/spinifex/hive/handlers/ec2/vpc"
-	"github.com/mulgadc/spinifex/hive/objectstore"
-	"github.com/mulgadc/spinifex/hive/qmp"
-	"github.com/mulgadc/spinifex/hive/types"
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/config"
+	handlers_ec2_account "github.com/mulgadc/spinifex/spinifex/handlers/ec2/account"
+	handlers_ec2_eigw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eigw"
+	handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw"
+	handlers_ec2_image "github.com/mulgadc/spinifex/spinifex/handlers/ec2/image"
+	handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance"
+	handlers_ec2_key "github.com/mulgadc/spinifex/spinifex/handlers/ec2/key"
+	handlers_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/handlers/ec2/snapshot"
+	handlers_ec2_tags "github.com/mulgadc/spinifex/spinifex/handlers/ec2/tags"
+	handlers_ec2_volume "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volume"
+	handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc"
+	"github.com/mulgadc/spinifex/spinifex/objectstore"
+	"github.com/mulgadc/spinifex/spinifex/qmp"
+	"github.com/mulgadc/spinifex/spinifex/types"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 	"github.com/mulgadc/viperblock/viperblock"
 	"github.com/nats-io/nats-server/v2/server"
 	"github.com/nats-io/nats.go"

spinifex/daemon/daemon_handlers_volume.go

@@ -7,11 +7,11 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	"github.com/mulgadc/spinifex/hive/qmp"
-	"github.com/mulgadc/spinifex/hive/types"
-	"github.com/mulgadc/spinifex/hive/utils"
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/qmp"
+	"github.com/mulgadc/spinifex/spinifex/types"
+	"github.com/mulgadc/spinifex/spinifex/utils"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/daemon/daemon_test.go

@@ -15,13 +15,13 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awss3 "github.com/aws/aws-sdk-go/service/s3"
-	"github.com/mulgadc/spinifex/hive/config"
-	handlers_ec2_instance "github.com/mulgadc/spinifex/hive/handlers/ec2/instance"
-	handlers_ec2_volume "github.com/mulgadc/spinifex/hive/handlers/ec2/volume"
-	"github.com/mulgadc/spinifex/hive/objectstore"
-	"github.com/mulgadc/spinifex/hive/qmp"
-	"github.com/mulgadc/spinifex/hive/types"
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/config"
+	handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance"
+	handlers_ec2_volume "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volume"
+	"github.com/mulgadc/spinifex/spinifex/objectstore"
+	"github.com/mulgadc/spinifex/spinifex/qmp"
+	"github.com/mulgadc/spinifex/spinifex/types"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 	"github.com/nats-io/nats.go"
 	"github.com/pelletier/go-toml/v2"
 	"github.com/stretchr/testify/assert"

spinifex/daemon/device_map.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mulgadc/spinifex/hive/qmp"
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/qmp"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 )
 
 // pciAddrRegexp extracts the device index from a boot-time QDev path.

spinifex/daemon/device_map_test.go

@@ -3,7 +3,7 @@ package daemon
 import (
 	"testing"
 
-	"github.com/mulgadc/spinifex/hive/qmp"
+	"github.com/mulgadc/spinifex/spinifex/qmp"
 	"github.com/stretchr/testify/assert"
 )
 

spinifex/daemon/health.go

@@ -10,7 +10,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 )
 
 const (

spinifex/daemon/health_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mulgadc/spinifex/hive/config"
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/config"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 	"github.com/nats-io/nats.go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

spinifex/daemon/heartbeat_test.go

@@ -3,8 +3,8 @@ package daemon
 import (
 	"testing"
 
-	"github.com/mulgadc/spinifex/hive/config"
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/config"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 	"github.com/nats-io/nats.go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

spinifex/daemon/jetstream.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/daemon/jetstream_test.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 	"github.com/nats-io/nats.go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

spinifex/daemon/network_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 )
 
 func TestTapDeviceName(t *testing.T) {

spinifex/daemon/ownership.go

@@ -3,8 +3,8 @@ package daemon
 import (
 	"log/slog"
 
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/daemon/resource.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/types"
+	"github.com/mulgadc/spinifex/spinifex/types"
 )
 
 // errInsufficientCapacity is returned by allocateForLaunch when MinCount

spinifex/daemon/shutdown.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/daemon/state.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log/slog"
 
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 )
 
 // TransitionState validates and applies a state transition on the given instance.

spinifex/daemon/state_test.go

@@ -8,9 +8,9 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/config"
-	"github.com/mulgadc/spinifex/hive/types"
-	"github.com/mulgadc/spinifex/hive/vm"
+	"github.com/mulgadc/spinifex/spinifex/config"
+	"github.com/mulgadc/spinifex/spinifex/types"
+	"github.com/mulgadc/spinifex/spinifex/vm"
 	"github.com/nats-io/nats-server/v2/server"
 	"github.com/nats-io/nats.go"
 	"github.com/stretchr/testify/assert"

spinifex/formation/helpers.go

@@ -4,7 +4,7 @@ import (
 	"slices"
 	"sort"
 
-	"github.com/mulgadc/spinifex/hive/admin"
+	"github.com/mulgadc/spinifex/spinifex/admin"
 )
 
 // hasService reports whether the node's service list includes name.

spinifex/gateway/auth.go

@@ -13,8 +13,8 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_iam "github.com/mulgadc/spinifex/hive/handlers/iam"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam"
 	"github.com/mulgadc/predastore/auth"
 )
 

spinifex/gateway/auth_test.go

@@ -12,9 +12,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/go-chi/chi/v5"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_iam "github.com/mulgadc/spinifex/hive/handlers/iam"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/mulgadc/predastore/auth"
 )
 

spinifex/gateway/ec2.go

@@ -10,20 +10,20 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awsec2query"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	gateway_ec2_account "github.com/mulgadc/spinifex/hive/gateway/ec2/account"
-	gateway_ec2_eigw "github.com/mulgadc/spinifex/hive/gateway/ec2/eigw"
-	gateway_ec2_igw "github.com/mulgadc/spinifex/hive/gateway/ec2/igw"
-	gateway_ec2_image "github.com/mulgadc/spinifex/hive/gateway/ec2/image"
-	gateway_ec2_instance "github.com/mulgadc/spinifex/hive/gateway/ec2/instance"
-	gateway_ec2_key "github.com/mulgadc/spinifex/hive/gateway/ec2/key"
-	gateway_ec2_snapshot "github.com/mulgadc/spinifex/hive/gateway/ec2/snapshot"
-	gateway_ec2_tags "github.com/mulgadc/spinifex/hive/gateway/ec2/tags"
-	gateway_ec2_volume "github.com/mulgadc/spinifex/hive/gateway/ec2/volume"
-	gateway_ec2_vpc "github.com/mulgadc/spinifex/hive/gateway/ec2/vpc"
-	gateway_ec2_zone "github.com/mulgadc/spinifex/hive/gateway/ec2/zone"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/awsec2query"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	gateway_ec2_account "github.com/mulgadc/spinifex/spinifex/gateway/ec2/account"
+	gateway_ec2_eigw "github.com/mulgadc/spinifex/spinifex/gateway/ec2/eigw"
+	gateway_ec2_igw "github.com/mulgadc/spinifex/spinifex/gateway/ec2/igw"
+	gateway_ec2_image "github.com/mulgadc/spinifex/spinifex/gateway/ec2/image"
+	gateway_ec2_instance "github.com/mulgadc/spinifex/spinifex/gateway/ec2/instance"
+	gateway_ec2_key "github.com/mulgadc/spinifex/spinifex/gateway/ec2/key"
+	gateway_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/gateway/ec2/snapshot"
+	gateway_ec2_tags "github.com/mulgadc/spinifex/spinifex/gateway/ec2/tags"
+	gateway_ec2_volume "github.com/mulgadc/spinifex/spinifex/gateway/ec2/volume"
+	gateway_ec2_vpc "github.com/mulgadc/spinifex/spinifex/gateway/ec2/vpc"
+	gateway_ec2_zone "github.com/mulgadc/spinifex/spinifex/gateway/ec2/zone"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 )
 
 // EC2Handler processes parsed query args and returns XML response bytes.

spinifex/gateway/ec2/account/DisableEbsEncryptionByDefault.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_account "github.com/mulgadc/spinifex/hive/handlers/ec2/account"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_account "github.com/mulgadc/spinifex/spinifex/handlers/ec2/account"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/account/DisableSerialConsoleAccess.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_account "github.com/mulgadc/spinifex/hive/handlers/ec2/account"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_account "github.com/mulgadc/spinifex/spinifex/handlers/ec2/account"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/account/EnableEbsEncryptionByDefault.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_account "github.com/mulgadc/spinifex/hive/handlers/ec2/account"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_account "github.com/mulgadc/spinifex/spinifex/handlers/ec2/account"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/account/EnableSerialConsoleAccess.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_account "github.com/mulgadc/spinifex/hive/handlers/ec2/account"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_account "github.com/mulgadc/spinifex/spinifex/handlers/ec2/account"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/account/GetEbsEncryptionByDefault.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_account "github.com/mulgadc/spinifex/hive/handlers/ec2/account"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_account "github.com/mulgadc/spinifex/spinifex/handlers/ec2/account"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/account/GetSerialConsoleAccessStatus.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_account "github.com/mulgadc/spinifex/hive/handlers/ec2/account"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_account "github.com/mulgadc/spinifex/spinifex/handlers/ec2/account"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/account/account_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

spinifex/gateway/ec2/eigw/CreateEgressOnlyInternetGateway.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_eigw "github.com/mulgadc/spinifex/hive/handlers/ec2/eigw"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_eigw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eigw"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/eigw/DeleteEgressOnlyInternetGateway.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_eigw "github.com/mulgadc/spinifex/hive/handlers/ec2/eigw"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_eigw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eigw"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/eigw/DescribeEgressOnlyInternetGateways.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_eigw "github.com/mulgadc/spinifex/hive/handlers/ec2/eigw"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_eigw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eigw"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/eigw/eigw_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
 	"github.com/stretchr/testify/assert"
 )
 

spinifex/gateway/ec2/igw/AttachInternetGateway.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_igw "github.com/mulgadc/spinifex/hive/handlers/ec2/igw"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/igw/CreateInternetGateway.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_igw "github.com/mulgadc/spinifex/hive/handlers/ec2/igw"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/igw/DeleteInternetGateway.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_igw "github.com/mulgadc/spinifex/hive/handlers/ec2/igw"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/igw/DescribeInternetGateways.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_igw "github.com/mulgadc/spinifex/hive/handlers/ec2/igw"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/igw/DetachInternetGateway.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_igw "github.com/mulgadc/spinifex/hive/handlers/ec2/igw"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/igw/igw_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
 	"github.com/stretchr/testify/assert"
 )
 

spinifex/gateway/ec2/image/CreateImage.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_image "github.com/mulgadc/spinifex/hive/handlers/ec2/image"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_image "github.com/mulgadc/spinifex/spinifex/handlers/ec2/image"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/image/CreateImage_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
 	"github.com/stretchr/testify/assert"
 )
 

spinifex/gateway/ec2/image/DescribeImages.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	handlers_ec2_image "github.com/mulgadc/spinifex/hive/handlers/ec2/image"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	handlers_ec2_image "github.com/mulgadc/spinifex/spinifex/handlers/ec2/image"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/image/DescribeImages_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
 	"github.com/stretchr/testify/assert"
 )
 

spinifex/gateway/ec2/image/handler_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
 	"github.com/stretchr/testify/assert"
 )
 

spinifex/gateway/ec2/instance/DescribeInstanceTypes.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/instance/DescribeInstanceTypes_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/nats-io/nats.go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

spinifex/gateway/ec2/instance/DescribeInstances.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/instance/DescribeInstances_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/nats-io/nats.go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

spinifex/gateway/ec2/instance/GetConsoleOutput.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/instance/ModifyInstanceAttribute.go

@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/instance/ModifyInstanceAttribute_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
 	"github.com/nats-io/nats.go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

spinifex/gateway/ec2/instance/RebootInstances.go

@@ -8,9 +8,9 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	"github.com/mulgadc/spinifex/hive/types"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/types"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/instance/RebootInstances_test.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	"github.com/mulgadc/spinifex/hive/types"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/types"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/nats-io/nats.go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

spinifex/gateway/ec2/instance/RunInstances.go

@@ -6,10 +6,10 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 
-	handlers_ec2_instance "github.com/mulgadc/spinifex/hive/handlers/ec2/instance"
+	handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance"
 	"github.com/nats-io/nats.go"
 )
 

spinifex/gateway/ec2/instance/RunInstances_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/awserrors"
 	"github.com/stretchr/testify/assert"
 )
 

spinifex/gateway/ec2/instance/StartInstances.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mulgadc/spinifex/hive/utils"
+	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/nats-io/nats.go"
 )