diff --git a/product/ERP5Type/Tool/BaseTool.py b/product/ERP5Type/Tool/BaseTool.py
index dc914d8bfa353eef1efaabf7d60602c5680f798b..b879917de37e1270db8b4e520d0c76b7cc74cd80 100755
--- a/product/ERP5Type/Tool/BaseTool.py
+++ b/product/ERP5Type/Tool/BaseTool.py
@@ -30,7 +30,7 @@ from Products.CMFCore.utils import UniqueObject
 
 from AccessControl import ClassSecurityInfo
 from Globals import InitializeClass, DTMLFile
-from Products.ERP5Type.Document import Folder
+from Products.ERP5Type.Document.Folder import Folder
 from Products.ERP5Type import Permissions, _dtmldir
 
 from Products.ERP5 import _dtmldir
diff --git a/product/ERP5Type/Tool/ClassTool.py b/product/ERP5Type/Tool/ClassTool.py
index 3d9fed861b40656f1257b3f0665979ef7a995ff3..bde201f0a8afd4c26ef4c56bf7626661debfca01 100755
--- a/product/ERP5Type/Tool/ClassTool.py
+++ b/product/ERP5Type/Tool/ClassTool.py
@@ -34,7 +34,7 @@ from Globals import InitializeClass, DTMLFile
 from Products.ERP5Type import Permissions
 from Products.ERP5Type import _dtmldir
 from Products.ERP5Type.Tool.BaseTool import BaseTool
-from Products.ERP5Type.Document import Folder
+from Products.ERP5Type.Document.Folder import Folder
 
 from Products.ERP5Type.Utils import readLocalPropertySheet, writeLocalPropertySheet, getLocalPropertySheetList
 from Products.ERP5Type.Utils import readLocalExtension, writeLocalExtension, getLocalExtensionList