diff --git a/internal/handlers/v1alpha1/handler.go b/internal/handlers/v1alpha1/handler.go
new file mode 100644
index 000000000..ef2b2ef99
--- /dev/null
+++ b/internal/handlers/v1alpha1/handler.go
@@ -0,0 +1,33 @@
+package v1alpha1
+
+import "github.com/kubev2v/migration-planner/internal/service"
+
+type ServiceHandler struct {
+	sourceSrv     *service.SourceService
+	assessmentSrv service.AssessmentServicer
+	jobSrv        *service.JobService
+	sizerSrv      *service.SizerService
+	estimationSrv *service.EstimationService
+	accountsSrv   *service.AccountsService
+	partnerSrv    service.PartnerServicer
+}
+
+func NewServiceHandler(
+	sourceService *service.SourceService,
+	a service.AssessmentServicer,
+	j *service.JobService,
+	sizer *service.SizerService,
+	estimation *service.EstimationService,
+	accounts *service.AccountsService,
+	partner service.PartnerServicer,
+) *ServiceHandler {
+	return &ServiceHandler{
+		sourceSrv:     sourceService,
+		assessmentSrv: a,
+		jobSrv:        j,
+		sizerSrv:      sizer,
+		estimationSrv: estimation,
+		accountsSrv:   accounts,
+		partnerSrv:    partner,
+	}
+}
diff --git a/internal/handlers/v1alpha1/source.go b/internal/handlers/v1alpha1/source.go
index 2bdc28ade..0d8f9a877 100644
--- a/internal/handlers/v1alpha1/source.go
+++ b/internal/handlers/v1alpha1/source.go
@@ -15,36 +15,6 @@ import (
 	srvMappers "github.com/kubev2v/migration-planner/internal/service/mappers"
 )
 
-type ServiceHandler struct {
-	sourceSrv     *service.SourceService
-	assessmentSrv service.AssessmentServicer
-	jobSrv        *service.JobService
-	sizerSrv      *service.SizerService
-	estimationSrv *service.EstimationService
-	accountsSrv   *service.AccountsService
-	partnerSrv    service.PartnerServicer
-}
-
-func NewServiceHandler(
-	sourceService *service.SourceService,
-	a service.AssessmentServicer,
-	j *service.JobService,
-	sizer *service.SizerService,
-	estimation *service.EstimationService,
-	accounts *service.AccountsService,
-	partner service.PartnerServicer,
-) *ServiceHandler {
-	return &ServiceHandler{
-		sourceSrv:     sourceService,
-		assessmentSrv: a,
-		jobSrv:        j,
-		sizerSrv:      sizer,
-		estimationSrv: estimation,
-		accountsSrv:   accounts,
-		partnerSrv:    partner,
-	}
-}
-
 // validateSourceData validates the source data using the source validation rules
 func validateSourceData(data interface{}) error {
 	v := validator.NewValidator()