diff --git a/dvc/command/data_sync.py b/dvc/command/data_sync.py
index d299ca17c..8c7009e6e 100644
--- a/dvc/command/data_sync.py
+++ b/dvc/command/data_sync.py
@@ -3,7 +3,7 @@ import os
 
 from boto.s3.connection import S3Connection
 
-from dvc.command.cmd_base import CmdBase
+from dvc.command.base import CmdBase
 from dvc.logger import Logger
 from dvc.exceptions import DvcException
 from dvc.utils import run
diff --git a/dvc/command/import.py b/dvc/command/import.py
index 1a2d90194..c03e33950 100644
--- a/dvc/command/import.py
+++ b/dvc/command/import.py
@@ -4,8 +4,8 @@ import re
 import fasteners
 import requests
 
-from dvc.command.cmd_base import CmdBase
-from dvc.command.cmd_data_sync import sizeof_fmt
+from dvc.command.base import CmdBase
+from dvc.command.data_sync import sizeof_fmt
 from dvc.logger import Logger
 from dvc.exceptions import DvcException
 from dvc.state_file import StateFile
diff --git a/dvc/command/init.py b/dvc/command/init.py
index 9f536d810..2f45dfc8a 100644
--- a/dvc/command/init.py
+++ b/dvc/command/init.py
@@ -1,7 +1,7 @@
 import os
 from pathlib import Path
 
-from dvc.command.cmd_base import CmdBase
+from dvc.command.base import CmdBase
 from dvc.logger import Logger
 from dvc.config import Config
 from dvc.exceptions import DvcException
diff --git a/dvc/command/remove.py b/dvc/command/remove.py
index b50722e4d..cb29341dc 100644
--- a/dvc/command/remove.py
+++ b/dvc/command/remove.py
@@ -3,7 +3,7 @@ import os
 import fasteners
 from boto.s3.connection import S3Connection
 
-from dvc.command.cmd_base import CmdBase
+from dvc.command.base import CmdBase
 from dvc.exceptions import DvcException
 from dvc.logger import Logger
 from dvc.utils import run
diff --git a/dvc/command/repro.py b/dvc/command/repro.py
index b5062b441..9829baf1a 100644
--- a/dvc/command/repro.py
+++ b/dvc/command/repro.py
@@ -2,8 +2,8 @@ import os
 
 import fasteners
 
-from dvc.command.cmd_base import CmdBase
-from dvc.command.cmd_run import CmdRun
+from dvc.command.base import CmdBase
+from dvc.command.run import CmdRun
 from dvc.logger import Logger
 from dvc.exceptions import DvcException
 from dvc.path.data_item import NotInDataDirError
diff --git a/dvc/command/run.py b/dvc/command/run.py
index 150b9baed..03693b82c 100644
--- a/dvc/command/run.py
+++ b/dvc/command/run.py
@@ -5,7 +5,7 @@ import fasteners
 
 from dvc.path.data_item import NotInDataDirError
 from dvc.git_wrapper import GitWrapper
-from dvc.command.cmd_base import CmdBase
+from dvc.command.base import CmdBase
 from dvc.logger import Logger
 from dvc.exceptions import DvcException
 from dvc.repository_change import RepositoryChange
diff --git a/tests/test_cmd_data_remove.py b/tests/test_cmd_data_remove.py
index 2dc0d447a..8b99ebe7c 100644
--- a/tests/test_cmd_data_remove.py
+++ b/tests/test_cmd_data_remove.py
@@ -1,6 +1,6 @@
 import os
 
-from dvc.command.cmd_data_remove import CmdDataRemove, DataRemoveError
+from dvc.command.remove import CmdDataRemove, DataRemoveError
 from dvc.path.data_item import DataItemError
 from tests.basic_env import DirHierarchyEnvironment