diff --git a/src/Makefile.am b/gajim/Makefile.am
similarity index 100%
rename from src/Makefile.am
rename to gajim/Makefile.am
diff --git a/src/adhoc_commands.py b/gajim/adhoc_commands.py
similarity index 100%
rename from src/adhoc_commands.py
rename to gajim/adhoc_commands.py
diff --git a/src/advanced_configuration_window.py b/gajim/advanced_configuration_window.py
similarity index 100%
rename from src/advanced_configuration_window.py
rename to gajim/advanced_configuration_window.py
diff --git a/src/app_actions.py b/gajim/app_actions.py
similarity index 100%
rename from src/app_actions.py
rename to gajim/app_actions.py
diff --git a/src/atom_window.py b/gajim/atom_window.py
similarity index 100%
rename from src/atom_window.py
rename to gajim/atom_window.py
diff --git a/src/cell_renderer_image.py b/gajim/cell_renderer_image.py
similarity index 100%
rename from src/cell_renderer_image.py
rename to gajim/cell_renderer_image.py
diff --git a/src/chat_control.py b/gajim/chat_control.py
similarity index 100%
rename from src/chat_control.py
rename to gajim/chat_control.py
diff --git a/src/chat_control_base.py b/gajim/chat_control_base.py
similarity index 100%
rename from src/chat_control_base.py
rename to gajim/chat_control_base.py
diff --git a/src/command_system/__init__.py b/gajim/command_system/__init__.py
similarity index 100%
rename from src/command_system/__init__.py
rename to gajim/command_system/__init__.py
diff --git a/src/command_system/dispatcher.py b/gajim/command_system/dispatcher.py
similarity index 100%
rename from src/command_system/dispatcher.py
rename to gajim/command_system/dispatcher.py
diff --git a/src/command_system/errors.py b/gajim/command_system/errors.py
similarity index 100%
rename from src/command_system/errors.py
rename to gajim/command_system/errors.py
diff --git a/src/command_system/framework.py b/gajim/command_system/framework.py
similarity index 100%
rename from src/command_system/framework.py
rename to gajim/command_system/framework.py
diff --git a/src/command_system/implementation/__init__.py b/gajim/command_system/implementation/__init__.py
similarity index 100%
rename from src/command_system/implementation/__init__.py
rename to gajim/command_system/implementation/__init__.py
diff --git a/src/command_system/implementation/custom.py b/gajim/command_system/implementation/custom.py
similarity index 100%
rename from src/command_system/implementation/custom.py
rename to gajim/command_system/implementation/custom.py
diff --git a/src/command_system/implementation/execute.py b/gajim/command_system/implementation/execute.py
similarity index 100%
rename from src/command_system/implementation/execute.py
rename to gajim/command_system/implementation/execute.py
diff --git a/src/command_system/implementation/hosts.py b/gajim/command_system/implementation/hosts.py
similarity index 100%
rename from src/command_system/implementation/hosts.py
rename to gajim/command_system/implementation/hosts.py
diff --git a/src/command_system/implementation/middleware.py b/gajim/command_system/implementation/middleware.py
similarity index 100%
rename from src/command_system/implementation/middleware.py
rename to gajim/command_system/implementation/middleware.py
diff --git a/src/command_system/implementation/standard.py b/gajim/command_system/implementation/standard.py
similarity index 100%
rename from src/command_system/implementation/standard.py
rename to gajim/command_system/implementation/standard.py
diff --git a/src/command_system/mapping.py b/gajim/command_system/mapping.py
similarity index 100%
rename from src/command_system/mapping.py
rename to gajim/command_system/mapping.py
diff --git a/src/command_system/tools.py b/gajim/command_system/tools.py
similarity index 100%
rename from src/command_system/tools.py
rename to gajim/command_system/tools.py
diff --git a/src/common/__init__.py b/gajim/common/__init__.py
similarity index 100%
rename from src/common/__init__.py
rename to gajim/common/__init__.py
diff --git a/src/common/account.py b/gajim/common/account.py
similarity index 100%
rename from src/common/account.py
rename to gajim/common/account.py
diff --git a/src/common/atom.py b/gajim/common/atom.py
similarity index 100%
rename from src/common/atom.py
rename to gajim/common/atom.py
diff --git a/src/common/caps_cache.py b/gajim/common/caps_cache.py
similarity index 100%
rename from src/common/caps_cache.py
rename to gajim/common/caps_cache.py
diff --git a/src/common/check_X509.py b/gajim/common/check_X509.py
similarity index 100%
rename from src/common/check_X509.py
rename to gajim/common/check_X509.py
diff --git a/src/common/check_paths.py b/gajim/common/check_paths.py
similarity index 100%
rename from src/common/check_paths.py
rename to gajim/common/check_paths.py
diff --git a/src/common/commands.py b/gajim/common/commands.py
similarity index 100%
rename from src/common/commands.py
rename to gajim/common/commands.py
diff --git a/src/common/config.py b/gajim/common/config.py
similarity index 100%
rename from src/common/config.py
rename to gajim/common/config.py
diff --git a/src/common/configpaths.py b/gajim/common/configpaths.py
similarity index 100%
rename from src/common/configpaths.py
rename to gajim/common/configpaths.py
diff --git a/src/common/connection.py b/gajim/common/connection.py
similarity index 100%
rename from src/common/connection.py
rename to gajim/common/connection.py
diff --git a/src/common/connection_handlers.py b/gajim/common/connection_handlers.py
similarity index 100%
rename from src/common/connection_handlers.py
rename to gajim/common/connection_handlers.py
diff --git a/src/common/connection_handlers_events.py b/gajim/common/connection_handlers_events.py
similarity index 100%
rename from src/common/connection_handlers_events.py
rename to gajim/common/connection_handlers_events.py
diff --git a/src/common/contacts.py b/gajim/common/contacts.py
similarity index 100%
rename from src/common/contacts.py
rename to gajim/common/contacts.py
diff --git a/src/common/crypto.py b/gajim/common/crypto.py
similarity index 100%
rename from src/common/crypto.py
rename to gajim/common/crypto.py
diff --git a/src/common/dataforms.py b/gajim/common/dataforms.py
similarity index 100%
rename from src/common/dataforms.py
rename to gajim/common/dataforms.py
diff --git a/src/common/dbus_support.py b/gajim/common/dbus_support.py
similarity index 100%
rename from src/common/dbus_support.py
rename to gajim/common/dbus_support.py
diff --git a/src/common/defs.py b/gajim/common/defs.py
similarity index 100%
rename from src/common/defs.py
rename to gajim/common/defs.py
diff --git a/src/common/dh.py b/gajim/common/dh.py
similarity index 100%
rename from src/common/dh.py
rename to gajim/common/dh.py
diff --git a/src/common/events.py b/gajim/common/events.py
similarity index 100%
rename from src/common/events.py
rename to gajim/common/events.py
diff --git a/src/common/exceptions.py b/gajim/common/exceptions.py
similarity index 100%
rename from src/common/exceptions.py
rename to gajim/common/exceptions.py
diff --git a/src/common/file_props.py b/gajim/common/file_props.py
similarity index 100%
rename from src/common/file_props.py
rename to gajim/common/file_props.py
diff --git a/src/common/fuzzyclock.py b/gajim/common/fuzzyclock.py
similarity index 100%
rename from src/common/fuzzyclock.py
rename to gajim/common/fuzzyclock.py
diff --git a/src/common/gajim.py b/gajim/common/gajim.py
similarity index 100%
rename from src/common/gajim.py
rename to gajim/common/gajim.py
diff --git a/src/common/ged.py b/gajim/common/ged.py
similarity index 100%
rename from src/common/ged.py
rename to gajim/common/ged.py
diff --git a/src/common/gpg.py b/gajim/common/gpg.py
similarity index 100%
rename from src/common/gpg.py
rename to gajim/common/gpg.py
diff --git a/src/common/helpers.py b/gajim/common/helpers.py
similarity index 100%
rename from src/common/helpers.py
rename to gajim/common/helpers.py
diff --git a/src/common/i18n.py b/gajim/common/i18n.py
similarity index 100%
rename from src/common/i18n.py
rename to gajim/common/i18n.py
diff --git a/src/common/idle.py b/gajim/common/idle.py
similarity index 100%
rename from src/common/idle.py
rename to gajim/common/idle.py
diff --git a/src/common/jingle.py b/gajim/common/jingle.py
similarity index 100%
rename from src/common/jingle.py
rename to gajim/common/jingle.py
diff --git a/src/common/jingle_content.py b/gajim/common/jingle_content.py
similarity index 100%
rename from src/common/jingle_content.py
rename to gajim/common/jingle_content.py
diff --git a/src/common/jingle_ft.py b/gajim/common/jingle_ft.py
similarity index 100%
rename from src/common/jingle_ft.py
rename to gajim/common/jingle_ft.py
diff --git a/src/common/jingle_ftstates.py b/gajim/common/jingle_ftstates.py
similarity index 100%
rename from src/common/jingle_ftstates.py
rename to gajim/common/jingle_ftstates.py
diff --git a/src/common/jingle_rtp.py b/gajim/common/jingle_rtp.py
similarity index 100%
rename from src/common/jingle_rtp.py
rename to gajim/common/jingle_rtp.py
diff --git a/src/common/jingle_session.py b/gajim/common/jingle_session.py
similarity index 100%
rename from src/common/jingle_session.py
rename to gajim/common/jingle_session.py
diff --git a/src/common/jingle_transport.py b/gajim/common/jingle_transport.py
similarity index 100%
rename from src/common/jingle_transport.py
rename to gajim/common/jingle_transport.py
diff --git a/src/common/jingle_xtls.py b/gajim/common/jingle_xtls.py
similarity index 100%
rename from src/common/jingle_xtls.py
rename to gajim/common/jingle_xtls.py
diff --git a/src/common/location_listener.py b/gajim/common/location_listener.py
similarity index 100%
rename from src/common/location_listener.py
rename to gajim/common/location_listener.py
diff --git a/src/common/logger.py b/gajim/common/logger.py
similarity index 100%
rename from src/common/logger.py
rename to gajim/common/logger.py
diff --git a/src/common/logging_helpers.py b/gajim/common/logging_helpers.py
similarity index 100%
rename from src/common/logging_helpers.py
rename to gajim/common/logging_helpers.py
diff --git a/src/common/message_archiving.py b/gajim/common/message_archiving.py
similarity index 100%
rename from src/common/message_archiving.py
rename to gajim/common/message_archiving.py
diff --git a/src/common/multimedia_helpers.py b/gajim/common/multimedia_helpers.py
similarity index 100%
rename from src/common/multimedia_helpers.py
rename to gajim/common/multimedia_helpers.py
diff --git a/src/common/nec.py b/gajim/common/nec.py
similarity index 100%
rename from src/common/nec.py
rename to gajim/common/nec.py
diff --git a/src/common/optparser.py b/gajim/common/optparser.py
similarity index 100%
rename from src/common/optparser.py
rename to gajim/common/optparser.py
diff --git a/src/common/passwords.py b/gajim/common/passwords.py
similarity index 100%
rename from src/common/passwords.py
rename to gajim/common/passwords.py
diff --git a/src/common/pep.py b/gajim/common/pep.py
similarity index 100%
rename from src/common/pep.py
rename to gajim/common/pep.py
diff --git a/src/common/protocol/__init__.py b/gajim/common/protocol/__init__.py
similarity index 100%
rename from src/common/protocol/__init__.py
rename to gajim/common/protocol/__init__.py
diff --git a/src/common/protocol/bytestream.py b/gajim/common/protocol/bytestream.py
similarity index 100%
rename from src/common/protocol/bytestream.py
rename to gajim/common/protocol/bytestream.py
diff --git a/src/common/protocol/caps.py b/gajim/common/protocol/caps.py
similarity index 100%
rename from src/common/protocol/caps.py
rename to gajim/common/protocol/caps.py
diff --git a/src/common/proxy65_manager.py b/gajim/common/proxy65_manager.py
similarity index 100%
rename from src/common/proxy65_manager.py
rename to gajim/common/proxy65_manager.py
diff --git a/src/common/pubsub.py b/gajim/common/pubsub.py
similarity index 100%
rename from src/common/pubsub.py
rename to gajim/common/pubsub.py
diff --git a/src/common/resolver.py b/gajim/common/resolver.py
similarity index 100%
rename from src/common/resolver.py
rename to gajim/common/resolver.py
diff --git a/src/common/rst_xhtml_generator.py b/gajim/common/rst_xhtml_generator.py
similarity index 100%
rename from src/common/rst_xhtml_generator.py
rename to gajim/common/rst_xhtml_generator.py
diff --git a/src/common/sleepy.py b/gajim/common/sleepy.py
similarity index 100%
rename from src/common/sleepy.py
rename to gajim/common/sleepy.py
diff --git a/src/common/socks5.py b/gajim/common/socks5.py
similarity index 100%
rename from src/common/socks5.py
rename to gajim/common/socks5.py
diff --git a/src/common/stanza_session.py b/gajim/common/stanza_session.py
similarity index 100%
rename from src/common/stanza_session.py
rename to gajim/common/stanza_session.py
diff --git a/src/common/zeroconf/__init__.py b/gajim/common/zeroconf/__init__.py
similarity index 100%
rename from src/common/zeroconf/__init__.py
rename to gajim/common/zeroconf/__init__.py
diff --git a/src/common/zeroconf/client_zeroconf.py b/gajim/common/zeroconf/client_zeroconf.py
similarity index 100%
rename from src/common/zeroconf/client_zeroconf.py
rename to gajim/common/zeroconf/client_zeroconf.py
diff --git a/src/common/zeroconf/connection_handlers_zeroconf.py b/gajim/common/zeroconf/connection_handlers_zeroconf.py
similarity index 100%
rename from src/common/zeroconf/connection_handlers_zeroconf.py
rename to gajim/common/zeroconf/connection_handlers_zeroconf.py
diff --git a/src/common/zeroconf/connection_zeroconf.py b/gajim/common/zeroconf/connection_zeroconf.py
similarity index 100%
rename from src/common/zeroconf/connection_zeroconf.py
rename to gajim/common/zeroconf/connection_zeroconf.py
diff --git a/src/common/zeroconf/roster_zeroconf.py b/gajim/common/zeroconf/roster_zeroconf.py
similarity index 100%
rename from src/common/zeroconf/roster_zeroconf.py
rename to gajim/common/zeroconf/roster_zeroconf.py
diff --git a/src/common/zeroconf/zeroconf.py b/gajim/common/zeroconf/zeroconf.py
similarity index 100%
rename from src/common/zeroconf/zeroconf.py
rename to gajim/common/zeroconf/zeroconf.py
diff --git a/src/common/zeroconf/zeroconf_avahi.py b/gajim/common/zeroconf/zeroconf_avahi.py
similarity index 100%
rename from src/common/zeroconf/zeroconf_avahi.py
rename to gajim/common/zeroconf/zeroconf_avahi.py
diff --git a/src/common/zeroconf/zeroconf_bonjour.py b/gajim/common/zeroconf/zeroconf_bonjour.py
similarity index 100%
rename from src/common/zeroconf/zeroconf_bonjour.py
rename to gajim/common/zeroconf/zeroconf_bonjour.py
diff --git a/src/config.py b/gajim/config.py
similarity index 100%
rename from src/config.py
rename to gajim/config.py
diff --git a/src/conversation_textview.py b/gajim/conversation_textview.py
similarity index 100%
rename from src/conversation_textview.py
rename to gajim/conversation_textview.py
diff --git a/src/dataforms_widget.py b/gajim/dataforms_widget.py
similarity index 100%
rename from src/dataforms_widget.py
rename to gajim/dataforms_widget.py
diff --git a/src/dialogs.py b/gajim/dialogs.py
similarity index 100%
rename from src/dialogs.py
rename to gajim/dialogs.py
diff --git a/src/disco.py b/gajim/disco.py
similarity index 100%
rename from src/disco.py
rename to gajim/disco.py
diff --git a/src/features_window.py b/gajim/features_window.py
similarity index 100%
rename from src/features_window.py
rename to gajim/features_window.py
diff --git a/src/filetransfers_window.py b/gajim/filetransfers_window.py
similarity index 100%
rename from src/filetransfers_window.py
rename to gajim/filetransfers_window.py
diff --git a/src/gajim-remote.py b/gajim/gajim-remote.py
similarity index 100%
rename from src/gajim-remote.py
rename to gajim/gajim-remote.py
diff --git a/src/gajim.py b/gajim/gajim.py
similarity index 100%
rename from src/gajim.py
rename to gajim/gajim.py
diff --git a/src/gajim_themes_window.py b/gajim/gajim_themes_window.py
similarity index 100%
rename from src/gajim_themes_window.py
rename to gajim/gajim_themes_window.py
diff --git a/src/groupchat_control.py b/gajim/groupchat_control.py
similarity index 100%
rename from src/groupchat_control.py
rename to gajim/groupchat_control.py
diff --git a/src/groups.py b/gajim/groups.py
similarity index 100%
rename from src/groups.py
rename to gajim/groups.py
diff --git a/src/gtkexcepthook.py b/gajim/gtkexcepthook.py
similarity index 100%
rename from src/gtkexcepthook.py
rename to gajim/gtkexcepthook.py
diff --git a/src/gtkgui_helpers.py b/gajim/gtkgui_helpers.py
similarity index 100%
rename from src/gtkgui_helpers.py
rename to gajim/gtkgui_helpers.py
diff --git a/src/gtkspell.py b/gajim/gtkspell.py
similarity index 100%
rename from src/gtkspell.py
rename to gajim/gtkspell.py
diff --git a/src/gui_interface.py b/gajim/gui_interface.py
similarity index 100%
rename from src/gui_interface.py
rename to gajim/gui_interface.py
diff --git a/src/gui_menu_builder.py b/gajim/gui_menu_builder.py
similarity index 100%
rename from src/gui_menu_builder.py
rename to gajim/gui_menu_builder.py
diff --git a/src/history_manager.py b/gajim/history_manager.py
similarity index 100%
rename from src/history_manager.py
rename to gajim/history_manager.py
diff --git a/src/history_window.py b/gajim/history_window.py
similarity index 100%
rename from src/history_window.py
rename to gajim/history_window.py
diff --git a/src/htmltextview.py b/gajim/htmltextview.py
similarity index 100%
rename from src/htmltextview.py
rename to gajim/htmltextview.py
diff --git a/src/ipython_view.py b/gajim/ipython_view.py
similarity index 100%
rename from src/ipython_view.py
rename to gajim/ipython_view.py
diff --git a/src/logind_listener.py b/gajim/logind_listener.py
similarity index 100%
rename from src/logind_listener.py
rename to gajim/logind_listener.py
diff --git a/src/message_control.py b/gajim/message_control.py
similarity index 100%
rename from src/message_control.py
rename to gajim/message_control.py
diff --git a/src/message_textview.py b/gajim/message_textview.py
similarity index 100%
rename from src/message_textview.py
rename to gajim/message_textview.py
diff --git a/src/message_window.py b/gajim/message_window.py
similarity index 100%
rename from src/message_window.py
rename to gajim/message_window.py
diff --git a/src/music_track_listener.py b/gajim/music_track_listener.py
similarity index 100%
rename from src/music_track_listener.py
rename to gajim/music_track_listener.py
diff --git a/src/negotiation.py b/gajim/negotiation.py
similarity index 100%
rename from src/negotiation.py
rename to gajim/negotiation.py
diff --git a/src/network_watcher.py b/gajim/network_watcher.py
similarity index 100%
rename from src/network_watcher.py
rename to gajim/network_watcher.py
diff --git a/src/notify.py b/gajim/notify.py
similarity index 100%
rename from src/notify.py
rename to gajim/notify.py
diff --git a/src/plugins/__init__.py b/gajim/plugins/__init__.py
similarity index 100%
rename from src/plugins/__init__.py
rename to gajim/plugins/__init__.py
diff --git a/src/plugins/gajimplugin.py b/gajim/plugins/gajimplugin.py
similarity index 100%
rename from src/plugins/gajimplugin.py
rename to gajim/plugins/gajimplugin.py
diff --git a/src/plugins/gui.py b/gajim/plugins/gui.py
similarity index 100%
rename from src/plugins/gui.py
rename to gajim/plugins/gui.py
diff --git a/src/plugins/helpers.py b/gajim/plugins/helpers.py
similarity index 100%
rename from src/plugins/helpers.py
rename to gajim/plugins/helpers.py
diff --git a/src/plugins/pluginmanager.py b/gajim/plugins/pluginmanager.py
similarity index 100%
rename from src/plugins/pluginmanager.py
rename to gajim/plugins/pluginmanager.py
diff --git a/src/plugins/plugins_i18n.py b/gajim/plugins/plugins_i18n.py
similarity index 100%
rename from src/plugins/plugins_i18n.py
rename to gajim/plugins/plugins_i18n.py
diff --git a/src/profile_window.py b/gajim/profile_window.py
similarity index 100%
rename from src/profile_window.py
rename to gajim/profile_window.py
diff --git a/src/pylint.rc b/gajim/pylint.rc
similarity index 100%
rename from src/pylint.rc
rename to gajim/pylint.rc
diff --git a/src/remote_control.py b/gajim/remote_control.py
similarity index 100%
rename from src/remote_control.py
rename to gajim/remote_control.py
diff --git a/src/roster_window.py b/gajim/roster_window.py
similarity index 100%
rename from src/roster_window.py
rename to gajim/roster_window.py
diff --git a/src/search_window.py b/gajim/search_window.py
similarity index 100%
rename from src/search_window.py
rename to gajim/search_window.py
diff --git a/src/secrets.py b/gajim/secrets.py
similarity index 100%
rename from src/secrets.py
rename to gajim/secrets.py
diff --git a/src/session.py b/gajim/session.py
similarity index 100%
rename from src/session.py
rename to gajim/session.py
diff --git a/src/shortcuts_window.py b/gajim/shortcuts_window.py
similarity index 100%
rename from src/shortcuts_window.py
rename to gajim/shortcuts_window.py
diff --git a/src/statusicon.py b/gajim/statusicon.py
similarity index 100%
rename from src/statusicon.py
rename to gajim/statusicon.py
diff --git a/src/tooltips.py b/gajim/tooltips.py
similarity index 100%
rename from src/tooltips.py
rename to gajim/tooltips.py
diff --git a/src/upower_listener.py b/gajim/upower_listener.py
similarity index 100%
rename from src/upower_listener.py
rename to gajim/upower_listener.py
diff --git a/src/vcard.py b/gajim/vcard.py
similarity index 100%
rename from src/vcard.py
rename to gajim/vcard.py