diff --git a/.gitignore b/.gitignore
index 41ef9e2..7ff38ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 ajax/dojo/*
 build/
 dist/
+*.swp
 *.egg-info
 *.project
 *.pydevproject
diff --git a/__init__.py b/cybertools/__init__.py
similarity index 100%
rename from __init__.py
rename to cybertools/__init__.py
diff --git a/ajax/__init__.py b/cybertools/ajax/__init__.py
similarity index 100%
rename from ajax/__init__.py
rename to cybertools/ajax/__init__.py
diff --git a/ajax/configure-jocy.zcml b/cybertools/ajax/configure-jocy.zcml
similarity index 100%
rename from ajax/configure-jocy.zcml
rename to cybertools/ajax/configure-jocy.zcml
diff --git a/ajax/dojo/__init__.py b/cybertools/ajax/dojo/__init__.py
similarity index 100%
rename from ajax/dojo/__init__.py
rename to cybertools/ajax/dojo/__init__.py
diff --git a/ajax/dojo/configure-z2.zcml b/cybertools/ajax/dojo/configure-z2.zcml
similarity index 100%
rename from ajax/dojo/configure-z2.zcml
rename to cybertools/ajax/dojo/configure-z2.zcml
diff --git a/ajax/dojo/configure.zcml b/cybertools/ajax/dojo/configure.zcml
similarity index 100%
rename from ajax/dojo/configure.zcml
rename to cybertools/ajax/dojo/configure.zcml
diff --git a/ajax/dojo/layout.py b/cybertools/ajax/dojo/layout.py
similarity index 100%
rename from ajax/dojo/layout.py
rename to cybertools/ajax/dojo/layout.py
diff --git a/ajax/dojo/macros.pt b/cybertools/ajax/dojo/macros.pt
similarity index 100%
rename from ajax/dojo/macros.pt
rename to cybertools/ajax/dojo/macros.pt
diff --git a/ajax/dojo/z2traversal.py b/cybertools/ajax/dojo/z2traversal.py
similarity index 100%
rename from ajax/dojo/z2traversal.py
rename to cybertools/ajax/dojo/z2traversal.py
diff --git a/ajax/fckeditor/__init__.py b/cybertools/ajax/fckeditor/__init__.py
similarity index 100%
rename from ajax/fckeditor/__init__.py
rename to cybertools/ajax/fckeditor/__init__.py
diff --git a/ajax/fckeditor/configure.zcml b/cybertools/ajax/fckeditor/configure.zcml
similarity index 100%
rename from ajax/fckeditor/configure.zcml
rename to cybertools/ajax/fckeditor/configure.zcml
diff --git a/ajax/fckeditor/fckconfig.js b/cybertools/ajax/fckeditor/fckconfig.js
similarity index 100%
rename from ajax/fckeditor/fckconfig.js
rename to cybertools/ajax/fckeditor/fckconfig.js
diff --git a/ajax/innerHtml.pt b/cybertools/ajax/innerHtml.pt
similarity index 100%
rename from ajax/innerHtml.pt
rename to cybertools/ajax/innerHtml.pt
diff --git a/ajax/jocy/data.js b/cybertools/ajax/jocy/data.js
similarity index 100%
rename from ajax/jocy/data.js
rename to cybertools/ajax/jocy/data.js
diff --git a/ajax/jocy/talk.js b/cybertools/ajax/jocy/talk.js
similarity index 100%
rename from ajax/jocy/talk.js
rename to cybertools/ajax/jocy/talk.js
diff --git a/brain/README.txt b/cybertools/brain/README.txt
similarity index 100%
rename from brain/README.txt
rename to cybertools/brain/README.txt
diff --git a/brain/__init__.py b/cybertools/brain/__init__.py
similarity index 100%
rename from brain/__init__.py
rename to cybertools/brain/__init__.py
diff --git a/brain/interfaces.py b/cybertools/brain/interfaces.py
similarity index 100%
rename from brain/interfaces.py
rename to cybertools/brain/interfaces.py
diff --git a/brain/neuron.py b/cybertools/brain/neuron.py
similarity index 100%
rename from brain/neuron.py
rename to cybertools/brain/neuron.py
diff --git a/brain/session.py b/cybertools/brain/session.py
similarity index 100%
rename from brain/session.py
rename to cybertools/brain/session.py
diff --git a/brain/state.py b/cybertools/brain/state.py
similarity index 100%
rename from brain/state.py
rename to cybertools/brain/state.py
diff --git a/brain/tests.py b/cybertools/brain/tests.py
similarity index 100%
rename from brain/tests.py
rename to cybertools/brain/tests.py
diff --git a/browser/README.txt b/cybertools/browser/README.txt
similarity index 100%
rename from browser/README.txt
rename to cybertools/browser/README.txt
diff --git a/browser/__init__.py b/cybertools/browser/__init__.py
similarity index 100%
rename from browser/__init__.py
rename to cybertools/browser/__init__.py
diff --git a/browser/action.py b/cybertools/browser/action.py
similarity index 100%
rename from browser/action.py
rename to cybertools/browser/action.py
diff --git a/browser/action_macros.pt b/cybertools/browser/action_macros.pt
similarity index 100%
rename from browser/action_macros.pt
rename to cybertools/browser/action_macros.pt
diff --git a/browser/base_macros.pt b/cybertools/browser/base_macros.pt
similarity index 100%
rename from browser/base_macros.pt
rename to cybertools/browser/base_macros.pt
diff --git a/browser/blue/__init__.py b/cybertools/browser/blue/__init__.py
similarity index 100%
rename from browser/blue/__init__.py
rename to cybertools/browser/blue/__init__.py
diff --git a/browser/blue/blue8.css b/cybertools/browser/blue/blue8.css
similarity index 100%
rename from browser/blue/blue8.css
rename to cybertools/browser/blue/blue8.css
diff --git a/browser/blue/blueprint/plugins/buttons/icons/cross.png b/cybertools/browser/blue/blueprint/plugins/buttons/icons/cross.png
similarity index 100%
rename from browser/blue/blueprint/plugins/buttons/icons/cross.png
rename to cybertools/browser/blue/blueprint/plugins/buttons/icons/cross.png
diff --git a/browser/blue/blueprint/plugins/buttons/icons/key.png b/cybertools/browser/blue/blueprint/plugins/buttons/icons/key.png
similarity index 100%
rename from browser/blue/blueprint/plugins/buttons/icons/key.png
rename to cybertools/browser/blue/blueprint/plugins/buttons/icons/key.png
diff --git a/browser/blue/blueprint/plugins/buttons/icons/tick.png b/cybertools/browser/blue/blueprint/plugins/buttons/icons/tick.png
similarity index 100%
rename from browser/blue/blueprint/plugins/buttons/icons/tick.png
rename to cybertools/browser/blue/blueprint/plugins/buttons/icons/tick.png
diff --git a/browser/blue/blueprint/plugins/buttons/readme.txt b/cybertools/browser/blue/blueprint/plugins/buttons/readme.txt
similarity index 100%
rename from browser/blue/blueprint/plugins/buttons/readme.txt
rename to cybertools/browser/blue/blueprint/plugins/buttons/readme.txt
diff --git a/browser/blue/blueprint/plugins/buttons/screen.css b/cybertools/browser/blue/blueprint/plugins/buttons/screen.css
similarity index 100%
rename from browser/blue/blueprint/plugins/buttons/screen.css
rename to cybertools/browser/blue/blueprint/plugins/buttons/screen.css
diff --git a/browser/blue/blueprint/plugins/fancy-type/readme.txt b/cybertools/browser/blue/blueprint/plugins/fancy-type/readme.txt
similarity index 100%
rename from browser/blue/blueprint/plugins/fancy-type/readme.txt
rename to cybertools/browser/blue/blueprint/plugins/fancy-type/readme.txt
diff --git a/browser/blue/blueprint/plugins/fancy-type/screen.css b/cybertools/browser/blue/blueprint/plugins/fancy-type/screen.css
similarity index 100%
rename from browser/blue/blueprint/plugins/fancy-type/screen.css
rename to cybertools/browser/blue/blueprint/plugins/fancy-type/screen.css
diff --git a/browser/blue/blueprint/plugins/link-icons/icons/doc.png b/cybertools/browser/blue/blueprint/plugins/link-icons/icons/doc.png
similarity index 100%
rename from browser/blue/blueprint/plugins/link-icons/icons/doc.png
rename to cybertools/browser/blue/blueprint/plugins/link-icons/icons/doc.png
diff --git a/browser/blue/blueprint/plugins/link-icons/icons/email.png b/cybertools/browser/blue/blueprint/plugins/link-icons/icons/email.png
similarity index 100%
rename from browser/blue/blueprint/plugins/link-icons/icons/email.png
rename to cybertools/browser/blue/blueprint/plugins/link-icons/icons/email.png
diff --git a/browser/blue/blueprint/plugins/link-icons/icons/external.png b/cybertools/browser/blue/blueprint/plugins/link-icons/icons/external.png
similarity index 100%
rename from browser/blue/blueprint/plugins/link-icons/icons/external.png
rename to cybertools/browser/blue/blueprint/plugins/link-icons/icons/external.png
diff --git a/browser/blue/blueprint/plugins/link-icons/icons/feed.png b/cybertools/browser/blue/blueprint/plugins/link-icons/icons/feed.png
similarity index 100%
rename from browser/blue/blueprint/plugins/link-icons/icons/feed.png
rename to cybertools/browser/blue/blueprint/plugins/link-icons/icons/feed.png
diff --git a/browser/blue/blueprint/plugins/link-icons/icons/im.png b/cybertools/browser/blue/blueprint/plugins/link-icons/icons/im.png
similarity index 100%
rename from browser/blue/blueprint/plugins/link-icons/icons/im.png
rename to cybertools/browser/blue/blueprint/plugins/link-icons/icons/im.png
diff --git a/browser/blue/blueprint/plugins/link-icons/icons/pdf.png b/cybertools/browser/blue/blueprint/plugins/link-icons/icons/pdf.png
similarity index 100%
rename from browser/blue/blueprint/plugins/link-icons/icons/pdf.png
rename to cybertools/browser/blue/blueprint/plugins/link-icons/icons/pdf.png
diff --git a/browser/blue/blueprint/plugins/link-icons/icons/visited.png b/cybertools/browser/blue/blueprint/plugins/link-icons/icons/visited.png
similarity index 100%
rename from browser/blue/blueprint/plugins/link-icons/icons/visited.png
rename to cybertools/browser/blue/blueprint/plugins/link-icons/icons/visited.png
diff --git a/browser/blue/blueprint/plugins/link-icons/icons/xls.png b/cybertools/browser/blue/blueprint/plugins/link-icons/icons/xls.png
similarity index 100%
rename from browser/blue/blueprint/plugins/link-icons/icons/xls.png
rename to cybertools/browser/blue/blueprint/plugins/link-icons/icons/xls.png
diff --git a/browser/blue/blueprint/plugins/link-icons/readme.txt b/cybertools/browser/blue/blueprint/plugins/link-icons/readme.txt
similarity index 100%
rename from browser/blue/blueprint/plugins/link-icons/readme.txt
rename to cybertools/browser/blue/blueprint/plugins/link-icons/readme.txt
diff --git a/browser/blue/blueprint/plugins/link-icons/screen.css b/cybertools/browser/blue/blueprint/plugins/link-icons/screen.css
similarity index 100%
rename from browser/blue/blueprint/plugins/link-icons/screen.css
rename to cybertools/browser/blue/blueprint/plugins/link-icons/screen.css
diff --git a/browser/blue/blueprint/plugins/rtl/readme.txt b/cybertools/browser/blue/blueprint/plugins/rtl/readme.txt
similarity index 100%
rename from browser/blue/blueprint/plugins/rtl/readme.txt
rename to cybertools/browser/blue/blueprint/plugins/rtl/readme.txt
diff --git a/browser/blue/blueprint/plugins/rtl/screen.css b/cybertools/browser/blue/blueprint/plugins/rtl/screen.css
similarity index 100%
rename from browser/blue/blueprint/plugins/rtl/screen.css
rename to cybertools/browser/blue/blueprint/plugins/rtl/screen.css
diff --git a/browser/blue/blueprint/print.css b/cybertools/browser/blue/blueprint/print.css
similarity index 100%
rename from browser/blue/blueprint/print.css
rename to cybertools/browser/blue/blueprint/print.css
diff --git a/browser/blue/blueprint/screen.css b/cybertools/browser/blue/blueprint/screen.css
similarity index 100%
rename from browser/blue/blueprint/screen.css
rename to cybertools/browser/blue/blueprint/screen.css
diff --git a/browser/blue/blueprint/src/forms.css b/cybertools/browser/blue/blueprint/src/forms.css
similarity index 100%
rename from browser/blue/blueprint/src/forms.css
rename to cybertools/browser/blue/blueprint/src/forms.css
diff --git a/browser/blue/blueprint/src/grid.css b/cybertools/browser/blue/blueprint/src/grid.css
similarity index 100%
rename from browser/blue/blueprint/src/grid.css
rename to cybertools/browser/blue/blueprint/src/grid.css
diff --git a/browser/blue/blueprint/src/grid.png b/cybertools/browser/blue/blueprint/src/grid.png
similarity index 100%
rename from browser/blue/blueprint/src/grid.png
rename to cybertools/browser/blue/blueprint/src/grid.png
diff --git a/browser/blue/blueprint/src/ie.css b/cybertools/browser/blue/blueprint/src/ie.css
similarity index 100%
rename from browser/blue/blueprint/src/ie.css
rename to cybertools/browser/blue/blueprint/src/ie.css
diff --git a/browser/blue/blueprint/src/print.css b/cybertools/browser/blue/blueprint/src/print.css
similarity index 100%
rename from browser/blue/blueprint/src/print.css
rename to cybertools/browser/blue/blueprint/src/print.css
diff --git a/browser/blue/blueprint/src/reset.css b/cybertools/browser/blue/blueprint/src/reset.css
similarity index 100%
rename from browser/blue/blueprint/src/reset.css
rename to cybertools/browser/blue/blueprint/src/reset.css
diff --git a/browser/blue/blueprint/src/typography.css b/cybertools/browser/blue/blueprint/src/typography.css
similarity index 100%
rename from browser/blue/blueprint/src/typography.css
rename to cybertools/browser/blue/blueprint/src/typography.css
diff --git a/browser/blue/body.pt b/cybertools/browser/blue/body.pt
similarity index 100%
rename from browser/blue/body.pt
rename to cybertools/browser/blue/body.pt
diff --git a/browser/blue/browser.py b/cybertools/browser/blue/browser.py
similarity index 100%
rename from browser/blue/browser.py
rename to cybertools/browser/blue/browser.py
diff --git a/browser/blue/configure.zcml b/cybertools/browser/blue/configure.zcml
similarity index 100%
rename from browser/blue/configure.zcml
rename to cybertools/browser/blue/configure.zcml
diff --git a/browser/blue/controller.py b/cybertools/browser/blue/controller.py
similarity index 100%
rename from browser/blue/controller.py
rename to cybertools/browser/blue/controller.py
diff --git a/browser/blue/custom.css b/cybertools/browser/blue/custom.css
similarity index 100%
rename from browser/blue/custom.css
rename to cybertools/browser/blue/custom.css
diff --git a/browser/blue/grid8.png b/cybertools/browser/blue/grid8.png
similarity index 100%
rename from browser/blue/grid8.png
rename to cybertools/browser/blue/grid8.png
diff --git a/browser/blue/ie.css b/cybertools/browser/blue/ie.css
similarity index 100%
rename from browser/blue/ie.css
rename to cybertools/browser/blue/ie.css
diff --git a/browser/configurator.py b/cybertools/browser/configurator.py
similarity index 100%
rename from browser/configurator.py
rename to cybertools/browser/configurator.py
diff --git a/browser/configure-errorviews.zcml b/cybertools/browser/configure-errorviews.zcml
similarity index 100%
rename from browser/configure-errorviews.zcml
rename to cybertools/browser/configure-errorviews.zcml
diff --git a/browser/configure.zcml b/cybertools/browser/configure.zcml
similarity index 100%
rename from browser/configure.zcml
rename to cybertools/browser/configure.zcml
diff --git a/browser/controller.py b/cybertools/browser/controller.py
similarity index 100%
rename from browser/controller.py
rename to cybertools/browser/controller.py
diff --git a/browser/form.py b/cybertools/browser/form.py
similarity index 100%
rename from browser/form.py
rename to cybertools/browser/form.py
diff --git a/browser/ftests.py b/cybertools/browser/ftests.py
similarity index 100%
rename from browser/ftests.py
rename to cybertools/browser/ftests.py
diff --git a/browser/icons/application_edit.png b/cybertools/browser/icons/application_edit.png
similarity index 100%
rename from browser/icons/application_edit.png
rename to cybertools/browser/icons/application_edit.png
diff --git a/browser/icons/arrow_left.png b/cybertools/browser/icons/arrow_left.png
similarity index 100%
rename from browser/icons/arrow_left.png
rename to cybertools/browser/icons/arrow_left.png
diff --git a/browser/icons/arrow_right.png b/cybertools/browser/icons/arrow_right.png
similarity index 100%
rename from browser/icons/arrow_right.png
rename to cybertools/browser/icons/arrow_right.png
diff --git a/browser/icons/arrow_up.png b/cybertools/browser/icons/arrow_up.png
similarity index 100%
rename from browser/icons/arrow_up.png
rename to cybertools/browser/icons/arrow_up.png
diff --git a/browser/icons/arrowdown.gif b/cybertools/browser/icons/arrowdown.gif
similarity index 100%
rename from browser/icons/arrowdown.gif
rename to cybertools/browser/icons/arrowdown.gif
diff --git a/browser/icons/arrowup.gif b/cybertools/browser/icons/arrowup.gif
similarity index 100%
rename from browser/icons/arrowup.gif
rename to cybertools/browser/icons/arrowup.gif
diff --git a/browser/icons/book_next.png b/cybertools/browser/icons/book_next.png
similarity index 100%
rename from browser/icons/book_next.png
rename to cybertools/browser/icons/book_next.png
diff --git a/browser/icons/book_previous.png b/cybertools/browser/icons/book_previous.png
similarity index 100%
rename from browser/icons/book_previous.png
rename to cybertools/browser/icons/book_previous.png
diff --git a/browser/icons/cancel.png b/cybertools/browser/icons/cancel.png
similarity index 100%
rename from browser/icons/cancel.png
rename to cybertools/browser/icons/cancel.png
diff --git a/browser/icons/delete.png b/cybertools/browser/icons/delete.png
similarity index 100%
rename from browser/icons/delete.png
rename to cybertools/browser/icons/delete.png
diff --git a/browser/icons/dialog-information.png b/cybertools/browser/icons/dialog-information.png
similarity index 100%
rename from browser/icons/dialog-information.png
rename to cybertools/browser/icons/dialog-information.png
diff --git a/browser/icons/dialog-warning.png b/cybertools/browser/icons/dialog-warning.png
similarity index 100%
rename from browser/icons/dialog-warning.png
rename to cybertools/browser/icons/dialog-warning.png
diff --git a/browser/icons/email.png b/cybertools/browser/icons/email.png
similarity index 100%
rename from browser/icons/email.png
rename to cybertools/browser/icons/email.png
diff --git a/browser/icons/email_edit.png b/cybertools/browser/icons/email_edit.png
similarity index 100%
rename from browser/icons/email_edit.png
rename to cybertools/browser/icons/email_edit.png
diff --git a/browser/icons/favorite.png b/cybertools/browser/icons/favorite.png
similarity index 100%
rename from browser/icons/favorite.png
rename to cybertools/browser/icons/favorite.png
diff --git a/browser/icons/file-excel.png b/cybertools/browser/icons/file-excel.png
similarity index 100%
rename from browser/icons/file-excel.png
rename to cybertools/browser/icons/file-excel.png
diff --git a/browser/icons/file-pdf.png b/cybertools/browser/icons/file-pdf.png
similarity index 100%
rename from browser/icons/file-pdf.png
rename to cybertools/browser/icons/file-pdf.png
diff --git a/browser/icons/file-word.png b/cybertools/browser/icons/file-word.png
similarity index 100%
rename from browser/icons/file-word.png
rename to cybertools/browser/icons/file-word.png
diff --git a/browser/icons/group.png b/cybertools/browser/icons/group.png
similarity index 100%
rename from browser/icons/group.png
rename to cybertools/browser/icons/group.png
diff --git a/browser/icons/info.png b/cybertools/browser/icons/info.png
similarity index 100%
rename from browser/icons/info.png
rename to cybertools/browser/icons/info.png
diff --git a/browser/icons/ledblue.png b/cybertools/browser/icons/ledblue.png
similarity index 100%
rename from browser/icons/ledblue.png
rename to cybertools/browser/icons/ledblue.png
diff --git a/browser/icons/ledgreen.png b/cybertools/browser/icons/ledgreen.png
similarity index 100%
rename from browser/icons/ledgreen.png
rename to cybertools/browser/icons/ledgreen.png
diff --git a/browser/icons/ledgreenblue.png b/cybertools/browser/icons/ledgreenblue.png
similarity index 100%
rename from browser/icons/ledgreenblue.png
rename to cybertools/browser/icons/ledgreenblue.png
diff --git a/browser/icons/ledgrey.png b/cybertools/browser/icons/ledgrey.png
similarity index 100%
rename from browser/icons/ledgrey.png
rename to cybertools/browser/icons/ledgrey.png
diff --git a/browser/icons/ledlightblue.png b/cybertools/browser/icons/ledlightblue.png
similarity index 100%
rename from browser/icons/ledlightblue.png
rename to cybertools/browser/icons/ledlightblue.png
diff --git a/browser/icons/ledlightgreen.png b/cybertools/browser/icons/ledlightgreen.png
similarity index 100%
rename from browser/icons/ledlightgreen.png
rename to cybertools/browser/icons/ledlightgreen.png
diff --git a/browser/icons/ledorange.png b/cybertools/browser/icons/ledorange.png
similarity index 100%
rename from browser/icons/ledorange.png
rename to cybertools/browser/icons/ledorange.png
diff --git a/browser/icons/ledpurple.png b/cybertools/browser/icons/ledpurple.png
similarity index 100%
rename from browser/icons/ledpurple.png
rename to cybertools/browser/icons/ledpurple.png
diff --git a/browser/icons/ledred.png b/cybertools/browser/icons/ledred.png
similarity index 100%
rename from browser/icons/ledred.png
rename to cybertools/browser/icons/ledred.png
diff --git a/browser/icons/ledx.png b/cybertools/browser/icons/ledx.png
similarity index 100%
rename from browser/icons/ledx.png
rename to cybertools/browser/icons/ledx.png
diff --git a/browser/icons/ledyellow.png b/cybertools/browser/icons/ledyellow.png
similarity index 100%
rename from browser/icons/ledyellow.png
rename to cybertools/browser/icons/ledyellow.png
diff --git a/browser/icons/loading.gif b/cybertools/browser/icons/loading.gif
similarity index 100%
rename from browser/icons/loading.gif
rename to cybertools/browser/icons/loading.gif
diff --git a/browser/icons/magnifier.png b/cybertools/browser/icons/magnifier.png
similarity index 100%
rename from browser/icons/magnifier.png
rename to cybertools/browser/icons/magnifier.png
diff --git a/browser/icons/minus.gif b/cybertools/browser/icons/minus.gif
similarity index 100%
rename from browser/icons/minus.gif
rename to cybertools/browser/icons/minus.gif
diff --git a/browser/icons/page_copy.png b/cybertools/browser/icons/page_copy.png
similarity index 100%
rename from browser/icons/page_copy.png
rename to cybertools/browser/icons/page_copy.png
diff --git a/browser/icons/page_delete.png b/cybertools/browser/icons/page_delete.png
similarity index 100%
rename from browser/icons/page_delete.png
rename to cybertools/browser/icons/page_delete.png
diff --git a/browser/icons/page_edit.png b/cybertools/browser/icons/page_edit.png
similarity index 100%
rename from browser/icons/page_edit.png
rename to cybertools/browser/icons/page_edit.png
diff --git a/browser/icons/plus.gif b/cybertools/browser/icons/plus.gif
similarity index 100%
rename from browser/icons/plus.gif
rename to cybertools/browser/icons/plus.gif
diff --git a/browser/icons/printer.png b/cybertools/browser/icons/printer.png
similarity index 100%
rename from browser/icons/printer.png
rename to cybertools/browser/icons/printer.png
diff --git a/browser/icons/report_edit.png b/cybertools/browser/icons/report_edit.png
similarity index 100%
rename from browser/icons/report_edit.png
rename to cybertools/browser/icons/report_edit.png
diff --git a/browser/icons/table.png b/cybertools/browser/icons/table.png
similarity index 100%
rename from browser/icons/table.png
rename to cybertools/browser/icons/table.png
diff --git a/browser/icons/tick.png b/cybertools/browser/icons/tick.png
similarity index 100%
rename from browser/icons/tick.png
rename to cybertools/browser/icons/tick.png
diff --git a/browser/icons/time.png b/cybertools/browser/icons/time.png
similarity index 100%
rename from browser/icons/time.png
rename to cybertools/browser/icons/time.png
diff --git a/browser/icons/time_go.png b/cybertools/browser/icons/time_go.png
similarity index 100%
rename from browser/icons/time_go.png
rename to cybertools/browser/icons/time_go.png
diff --git a/browser/icons/user.png b/cybertools/browser/icons/user.png
similarity index 100%
rename from browser/icons/user.png
rename to cybertools/browser/icons/user.png
diff --git a/browser/icons/vcard_edit.png b/cybertools/browser/icons/vcard_edit.png
similarity index 100%
rename from browser/icons/vcard_edit.png
rename to cybertools/browser/icons/vcard_edit.png
diff --git a/browser/interfaces.py b/cybertools/browser/interfaces.py
similarity index 100%
rename from browser/interfaces.py
rename to cybertools/browser/interfaces.py
diff --git a/browser/liquid/README.txt b/cybertools/browser/liquid/README.txt
similarity index 100%
rename from browser/liquid/README.txt
rename to cybertools/browser/liquid/README.txt
diff --git a/browser/liquid/__init__.py b/cybertools/browser/liquid/__init__.py
similarity index 100%
rename from browser/liquid/__init__.py
rename to cybertools/browser/liquid/__init__.py
diff --git a/browser/liquid/base.css b/cybertools/browser/liquid/base.css
similarity index 100%
rename from browser/liquid/base.css
rename to cybertools/browser/liquid/base.css
diff --git a/browser/liquid/body.pt b/cybertools/browser/liquid/body.pt
similarity index 100%
rename from browser/liquid/body.pt
rename to cybertools/browser/liquid/body.pt
diff --git a/browser/liquid/configure.zcml b/cybertools/browser/liquid/configure.zcml
similarity index 100%
rename from browser/liquid/configure.zcml
rename to cybertools/browser/liquid/configure.zcml
diff --git a/browser/liquid/controller.py b/cybertools/browser/liquid/controller.py
similarity index 100%
rename from browser/liquid/controller.py
rename to cybertools/browser/liquid/controller.py
diff --git a/browser/liquid/custom.css b/cybertools/browser/liquid/custom.css
similarity index 100%
rename from browser/liquid/custom.css
rename to cybertools/browser/liquid/custom.css
diff --git a/browser/liquid/popup.css b/cybertools/browser/liquid/popup.css
similarity index 100%
rename from browser/liquid/popup.css
rename to cybertools/browser/liquid/popup.css
diff --git a/browser/liquid/popup.pt b/cybertools/browser/liquid/popup.pt
similarity index 100%
rename from browser/liquid/popup.pt
rename to cybertools/browser/liquid/popup.pt
diff --git a/browser/liquid/presentation.css b/cybertools/browser/liquid/presentation.css
similarity index 100%
rename from browser/liquid/presentation.css
rename to cybertools/browser/liquid/presentation.css
diff --git a/browser/liquid/print.css b/cybertools/browser/liquid/print.css
similarity index 100%
rename from browser/liquid/print.css
rename to cybertools/browser/liquid/print.css
diff --git a/browser/liquid/view_macros.pt b/cybertools/browser/liquid/view_macros.pt
similarity index 100%
rename from browser/liquid/view_macros.pt
rename to cybertools/browser/liquid/view_macros.pt
diff --git a/browser/liquid/zope3_tablelayout.css b/cybertools/browser/liquid/zope3_tablelayout.css
similarity index 100%
rename from browser/liquid/zope3_tablelayout.css
rename to cybertools/browser/liquid/zope3_tablelayout.css
diff --git a/browser/loops/__init__.py b/cybertools/browser/loops/__init__.py
similarity index 100%
rename from browser/loops/__init__.py
rename to cybertools/browser/loops/__init__.py
diff --git a/browser/loops/auth.py b/cybertools/browser/loops/auth.py
similarity index 100%
rename from browser/loops/auth.py
rename to cybertools/browser/loops/auth.py
diff --git a/browser/loops/configure.zcml b/cybertools/browser/loops/configure.zcml
similarity index 100%
rename from browser/loops/configure.zcml
rename to cybertools/browser/loops/configure.zcml
diff --git a/browser/loops/loginform.pt b/cybertools/browser/loops/loginform.pt
similarity index 100%
rename from browser/loops/loginform.pt
rename to cybertools/browser/loops/loginform.pt
diff --git a/browser/loops/loops_favicon.png b/cybertools/browser/loops/loops_favicon.png
similarity index 100%
rename from browser/loops/loops_favicon.png
rename to cybertools/browser/loops/loops_favicon.png
diff --git a/browser/loops/loops_layout.css b/cybertools/browser/loops/loops_layout.css
similarity index 100%
rename from browser/loops/loops_layout.css
rename to cybertools/browser/loops/loops_layout.css
diff --git a/browser/loops/loops_logo.png b/cybertools/browser/loops/loops_logo.png
similarity index 100%
rename from browser/loops/loops_logo.png
rename to cybertools/browser/loops/loops_logo.png
diff --git a/browser/loops/loops_management_layout.css b/cybertools/browser/loops/loops_management_layout.css
similarity index 100%
rename from browser/loops/loops_management_layout.css
rename to cybertools/browser/loops/loops_management_layout.css
diff --git a/browser/loops/menu.py b/cybertools/browser/loops/menu.py
similarity index 100%
rename from browser/loops/menu.py
rename to cybertools/browser/loops/menu.py
diff --git a/browser/macro.py b/cybertools/browser/macro.py
similarity index 100%
rename from browser/macro.py
rename to cybertools/browser/macro.py
diff --git a/browser/main.pt b/cybertools/browser/main.pt
similarity index 100%
rename from browser/main.pt
rename to cybertools/browser/main.pt
diff --git a/browser/member.py b/cybertools/browser/member.py
similarity index 100%
rename from browser/member.py
rename to cybertools/browser/member.py
diff --git a/browser/mojo/__init__.py b/cybertools/browser/mojo/__init__.py
similarity index 100%
rename from browser/mojo/__init__.py
rename to cybertools/browser/mojo/__init__.py
diff --git a/browser/mojo/base.css b/cybertools/browser/mojo/base.css
similarity index 100%
rename from browser/mojo/base.css
rename to cybertools/browser/mojo/base.css
diff --git a/browser/mojo/body.pt b/cybertools/browser/mojo/body.pt
similarity index 100%
rename from browser/mojo/body.pt
rename to cybertools/browser/mojo/body.pt
diff --git a/browser/mojo/browser.py b/cybertools/browser/mojo/browser.py
similarity index 100%
rename from browser/mojo/browser.py
rename to cybertools/browser/mojo/browser.py
diff --git a/browser/mojo/configure.zcml b/cybertools/browser/mojo/configure.zcml
similarity index 100%
rename from browser/mojo/configure.zcml
rename to cybertools/browser/mojo/configure.zcml
diff --git a/browser/mojo/controller.py b/cybertools/browser/mojo/controller.py
similarity index 100%
rename from browser/mojo/controller.py
rename to cybertools/browser/mojo/controller.py
diff --git a/browser/mojo/custom.css b/cybertools/browser/mojo/custom.css
similarity index 100%
rename from browser/mojo/custom.css
rename to cybertools/browser/mojo/custom.css
diff --git a/browser/mojo/print.css b/cybertools/browser/mojo/print.css
similarity index 100%
rename from browser/mojo/print.css
rename to cybertools/browser/mojo/print.css
diff --git a/browser/notfound.pt b/cybertools/browser/notfound.pt
similarity index 100%
rename from browser/notfound.pt
rename to cybertools/browser/notfound.pt
diff --git a/browser/renderer.pt b/cybertools/browser/renderer.pt
similarity index 100%
rename from browser/renderer.pt
rename to cybertools/browser/renderer.pt
diff --git a/browser/renderer.py b/cybertools/browser/renderer.py
similarity index 100%
rename from browser/renderer.py
rename to cybertools/browser/renderer.py
diff --git a/browser/systemerror.pt b/cybertools/browser/systemerror.pt
similarity index 100%
rename from browser/systemerror.pt
rename to cybertools/browser/systemerror.pt
diff --git a/browser/tests.py b/cybertools/browser/tests.py
similarity index 100%
rename from browser/tests.py
rename to cybertools/browser/tests.py
diff --git a/browser/url.py b/cybertools/browser/url.py
similarity index 100%
rename from browser/url.py
rename to cybertools/browser/url.py
diff --git a/browser/url.txt b/cybertools/browser/url.txt
similarity index 100%
rename from browser/url.txt
rename to cybertools/browser/url.txt
diff --git a/browser/view.py b/cybertools/browser/view.py
similarity index 100%
rename from browser/view.py
rename to cybertools/browser/view.py
diff --git a/browser/widget.py b/cybertools/browser/widget.py
similarity index 100%
rename from browser/widget.py
rename to cybertools/browser/widget.py
diff --git a/catalog/README.txt b/cybertools/catalog/README.txt
similarity index 100%
rename from catalog/README.txt
rename to cybertools/catalog/README.txt
diff --git a/catalog/__init__.py b/cybertools/catalog/__init__.py
similarity index 100%
rename from catalog/__init__.py
rename to cybertools/catalog/__init__.py
diff --git a/catalog/configure.zcml b/cybertools/catalog/configure.zcml
similarity index 100%
rename from catalog/configure.zcml
rename to cybertools/catalog/configure.zcml
diff --git a/catalog/keyword.py b/cybertools/catalog/keyword.py
similarity index 100%
rename from catalog/keyword.py
rename to cybertools/catalog/keyword.py
diff --git a/catalog/query.py b/cybertools/catalog/query.py
similarity index 100%
rename from catalog/query.py
rename to cybertools/catalog/query.py
diff --git a/catalog/tests.py b/cybertools/catalog/tests.py
similarity index 100%
rename from catalog/tests.py
rename to cybertools/catalog/tests.py
diff --git a/commerce/README.txt b/cybertools/commerce/README.txt
similarity index 100%
rename from commerce/README.txt
rename to cybertools/commerce/README.txt
diff --git a/commerce/__init__.py b/cybertools/commerce/__init__.py
similarity index 100%
rename from commerce/__init__.py
rename to cybertools/commerce/__init__.py
diff --git a/commerce/common.py b/cybertools/commerce/common.py
similarity index 100%
rename from commerce/common.py
rename to cybertools/commerce/common.py
diff --git a/commerce/configure.zcml b/cybertools/commerce/configure.zcml
similarity index 100%
rename from commerce/configure.zcml
rename to cybertools/commerce/configure.zcml
diff --git a/commerce/customer.py b/cybertools/commerce/customer.py
similarity index 100%
rename from commerce/customer.py
rename to cybertools/commerce/customer.py
diff --git a/commerce/interfaces.py b/cybertools/commerce/interfaces.py
similarity index 100%
rename from commerce/interfaces.py
rename to cybertools/commerce/interfaces.py
diff --git a/commerce/locales/cybertools.commerce.pot b/cybertools/commerce/locales/cybertools.commerce.pot
similarity index 100%
rename from commerce/locales/cybertools.commerce.pot
rename to cybertools/commerce/locales/cybertools.commerce.pot
diff --git a/commerce/locales/de/LC_MESSAGES/cybertools.commerce.mo b/cybertools/commerce/locales/de/LC_MESSAGES/cybertools.commerce.mo
similarity index 100%
rename from commerce/locales/de/LC_MESSAGES/cybertools.commerce.mo
rename to cybertools/commerce/locales/de/LC_MESSAGES/cybertools.commerce.mo
diff --git a/commerce/locales/de/LC_MESSAGES/cybertools.commerce.po b/cybertools/commerce/locales/de/LC_MESSAGES/cybertools.commerce.po
similarity index 100%
rename from commerce/locales/de/LC_MESSAGES/cybertools.commerce.po
rename to cybertools/commerce/locales/de/LC_MESSAGES/cybertools.commerce.po
diff --git a/commerce/locales/en/LC_MESSAGES/cybertools.commerce.po b/cybertools/commerce/locales/en/LC_MESSAGES/cybertools.commerce.po
similarity index 100%
rename from commerce/locales/en/LC_MESSAGES/cybertools.commerce.po
rename to cybertools/commerce/locales/en/LC_MESSAGES/cybertools.commerce.po
diff --git a/commerce/manager.py b/cybertools/commerce/manager.py
similarity index 100%
rename from commerce/manager.py
rename to cybertools/commerce/manager.py
diff --git a/commerce/order.py b/cybertools/commerce/order.py
similarity index 100%
rename from commerce/order.py
rename to cybertools/commerce/order.py
diff --git a/commerce/product.py b/cybertools/commerce/product.py
similarity index 100%
rename from commerce/product.py
rename to cybertools/commerce/product.py
diff --git a/commerce/shop.py b/cybertools/commerce/shop.py
similarity index 100%
rename from commerce/shop.py
rename to cybertools/commerce/shop.py
diff --git a/commerce/tests.py b/cybertools/commerce/tests.py
similarity index 100%
rename from commerce/tests.py
rename to cybertools/commerce/tests.py
diff --git a/composer/README.txt b/cybertools/composer/README.txt
similarity index 100%
rename from composer/README.txt
rename to cybertools/composer/README.txt
diff --git a/composer/__init__.py b/cybertools/composer/__init__.py
similarity index 100%
rename from composer/__init__.py
rename to cybertools/composer/__init__.py
diff --git a/composer/base.py b/cybertools/composer/base.py
similarity index 100%
rename from composer/base.py
rename to cybertools/composer/base.py
diff --git a/composer/instance.py b/cybertools/composer/instance.py
similarity index 100%
rename from composer/instance.py
rename to cybertools/composer/instance.py
diff --git a/composer/interfaces.py b/cybertools/composer/interfaces.py
similarity index 100%
rename from composer/interfaces.py
rename to cybertools/composer/interfaces.py
diff --git a/composer/layout/README.txt b/cybertools/composer/layout/README.txt
similarity index 100%
rename from composer/layout/README.txt
rename to cybertools/composer/layout/README.txt
diff --git a/composer/layout/__init__.py b/cybertools/composer/layout/__init__.py
similarity index 100%
rename from composer/layout/__init__.py
rename to cybertools/composer/layout/__init__.py
diff --git a/composer/layout/base.py b/cybertools/composer/layout/base.py
similarity index 100%
rename from composer/layout/base.py
rename to cybertools/composer/layout/base.py
diff --git a/composer/layout/browser/__init__.py b/cybertools/composer/layout/browser/__init__.py
similarity index 100%
rename from composer/layout/browser/__init__.py
rename to cybertools/composer/layout/browser/__init__.py
diff --git a/composer/layout/browser/base.pt b/cybertools/composer/layout/browser/base.pt
similarity index 100%
rename from composer/layout/browser/base.pt
rename to cybertools/composer/layout/browser/base.pt
diff --git a/composer/layout/browser/configure.zcml b/cybertools/composer/layout/browser/configure.zcml
similarity index 100%
rename from composer/layout/browser/configure.zcml
rename to cybertools/composer/layout/browser/configure.zcml
diff --git a/composer/layout/browser/default.pt b/cybertools/composer/layout/browser/default.pt
similarity index 100%
rename from composer/layout/browser/default.pt
rename to cybertools/composer/layout/browser/default.pt
diff --git a/composer/layout/browser/default.py b/cybertools/composer/layout/browser/default.py
similarity index 100%
rename from composer/layout/browser/default.py
rename to cybertools/composer/layout/browser/default.py
diff --git a/composer/layout/browser/liquid/__init__.py b/cybertools/composer/layout/browser/liquid/__init__.py
similarity index 100%
rename from composer/layout/browser/liquid/__init__.py
rename to cybertools/composer/layout/browser/liquid/__init__.py
diff --git a/composer/layout/browser/liquid/base.css b/cybertools/composer/layout/browser/liquid/base.css
similarity index 100%
rename from composer/layout/browser/liquid/base.css
rename to cybertools/composer/layout/browser/liquid/base.css
diff --git a/composer/layout/browser/liquid/configure.zcml b/cybertools/composer/layout/browser/liquid/configure.zcml
similarity index 100%
rename from composer/layout/browser/liquid/configure.zcml
rename to cybertools/composer/layout/browser/liquid/configure.zcml
diff --git a/composer/layout/browser/liquid/default.pt b/cybertools/composer/layout/browser/liquid/default.pt
similarity index 100%
rename from composer/layout/browser/liquid/default.pt
rename to cybertools/composer/layout/browser/liquid/default.pt
diff --git a/composer/layout/browser/liquid/default.py b/cybertools/composer/layout/browser/liquid/default.py
similarity index 100%
rename from composer/layout/browser/liquid/default.py
rename to cybertools/composer/layout/browser/liquid/default.py
diff --git a/composer/layout/browser/renderer.pt b/cybertools/composer/layout/browser/renderer.pt
similarity index 100%
rename from composer/layout/browser/renderer.pt
rename to cybertools/composer/layout/browser/renderer.pt
diff --git a/composer/layout/browser/resources/loops_favicon.png b/cybertools/composer/layout/browser/resources/loops_favicon.png
similarity index 100%
rename from composer/layout/browser/resources/loops_favicon.png
rename to cybertools/composer/layout/browser/resources/loops_favicon.png
diff --git a/composer/layout/browser/standard.pt b/cybertools/composer/layout/browser/standard.pt
similarity index 100%
rename from composer/layout/browser/standard.pt
rename to cybertools/composer/layout/browser/standard.pt
diff --git a/composer/layout/browser/standard.py b/cybertools/composer/layout/browser/standard.py
similarity index 100%
rename from composer/layout/browser/standard.py
rename to cybertools/composer/layout/browser/standard.py
diff --git a/composer/layout/browser/view.py b/cybertools/composer/layout/browser/view.py
similarity index 100%
rename from composer/layout/browser/view.py
rename to cybertools/composer/layout/browser/view.py
diff --git a/composer/layout/configure.zcml b/cybertools/composer/layout/configure.zcml
similarity index 100%
rename from composer/layout/configure.zcml
rename to cybertools/composer/layout/configure.zcml
diff --git a/composer/layout/interfaces.py b/cybertools/composer/layout/interfaces.py
similarity index 100%
rename from composer/layout/interfaces.py
rename to cybertools/composer/layout/interfaces.py
diff --git a/composer/layout/region.py b/cybertools/composer/layout/region.py
similarity index 100%
rename from composer/layout/region.py
rename to cybertools/composer/layout/region.py
diff --git a/composer/layout/tests.py b/cybertools/composer/layout/tests.py
similarity index 100%
rename from composer/layout/tests.py
rename to cybertools/composer/layout/tests.py
diff --git a/composer/message/README.txt b/cybertools/composer/message/README.txt
similarity index 100%
rename from composer/message/README.txt
rename to cybertools/composer/message/README.txt
diff --git a/composer/message/__init__.py b/cybertools/composer/message/__init__.py
similarity index 100%
rename from composer/message/__init__.py
rename to cybertools/composer/message/__init__.py
diff --git a/composer/message/base.py b/cybertools/composer/message/base.py
similarity index 100%
rename from composer/message/base.py
rename to cybertools/composer/message/base.py
diff --git a/composer/message/configure.zcml b/cybertools/composer/message/configure.zcml
similarity index 100%
rename from composer/message/configure.zcml
rename to cybertools/composer/message/configure.zcml
diff --git a/composer/message/instance.py b/cybertools/composer/message/instance.py
similarity index 100%
rename from composer/message/instance.py
rename to cybertools/composer/message/instance.py
diff --git a/composer/message/interfaces.py b/cybertools/composer/message/interfaces.py
similarity index 100%
rename from composer/message/interfaces.py
rename to cybertools/composer/message/interfaces.py
diff --git a/composer/message/tests.py b/cybertools/composer/message/tests.py
similarity index 100%
rename from composer/message/tests.py
rename to cybertools/composer/message/tests.py
diff --git a/composer/report/README.txt b/cybertools/composer/report/README.txt
similarity index 100%
rename from composer/report/README.txt
rename to cybertools/composer/report/README.txt
diff --git a/composer/report/__init__.py b/cybertools/composer/report/__init__.py
similarity index 100%
rename from composer/report/__init__.py
rename to cybertools/composer/report/__init__.py
diff --git a/composer/report/base.py b/cybertools/composer/report/base.py
similarity index 100%
rename from composer/report/base.py
rename to cybertools/composer/report/base.py
diff --git a/composer/report/configure.zcml b/cybertools/composer/report/configure.zcml
similarity index 100%
rename from composer/report/configure.zcml
rename to cybertools/composer/report/configure.zcml
diff --git a/composer/report/field.py b/cybertools/composer/report/field.py
similarity index 100%
rename from composer/report/field.py
rename to cybertools/composer/report/field.py
diff --git a/composer/report/instance.py b/cybertools/composer/report/instance.py
similarity index 100%
rename from composer/report/instance.py
rename to cybertools/composer/report/instance.py
diff --git a/composer/report/interfaces.py b/cybertools/composer/report/interfaces.py
similarity index 100%
rename from composer/report/interfaces.py
rename to cybertools/composer/report/interfaces.py
diff --git a/composer/report/result.py b/cybertools/composer/report/result.py
similarity index 100%
rename from composer/report/result.py
rename to cybertools/composer/report/result.py
diff --git a/composer/report/tests.py b/cybertools/composer/report/tests.py
similarity index 100%
rename from composer/report/tests.py
rename to cybertools/composer/report/tests.py
diff --git a/composer/rule/README.txt b/cybertools/composer/rule/README.txt
similarity index 100%
rename from composer/rule/README.txt
rename to cybertools/composer/rule/README.txt
diff --git a/composer/rule/__init__.py b/cybertools/composer/rule/__init__.py
similarity index 100%
rename from composer/rule/__init__.py
rename to cybertools/composer/rule/__init__.py
diff --git a/composer/rule/base.py b/cybertools/composer/rule/base.py
similarity index 100%
rename from composer/rule/base.py
rename to cybertools/composer/rule/base.py
diff --git a/composer/rule/configure.zcml b/cybertools/composer/rule/configure.zcml
similarity index 100%
rename from composer/rule/configure.zcml
rename to cybertools/composer/rule/configure.zcml
diff --git a/composer/rule/instance.py b/cybertools/composer/rule/instance.py
similarity index 100%
rename from composer/rule/instance.py
rename to cybertools/composer/rule/instance.py
diff --git a/composer/rule/interfaces.py b/cybertools/composer/rule/interfaces.py
similarity index 100%
rename from composer/rule/interfaces.py
rename to cybertools/composer/rule/interfaces.py
diff --git a/composer/rule/mail.py b/cybertools/composer/rule/mail.py
similarity index 100%
rename from composer/rule/mail.py
rename to cybertools/composer/rule/mail.py
diff --git a/composer/rule/message.py b/cybertools/composer/rule/message.py
similarity index 100%
rename from composer/rule/message.py
rename to cybertools/composer/rule/message.py
diff --git a/composer/rule/tests.py b/cybertools/composer/rule/tests.py
similarity index 100%
rename from composer/rule/tests.py
rename to cybertools/composer/rule/tests.py
diff --git a/composer/rule/web.py b/cybertools/composer/rule/web.py
similarity index 100%
rename from composer/rule/web.py
rename to cybertools/composer/rule/web.py
diff --git a/composer/schema/README.txt b/cybertools/composer/schema/README.txt
similarity index 100%
rename from composer/schema/README.txt
rename to cybertools/composer/schema/README.txt
diff --git a/composer/schema/__init__.py b/cybertools/composer/schema/__init__.py
similarity index 100%
rename from composer/schema/__init__.py
rename to cybertools/composer/schema/__init__.py
diff --git a/composer/schema/browser/__init__.py b/cybertools/composer/schema/browser/__init__.py
similarity index 100%
rename from composer/schema/browser/__init__.py
rename to cybertools/composer/schema/browser/__init__.py
diff --git a/composer/schema/browser/common.py b/cybertools/composer/schema/browser/common.py
similarity index 100%
rename from composer/schema/browser/common.py
rename to cybertools/composer/schema/browser/common.py
diff --git a/composer/schema/browser/configure.zcml b/cybertools/composer/schema/browser/configure.zcml
similarity index 100%
rename from composer/schema/browser/configure.zcml
rename to cybertools/composer/schema/browser/configure.zcml
diff --git a/composer/schema/browser/form.py b/cybertools/composer/schema/browser/form.py
similarity index 100%
rename from composer/schema/browser/form.py
rename to cybertools/composer/schema/browser/form.py
diff --git a/composer/schema/browser/report.py b/cybertools/composer/schema/browser/report.py
similarity index 100%
rename from composer/schema/browser/report.py
rename to cybertools/composer/schema/browser/report.py
diff --git a/composer/schema/browser/schema.py b/cybertools/composer/schema/browser/schema.py
similarity index 100%
rename from composer/schema/browser/schema.py
rename to cybertools/composer/schema/browser/schema.py
diff --git a/composer/schema/browser/schema_macros.pt b/cybertools/composer/schema/browser/schema_macros.pt
similarity index 100%
rename from composer/schema/browser/schema_macros.pt
rename to cybertools/composer/schema/browser/schema_macros.pt
diff --git a/composer/schema/client.py b/cybertools/composer/schema/client.py
similarity index 100%
rename from composer/schema/client.py
rename to cybertools/composer/schema/client.py
diff --git a/composer/schema/configure.zcml b/cybertools/composer/schema/configure.zcml
similarity index 100%
rename from composer/schema/configure.zcml
rename to cybertools/composer/schema/configure.zcml
diff --git a/composer/schema/factory.py b/cybertools/composer/schema/factory.py
similarity index 100%
rename from composer/schema/factory.py
rename to cybertools/composer/schema/factory.py
diff --git a/composer/schema/field.py b/cybertools/composer/schema/field.py
similarity index 100%
rename from composer/schema/field.py
rename to cybertools/composer/schema/field.py
diff --git a/composer/schema/grid/__init__.py b/cybertools/composer/schema/grid/__init__.py
similarity index 100%
rename from composer/schema/grid/__init__.py
rename to cybertools/composer/schema/grid/__init__.py
diff --git a/composer/schema/grid/field.py b/cybertools/composer/schema/grid/field.py
similarity index 100%
rename from composer/schema/grid/field.py
rename to cybertools/composer/schema/grid/field.py
diff --git a/composer/schema/grid/grid_macros.pt b/cybertools/composer/schema/grid/grid_macros.pt
similarity index 100%
rename from composer/schema/grid/grid_macros.pt
rename to cybertools/composer/schema/grid/grid_macros.pt
diff --git a/composer/schema/grid/interfaces.py b/cybertools/composer/schema/grid/interfaces.py
similarity index 100%
rename from composer/schema/grid/interfaces.py
rename to cybertools/composer/schema/grid/interfaces.py
diff --git a/composer/schema/instance.py b/cybertools/composer/schema/instance.py
similarity index 100%
rename from composer/schema/instance.py
rename to cybertools/composer/schema/instance.py
diff --git a/composer/schema/interfaces.py b/cybertools/composer/schema/interfaces.py
similarity index 100%
rename from composer/schema/interfaces.py
rename to cybertools/composer/schema/interfaces.py
diff --git a/composer/schema/schema.py b/cybertools/composer/schema/schema.py
similarity index 100%
rename from composer/schema/schema.py
rename to cybertools/composer/schema/schema.py
diff --git a/composer/schema/tests.py b/cybertools/composer/schema/tests.py
similarity index 100%
rename from composer/schema/tests.py
rename to cybertools/composer/schema/tests.py
diff --git a/composer/tests.py b/cybertools/composer/tests.py
similarity index 100%
rename from composer/tests.py
rename to cybertools/composer/tests.py
diff --git a/configure.zcml b/cybertools/configure.zcml
similarity index 100%
rename from configure.zcml
rename to cybertools/configure.zcml
diff --git a/container/DEPENDENCIES.cfg b/cybertools/container/DEPENDENCIES.cfg
similarity index 100%
rename from container/DEPENDENCIES.cfg
rename to cybertools/container/DEPENDENCIES.cfg
diff --git a/container/README.txt b/cybertools/container/README.txt
similarity index 100%
rename from container/README.txt
rename to cybertools/container/README.txt
diff --git a/container/SETUP.cfg b/cybertools/container/SETUP.cfg
similarity index 100%
rename from container/SETUP.cfg
rename to cybertools/container/SETUP.cfg
diff --git a/container/__init__.py b/cybertools/container/__init__.py
similarity index 100%
rename from container/__init__.py
rename to cybertools/container/__init__.py
diff --git a/container/base.py b/cybertools/container/base.py
similarity index 100%
rename from container/base.py
rename to cybertools/container/base.py
diff --git a/container/configure.zcml b/cybertools/container/configure.zcml
similarity index 100%
rename from container/configure.zcml
rename to cybertools/container/configure.zcml
diff --git a/container/contents.pt b/cybertools/container/contents.pt
similarity index 100%
rename from container/contents.pt
rename to cybertools/container/contents.pt
diff --git a/container/cybertools.container-configure.zcml b/cybertools/container/cybertools.container-configure.zcml
similarity index 100%
rename from container/cybertools.container-configure.zcml
rename to cybertools/container/cybertools.container-configure.zcml
diff --git a/container/interfaces.py b/cybertools/container/interfaces.py
similarity index 100%
rename from container/interfaces.py
rename to cybertools/container/interfaces.py
diff --git a/container/ordered.py b/cybertools/container/ordered.py
similarity index 100%
rename from container/ordered.py
rename to cybertools/container/ordered.py
diff --git a/container/tests.py b/cybertools/container/tests.py
similarity index 100%
rename from container/tests.py
rename to cybertools/container/tests.py
diff --git a/docgen/README.txt b/cybertools/docgen/README.txt
similarity index 100%
rename from docgen/README.txt
rename to cybertools/docgen/README.txt
diff --git a/docgen/__init__.py b/cybertools/docgen/__init__.py
similarity index 100%
rename from docgen/__init__.py
rename to cybertools/docgen/__init__.py
diff --git a/docgen/base.py b/cybertools/docgen/base.py
similarity index 100%
rename from docgen/base.py
rename to cybertools/docgen/base.py
diff --git a/docgen/document.mht b/cybertools/docgen/document.mht
similarity index 100%
rename from docgen/document.mht
rename to cybertools/docgen/document.mht
diff --git a/docgen/mht.py b/cybertools/docgen/mht.py
similarity index 100%
rename from docgen/mht.py
rename to cybertools/docgen/mht.py
diff --git a/docgen/testing/test_doc.mht b/cybertools/docgen/testing/test_doc.mht
similarity index 100%
rename from docgen/testing/test_doc.mht
rename to cybertools/docgen/testing/test_doc.mht
diff --git a/docgen/testing/test_image.jpg b/cybertools/docgen/testing/test_image.jpg
similarity index 100%
rename from docgen/testing/test_image.jpg
rename to cybertools/docgen/testing/test_image.jpg
diff --git a/docgen/tests.py b/cybertools/docgen/tests.py
similarity index 100%
rename from docgen/tests.py
rename to cybertools/docgen/tests.py
diff --git a/docgen/word.css b/cybertools/docgen/word.css
similarity index 100%
rename from docgen/word.css
rename to cybertools/docgen/word.css
diff --git a/docgen/word_body.pt b/cybertools/docgen/word_body.pt
similarity index 100%
rename from docgen/word_body.pt
rename to cybertools/docgen/word_body.pt
diff --git a/docgen/word_macros.pt b/cybertools/docgen/word_macros.pt
similarity index 100%
rename from docgen/word_macros.pt
rename to cybertools/docgen/word_macros.pt
diff --git a/docgen/word_page.pt b/cybertools/docgen/word_page.pt
similarity index 100%
rename from docgen/word_page.pt
rename to cybertools/docgen/word_page.pt
diff --git a/external/__init__.py b/cybertools/external/__init__.py
similarity index 100%
rename from external/__init__.py
rename to cybertools/external/__init__.py
diff --git a/external/base.py b/cybertools/external/base.py
similarity index 100%
rename from external/base.py
rename to cybertools/external/base.py
diff --git a/external/dsv.py b/cybertools/external/dsv.py
similarity index 100%
rename from external/dsv.py
rename to cybertools/external/dsv.py
diff --git a/external/element.py b/cybertools/external/element.py
similarity index 100%
rename from external/element.py
rename to cybertools/external/element.py
diff --git a/external/interfaces.py b/cybertools/external/interfaces.py
similarity index 100%
rename from external/interfaces.py
rename to cybertools/external/interfaces.py
diff --git a/integrator/__init__.py b/cybertools/integrator/__init__.py
similarity index 100%
rename from integrator/__init__.py
rename to cybertools/integrator/__init__.py
diff --git a/integrator/base.py b/cybertools/integrator/base.py
similarity index 100%
rename from integrator/base.py
rename to cybertools/integrator/base.py
diff --git a/integrator/browser/__init__.py b/cybertools/integrator/browser/__init__.py
similarity index 100%
rename from integrator/browser/__init__.py
rename to cybertools/integrator/browser/__init__.py
diff --git a/integrator/browser/bscw.py b/cybertools/integrator/browser/bscw.py
similarity index 100%
rename from integrator/browser/bscw.py
rename to cybertools/integrator/browser/bscw.py
diff --git a/integrator/browser/view.pt b/cybertools/integrator/browser/view.pt
similarity index 100%
rename from integrator/browser/view.pt
rename to cybertools/integrator/browser/view.pt
diff --git a/integrator/bscw.py b/cybertools/integrator/bscw.py
similarity index 100%
rename from integrator/bscw.py
rename to cybertools/integrator/bscw.py
diff --git a/integrator/bscw.txt b/cybertools/integrator/bscw.txt
similarity index 100%
rename from integrator/bscw.txt
rename to cybertools/integrator/bscw.txt
diff --git a/integrator/filesystem.py b/cybertools/integrator/filesystem.py
similarity index 100%
rename from integrator/filesystem.py
rename to cybertools/integrator/filesystem.py
diff --git a/integrator/filesystem.txt b/cybertools/integrator/filesystem.txt
similarity index 100%
rename from integrator/filesystem.txt
rename to cybertools/integrator/filesystem.txt
diff --git a/integrator/interfaces.py b/cybertools/integrator/interfaces.py
similarity index 100%
rename from integrator/interfaces.py
rename to cybertools/integrator/interfaces.py
diff --git a/integrator/mime.types b/cybertools/integrator/mime.types
similarity index 100%
rename from integrator/mime.types
rename to cybertools/integrator/mime.types
diff --git a/integrator/tests/__init__.py b/cybertools/integrator/tests/__init__.py
similarity index 100%
rename from integrator/tests/__init__.py
rename to cybertools/integrator/tests/__init__.py
diff --git a/integrator/tests/bscw.py b/cybertools/integrator/tests/bscw.py
similarity index 100%
rename from integrator/tests/bscw.py
rename to cybertools/integrator/tests/bscw.py
diff --git a/integrator/tests/data/index.html b/cybertools/integrator/tests/data/index.html
similarity index 100%
rename from integrator/tests/data/index.html
rename to cybertools/integrator/tests/data/index.html
diff --git a/integrator/tests/data/sub/demo.tgz b/cybertools/integrator/tests/data/sub/demo.tgz
similarity index 100%
rename from integrator/tests/data/sub/demo.tgz
rename to cybertools/integrator/tests/data/sub/demo.tgz
diff --git a/integrator/tests/data/sub/index.html b/cybertools/integrator/tests/data/sub/index.html
similarity index 100%
rename from integrator/tests/data/sub/index.html
rename to cybertools/integrator/tests/data/sub/index.html
diff --git a/integrator/tests/data/sub/loops_logo.png b/cybertools/integrator/tests/data/sub/loops_logo.png
similarity index 100%
rename from integrator/tests/data/sub/loops_logo.png
rename to cybertools/integrator/tests/data/sub/loops_logo.png
diff --git a/integrator/tests/test_bscw.py b/cybertools/integrator/tests/test_bscw.py
similarity index 100%
rename from integrator/tests/test_bscw.py
rename to cybertools/integrator/tests/test_bscw.py
diff --git a/integrator/tests/test_filesystem.py b/cybertools/integrator/tests/test_filesystem.py
similarity index 100%
rename from integrator/tests/test_filesystem.py
rename to cybertools/integrator/tests/test_filesystem.py
diff --git a/knowledge/README.txt b/cybertools/knowledge/README.txt
similarity index 100%
rename from knowledge/README.txt
rename to cybertools/knowledge/README.txt
diff --git a/knowledge/__init__.py b/cybertools/knowledge/__init__.py
similarity index 100%
rename from knowledge/__init__.py
rename to cybertools/knowledge/__init__.py
diff --git a/knowledge/element.py b/cybertools/knowledge/element.py
similarity index 100%
rename from knowledge/element.py
rename to cybertools/knowledge/element.py
diff --git a/knowledge/interfaces.py b/cybertools/knowledge/interfaces.py
similarity index 100%
rename from knowledge/interfaces.py
rename to cybertools/knowledge/interfaces.py
diff --git a/knowledge/knowing.py b/cybertools/knowledge/knowing.py
similarity index 100%
rename from knowledge/knowing.py
rename to cybertools/knowledge/knowing.py
diff --git a/knowledge/provider.py b/cybertools/knowledge/provider.py
similarity index 100%
rename from knowledge/provider.py
rename to cybertools/knowledge/provider.py
diff --git a/knowledge/requirement.py b/cybertools/knowledge/requirement.py
similarity index 100%
rename from knowledge/requirement.py
rename to cybertools/knowledge/requirement.py
diff --git a/knowledge/survey/README.txt b/cybertools/knowledge/survey/README.txt
similarity index 100%
rename from knowledge/survey/README.txt
rename to cybertools/knowledge/survey/README.txt
diff --git a/knowledge/survey/__init__.py b/cybertools/knowledge/survey/__init__.py
similarity index 100%
rename from knowledge/survey/__init__.py
rename to cybertools/knowledge/survey/__init__.py
diff --git a/knowledge/survey/interfaces.py b/cybertools/knowledge/survey/interfaces.py
similarity index 100%
rename from knowledge/survey/interfaces.py
rename to cybertools/knowledge/survey/interfaces.py
diff --git a/knowledge/survey/questionnaire.py b/cybertools/knowledge/survey/questionnaire.py
similarity index 100%
rename from knowledge/survey/questionnaire.py
rename to cybertools/knowledge/survey/questionnaire.py
diff --git a/knowledge/survey/tests.py b/cybertools/knowledge/survey/tests.py
similarity index 100%
rename from knowledge/survey/tests.py
rename to cybertools/knowledge/survey/tests.py
diff --git a/knowledge/tests.py b/cybertools/knowledge/tests.py
similarity index 100%
rename from knowledge/tests.py
rename to cybertools/knowledge/tests.py
diff --git a/link/README.txt b/cybertools/link/README.txt
similarity index 100%
rename from link/README.txt
rename to cybertools/link/README.txt
diff --git a/link/__init__.py b/cybertools/link/__init__.py
similarity index 100%
rename from link/__init__.py
rename to cybertools/link/__init__.py
diff --git a/link/base.py b/cybertools/link/base.py
similarity index 100%
rename from link/base.py
rename to cybertools/link/base.py
diff --git a/link/interfaces.py b/cybertools/link/interfaces.py
similarity index 100%
rename from link/interfaces.py
rename to cybertools/link/interfaces.py
diff --git a/link/tests.py b/cybertools/link/tests.py
similarity index 100%
rename from link/tests.py
rename to cybertools/link/tests.py
diff --git a/media/README.txt b/cybertools/media/README.txt
similarity index 100%
rename from media/README.txt
rename to cybertools/media/README.txt
diff --git a/media/__init__.py b/cybertools/media/__init__.py
similarity index 100%
rename from media/__init__.py
rename to cybertools/media/__init__.py
diff --git a/media/asset.py b/cybertools/media/asset.py
similarity index 100%
rename from media/asset.py
rename to cybertools/media/asset.py
diff --git a/media/interfaces.py b/cybertools/media/interfaces.py
similarity index 100%
rename from media/interfaces.py
rename to cybertools/media/interfaces.py
diff --git a/media/piltransform.py b/cybertools/media/piltransform.py
similarity index 100%
rename from media/piltransform.py
rename to cybertools/media/piltransform.py
diff --git a/media/testdata/test1.jpg b/cybertools/media/testdata/test1.jpg
similarity index 100%
rename from media/testdata/test1.jpg
rename to cybertools/media/testdata/test1.jpg
diff --git a/media/tests.py b/cybertools/media/tests.py
similarity index 100%
rename from media/tests.py
rename to cybertools/media/tests.py
diff --git a/meta/README.txt b/cybertools/meta/README.txt
similarity index 100%
rename from meta/README.txt
rename to cybertools/meta/README.txt
diff --git a/meta/__init__.py b/cybertools/meta/__init__.py
similarity index 100%
rename from meta/__init__.py
rename to cybertools/meta/__init__.py
diff --git a/meta/config.py b/cybertools/meta/config.py
similarity index 100%
rename from meta/config.py
rename to cybertools/meta/config.py
diff --git a/meta/element.py b/cybertools/meta/element.py
similarity index 100%
rename from meta/element.py
rename to cybertools/meta/element.py
diff --git a/meta/interfaces.py b/cybertools/meta/interfaces.py
similarity index 100%
rename from meta/interfaces.py
rename to cybertools/meta/interfaces.py
diff --git a/meta/namespace.py b/cybertools/meta/namespace.py
similarity index 100%
rename from meta/namespace.py
rename to cybertools/meta/namespace.py
diff --git a/meta/namespace.txt b/cybertools/meta/namespace.txt
similarity index 100%
rename from meta/namespace.txt
rename to cybertools/meta/namespace.txt
diff --git a/meta/tests.py b/cybertools/meta/tests.py
similarity index 100%
rename from meta/tests.py
rename to cybertools/meta/tests.py
diff --git a/organize/README.txt b/cybertools/organize/README.txt
similarity index 100%
rename from organize/README.txt
rename to cybertools/organize/README.txt
diff --git a/organize/__init__.py b/cybertools/organize/__init__.py
similarity index 100%
rename from organize/__init__.py
rename to cybertools/organize/__init__.py
diff --git a/organize/browser/__init__.py b/cybertools/organize/browser/__init__.py
similarity index 100%
rename from organize/browser/__init__.py
rename to cybertools/organize/browser/__init__.py
diff --git a/organize/browser/configure.zcml b/cybertools/organize/browser/configure.zcml
similarity index 100%
rename from organize/browser/configure.zcml
rename to cybertools/organize/browser/configure.zcml
diff --git a/organize/browser/report.py b/cybertools/organize/browser/report.py
similarity index 100%
rename from organize/browser/report.py
rename to cybertools/organize/browser/report.py
diff --git a/organize/browser/service.py b/cybertools/organize/browser/service.py
similarity index 100%
rename from organize/browser/service.py
rename to cybertools/organize/browser/service.py
diff --git a/organize/configure.zcml b/cybertools/organize/configure.zcml
similarity index 100%
rename from organize/configure.zcml
rename to cybertools/organize/configure.zcml
diff --git a/organize/formmanager.txt b/cybertools/organize/formmanager.txt
similarity index 100%
rename from organize/formmanager.txt
rename to cybertools/organize/formmanager.txt
diff --git a/organize/interfaces.py b/cybertools/organize/interfaces.py
similarity index 100%
rename from organize/interfaces.py
rename to cybertools/organize/interfaces.py
diff --git a/organize/locales/cybertools.organize.pot b/cybertools/organize/locales/cybertools.organize.pot
similarity index 100%
rename from organize/locales/cybertools.organize.pot
rename to cybertools/organize/locales/cybertools.organize.pot
diff --git a/organize/locales/de/LC_MESSAGES/cybertools.organize.mo b/cybertools/organize/locales/de/LC_MESSAGES/cybertools.organize.mo
similarity index 100%
rename from organize/locales/de/LC_MESSAGES/cybertools.organize.mo
rename to cybertools/organize/locales/de/LC_MESSAGES/cybertools.organize.mo
diff --git a/organize/locales/de/LC_MESSAGES/cybertools.organize.po b/cybertools/organize/locales/de/LC_MESSAGES/cybertools.organize.po
similarity index 100%
rename from organize/locales/de/LC_MESSAGES/cybertools.organize.po
rename to cybertools/organize/locales/de/LC_MESSAGES/cybertools.organize.po
diff --git a/organize/locales/en/LC_MESSAGES/cybertools.organize.mo b/cybertools/organize/locales/en/LC_MESSAGES/cybertools.organize.mo
similarity index 100%
rename from organize/locales/en/LC_MESSAGES/cybertools.organize.mo
rename to cybertools/organize/locales/en/LC_MESSAGES/cybertools.organize.mo
diff --git a/organize/locales/en/LC_MESSAGES/cybertools.organize.po b/cybertools/organize/locales/en/LC_MESSAGES/cybertools.organize.po
similarity index 100%
rename from organize/locales/en/LC_MESSAGES/cybertools.organize.po
rename to cybertools/organize/locales/en/LC_MESSAGES/cybertools.organize.po
diff --git a/organize/party.py b/cybertools/organize/party.py
similarity index 100%
rename from organize/party.py
rename to cybertools/organize/party.py
diff --git a/organize/service.py b/cybertools/organize/service.py
similarity index 100%
rename from organize/service.py
rename to cybertools/organize/service.py
diff --git a/organize/servicemanager.txt b/cybertools/organize/servicemanager.txt
similarity index 100%
rename from organize/servicemanager.txt
rename to cybertools/organize/servicemanager.txt
diff --git a/organize/task.py b/cybertools/organize/task.py
similarity index 100%
rename from organize/task.py
rename to cybertools/organize/task.py
diff --git a/organize/tests.py b/cybertools/organize/tests.py
similarity index 100%
rename from organize/tests.py
rename to cybertools/organize/tests.py
diff --git a/organize/work.py b/cybertools/organize/work.py
similarity index 100%
rename from organize/work.py
rename to cybertools/organize/work.py
diff --git a/organize/work.txt b/cybertools/organize/work.txt
similarity index 100%
rename from organize/work.txt
rename to cybertools/organize/work.txt
diff --git a/plugin/README.txt b/cybertools/plugin/README.txt
similarity index 100%
rename from plugin/README.txt
rename to cybertools/plugin/README.txt
diff --git a/plugin/__init__.py b/cybertools/plugin/__init__.py
similarity index 100%
rename from plugin/__init__.py
rename to cybertools/plugin/__init__.py
diff --git a/plugin/base.py b/cybertools/plugin/base.py
similarity index 100%
rename from plugin/base.py
rename to cybertools/plugin/base.py
diff --git a/plugin/manage.py b/cybertools/plugin/manage.py
similarity index 100%
rename from plugin/manage.py
rename to cybertools/plugin/manage.py
diff --git a/plugin/testing/__init__.py b/cybertools/plugin/testing/__init__.py
similarity index 100%
rename from plugin/testing/__init__.py
rename to cybertools/plugin/testing/__init__.py
diff --git a/plugin/tests.py b/cybertools/plugin/tests.py
similarity index 100%
rename from plugin/tests.py
rename to cybertools/plugin/tests.py
diff --git a/process/README.txt b/cybertools/process/README.txt
similarity index 100%
rename from process/README.txt
rename to cybertools/process/README.txt
diff --git a/process/__init__.py b/cybertools/process/__init__.py
similarity index 100%
rename from process/__init__.py
rename to cybertools/process/__init__.py
diff --git a/process/definition.py b/cybertools/process/definition.py
similarity index 100%
rename from process/definition.py
rename to cybertools/process/definition.py
diff --git a/process/execution.py b/cybertools/process/execution.py
similarity index 100%
rename from process/execution.py
rename to cybertools/process/execution.py
diff --git a/process/interfaces.py b/cybertools/process/interfaces.py
similarity index 100%
rename from process/interfaces.py
rename to cybertools/process/interfaces.py
diff --git a/process/tests.py b/cybertools/process/tests.py
similarity index 100%
rename from process/tests.py
rename to cybertools/process/tests.py
diff --git a/pyscript/README.txt b/cybertools/pyscript/README.txt
similarity index 100%
rename from pyscript/README.txt
rename to cybertools/pyscript/README.txt
diff --git a/pyscript/__init__.py b/cybertools/pyscript/__init__.py
similarity index 100%
rename from pyscript/__init__.py
rename to cybertools/pyscript/__init__.py
diff --git a/pyscript/browser.py b/cybertools/pyscript/browser.py
similarity index 100%
rename from pyscript/browser.py
rename to cybertools/pyscript/browser.py
diff --git a/pyscript/configure.zcml b/cybertools/pyscript/configure.zcml
similarity index 100%
rename from pyscript/configure.zcml
rename to cybertools/pyscript/configure.zcml
diff --git a/pyscript/cybertools.pyscript-configure.zcml b/cybertools/pyscript/cybertools.pyscript-configure.zcml
similarity index 100%
rename from pyscript/cybertools.pyscript-configure.zcml
rename to cybertools/pyscript/cybertools.pyscript-configure.zcml
diff --git a/pyscript/edit.pt b/cybertools/pyscript/edit.pt
similarity index 100%
rename from pyscript/edit.pt
rename to cybertools/pyscript/edit.pt
diff --git a/pyscript/interfaces.py b/cybertools/pyscript/interfaces.py
similarity index 100%
rename from pyscript/interfaces.py
rename to cybertools/pyscript/interfaces.py
diff --git a/pyscript/plot.py b/cybertools/pyscript/plot.py
similarity index 100%
rename from pyscript/plot.py
rename to cybertools/pyscript/plot.py
diff --git a/pyscript/rstat.py b/cybertools/pyscript/rstat.py
similarity index 100%
rename from pyscript/rstat.py
rename to cybertools/pyscript/rstat.py
diff --git a/pyscript/rstat.txt b/cybertools/pyscript/rstat.txt
similarity index 100%
rename from pyscript/rstat.txt
rename to cybertools/pyscript/rstat.txt
diff --git a/pyscript/script.py b/cybertools/pyscript/script.py
similarity index 100%
rename from pyscript/script.py
rename to cybertools/pyscript/script.py
diff --git a/pyscript/tests.py b/cybertools/pyscript/tests.py
similarity index 100%
rename from pyscript/tests.py
rename to cybertools/pyscript/tests.py
diff --git a/relation/DEPENDENCIES.cfg b/cybertools/relation/DEPENDENCIES.cfg
similarity index 100%
rename from relation/DEPENDENCIES.cfg
rename to cybertools/relation/DEPENDENCIES.cfg
diff --git a/relation/README.txt b/cybertools/relation/README.txt
similarity index 100%
rename from relation/README.txt
rename to cybertools/relation/README.txt
diff --git a/relation/SETUP.cfg b/cybertools/relation/SETUP.cfg
similarity index 100%
rename from relation/SETUP.cfg
rename to cybertools/relation/SETUP.cfg
diff --git a/relation/__init__.py b/cybertools/relation/__init__.py
similarity index 100%
rename from relation/__init__.py
rename to cybertools/relation/__init__.py
diff --git a/relation/concepts.txt b/cybertools/relation/concepts.txt
similarity index 100%
rename from relation/concepts.txt
rename to cybertools/relation/concepts.txt
diff --git a/relation/configure.zcml b/cybertools/relation/configure.zcml
similarity index 100%
rename from relation/configure.zcml
rename to cybertools/relation/configure.zcml
diff --git a/relation/cybertools.relation-configure.zcml b/cybertools/relation/cybertools.relation-configure.zcml
similarity index 100%
rename from relation/cybertools.relation-configure.zcml
rename to cybertools/relation/cybertools.relation-configure.zcml
diff --git a/relation/ftests.py b/cybertools/relation/ftests.py
similarity index 100%
rename from relation/ftests.py
rename to cybertools/relation/ftests.py
diff --git a/relation/interfaces.py b/cybertools/relation/interfaces.py
similarity index 100%
rename from relation/interfaces.py
rename to cybertools/relation/interfaces.py
diff --git a/relation/registry.py b/cybertools/relation/registry.py
similarity index 100%
rename from relation/registry.py
rename to cybertools/relation/registry.py
diff --git a/relation/tests.py b/cybertools/relation/tests.py
similarity index 100%
rename from relation/tests.py
rename to cybertools/relation/tests.py
diff --git a/reporter/README.txt b/cybertools/reporter/README.txt
similarity index 100%
rename from reporter/README.txt
rename to cybertools/reporter/README.txt
diff --git a/reporter/__init__.py b/cybertools/reporter/__init__.py
similarity index 100%
rename from reporter/__init__.py
rename to cybertools/reporter/__init__.py
diff --git a/reporter/batch.py b/cybertools/reporter/batch.py
similarity index 100%
rename from reporter/batch.py
rename to cybertools/reporter/batch.py
diff --git a/reporter/browser/__init__.py b/cybertools/reporter/browser/__init__.py
similarity index 100%
rename from reporter/browser/__init__.py
rename to cybertools/reporter/browser/__init__.py
diff --git a/reporter/browser/batch.py b/cybertools/reporter/browser/batch.py
similarity index 100%
rename from reporter/browser/batch.py
rename to cybertools/reporter/browser/batch.py
diff --git a/reporter/browser/configure.zcml b/cybertools/reporter/browser/configure.zcml
similarity index 100%
rename from reporter/browser/configure.zcml
rename to cybertools/reporter/browser/configure.zcml
diff --git a/reporter/browser/macros.pt b/cybertools/reporter/browser/macros.pt
similarity index 100%
rename from reporter/browser/macros.pt
rename to cybertools/reporter/browser/macros.pt
diff --git a/reporter/browser/report.py b/cybertools/reporter/browser/report.py
similarity index 100%
rename from reporter/browser/report.py
rename to cybertools/reporter/browser/report.py
diff --git a/reporter/configure.zcml b/cybertools/reporter/configure.zcml
similarity index 100%
rename from reporter/configure.zcml
rename to cybertools/reporter/configure.zcml
diff --git a/reporter/cybertools.reporter-configure.zcml b/cybertools/reporter/cybertools.reporter-configure.zcml
similarity index 100%
rename from reporter/cybertools.reporter-configure.zcml
rename to cybertools/reporter/cybertools.reporter-configure.zcml
diff --git a/reporter/data.py b/cybertools/reporter/data.py
similarity index 100%
rename from reporter/data.py
rename to cybertools/reporter/data.py
diff --git a/reporter/interfaces.py b/cybertools/reporter/interfaces.py
similarity index 100%
rename from reporter/interfaces.py
rename to cybertools/reporter/interfaces.py
diff --git a/reporter/resultset.py b/cybertools/reporter/resultset.py
similarity index 100%
rename from reporter/resultset.py
rename to cybertools/reporter/resultset.py
diff --git a/reporter/tests.py b/cybertools/reporter/tests.py
similarity index 100%
rename from reporter/tests.py
rename to cybertools/reporter/tests.py
diff --git a/roa/README.txt b/cybertools/roa/README.txt
similarity index 100%
rename from roa/README.txt
rename to cybertools/roa/README.txt
diff --git a/roa/__init__.py b/cybertools/roa/__init__.py
similarity index 100%
rename from roa/__init__.py
rename to cybertools/roa/__init__.py
diff --git a/roa/json.py b/cybertools/roa/json.py
similarity index 100%
rename from roa/json.py
rename to cybertools/roa/json.py
diff --git a/roa/tests.py b/cybertools/roa/tests.py
similarity index 100%
rename from roa/tests.py
rename to cybertools/roa/tests.py
diff --git a/roa/traversal.py b/cybertools/roa/traversal.py
similarity index 100%
rename from roa/traversal.py
rename to cybertools/roa/traversal.py
diff --git a/roa/z2/__init__.py b/cybertools/roa/z2/__init__.py
similarity index 100%
rename from roa/z2/__init__.py
rename to cybertools/roa/z2/__init__.py
diff --git a/roa/z2/traversal.py b/cybertools/roa/z2/traversal.py
similarity index 100%
rename from roa/z2/traversal.py
rename to cybertools/roa/z2/traversal.py
diff --git a/scorm/README.txt b/cybertools/scorm/README.txt
similarity index 100%
rename from scorm/README.txt
rename to cybertools/scorm/README.txt
diff --git a/scorm/__init__.py b/cybertools/scorm/__init__.py
similarity index 100%
rename from scorm/__init__.py
rename to cybertools/scorm/__init__.py
diff --git a/scorm/base.py b/cybertools/scorm/base.py
similarity index 100%
rename from scorm/base.py
rename to cybertools/scorm/base.py
diff --git a/scorm/interfaces.py b/cybertools/scorm/interfaces.py
similarity index 100%
rename from scorm/interfaces.py
rename to cybertools/scorm/interfaces.py
diff --git a/scorm/tests.py b/cybertools/scorm/tests.py
similarity index 100%
rename from scorm/tests.py
rename to cybertools/scorm/tests.py
diff --git a/session/__init__.py b/cybertools/session/__init__.py
similarity index 100%
rename from session/__init__.py
rename to cybertools/session/__init__.py
diff --git a/session/memcached.py b/cybertools/session/memcached.py
similarity index 100%
rename from session/memcached.py
rename to cybertools/session/memcached.py
diff --git a/session/memcached.zcml b/cybertools/session/memcached.zcml
similarity index 100%
rename from session/memcached.zcml
rename to cybertools/session/memcached.zcml
diff --git a/stateful/README.txt b/cybertools/stateful/README.txt
similarity index 100%
rename from stateful/README.txt
rename to cybertools/stateful/README.txt
diff --git a/stateful/__init__.py b/cybertools/stateful/__init__.py
similarity index 100%
rename from stateful/__init__.py
rename to cybertools/stateful/__init__.py
diff --git a/stateful/base.py b/cybertools/stateful/base.py
similarity index 100%
rename from stateful/base.py
rename to cybertools/stateful/base.py
diff --git a/stateful/definition.py b/cybertools/stateful/definition.py
similarity index 100%
rename from stateful/definition.py
rename to cybertools/stateful/definition.py
diff --git a/stateful/interfaces.py b/cybertools/stateful/interfaces.py
similarity index 100%
rename from stateful/interfaces.py
rename to cybertools/stateful/interfaces.py
diff --git a/stateful/publishing.py b/cybertools/stateful/publishing.py
similarity index 100%
rename from stateful/publishing.py
rename to cybertools/stateful/publishing.py
diff --git a/stateful/tests.py b/cybertools/stateful/tests.py
similarity index 100%
rename from stateful/tests.py
rename to cybertools/stateful/tests.py
diff --git a/storage/README.txt b/cybertools/storage/README.txt
similarity index 100%
rename from storage/README.txt
rename to cybertools/storage/README.txt
diff --git a/storage/__init__.py b/cybertools/storage/__init__.py
similarity index 100%
rename from storage/__init__.py
rename to cybertools/storage/__init__.py
diff --git a/storage/filesystem.py b/cybertools/storage/filesystem.py
similarity index 100%
rename from storage/filesystem.py
rename to cybertools/storage/filesystem.py
diff --git a/storage/interfaces.py b/cybertools/storage/interfaces.py
similarity index 100%
rename from storage/interfaces.py
rename to cybertools/storage/interfaces.py
diff --git a/storage/pzope/README.txt b/cybertools/storage/pzope/README.txt
similarity index 100%
rename from storage/pzope/README.txt
rename to cybertools/storage/pzope/README.txt
diff --git a/storage/pzope/__init__.py b/cybertools/storage/pzope/__init__.py
similarity index 100%
rename from storage/pzope/__init__.py
rename to cybertools/storage/pzope/__init__.py
diff --git a/storage/pzope/base.py b/cybertools/storage/pzope/base.py
similarity index 100%
rename from storage/pzope/base.py
rename to cybertools/storage/pzope/base.py
diff --git a/storage/pzope/tests.py b/cybertools/storage/pzope/tests.py
similarity index 100%
rename from storage/pzope/tests.py
rename to cybertools/storage/pzope/tests.py
diff --git a/storage/tests.py b/cybertools/storage/tests.py
similarity index 100%
rename from storage/tests.py
rename to cybertools/storage/tests.py
diff --git a/text/README.txt b/cybertools/text/README.txt
similarity index 71%
rename from text/README.txt
rename to cybertools/text/README.txt
index d14f8e5..f1f4093 100644
--- a/text/README.txt
+++ b/cybertools/text/README.txt
@@ -21,12 +21,14 @@ HTML
 ----
 
   >>> from cybertools.text.html import htmlToText
-  >>> html = open(os.path.join(testdir, 'selfhtml.html')).read()
-  >>> text = htmlToText(html.decode('ISO8859-15'))
+  >>> f = open(os.path.join(testdir, 'selfhtml.html'), encoding='ISO8859-15')
+  >>> html = f.read()
+  >>> text = htmlToText(html)
   >>> '<p>' in html
   True
   >>> '<p>' in text
   False
+  >>> f.close()
 
 PDF Files
 ---------
@@ -35,7 +37,7 @@ Let's start with a PDF file:
 
   >>> from cybertools.text.pdf import PdfTransform
   >>> transform = PdfTransform(None)
-  >>> f = open(os.path.join(testdir, 'mary.pdf'))
+  >>> f = open(os.path.join(testdir, 'mary.pdf'), 'rb')
 
 This will be transformed to plain text:
 
@@ -43,7 +45,7 @@ This will be transformed to plain text:
 
 Let's check the log, should be empty:
 
-  >>> print log
+  >>> print(log)
 
 So what is in the plain text result?
 
@@ -52,83 +54,92 @@ So what is in the plain text result?
   89
   >>> u'lamb' in words
   True
+  >>> f.close()
 
 Word Documents
 --------------
 
   >>> from cybertools.text.doc import DocTransform
   >>> transform = DocTransform(None)
-  >>> f = open(os.path.join(testdir, 'mary.doc'))
+  >>> f = open(os.path.join(testdir, 'mary.doc'), 'rb')
   >>> result = transform(f)
-  >>> print log
+  >>> print(log)
   >>> words = result.split()
   >>> len(words)
   89
   >>> u'lamb' in words
   True
+  >>> f.close()
 
 RTF Files
 ---------
 
   >>> from cybertools.text.rtf import RtfTransform
   >>> transform = RtfTransform(None)
-  >>> f = open(os.path.join(testdir, 'mary.rtf'))
+  >>> f = open(os.path.join(testdir, 'mary.rtf'), 'rb')
   >>> result = transform(f)
-  >>> print log
+  >>> print(log)
   >>> words = result.split()
   >>> len(words)
   90
   >>> u'lamb' in words
   True
+  >>> f.close()
 
 PowerPoint Presentations
 ------------------------
 
   >>> from cybertools.text.ppt import PptTransform
   >>> transform = PptTransform(None)
-  >>> f = open(os.path.join(testdir, 'mary.ppt'))
+  >>> f = open(os.path.join(testdir, 'mary.ppt'), 'rb')
   >>> result = transform(f)
-  >>> print log
-  >>> words = result.split()
-  >>> len(words)
-  102
-  >>> u'lamb' in words
-  True
+  >>> print(log)
+  zope.server WARNING
+    ppthtml is not available
+
+>> words = result.split()
+>> len(words)
+102
+>> u'lamb' in words
+True
+
+  >>> f.close()
 
 Excel Spreadsheets
 ------------------
 
   >>> from cybertools.text.xls import XlsTransform
   >>> transform = XlsTransform(None)
-  >>> f = open(os.path.join(testdir, 'mary.xls'))
+  >>> f = open(os.path.join(testdir, 'mary.xls'), 'rb')
   >>> result = transform(f)
-  >>> print log
   >>> words = result.split()
   >>> len(words)
   89
   >>> u'lamb' in words
   True
+  >>> f.close()
 
 OpenOffice
 ----------
 
   >>> from cybertools.text.ooffice import OOTransform
   >>> transform = OOTransform(None)
-  >>> f = open(os.path.join(testdir, 'mary.odt'))
+  >>> f = open(os.path.join(testdir, 'mary.odt'), 'rb')
   >>> result = transform(f)
-  >>> print log
-  >>> words = result.split()
   >>> len(words)
   89
   >>> u'lamb' in words
   True
+  >>> f.close()
 
-  >>> f = open(os.path.join(testdir, 'mary.ods'))
+  >>> f = open(os.path.join(testdir, 'mary.ods'), 'rb')
   >>> result = transform(f)
   >>> len(result.split())
   89
+  >>> f.close()
 
-  >>> f = open(os.path.join(testdir, 'mary.odp'))
+  >>> f = open(os.path.join(testdir, 'mary.odp'), 'rb')
   >>> result = transform(f)
   >>> len(result.split())
   99
+  >>> f.close()
diff --git a/text/__init__.py b/cybertools/text/__init__.py
similarity index 100%
rename from text/__init__.py
rename to cybertools/text/__init__.py
diff --git a/text/base.py b/cybertools/text/base.py
similarity index 94%
rename from text/base.py
rename to cybertools/text/base.py
index 74057c3..8bc4c4c 100644
--- a/text/base.py
+++ b/cybertools/text/base.py
@@ -27,14 +27,13 @@ $Id$
 
 import os, shutil, sys, tempfile
 import logging
-from zope.interface import implements
+from zope.interface import implementer
 from cybertools.text.interfaces import ITextTransform, IFileTransform
 
 
+@implementer(ITextTransform)
 class BaseTransform(object):
 
-    implements(ITextTransform)
-
     def __init__(self, context):
         self.context = context
         self.text = None
@@ -45,10 +44,9 @@ class BaseTransform(object):
         return self.text
 
 
+@implementer(IFileTransform)
 class BaseFileTransform(BaseTransform):
 
-    implements(IFileTransform)
-
     extension = '.txt'
 
     def __call__(self, fr):
@@ -89,5 +87,5 @@ class BaseFileTransform(BaseTransform):
                 if os.path.isfile(fn):
                     return True
         if logMessage:
-            logging.getLogger('zope.server').warn(logMessage)
+            logging.getLogger('zope.server').warning(logMessage)
         return False
diff --git a/text/config/wvText.xml b/cybertools/text/config/wvText.xml
similarity index 100%
rename from text/config/wvText.xml
rename to cybertools/text/config/wvText.xml
diff --git a/text/doc.py b/cybertools/text/doc.py
similarity index 97%
rename from text/doc.py
rename to cybertools/text/doc.py
index 8ea895f..f29610b 100644
--- a/text/doc.py
+++ b/cybertools/text/doc.py
@@ -50,4 +50,4 @@ class DocTransform(base.BaseFileTransform):
         else:
             data = self.execute('wvWare -c utf-8 --nographics -x "%s" "%s" 2> /dev/null'
                                 % (wvConf, filename))
-        return data.decode('UTF-8')
+        return data
diff --git a/text/html.py b/cybertools/text/html.py
similarity index 84%
rename from text/html.py
rename to cybertools/text/html.py
index f984a43..1338681 100644
--- a/text/html.py
+++ b/cybertools/text/html.py
@@ -23,11 +23,9 @@ $Id$
 """
 
 import os, sys
-from cStringIO import StringIO
 
 from cybertools.text import base
-from cybertools.text.lib.BeautifulSoup import BeautifulSoup
-from cybertools.text.lib.BeautifulSoup import Declaration, NavigableString
+from bs4 import BeautifulSoup, Declaration, Doctype, NavigableString
 
 
 class HtmlTransform(base.BaseTransform):
@@ -40,7 +38,7 @@ class HtmlTransform(base.BaseTransform):
 def htmlToText(input):
     data = []
     input = input.replace(u'<!--', u'')
-    soup = BeautifulSoup(input)
+    soup = BeautifulSoup(input, features='lxml')
     collectText(soup.contents, data)
     text = u' '.join(data).replace(u'\n', u'').replace(u'&nbsp;', u'')
     return text
@@ -49,5 +47,5 @@ def collectText(tags, data):
     for tag in tags:
         if type(tag) is NavigableString:
             data.append(tag)
-        elif tag is not None and type(tag) is not Declaration:
+        elif tag is not None and type(tag) not in (Declaration, Doctype):
             collectText(tag.contents, data)
diff --git a/text/interfaces.py b/cybertools/text/interfaces.py
similarity index 100%
rename from text/interfaces.py
rename to cybertools/text/interfaces.py
diff --git a/text/lib/BeautifulSoup.py b/cybertools/text/lib/BeautifulSoup.py
similarity index 100%
rename from text/lib/BeautifulSoup.py
rename to cybertools/text/lib/BeautifulSoup.py
diff --git a/text/lib/__init__.py b/cybertools/text/lib/__init__.py
similarity index 100%
rename from text/lib/__init__.py
rename to cybertools/text/lib/__init__.py
diff --git a/text/mimetypes.py b/cybertools/text/mimetypes.py
similarity index 100%
rename from text/mimetypes.py
rename to cybertools/text/mimetypes.py
diff --git a/text/ooffice.py b/cybertools/text/ooffice.py
similarity index 100%
rename from text/ooffice.py
rename to cybertools/text/ooffice.py
diff --git a/text/pdf.py b/cybertools/text/pdf.py
similarity index 97%
rename from text/pdf.py
rename to cybertools/text/pdf.py
index 41ae286..55b9271 100644
--- a/text/pdf.py
+++ b/cybertools/text/pdf.py
@@ -39,4 +39,4 @@ class PdfTransform(base.BaseFileTransform):
         if not self.checkAvailable('pdftotext', 'pdftotext is not available'):
             return u''
         data = self.execute('pdftotext -enc UTF-8 "%s" -' % filename)
-        return data.decode('UTF-8')
+        return data
diff --git a/text/ppt.py b/cybertools/text/ppt.py
similarity index 100%
rename from text/ppt.py
rename to cybertools/text/ppt.py
diff --git a/text/rtf.py b/cybertools/text/rtf.py
similarity index 93%
rename from text/rtf.py
rename to cybertools/text/rtf.py
index 7972cc4..0e46c94 100644
--- a/text/rtf.py
+++ b/cybertools/text/rtf.py
@@ -28,7 +28,7 @@ $Id$
 
 import os, sys
 from xml import sax
-from cStringIO import StringIO
+from io import StringIO
 
 from cybertools.text import base
 
@@ -36,7 +36,7 @@ from cybertools.text import base
 class RtfTextHandler(sax.ContentHandler):
 
     def characters(self, text):
-        self._data.write(text.encode('UTF-8'))
+        self._data.write(text)
 
     def startDocument(self):
         self._data = StringIO()
@@ -60,4 +60,4 @@ class RtfTransform(base.BaseFileTransform):
         xmlstr = self.execute('rtf2xml --no-dtd "%s"' % filename)
         handler = RtfTextHandler()
         sax.parseString(xmlstr, handler)
-        return handler.getData().decode('UTF-8')
+        return handler.getData()
diff --git a/text/testfiles/mary.doc b/cybertools/text/testfiles/mary.doc
similarity index 100%
rename from text/testfiles/mary.doc
rename to cybertools/text/testfiles/mary.doc
diff --git a/text/testfiles/mary.odp b/cybertools/text/testfiles/mary.odp
similarity index 100%
rename from text/testfiles/mary.odp
rename to cybertools/text/testfiles/mary.odp
diff --git a/text/testfiles/mary.ods b/cybertools/text/testfiles/mary.ods
similarity index 100%
rename from text/testfiles/mary.ods
rename to cybertools/text/testfiles/mary.ods
diff --git a/text/testfiles/mary.odt b/cybertools/text/testfiles/mary.odt
similarity index 100%
rename from text/testfiles/mary.odt
rename to cybertools/text/testfiles/mary.odt
diff --git a/text/testfiles/mary.pdf b/cybertools/text/testfiles/mary.pdf
similarity index 100%
rename from text/testfiles/mary.pdf
rename to cybertools/text/testfiles/mary.pdf
diff --git a/text/testfiles/mary.ppt b/cybertools/text/testfiles/mary.ppt
similarity index 100%
rename from text/testfiles/mary.ppt
rename to cybertools/text/testfiles/mary.ppt
diff --git a/text/testfiles/mary.rtf b/cybertools/text/testfiles/mary.rtf
similarity index 100%
rename from text/testfiles/mary.rtf
rename to cybertools/text/testfiles/mary.rtf
diff --git a/text/testfiles/mary.xls b/cybertools/text/testfiles/mary.xls
similarity index 100%
rename from text/testfiles/mary.xls
rename to cybertools/text/testfiles/mary.xls
diff --git a/text/testfiles/selfhtml.html b/cybertools/text/testfiles/selfhtml.html
similarity index 100%
rename from text/testfiles/selfhtml.html
rename to cybertools/text/testfiles/selfhtml.html
diff --git a/text/tests.py b/cybertools/text/tests.py
similarity index 78%
rename from text/tests.py
rename to cybertools/text/tests.py
index f7fd2dd..e735450 100755
--- a/text/tests.py
+++ b/cybertools/text/tests.py
@@ -5,8 +5,11 @@ Tests for the 'cybertools.text' package.
 """
 
 import unittest, doctest
+import warnings
 from cybertools.text import pdf
 
+warnings.filterwarnings('ignore', category=ResourceWarning)
+
 class Test(unittest.TestCase):
     "Basic tests for the text package."
 
@@ -17,7 +20,7 @@ class Test(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-        unittest.makeSuite(Test),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
         doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 
diff --git a/text/xls.py b/cybertools/text/xls.py
similarity index 97%
rename from text/xls.py
rename to cybertools/text/xls.py
index 31dad60..b3c7ac6 100644
--- a/text/xls.py
+++ b/cybertools/text/xls.py
@@ -42,4 +42,4 @@ class XlsTransform(base.BaseFileTransform):
             data = self.execute('xls2csv -d 8859-1 -q 0 "%s" 2> nul:' % filename)
         else:
             data = self.execute('xls2csv -d 8859-1 -q 0 "%s" 2> /dev/null' % filename)
-        return data.decode('ISO8859-1')
+        return data
diff --git a/tracking/README.txt b/cybertools/tracking/README.txt
similarity index 100%
rename from tracking/README.txt
rename to cybertools/tracking/README.txt
diff --git a/tracking/__init__.py b/cybertools/tracking/__init__.py
similarity index 100%
rename from tracking/__init__.py
rename to cybertools/tracking/__init__.py
diff --git a/tracking/browser.py b/cybertools/tracking/browser.py
similarity index 100%
rename from tracking/browser.py
rename to cybertools/tracking/browser.py
diff --git a/tracking/btree.py b/cybertools/tracking/btree.py
similarity index 100%
rename from tracking/btree.py
rename to cybertools/tracking/btree.py
diff --git a/tracking/comment/README.txt b/cybertools/tracking/comment/README.txt
similarity index 100%
rename from tracking/comment/README.txt
rename to cybertools/tracking/comment/README.txt
diff --git a/tracking/comment/__init__.py b/cybertools/tracking/comment/__init__.py
similarity index 100%
rename from tracking/comment/__init__.py
rename to cybertools/tracking/comment/__init__.py
diff --git a/tracking/comment/base.py b/cybertools/tracking/comment/base.py
similarity index 100%
rename from tracking/comment/base.py
rename to cybertools/tracking/comment/base.py
diff --git a/tracking/comment/interfaces.py b/cybertools/tracking/comment/interfaces.py
similarity index 100%
rename from tracking/comment/interfaces.py
rename to cybertools/tracking/comment/interfaces.py
diff --git a/tracking/comment/tests.py b/cybertools/tracking/comment/tests.py
similarity index 100%
rename from tracking/comment/tests.py
rename to cybertools/tracking/comment/tests.py
diff --git a/tracking/interfaces.py b/cybertools/tracking/interfaces.py
similarity index 100%
rename from tracking/interfaces.py
rename to cybertools/tracking/interfaces.py
diff --git a/tracking/logfile.py b/cybertools/tracking/logfile.py
similarity index 100%
rename from tracking/logfile.py
rename to cybertools/tracking/logfile.py
diff --git a/tracking/notify/README.txt b/cybertools/tracking/notify/README.txt
similarity index 100%
rename from tracking/notify/README.txt
rename to cybertools/tracking/notify/README.txt
diff --git a/tracking/notify/__init__.py b/cybertools/tracking/notify/__init__.py
similarity index 100%
rename from tracking/notify/__init__.py
rename to cybertools/tracking/notify/__init__.py
diff --git a/tracking/notify/base.py b/cybertools/tracking/notify/base.py
similarity index 100%
rename from tracking/notify/base.py
rename to cybertools/tracking/notify/base.py
diff --git a/tracking/notify/interfaces.py b/cybertools/tracking/notify/interfaces.py
similarity index 100%
rename from tracking/notify/interfaces.py
rename to cybertools/tracking/notify/interfaces.py
diff --git a/tracking/notify/tests.py b/cybertools/tracking/notify/tests.py
similarity index 100%
rename from tracking/notify/tests.py
rename to cybertools/tracking/notify/tests.py
diff --git a/tracking/tests.py b/cybertools/tracking/tests.py
similarity index 100%
rename from tracking/tests.py
rename to cybertools/tracking/tests.py
diff --git a/tracking/track.pt b/cybertools/tracking/track.pt
similarity index 100%
rename from tracking/track.pt
rename to cybertools/tracking/track.pt
diff --git a/tracking/tracks.pt b/cybertools/tracking/tracks.pt
similarity index 100%
rename from tracking/tracks.pt
rename to cybertools/tracking/tracks.pt
diff --git a/typology/README.txt b/cybertools/typology/README.txt
similarity index 100%
rename from typology/README.txt
rename to cybertools/typology/README.txt
diff --git a/typology/__init__.py b/cybertools/typology/__init__.py
similarity index 100%
rename from typology/__init__.py
rename to cybertools/typology/__init__.py
diff --git a/typology/browser/__init__.py b/cybertools/typology/browser/__init__.py
similarity index 100%
rename from typology/browser/__init__.py
rename to cybertools/typology/browser/__init__.py
diff --git a/typology/configure.zcml b/cybertools/typology/configure.zcml
similarity index 100%
rename from typology/configure.zcml
rename to cybertools/typology/configure.zcml
diff --git a/typology/cybertools.typology-configure.zcml b/cybertools/typology/cybertools.typology-configure.zcml
similarity index 100%
rename from typology/cybertools.typology-configure.zcml
rename to cybertools/typology/cybertools.typology-configure.zcml
diff --git a/typology/example/__init__.py b/cybertools/typology/example/__init__.py
similarity index 100%
rename from typology/example/__init__.py
rename to cybertools/typology/example/__init__.py
diff --git a/typology/example/person.py b/cybertools/typology/example/person.py
similarity index 100%
rename from typology/example/person.py
rename to cybertools/typology/example/person.py
diff --git a/typology/interfaces.py b/cybertools/typology/interfaces.py
similarity index 100%
rename from typology/interfaces.py
rename to cybertools/typology/interfaces.py
diff --git a/typology/tests.py b/cybertools/typology/tests.py
similarity index 100%
rename from typology/tests.py
rename to cybertools/typology/tests.py
diff --git a/typology/type.py b/cybertools/typology/type.py
similarity index 100%
rename from typology/type.py
rename to cybertools/typology/type.py
diff --git a/util/README.txt b/cybertools/util/README.txt
similarity index 100%
rename from util/README.txt
rename to cybertools/util/README.txt
diff --git a/util/__init__.py b/cybertools/util/__init__.py
similarity index 100%
rename from util/__init__.py
rename to cybertools/util/__init__.py
diff --git a/util/adapter.py b/cybertools/util/adapter.py
similarity index 100%
rename from util/adapter.py
rename to cybertools/util/adapter.py
diff --git a/util/adapter.txt b/cybertools/util/adapter.txt
similarity index 100%
rename from util/adapter.txt
rename to cybertools/util/adapter.txt
diff --git a/util/aop.py b/cybertools/util/aop.py
similarity index 100%
rename from util/aop.py
rename to cybertools/util/aop.py
diff --git a/util/aop.txt b/cybertools/util/aop.txt
similarity index 100%
rename from util/aop.txt
rename to cybertools/util/aop.txt
diff --git a/util/cache.py b/cybertools/util/cache.py
similarity index 100%
rename from util/cache.py
rename to cybertools/util/cache.py
diff --git a/util/cache.txt b/cybertools/util/cache.txt
similarity index 100%
rename from util/cache.txt
rename to cybertools/util/cache.txt
diff --git a/util/config.py b/cybertools/util/config.py
similarity index 100%
rename from util/config.py
rename to cybertools/util/config.py
diff --git a/util/config.txt b/cybertools/util/config.txt
similarity index 100%
rename from util/config.txt
rename to cybertools/util/config.txt
diff --git a/util/date.py b/cybertools/util/date.py
similarity index 100%
rename from util/date.py
rename to cybertools/util/date.py
diff --git a/util/defer.py b/cybertools/util/defer.py
similarity index 100%
rename from util/defer.py
rename to cybertools/util/defer.py
diff --git a/util/defer.txt b/cybertools/util/defer.txt
similarity index 100%
rename from util/defer.txt
rename to cybertools/util/defer.txt
diff --git a/util/format.py b/cybertools/util/format.py
similarity index 100%
rename from util/format.py
rename to cybertools/util/format.py
diff --git a/util/format.txt b/cybertools/util/format.txt
similarity index 100%
rename from util/format.txt
rename to cybertools/util/format.txt
diff --git a/util/generic/__init__.py b/cybertools/util/generic/__init__.py
similarity index 100%
rename from util/generic/__init__.py
rename to cybertools/util/generic/__init__.py
diff --git a/util/generic/interfaces.py b/cybertools/util/generic/interfaces.py
similarity index 100%
rename from util/generic/interfaces.py
rename to cybertools/util/generic/interfaces.py
diff --git a/util/html.py b/cybertools/util/html.py
similarity index 100%
rename from util/html.py
rename to cybertools/util/html.py
diff --git a/util/html.txt b/cybertools/util/html.txt
similarity index 100%
rename from util/html.txt
rename to cybertools/util/html.txt
diff --git a/util/iterate.py b/cybertools/util/iterate.py
similarity index 100%
rename from util/iterate.py
rename to cybertools/util/iterate.py
diff --git a/util/iterate.txt b/cybertools/util/iterate.txt
similarity index 100%
rename from util/iterate.txt
rename to cybertools/util/iterate.txt
diff --git a/util/jeep.py b/cybertools/util/jeep.py
similarity index 100%
rename from util/jeep.py
rename to cybertools/util/jeep.py
diff --git a/util/jeep.txt b/cybertools/util/jeep.txt
similarity index 100%
rename from util/jeep.txt
rename to cybertools/util/jeep.txt
diff --git a/util/json.py b/cybertools/util/json.py
similarity index 100%
rename from util/json.py
rename to cybertools/util/json.py
diff --git a/util/json.txt b/cybertools/util/json.txt
similarity index 100%
rename from util/json.txt
rename to cybertools/util/json.txt
diff --git a/util/multikey.py b/cybertools/util/multikey.py
similarity index 100%
rename from util/multikey.py
rename to cybertools/util/multikey.py
diff --git a/util/multikey.txt b/cybertools/util/multikey.txt
similarity index 100%
rename from util/multikey.txt
rename to cybertools/util/multikey.txt
diff --git a/util/property.py b/cybertools/util/property.py
similarity index 100%
rename from util/property.py
rename to cybertools/util/property.py
diff --git a/util/property.txt b/cybertools/util/property.txt
similarity index 100%
rename from util/property.txt
rename to cybertools/util/property.txt
diff --git a/util/randomname.py b/cybertools/util/randomname.py
similarity index 100%
rename from util/randomname.py
rename to cybertools/util/randomname.py
diff --git a/util/randomname.txt b/cybertools/util/randomname.txt
similarity index 100%
rename from util/randomname.txt
rename to cybertools/util/randomname.txt
diff --git a/util/tests.py b/cybertools/util/tests.py
similarity index 100%
rename from util/tests.py
rename to cybertools/util/tests.py
diff --git a/util/util.py b/cybertools/util/util.py
similarity index 100%
rename from util/util.py
rename to cybertools/util/util.py
diff --git a/util/version.py b/cybertools/util/version.py
similarity index 100%
rename from util/version.py
rename to cybertools/util/version.py
diff --git a/util/version.txt b/cybertools/util/version.txt
similarity index 100%
rename from util/version.txt
rename to cybertools/util/version.txt
diff --git a/view/README.txt b/cybertools/view/README.txt
similarity index 100%
rename from view/README.txt
rename to cybertools/view/README.txt
diff --git a/view/__init__.py b/cybertools/view/__init__.py
similarity index 100%
rename from view/__init__.py
rename to cybertools/view/__init__.py
diff --git a/view/browser/__init__.py b/cybertools/view/browser/__init__.py
similarity index 100%
rename from view/browser/__init__.py
rename to cybertools/view/browser/__init__.py
diff --git a/view/browser/generic.pt b/cybertools/view/browser/generic.pt
similarity index 100%
rename from view/browser/generic.pt
rename to cybertools/view/browser/generic.pt
diff --git a/view/browser/liquid/__init__.py b/cybertools/view/browser/liquid/__init__.py
similarity index 100%
rename from view/browser/liquid/__init__.py
rename to cybertools/view/browser/liquid/__init__.py
diff --git a/view/browser/liquid/base.css b/cybertools/view/browser/liquid/base.css
similarity index 100%
rename from view/browser/liquid/base.css
rename to cybertools/view/browser/liquid/base.css
diff --git a/view/browser/liquid/body.pt b/cybertools/view/browser/liquid/body.pt
similarity index 100%
rename from view/browser/liquid/body.pt
rename to cybertools/view/browser/liquid/body.pt
diff --git a/view/browser/liquid/configure.zcml b/cybertools/view/browser/liquid/configure.zcml
similarity index 100%
rename from view/browser/liquid/configure.zcml
rename to cybertools/view/browser/liquid/configure.zcml
diff --git a/view/browser/liquid/custom.css b/cybertools/view/browser/liquid/custom.css
similarity index 100%
rename from view/browser/liquid/custom.css
rename to cybertools/view/browser/liquid/custom.css
diff --git a/view/browser/liquid/logo.png b/cybertools/view/browser/liquid/logo.png
similarity index 100%
rename from view/browser/liquid/logo.png
rename to cybertools/view/browser/liquid/logo.png
diff --git a/view/browser/liquid/presentation.css b/cybertools/view/browser/liquid/presentation.css
similarity index 100%
rename from view/browser/liquid/presentation.css
rename to cybertools/view/browser/liquid/presentation.css
diff --git a/view/browser/liquid/print.css b/cybertools/view/browser/liquid/print.css
similarity index 100%
rename from view/browser/liquid/print.css
rename to cybertools/view/browser/liquid/print.css
diff --git a/view/browser/liquid/view_macros.pt b/cybertools/view/browser/liquid/view_macros.pt
similarity index 100%
rename from view/browser/liquid/view_macros.pt
rename to cybertools/view/browser/liquid/view_macros.pt
diff --git a/view/browser/view.py b/cybertools/view/browser/view.py
similarity index 100%
rename from view/browser/view.py
rename to cybertools/view/browser/view.py
diff --git a/view/pac.py b/cybertools/view/pac.py
similarity index 100%
rename from view/pac.py
rename to cybertools/view/pac.py
diff --git a/view/tests.py b/cybertools/view/tests.py
similarity index 100%
rename from view/tests.py
rename to cybertools/view/tests.py
diff --git a/view/web/__init__.py b/cybertools/view/web/__init__.py
similarity index 100%
rename from view/web/__init__.py
rename to cybertools/view/web/__init__.py
diff --git a/view/web/base.py b/cybertools/view/web/base.py
similarity index 100%
rename from view/web/base.py
rename to cybertools/view/web/base.py
diff --git a/view/web/configure.zcml b/cybertools/view/web/configure.zcml
similarity index 100%
rename from view/web/configure.zcml
rename to cybertools/view/web/configure.zcml
diff --git a/view/web/template.py b/cybertools/view/web/template.py
similarity index 100%
rename from view/web/template.py
rename to cybertools/view/web/template.py
diff --git a/view/web/zpt/__init__.py b/cybertools/view/web/zpt/__init__.py
similarity index 100%
rename from view/web/zpt/__init__.py
rename to cybertools/view/web/zpt/__init__.py
diff --git a/view/web/zpt/configure.zcml b/cybertools/view/web/zpt/configure.zcml
similarity index 100%
rename from view/web/zpt/configure.zcml
rename to cybertools/view/web/zpt/configure.zcml
diff --git a/view/web/zpt/content.pt b/cybertools/view/web/zpt/content.pt
similarity index 100%
rename from view/web/zpt/content.pt
rename to cybertools/view/web/zpt/content.pt
diff --git a/view/web/zpt/main.pt b/cybertools/view/web/zpt/main.pt
similarity index 100%
rename from view/web/zpt/main.pt
rename to cybertools/view/web/zpt/main.pt
diff --git a/view/web/zpt/template.py b/cybertools/view/web/zpt/template.py
similarity index 100%
rename from view/web/zpt/template.py
rename to cybertools/view/web/zpt/template.py
diff --git a/wiki/README.txt b/cybertools/wiki/README.txt
similarity index 100%
rename from wiki/README.txt
rename to cybertools/wiki/README.txt
diff --git a/wiki/__init__.py b/cybertools/wiki/__init__.py
similarity index 100%
rename from wiki/__init__.py
rename to cybertools/wiki/__init__.py
diff --git a/wiki/base/__init__.py b/cybertools/wiki/base/__init__.py
similarity index 100%
rename from wiki/base/__init__.py
rename to cybertools/wiki/base/__init__.py
diff --git a/wiki/base/config.py b/cybertools/wiki/base/config.py
similarity index 100%
rename from wiki/base/config.py
rename to cybertools/wiki/base/config.py
diff --git a/wiki/base/link.py b/cybertools/wiki/base/link.py
similarity index 100%
rename from wiki/base/link.py
rename to cybertools/wiki/base/link.py
diff --git a/wiki/base/media.py b/cybertools/wiki/base/media.py
similarity index 100%
rename from wiki/base/media.py
rename to cybertools/wiki/base/media.py
diff --git a/wiki/base/wiki.py b/cybertools/wiki/base/wiki.py
similarity index 100%
rename from wiki/base/wiki.py
rename to cybertools/wiki/base/wiki.py
diff --git a/wiki/browser/__init__.py b/cybertools/wiki/browser/__init__.py
similarity index 100%
rename from wiki/browser/__init__.py
rename to cybertools/wiki/browser/__init__.py
diff --git a/wiki/browser/default.pt b/cybertools/wiki/browser/default.pt
similarity index 100%
rename from wiki/browser/default.pt
rename to cybertools/wiki/browser/default.pt
diff --git a/wiki/browser/media.pt b/cybertools/wiki/browser/media.pt
similarity index 100%
rename from wiki/browser/media.pt
rename to cybertools/wiki/browser/media.pt
diff --git a/wiki/browser/media.py b/cybertools/wiki/browser/media.py
similarity index 100%
rename from wiki/browser/media.py
rename to cybertools/wiki/browser/media.py
diff --git a/wiki/browser/view.py b/cybertools/wiki/browser/view.py
similarity index 100%
rename from wiki/browser/view.py
rename to cybertools/wiki/browser/view.py
diff --git a/wiki/common.py b/cybertools/wiki/common.py
similarity index 100%
rename from wiki/common.py
rename to cybertools/wiki/common.py
diff --git a/wiki/dcu/__init__.py b/cybertools/wiki/dcu/__init__.py
similarity index 100%
rename from wiki/dcu/__init__.py
rename to cybertools/wiki/dcu/__init__.py
diff --git a/wiki/dcu/html.py b/cybertools/wiki/dcu/html.py
similarity index 100%
rename from wiki/dcu/html.py
rename to cybertools/wiki/dcu/html.py
diff --git a/wiki/dcu/process.py b/cybertools/wiki/dcu/process.py
similarity index 100%
rename from wiki/dcu/process.py
rename to cybertools/wiki/dcu/process.py
diff --git a/wiki/dcu/rstx.py b/cybertools/wiki/dcu/rstx.py
similarity index 100%
rename from wiki/dcu/rstx.py
rename to cybertools/wiki/dcu/rstx.py
diff --git a/wiki/generic/__init__.py b/cybertools/wiki/generic/__init__.py
similarity index 100%
rename from wiki/generic/__init__.py
rename to cybertools/wiki/generic/__init__.py
diff --git a/wiki/generic/adapter.py b/cybertools/wiki/generic/adapter.py
similarity index 100%
rename from wiki/generic/adapter.py
rename to cybertools/wiki/generic/adapter.py
diff --git a/wiki/generic/mixin.py b/cybertools/wiki/generic/mixin.py
similarity index 100%
rename from wiki/generic/mixin.py
rename to cybertools/wiki/generic/mixin.py
diff --git a/wiki/interfaces.py b/cybertools/wiki/interfaces.py
similarity index 100%
rename from wiki/interfaces.py
rename to cybertools/wiki/interfaces.py
diff --git a/wiki/preproc/README.txt b/cybertools/wiki/preproc/README.txt
similarity index 100%
rename from wiki/preproc/README.txt
rename to cybertools/wiki/preproc/README.txt
diff --git a/wiki/preproc/__init__.py b/cybertools/wiki/preproc/__init__.py
similarity index 100%
rename from wiki/preproc/__init__.py
rename to cybertools/wiki/preproc/__init__.py
diff --git a/wiki/preproc/mediawiki.py b/cybertools/wiki/preproc/mediawiki.py
similarity index 100%
rename from wiki/preproc/mediawiki.py
rename to cybertools/wiki/preproc/mediawiki.py
diff --git a/wiki/tests.py b/cybertools/wiki/tests.py
similarity index 100%
rename from wiki/tests.py
rename to cybertools/wiki/tests.py
diff --git a/wiki/tracking/__init__.py b/cybertools/wiki/tracking/__init__.py
similarity index 100%
rename from wiki/tracking/__init__.py
rename to cybertools/wiki/tracking/__init__.py
diff --git a/wiki/tracking/link.py b/cybertools/wiki/tracking/link.py
similarity index 100%
rename from wiki/tracking/link.py
rename to cybertools/wiki/tracking/link.py
diff --git a/xedit/README.txt b/cybertools/xedit/README.txt
similarity index 100%
rename from xedit/README.txt
rename to cybertools/xedit/README.txt
diff --git a/xedit/__init__.py b/cybertools/xedit/__init__.py
similarity index 100%
rename from xedit/__init__.py
rename to cybertools/xedit/__init__.py
diff --git a/xedit/browser.py b/cybertools/xedit/browser.py
similarity index 100%
rename from xedit/browser.py
rename to cybertools/xedit/browser.py
diff --git a/xedit/configure.zcml b/cybertools/xedit/configure.zcml
similarity index 100%
rename from xedit/configure.zcml
rename to cybertools/xedit/configure.zcml
diff --git a/xedit/cybertools.xedit-configure.zcml b/cybertools/xedit/cybertools.xedit-configure.zcml
similarity index 100%
rename from xedit/cybertools.xedit-configure.zcml
rename to cybertools/xedit/cybertools.xedit-configure.zcml
diff --git a/xedit/edit.gif b/cybertools/xedit/edit.gif
similarity index 100%
rename from xedit/edit.gif
rename to cybertools/xedit/edit.gif
diff --git a/xedit/handler.py b/cybertools/xedit/handler.py
similarity index 100%
rename from xedit/handler.py
rename to cybertools/xedit/handler.py
diff --git a/xedit/interfaces.py b/cybertools/xedit/interfaces.py
similarity index 100%
rename from xedit/interfaces.py
rename to cybertools/xedit/interfaces.py
diff --git a/xedit/tests.py b/cybertools/xedit/tests.py
similarity index 100%
rename from xedit/tests.py
rename to cybertools/xedit/tests.py
diff --git a/xedit/xedit.pt b/cybertools/xedit/xedit.pt
similarity index 100%
rename from xedit/xedit.pt
rename to cybertools/xedit/xedit.pt
diff --git a/xml/README.txt b/cybertools/xml/README.txt
similarity index 100%
rename from xml/README.txt
rename to cybertools/xml/README.txt
diff --git a/xml/__init__.py b/cybertools/xml/__init__.py
similarity index 100%
rename from xml/__init__.py
rename to cybertools/xml/__init__.py
diff --git a/xml/element.py b/cybertools/xml/element.py
similarity index 100%
rename from xml/element.py
rename to cybertools/xml/element.py
diff --git a/xml/element.sav.py b/cybertools/xml/element.sav.py
similarity index 100%
rename from xml/element.sav.py
rename to cybertools/xml/element.sav.py
diff --git a/xml/tests.py b/cybertools/xml/tests.py
similarity index 100%
rename from xml/tests.py
rename to cybertools/xml/tests.py
diff --git a/z2/README.txt b/cybertools/z2/README.txt
similarity index 100%
rename from z2/README.txt
rename to cybertools/z2/README.txt
diff --git a/z2/__init__.py b/cybertools/z2/__init__.py
similarity index 100%
rename from z2/__init__.py
rename to cybertools/z2/__init__.py
diff --git a/z2/browser/__init__.py b/cybertools/z2/browser/__init__.py
similarity index 100%
rename from z2/browser/__init__.py
rename to cybertools/z2/browser/__init__.py
diff --git a/z2/browser/configure.zcml b/cybertools/z2/browser/configure.zcml
similarity index 100%
rename from z2/browser/configure.zcml
rename to cybertools/z2/browser/configure.zcml
diff --git a/z2/browser/main.pt b/cybertools/z2/browser/main.pt
similarity index 100%
rename from z2/browser/main.pt
rename to cybertools/z2/browser/main.pt
diff --git a/z2/browser/main_zmi.pt b/cybertools/z2/browser/main_zmi.pt
similarity index 100%
rename from z2/browser/main_zmi.pt
rename to cybertools/z2/browser/main_zmi.pt
diff --git a/z2/browser/view.py b/cybertools/z2/browser/view.py
similarity index 100%
rename from z2/browser/view.py
rename to cybertools/z2/browser/view.py
diff --git a/z2/configure.zcml b/cybertools/z2/configure.zcml
similarity index 100%
rename from z2/configure.zcml
rename to cybertools/z2/configure.zcml
diff --git a/z2/generic.py b/cybertools/z2/generic.py
similarity index 100%
rename from z2/generic.py
rename to cybertools/z2/generic.py
diff --git a/z2/intid/README.txt b/cybertools/z2/intid/README.txt
similarity index 100%
rename from z2/intid/README.txt
rename to cybertools/z2/intid/README.txt
diff --git a/z2/intid/__init__.py b/cybertools/z2/intid/__init__.py
similarity index 100%
rename from z2/intid/__init__.py
rename to cybertools/z2/intid/__init__.py
diff --git a/z2/intid/base.zcml b/cybertools/z2/intid/base.zcml
similarity index 100%
rename from z2/intid/base.zcml
rename to cybertools/z2/intid/base.zcml
diff --git a/z2/intid/browser.py b/cybertools/z2/intid/browser.py
similarity index 100%
rename from z2/intid/browser.py
rename to cybertools/z2/intid/browser.py
diff --git a/z2/intid/cmfdirectoryview.zcml b/cybertools/z2/intid/cmfdirectoryview.zcml
similarity index 100%
rename from z2/intid/cmfdirectoryview.zcml
rename to cybertools/z2/intid/cmfdirectoryview.zcml
diff --git a/z2/intid/configure.zcml b/cybertools/z2/intid/configure.zcml
similarity index 100%
rename from z2/intid/configure.zcml
rename to cybertools/z2/intid/configure.zcml
diff --git a/z2/intid/install.pt b/cybertools/z2/intid/install.pt
similarity index 100%
rename from z2/intid/install.pt
rename to cybertools/z2/intid/install.pt
diff --git a/z2/intid/intid.py b/cybertools/z2/intid/intid.py
similarity index 100%
rename from z2/intid/intid.py
rename to cybertools/z2/intid/intid.py
diff --git a/z2/intid/keyreference.py b/cybertools/z2/intid/keyreference.py
similarity index 100%
rename from z2/intid/keyreference.py
rename to cybertools/z2/intid/keyreference.py
diff --git a/z2/intid/lsm.py b/cybertools/z2/intid/lsm.py
similarity index 100%
rename from z2/intid/lsm.py
rename to cybertools/z2/intid/lsm.py
diff --git a/z2/intid/overrides.zcml b/cybertools/z2/intid/overrides.zcml
similarity index 100%
rename from z2/intid/overrides.zcml
rename to cybertools/z2/intid/overrides.zcml
diff --git a/z2/intid/registrations.pt b/cybertools/z2/intid/registrations.pt
similarity index 100%
rename from z2/intid/registrations.pt
rename to cybertools/z2/intid/registrations.pt
diff --git a/z2/intid/site.py b/cybertools/z2/intid/site.py
similarity index 100%
rename from z2/intid/site.py
rename to cybertools/z2/intid/site.py
diff --git a/z2/intid/subscriber.zcml b/cybertools/z2/intid/subscriber.zcml
similarity index 100%
rename from z2/intid/subscriber.zcml
rename to cybertools/z2/intid/subscriber.zcml
diff --git a/z2/intid/test.zcml b/cybertools/z2/intid/test.zcml
similarity index 100%
rename from z2/intid/test.zcml
rename to cybertools/z2/intid/test.zcml
diff --git a/z2/intid/tracking.txt b/cybertools/z2/intid/tracking.txt
similarity index 100%
rename from z2/intid/tracking.txt
rename to cybertools/z2/intid/tracking.txt
diff --git a/z2/intid/unreferenceable.py b/cybertools/z2/intid/unreferenceable.py
similarity index 100%
rename from z2/intid/unreferenceable.py
rename to cybertools/z2/intid/unreferenceable.py
diff --git a/z2/intid/utils.py b/cybertools/z2/intid/utils.py
similarity index 100%
rename from z2/intid/utils.py
rename to cybertools/z2/intid/utils.py
diff --git a/z2/intid/xx_ftests.py b/cybertools/z2/intid/xx_ftests.py
similarity index 100%
rename from z2/intid/xx_ftests.py
rename to cybertools/z2/intid/xx_ftests.py
diff --git a/z2/intid/xx_tests.py b/cybertools/z2/intid/xx_tests.py
similarity index 100%
rename from z2/intid/xx_tests.py
rename to cybertools/z2/intid/xx_tests.py
diff --git a/z2/tests.py b/cybertools/z2/tests.py
similarity index 100%
rename from z2/tests.py
rename to cybertools/z2/tests.py
diff --git a/z2/traversal.py b/cybertools/z2/traversal.py
similarity index 100%
rename from z2/traversal.py
rename to cybertools/z2/traversal.py
diff --git a/z2/util.py b/cybertools/z2/util.py
similarity index 100%
rename from z2/util.py
rename to cybertools/z2/util.py
diff --git a/zutil/README.txt b/cybertools/zutil/README.txt
similarity index 100%
rename from zutil/README.txt
rename to cybertools/zutil/README.txt
diff --git a/zutil/__init__.py b/cybertools/zutil/__init__.py
similarity index 100%
rename from zutil/__init__.py
rename to cybertools/zutil/__init__.py
diff --git a/zutil/jeep.py b/cybertools/zutil/jeep.py
similarity index 100%
rename from zutil/jeep.py
rename to cybertools/zutil/jeep.py
diff --git a/zutil/jeep.txt b/cybertools/zutil/jeep.txt
similarity index 100%
rename from zutil/jeep.txt
rename to cybertools/zutil/jeep.txt
diff --git a/zutil/rcache.py b/cybertools/zutil/rcache.py
similarity index 100%
rename from zutil/rcache.py
rename to cybertools/zutil/rcache.py
diff --git a/zutil/rcache.txt b/cybertools/zutil/rcache.txt
similarity index 100%
rename from zutil/rcache.txt
rename to cybertools/zutil/rcache.txt
diff --git a/zutil/tests.py b/cybertools/zutil/tests.py
similarity index 100%
rename from zutil/tests.py
rename to cybertools/zutil/tests.py