diff --git a/tools/marvin/marvin/factory/data/account.py b/tools/marvin/marvin/factory/data/account.py
index b0fcd7b20b7..97caf161916 100644
--- a/tools/marvin/marvin/factory/data/account.py
+++ b/tools/marvin/marvin/factory/data/account.py
@@ -17,7 +17,7 @@
 
 import factory
 from marvin.factory.account import AccountFactory
-from marvin.utils import random_gen
+from marvin.legacy.utils import random_gen
 
 class UserAccountFactory(AccountFactory):
 
diff --git a/tools/marvin/marvin/factory/data/cluster.py b/tools/marvin/marvin/factory/data/cluster.py
index 321252b750c..c51321d98f5 100644
--- a/tools/marvin/marvin/factory/data/cluster.py
+++ b/tools/marvin/marvin/factory/data/cluster.py
@@ -16,7 +16,7 @@
 # under the License.
 
 import factory
-from marvin.utils import random_gen
+from marvin.legacy.utils import random_gen
 from marvin.factory.cluster import ClusterFactory
 
 class XenClusterFactory(ClusterFactory):
diff --git a/tools/marvin/marvin/factory/data/diskoffering.py b/tools/marvin/marvin/factory/data/diskoffering.py
index ee58c272d26..48526b8c261 100644
--- a/tools/marvin/marvin/factory/data/diskoffering.py
+++ b/tools/marvin/marvin/factory/data/diskoffering.py
@@ -17,7 +17,7 @@
 
 import factory
 from marvin.factory.diskoffering import DiskOfferingFactory
-from marvin.utils import random_gen
+from marvin.legacy.utils import random_gen
 
 class SharedDiskOfferingFactory(DiskOfferingFactory):
 
diff --git a/tools/marvin/marvin/factory/data/serviceoffering.py b/tools/marvin/marvin/factory/data/serviceoffering.py
index b3a76392a26..955657e9ebb 100644
--- a/tools/marvin/marvin/factory/data/serviceoffering.py
+++ b/tools/marvin/marvin/factory/data/serviceoffering.py
@@ -17,7 +17,7 @@
 
 import factory
 from marvin.factory.serviceoffering import ServiceOfferingFactory
-from marvin.utils import random_gen
+from marvin.legacy.utils import random_gen
 
 class SmallServiceOfferingFactory(ServiceOfferingFactory):
     cpunumber = 1
diff --git a/tools/marvin/marvin/factory/data/user.py b/tools/marvin/marvin/factory/data/user.py
index d3bde0d5056..d5fa456dab8 100644
--- a/tools/marvin/marvin/factory/data/user.py
+++ b/tools/marvin/marvin/factory/data/user.py
@@ -18,7 +18,7 @@
 import factory
 from marvin.factory.user import UserFactory
 from marvin.factory.data.account import UserAccountFactory
-from marvin.utils import random_gen
+from marvin.legacy.utils import random_gen
 
 class UserFactory(UserFactory):
 
diff --git a/tools/marvin/marvin/factory/data/vm.py b/tools/marvin/marvin/factory/data/vm.py
index a9386038641..0d7aac04f9c 100644
--- a/tools/marvin/marvin/factory/data/vm.py
+++ b/tools/marvin/marvin/factory/data/vm.py
@@ -15,9 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import factory
 from marvin.factory.virtualmachine import VirtualMachineFactory
-from marvin.utils import random_gen
 
 
 class VirtualMachineIsolatedNetwork(VirtualMachineFactory):
diff --git a/tools/marvin/marvin/factory/data/zone.py b/tools/marvin/marvin/factory/data/zone.py
index 2936c0be9f4..67c1cb451ac 100644
--- a/tools/marvin/marvin/factory/data/zone.py
+++ b/tools/marvin/marvin/factory/data/zone.py
@@ -17,7 +17,7 @@
 
 import factory
 from marvin.factory.zone import ZoneFactory
-from marvin.utils import random_gen
+from marvin.legacy.utils import random_gen
 
 class AdvancedZoneFactory(ZoneFactory):
     name = factory.Sequence(lambda n: "advzone" + random_gen())
diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py
index 0e52bab9d33..716de25f7dd 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -15,14 +15,13 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import marvin
 import sys
 import logging
 import nose.core
 from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin import deployDataCenter
 from nose.plugins.base import Plugin
 import time
+from marvin.deployer import deployDataCenter
 
 
 class MarvinPlugin(Plugin):
diff --git a/tools/marvin/marvin/sandbox/advanced/advanced_env.py b/tools/marvin/marvin/sandbox/advanced/advanced_env.py
index 4a2fbfbda0f..5483ad78403 100644
--- a/tools/marvin/marvin/sandbox/advanced/advanced_env.py
+++ b/tools/marvin/marvin/sandbox/advanced/advanced_env.py
@@ -22,11 +22,9 @@
 #    * Only a sandbox
 ############################################################
 '''
-import random
-import marvin
 from ConfigParser import SafeConfigParser
 from optparse import OptionParser
-from marvin.configGenerator import *
+from marvin.deployer.configGenerator import *
 
 
 def getGlobalSettings(config):
diff --git a/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py b/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py
index 9cf4a0aa98f..a44bf95dd70 100644
--- a/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py
+++ b/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py
@@ -22,11 +22,9 @@
 #    * Only a sandbox
 ############################################################
 '''
-import random
-import marvin
 from ConfigParser import SafeConfigParser
 from optparse import OptionParser
-from marvin.configGenerator import *
+from marvin.deployer.configGenerator import *
 
 
 def getGlobalSettings(config):
diff --git a/tools/marvin/marvin/sandbox/basic/basic_env.py b/tools/marvin/marvin/sandbox/basic/basic_env.py
index bf106fcb8de..c60b41d0726 100644
--- a/tools/marvin/marvin/sandbox/basic/basic_env.py
+++ b/tools/marvin/marvin/sandbox/basic/basic_env.py
@@ -23,11 +23,9 @@
 #    * Only a sandbox
 ############################################################
 '''
-import random
-import marvin
 from ConfigParser import SafeConfigParser
 from optparse import OptionParser
-from marvin.configGenerator import *
+from marvin.deployer.configGenerator import *
 
 
 def getGlobalSettings(config):