diff --git a/ush/python/pygw/.gitignore b/.gitignore
similarity index 100%
rename from ush/python/pygw/.gitignore
rename to .gitignore
diff --git a/ush/python/pygw/README.md b/README.md
similarity index 100%
rename from ush/python/pygw/README.md
rename to README.md
diff --git a/ush/python/pygw/setup.cfg b/setup.cfg
similarity index 100%
rename from ush/python/pygw/setup.cfg
rename to setup.cfg
diff --git a/ush/python/pygw/setup.py b/setup.py
similarity index 100%
rename from ush/python/pygw/setup.py
rename to setup.py
diff --git a/ush/python/pygw/src/pygw/__init__.py b/src/pygw/__init__.py
similarity index 100%
rename from ush/python/pygw/src/pygw/__init__.py
rename to src/pygw/__init__.py
diff --git a/ush/python/pygw/src/pygw/attrdict.py b/src/pygw/attrdict.py
similarity index 100%
rename from ush/python/pygw/src/pygw/attrdict.py
rename to src/pygw/attrdict.py
diff --git a/ush/python/pygw/src/pygw/configuration.py b/src/pygw/configuration.py
similarity index 100%
rename from ush/python/pygw/src/pygw/configuration.py
rename to src/pygw/configuration.py
diff --git a/ush/python/pygw/src/pygw/exceptions.py b/src/pygw/exceptions.py
similarity index 100%
rename from ush/python/pygw/src/pygw/exceptions.py
rename to src/pygw/exceptions.py
diff --git a/ush/python/pygw/src/pygw/executable.py b/src/pygw/executable.py
similarity index 100%
rename from ush/python/pygw/src/pygw/executable.py
rename to src/pygw/executable.py
diff --git a/ush/python/pygw/src/pygw/factory.py b/src/pygw/factory.py
similarity index 100%
rename from ush/python/pygw/src/pygw/factory.py
rename to src/pygw/factory.py
diff --git a/ush/python/pygw/src/pygw/file_utils.py b/src/pygw/file_utils.py
similarity index 100%
rename from ush/python/pygw/src/pygw/file_utils.py
rename to src/pygw/file_utils.py
diff --git a/ush/python/pygw/src/pygw/fsutils.py b/src/pygw/fsutils.py
similarity index 100%
rename from ush/python/pygw/src/pygw/fsutils.py
rename to src/pygw/fsutils.py
diff --git a/ush/python/pygw/src/pygw/jinja.py b/src/pygw/jinja.py
similarity index 100%
rename from ush/python/pygw/src/pygw/jinja.py
rename to src/pygw/jinja.py
diff --git a/ush/python/pygw/src/pygw/logger.py b/src/pygw/logger.py
similarity index 100%
rename from ush/python/pygw/src/pygw/logger.py
rename to src/pygw/logger.py
diff --git a/ush/python/pygw/src/pygw/schema.py b/src/pygw/schema.py
similarity index 100%
rename from ush/python/pygw/src/pygw/schema.py
rename to src/pygw/schema.py
diff --git a/ush/python/pygw/src/pygw/task.py b/src/pygw/task.py
similarity index 100%
rename from ush/python/pygw/src/pygw/task.py
rename to src/pygw/task.py
diff --git a/ush/python/pygw/src/pygw/template.py b/src/pygw/template.py
similarity index 100%
rename from ush/python/pygw/src/pygw/template.py
rename to src/pygw/template.py
diff --git a/ush/python/pygw/src/pygw/timetools.py b/src/pygw/timetools.py
similarity index 100%
rename from ush/python/pygw/src/pygw/timetools.py
rename to src/pygw/timetools.py
diff --git a/ush/python/pygw/src/pygw/yaml_file.py b/src/pygw/yaml_file.py
similarity index 100%
rename from ush/python/pygw/src/pygw/yaml_file.py
rename to src/pygw/yaml_file.py
diff --git a/ush/python/pygw/src/tests/__init__.py b/src/tests/__init__.py
similarity index 100%
rename from ush/python/pygw/src/tests/__init__.py
rename to src/tests/__init__.py
diff --git a/ush/python/pygw/src/tests/test-files/test_schema.yaml b/src/tests/test-files/test_schema.yaml
similarity index 100%
rename from ush/python/pygw/src/tests/test-files/test_schema.yaml
rename to src/tests/test-files/test_schema.yaml
diff --git a/ush/python/pygw/src/tests/test_configuration.py b/src/tests/test_configuration.py
similarity index 100%
rename from ush/python/pygw/src/tests/test_configuration.py
rename to src/tests/test_configuration.py
diff --git a/ush/python/pygw/src/tests/test_exceptions.py b/src/tests/test_exceptions.py
similarity index 100%
rename from ush/python/pygw/src/tests/test_exceptions.py
rename to src/tests/test_exceptions.py
diff --git a/ush/python/pygw/src/tests/test_executable.py b/src/tests/test_executable.py
similarity index 100%
rename from ush/python/pygw/src/tests/test_executable.py
rename to src/tests/test_executable.py
diff --git a/ush/python/pygw/src/tests/test_factory.py b/src/tests/test_factory.py
similarity index 100%
rename from ush/python/pygw/src/tests/test_factory.py
rename to src/tests/test_factory.py
diff --git a/ush/python/pygw/src/tests/test_file_utils.py b/src/tests/test_file_utils.py
similarity index 100%
rename from ush/python/pygw/src/tests/test_file_utils.py
rename to src/tests/test_file_utils.py
diff --git a/ush/python/pygw/src/tests/test_jinja.py b/src/tests/test_jinja.py
similarity index 100%
rename from ush/python/pygw/src/tests/test_jinja.py
rename to src/tests/test_jinja.py
diff --git a/ush/python/pygw/src/tests/test_logger.py b/src/tests/test_logger.py
similarity index 100%
rename from ush/python/pygw/src/tests/test_logger.py
rename to src/tests/test_logger.py
diff --git a/ush/python/pygw/src/tests/test_schema.py b/src/tests/test_schema.py
similarity index 100%
rename from ush/python/pygw/src/tests/test_schema.py
rename to src/tests/test_schema.py
diff --git a/ush/python/pygw/src/tests/test_template.py b/src/tests/test_template.py
similarity index 100%
rename from ush/python/pygw/src/tests/test_template.py
rename to src/tests/test_template.py
diff --git a/ush/python/pygw/src/tests/test_timetools.py b/src/tests/test_timetools.py
similarity index 100%
rename from ush/python/pygw/src/tests/test_timetools.py
rename to src/tests/test_timetools.py
diff --git a/ush/python/pygw/src/tests/test_yaml_file.py b/src/tests/test_yaml_file.py
similarity index 100%
rename from ush/python/pygw/src/tests/test_yaml_file.py
rename to src/tests/test_yaml_file.py