diff --git a/errorfix/__init__.py b/errorfix/__init__.py
index 92833d6..48df70a 100644
--- a/errorfix/__init__.py
+++ b/errorfix/__init__.py
@@ -1,15 +1,18 @@
-from .cli import cli
-from .rules import RuleLoader
+from .rules import Rule, RuleLoader
 from .patterns import PatternMatcher
-from .formatters import TextFormatter, JSONFormatter, StructuredFormatter
-from .plugins import PluginLoader
+from .formatters import Formatter, TextFormatter, JSONFormatter
+from .plugins import Plugin, PluginLoader, PluginRegistry
+from .cli import cli
 
 __all__ = [
-    'cli',
+    'Rule',
     'RuleLoader',
     'PatternMatcher',
+    'Formatter',
     'TextFormatter',
     'JSONFormatter',
-    'StructuredFormatter',
+    'Plugin',
     'PluginLoader',
+    'PluginRegistry',
+    'cli',
 ]