diff --git a/ckan/cli/__init__.py b/ckan/cli/__init__.py
index 4d9b4855411..20f760c30ee 100644
--- a/ckan/cli/__init__.py
+++ b/ckan/cli/__init__.py
@@ -56,4 +56,5 @@ def _load_config(config=None):
     log.debug(u"Using " + filename)
     return appconfig(u'config:' + filename)
 
+
 load_config = _load_config
diff --git a/ckan/cli/cli.py b/ckan/cli/cli.py
index cdcf28b58c3..1bbdbeef8cd 100644
--- a/ckan/cli/cli.py
+++ b/ckan/cli/cli.py
@@ -3,8 +3,7 @@
 import os
 
 import click
-from ckan.cli.server.server import run
-from ckan.cli.database.db import db
+from ckan.cli import db, server
 
 
 @click.group()
@@ -12,5 +11,6 @@
 def ckan(*args, **kwargs):
     pass
 
-ckan.add_command(run)
-ckan.add_command(db)
+
+ckan.add_command(server.run)
+ckan.add_command(db.db)
diff --git a/ckan/cli/database/__init__.py b/ckan/cli/database/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/ckan/cli/database/db.py b/ckan/cli/db.py
similarity index 93%
rename from ckan/cli/database/db.py
rename to ckan/cli/db.py
index 60196fe4598..27c95712bb2 100644
--- a/ckan/cli/database/db.py
+++ b/ckan/cli/db.py
@@ -32,11 +32,11 @@ def initdb(config):
         print(e)
     print(u'Initialising DB: SUCCESS')
 
-
+prompt_msg =u'This will delete all of your data!\nDo you want to continue?'
 @db.command(u'clean', short_help=u'Clean the database')
 @click.help_option(u'-h', u'--help')
 @click_config_option
-@click.confirmation_option(prompt=u'This will delete all the data! Do you want to continue?')
+@click.confirmation_option(prompt=prompt_msg)
 def cleandb(config):
     u'''Cleaning  the database'''
     conf = load_config(config)
diff --git a/ckan/cli/server/server.py b/ckan/cli/server.py
similarity index 100%
rename from ckan/cli/server/server.py
rename to ckan/cli/server.py
diff --git a/ckan/cli/server/__init__.py b/ckan/cli/server/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000