diff --git a/cheuph/__init__.py b/cheuph/__init__.py
index efa48dc..130f0bc 100644
--- a/cheuph/__init__.py
+++ b/cheuph/__init__.py
@@ -1,29 +1,17 @@
 from typing import List
 
 from .attributed_lines import *
-from .attributed_lines_widget import *
-from .attributed_text_widget import *
-from .config import *
-from .exceptions import *
+from .cursor_rendering import *
+from .element import *
+from .element_supply import *
 from .markup import *
-from .message import *
-from .message_editor_widget import *
-from .message_supply import *
-from .message_tree_widget import *
-from .rendered_message_cache import *
-from .user_list_widget import *
+from .rendered_element_cache import *
 
 __all__: List[str] = []
 
 __all__ += attributed_lines.__all__
-__all__ += attributed_lines_widget.__all__
-__all__ += attributed_text_widget.__all__
-__all__ += config.__all__
-__all__ += exceptions.__all__
+__all__ += cursor_rendering.__all__
+__all__ += element.__all__
+__all__ += element_supply.__all__
 __all__ += markup.__all__
-__all__ += message.__all__
-__all__ += message_editor_widget.__all__
-__all__ += message_supply.__all__
-__all__ += message_tree_widget.__all__
-__all__ += rendered_message_cache.__all__
-__all__ += user_list_widget.__all__
+__all__ += rendered_element_cache.__all__
diff --git a/cheuph/attributed_lines.py b/cheuph/attributed_lines.py
index 7f089ca..1285141 100644
--- a/cheuph/attributed_lines.py
+++ b/cheuph/attributed_lines.py
@@ -8,10 +8,8 @@ from .markup import AT, AttributedText, Attributes
 
 __all__ = ["Line", "AttributedLines"]
 
-
 Line = Tuple[Attributes, AttributedText]
 
-
 class AttributedLines:
     """
     AttributedLines is a list of lines of AttributedText that maintains a