diff --git a/cfg_checker/cli/network.py b/cfg_checker/cli/network.py
index f70c410..4d6d0c4 100644
--- a/cfg_checker/cli/network.py
+++ b/cfg_checker/cli/network.py
@@ -1,4 +1,4 @@
-from cfg_checker.network.checker import NetworkChecker
+from cfg_checker.modules.network.checker import NetworkChecker
 
 if __name__ == '__main__':
     # init connection to salt and collect minion data
diff --git a/cfg_checker/cli/package.py b/cfg_checker/cli/package.py
index 3119385..74166be 100644
--- a/cfg_checker/cli/package.py
+++ b/cfg_checker/cli/package.py
@@ -1,4 +1,4 @@
-from cfg_checker.packages.checker import CloudPackageChecker
+from cfg_checker.modules.packages.checker import CloudPackageChecker
 
 
 if __name__ == '__main__':
diff --git a/cfg_checker/cli/reclass.py b/cfg_checker/cli/reclass.py
index 41b863d..2959bf3 100644
--- a/cfg_checker/cli/reclass.py
+++ b/cfg_checker/cli/reclass.py
@@ -1,4 +1,4 @@
-from cfg_checker.reclass.comparer import ModelComparer
+from cfg_checker.modules.reclass.comparer import ModelComparer
 
 if __name__ == "__main__":
     # Execute the comparison using argv params
diff --git a/cfg_checker/modules/network/checker.py b/cfg_checker/modules/network/checker.py
index 03a48de..629e01d 100644
--- a/cfg_checker/modules/network/checker.py
+++ b/cfg_checker/modules/network/checker.py
@@ -5,7 +5,7 @@
 
 from copy import deepcopy
 
-from cfg_checker import reporter
+from cfg_checker.reports import reporter
 from cfg_checker.common import utils, const
 from cfg_checker.common import config, logger, logger_cli, pkg_dir
 from cfg_checker.common import salt_utils
diff --git a/cfg_checker/modules/packages/checker.py b/cfg_checker/modules/packages/checker.py
index 5f48dcd..81ba20e 100644
--- a/cfg_checker/modules/packages/checker.py
+++ b/cfg_checker/modules/packages/checker.py
@@ -4,7 +4,7 @@
 
 from copy import deepcopy
 
-from cfg_checker import reporter
+from cfg_checker.reports import reporter
 from cfg_checker.common import utils, const
 from cfg_checker.common import config, logger, logger_cli, pkg_dir
 from cfg_checker.common import salt_utils
diff --git a/cfg_checker/modules/reclass/comparer.py b/cfg_checker/modules/reclass/comparer.py
index 5a26f29..0dec9d1 100644
--- a/cfg_checker/modules/reclass/comparer.py
+++ b/cfg_checker/modules/reclass/comparer.py
@@ -6,7 +6,7 @@
 import os
 import yaml
 
-from cfg_checker import reporter
+from cfg_checker.reports import reporter
 from cfg_checker.common import logger, logger_cli