diff --git a/pym/update/__init__.py b/pym/__init__.py
similarity index 100%
rename from pym/update/__init__.py
rename to pym/__init__.py
diff --git a/pym/update/datavars.py b/pym/datavars.py
similarity index 100%
rename from pym/update/datavars.py
rename to pym/datavars.py
diff --git a/pym/update/emerge_parser.py b/pym/emerge_parser.py
similarity index 100%
rename from pym/update/emerge_parser.py
rename to pym/emerge_parser.py
diff --git a/pym/update/profile.py b/pym/profile.py
similarity index 100%
rename from pym/update/profile.py
rename to pym/profile.py
diff --git a/pym/update/update.py b/pym/update.py
similarity index 100%
rename from pym/update/update.py
rename to pym/update.py
diff --git a/pym/update/update_info.py b/pym/update_info.py
similarity index 100%
rename from pym/update/update_info.py
rename to pym/update_info.py
diff --git a/pym/update/update_tasks.py b/pym/update_tasks.py
similarity index 100%
rename from pym/update/update_tasks.py
rename to pym/update_tasks.py
diff --git a/pym/update/utils/__init__.py b/pym/utils/__init__.py
similarity index 100%
rename from pym/update/utils/__init__.py
rename to pym/utils/__init__.py
diff --git a/pym/update/utils/cl_setup_update.py b/pym/utils/cl_setup_update.py
similarity index 100%
rename from pym/update/utils/cl_setup_update.py
rename to pym/utils/cl_setup_update.py
diff --git a/pym/update/utils/cl_update.py b/pym/utils/cl_update.py
similarity index 100%
rename from pym/update/utils/cl_update.py
rename to pym/utils/cl_update.py
diff --git a/pym/update/utils/cl_update_profile.py b/pym/utils/cl_update_profile.py
similarity index 100%
rename from pym/update/utils/cl_update_profile.py
rename to pym/utils/cl_update_profile.py
diff --git a/pym/update/variables/__init__.py b/pym/variables/__init__.py
similarity index 100%
rename from pym/update/variables/__init__.py
rename to pym/variables/__init__.py
diff --git a/pym/update/variables/action.py b/pym/variables/action.py
similarity index 100%
rename from pym/update/variables/action.py
rename to pym/variables/action.py
diff --git a/pym/update/variables/update.py b/pym/variables/update.py
similarity index 99%
rename from pym/update/variables/update.py
rename to pym/variables/update.py
index 5eb16d1..9a7d638 100644
--- a/pym/update/variables/update.py
+++ b/pym/variables/update.py
@@ -687,10 +687,11 @@ class VariableClUpdateOtherGitExists(Variable):
     repos_path = 'cl_update_repos_storage'
 
     def get(self):
-        rep = f"{self.Get(self.repos_path)}/container"
-        if os.path.exists(os.path.join(rep, '.git')):
-            return True
-        return False
+        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'))):
+                return False
+        return True
 
 
 
diff --git a/pym/update/wsdl_update.py b/pym/wsdl_update.py
similarity index 100%
rename from pym/update/wsdl_update.py
rename to pym/wsdl_update.py