diff --git a/app/services/boards/base_service.rb b/app/services/boards/base_service.rb
deleted file mode 100644
index 7eacacbaf7e1d15e6812982b0b6c043089bebd8e..0000000000000000000000000000000000000000
--- a/app/services/boards/base_service.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module Boards
-  class BaseService < ::BaseService
-  end
-end
diff --git a/app/services/boards/create_service.rb b/app/services/boards/create_service.rb
index a9dbd76a44af32fe7cca78e884f58e411de02fe2..9bdd7b6f0cf16034c904b1faae7a302d4e050cfa 100644
--- a/app/services/boards/create_service.rb
+++ b/app/services/boards/create_service.rb
@@ -1,5 +1,5 @@
 module Boards
-  class CreateService < Boards::BaseService
+  class CreateService < BaseService
     def execute
       if project.boards.empty?
         create_board!
diff --git a/app/services/boards/issues/create_service.rb b/app/services/boards/issues/create_service.rb
index a181e74043bc42226b3b85bae58646662b635024..c0d7ff5b585a5bb3c3c07d96d0f4e43eda1d1f8d 100644
--- a/app/services/boards/issues/create_service.rb
+++ b/app/services/boards/issues/create_service.rb
@@ -1,6 +1,6 @@
 module Boards
   module Issues
-    class CreateService < Boards::BaseService
+    class CreateService < BaseService
       def execute
         create_issue(params.merge(label_ids: [list.label_id]))
       end
diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb
index 782dbf0db1aa568afae1afb70246a4cef4b73b2d..fd4a462c7b2faa831cd77510360275c75ca38100 100644
--- a/app/services/boards/issues/list_service.rb
+++ b/app/services/boards/issues/list_service.rb
@@ -1,6 +1,6 @@
 module Boards
   module Issues
-    class ListService < Boards::BaseService
+    class ListService < BaseService
       def execute
         issues = IssuesFinder.new(current_user, filter_params).execute
         issues = without_board_labels(issues) unless list.movable?
diff --git a/app/services/boards/issues/move_service.rb b/app/services/boards/issues/move_service.rb
index 9a16609a8b504432abf654365635da405c45e55f..96554a92a027ae83c5fc6519085d9c6b190cc536 100644
--- a/app/services/boards/issues/move_service.rb
+++ b/app/services/boards/issues/move_service.rb
@@ -1,6 +1,6 @@
 module Boards
   module Issues
-    class MoveService < Boards::BaseService
+    class MoveService < BaseService
       def execute(issue)
         return false unless can?(current_user, :update_issue, issue)
         return false unless valid_move?
diff --git a/app/services/boards/list_service.rb b/app/services/boards/list_service.rb
index cca4bdd82a29a6a2b357fd66916720d4f2d460de..84f1fc3a4e297bc55856ac5d8148df1ce44a8a7f 100644
--- a/app/services/boards/list_service.rb
+++ b/app/services/boards/list_service.rb
@@ -1,5 +1,5 @@
 module Boards
-  class ListService < Boards::BaseService
+  class ListService < BaseService
     def execute
       create_board! if project.boards.empty?
       project.boards
diff --git a/app/services/boards/lists/create_service.rb b/app/services/boards/lists/create_service.rb
index da6f59c03997a12720dbc9e8db403f68c55708c3..abc7aeece39eafc276c0aa42a6b712d7f9b1a1bf 100644
--- a/app/services/boards/lists/create_service.rb
+++ b/app/services/boards/lists/create_service.rb
@@ -1,6 +1,6 @@
 module Boards
   module Lists
-    class CreateService < Boards::BaseService
+    class CreateService < BaseService
       def execute(board)
         List.transaction do
           label    = project.labels.find(params[:label_id])
diff --git a/app/services/boards/lists/destroy_service.rb b/app/services/boards/lists/destroy_service.rb
index d75c5fd3dc6346bbb6e61c0d40c1c68746ed7980..f986e05944c336281cd301f1938062fbee3c9a79 100644
--- a/app/services/boards/lists/destroy_service.rb
+++ b/app/services/boards/lists/destroy_service.rb
@@ -1,6 +1,6 @@
 module Boards
   module Lists
-    class DestroyService < Boards::BaseService
+    class DestroyService < BaseService
       def execute(list)
         return false unless list.destroyable?
 
diff --git a/app/services/boards/lists/generate_service.rb b/app/services/boards/lists/generate_service.rb
index 686e4e4b3368ed55f25ce1301fba51983b6d2be3..d8048f1c67edb1d74a3ee78b4806d1e206f175ea 100644
--- a/app/services/boards/lists/generate_service.rb
+++ b/app/services/boards/lists/generate_service.rb
@@ -1,6 +1,6 @@
 module Boards
   module Lists
-    class GenerateService < Boards::BaseService
+    class GenerateService < BaseService
       def execute(board)
         return false unless board.lists.movable.empty?
 
diff --git a/app/services/boards/lists/list_service.rb b/app/services/boards/lists/list_service.rb
index ff739bc7d9ccec1c0cd924605d63948301b36a3f..c579ed4c869eb118f489d590f89800d635372144 100644
--- a/app/services/boards/lists/list_service.rb
+++ b/app/services/boards/lists/list_service.rb
@@ -1,6 +1,6 @@
 module Boards
   module Lists
-    class ListService < Boards::BaseService
+    class ListService < BaseService
       def execute(board)
         board.lists
       end
diff --git a/app/services/boards/lists/move_service.rb b/app/services/boards/lists/move_service.rb
index 7d0730e8332dd163e9ef4799d1645e172ebe2627..f2a68865f7b82fe5b88d085a554b33b53abc6177 100644
--- a/app/services/boards/lists/move_service.rb
+++ b/app/services/boards/lists/move_service.rb
@@ -1,6 +1,6 @@
 module Boards
   module Lists
-    class MoveService < Boards::BaseService
+    class MoveService < BaseService
       def execute(list)
         @board = list.board
         @old_position = list.position