--- a/MPIWGFolder.py	Thu Jun 06 14:00:31 2013 +0200
+++ b/MPIWGFolder.py	Thu Jun 06 15:34:20 2013 +0200
@@ -1,8 +1,8 @@
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 import logging
 from OFS.Folder import Folder
-from AccessControl import ClassSecurityInfo
-from MPIWGHelper import *
+
+import MPIWGHelper
 
 
 class MPIWGFolder(Folder):
@@ -16,8 +16,8 @@
         {'label':'Configure', 'action':'changeForm'},
         )
 
-    changeWeightForm = PageTemplateFile('zpt/MPIWGFolderChangeWeight', globals())
-    changeForm = PageTemplateFile('zpt/MPIWGFolderConfig', globals())
+    changeWeightForm = PageTemplateFile('zpt/folder/manage_change_weight', globals())
+    changeForm = PageTemplateFile('zpt/folder/manage_config', globals())
     changeWeightsForm = PageTemplateFile('zpt/folder/manage_change_weights', globals())
 
     def __init__(self, id, title=None, weight=0, canonicalName=None):
@@ -74,16 +74,16 @@
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
        
-    getBreadcrumbs = getBreadcrumbs
+    getBreadcrumbs = MPIWGHelper.getBreadcrumbs
     
-    getSection = getSection
+    getSection = MPIWGHelper.getSection
 
-    getSubSection = getSubSection
+    getSubSection = MPIWGHelper.getSubSection
     
 
 def manage_addMPIWGFolderForm(self):
     """Form for adding"""
-    pt = PageTemplateFile('zpt/AddMPIWGFolder', globals()).__of__(self)
+    pt = PageTemplateFile('zpt/folder/manage_add_MPIWGFolder', globals()).__of__(self)
     return pt()
 
 def manage_addMPIWGFolder(self, id, title=None, weight=0, RESPONSE=None):