diff --git a/browser/configure.zcml b/browser/configure.zcml
index 19e1eeb..65cc86f 100644
--- a/browser/configure.zcml
+++ b/browser/configure.zcml
@@ -6,38 +6,6 @@
    i18n_domain="zope"
    >
 
-  <tool
-      interface="cybertools.interfaces.IMenu"
-      title="Menu"
-      description="A Menu allows you to add menu items that are then shown in a portlet"
-      />
-    
-  <addform
-      label="Add Menu"
-      name="AddMenu.html"
-      schema="cybertools.interfaces.IMenu"
-      content_factory="cybertools.menu.Menu"
-      fields="title"
-      permission="zope.ManageContent"
-      />
-
-  <addMenuItem
-      class="cybertools.menu.Menu"
-      title="Menu"
-      permission="zope.ManageContent"
-      view="AddMenu.html"
-      />
-
-  <editform
-      label="Edit Menu"
-      name="edit.html"
-      schema="cybertools.interfaces.IMenu"
-      for="cybertools.interfaces.IMenu"
-      permission="zope.ManageContent"
-      menu="zmi_views" title="Edit"
-      fields="title"
-      />
-
   <menu
       id="mmain"
       title="main Menu"
diff --git a/ftests.py b/browser/ftests.py
similarity index 79%
rename from ftests.py
rename to browser/ftests.py
index d083c32..d775339 100755
--- a/ftests.py
+++ b/browser/ftests.py
@@ -7,7 +7,7 @@ from zope.app.testing.functional import FunctionalDocFileSuite
 
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
-    browser = FunctionalDocFileSuite('browser/skin/cyberview.txt', optionflags=flags)
+    browser = FunctionalDocFileSuite('skin/cyberview.txt', optionflags=flags)
     return unittest.TestSuite((browser,))
 
 if __name__ == '__main__':
diff --git a/browser/pageprovider.py b/browser/pageprovider.py
index 994075c..690d730 100644
--- a/browser/pageprovider.py
+++ b/browser/pageprovider.py
@@ -17,7 +17,9 @@
 #
 
 """
-cybertools regions.
+This is intended to replace the page macro - we just use a view that renders
+a standard template (main.pt). This calls a set of viewlet managers that
+do the real work.
 
 $Id$
 """
diff --git a/browser/tests.py b/browser/tests.py
new file mode 100755
index 0000000..e8a1cdc
--- /dev/null
+++ b/browser/tests.py
@@ -0,0 +1,17 @@
+# $Id$
+
+import unittest
+from zope.testing.doctestunit import DocFileSuite
+from zope.app.testing import ztapi
+from zope.interface.verify import verifyClass
+from zope.app import zapi
+
+
+def test_suite():
+    return unittest.TestSuite((
+                unittest.makeSuite(TestMenu),
+                DocFileSuite('README.txt'),
+            ))
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')
diff --git a/configure.zcml b/configure.zcml
index 8c0c4be..fab9023 100644
--- a/configure.zcml
+++ b/configure.zcml
@@ -5,33 +5,6 @@
    i18n_domain="zope"
    >
 
-  <!-- Content declarations -->
-
-  <interface
-      interface=".interfaces.IMenu"
-      type="zope.app.content.interfaces.IContentType" />
-
-  <content class=".menu.Menu">
-
-    <implements
-        interface="zope.app.utility.interfaces.ILocalUtility
-                   zope.app.annotation.interfaces.IAttributeAnnotatable" />
-
-    <factory
-        id="cybertools.Menu"
-        description="A configurable menu" />
-
-    <require
-        permission="zope.View"
-        interface=".interfaces.IMenu" />
-
-    <require
-        permission="zope.ManageContent"
-        set_schema=".interfaces.IMenu" />
-
-  </content>
-
-  <!-- Register views and skin stuff -->
   <include package=".browser" />
 
 </configure>
diff --git a/doc/menu.txt b/menu/README.txt
similarity index 89%
rename from doc/menu.txt
rename to menu/README.txt
index fe4b9ae..38be69c 100644
--- a/doc/menu.txt
+++ b/menu/README.txt
@@ -7,8 +7,8 @@ We first set up a test and working environment:
     >>> from zope.app.testing import ztapi
     >>> from zope.app.component import site, interfaces
     >>> from zope.app.folder import Folder
-    >>> from cybertools.menu import Menu
-    >>> from cybertools.interfaces import IMenu
+    >>> from cybertools.menu.menu import Menu
+    >>> from cybertools.menu.interfaces import IMenu
 
 Set up a site:
 
diff --git a/menu/__init__.py b/menu/__init__.py
new file mode 100644
index 0000000..4bc90fb
--- /dev/null
+++ b/menu/__init__.py
@@ -0,0 +1,4 @@
+"""
+$Id$
+"""
+
diff --git a/menu/configure.zcml b/menu/configure.zcml
new file mode 100644
index 0000000..25e1c69
--- /dev/null
+++ b/menu/configure.zcml
@@ -0,0 +1,70 @@
+<!-- $Id$ -->
+
+<configure
+   xmlns="http://namespaces.zope.org/zope"
+   xmlns:browser="http://namespaces.zope.org/browser"
+   i18n_domain="zope"
+   >
+
+  <!-- Content declarations -->
+
+  <interface
+      interface=".interfaces.IMenu"
+      type="zope.app.content.interfaces.IContentType" />
+
+  <content class=".menu.Menu">
+
+    <implements
+        interface="zope.app.utility.interfaces.ILocalUtility
+                   zope.app.annotation.interfaces.IAttributeAnnotatable" />
+
+    <factory
+        id="cybertools.Menu"
+        description="A configurable menu" />
+
+    <require
+        permission="zope.View"
+        interface=".interfaces.IMenu" />
+
+    <require
+        permission="zope.ManageContent"
+        set_schema=".interfaces.IMenu" />
+
+  </content>
+
+  <!-- Register views and skin stuff -->
+  <!--<include package=".browser" />-->
+
+  <tool
+      interface="cybertools.menu.interfaces.IMenu"
+      title="Menu"
+      description="A Menu allows you to add menu items that are then shown in a portlet"
+      />
+    
+  <browser:addform
+      label="Add Menu"
+      name="AddMenu.html"
+      schema="cybertools.interfaces.IMenu"
+      content_factory="cybertools.menu.Menu"
+      fields="title"
+      permission="zope.ManageContent"
+      />
+
+  <browser:addMenuItem
+      class="cybertools.menu.Menu"
+      title="Menu"
+      permission="zope.ManageContent"
+      view="AddMenu.html"
+      />
+
+  <browser:editform
+      label="Edit Menu"
+      name="edit.html"
+      schema="cybertools.interfaces.IMenu"
+      for="cybertools.interfaces.IMenu"
+      permission="zope.ManageContent"
+      menu="zmi_views" title="Edit"
+      fields="title"
+      />
+
+</configure>
diff --git a/interfaces.py b/menu/interfaces.py
similarity index 100%
rename from interfaces.py
rename to menu/interfaces.py
diff --git a/menu.py b/menu/menu.py
similarity index 100%
rename from menu.py
rename to menu/menu.py
diff --git a/tests.py b/menu/tests.py
similarity index 87%
rename from tests.py
rename to menu/tests.py
index d43217f..72d67f4 100755
--- a/tests.py
+++ b/menu/tests.py
@@ -10,8 +10,8 @@ from zope.app.container.interfaces import IContained
 from zope.app.folder import Folder
 from zope.app import zapi
 
-from cybertools.menu import Menu
-from cybertools.interfaces import IMenu
+from menu import Menu
+from interfaces import IMenu
 
 
 class TestMenu(unittest.TestCase):
@@ -41,8 +41,7 @@ class TestMenu(unittest.TestCase):
 def test_suite():
     return unittest.TestSuite((
                 unittest.makeSuite(TestMenu),
-                DocFileSuite('browser/README.txt'),
-                DocFileSuite('doc/menu.txt'),
+                DocFileSuite('README.txt'),
             ))
 
 if __name__ == '__main__':