diff --git a/integrator/bscw.py b/integrator/bscw.py
new file mode 100644
index 0000000..aad64f2
--- /dev/null
+++ b/integrator/bscw.py
@@ -0,0 +1,135 @@
+#
+#  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
+#
+
+"""
+Access to objects in a BSCW repository.
+
+$Id$
+"""
+
+import os
+from xmlrpclib import ServerProxy
+from zope import component
+from zope.app.file.image import getImageInfo
+from zope.cachedescriptors.property import Lazy
+from zope.contenttype import guess_content_type
+from zope.interface import implements, Attribute
+
+from cybertools.integrator.base import ContainerFactory, FileFactory
+from cybertools.integrator.base import ReadContainer, File, Image
+from cybertools.text import mimetypes
+
+
+# proxy classes
+
+class ReadContainer(ReadContainer):
+
+    factoryName = 'bscw'
+    data = None
+
+    @Lazy
+    def data(self):
+        data = self.server.get_attributes(self.address,
+                ['__class__', 'type', 'id', 'name', 'descr', 'url_link'], 1, True)
+        return dict((item['id'], item) for item in data[1])
+
+    def keys(self):
+        return self.data.keys()
+
+    def __iter__(self):
+        return iter(self.keys())
+
+    def __getitem__(self, key):
+        if key in self:
+            return self.get(key)
+        raise KeyError(key)
+
+    def get(self, key, default=None):
+        if key not in self.data:
+            return default
+        item = self.data[key]
+        if 'Folder' in item['__class__']:
+            return self.containerFactory(item['id'], server=self.server)
+        elif 'Document' in item['__class__']:
+            return self.fileFactory(item['id'], server=self.server,
+                                    type=item['type'])
+        else:
+            return OtherObject(item['id'], server=self.server)
+
+    def values(self):
+        return [self.get(k) for k in self]
+
+    def __len__(self):
+        return len(self.keys())
+
+    def items(self):
+        return [(k, self.get(k)) for k in self]
+
+    def __contains__(self, key):
+        return key in self.keys()
+
+
+class File(File):
+
+    contentType = None
+
+    def getData(self):
+        return self.server.get_document()
+    data = property(getData)
+
+    def getSize(self):
+        return os.stat(self.address)[stat.ST_SIZE]
+
+
+class Image(File):
+
+    width = height = 0
+
+    def getImageSize(self):
+        return self.width, self.height
+
+
+class OtherObject(File):
+
+    data = u''
+
+
+# factory classes
+
+class ContainerFactory(ContainerFactory):
+
+    proxyClass = ReadContainer
+
+    def __call__(self, address, **kw):
+        server = ServerProxy(address)
+        name = kw.pop('name', '')
+        return self.proxyClass(name, server=server, **kw)
+
+
+class FileFactory(FileFactory):
+
+    def __call__(self, address, **kw):
+        contentType = kw.pop('type', None)
+        width = height = 0
+        obj = File(address, contentType, **kw)
+        if contentType.startswith('image/'):
+            return Image(address, contentType=contentType,
+                         width=width, height=height, **kw)
+        else:
+            obj.contentType = contentType
+            return obj
diff --git a/integrator/testing/__init__.py b/integrator/testing/__init__.py
new file mode 100644
index 0000000..38314f3
--- /dev/null
+++ b/integrator/testing/__init__.py
@@ -0,0 +1,3 @@
+"""
+$Id$
+"""
diff --git a/integrator/testdata/index.html b/integrator/testing/data/index.html
similarity index 100%
rename from integrator/testdata/index.html
rename to integrator/testing/data/index.html
diff --git a/integrator/testdata/sub/demo.tgz b/integrator/testing/data/sub/demo.tgz
similarity index 100%
rename from integrator/testdata/sub/demo.tgz
rename to integrator/testing/data/sub/demo.tgz
diff --git a/integrator/testdata/sub/index.html b/integrator/testing/data/sub/index.html
similarity index 100%
rename from integrator/testdata/sub/index.html
rename to integrator/testing/data/sub/index.html
diff --git a/integrator/testdata/sub/loops_logo.png b/integrator/testing/data/sub/loops_logo.png
similarity index 100%
rename from integrator/testdata/sub/loops_logo.png
rename to integrator/testing/data/sub/loops_logo.png
diff --git a/integrator/tests.py b/integrator/tests.py
index 5b04189..f24ef84 100755
--- a/integrator/tests.py
+++ b/integrator/tests.py
@@ -7,7 +7,7 @@ from zope.interface.verify import verifyClass
 
 
 baseDir = os.path.dirname(__file__)
-testDir = os.path.join(baseDir, 'testdata')
+testDir = os.path.join(baseDir, 'testing', 'data')
 
 
 class Test(unittest.TestCase):