diff --git a/bcfg2new/Plugins/Python/PythonDefaults.py b/bcfg2/Plugins/Python/PythonDefaults.py
similarity index 100%
rename from bcfg2new/Plugins/Python/PythonDefaults.py
rename to bcfg2/Plugins/Python/PythonDefaults.py
diff --git a/bcfg2new/Plugins/Python/PythonEnv.py b/bcfg2/Plugins/Python/PythonEnv.py
similarity index 100%
rename from bcfg2new/Plugins/Python/PythonEnv.py
rename to bcfg2/Plugins/Python/PythonEnv.py
diff --git a/bcfg2new/Plugins/Python/PythonFactories.py b/bcfg2/Plugins/Python/PythonFactories.py
similarity index 100%
rename from bcfg2new/Plugins/Python/PythonFactories.py
rename to bcfg2/Plugins/Python/PythonFactories.py
diff --git a/bcfg2new/Plugins/Python/PythonFile.py b/bcfg2/Plugins/Python/PythonFile.py
similarity index 100%
rename from bcfg2new/Plugins/Python/PythonFile.py
rename to bcfg2/Plugins/Python/PythonFile.py
diff --git a/bcfg2new/Plugins/Python/PythonPlugin.py b/bcfg2/Plugins/Python/PythonPlugin.py
similarity index 100%
rename from bcfg2new/Plugins/Python/PythonPlugin.py
rename to bcfg2/Plugins/Python/PythonPlugin.py
diff --git a/bcfg2new/Plugins/Python/PythonTools.py b/bcfg2/Plugins/Python/PythonTools.py
similarity index 100%
rename from bcfg2new/Plugins/Python/PythonTools.py
rename to bcfg2/Plugins/Python/PythonTools.py
diff --git a/bcfg2new/Plugins/Python/__init__.py b/bcfg2/Plugins/Python/__init__.py
similarity index 100%
rename from bcfg2new/Plugins/Python/__init__.py
rename to bcfg2/Plugins/Python/__init__.py
diff --git a/bcfg2new/Tools/Python.py b/bcfg2/Tools/Python.py
similarity index 100%
rename from bcfg2new/Tools/Python.py
rename to bcfg2/Tools/Python.py
diff --git a/archive/bcfg2/bcfg2-graph.py b/bcfg2/bcfg2-graph.py
similarity index 100%
rename from archive/bcfg2/bcfg2-graph.py
rename to bcfg2/bcfg2-graph.py
diff --git a/archive/bcfg2/bcfg2_report.py b/bcfg2/bcfg2_report.py
similarity index 100%
rename from archive/bcfg2/bcfg2_report.py
rename to bcfg2/bcfg2_report.py