diff --git a/index/__init__.py b/index/__init__.py
deleted file mode 100644
index 38314f3..0000000
--- a/index/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""
-$Id$
-"""
diff --git a/index/tests.py b/index/tests.py
deleted file mode 100755
index b9e2484..0000000
--- a/index/tests.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /usr/bin/python
-
-"""
-Tests for the 'cybertools.index' package.
-
-$Id$
-"""
-
-import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
-
-from cybertools.index import multikey
-
-
-class Test(unittest.TestCase):
-    "Basic tests for the index package."
-
-    def testBasicStuff(self):
-        pass
-
-
-def test_suite():
-    flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
-    return unittest.TestSuite((
-                DocFileSuite('README.txt', optionflags=flags),
-                unittest.makeSuite(Test),
-            ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
diff --git a/index/multikey.py b/util/index.py
similarity index 100%
rename from index/multikey.py
rename to util/index.py
diff --git a/index/README.txt b/util/index.txt
similarity index 100%
rename from index/README.txt
rename to util/index.txt