5 files changed, 10 insertions, 9 deletions
diff --git a/poezio/core/__init__.py b/poezio/core/__init__.py
index fd3d0283..0c6d63d9 100644
--- a/poezio/core/__init__.py
+++ b/poezio/core/__init__.py
@@ -1,7 +1,8 @@
 """
 Core class, split into smaller chunks
 """
+__all__ = ['Core', 'Command', 'Status']
 
-from . core import Core
-from . structs import Command, Status
+from poezio.core.core import Core
+from poezio.core.structs import Command, Status
 
diff --git a/poezio/core/commands.py b/poezio/core/commands.py
index 7692d115..40f0182b 100644
--- a/poezio/core/commands.py
+++ b/poezio/core/commands.py
@@ -27,7 +27,7 @@ from poezio.roster import roster
 from poezio.theming import dump_tuple, get_theme
 from poezio.decorators import command_args_parser
 
-from . structs import Command, POSSIBLE_SHOW
+from poezio.core.structs import Command, POSSIBLE_SHOW
 
 
 class CommandCore:
diff --git a/poezio/core/completions.py b/poezio/core/completions.py
index a1ac1801..7ee4a8a6 100644
--- a/poezio/core/completions.py
+++ b/poezio/core/completions.py
@@ -15,7 +15,7 @@ from poezio.common import safeJID
 from poezio.config import config
 from poezio.roster import roster
 
-from . structs import POSSIBLE_SHOW
+from poezio.core.structs import POSSIBLE_SHOW
 
 
 class CompletionCore:
diff --git a/poezio/core/core.py b/poezio/core/core.py
index 589bd2c7..b8c4f5cf 100644
--- a/poezio/core/core.py
+++ b/poezio/core/core.py
@@ -43,10 +43,10 @@ from poezio.text_buffer import TextBuffer
 from poezio.theming import get_theme
 from poezio import keyboard
 
-from . completions import CompletionCore
-from . commands import CommandCore
-from . handlers import HandlerCore
-from . structs import POSSIBLE_SHOW, DEPRECATED_ERRORS, \
+from poezio.core.completions import CompletionCore
+from poezio.core.commands import CommandCore
+from poezio.core.handlers import HandlerCore
+from poezio.core.structs import POSSIBLE_SHOW, DEPRECATED_ERRORS, \
         ERROR_AND_STATUS_CODES, Command, Status
 
 
diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py
index 373b7b8c..70c2e59c 100644
--- a/poezio/core/handlers.py
+++ b/poezio/core/handlers.py
@@ -34,7 +34,7 @@ from poezio.roster import roster
 from poezio.text_buffer import CorrectionError, AckError
 from poezio.theming import dump_tuple, get_theme
 
-from . commands import dumb_callback
+from poezio.core.commands import dumb_callback
 
 try:
     from pygments import highlight