diff --git a/.gitignore b/.gitignore
index 7ff38ab..585d448 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 *.pyc
 *.pyo
-ajax/dojo/*
+*/ajax/dojo/dojo*
 build/
 dist/
 *.swp
diff --git a/cybertools/ajax/dojo/layout.py b/cybertools/ajax/dojo/layout.py
index d7266ec..7284bc8 100644
--- a/cybertools/ajax/dojo/layout.py
+++ b/cybertools/ajax/dojo/layout.py
@@ -1,28 +1,10 @@
-#
-#  Copyright (c) 2008 Helmut Merz - helmutm@cy55.de
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-"""
-Embed Dojo using the cybertools.composer.layout procedure.
+# cybertools.ajax.dojo.layout
 
-$Id$
+""" Embed Dojo using the cybertools.composer.layout procedure.
 """
 
-from cStringIO import StringIO
-from zope.app.pagetemplate import ViewPageTemplateFile
+from io import StringIO
+from zope.browserpage import ViewPageTemplateFile
 from zope.cachedescriptors.property import Lazy
 
 from cybertools.browser.renderer import RendererFactory