diff --git a/x/actions.py b/solar/solar/core/actions.py
similarity index 100%
rename from x/actions.py
rename to solar/solar/core/actions.py
diff --git a/x/db.py b/solar/solar/core/db.py
similarity index 100%
rename from x/db.py
rename to solar/solar/core/db.py
diff --git a/x/deployment.py b/solar/solar/core/deployment.py
similarity index 100%
rename from x/deployment.py
rename to solar/solar/core/deployment.py
diff --git a/x/handlers/__init__.py b/solar/solar/core/handlers/__init__.py
similarity index 100%
rename from x/handlers/__init__.py
rename to solar/solar/core/handlers/__init__.py
diff --git a/x/handlers/ansible.py b/solar/solar/core/handlers/ansible.py
similarity index 100%
rename from x/handlers/ansible.py
rename to solar/solar/core/handlers/ansible.py
diff --git a/x/handlers/base.py b/solar/solar/core/handlers/base.py
similarity index 100%
rename from x/handlers/base.py
rename to solar/solar/core/handlers/base.py
diff --git a/x/handlers/shell.py b/solar/solar/core/handlers/shell.py
similarity index 100%
rename from x/handlers/shell.py
rename to solar/solar/core/handlers/shell.py
diff --git a/x/observer.py b/solar/solar/core/observer.py
similarity index 100%
rename from x/observer.py
rename to solar/solar/core/observer.py
diff --git a/x/resource.py b/solar/solar/core/resource.py
similarity index 100%
rename from x/resource.py
rename to solar/solar/core/resource.py
diff --git a/x/signals.py b/solar/solar/core/signals.py
similarity index 100%
rename from x/signals.py
rename to solar/solar/core/signals.py
diff --git a/x/utils.py b/solar/solar/core/utils.py
similarity index 100%
rename from x/utils.py
rename to solar/solar/core/utils.py
diff --git a/x/test/__init__.py b/solar/solar/test/__init__.py
similarity index 100%
rename from x/test/__init__.py
rename to solar/solar/test/__init__.py
diff --git a/x/test/base.py b/solar/solar/test/base.py
similarity index 100%
rename from x/test/base.py
rename to solar/solar/test/base.py
diff --git a/x/test/test_signals.py b/solar/solar/test/test_signals.py
similarity index 100%
rename from x/test/test_signals.py
rename to solar/solar/test/test_signals.py