diff --git a/reporter/example/contact.py b/contact/__init__.py
similarity index 95%
rename from reporter/example/contact.py
rename to contact/__init__.py
index f535c75..861ff6e 100644
--- a/reporter/example/contact.py
+++ b/contact/__init__.py
@@ -26,7 +26,7 @@ $Id$
 from zope.component import adapts
 from zope.interface import implements
 from cybertools.reporter.interfaces import IResultSet
-from cybertools.reporter.example.interfaces import IContactsDataSource
+from cybertools.reporter.contact.interfaces import IContactsDataSource
 
 
 class Person(object):
diff --git a/reporter/example/__init__.py b/contact/browser/__init__.py
similarity index 100%
rename from reporter/example/__init__.py
rename to contact/browser/__init__.py
diff --git a/reporter/example/interfaces.py b/contact/interfaces.py
similarity index 85%
rename from reporter/example/interfaces.py
rename to contact/interfaces.py
index 8439afb..12f21d2 100644
--- a/reporter/example/interfaces.py
+++ b/contact/interfaces.py
@@ -18,14 +18,9 @@
 
 """
 Interfaces for a simple contact management framework to be used
-as an example for the cybertools.reporter package.
+as an example for some of the cybertools packages.
 
 $Id$
 """
 
 from zope.interface import Interface
-
-class IContactsDataSource(Interface):
-    """ A data source marker interface for contacts.
-    """
-
diff --git a/reporter/README.txt b/reporter/README.txt
index 6dac6cb..027f21f 100644
--- a/reporter/README.txt
+++ b/reporter/README.txt
@@ -16,8 +16,8 @@ A Basic API for Reports and Listings
 Let's start with the Person class from the example package - we will
 then provide a listing of persons...
 
-  >>> from cybertools.reporter.example.contact import Person, Contacts
-  >>> from cybertools.reporter.example.interfaces import IContactsDataSource
+  >>> from cybertools.contact import Person, Contacts
+  >>> from cybertools.reporter.contact.interfaces import IContactsDataSource
 
   >>> import time
   >>> format = '%Y-%m-%d'
diff --git a/reporter/contact/__init__.py b/reporter/contact/__init__.py
new file mode 100644
index 0000000..4bc90fb
--- /dev/null
+++ b/reporter/contact/__init__.py
@@ -0,0 +1,4 @@
+"""
+$Id$
+"""
+
diff --git a/reporter/contact/interfaces.py b/reporter/contact/interfaces.py
new file mode 100644
index 0000000..0e4fde5
--- /dev/null
+++ b/reporter/contact/interfaces.py
@@ -0,0 +1,31 @@
+#
+#  Copyright (c) 2006 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
+#
+
+"""
+Interfaces for an example for the cybertools.reporter package. This is
+based on the cybertools.contact package
+
+$Id$
+"""
+
+from zope.interface import Interface
+
+class IContactsDataSource(Interface):
+    """ A data source marker interface for a collection of contacts.
+    """
+