diff --git a/pym/__init__.py b/pym/update/__init__.py
similarity index 100%
rename from pym/__init__.py
rename to pym/update/__init__.py
diff --git a/pym/datavars.py b/pym/update/datavars.py
similarity index 100%
rename from pym/datavars.py
rename to pym/update/datavars.py
diff --git a/pym/emerge_parser.py b/pym/update/emerge_parser.py
similarity index 100%
rename from pym/emerge_parser.py
rename to pym/update/emerge_parser.py
diff --git a/pym/profile.py b/pym/update/profile.py
similarity index 100%
rename from pym/profile.py
rename to pym/update/profile.py
diff --git a/pym/update.py b/pym/update/update.py
similarity index 100%
rename from pym/update.py
rename to pym/update/update.py
diff --git a/pym/update_info.py b/pym/update/update_info.py
similarity index 100%
rename from pym/update_info.py
rename to pym/update/update_info.py
diff --git a/pym/update_tasks.py b/pym/update/update_tasks.py
similarity index 100%
rename from pym/update_tasks.py
rename to pym/update/update_tasks.py
diff --git a/pym/utils/__init__.py b/pym/update/utils/__init__.py
similarity index 100%
rename from pym/utils/__init__.py
rename to pym/update/utils/__init__.py
diff --git a/pym/utils/cl_setup_update.py b/pym/update/utils/cl_setup_update.py
similarity index 100%
rename from pym/utils/cl_setup_update.py
rename to pym/update/utils/cl_setup_update.py
diff --git a/pym/utils/cl_update.py b/pym/update/utils/cl_update.py
similarity index 100%
rename from pym/utils/cl_update.py
rename to pym/update/utils/cl_update.py
diff --git a/pym/utils/cl_update_profile.py b/pym/update/utils/cl_update_profile.py
similarity index 100%
rename from pym/utils/cl_update_profile.py
rename to pym/update/utils/cl_update_profile.py
diff --git a/pym/variables/__init__.py b/pym/update/variables/__init__.py
similarity index 100%
rename from pym/variables/__init__.py
rename to pym/update/variables/__init__.py
diff --git a/pym/variables/action.py b/pym/update/variables/action.py
similarity index 100%
rename from pym/variables/action.py
rename to pym/update/variables/action.py
diff --git a/pym/variables/update.py b/pym/update/variables/update.py
similarity index 99%
rename from pym/variables/update.py
rename to pym/update/variables/update.py
index 9a7d638..fa7087a 100644
--- a/pym/variables/update.py
+++ b/pym/update/variables/update.py
@@ -688,8 +688,8 @@ class VariableClUpdateOtherGitExists(Variable):
 
     def get(self):
         repos = self.Get(self.repos_path)
-        for repo in listDirectory(repos):
-            if not os.path.exists(os.path.join(repos, os.path.join(repo, '.git'))):
+        for rep in listDirectory(repos):
+            if not os.path.exists(os.path.join(repos, os.path.join(rep, '.git'))):
                 return False
         return True
 
diff --git a/pym/wsdl_update.py b/pym/update/wsdl_update.py
similarity index 100%
rename from pym/wsdl_update.py
rename to pym/update/wsdl_update.py