diff --git a/tools/marvin/marvin/oldbase.py b/tools/marvin/marvin/legacy/base.py
old mode 100755
new mode 100644
similarity index 100%
rename from tools/marvin/marvin/oldbase.py
rename to tools/marvin/marvin/legacy/base.py
diff --git a/tools/marvin/marvin/common.py b/tools/marvin/marvin/legacy/common.py
similarity index 99%
rename from tools/marvin/marvin/common.py
rename to tools/marvin/marvin/legacy/common.py
index 65d2f777384..63bff7c2cd9 100644
--- a/tools/marvin/marvin/common.py
+++ b/tools/marvin/marvin/legacy/common.py
@@ -20,7 +20,7 @@
 #Import Local Modules
 from marvin.cloudstackAPI import *
 from marvin.remoteSSHClient import remoteSSHClient
-from marvin.utils import *
+from marvin.legacy.utils import *
 from marvin.integration.lib.base import Configurations
 
 #Import System modules
diff --git a/tools/marvin/marvin/utils.py b/tools/marvin/marvin/legacy/utils.py
similarity index 100%
rename from tools/marvin/marvin/utils.py
rename to tools/marvin/marvin/legacy/utils.py