diff --git a/internal/modules/closings/dto/closingMarketing.dto.go b/internal/modules/closings/dto/closingMarketing.dto.go
index e64a6735..a442fc9d 100644
--- a/internal/modules/closings/dto/closingMarketing.dto.go
+++ b/internal/modules/closings/dto/closingMarketing.dto.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	deliveryOrdersDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/dto"
+	deliveryOrdersDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/dto"
 	customerDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/customers/dto"
 	kandangDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/dto"
 	productDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/products/dto"
diff --git a/internal/modules/closings/module.go b/internal/modules/closings/module.go
index af129eda..566f26b2 100644
--- a/internal/modules/closings/module.go
+++ b/internal/modules/closings/module.go
@@ -10,7 +10,7 @@ import (
 	rClosing "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/repositories"
 	sClosing "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/services"
 	rExpenseRealization "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/repositories"
-	rMarketings "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/repositories"
+	rMarketings "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/repositories"
 	rChickin "gitlab.com/mbugroup/lti-api.git/internal/modules/production/chickins/repositories"
 	rProjectFlock "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
 
diff --git a/internal/modules/closings/services/closing.service.go b/internal/modules/closings/services/closing.service.go
index 621fdb8f..dc2ae81e 100644
--- a/internal/modules/closings/services/closing.service.go
+++ b/internal/modules/closings/services/closing.service.go
@@ -10,8 +10,8 @@ import (
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/validations"
 	expenseRealizationRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/repositories"
-	marketingDeliveryProductRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/repositories"
-	marketingRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/repositories"
+	marketingDeliveryProductRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/repositories"
+	marketingRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/repositories"
 	chickinRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/production/chickins/repositories"
 	projectflockRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
diff --git a/internal/modules/marketing/delivery-orderss/controllers/delivery-orders.controller.go b/internal/modules/marketing/controllers/deliveryorder.controller.go
similarity index 92%
rename from internal/modules/marketing/delivery-orderss/controllers/delivery-orders.controller.go
rename to internal/modules/marketing/controllers/deliveryorder.controller.go
index 292381d0..73904cc3 100644
--- a/internal/modules/marketing/delivery-orderss/controllers/delivery-orders.controller.go
+++ b/internal/modules/marketing/controllers/deliveryorder.controller.go
@@ -4,9 +4,9 @@ import (
 	"math"
 	"strconv"
 
-	"gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/dto"
-	service "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/services"
-	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/validations"
+	"gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/dto"
+	service "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/services"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/response"
 
 	"github.com/gofiber/fiber/v2"
@@ -23,7 +23,7 @@ func NewDeliveryOrdersController(deliveryOrdersService service.DeliveryOrdersSer
 }
 
 func (u *DeliveryOrdersController) GetAll(c *fiber.Ctx) error {
-	query := &validation.Query{
+	query := &validation.DeliveryOrderQuery{
 		Page:        c.QueryInt("page", 1),
 		Limit:       c.QueryInt("limit", 10),
 		MarketingId: uint(c.QueryInt("marketing_id", 0)),
@@ -76,7 +76,7 @@ func (u *DeliveryOrdersController) GetOne(c *fiber.Ctx) error {
 }
 
 func (u *DeliveryOrdersController) CreateOne(c *fiber.Ctx) error {
-	req := new(validation.Create)
+	req := new(validation.DeliveryOrderCreate)
 
 	if err := c.BodyParser(req); err != nil {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid request body")
@@ -97,7 +97,7 @@ func (u *DeliveryOrdersController) CreateOne(c *fiber.Ctx) error {
 }
 
 func (u *DeliveryOrdersController) UpdateOne(c *fiber.Ctx) error {
-	req := new(validation.Update)
+	req := new(validation.DeliveryOrderUpdate)
 	param := c.Params("id")
 
 	id, err := strconv.Atoi(param)
diff --git a/internal/modules/marketing/sales-orders/controllers/sales-orders.controller.go b/internal/modules/marketing/controllers/salesorder.controller.go
similarity index 95%
rename from internal/modules/marketing/sales-orders/controllers/sales-orders.controller.go
rename to internal/modules/marketing/controllers/salesorder.controller.go
index 16d3b5be..416af20f 100644
--- a/internal/modules/marketing/sales-orders/controllers/sales-orders.controller.go
+++ b/internal/modules/marketing/controllers/salesorder.controller.go
@@ -3,9 +3,9 @@ package controller
 import (
 	"strconv"
 
-	"gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/dto"
-	service "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/services"
-	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/validations"
+	"gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/dto"
+	service "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/services"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/response"
 
 	"github.com/gofiber/fiber/v2"
diff --git a/internal/modules/marketing/delivery-orderss/module.go b/internal/modules/marketing/delivery-orderss/module.go
deleted file mode 100644
index efe3737d..00000000
--- a/internal/modules/marketing/delivery-orderss/module.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package delivery_orderss
-
-import (
-	"fmt"
-
-	"github.com/go-playground/validator/v10"
-	"github.com/gofiber/fiber/v2"
-	"gorm.io/gorm"
-
-	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
-	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
-	sDeliveryOrders "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/services"
-	rMarketing "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/repositories"
-	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
-	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-)
-
-type DeliveryOrdersModule struct{}
-
-func (DeliveryOrdersModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
-	marketingRepo := rMarketing.NewMarketingRepository(db)
-	marketingProductRepo := rMarketing.NewMarketingProductRepository(db)
-	marketingDeliveryProductRepo := rMarketing.NewMarketingDeliveryProductRepository(db)
-	userRepo := rUser.NewUserRepository(db)
-	approvalRepo := commonRepo.NewApprovalRepository(db)
-	approvalSvc := commonSvc.NewApprovalService(approvalRepo)
-
-	// Register workflow steps for MARKETINGS approval
-	if err := approvalSvc.RegisterWorkflowSteps(utils.ApprovalWorkflowMarketing, utils.MarketingApprovalSteps); err != nil {
-		panic(fmt.Sprintf("failed to register marketing approval workflow: %v", err))
-	}
-
-	deliveryOrdersService := sDeliveryOrders.NewDeliveryOrdersService(marketingRepo, marketingProductRepo, marketingDeliveryProductRepo, approvalSvc, validate)
-	userService := sUser.NewUserService(userRepo, validate)
-
-	DeliveryOrdersRoutes(router, userService, deliveryOrdersService)
-}
diff --git a/internal/modules/marketing/delivery-orderss/route.go b/internal/modules/marketing/delivery-orderss/route.go
deleted file mode 100644
index c83330da..00000000
--- a/internal/modules/marketing/delivery-orderss/route.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package delivery_orderss
-
-import (
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
-	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/controllers"
-	deliveryOrders "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/services"
-	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
-
-	"github.com/gofiber/fiber/v2"
-)
-
-func DeliveryOrdersRoutes(v1 fiber.Router, u user.UserService, s deliveryOrders.DeliveryOrdersService) {
-	ctrl := controller.NewDeliveryOrdersController(s)
-
-	v1.Get("/", ctrl.GetAll)
-	v1.Get("/:id", ctrl.GetOne)
-
-	// Sisanya di group /delivery-orders
-	route := v1.Group("/delivery-orders")
-	route.Use(m.Auth(u))
-
-	// route.Get("/", m.Auth(u), ctrl.GetAll)
-	// route.Post("/", m.Auth(u), ctrl.CreateOne)
-	// route.Get("/:id", m.Auth(u), ctrl.GetOne)
-	// route.Patch("/:id", m.Auth(u), ctrl.UpdateOne)
-	// route.Delete("/:id", m.Auth(u), ctrl.DeleteOne)
-
-	route.Post("/", ctrl.CreateOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-
-}
diff --git a/internal/modules/marketing/delivery-orderss/dto/delivery-orders.dto.go b/internal/modules/marketing/dto/deliveryorder.dto.go
similarity index 94%
rename from internal/modules/marketing/delivery-orderss/dto/delivery-orders.dto.go
rename to internal/modules/marketing/dto/deliveryorder.dto.go
index 69037499..b2bb70d7 100644
--- a/internal/modules/marketing/delivery-orderss/dto/delivery-orders.dto.go
+++ b/internal/modules/marketing/dto/deliveryorder.dto.go
@@ -24,7 +24,7 @@ type MarketingListDTO struct {
 	Customer       customerDTO.CustomerRelationDTO `json:"customer"`
 	SalesPerson    userDTO.UserRelationDTO         `json:"sales_person"`
 	SoDocs         string                          `json:"so_docs"`
-	SalesOrder     []MarketingProductDTO           `json:"sales_order"`
+	SalesOrder     []DeliveryMarketingProductDTO   `json:"sales_order"`
 	CreatedUser    userDTO.UserRelationDTO         `json:"created_user"`
 	CreatedAt      time.Time                       `json:"created_at"`
 	UpdatedAt      time.Time                       `json:"updated_at"`
@@ -36,13 +36,14 @@ type MarketingDetailDTO struct {
 	Customer       customerDTO.CustomerRelationDTO `json:"customer"`
 	SalesPerson    userDTO.UserRelationDTO         `json:"sales_person"`
 	SoDocs         string                          `json:"so_docs"`
-	SalesOrder     []MarketingProductDTO           `json:"sales_order"`
+	SalesOrder     []DeliveryMarketingProductDTO   `json:"sales_order"`
 	DeliveryOrder  []DeliveryGroupDTO              `json:"delivery_order"`
 	CreatedUser    userDTO.UserRelationDTO         `json:"created_user"`
 	CreatedAt      time.Time                       `json:"created_at"`
 	UpdatedAt      time.Time                       `json:"updated_at"`
 	LatestApproval approvalDTO.ApprovalRelationDTO `json:"latest_approval"`
 }
+
 type MarketingDeliveryProductDTO struct {
 	Id                 uint                                          `json:"id"`
 	MarketingProductId uint                                          `json:"marketing_product_id"`
@@ -73,7 +74,7 @@ type DeliveryGroupDTO struct {
 	Deliveries   []DeliveryItemDTO                         `json:"deliveries"`
 }
 
-type MarketingProductDTO struct {
+type DeliveryMarketingProductDTO struct {
 	Id                 uint                                          `json:"id"`
 	MarketingId        uint                                          `json:"marketing_id"`
 	ProductWarehouseId uint                                          `json:"product_warehouse_id"`
@@ -95,14 +96,14 @@ func ToMarketingRelationDTO(marketing *entity.Marketing) MarketingRelationDTO {
 	}
 }
 
-func ToMarketingProductDTO(e entity.MarketingProduct) MarketingProductDTO {
+func ToDeliveryMarketingProductDTO(e entity.MarketingProduct) DeliveryMarketingProductDTO {
 	var productWarehouse *productwarehouseDTO.ProductWarehousNestedDTO
 	if e.ProductWarehouse.Id != 0 {
 		mapped := productwarehouseDTO.ToProductWarehouseNestedDTO(e.ProductWarehouse)
 		productWarehouse = &mapped
 	}
 
-	return MarketingProductDTO{
+	return DeliveryMarketingProductDTO{
 		Id:                 e.Id,
 		MarketingId:        e.MarketingId,
 		ProductWarehouseId: e.ProductWarehouseId,
@@ -155,11 +156,11 @@ func ToMarketingListDTO(marketing *entity.Marketing, deliveryProducts []entity.M
 		latestApproval = mapped
 	}
 
-	var salesOrderProducts []MarketingProductDTO
+	var salesOrderProducts []DeliveryMarketingProductDTO
 	if len(marketing.Products) > 0 {
-		salesOrderProducts = make([]MarketingProductDTO, len(marketing.Products))
+		salesOrderProducts = make([]DeliveryMarketingProductDTO, len(marketing.Products))
 		for i, product := range marketing.Products {
-			salesOrderProducts[i] = ToMarketingProductDTO(product)
+			salesOrderProducts[i] = ToDeliveryMarketingProductDTO(product)
 		}
 	}
 
@@ -195,11 +196,11 @@ func ToMarketingDetailDTO(marketing *entity.Marketing, deliveryProducts []entity
 		salesPerson = mapped
 	}
 
-	var salesOrderProducts []MarketingProductDTO
+	var salesOrderProducts []DeliveryMarketingProductDTO
 	if len(marketing.Products) > 0 {
-		salesOrderProducts = make([]MarketingProductDTO, len(marketing.Products))
+		salesOrderProducts = make([]DeliveryMarketingProductDTO, len(marketing.Products))
 		for i, product := range marketing.Products {
-			salesOrderProducts[i] = ToMarketingProductDTO(product)
+			salesOrderProducts[i] = ToDeliveryMarketingProductDTO(product)
 		}
 	}
 
diff --git a/internal/modules/marketing/sales-orders/dto/sales-orders.dto.go b/internal/modules/marketing/dto/salesorder.dto.go
similarity index 100%
rename from internal/modules/marketing/sales-orders/dto/sales-orders.dto.go
rename to internal/modules/marketing/dto/salesorder.dto.go
diff --git a/internal/modules/marketing/module.go b/internal/modules/marketing/module.go
index 9bf4f018..33048bdf 100644
--- a/internal/modules/marketing/module.go
+++ b/internal/modules/marketing/module.go
@@ -1,13 +1,48 @@
 package marketing
 
 import (
+	"fmt"
+
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
 	"gorm.io/gorm"
+
+	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
+	rProductWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
+	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/repositories"
+	service "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/services"
+	rCustomer "gitlab.com/mbugroup/lti-api.git/internal/modules/master/customers/repositories"
+	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
+	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 )
 
 type MarketingModule struct{}
 
 func (MarketingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
-	RegisterRoutes(router, db, validate)
+	// Initialize repositories
+	marketingRepo := repository.NewMarketingRepository(db)
+	marketingProductRepo := repository.NewMarketingProductRepository(db)
+	marketingDeliveryProductRepo := repository.NewMarketingDeliveryProductRepository(db)
+	userRepo := rUser.NewUserRepository(db)
+	customerRepo := rCustomer.NewCustomerRepository(db)
+	productWarehouseRepo := rProductWarehouse.NewProductWarehouseRepository(db)
+
+	// Initialize approval service
+	approvalRepo := commonRepo.NewApprovalRepository(db)
+	approvalSvc := commonSvc.NewApprovalService(approvalRepo)
+
+	// Register workflow steps for marketing approval
+	if err := approvalSvc.RegisterWorkflowSteps(utils.ApprovalWorkflowMarketing, utils.MarketingApprovalSteps); err != nil {
+		panic(fmt.Sprintf("failed to register marketing approval workflow: %v", err))
+	}
+
+	// Initialize services
+	salesOrdersService := service.NewSalesOrdersService(marketingRepo, customerRepo, productWarehouseRepo, userRepo, approvalSvc, validate)
+	deliveryOrdersService := service.NewDeliveryOrdersService(marketingRepo, marketingProductRepo, marketingDeliveryProductRepo, approvalSvc, validate)
+	userService := sUser.NewUserService(userRepo, validate)
+
+	// Register routes
+	RegisterRoutes(router, userService, salesOrdersService, deliveryOrdersService)
 }
diff --git a/internal/modules/marketing/sales-orders/repositories/marketings.repository.go b/internal/modules/marketing/repositories/salesorder.repository.go
similarity index 100%
rename from internal/modules/marketing/sales-orders/repositories/marketings.repository.go
rename to internal/modules/marketing/repositories/salesorder.repository.go
diff --git a/internal/modules/marketing/sales-orders/repositories/marketing-delivery-products.repository.go b/internal/modules/marketing/repositories/salesorder_delivery_product.repository.go
similarity index 100%
rename from internal/modules/marketing/sales-orders/repositories/marketing-delivery-products.repository.go
rename to internal/modules/marketing/repositories/salesorder_delivery_product.repository.go
diff --git a/internal/modules/marketing/sales-orders/repositories/marketing-products.repository.go b/internal/modules/marketing/repositories/salesorder_product.repository.go
similarity index 100%
rename from internal/modules/marketing/sales-orders/repositories/marketing-products.repository.go
rename to internal/modules/marketing/repositories/salesorder_product.repository.go
diff --git a/internal/modules/marketing/route.go b/internal/modules/marketing/route.go
index 1ab03896..75ecc0f6 100644
--- a/internal/modules/marketing/route.go
+++ b/internal/modules/marketing/route.go
@@ -1,27 +1,31 @@
 package marketing
 
 import (
-	"gitlab.com/mbugroup/lti-api.git/internal/modules"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/controllers"
+	service "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/services"
+	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
 
-	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
-	"gorm.io/gorm"
-
-	salesOrderss "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders"
-	deliveryOrderss "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss"
-	// MODULE IMPORTS
 )
 
-func RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
-	group := router.Group("/marketing")
+func RegisterRoutes(router fiber.Router, userService user.UserService, salesOrdersService service.SalesOrdersService, deliveryOrdersService service.DeliveryOrdersService) {
+	salesOrdersCtrl := controller.NewSalesOrdersController(salesOrdersService)
+	deliveryOrdersCtrl := controller.NewDeliveryOrdersController(deliveryOrdersService)
 
-	allModules := []modules.Module{
-		salesOrderss.SalesOrdersModule{},
-		deliveryOrderss.DeliveryOrdersModule{},
-		// MODULE REGISTRY
-	}
+	route := router.Group("/marketing")
+	route.Use(m.Auth(userService))
 
-	for _, m := range allModules {
-		m.RegisterRoutes(group, db, validate)
-	}
+	route.Get("/", deliveryOrdersCtrl.GetAll)
+	route.Get("/:id", deliveryOrdersCtrl.GetOne)
+	route.Delete("/:id", salesOrdersCtrl.DeleteOne)
+
+	route.Post("/sales-orders", salesOrdersCtrl.CreateOne)
+	route.Patch("/sales-orders/:id", salesOrdersCtrl.UpdateOne)
+	route.Post("/sales-orders/approvals", salesOrdersCtrl.Approval)
+
+	route.Get("/delivery-orders", deliveryOrdersCtrl.GetAll)
+	route.Get("/delivery-orders/:id", deliveryOrdersCtrl.GetOne)
+	route.Post("/delivery-orders", deliveryOrdersCtrl.CreateOne)
+	route.Patch("/delivery-orders/:id", deliveryOrdersCtrl.UpdateOne)
 }
diff --git a/internal/modules/marketing/sales-orders/module.go b/internal/modules/marketing/sales-orders/module.go
deleted file mode 100644
index 0d9583d0..00000000
--- a/internal/modules/marketing/sales-orders/module.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package sales_orders
-
-import (
-	"fmt"
-
-	"github.com/go-playground/validator/v10"
-	"github.com/gofiber/fiber/v2"
-	"gorm.io/gorm"
-
-	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
-	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
-	rProductWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
-	rSalesOrders "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/repositories"
-	sSalesOrders "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/services"
-	rCustomer "gitlab.com/mbugroup/lti-api.git/internal/modules/master/customers/repositories"
-	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
-	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-)
-
-type SalesOrdersModule struct{}
-
-func (SalesOrdersModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
-	marketingRepo := rSalesOrders.NewMarketingRepository(db)
-	userRepo := rUser.NewUserRepository(db)
-	customerRepo := rCustomer.NewCustomerRepository(db)
-	productWarehouseRepo := rProductWarehouse.NewProductWarehouseRepository(db)
-
-	approvalSvc := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(db))
-
-	if err := approvalSvc.RegisterWorkflowSteps(utils.ApprovalWorkflowMarketing, utils.MarketingApprovalSteps); err != nil {
-		panic(fmt.Sprintf("failed to register marketing approval workflow: %v", err))
-	}
-
-	salesOrdersService := sSalesOrders.NewSalesOrdersService(marketingRepo, customerRepo, productWarehouseRepo, userRepo, approvalSvc, validate)
-	userService := sUser.NewUserService(userRepo, validate)
-
-	SalesOrdersRoutes(router, userService, salesOrdersService)
-}
diff --git a/internal/modules/marketing/sales-orders/route.go b/internal/modules/marketing/sales-orders/route.go
deleted file mode 100644
index f87cea66..00000000
--- a/internal/modules/marketing/sales-orders/route.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package sales_orders
-
-import (
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
-	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/controllers"
-	salesOrders "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/services"
-	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
-
-	"github.com/gofiber/fiber/v2"
-)
-
-func SalesOrdersRoutes(v1 fiber.Router, u user.UserService, s salesOrders.SalesOrdersService) {
-	ctrl := controller.NewSalesOrdersController(s)
-
-	v1.Delete("/:id", ctrl.DeleteOne)
-	route := v1.Group("/sales-orders")
-	route.Use(m.Auth(u))
-
-	// route.Post("/", m.Auth(u), ctrl.CreateOne)
-	// route.Patch("/:id", m.Auth(u), ctrl.UpdateOne)
-	// route.Delete("/:id", m.Auth(u), ctrl.DeleteOne)
-
-	route.Post("/", ctrl.CreateOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-
-	route.Post("/approvals", ctrl.Approval)
-}
diff --git a/internal/modules/marketing/delivery-orderss/services/delivery-orders.service.go b/internal/modules/marketing/services/deliveryorder.service.go
similarity index 96%
rename from internal/modules/marketing/delivery-orderss/services/delivery-orders.service.go
rename to internal/modules/marketing/services/deliveryorder.service.go
index 52ced7d7..85b15dc5 100644
--- a/internal/modules/marketing/delivery-orderss/services/delivery-orders.service.go
+++ b/internal/modules/marketing/services/deliveryorder.service.go
@@ -11,9 +11,9 @@ import (
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	productWarehouseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
-	"gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/dto"
-	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/validations"
-	marketingRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/repositories"
+	"gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/dto"
+	marketingRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/repositories"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 
 	"github.com/go-playground/validator/v10"
@@ -23,10 +23,10 @@ import (
 )
 
 type DeliveryOrdersService interface {
-	GetAll(ctx *fiber.Ctx, params *validation.Query) ([]dto.MarketingListDTO, int64, error)
+	GetAll(ctx *fiber.Ctx, params *validation.DeliveryOrderQuery) ([]dto.MarketingListDTO, int64, error)
 	GetOne(ctx *fiber.Ctx, id uint) (*dto.MarketingDetailDTO, error)
-	CreateOne(ctx *fiber.Ctx, req *validation.Create) (*dto.MarketingDetailDTO, error)
-	UpdateOne(ctx *fiber.Ctx, req *validation.Update, id uint) (*dto.MarketingDetailDTO, error)
+	CreateOne(ctx *fiber.Ctx, req *validation.DeliveryOrderCreate) (*dto.MarketingDetailDTO, error)
+	UpdateOne(ctx *fiber.Ctx, req *validation.DeliveryOrderUpdate, id uint) (*dto.MarketingDetailDTO, error)
 }
 
 type deliveryOrdersService struct {
@@ -85,7 +85,7 @@ func (s deliveryOrdersService) getMarketingWithDeliveries(c *fiber.Ctx, marketin
 	return &responseDTO, nil
 }
 
-func (s deliveryOrdersService) GetAll(c *fiber.Ctx, params *validation.Query) ([]dto.MarketingListDTO, int64, error) {
+func (s deliveryOrdersService) GetAll(c *fiber.Ctx, params *validation.DeliveryOrderQuery) ([]dto.MarketingListDTO, int64, error) {
 	if err := s.Validate.Struct(params); err != nil {
 		return nil, 0, err
 	}
@@ -164,7 +164,7 @@ func (s deliveryOrdersService) GetOne(c *fiber.Ctx, id uint) (*dto.MarketingDeta
 	return &responseDTO, nil
 }
 
-func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*dto.MarketingDetailDTO, error) {
+func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.DeliveryOrderCreate) (*dto.MarketingDetailDTO, error) {
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
@@ -285,7 +285,7 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create)
 	return s.getMarketingWithDeliveries(c, req.MarketingId)
 }
 
-func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint) (*dto.MarketingDetailDTO, error) {
+func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryOrderUpdate, id uint) (*dto.MarketingDetailDTO, error) {
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
diff --git a/internal/modules/marketing/sales-orders/services/sales-orders.service.go b/internal/modules/marketing/services/salesorder.service.go
similarity index 99%
rename from internal/modules/marketing/sales-orders/services/sales-orders.service.go
rename to internal/modules/marketing/services/salesorder.service.go
index 061ffaf7..7d60cd6c 100644
--- a/internal/modules/marketing/sales-orders/services/sales-orders.service.go
+++ b/internal/modules/marketing/services/salesorder.service.go
@@ -11,8 +11,8 @@ import (
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	productWarehouseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
-	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/repositories"
-	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/validations"
+	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/repositories"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/validations"
 	customerRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/master/customers/repositories"
 	userRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
diff --git a/internal/modules/marketing/delivery-orderss/validations/delivery-orders.validation.go b/internal/modules/marketing/validations/deliveryorder.validation.go
similarity index 91%
rename from internal/modules/marketing/delivery-orderss/validations/delivery-orders.validation.go
rename to internal/modules/marketing/validations/deliveryorder.validation.go
index 3317e952..7db2cdd1 100644
--- a/internal/modules/marketing/delivery-orderss/validations/delivery-orders.validation.go
+++ b/internal/modules/marketing/validations/deliveryorder.validation.go
@@ -11,22 +11,22 @@ type DeliveryProduct struct {
 	VehicleNumber      string  `json:"vehicle_number" validate:"omitempty,max=50"`
 }
 
-type Create struct {
+type DeliveryOrderCreate struct {
 	MarketingId      uint              `json:"marketing_id" validate:"required,gt=0"`
 	DeliveryProducts []DeliveryProduct `json:"delivery_products" validate:"required,min=1,dive"`
 }
 
-type Update struct {
+type DeliveryOrderUpdate struct {
 	DeliveryProducts []DeliveryProduct `json:"delivery_products" validate:"omitempty,min=1,dive"`
 }
 
-type Query struct {
+type DeliveryOrderQuery struct {
 	Page        int  `query:"page" validate:"omitempty,number,min=1,gt=0"`
 	Limit       int  `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
 	MarketingId uint `query:"marketing_id" validate:"omitempty,gt=0"`
 }
 
-type Approve struct {
+type DeliveryOrderApprove struct {
 	Action        string  `json:"action" validate:"required_strict"`
 	ApprovableIds []uint  `json:"approvable_ids" validate:"required_strict,min=1,dive,gt=0"`
 	Notes         *string `json:"notes,omitempty" validate:"omitempty,max=500"`
diff --git a/internal/modules/marketing/sales-orders/validations/sales-orders.validation.go b/internal/modules/marketing/validations/salesorder.validation.go
similarity index 100%
rename from internal/modules/marketing/sales-orders/validations/sales-orders.validation.go
rename to internal/modules/marketing/validations/salesorder.validation.go