5 files changed, 9 insertions, 7 deletions

diff --git a/mailman/core/chains.py b/mailman/core/chains.py
index ba34a426e..58935ed39 100644
--- a/mailman/core/chains.py
+++ b/mailman/core/chains.py
@@ -31,7 +31,7 @@ from mailman.chains.headers import HeaderMatchChain
 from mailman.chains.hold import HoldChain
 from mailman.chains.reject import RejectChain
 from mailman.config import config
-from mailman.interfaces import LinkAction
+from mailman.interfaces.chain import LinkAction
 
 
 
diff --git a/mailman/core/initialize.py b/mailman/core/initialize.py
index bf38303d5..c8b457d75 100644
--- a/mailman/core/initialize.py
+++ b/mailman/core/initialize.py
@@ -33,7 +33,7 @@ import mailman.config.config
 import mailman.core.logging
 
 from mailman.core.plugins import get_plugin
-from mailman.interfaces import IDatabase
+from mailman.interfaces.database import IDatabase
 
 
 
diff --git a/mailman/core/pipelines.py b/mailman/core/pipelines.py
index bc4a70b87..7be252388 100644
--- a/mailman/core/pipelines.py
+++ b/mailman/core/pipelines.py
@@ -30,7 +30,8 @@ from zope.interface.verify import verifyObject
 from mailman.config import config
 from mailman.core.plugins import get_plugins
 from mailman.i18n import _
-from mailman.interfaces import IHandler, IPipeline
+from mailman.interfaces.handler import IHandler
+from mailman.interfaces.pipeline import IPipeline
 
 
 
diff --git a/mailman/core/rules.py b/mailman/core/rules.py
index 62c643937..dec7eb792 100644
--- a/mailman/core/rules.py
+++ b/mailman/core/rules.py
@@ -28,7 +28,7 @@ from zope.interface.verify import verifyObject
 
 from mailman.config import config
 from mailman.core.plugins import get_plugins
-from mailman.interfaces import IRule
+from mailman.interfaces.rules import IRule
 
 
 
diff --git a/mailman/core/styles.py b/mailman/core/styles.py
index aee61790f..11177e725 100644
--- a/mailman/core/styles.py
+++ b/mailman/core/styles.py
@@ -36,9 +36,10 @@ from mailman import Utils
 from mailman.config import config
 from mailman.core.plugins import get_plugins
 from mailman.i18n import _
-from mailman.interfaces import (
-    Action, DuplicateStyleError, IStyle, IStyleManager, NewsModeration,
-    Personalization)
+from mailman.interfaces import Action, NewsModeration
+from mailman.interfaces.mailinglist import Personalization
+from mailman.interfaces.styles import (
+    DuplicateStyleError, IStyle, IStyleManager)