76 files changed, 19 insertions, 30 deletions
diff --git a/Makefile b/Makefile
index 2b3e3a51..6b901279 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ clean:
 	rm -rf poezio.egg-info
 	rm -rf dist
 	rm -rf build
-	rm -f src/*.so
+	rm -f poezio/*.so
 
 install: all
 	python3 setup.py install --root=$(DESTDIR) --optimize=1
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4ce97717..61f17b38 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -15,7 +15,7 @@
 import sys, os, time
 
 sys.path.insert(0, os.path.abspath('../stub'))
-sys.path.append(os.path.abspath('../../src/'))
+sys.path.append(os.path.abspath('../../poezio/'))
 sys.path.append(os.path.abspath('../../plugins/'))
 
 # If extensions (or modules to document with autodoc) are in another directory,
diff --git a/doc/source/keys.rst b/doc/source/keys.rst
index ac4428e5..f1d47b91 100644
--- a/doc/source/keys.rst
+++ b/doc/source/keys.rst
@@ -249,7 +249,7 @@ To know exactly what the code of a key is, just run
 
 .. code-block:: bash
 
-    python3 src/keyboard.py
+    python3 poezio/keyboard.py
 
 And enter any key.
 
diff --git a/launch.sh b/launch.sh
index ca100524..267c90f4 100755
--- a/launch.sh
+++ b/launch.sh
@@ -25,5 +25,5 @@ else
 fi
 
 $PYTHON3 -c 'import sys;(print("Python 3.4 or newer is required") and exit(1)) if sys.version_info < (3, 4) else exit(0)' || exit 1
-exec "$PYTHON3" "$poezio_dir/src/poezio.py" -v "$args" "$@"
+exec "$PYTHON3" "$poezio_dir/poezio/poezio.py" -v "$args" "$@"
 
diff --git a/plugins/link.py b/plugins/link.py
index d39d01b9..bca592a1 100644
--- a/plugins/link.py
+++ b/plugins/link.py
@@ -76,7 +76,7 @@ Options
         Set the default browser started by the plugin
 
 .. _Unix FIFO: https://en.wikipedia.org/wiki/Named_pipe
-.. _daemon.py: http://dev.louiz.org/projects/poezio/repository/revisions/master/raw/src/daemon.py
+.. _daemon.py: http://dev.louiz.org/projects/poezio/repository/revisions/master/raw/poezio/daemon.py
 
 """
 import platform
diff --git a/src/args.py b/poezio/args.py
index 63e77927..63e77927 100644
--- a/src/args.py
+++ b/poezio/args.py
diff --git a/src/bookmarks.py b/poezio/bookmarks.py
index c7d26a51..c7d26a51 100644
--- a/src/bookmarks.py
+++ b/poezio/bookmarks.py
diff --git a/src/common.py b/poezio/common.py
index a62c83f1..a62c83f1 100644
--- a/src/common.py
+++ b/poezio/common.py
diff --git a/src/config.py b/poezio/config.py
index 7f0c75f6..7f0c75f6 100644
--- a/src/config.py
+++ b/poezio/config.py
diff --git a/src/connection.py b/poezio/connection.py
index c4cc8b6b..c4cc8b6b 100644
--- a/src/connection.py
+++ b/poezio/connection.py
diff --git a/src/contact.py b/poezio/contact.py
index c670e5bc..c670e5bc 100644
--- a/src/contact.py
+++ b/poezio/contact.py
diff --git a/src/core/__init__.py b/poezio/core/__init__.py
index 6a82e2bb..6a82e2bb 100644
--- a/src/core/__init__.py
+++ b/poezio/core/__init__.py
diff --git a/src/core/commands.py b/poezio/core/commands.py
index a0a636c1..a0a636c1 100644
--- a/src/core/commands.py
+++ b/poezio/core/commands.py
diff --git a/src/core/completions.py b/poezio/core/completions.py
index 9fd44f1b..9fd44f1b 100644
--- a/src/core/completions.py
+++ b/poezio/core/completions.py
diff --git a/src/core/core.py b/poezio/core/core.py
index f32099f1..f32099f1 100644
--- a/src/core/core.py
+++ b/poezio/core/core.py
diff --git a/src/core/handlers.py b/poezio/core/handlers.py
index 8cc08179..8cc08179 100644
--- a/src/core/handlers.py
+++ b/poezio/core/handlers.py
diff --git a/src/core/structs.py b/poezio/core/structs.py
index 4ce0ef43..4ce0ef43 100644
--- a/src/core/structs.py
+++ b/poezio/core/structs.py
diff --git a/src/daemon.py b/poezio/daemon.py
index 6325d8df..6325d8df 100755
--- a/src/daemon.py
+++ b/poezio/daemon.py
diff --git a/src/decorators.py b/poezio/decorators.py
index c4ea6563..c4ea6563 100644
--- a/src/decorators.py
+++ b/poezio/decorators.py
diff --git a/src/events.py b/poezio/events.py
index 15ef3e35..15ef3e35 100644
--- a/src/events.py
+++ b/poezio/events.py
diff --git a/src/fifo.py b/poezio/fifo.py
index 863ef228..863ef228 100644
--- a/src/fifo.py
+++ b/poezio/fifo.py
diff --git a/src/fixes.py b/poezio/fixes.py
index 3840a093..3840a093 100644
--- a/src/fixes.py
+++ b/poezio/fixes.py
diff --git a/src/keyboard.py b/poezio/keyboard.py
index ccf9e752..ccf9e752 100755
--- a/src/keyboard.py
+++ b/poezio/keyboard.py
diff --git a/src/logger.py b/poezio/logger.py
index 7efa8f61..7efa8f61 100644
--- a/src/logger.py
+++ b/poezio/logger.py
diff --git a/src/multiuserchat.py b/poezio/multiuserchat.py
index b7b12305..b7b12305 100644
--- a/src/multiuserchat.py
+++ b/poezio/multiuserchat.py
diff --git a/src/pep.py b/poezio/pep.py
index 0f7a1ced..0f7a1ced 100644
--- a/src/pep.py
+++ b/poezio/pep.py
diff --git a/src/plugin.py b/poezio/plugin.py
index bf30c981..bf30c981 100644
--- a/src/plugin.py
+++ b/poezio/plugin.py
diff --git a/src/plugin_manager.py b/poezio/plugin_manager.py
index 549753a9..549753a9 100644
--- a/src/plugin_manager.py
+++ b/poezio/plugin_manager.py
diff --git a/src/poezio.py b/poezio/poezio.py
index 9fb6fb73..9fb6fb73 100644
--- a/src/poezio.py
+++ b/poezio/poezio.py
diff --git a/src/poezio_shlex.py b/poezio/poezio_shlex.py
index 032baeee..032baeee 100644
--- a/src/poezio_shlex.py
+++ b/poezio/poezio_shlex.py
diff --git a/src/pooptmodule.c b/poezio/pooptmodule.c
index 69fb7f6f..69fb7f6f 100644
--- a/src/pooptmodule.c
+++ b/poezio/pooptmodule.c
diff --git a/src/roster.py b/poezio/roster.py
index ba7da63e..ba7da63e 100644
--- a/src/roster.py
+++ b/poezio/roster.py
diff --git a/src/roster_sorting.py b/poezio/roster_sorting.py
index c57f0dce..c57f0dce 100644
--- a/src/roster_sorting.py
+++ b/poezio/roster_sorting.py
diff --git a/src/singleton.py b/poezio/singleton.py
index 9133012b..9133012b 100644
--- a/src/singleton.py
+++ b/poezio/singleton.py
diff --git a/src/size_manager.py b/poezio/size_manager.py
index 1cad83fd..1cad83fd 100644
--- a/src/size_manager.py
+++ b/poezio/size_manager.py
diff --git a/src/tabs/__init__.py b/poezio/tabs/__init__.py
index d0a881a6..d0a881a6 100644
--- a/src/tabs/__init__.py
+++ b/poezio/tabs/__init__.py
diff --git a/src/tabs/adhoc_commands_list.py b/poezio/tabs/adhoc_commands_list.py
index 10ebf22b..10ebf22b 100644
--- a/src/tabs/adhoc_commands_list.py
+++ b/poezio/tabs/adhoc_commands_list.py
diff --git a/src/tabs/basetabs.py b/poezio/tabs/basetabs.py
index bb0c0ea4..bb0c0ea4 100644
--- a/src/tabs/basetabs.py
+++ b/poezio/tabs/basetabs.py
diff --git a/src/tabs/bookmarkstab.py b/poezio/tabs/bookmarkstab.py
index 7f5069ea..7f5069ea 100644
--- a/src/tabs/bookmarkstab.py
+++ b/poezio/tabs/bookmarkstab.py
diff --git a/src/tabs/conversationtab.py b/poezio/tabs/conversationtab.py
index 1d8c60a4..1d8c60a4 100644
--- a/src/tabs/conversationtab.py
+++ b/poezio/tabs/conversationtab.py
diff --git a/src/tabs/data_forms.py b/poezio/tabs/data_forms.py
index 0fad2974..0fad2974 100644
--- a/src/tabs/data_forms.py
+++ b/poezio/tabs/data_forms.py
diff --git a/src/tabs/listtab.py b/poezio/tabs/listtab.py
index 4d8bab9c..4d8bab9c 100644
--- a/src/tabs/listtab.py
+++ b/poezio/tabs/listtab.py
diff --git a/src/tabs/muclisttab.py b/poezio/tabs/muclisttab.py
index 92d55190..92d55190 100644
--- a/src/tabs/muclisttab.py
+++ b/poezio/tabs/muclisttab.py
diff --git a/src/tabs/muctab.py b/poezio/tabs/muctab.py
index 1f3ec6d8..1f3ec6d8 100644
--- a/src/tabs/muctab.py
+++ b/poezio/tabs/muctab.py
diff --git a/src/tabs/privatetab.py b/poezio/tabs/privatetab.py
index a715a922..a715a922 100644
--- a/src/tabs/privatetab.py
+++ b/poezio/tabs/privatetab.py
diff --git a/src/tabs/rostertab.py b/poezio/tabs/rostertab.py
index a5c22304..a5c22304 100644
--- a/src/tabs/rostertab.py
+++ b/poezio/tabs/rostertab.py
diff --git a/src/tabs/xmltab.py b/poezio/tabs/xmltab.py
index b063ad35..b063ad35 100644
--- a/src/tabs/xmltab.py
+++ b/poezio/tabs/xmltab.py
diff --git a/src/text_buffer.py b/poezio/text_buffer.py
index dd5bc58a..dd5bc58a 100644
--- a/src/text_buffer.py
+++ b/poezio/text_buffer.py
diff --git a/src/theming.py b/poezio/theming.py
index 5d263741..5d263741 100755
--- a/src/theming.py
+++ b/poezio/theming.py
diff --git a/src/timed_events.py b/poezio/timed_events.py
index 7f43d05f..7f43d05f 100644
--- a/src/timed_events.py
+++ b/poezio/timed_events.py
diff --git a/src/user.py b/poezio/user.py
index 4142869b..4142869b 100644
--- a/src/user.py
+++ b/poezio/user.py
diff --git a/src/windows/__init__.py b/poezio/windows/__init__.py
index 5ec73961..5ec73961 100644
--- a/src/windows/__init__.py
+++ b/poezio/windows/__init__.py
diff --git a/src/windows/base_wins.py b/poezio/windows/base_wins.py
index 464c6fa1..8df214d2 100644
--- a/src/windows/base_wins.py
+++ b/poezio/windows/base_wins.py
@@ -4,7 +4,7 @@ by the file of this module.
 
 A window is a little part of the screen, for example the input window,
 the text window, the roster window, etc.
-A Tab (see the src/tabs module) is composed of multiple Windows
+A Tab (see the poezio.tabs module) is composed of multiple Windows
 """
 
 import logging
diff --git a/src/windows/bookmark_forms.py b/poezio/windows/bookmark_forms.py
index de1043c9..de1043c9 100644
--- a/src/windows/bookmark_forms.py
+++ b/poezio/windows/bookmark_forms.py
diff --git a/src/windows/data_forms.py b/poezio/windows/data_forms.py
index 410648ec..410648ec 100644
--- a/src/windows/data_forms.py
+++ b/poezio/windows/data_forms.py
diff --git a/src/windows/funcs.py b/poezio/windows/funcs.py
index f1401628..f1401628 100644
--- a/src/windows/funcs.py
+++ b/poezio/windows/funcs.py
diff --git a/src/windows/info_bar.py b/poezio/windows/info_bar.py
index abd956cd..abd956cd 100644
--- a/src/windows/info_bar.py
+++ b/poezio/windows/info_bar.py
diff --git a/src/windows/info_wins.py b/poezio/windows/info_wins.py
index f6aebd35..f6aebd35 100644
--- a/src/windows/info_wins.py
+++ b/poezio/windows/info_wins.py
diff --git a/src/windows/input_placeholders.py b/poezio/windows/input_placeholders.py
index 496417d1..496417d1 100644
--- a/src/windows/input_placeholders.py
+++ b/poezio/windows/input_placeholders.py
diff --git a/src/windows/inputs.py b/poezio/windows/inputs.py
index 80f0c900..80f0c900 100644
--- a/src/windows/inputs.py
+++ b/poezio/windows/inputs.py
diff --git a/src/windows/list.py b/poezio/windows/list.py
index 677df6ff..677df6ff 100644
--- a/src/windows/list.py
+++ b/poezio/windows/list.py
diff --git a/src/windows/misc.py b/poezio/windows/misc.py
index 07c91bbd..07c91bbd 100644
--- a/src/windows/misc.py
+++ b/poezio/windows/misc.py
diff --git a/src/windows/muc.py b/poezio/windows/muc.py
index 84775787..84775787 100644
--- a/src/windows/muc.py
+++ b/poezio/windows/muc.py
diff --git a/src/windows/roster_win.py b/poezio/windows/roster_win.py
index a2e2badd..a2e2badd 100644
--- a/src/windows/roster_win.py
+++ b/poezio/windows/roster_win.py
diff --git a/src/windows/text_win.py b/poezio/windows/text_win.py
index fd1fe546..fd1fe546 100644
--- a/src/windows/text_win.py
+++ b/poezio/windows/text_win.py
diff --git a/src/xhtml.py b/poezio/xhtml.py
index b84ce943..b84ce943 100644
--- a/src/xhtml.py
+++ b/poezio/xhtml.py
diff --git a/setup.py b/setup.py
index 051bcf8b..775b5fb9 100755
--- a/setup.py
+++ b/setup.py
@@ -38,12 +38,12 @@ def find_doc(before, path):
 
 module_poopt = Extension('poezio.poopt',
                     extra_compile_args=['-Wno-declaration-after-statement'],
-                    sources=['src/pooptmodule.c'])
+                    sources=['poezio/pooptmodule.c'])
 
 # Create a link to the config file (for packaging purposes)
-if not exists(join(current_dir, 'src', 'default_config.cfg')):
+if not exists(join(current_dir, 'poezio', 'default_config.cfg')):
     link(join(current_dir, 'data', 'default_config.cfg'),
-         join(current_dir, 'src', 'default_config.cfg'))
+         join(current_dir, 'poezio', 'default_config.cfg'))
 
 # identify the git version
 git_dir = join(current_dir, '.git')
@@ -91,7 +91,7 @@ setup(name="poezio",
       keywords=['jabber', 'xmpp', 'client', 'chat', 'im', 'console'],
       packages=['poezio', 'poezio.core', 'poezio.tabs', 'poezio.windows',
                 'poezio_plugins', 'poezio_plugins.gpg', 'poezio_themes'],
-      package_dir={'poezio': 'src',
+      package_dir={'poezio': 'poezio',
                    'poezio_plugins': 'plugins',
                    'poezio_themes': 'data/themes'},
       package_data={'poezio': ['default_config.cfg']},
@@ -106,8 +106,8 @@ setup(name="poezio",
                       'Screen autoaway plugin': 'pyinotify==0.9.4'})
 
 # Remove the link afterwards
-if (exists(join(current_dir, 'src', 'default_config.cfg')) and
+if (exists(join(current_dir, 'poezio', 'default_config.cfg')) and
         exists(join(current_dir, 'data', 'default_config.cfg'))):
 
-    unlink(join(current_dir, 'src', 'default_config.cfg'))
+    unlink(join(current_dir, 'poezio', 'default_config.cfg'))
 
diff --git a/src/__init__.py b/src/__init__.py
deleted file mode 100644
index 9fdbcc02..00000000
--- a/src/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from poezio.poezio import main
diff --git a/test/test_common.py b/test/test_common.py
index 0b2bd279..97727aaf 100644
--- a/test/test_common.py
+++ b/test/test_common.py
@@ -3,7 +3,7 @@ Test the functions in the `common` module
 """
 
 import sys
-sys.path.append('src')
+sys.path.append('poezio')
 
 import time
 import pytest
diff --git a/test/test_completion.py b/test/test_completion.py
index 0e6e0492..54c0f057 100644
--- a/test/test_completion.py
+++ b/test/test_completion.py
@@ -8,7 +8,7 @@ import random
 import sys
 import os
 
-sys.path.append('src')
+sys.path.append('poezio')
 
 class ConfigShim(object):
     def get(self, *args, **kwargs):
diff --git a/test/test_config.py b/test/test_config.py
index f8d06258..4c87458e 100644
--- a/test/test_config.py
+++ b/test/test_config.py
@@ -8,7 +8,7 @@ import sys
 import os
 
 
-sys.path.append('src')
+sys.path.append('poezio')
 
 import config
 
diff --git a/test/test_poopt.py b/test/test_poopt.py
index 9b640ff0..54f466a6 100644
--- a/test/test_poopt.py
+++ b/test/test_poopt.py
@@ -4,7 +4,7 @@ Test of the poopt module
 
 import pytest
 import sys
-sys.path.append('src')
+sys.path.append('poezio')
 
 from poopt import cut_text
 
diff --git a/test/test_theming.py b/test/test_theming.py
index 9cdb4829..b59560b7 100644
--- a/test/test_theming.py
+++ b/test/test_theming.py
@@ -4,7 +4,7 @@ Test the functions in the `theming` module
 
 import sys
 import pytest
-sys.path.append('src')
+sys.path.append('poezio')
 
 from theming import dump_tuple, read_tuple
 
diff --git a/test/test_windows.py b/test/test_windows.py
index 8fb85295..26a426c7 100644
--- a/test/test_windows.py
+++ b/test/test_windows.py
@@ -1,6 +1,6 @@
 import pytest
 import sys
-sys.path.append('src')
+sys.path.append('poezio')
 
 class ConfigShim(object):
     def get(self, *args, **kwargs):
diff --git a/test/test_xhtml.py b/test/test_xhtml.py
index 5afd08ff..b4d6c3da 100644
--- a/test/test_xhtml.py
+++ b/test/test_xhtml.py
@@ -5,7 +5,7 @@ Test the functions in the `xhtml` module
 import pytest
 import sys
 import xml
-sys.path.append('src')
+sys.path.append('poezio')
 
 from xhtml import (poezio_colors_to_html, xhtml_to_poezio_colors,
                    parse_css, clean_text)
diff --git a/update.sh b/update.sh
index 73c37467..dd9d846f 100755
--- a/update.sh
+++ b/update.sh
@@ -64,13 +64,3 @@ else
 fi
 
 make
-
-
-if [ -e src/slixmpp ]
-then
-    echo ""
-    echo "The update script detected a slixmpp link in src/."
-    echo "This is probably due to the old update script, you should delete it"
-    echo "so that poezio can use the up-to-date copy inside the poezio-venv directory."
-    echo ""
-fi