diff --git a/tools/marvin/marvin/deployer/__init__.py b/tools/marvin/marvin/deployer/__init__.py
new file mode 100644
index 00000000000..d216be4ddc9
--- /dev/null
+++ b/tools/marvin/marvin/deployer/__init__.py
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
\ No newline at end of file
diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/deployer/configGenerator.py
similarity index 99%
rename from tools/marvin/marvin/configGenerator.py
rename to tools/marvin/marvin/deployer/configGenerator.py
index 0cfad30569c..5e511d6b2f1 100644
--- a/tools/marvin/marvin/configGenerator.py
+++ b/tools/marvin/marvin/deployer/configGenerator.py
@@ -856,7 +856,7 @@ if __name__ == "__main__":
 with security groups")
     parser.add_option("-o", "--output", action="store",
                       default="./datacenterCfg", dest="output",
-                      help="the path where the json config file generated, \
+                      help="the path where the json deployer file generated, \
 by default is ./datacenterCfg")
 
     (options, args) = parser.parse_args()
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployer/deployDataCenter.py
similarity index 99%
rename from tools/marvin/marvin/deployDataCenter.py
rename to tools/marvin/marvin/deployer/deployDataCenter.py
index 3f7eebbc21b..c260ddb83ba 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployer/deployDataCenter.py
@@ -16,7 +16,6 @@
 # under the License.
 
 """Deploy datacenters according to a json configuration file"""
-import configGenerator
 import cloudstackException
 import cloudstackTestClient
 import logging
@@ -24,6 +23,7 @@ from cloudstackAPI import *
 from os import path
 from time import sleep
 from optparse import OptionParser
+from marvin.deployer import configGenerator
 
 
 class deployDataCenters(object):
@@ -517,7 +517,7 @@ class deployDataCenters(object):
             self.config = configGenerator.getSetupConfig(self.configFile)
         except:
             raise cloudstackException.InvalidParameterException(
-                "Failed to load config %s" % self.configFile)
+                "Failed to load deployer %s" % self.configFile)
 
         ''' Retrieving Management Server Connection Details '''
         mgtDetails = self.config.mgtSvr[0]
@@ -602,7 +602,7 @@ if __name__ == "__main__":
     parser = OptionParser()
     parser.add_option("-i", "--input", action="store",
                       default="./datacenterCfg", dest="input", help="the path \
-                      where the json config file generated, by default is \
+                      where the json deployer file generated, by default is \
                       ./datacenterCfg")
 
     (options, args) = parser.parse_args()