diff --git a/.gitignore b/.gitignore
index 436408a..7f4ce26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ var/
 *.sublime-project
 *.sublime-workspace
 .settings
+adminuser.zcml
diff --git a/inst/bluebream/adminuser.zcml.in b/inst/bluebream/adminuser.zcml.in
new file mode 100644
index 0000000..bb89fc1
--- /dev/null
+++ b/inst/bluebream/adminuser.zcml.in
@@ -0,0 +1,14 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+  <principal
+     id="zope.manager"
+     title="Manager"
+     login="admin"
+     password="admin"
+     password_manager="Plain Text" />
+
+  <grant
+     role="zope.Manager"
+     principal="zope.manager" />
+
+</configure>
diff --git a/inst/bluebream/application.zcml b/inst/bluebream/application.zcml
index 0040c1f..719a67a 100644
--- a/inst/bluebream/application.zcml
+++ b/inst/bluebream/application.zcml
@@ -1,23 +1,13 @@
-<configure
-   xmlns="http://namespaces.zope.org/zope"
-   xmlns:browser="http://namespaces.zope.org/browser"
-   i18n_domain="bluebream">
+<configure xmlns="http://namespaces.zope.org/zope">
 
-  <include file="../bluebream.zcml" />
+  <include package="loops" file="bluebream.zcml" />
 
-  <include package="zope.app.zcmlfiles" />
-  <include package="zope.app.i18n" />
-  <include package="zope.app.intid" />
-  <include package="zope.app.renderer" />
-  <include package="zope.app.session" />
-  <include package="zope.sendmail" file="meta.zcml" />
+  <include package="loops" file="securitypolicy.zcml" />
 
-  <include package="main" file="securitypolicy.zcml" />
+  <include file="adminuser.zcml" />
 
-  <browser:defaultView
-        for="zope.container.interfaces.IContainer"
-        name="index.html" />
+  <includeOverrides package="loops" file="overrides.zcml" />
 
-  <includeOverrides package="main" file="overrides.zcml" />
+  <includeOverrides file="overrides.zcml" />
 
 </configure>
diff --git a/inst/bluebream/securitypolicy.zcml b/inst/bluebream/securitypolicy.zcml
deleted file mode 100644
index 9ab3b78..0000000
--- a/inst/bluebream/securitypolicy.zcml
+++ /dev/null
@@ -1,51 +0,0 @@
-<configure
-   xmlns="http://namespaces.zope.org/zope"
-   i18n_domain="main">
-
-  <!-- This file contains sample security policy definition -->
-
-  <securityPolicy 
-     component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
-
-  <unauthenticatedPrincipal
-     id="zope.anybody"
-     title="Unauthenticated User" />
-
-  <unauthenticatedGroup
-     id="zope.Anybody"
-     title="Unauthenticated Users" />
-
-  <authenticatedGroup
-     id="zope.Authenticated"
-     title="Authenticated Users" />
-
-  <everybodyGroup
-     id="zope.Everybody"
-     title="All Users" />
-
-  <role id="zope.Anonymous" title="Everybody"
-        description="All users have this role implicitly" />
-  <grant permission="zope.View" role="zope.Anonymous" />
-
-  <role id="zope.Manager" title="Site Manager" />
-  <grantAll role="zope.Manager" />
-
-  <role id="zope.Member" title="Site Member" />
-  <role id="zope.ContentManager" title="Content Manager" />
-
-  <grant role="zope.Member" permission="zope.View" />
-  <grant role="zope.ContentManager" permission="zope.ManageContent" />
-  <grant role="zope.ContentManager" permission="zope.View" />
-
-  <principal
-     id="zope.manager"
-     title="Manager"
-     login="admin"
-     password="admin"
-     password_manager="Plain Text" />
-
-  <grant
-     role="zope.Manager"
-     principal="zope.manager" />
-
-</configure>
diff --git a/inst/loops/adminuser.zcml.in b/inst/loops/adminuser.zcml.in
new file mode 100644
index 0000000..bb89fc1
--- /dev/null
+++ b/inst/loops/adminuser.zcml.in
@@ -0,0 +1,14 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+  <principal
+     id="zope.manager"
+     title="Manager"
+     login="admin"
+     password="admin"
+     password_manager="Plain Text" />
+
+  <grant
+     role="zope.Manager"
+     principal="zope.manager" />
+
+</configure>
diff --git a/inst/loops/application.zcml b/inst/loops/application.zcml
index 76de5b3..8546129 100644
--- a/inst/loops/application.zcml
+++ b/inst/loops/application.zcml
@@ -1,22 +1,10 @@
-<configure
-   xmlns="http://namespaces.zope.org/zope"
-   xmlns:browser="http://namespaces.zope.org/browser"
-   i18n_domain="main">
+<configure xmlns="http://namespaces.zope.org/zope">
 
-  <include file="../bluebream.zcml" />
+  <include package="loops" file="bluebream.zcml" />
 
-  <include package="zope.app.zcmlfiles" />
-  <include package="zope.app.i18n" />
-  <include package="zope.app.intid" />
-  <include package="zope.app.renderer" />
-  <include package="zope.app.session" />
-  <include package="zope.sendmail" file="meta.zcml" />
+  <include package="loops" file="securitypolicy.zcml" />
 
-  <include package="main" file="securitypolicy.zcml" />
-
-  <browser:defaultView
-        for="zope.container.interfaces.IContainer"
-        name="index.html" />
+  <include file="adminuser.zcml" />
 
   <include package="cybertools" />
   <include package="cybertools.ajax.dojo" />
@@ -42,6 +30,7 @@
   <include package="cyberapps.knowledge" />-->
 
   <!-- Override registrations -->
-  <includeOverrides package="main" file="overrides.zcml" />
+  <includeOverrides package="loops" file="overrides.zcml" />
+  <includeOverrides file="overrides.zcml" />
 
 </configure>
diff --git a/inst/loops/notfound.pt b/inst/loops/notfound.pt
deleted file mode 100644
index f3d4483..0000000
--- a/inst/loops/notfound.pt
+++ /dev/null
@@ -1,18 +0,0 @@
-<html
-    i18n:domain="zope">
-<body>
-
-<h3  i18n:translate="">
-  The page that you are trying to access is not available
-</h3>
-<br/> 
-<b  i18n:translate="">Please note the following:</b>
-<br/>
-<ol>
-   <li i18n:translate=""> You might have misspelled the url </li>
-   <li i18n:translate="">
-     You might be trying to access a non-existing page
-   </li>
-</ol>
-</body>
-</html>
\ No newline at end of file
diff --git a/inst/loops/overrides.zcml b/inst/loops/overrides.zcml
index 397495e..7996f67 100644
--- a/inst/loops/overrides.zcml
+++ b/inst/loops/overrides.zcml
@@ -1,48 +1,4 @@
-<configure
-  xmlns="http://namespaces.zope.org/zope"
-  xmlns:browser="http://namespaces.zope.org/browser">
-
-  <!-- ZCML declarations to override the default definitions -->
-
-  <browser:defaultSkin name="Loops" />
-
-  <browser:containerViews
-      for="zope.app.folder.interfaces.IFolder"
-      contents="zope.ManageContent"
-      index="zope.ManageContent"
-      add="zope.ManageContent"
-      />
-
-  <browser:page
-      name="singleBranchTree.xml"
-      for="zope.interface.interface.Interface"
-      permission="zope.ManageContent"
-      class="zope.app.rotterdam.xmlobject.XmlObjectView"
-      attribute="singleBranchTree"
-      />
-
-  <browser:pages
-      for="zope.container.interfaces.IReadContainer"
-      permission="zope.ManageContent"
-      class="zope.app.rotterdam.xmlobject.ReadContainerXmlObjectView">
-    <browser:page
-        name="children.xml"
-        attribute="children"
-        />
-    <browser:page
-        name="singleBranchTree.xml"
-        attribute="singleBranchTree"
-        />
-  </browser:pages>
-
-  <browser:page
-      for="zope.publisher.interfaces.INotFound"
-      name="index.html"
-      permission="zope.Public"
-      template="notfound.pt"
-      class="zope.app.exception.browser.notfound.NotFound"
-      />
-
-  <!--<include package="cco.member" />-->
+<configure xmlns="http://namespaces.zope.org/zope">
 
 </configure>
+
diff --git a/inst/loops/securitypolicy.zcml b/inst/loops/securitypolicy.zcml
deleted file mode 100644
index a27e369..0000000
--- a/inst/loops/securitypolicy.zcml
+++ /dev/null
@@ -1,52 +0,0 @@
-<configure
-   xmlns="http://namespaces.zope.org/zope"
-   i18n_domain="main">
-
-  <!-- This file contains sample security policy definition -->
-
-  <securityPolicy 
-     component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
-
-  <unauthenticatedPrincipal
-     id="zope.anybody"
-     title="Unauthenticated User" />
-
-  <unauthenticatedGroup
-     id="zope.Anybody"
-     title="Unauthenticated Users" />
-
-  <authenticatedGroup
-     id="zope.Authenticated"
-     title="Authenticated Users" />
-
-  <everybodyGroup
-     id="zope.Everybody"
-     title="All Users" />
-
-  <role id="zope.Anonymous" title="Everybody"
-        description="All users have this role implicitly" />
-  <grant permission="zope.View" role="zope.Anonymous" />
-
-  <role id="zope.Manager" title="Site Manager" />
-  <grantAll role="zope.Manager" />
-
-  <role id="zope.Member" title="Site Member" />
-  <role id="zope.ContentManager" title="Content Manager" />
-
-  <grant role="zope.Member" permission="zope.View" />
-  <grant role="zope.ContentManager" permission="zope.ManageContent" />
-  <grant role="zope.ContentManager" permission="zope.View" />
-  <grant role="zope.ContentManager" permission="loops.AssignAsParent" />
-
-  <principal
-     id="zope.manager"
-     title="Manager"
-     login="admin"
-     password="admin"
-     password_manager="Plain Text" />
-
-  <grant
-     role="zope.Manager"
-     principal="zope.manager" />
-
-</configure>
diff --git a/inst/bluebream.zcml b/loops/bluebream.zcml
similarity index 83%
rename from inst/bluebream.zcml
rename to loops/bluebream.zcml
index 210409f..3a4a23b 100644
--- a/inst/bluebream.zcml
+++ b/loops/bluebream.zcml
@@ -1,4 +1,6 @@
-<configure xmlns="http://namespaces.zope.org/zope">
+<configure 
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser">
 
   <include package="zope.component" file="meta.zcml" />
   <include package="zope.security" file="meta.zcml" />
@@ -52,13 +54,16 @@
   <include package="zope.catalog" />
   <include package="zope.dublincore.browser" />
 
-  <!-- enable the apidoc -->
-  <!-- enable this when apidoc works
-  <include zcml:condition="have devmode"
-           package="zope.app.apidoc" file="meta.zcml" />
-  <include zcml:condition="have devmode"
-           package="zope.app.apidoc" />
-  -->
+  <include package="zope.app.zcmlfiles" />
+  <include package="zope.app.i18n" />
+  <include package="zope.app.intid" />
+  <include package="zope.app.renderer" />
+  <include package="zope.app.session" />
+  <include package="zope.sendmail" file="meta.zcml" />
+
+  <browser:defaultView
+        for="zope.container.interfaces.IContainer"
+        name="index.html" />
 
 </configure>
 
diff --git a/inst/bluebream/notfound.pt b/loops/notfound.pt
similarity index 100%
rename from inst/bluebream/notfound.pt
rename to loops/notfound.pt
diff --git a/loops/overrides.zcml b/loops/overrides.zcml
new file mode 100644
index 0000000..fb8b793
--- /dev/null
+++ b/loops/overrides.zcml
@@ -0,0 +1,3 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+</configure>
diff --git a/loops/securitypolicy.zcml b/loops/securitypolicy.zcml
index 6fe8a2f..ef80d7a 100644
--- a/loops/securitypolicy.zcml
+++ b/loops/securitypolicy.zcml
@@ -1,31 +1,40 @@
-<!-- copy this file to the etc subdirectory of your Zope instance -->
-
-<!-- security policy settings -->
-
 <configure
-    xmlns="http://namespaces.zope.org/zope"
-    i18n_domain="zope">
+   xmlns="http://namespaces.zope.org/zope"
+   i18n_domain="main">
 
-  <include package="zope.app.securitypolicy" />
+  <!-- This file contains sample security policy definition -->
 
-  <securityPolicy
-    component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+  <securityPolicy 
+     component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+
+  <unauthenticatedPrincipal
+     id="zope.anybody"
+     title="Unauthenticated User" />
+
+  <unauthenticatedGroup
+     id="zope.Anybody"
+     title="Unauthenticated Users" />
+
+  <authenticatedGroup
+     id="zope.Authenticated"
+     title="Authenticated Users" />
+
+  <everybodyGroup
+     id="zope.Everybody"
+     title="All Users" />
 
   <role id="zope.Anonymous" title="Everybody"
         description="All users have this role implicitly" />
+  <grant permission="zope.View" role="zope.Anonymous" />
+
   <role id="zope.Manager" title="Site Manager" />
+  <grantAll role="zope.Manager" />
+
   <role id="zope.Member" title="Site Member" />
   <role id="zope.ContentManager" title="Content Manager" />
 
-  <grant role="zope.Anonymous" permission="zope.app.dublincore.view" />
   <grant role="zope.Member" permission="zope.View" />
-
   <grant role="zope.ContentManager" permission="zope.ManageContent" />
   <grant role="zope.ContentManager" permission="zope.View" />
 
-  <!-- loops-specific grant added in 2010-06 -->
-  <grant role="zope.ContentManager" permission="loops.AssignAsParent" />
-
-  <grantAll role="zope.Manager" />
-
 </configure>