diff --git a/solar/MANIFEST.in b/MANIFEST.in
similarity index 100%
rename from solar/MANIFEST.in
rename to MANIFEST.in
diff --git a/solar/requirements.txt b/requirements.txt
similarity index 100%
rename from solar/requirements.txt
rename to requirements.txt
diff --git a/solar/setup.py b/setup.py
similarity index 100%
rename from solar/setup.py
rename to setup.py
diff --git a/solar/solar/__init__.py b/solar/__init__.py
similarity index 100%
rename from solar/solar/__init__.py
rename to solar/__init__.py
diff --git a/solar/solar/cli/__init__.py b/solar/cli/__init__.py
similarity index 100%
rename from solar/solar/cli/__init__.py
rename to solar/cli/__init__.py
diff --git a/solar/solar/cli/base.py b/solar/cli/base.py
similarity index 100%
rename from solar/solar/cli/base.py
rename to solar/cli/base.py
diff --git a/solar/solar/cli/events.py b/solar/cli/events.py
similarity index 100%
rename from solar/solar/cli/events.py
rename to solar/cli/events.py
diff --git a/solar/solar/cli/executors.py b/solar/cli/executors.py
similarity index 100%
rename from solar/solar/cli/executors.py
rename to solar/cli/executors.py
diff --git a/solar/solar/cli/main.py b/solar/cli/main.py
similarity index 100%
rename from solar/solar/cli/main.py
rename to solar/cli/main.py
diff --git a/solar/solar/cli/orch.py b/solar/cli/orch.py
similarity index 100%
rename from solar/solar/cli/orch.py
rename to solar/cli/orch.py
diff --git a/solar/solar/cli/resource.py b/solar/cli/resource.py
similarity index 100%
rename from solar/solar/cli/resource.py
rename to solar/cli/resource.py
diff --git a/solar/solar/cli/system_log.py b/solar/cli/system_log.py
similarity index 100%
rename from solar/solar/cli/system_log.py
rename to solar/cli/system_log.py
diff --git a/solar/solar/cli/uids_history.py b/solar/cli/uids_history.py
similarity index 100%
rename from solar/solar/cli/uids_history.py
rename to solar/cli/uids_history.py
diff --git a/solar/solar/config.py b/solar/config.py
similarity index 100%
rename from solar/solar/config.py
rename to solar/config.py
diff --git a/solar/solar/core/__init__.py b/solar/core/__init__.py
similarity index 100%
rename from solar/solar/core/__init__.py
rename to solar/core/__init__.py
diff --git a/solar/solar/core/actions.py b/solar/core/actions.py
similarity index 100%
rename from solar/solar/core/actions.py
rename to solar/core/actions.py
diff --git a/solar/solar/core/handlers/__init__.py b/solar/core/handlers/__init__.py
similarity index 100%
rename from solar/solar/core/handlers/__init__.py
rename to solar/core/handlers/__init__.py
diff --git a/solar/solar/core/handlers/ansible_playbook.py b/solar/core/handlers/ansible_playbook.py
similarity index 100%
rename from solar/solar/core/handlers/ansible_playbook.py
rename to solar/core/handlers/ansible_playbook.py
diff --git a/solar/solar/core/handlers/ansible_template.py b/solar/core/handlers/ansible_template.py
similarity index 100%
rename from solar/solar/core/handlers/ansible_template.py
rename to solar/core/handlers/ansible_template.py
diff --git a/solar/solar/core/handlers/base.py b/solar/core/handlers/base.py
similarity index 100%
rename from solar/solar/core/handlers/base.py
rename to solar/core/handlers/base.py
diff --git a/solar/solar/core/handlers/puppet.py b/solar/core/handlers/puppet.py
similarity index 100%
rename from solar/solar/core/handlers/puppet.py
rename to solar/core/handlers/puppet.py
diff --git a/solar/solar/core/handlers/python.py b/solar/core/handlers/python.py
similarity index 100%
rename from solar/solar/core/handlers/python.py
rename to solar/core/handlers/python.py
diff --git a/solar/solar/core/handlers/shell.py b/solar/core/handlers/shell.py
similarity index 100%
rename from solar/solar/core/handlers/shell.py
rename to solar/core/handlers/shell.py
diff --git a/solar/solar/core/log.py b/solar/core/log.py
similarity index 100%
rename from solar/solar/core/log.py
rename to solar/core/log.py
diff --git a/solar/solar/core/provider.py b/solar/core/provider.py
similarity index 100%
rename from solar/solar/core/provider.py
rename to solar/core/provider.py
diff --git a/solar/solar/core/resource/__init__.py b/solar/core/resource/__init__.py
similarity index 100%
rename from solar/solar/core/resource/__init__.py
rename to solar/core/resource/__init__.py
diff --git a/solar/solar/core/resource/resource.py b/solar/core/resource/resource.py
similarity index 100%
rename from solar/solar/core/resource/resource.py
rename to solar/core/resource/resource.py
diff --git a/solar/solar/core/resource/virtual_resource.py b/solar/core/resource/virtual_resource.py
similarity index 100%
rename from solar/solar/core/resource/virtual_resource.py
rename to solar/core/resource/virtual_resource.py
diff --git a/solar/solar/core/signals.py b/solar/core/signals.py
similarity index 100%
rename from solar/solar/core/signals.py
rename to solar/core/signals.py
diff --git a/solar/solar/core/tags_set_parser.py b/solar/core/tags_set_parser.py
similarity index 100%
rename from solar/solar/core/tags_set_parser.py
rename to solar/core/tags_set_parser.py
diff --git a/solar/solar/core/testing.py b/solar/core/testing.py
similarity index 100%
rename from solar/solar/core/testing.py
rename to solar/core/testing.py
diff --git a/solar/solar/core/transports/__init__.py b/solar/core/transports/__init__.py
similarity index 100%
rename from solar/solar/core/transports/__init__.py
rename to solar/core/transports/__init__.py
diff --git a/solar/solar/core/transports/base.py b/solar/core/transports/base.py
similarity index 100%
rename from solar/solar/core/transports/base.py
rename to solar/core/transports/base.py
diff --git a/solar/solar/core/transports/bat.py b/solar/core/transports/bat.py
similarity index 100%
rename from solar/solar/core/transports/bat.py
rename to solar/core/transports/bat.py
diff --git a/solar/solar/core/transports/helpers/__init__.py b/solar/core/transports/helpers/__init__.py
similarity index 100%
rename from solar/solar/core/transports/helpers/__init__.py
rename to solar/core/transports/helpers/__init__.py
diff --git a/solar/solar/core/transports/helpers/solar_torrent.py b/solar/core/transports/helpers/solar_torrent.py
similarity index 100%
rename from solar/solar/core/transports/helpers/solar_torrent.py
rename to solar/core/transports/helpers/solar_torrent.py
diff --git a/solar/solar/core/transports/rsync.py b/solar/core/transports/rsync.py
similarity index 100%
rename from solar/solar/core/transports/rsync.py
rename to solar/core/transports/rsync.py
diff --git a/solar/solar/core/transports/solard_transport.py b/solar/core/transports/solard_transport.py
similarity index 100%
rename from solar/solar/core/transports/solard_transport.py
rename to solar/core/transports/solard_transport.py
diff --git a/solar/solar/core/transports/ssh.py b/solar/core/transports/ssh.py
similarity index 100%
rename from solar/solar/core/transports/ssh.py
rename to solar/core/transports/ssh.py
diff --git a/solar/solar/core/transports/ssh_raw.py b/solar/core/transports/ssh_raw.py
similarity index 100%
rename from solar/solar/core/transports/ssh_raw.py
rename to solar/core/transports/ssh_raw.py
diff --git a/solar/solar/core/transports/torrent.py b/solar/core/transports/torrent.py
similarity index 100%
rename from solar/solar/core/transports/torrent.py
rename to solar/core/transports/torrent.py
diff --git a/solar/solar/core/validation.py b/solar/core/validation.py
similarity index 100%
rename from solar/solar/core/validation.py
rename to solar/core/validation.py
diff --git a/solar/solar/dblayer/__init__.py b/solar/dblayer/__init__.py
similarity index 100%
rename from solar/solar/dblayer/__init__.py
rename to solar/dblayer/__init__.py
diff --git a/solar/solar/dblayer/conflict_resolution.py b/solar/dblayer/conflict_resolution.py
similarity index 100%
rename from solar/solar/dblayer/conflict_resolution.py
rename to solar/dblayer/conflict_resolution.py
diff --git a/solar/solar/dblayer/gevent_helpers.py b/solar/dblayer/gevent_helpers.py
similarity index 100%
rename from solar/solar/dblayer/gevent_helpers.py
rename to solar/dblayer/gevent_helpers.py
diff --git a/solar/solar/dblayer/gevent_local.py b/solar/dblayer/gevent_local.py
similarity index 100%
rename from solar/solar/dblayer/gevent_local.py
rename to solar/dblayer/gevent_local.py
diff --git a/solar/solar/dblayer/gevent_patches.py b/solar/dblayer/gevent_patches.py
similarity index 100%
rename from solar/solar/dblayer/gevent_patches.py
rename to solar/dblayer/gevent_patches.py
diff --git a/solar/solar/dblayer/model.py b/solar/dblayer/model.py
similarity index 100%
rename from solar/solar/dblayer/model.py
rename to solar/dblayer/model.py
diff --git a/solar/solar/dblayer/riak_client.py b/solar/dblayer/riak_client.py
similarity index 100%
rename from solar/solar/dblayer/riak_client.py
rename to solar/dblayer/riak_client.py
diff --git a/solar/solar/dblayer/solar_models.py b/solar/dblayer/solar_models.py
similarity index 100%
rename from solar/solar/dblayer/solar_models.py
rename to solar/dblayer/solar_models.py
diff --git a/solar/solar/dblayer/sql_client.py b/solar/dblayer/sql_client.py
similarity index 100%
rename from solar/solar/dblayer/sql_client.py
rename to solar/dblayer/sql_client.py
diff --git a/solar/solar/dblayer/standalone_session_wrapper.py b/solar/dblayer/standalone_session_wrapper.py
similarity index 100%
rename from solar/solar/dblayer/standalone_session_wrapper.py
rename to solar/dblayer/standalone_session_wrapper.py
diff --git a/solar/solar/dblayer/test/conftest.py b/solar/dblayer/test/conftest.py
similarity index 100%
rename from solar/solar/dblayer/test/conftest.py
rename to solar/dblayer/test/conftest.py
diff --git a/solar/solar/dblayer/test/test_basic.py b/solar/dblayer/test/test_basic.py
similarity index 100%
rename from solar/solar/dblayer/test/test_basic.py
rename to solar/dblayer/test/test_basic.py
diff --git a/solar/solar/dblayer/test/test_execution_models.py b/solar/dblayer/test/test_execution_models.py
similarity index 100%
rename from solar/solar/dblayer/test/test_execution_models.py
rename to solar/dblayer/test/test_execution_models.py
diff --git a/solar/solar/dblayer/test/test_log.py b/solar/dblayer/test/test_log.py
similarity index 100%
rename from solar/solar/dblayer/test/test_log.py
rename to solar/dblayer/test/test_log.py
diff --git a/solar/solar/dblayer/test/test_nested.py b/solar/dblayer/test/test_nested.py
similarity index 100%
rename from solar/solar/dblayer/test/test_nested.py
rename to solar/dblayer/test/test_nested.py
diff --git a/solar/solar/dblayer/test/test_real.py b/solar/dblayer/test/test_real.py
similarity index 100%
rename from solar/solar/dblayer/test/test_real.py
rename to solar/dblayer/test/test_real.py
diff --git a/solar/solar/errors.py b/solar/errors.py
similarity index 100%
rename from solar/solar/errors.py
rename to solar/errors.py
diff --git a/solar/solar/events/__init__.py b/solar/events/__init__.py
similarity index 100%
rename from solar/solar/events/__init__.py
rename to solar/events/__init__.py
diff --git a/solar/solar/events/api.py b/solar/events/api.py
similarity index 100%
rename from solar/solar/events/api.py
rename to solar/events/api.py
diff --git a/solar/solar/events/controls.py b/solar/events/controls.py
similarity index 100%
rename from solar/solar/events/controls.py
rename to solar/events/controls.py
diff --git a/solar/solar/orchestration/__init__.py b/solar/orchestration/__init__.py
similarity index 100%
rename from solar/solar/orchestration/__init__.py
rename to solar/orchestration/__init__.py
diff --git a/solar/solar/orchestration/consts.py b/solar/orchestration/consts.py
similarity index 100%
rename from solar/solar/orchestration/consts.py
rename to solar/orchestration/consts.py
diff --git a/solar/solar/orchestration/executor.py b/solar/orchestration/executor.py
similarity index 100%
rename from solar/solar/orchestration/executor.py
rename to solar/orchestration/executor.py
diff --git a/solar/solar/orchestration/filters.py b/solar/orchestration/filters.py
similarity index 100%
rename from solar/solar/orchestration/filters.py
rename to solar/orchestration/filters.py
diff --git a/solar/solar/orchestration/graph.py b/solar/orchestration/graph.py
similarity index 100%
rename from solar/solar/orchestration/graph.py
rename to solar/orchestration/graph.py
diff --git a/solar/solar/orchestration/limits.py b/solar/orchestration/limits.py
similarity index 100%
rename from solar/solar/orchestration/limits.py
rename to solar/orchestration/limits.py
diff --git a/solar/solar/orchestration/runner.py b/solar/orchestration/runner.py
similarity index 100%
rename from solar/solar/orchestration/runner.py
rename to solar/orchestration/runner.py
diff --git a/solar/solar/orchestration/tasks.py b/solar/orchestration/tasks.py
similarity index 100%
rename from solar/solar/orchestration/tasks.py
rename to solar/orchestration/tasks.py
diff --git a/solar/solar/orchestration/traversal.py b/solar/orchestration/traversal.py
similarity index 100%
rename from solar/solar/orchestration/traversal.py
rename to solar/orchestration/traversal.py
diff --git a/solar/solar/orchestration/utils.py b/solar/orchestration/utils.py
similarity index 100%
rename from solar/solar/orchestration/utils.py
rename to solar/orchestration/utils.py
diff --git a/solar/solar/system_log/__init__.py b/solar/system_log/__init__.py
similarity index 100%
rename from solar/solar/system_log/__init__.py
rename to solar/system_log/__init__.py
diff --git a/solar/solar/system_log/change.py b/solar/system_log/change.py
similarity index 100%
rename from solar/solar/system_log/change.py
rename to solar/system_log/change.py
diff --git a/solar/solar/system_log/consts.py b/solar/system_log/consts.py
similarity index 100%
rename from solar/solar/system_log/consts.py
rename to solar/system_log/consts.py
diff --git a/solar/solar/system_log/data.py b/solar/system_log/data.py
similarity index 100%
rename from solar/solar/system_log/data.py
rename to solar/system_log/data.py
diff --git a/solar/solar/system_log/operations.py b/solar/system_log/operations.py
similarity index 100%
rename from solar/solar/system_log/operations.py
rename to solar/system_log/operations.py
diff --git a/solar/solar/system_log/tasks.py b/solar/system_log/tasks.py
similarity index 100%
rename from solar/solar/system_log/tasks.py
rename to solar/system_log/tasks.py
diff --git a/solar/solar/template.py b/solar/template.py
similarity index 100%
rename from solar/solar/template.py
rename to solar/template.py
diff --git a/solar/solar/test/__init__.py b/solar/test/__init__.py
similarity index 100%
rename from solar/solar/test/__init__.py
rename to solar/test/__init__.py
diff --git a/solar/solar/test/base.py b/solar/test/base.py
similarity index 100%
rename from solar/solar/test/base.py
rename to solar/test/base.py
diff --git a/solar/solar/test/conftest.py b/solar/test/conftest.py
similarity index 100%
rename from solar/solar/test/conftest.py
rename to solar/test/conftest.py
diff --git a/solar/solar/test/orch_fixtures/README.md b/solar/test/orch_fixtures/README.md
similarity index 100%
rename from solar/solar/test/orch_fixtures/README.md
rename to solar/test/orch_fixtures/README.md
diff --git a/solar/solar/test/orch_fixtures/example_py.yaml b/solar/test/orch_fixtures/example_py.yaml
similarity index 100%
rename from solar/solar/test/orch_fixtures/example_py.yaml
rename to solar/test/orch_fixtures/example_py.yaml
diff --git a/solar/solar/test/orch_fixtures/multi.yaml b/solar/test/orch_fixtures/multi.yaml
similarity index 100%
rename from solar/solar/test/orch_fixtures/multi.yaml
rename to solar/test/orch_fixtures/multi.yaml
diff --git a/solar/solar/test/orch_fixtures/riak.yaml b/solar/test/orch_fixtures/riak.yaml
similarity index 100%
rename from solar/solar/test/orch_fixtures/riak.yaml
rename to solar/test/orch_fixtures/riak.yaml
diff --git a/solar/solar/test/orch_fixtures/sequential.yaml b/solar/test/orch_fixtures/sequential.yaml
similarity index 100%
rename from solar/solar/test/orch_fixtures/sequential.yaml
rename to solar/test/orch_fixtures/sequential.yaml
diff --git a/solar/solar/test/orch_fixtures/simple.yaml b/solar/test/orch_fixtures/simple.yaml
similarity index 100%
rename from solar/solar/test/orch_fixtures/simple.yaml
rename to solar/test/orch_fixtures/simple.yaml
diff --git a/solar/solar/test/orch_fixtures/sleeping_beauty.yaml b/solar/test/orch_fixtures/sleeping_beauty.yaml
similarity index 100%
rename from solar/solar/test/orch_fixtures/sleeping_beauty.yaml
rename to solar/test/orch_fixtures/sleeping_beauty.yaml
diff --git a/solar/solar/test/orch_fixtures/test_errors.yaml b/solar/test/orch_fixtures/test_errors.yaml
similarity index 100%
rename from solar/solar/test/orch_fixtures/test_errors.yaml
rename to solar/test/orch_fixtures/test_errors.yaml
diff --git a/solar/solar/test/orch_fixtures/two_path.yaml b/solar/test/orch_fixtures/two_path.yaml
similarity index 100%
rename from solar/solar/test/orch_fixtures/two_path.yaml
rename to solar/test/orch_fixtures/two_path.yaml
diff --git a/solar/solar/test/orch_fixtures/upd_test_errors.yaml b/solar/test/orch_fixtures/upd_test_errors.yaml
similarity index 100%
rename from solar/solar/test/orch_fixtures/upd_test_errors.yaml
rename to solar/test/orch_fixtures/upd_test_errors.yaml
diff --git a/solar/solar/test/resource_fixtures/base_service/meta.yaml b/solar/test/resource_fixtures/base_service/meta.yaml
similarity index 100%
rename from solar/solar/test/resource_fixtures/base_service/meta.yaml
rename to solar/test/resource_fixtures/base_service/meta.yaml
diff --git a/solar/solar/test/resource_fixtures/node/actions/run.yaml b/solar/test/resource_fixtures/node/actions/run.yaml
similarity index 100%
rename from solar/solar/test/resource_fixtures/node/actions/run.yaml
rename to solar/test/resource_fixtures/node/actions/run.yaml
diff --git a/solar/solar/test/resource_fixtures/node/meta.yaml b/solar/test/resource_fixtures/node/meta.yaml
similarity index 100%
rename from solar/solar/test/resource_fixtures/node/meta.yaml
rename to solar/test/resource_fixtures/node/meta.yaml
diff --git a/solar/solar/test/resource_fixtures/nodes.yaml.tmpl b/solar/test/resource_fixtures/nodes.yaml.tmpl
similarity index 100%
rename from solar/solar/test/resource_fixtures/nodes.yaml.tmpl
rename to solar/test/resource_fixtures/nodes.yaml.tmpl
diff --git a/solar/solar/test/resource_fixtures/resource_with_list.yaml.tmpl b/solar/test/resource_fixtures/resource_with_list.yaml.tmpl
similarity index 100%
rename from solar/solar/test/resource_fixtures/resource_with_list.yaml.tmpl
rename to solar/test/resource_fixtures/resource_with_list.yaml.tmpl
diff --git a/solar/solar/test/resource_fixtures/update.yaml.tmpl b/solar/test/resource_fixtures/update.yaml.tmpl
similarity index 100%
rename from solar/solar/test/resource_fixtures/update.yaml.tmpl
rename to solar/test/resource_fixtures/update.yaml.tmpl
diff --git a/solar/solar/test/resource_fixtures/with_location.yaml.tmpl b/solar/test/resource_fixtures/with_location.yaml.tmpl
similarity index 100%
rename from solar/solar/test/resource_fixtures/with_location.yaml.tmpl
rename to solar/test/resource_fixtures/with_location.yaml.tmpl
diff --git a/solar/solar/test/test_celery_executor.py b/solar/test/test_celery_executor.py
similarity index 100%
rename from solar/solar/test/test_celery_executor.py
rename to solar/test/test_celery_executor.py
diff --git a/solar/solar/test/test_diff_generation.py b/solar/test/test_diff_generation.py
similarity index 100%
rename from solar/solar/test/test_diff_generation.py
rename to solar/test/test_diff_generation.py
diff --git a/solar/solar/test/test_events.py b/solar/test/test_events.py
similarity index 100%
rename from solar/solar/test/test_events.py
rename to solar/test/test_events.py
diff --git a/solar/solar/test/test_graph_api.py b/solar/test/test_graph_api.py
similarity index 100%
rename from solar/solar/test/test_graph_api.py
rename to solar/test/test_graph_api.py
diff --git a/solar/solar/test/test_graph_filtering.py b/solar/test/test_graph_filtering.py
similarity index 100%
rename from solar/solar/test/test_graph_filtering.py
rename to solar/test/test_graph_filtering.py
diff --git a/solar/solar/test/test_limits.py b/solar/test/test_limits.py
similarity index 100%
rename from solar/solar/test/test_limits.py
rename to solar/test/test_limits.py
diff --git a/solar/solar/test/test_operations_with_tags.py b/solar/test/test_operations_with_tags.py
similarity index 100%
rename from solar/solar/test/test_operations_with_tags.py
rename to solar/test/test_operations_with_tags.py
diff --git a/solar/solar/test/test_resource.py b/solar/test/test_resource.py
similarity index 100%
rename from solar/solar/test/test_resource.py
rename to solar/test/test_resource.py
diff --git a/solar/solar/test/test_signals.py b/solar/test/test_signals.py
similarity index 100%
rename from solar/solar/test/test_signals.py
rename to solar/test/test_signals.py
diff --git a/solar/solar/test/test_system_log_api.py b/solar/test/test_system_log_api.py
similarity index 100%
rename from solar/solar/test/test_system_log_api.py
rename to solar/test/test_system_log_api.py
diff --git a/solar/solar/test/test_system_log_details.py b/solar/test/test_system_log_details.py
similarity index 100%
rename from solar/solar/test/test_system_log_details.py
rename to solar/test/test_system_log_details.py
diff --git a/solar/solar/test/test_traversal.py b/solar/test/test_traversal.py
similarity index 100%
rename from solar/solar/test/test_traversal.py
rename to solar/test/test_traversal.py
diff --git a/solar/solar/test/test_validation.py b/solar/test/test_validation.py
similarity index 100%
rename from solar/solar/test/test_validation.py
rename to solar/test/test_validation.py
diff --git a/solar/solar/test/test_virtual_resource.py b/solar/test/test_virtual_resource.py
similarity index 100%
rename from solar/solar/test/test_virtual_resource.py
rename to solar/test/test_virtual_resource.py
diff --git a/solar/solar/utils.py b/solar/utils.py
similarity index 100%
rename from solar/solar/utils.py
rename to solar/utils.py
diff --git a/solar/test-requirements.txt b/test-requirements.txt
similarity index 100%
rename from solar/test-requirements.txt
rename to test-requirements.txt