--- a/ztfy/utils/catalog/__init__.py	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy/utils/catalog/__init__.py	Sun May 22 22:37:32 2011 +0200
@@ -19,10 +19,10 @@
 
 # import Zope3 interfaces
 from zope.annotation.interfaces import IAnnotations
-from zope.app.catalog.interfaces import ICatalog
-from zope.app.container.interfaces import IContainer
 from zope.app.file.interfaces import IFile
-from zope.app.intid.interfaces import IIntIds
+from zope.catalog.interfaces import ICatalog
+from zope.container.interfaces import IContainer
+from zope.intid.interfaces import IIntIds
 
 # import local interfaces