diff --git a/bandit/cli/__init__.py b/bandit/cli/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/bandit/bandit_baseline.py b/bandit/cli/baseline.py
similarity index 100%
rename from bandit/bandit_baseline.py
rename to bandit/cli/baseline.py
diff --git a/bandit/bandit_config_generator.py b/bandit/cli/config_generator.py
similarity index 100%
rename from bandit/bandit_config_generator.py
rename to bandit/cli/config_generator.py
diff --git a/bandit/bandit.py b/bandit/cli/main.py
similarity index 100%
rename from bandit/bandit.py
rename to bandit/cli/main.py
diff --git a/setup.cfg b/setup.cfg
index eb69f171..1bd1762f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,9 +23,9 @@ classifier =
 
 [entry_points]
 console_scripts =
-    bandit = bandit.bandit:main
-    bandit-config-generator = bandit.bandit_config_generator:main
-    bandit-baseline = bandit.bandit_baseline:main
+    bandit = bandit.cli.main:main
+    bandit-config-generator = bandit.cli.config_generator:main
+    bandit-baseline = bandit.cli.baseline:main
 bandit.formatters =
     csv = bandit.formatters.csv:report
     json = bandit.formatters.json:report
diff --git a/tests/unit/test_bandit.py b/tests/unit/test_bandit.py
index ec2bc592..c3a32940 100644
--- a/tests/unit/test_bandit.py
+++ b/tests/unit/test_bandit.py
@@ -4,7 +4,7 @@ import os
 import appdirs
 import testtools
 
-from bandit import bandit
+from bandit.cli import main as bandit
 from bandit.core import utils
 
 BASE_CONFIG = '/bandit.yaml'
diff --git a/tests/unit/test_bandit_baseline.py b/tests/unit/test_bandit_baseline.py
index 73076254..5d23e23a 100644
--- a/tests/unit/test_bandit_baseline.py
+++ b/tests/unit/test_bandit_baseline.py
@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import bandit.bandit_baseline as baseline
+import bandit.cli.baseline as baseline
 
 import fixtures
 import os
diff --git a/tests/unit/test_bandit_conf_generator.py b/tests/unit/test_bandit_conf_generator.py
index 8eda5be1..56c261a7 100644
--- a/tests/unit/test_bandit_conf_generator.py
+++ b/tests/unit/test_bandit_conf_generator.py
@@ -1,4 +1,4 @@
-from bandit.bandit_config_generator import get_config_settings
+from bandit.cli.config_generator import get_config_settings
 
 import mock
 import testtools
@@ -12,4 +12,4 @@ class BanditConfigGeneratorTests(testtools.TestCase):
                 spec=stevedore.extension.Extension)
     def test_get_config_settings(self, ext_mgr, ext):
         # TODO(tmcpeak): We need to add unit testing here
-        pass
\ No newline at end of file
+        pass