diff --git a/src/solarfm/__builtins__.py b/src/__builtins__.py
similarity index 100%
rename from src/solarfm/__builtins__.py
rename to src/__builtins__.py
diff --git a/src/solarfm/__init__.py b/src/__init__.py
similarity index 100%
rename from src/solarfm/__init__.py
rename to src/__init__.py
diff --git a/src/solarfm/__main__.py b/src/__main__.py
similarity index 100%
rename from src/solarfm/__main__.py
rename to src/__main__.py
diff --git a/src/solarfm/app.py b/src/app.py
similarity index 100%
rename from src/solarfm/app.py
rename to src/app.py
diff --git a/src/solarfm/core/__init__.py b/src/core/__init__.py
similarity index 100%
rename from src/solarfm/core/__init__.py
rename to src/core/__init__.py
diff --git a/src/solarfm/core/controller.py b/src/core/controller.py
similarity index 100%
rename from src/solarfm/core/controller.py
rename to src/core/controller.py
diff --git a/src/solarfm/core/controller_data.py b/src/core/controller_data.py
similarity index 100%
rename from src/solarfm/core/controller_data.py
rename to src/core/controller_data.py
diff --git a/src/solarfm/core/fs_actions/__init__.py b/src/core/fs_actions/__init__.py
similarity index 100%
rename from src/solarfm/core/fs_actions/__init__.py
rename to src/core/fs_actions/__init__.py
diff --git a/src/solarfm/core/fs_actions/crud_mixin.py b/src/core/fs_actions/crud_mixin.py
similarity index 100%
rename from src/solarfm/core/fs_actions/crud_mixin.py
rename to src/core/fs_actions/crud_mixin.py
diff --git a/src/solarfm/core/fs_actions/file_system_actions.py b/src/core/fs_actions/file_system_actions.py
similarity index 100%
rename from src/solarfm/core/fs_actions/file_system_actions.py
rename to src/core/fs_actions/file_system_actions.py
diff --git a/src/solarfm/core/fs_actions/handler_mixin.py b/src/core/fs_actions/handler_mixin.py
similarity index 100%
rename from src/solarfm/core/fs_actions/handler_mixin.py
rename to src/core/fs_actions/handler_mixin.py
diff --git a/src/solarfm/core/mixins/__init__.py b/src/core/mixins/__init__.py
similarity index 100%
rename from src/solarfm/core/mixins/__init__.py
rename to src/core/mixins/__init__.py
diff --git a/src/solarfm/core/mixins/signals/__init__.py b/src/core/mixins/signals/__init__.py
similarity index 100%
rename from src/solarfm/core/mixins/signals/__init__.py
rename to src/core/mixins/signals/__init__.py
diff --git a/src/solarfm/core/mixins/signals/file_action_signals_mixin.py b/src/core/mixins/signals/file_action_signals_mixin.py
similarity index 100%
rename from src/solarfm/core/mixins/signals/file_action_signals_mixin.py
rename to src/core/mixins/signals/file_action_signals_mixin.py
diff --git a/src/solarfm/core/mixins/signals/ipc_signals_mixin.py b/src/core/mixins/signals/ipc_signals_mixin.py
similarity index 100%
rename from src/solarfm/core/mixins/signals/ipc_signals_mixin.py
rename to src/core/mixins/signals/ipc_signals_mixin.py
diff --git a/src/solarfm/core/mixins/signals/keyboard_signals_mixin.py b/src/core/mixins/signals/keyboard_signals_mixin.py
similarity index 100%
rename from src/solarfm/core/mixins/signals/keyboard_signals_mixin.py
rename to src/core/mixins/signals/keyboard_signals_mixin.py
diff --git a/src/solarfm/core/mixins/signals_mixins.py b/src/core/mixins/signals_mixins.py
similarity index 100%
rename from src/solarfm/core/mixins/signals_mixins.py
rename to src/core/mixins/signals_mixins.py
diff --git a/src/solarfm/core/mixins/ui/__init__.py b/src/core/mixins/ui/__init__.py
similarity index 100%
rename from src/solarfm/core/mixins/ui/__init__.py
rename to src/core/mixins/ui/__init__.py
diff --git a/src/solarfm/core/mixins/ui/pane_mixin.py b/src/core/mixins/ui/pane_mixin.py
similarity index 100%
rename from src/solarfm/core/mixins/ui/pane_mixin.py
rename to src/core/mixins/ui/pane_mixin.py
diff --git a/src/solarfm/core/sfm_builder.py b/src/core/sfm_builder.py
similarity index 100%
rename from src/solarfm/core/sfm_builder.py
rename to src/core/sfm_builder.py
diff --git a/src/solarfm/core/ui_mixin.py b/src/core/ui_mixin.py
similarity index 100%
rename from src/solarfm/core/ui_mixin.py
rename to src/core/ui_mixin.py
diff --git a/src/solarfm/core/widgets/__init__.py b/src/core/widgets/__init__.py
similarity index 100%
rename from src/solarfm/core/widgets/__init__.py
rename to src/core/widgets/__init__.py
diff --git a/src/solarfm/core/widgets/bottom_status_info_widget.py b/src/core/widgets/bottom_status_info_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/bottom_status_info_widget.py
rename to src/core/widgets/bottom_status_info_widget.py
diff --git a/src/solarfm/core/widgets/context_menu_widget.py b/src/core/widgets/context_menu_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/context_menu_widget.py
rename to src/core/widgets/context_menu_widget.py
diff --git a/src/solarfm/core/widgets/dialogs/__init__.py b/src/core/widgets/dialogs/__init__.py
similarity index 100%
rename from src/solarfm/core/widgets/dialogs/__init__.py
rename to src/core/widgets/dialogs/__init__.py
diff --git a/src/solarfm/core/widgets/dialogs/about_widget.py b/src/core/widgets/dialogs/about_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/dialogs/about_widget.py
rename to src/core/widgets/dialogs/about_widget.py
diff --git a/src/solarfm/core/widgets/dialogs/appchooser_widget.py b/src/core/widgets/dialogs/appchooser_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/dialogs/appchooser_widget.py
rename to src/core/widgets/dialogs/appchooser_widget.py
diff --git a/src/solarfm/core/widgets/dialogs/file_exists_widget.py b/src/core/widgets/dialogs/file_exists_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/dialogs/file_exists_widget.py
rename to src/core/widgets/dialogs/file_exists_widget.py
diff --git a/src/solarfm/core/widgets/dialogs/message_widget.py b/src/core/widgets/dialogs/message_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/dialogs/message_widget.py
rename to src/core/widgets/dialogs/message_widget.py
diff --git a/src/solarfm/core/widgets/dialogs/new_file_widget.py b/src/core/widgets/dialogs/new_file_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/dialogs/new_file_widget.py
rename to src/core/widgets/dialogs/new_file_widget.py
diff --git a/src/solarfm/core/widgets/dialogs/rename_widget.py b/src/core/widgets/dialogs/rename_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/dialogs/rename_widget.py
rename to src/core/widgets/dialogs/rename_widget.py
diff --git a/src/solarfm/core/widgets/dialogs/save_load_widget.py b/src/core/widgets/dialogs/save_load_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/dialogs/save_load_widget.py
rename to src/core/widgets/dialogs/save_load_widget.py
diff --git a/src/solarfm/core/widgets/dialogs/user_pass_widget.py b/src/core/widgets/dialogs/user_pass_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/dialogs/user_pass_widget.py
rename to src/core/widgets/dialogs/user_pass_widget.py
diff --git a/src/solarfm/core/widgets/files_view/__init__.py b/src/core/widgets/files_view/__init__.py
similarity index 100%
rename from src/solarfm/core/widgets/files_view/__init__.py
rename to src/core/widgets/files_view/__init__.py
diff --git a/src/solarfm/core/widgets/files_view/files_widget.py b/src/core/widgets/files_view/files_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/files_view/files_widget.py
rename to src/core/widgets/files_view/files_widget.py
diff --git a/src/solarfm/core/widgets/files_view/grid_mixin.py b/src/core/widgets/files_view/grid_mixin.py
similarity index 100%
rename from src/solarfm/core/widgets/files_view/grid_mixin.py
rename to src/core/widgets/files_view/grid_mixin.py
diff --git a/src/solarfm/core/widgets/files_view/tab_mixin.py b/src/core/widgets/files_view/tab_mixin.py
similarity index 100%
rename from src/solarfm/core/widgets/files_view/tab_mixin.py
rename to src/core/widgets/files_view/tab_mixin.py
diff --git a/src/solarfm/core/widgets/files_view/window_mixin.py b/src/core/widgets/files_view/window_mixin.py
similarity index 100%
rename from src/solarfm/core/widgets/files_view/window_mixin.py
rename to src/core/widgets/files_view/window_mixin.py
diff --git a/src/solarfm/core/widgets/icon_grid_widget.py b/src/core/widgets/icon_grid_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/icon_grid_widget.py
rename to src/core/widgets/icon_grid_widget.py
diff --git a/src/solarfm/core/widgets/icon_tree_widget.py b/src/core/widgets/icon_tree_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/icon_tree_widget.py
rename to src/core/widgets/icon_tree_widget.py
diff --git a/src/solarfm/core/widgets/io_widget.py b/src/core/widgets/io_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/io_widget.py
rename to src/core/widgets/io_widget.py
diff --git a/src/solarfm/core/widgets/popups/__init__.py b/src/core/widgets/popups/__init__.py
similarity index 100%
rename from src/solarfm/core/widgets/popups/__init__.py
rename to src/core/widgets/popups/__init__.py
diff --git a/src/solarfm/core/widgets/popups/io_popup_widget.py b/src/core/widgets/popups/io_popup_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/popups/io_popup_widget.py
rename to src/core/widgets/popups/io_popup_widget.py
diff --git a/src/solarfm/core/widgets/popups/message_popup_widget.py b/src/core/widgets/popups/message_popup_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/popups/message_popup_widget.py
rename to src/core/widgets/popups/message_popup_widget.py
diff --git a/src/solarfm/core/widgets/popups/path_menu_popup_widget.py b/src/core/widgets/popups/path_menu_popup_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/popups/path_menu_popup_widget.py
rename to src/core/widgets/popups/path_menu_popup_widget.py
diff --git a/src/solarfm/core/widgets/popups/plugins_popup_widget.py b/src/core/widgets/popups/plugins_popup_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/popups/plugins_popup_widget.py
rename to src/core/widgets/popups/plugins_popup_widget.py
diff --git a/src/solarfm/core/widgets/tab_header_widget.py b/src/core/widgets/tab_header_widget.py
similarity index 100%
rename from src/solarfm/core/widgets/tab_header_widget.py
rename to src/core/widgets/tab_header_widget.py
diff --git a/src/solarfm/core/window.py b/src/core/window.py
similarity index 100%
rename from src/solarfm/core/window.py
rename to src/core/window.py
diff --git a/src/solarfm/plugins/__init__.py b/src/plugins/__init__.py
similarity index 100%
rename from src/solarfm/plugins/__init__.py
rename to src/plugins/__init__.py
diff --git a/src/solarfm/plugins/dto/__init__.py b/src/plugins/dto/__init__.py
similarity index 100%
rename from src/solarfm/plugins/dto/__init__.py
rename to src/plugins/dto/__init__.py
diff --git a/src/solarfm/plugins/dto/manifest.py b/src/plugins/dto/manifest.py
similarity index 100%
rename from src/solarfm/plugins/dto/manifest.py
rename to src/plugins/dto/manifest.py
diff --git a/src/solarfm/plugins/dto/manifest_meta.py b/src/plugins/dto/manifest_meta.py
similarity index 100%
rename from src/solarfm/plugins/dto/manifest_meta.py
rename to src/plugins/dto/manifest_meta.py
diff --git a/src/solarfm/plugins/dto/requests.py b/src/plugins/dto/requests.py
similarity index 100%
rename from src/solarfm/plugins/dto/requests.py
rename to src/plugins/dto/requests.py
diff --git a/src/solarfm/plugins/manifest_manager.py b/src/plugins/manifest_manager.py
similarity index 100%
rename from src/solarfm/plugins/manifest_manager.py
rename to src/plugins/manifest_manager.py
diff --git a/src/solarfm/plugins/plugin_base.py b/src/plugins/plugin_base.py
similarity index 100%
rename from src/solarfm/plugins/plugin_base.py
rename to src/plugins/plugin_base.py
diff --git a/src/solarfm/plugins/plugin_reload_mixin.py b/src/plugins/plugin_reload_mixin.py
similarity index 100%
rename from src/solarfm/plugins/plugin_reload_mixin.py
rename to src/plugins/plugin_reload_mixin.py
diff --git a/src/solarfm/plugins/plugins_controller.py b/src/plugins/plugins_controller.py
similarity index 100%
rename from src/solarfm/plugins/plugins_controller.py
rename to src/plugins/plugins_controller.py
diff --git a/src/solarfm/shellfm/__init__.py b/src/shellfm/__init__.py
similarity index 100%
rename from src/solarfm/shellfm/__init__.py
rename to src/shellfm/__init__.py
diff --git a/src/solarfm/shellfm/windows/__init__.py b/src/shellfm/windows/__init__.py
similarity index 100%
rename from src/solarfm/shellfm/windows/__init__.py
rename to src/shellfm/windows/__init__.py
diff --git a/src/solarfm/shellfm/windows/controller.py b/src/shellfm/windows/controller.py
similarity index 100%
rename from src/solarfm/shellfm/windows/controller.py
rename to src/shellfm/windows/controller.py
diff --git a/src/solarfm/shellfm/windows/tabs/__init__.py b/src/shellfm/windows/tabs/__init__.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/__init__.py
rename to src/shellfm/windows/tabs/__init__.py
diff --git a/src/solarfm/shellfm/windows/tabs/path.py b/src/shellfm/windows/tabs/path.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/path.py
rename to src/shellfm/windows/tabs/path.py
diff --git a/src/solarfm/shellfm/windows/tabs/tab.py b/src/shellfm/windows/tabs/tab.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/tab.py
rename to src/shellfm/windows/tabs/tab.py
diff --git a/src/solarfm/shellfm/windows/tabs/utils/__init__.py b/src/shellfm/windows/tabs/utils/__init__.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/utils/__init__.py
rename to src/shellfm/windows/tabs/utils/__init__.py
diff --git a/src/solarfm/shellfm/windows/tabs/utils/filehandler.py b/src/shellfm/windows/tabs/utils/filehandler.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/utils/filehandler.py
rename to src/shellfm/windows/tabs/utils/filehandler.py
diff --git a/src/solarfm/shellfm/windows/tabs/utils/launcher.py b/src/shellfm/windows/tabs/utils/launcher.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/utils/launcher.py
rename to src/shellfm/windows/tabs/utils/launcher.py
diff --git a/src/solarfm/shellfm/windows/tabs/utils/settings.py b/src/shellfm/windows/tabs/utils/settings.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/utils/settings.py
rename to src/shellfm/windows/tabs/utils/settings.py
diff --git a/src/solarfm/shellfm/windows/window.py b/src/shellfm/windows/window.py
similarity index 100%
rename from src/solarfm/shellfm/windows/window.py
rename to src/shellfm/windows/window.py
diff --git a/src/solarfm/utils/__init__.py b/src/utils/__init__.py
similarity index 100%
rename from src/solarfm/utils/__init__.py
rename to src/utils/__init__.py
diff --git a/src/solarfm/utils/cbindings/__init__.py b/src/utils/cbindings/__init__.py
similarity index 100%
rename from src/solarfm/utils/cbindings/__init__.py
rename to src/utils/cbindings/__init__.py
diff --git a/src/solarfm/utils/cbindings/gtkmemreaper.py b/src/utils/cbindings/gtkmemreaper.py
similarity index 100%
rename from src/solarfm/utils/cbindings/gtkmemreaper.py
rename to src/utils/cbindings/gtkmemreaper.py
diff --git a/src/solarfm/utils/cbindings/python_package_works/compile.sh b/src/utils/cbindings/python_package_works/compile.sh
similarity index 100%
rename from src/solarfm/utils/cbindings/python_package_works/compile.sh
rename to src/utils/cbindings/python_package_works/compile.sh
diff --git a/src/solarfm/utils/cbindings/python_package_works/gtkmemreaper.c b/src/utils/cbindings/python_package_works/gtkmemreaper.c
similarity index 100%
rename from src/solarfm/utils/cbindings/python_package_works/gtkmemreaper.c
rename to src/utils/cbindings/python_package_works/gtkmemreaper.c
diff --git a/src/solarfm/utils/cbindings/python_package_works/setup.py b/src/utils/cbindings/python_package_works/setup.py
similarity index 100%
rename from src/solarfm/utils/cbindings/python_package_works/setup.py
rename to src/utils/cbindings/python_package_works/setup.py
diff --git a/src/solarfm/utils/debugging.py b/src/utils/debugging.py
similarity index 100%
rename from src/solarfm/utils/debugging.py
rename to src/utils/debugging.py
diff --git a/src/solarfm/utils/event_system.py b/src/utils/event_system.py
similarity index 100%
rename from src/solarfm/utils/event_system.py
rename to src/utils/event_system.py
diff --git a/src/solarfm/utils/ipc_server.py b/src/utils/ipc_server.py
similarity index 100%
rename from src/solarfm/utils/ipc_server.py
rename to src/utils/ipc_server.py
diff --git a/src/solarfm/utils/keybindings.py b/src/utils/keybindings.py
similarity index 100%
rename from src/solarfm/utils/keybindings.py
rename to src/utils/keybindings.py
diff --git a/src/solarfm/utils/logger.py b/src/utils/logger.py
similarity index 100%
rename from src/solarfm/utils/logger.py
rename to src/utils/logger.py
diff --git a/src/solarfm/utils/settings_manager/__init__.py b/src/utils/settings_manager/__init__.py
similarity index 100%
rename from src/solarfm/utils/settings_manager/__init__.py
rename to src/utils/settings_manager/__init__.py
diff --git a/src/solarfm/utils/settings_manager/manager.py b/src/utils/settings_manager/manager.py
similarity index 100%
rename from src/solarfm/utils/settings_manager/manager.py
rename to src/utils/settings_manager/manager.py
diff --git a/src/solarfm/utils/settings_manager/options/__init__.py b/src/utils/settings_manager/options/__init__.py
similarity index 100%
rename from src/solarfm/utils/settings_manager/options/__init__.py
rename to src/utils/settings_manager/options/__init__.py
diff --git a/src/solarfm/utils/settings_manager/options/config.py b/src/utils/settings_manager/options/config.py
similarity index 100%
rename from src/solarfm/utils/settings_manager/options/config.py
rename to src/utils/settings_manager/options/config.py
diff --git a/src/solarfm/utils/settings_manager/options/debugging.py b/src/utils/settings_manager/options/debugging.py
similarity index 100%
rename from src/solarfm/utils/settings_manager/options/debugging.py
rename to src/utils/settings_manager/options/debugging.py
diff --git a/src/solarfm/utils/settings_manager/options/filters.py b/src/utils/settings_manager/options/filters.py
similarity index 100%
rename from src/solarfm/utils/settings_manager/options/filters.py
rename to src/utils/settings_manager/options/filters.py
diff --git a/src/solarfm/utils/settings_manager/options/settings.py b/src/utils/settings_manager/options/settings.py
similarity index 100%
rename from src/solarfm/utils/settings_manager/options/settings.py
rename to src/utils/settings_manager/options/settings.py
diff --git a/src/solarfm/utils/settings_manager/options/theming.py b/src/utils/settings_manager/options/theming.py
similarity index 100%
rename from src/solarfm/utils/settings_manager/options/theming.py
rename to src/utils/settings_manager/options/theming.py
diff --git a/src/solarfm/utils/settings_manager/start_check_mixin.py b/src/utils/settings_manager/start_check_mixin.py
similarity index 100%
rename from src/solarfm/utils/settings_manager/start_check_mixin.py
rename to src/utils/settings_manager/start_check_mixin.py
diff --git a/src/solarfm/utils/singleton.py b/src/utils/singleton.py
similarity index 100%
rename from src/solarfm/utils/singleton.py
rename to src/utils/singleton.py
diff --git a/src/solarfm/utils/types/__init__.py b/src/utils/types/__init__.py
similarity index 100%
rename from src/solarfm/utils/types/__init__.py
rename to src/utils/types/__init__.py
diff --git a/src/solarfm/utils/types/state.py b/src/utils/types/state.py
similarity index 100%
rename from src/solarfm/utils/types/state.py
rename to src/utils/types/state.py