diff --git a/pkg/core/alerts/interfaces.go b/pkg/core/alerts/interfaces.go
index 0708bdb..e002b6d 100644
--- a/pkg/core/alerts/interfaces.go
+++ b/pkg/core/alerts/interfaces.go
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-// Package alerts pkg/cloud/alerts/interfaces.go
+// Package alerts pkg/core/alerts/interfaces.go
 
-//go:generate mockgen -destination=mock_alerts.go -package=alerts github.com/carverauto/serviceradar/pkg/cloud/alerts AlertService
+//go:generate mockgen -destination=mock_alerts.go -package=alerts github.com/carverauto/serviceradar/pkg/core/alerts AlertService
 
 package alerts
 
diff --git a/pkg/core/alerts/mock_alerts.go b/pkg/core/alerts/mock_alerts.go
index 2434b66..93122a1 100644
--- a/pkg/core/alerts/mock_alerts.go
+++ b/pkg/core/alerts/mock_alerts.go
@@ -1,9 +1,9 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/carverauto/serviceradar/pkg/cloud/alerts (interfaces: AlertService)
+// Source: github.com/carverauto/serviceradar/pkg/core/alerts (interfaces: AlertService)
 //
 // Generated by this command:
 //
-//	mockgen -destination=mock_alerts.go -package=alerts github.com/carverauto/serviceradar/pkg/cloud/alerts AlertService
+//	mockgen -destination=mock_alerts.go -package=alerts github.com/carverauto/serviceradar/pkg/core/alerts AlertService
 //
 
 // Package alerts is a generated GoMock package.
diff --git a/pkg/core/api/interfaces.go b/pkg/core/api/interfaces.go
index 86ee8ca..dedb329 100644
--- a/pkg/core/api/interfaces.go
+++ b/pkg/core/api/interfaces.go
@@ -16,7 +16,7 @@
 
 package api
 
-//go:generate mockgen -destination=mock_api_server.go -package=api github.com/carverauto/serviceradar/pkg/cloud/api Service
+//go:generate mockgen -destination=mock_api_server.go -package=api github.com/carverauto/serviceradar/pkg/core/api Service
 
 // Service represents the API server functionality.
 type Service interface {
diff --git a/pkg/core/api/mock_api_server.go b/pkg/core/api/mock_api_server.go
index 6eb7250..44bdf3f 100644
--- a/pkg/core/api/mock_api_server.go
+++ b/pkg/core/api/mock_api_server.go
@@ -1,9 +1,9 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/carverauto/serviceradar/pkg/cloud/api (interfaces: Service)
+// Source: github.com/carverauto/serviceradar/pkg/core/api (interfaces: Service)
 //
 // Generated by this command:
 //
-//	mockgen -destination=mock_api_server.go -package=api github.com/carverauto/serviceradar/pkg/cloud/api Service
+//	mockgen -destination=mock_api_server.go -package=api github.com/carverauto/serviceradar/pkg/core/api Service
 //
 
 // Package api is a generated GoMock package.
diff --git a/pkg/core/interfaces.go b/pkg/core/interfaces.go
index 6aa6950..51a08a3 100644
--- a/pkg/core/interfaces.go
+++ b/pkg/core/interfaces.go
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-// Package cloud pkg/cloud/interfaces.go
-
-//go:generate mockgen -destination=mock_server.go -package=cloud github.com/carverauto/serviceradar/pkg/cloud NodeService,CloudService
+// Package core pkg/core/interfaces.go
+//go:generate mockgen -destination=mock_server.go -package=core github.com/carverauto/serviceradar/pkg/core NodeService,CoreService
 
 package core
 
 import (
 	"context"
 
-	"github.com/carverauto/serviceradar/pkg/cloud/api"
+	"github.com/carverauto/serviceradar/pkg/core/api"
 	"github.com/carverauto/serviceradar/pkg/metrics"
 )
 
@@ -35,8 +34,8 @@ type NodeService interface {
 	CheckNodeHealth(nodeID string) (bool, error)
 }
 
-// CloudService represents the main cloud service functionality.
-type CloudService interface {
+// CoreService represents the main cloud service functionality.
+type CoreService interface {
 	Start(ctx context.Context) error
 	Stop(ctx context.Context) error
 	ReportStatus(ctx context.Context, nodeID string, status *api.NodeStatus) error
diff --git a/pkg/core/mock_server.go b/pkg/core/mock_server.go
index 3a78d59..f57dc42 100644
--- a/pkg/core/mock_server.go
+++ b/pkg/core/mock_server.go
@@ -1,19 +1,19 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/carverauto/serviceradar/pkg/cloud (interfaces: NodeService,CloudService)
+// Source: github.com/carverauto/serviceradar/pkg/core (interfaces: NodeService,CoreService)
 //
 // Generated by this command:
 //
-//	mockgen -destination=mock_server.go -package=cloud github.com/carverauto/serviceradar/pkg/cloud NodeService,CloudService
+//	mockgen -destination=mock_server.go -package=core github.com/carverauto/serviceradar/pkg/core NodeService,CoreService
 //
 
-// Package cloud is a generated GoMock package.
+// Package core is a generated GoMock package.
 package core
 
 import (
 	context "context"
 	reflect "reflect"
 
-	api "github.com/carverauto/serviceradar/pkg/cloud/api"
+	api "github.com/carverauto/serviceradar/pkg/core/api"
 	metrics "github.com/carverauto/serviceradar/pkg/metrics"
 	gomock "go.uber.org/mock/gomock"
 )
@@ -101,32 +101,32 @@ func (mr *MockNodeServiceMockRecorder) UpdateNodeStatus(nodeID, status any) *gom
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateNodeStatus", reflect.TypeOf((*MockNodeService)(nil).UpdateNodeStatus), nodeID, status)
 }
 
-// MockCloudService is a mock of CloudService interface.
-type MockCloudService struct {
+// MockCoreService is a mock of CoreService interface.
+type MockCoreService struct {
 	ctrl     *gomock.Controller
-	recorder *MockCloudServiceMockRecorder
+	recorder *MockCoreServiceMockRecorder
 	isgomock struct{}
 }
 
-// MockCloudServiceMockRecorder is the mock recorder for MockCloudService.
-type MockCloudServiceMockRecorder struct {
-	mock *MockCloudService
+// MockCoreServiceMockRecorder is the mock recorder for MockCoreService.
+type MockCoreServiceMockRecorder struct {
+	mock *MockCoreService
 }
 
-// NewMockCloudService creates a new mock instance.
-func NewMockCloudService(ctrl *gomock.Controller) *MockCloudService {
-	mock := &MockCloudService{ctrl: ctrl}
-	mock.recorder = &MockCloudServiceMockRecorder{mock}
+// NewMockCoreService creates a new mock instance.
+func NewMockCoreService(ctrl *gomock.Controller) *MockCoreService {
+	mock := &MockCoreService{ctrl: ctrl}
+	mock.recorder = &MockCoreServiceMockRecorder{mock}
 	return mock
 }
 
 // EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockCloudService) EXPECT() *MockCloudServiceMockRecorder {
+func (m *MockCoreService) EXPECT() *MockCoreServiceMockRecorder {
 	return m.recorder
 }
 
 // GetMetricsManager mocks base method.
-func (m *MockCloudService) GetMetricsManager() metrics.MetricCollector {
+func (m *MockCoreService) GetMetricsManager() metrics.MetricCollector {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetMetricsManager")
 	ret0, _ := ret[0].(metrics.MetricCollector)
@@ -134,13 +134,13 @@ func (m *MockCloudService) GetMetricsManager() metrics.MetricCollector {
 }
 
 // GetMetricsManager indicates an expected call of GetMetricsManager.
-func (mr *MockCloudServiceMockRecorder) GetMetricsManager() *gomock.Call {
+func (mr *MockCoreServiceMockRecorder) GetMetricsManager() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMetricsManager", reflect.TypeOf((*MockCloudService)(nil).GetMetricsManager))
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMetricsManager", reflect.TypeOf((*MockCoreService)(nil).GetMetricsManager))
 }
 
 // ReportStatus mocks base method.
-func (m *MockCloudService) ReportStatus(ctx context.Context, nodeID string, status *api.NodeStatus) error {
+func (m *MockCoreService) ReportStatus(ctx context.Context, nodeID string, status *api.NodeStatus) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ReportStatus", ctx, nodeID, status)
 	ret0, _ := ret[0].(error)
@@ -148,13 +148,13 @@ func (m *MockCloudService) ReportStatus(ctx context.Context, nodeID string, stat
 }
 
 // ReportStatus indicates an expected call of ReportStatus.
-func (mr *MockCloudServiceMockRecorder) ReportStatus(ctx, nodeID, status any) *gomock.Call {
+func (mr *MockCoreServiceMockRecorder) ReportStatus(ctx, nodeID, status any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReportStatus", reflect.TypeOf((*MockCloudService)(nil).ReportStatus), ctx, nodeID, status)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReportStatus", reflect.TypeOf((*MockCoreService)(nil).ReportStatus), ctx, nodeID, status)
 }
 
 // Start mocks base method.
-func (m *MockCloudService) Start(ctx context.Context) error {
+func (m *MockCoreService) Start(ctx context.Context) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Start", ctx)
 	ret0, _ := ret[0].(error)
@@ -162,13 +162,13 @@ func (m *MockCloudService) Start(ctx context.Context) error {
 }
 
 // Start indicates an expected call of Start.
-func (mr *MockCloudServiceMockRecorder) Start(ctx any) *gomock.Call {
+func (mr *MockCoreServiceMockRecorder) Start(ctx any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockCloudService)(nil).Start), ctx)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockCoreService)(nil).Start), ctx)
 }
 
 // Stop mocks base method.
-func (m *MockCloudService) Stop(ctx context.Context) error {
+func (m *MockCoreService) Stop(ctx context.Context) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Stop", ctx)
 	ret0, _ := ret[0].(error)
@@ -176,7 +176,7 @@ func (m *MockCloudService) Stop(ctx context.Context) error {
 }
 
 // Stop indicates an expected call of Stop.
-func (mr *MockCloudServiceMockRecorder) Stop(ctx any) *gomock.Call {
+func (mr *MockCoreServiceMockRecorder) Stop(ctx any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockCloudService)(nil).Stop), ctx)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockCoreService)(nil).Stop), ctx)
 }
diff --git a/pkg/core/node_recovery.go b/pkg/core/node_recovery.go
index ce0ddad..f7f1355 100644
--- a/pkg/core/node_recovery.go
+++ b/pkg/core/node_recovery.go
@@ -23,7 +23,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/carverauto/serviceradar/pkg/cloud/alerts"
+	"github.com/carverauto/serviceradar/pkg/core/alerts"
 	"github.com/carverauto/serviceradar/pkg/db"
 )
 
diff --git a/pkg/core/node_recovery_test.go b/pkg/core/node_recovery_test.go
index da6b35d..9254cf7 100644
--- a/pkg/core/node_recovery_test.go
+++ b/pkg/core/node_recovery_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/carverauto/serviceradar/pkg/cloud/alerts"
+	"github.com/carverauto/serviceradar/pkg/core/alerts"
 	"github.com/carverauto/serviceradar/pkg/db"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
diff --git a/pkg/core/server.go b/pkg/core/server.go
index 39faa94..e652cd0 100644
--- a/pkg/core/server.go
+++ b/pkg/core/server.go
@@ -28,8 +28,8 @@ import (
 	"time"
 
 	"github.com/carverauto/serviceradar/pkg/checker/snmp"
-	"github.com/carverauto/serviceradar/pkg/cloud/alerts"
-	"github.com/carverauto/serviceradar/pkg/cloud/api"
+	"github.com/carverauto/serviceradar/pkg/core/alerts"
+	"github.com/carverauto/serviceradar/pkg/core/api"
 	"github.com/carverauto/serviceradar/pkg/db"
 	"github.com/carverauto/serviceradar/pkg/metrics"
 	"github.com/carverauto/serviceradar/pkg/models"
diff --git a/pkg/core/server_test.go b/pkg/core/server_test.go
index dd431a3..ffb53bb 100644
--- a/pkg/core/server_test.go
+++ b/pkg/core/server_test.go
@@ -21,8 +21,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/carverauto/serviceradar/pkg/cloud/alerts"
-	"github.com/carverauto/serviceradar/pkg/cloud/api"
+	"github.com/carverauto/serviceradar/pkg/core/alerts"
+	"github.com/carverauto/serviceradar/pkg/core/api"
 	"github.com/carverauto/serviceradar/proto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/pkg/core/types.go b/pkg/core/types.go
index da1145a..78b1731 100644
--- a/pkg/core/types.go
+++ b/pkg/core/types.go
@@ -21,8 +21,8 @@ import (
 	"time"
 
 	"github.com/carverauto/serviceradar/pkg/checker/snmp"
-	"github.com/carverauto/serviceradar/pkg/cloud/alerts"
-	"github.com/carverauto/serviceradar/pkg/cloud/api"
+	"github.com/carverauto/serviceradar/pkg/core/alerts"
+	"github.com/carverauto/serviceradar/pkg/core/api"
 	"github.com/carverauto/serviceradar/pkg/db"
 	"github.com/carverauto/serviceradar/pkg/grpc"
 	"github.com/carverauto/serviceradar/pkg/metrics"