diff --git a/cloud/INSTALL b/INSTALL
similarity index 100%
rename from cloud/INSTALL
rename to INSTALL
diff --git a/cloud/blocktype/box/account.php b/blocktype/box/account.php
similarity index 100%
rename from cloud/blocktype/box/account.php
rename to blocktype/box/account.php
diff --git a/cloud/blocktype/box/callback.php b/blocktype/box/callback.php
similarity index 100%
rename from cloud/blocktype/box/callback.php
rename to blocktype/box/callback.php
diff --git a/cloud/blocktype/box/details.php b/blocktype/box/details.php
similarity index 100%
rename from cloud/blocktype/box/details.php
rename to blocktype/box/details.php
diff --git a/cloud/blocktype/box/download.php b/blocktype/box/download.php
similarity index 100%
rename from cloud/blocktype/box/download.php
rename to blocktype/box/download.php
diff --git a/cloud/blocktype/box/lang/en.utf8/blocktype.box.php b/blocktype/box/lang/en.utf8/blocktype.box.php
similarity index 100%
rename from cloud/blocktype/box/lang/en.utf8/blocktype.box.php
rename to blocktype/box/lang/en.utf8/blocktype.box.php
diff --git a/cloud/blocktype/box/lib.php b/blocktype/box/lib.php
similarity index 100%
rename from cloud/blocktype/box/lib.php
rename to blocktype/box/lib.php
diff --git a/cloud/blocktype/box/manage.php b/blocktype/box/manage.php
similarity index 100%
rename from cloud/blocktype/box/manage.php
rename to blocktype/box/manage.php
diff --git a/cloud/blocktype/box/preview.php b/blocktype/box/preview.php
similarity index 100%
rename from cloud/blocktype/box/preview.php
rename to blocktype/box/preview.php
diff --git a/cloud/blocktype/box/theme/raw/details.tpl b/blocktype/box/theme/raw/details.tpl
similarity index 100%
rename from cloud/blocktype/box/theme/raw/details.tpl
rename to blocktype/box/theme/raw/details.tpl
diff --git a/cloud/blocktype/box/theme/raw/embed.tpl b/blocktype/box/theme/raw/embed.tpl
similarity index 100%
rename from cloud/blocktype/box/theme/raw/embed.tpl
rename to blocktype/box/theme/raw/embed.tpl
diff --git a/cloud/blocktype/box/theme/raw/list.tpl b/blocktype/box/theme/raw/list.tpl
similarity index 100%
rename from cloud/blocktype/box/theme/raw/list.tpl
rename to blocktype/box/theme/raw/list.tpl
diff --git a/cloud/blocktype/box/theme/raw/manage.tpl b/blocktype/box/theme/raw/manage.tpl
similarity index 100%
rename from cloud/blocktype/box/theme/raw/manage.tpl
rename to blocktype/box/theme/raw/manage.tpl
diff --git a/cloud/blocktype/box/theme/raw/save.tpl b/blocktype/box/theme/raw/save.tpl
similarity index 100%
rename from cloud/blocktype/box/theme/raw/save.tpl
rename to blocktype/box/theme/raw/save.tpl
diff --git a/cloud/blocktype/box/theme/raw/static/images/logo.png b/blocktype/box/theme/raw/static/images/logo.png
similarity index 100%
rename from cloud/blocktype/box/theme/raw/static/images/logo.png
rename to blocktype/box/theme/raw/static/images/logo.png
diff --git a/cloud/blocktype/box/theme/raw/static/images/service.png b/blocktype/box/theme/raw/static/images/service.png
similarity index 100%
rename from cloud/blocktype/box/theme/raw/static/images/service.png
rename to blocktype/box/theme/raw/static/images/service.png
diff --git a/cloud/blocktype/box/theme/raw/static/images/thumb.png b/blocktype/box/theme/raw/static/images/thumb.png
similarity index 100%
rename from cloud/blocktype/box/theme/raw/static/images/thumb.png
rename to blocktype/box/theme/raw/static/images/thumb.png
diff --git a/cloud/blocktype/box/version.php b/blocktype/box/version.php
similarity index 100%
rename from cloud/blocktype/box/version.php
rename to blocktype/box/version.php
diff --git a/cloud/blocktype/dropbox/account.php b/blocktype/dropbox/account.php
similarity index 100%
rename from cloud/blocktype/dropbox/account.php
rename to blocktype/dropbox/account.php
diff --git a/cloud/blocktype/dropbox/callback.php b/blocktype/dropbox/callback.php
similarity index 100%
rename from cloud/blocktype/dropbox/callback.php
rename to blocktype/dropbox/callback.php
diff --git a/cloud/blocktype/dropbox/details.php b/blocktype/dropbox/details.php
similarity index 100%
rename from cloud/blocktype/dropbox/details.php
rename to blocktype/dropbox/details.php
diff --git a/cloud/blocktype/dropbox/download.php b/blocktype/dropbox/download.php
similarity index 100%
rename from cloud/blocktype/dropbox/download.php
rename to blocktype/dropbox/download.php
diff --git a/cloud/blocktype/dropbox/lang/en.utf8/blocktype.dropbox.php b/blocktype/dropbox/lang/en.utf8/blocktype.dropbox.php
similarity index 100%
rename from cloud/blocktype/dropbox/lang/en.utf8/blocktype.dropbox.php
rename to blocktype/dropbox/lang/en.utf8/blocktype.dropbox.php
diff --git a/cloud/blocktype/dropbox/lib.php b/blocktype/dropbox/lib.php
similarity index 100%
rename from cloud/blocktype/dropbox/lib.php
rename to blocktype/dropbox/lib.php
diff --git a/cloud/blocktype/dropbox/manage.php b/blocktype/dropbox/manage.php
similarity index 100%
rename from cloud/blocktype/dropbox/manage.php
rename to blocktype/dropbox/manage.php
diff --git a/cloud/blocktype/dropbox/preview.php b/blocktype/dropbox/preview.php
similarity index 100%
rename from cloud/blocktype/dropbox/preview.php
rename to blocktype/dropbox/preview.php
diff --git a/cloud/blocktype/dropbox/theme/raw/details.tpl b/blocktype/dropbox/theme/raw/details.tpl
similarity index 100%
rename from cloud/blocktype/dropbox/theme/raw/details.tpl
rename to blocktype/dropbox/theme/raw/details.tpl
diff --git a/cloud/blocktype/dropbox/theme/raw/list.tpl b/blocktype/dropbox/theme/raw/list.tpl
similarity index 100%
rename from cloud/blocktype/dropbox/theme/raw/list.tpl
rename to blocktype/dropbox/theme/raw/list.tpl
diff --git a/cloud/blocktype/dropbox/theme/raw/manage.tpl b/blocktype/dropbox/theme/raw/manage.tpl
similarity index 100%
rename from cloud/blocktype/dropbox/theme/raw/manage.tpl
rename to blocktype/dropbox/theme/raw/manage.tpl
diff --git a/cloud/blocktype/dropbox/theme/raw/save.tpl b/blocktype/dropbox/theme/raw/save.tpl
similarity index 100%
rename from cloud/blocktype/dropbox/theme/raw/save.tpl
rename to blocktype/dropbox/theme/raw/save.tpl
diff --git a/cloud/blocktype/dropbox/theme/raw/static/images/logo.png b/blocktype/dropbox/theme/raw/static/images/logo.png
similarity index 100%
rename from cloud/blocktype/dropbox/theme/raw/static/images/logo.png
rename to blocktype/dropbox/theme/raw/static/images/logo.png
diff --git a/cloud/blocktype/dropbox/theme/raw/static/images/service.png b/blocktype/dropbox/theme/raw/static/images/service.png
similarity index 100%
rename from cloud/blocktype/dropbox/theme/raw/static/images/service.png
rename to blocktype/dropbox/theme/raw/static/images/service.png
diff --git a/cloud/blocktype/dropbox/theme/raw/static/images/thumb.png b/blocktype/dropbox/theme/raw/static/images/thumb.png
similarity index 100%
rename from cloud/blocktype/dropbox/theme/raw/static/images/thumb.png
rename to blocktype/dropbox/theme/raw/static/images/thumb.png
diff --git a/cloud/blocktype/dropbox/version.php b/blocktype/dropbox/version.php
similarity index 100%
rename from cloud/blocktype/dropbox/version.php
rename to blocktype/dropbox/version.php
diff --git a/cloud/blocktype/googledrive/account.php b/blocktype/googledrive/account.php
similarity index 100%
rename from cloud/blocktype/googledrive/account.php
rename to blocktype/googledrive/account.php
diff --git a/cloud/blocktype/googledrive/callback.php b/blocktype/googledrive/callback.php
similarity index 100%
rename from cloud/blocktype/googledrive/callback.php
rename to blocktype/googledrive/callback.php
diff --git a/cloud/blocktype/googledrive/details.php b/blocktype/googledrive/details.php
similarity index 100%
rename from cloud/blocktype/googledrive/details.php
rename to blocktype/googledrive/details.php
diff --git a/cloud/blocktype/googledrive/download.php b/blocktype/googledrive/download.php
similarity index 100%
rename from cloud/blocktype/googledrive/download.php
rename to blocktype/googledrive/download.php
diff --git a/cloud/blocktype/googledrive/export.php b/blocktype/googledrive/export.php
similarity index 100%
rename from cloud/blocktype/googledrive/export.php
rename to blocktype/googledrive/export.php
diff --git a/cloud/blocktype/googledrive/lang/en.utf8/blocktype.googledrive.php b/blocktype/googledrive/lang/en.utf8/blocktype.googledrive.php
similarity index 100%
rename from cloud/blocktype/googledrive/lang/en.utf8/blocktype.googledrive.php
rename to blocktype/googledrive/lang/en.utf8/blocktype.googledrive.php
diff --git a/cloud/blocktype/googledrive/lib.php b/blocktype/googledrive/lib.php
similarity index 100%
rename from cloud/blocktype/googledrive/lib.php
rename to blocktype/googledrive/lib.php
diff --git a/cloud/blocktype/googledrive/manage.php b/blocktype/googledrive/manage.php
similarity index 100%
rename from cloud/blocktype/googledrive/manage.php
rename to blocktype/googledrive/manage.php
diff --git a/cloud/blocktype/googledrive/preview.php b/blocktype/googledrive/preview.php
similarity index 100%
rename from cloud/blocktype/googledrive/preview.php
rename to blocktype/googledrive/preview.php
diff --git a/cloud/blocktype/googledrive/theme/raw/details.tpl b/blocktype/googledrive/theme/raw/details.tpl
similarity index 100%
rename from cloud/blocktype/googledrive/theme/raw/details.tpl
rename to blocktype/googledrive/theme/raw/details.tpl
diff --git a/cloud/blocktype/googledrive/theme/raw/embed.tpl b/blocktype/googledrive/theme/raw/embed.tpl
similarity index 100%
rename from cloud/blocktype/googledrive/theme/raw/embed.tpl
rename to blocktype/googledrive/theme/raw/embed.tpl
diff --git a/cloud/blocktype/googledrive/theme/raw/export.tpl b/blocktype/googledrive/theme/raw/export.tpl
similarity index 100%
rename from cloud/blocktype/googledrive/theme/raw/export.tpl
rename to blocktype/googledrive/theme/raw/export.tpl
diff --git a/cloud/blocktype/googledrive/theme/raw/list.tpl b/blocktype/googledrive/theme/raw/list.tpl
similarity index 100%
rename from cloud/blocktype/googledrive/theme/raw/list.tpl
rename to blocktype/googledrive/theme/raw/list.tpl
diff --git a/cloud/blocktype/googledrive/theme/raw/manage.tpl b/blocktype/googledrive/theme/raw/manage.tpl
similarity index 100%
rename from cloud/blocktype/googledrive/theme/raw/manage.tpl
rename to blocktype/googledrive/theme/raw/manage.tpl
diff --git a/cloud/blocktype/googledrive/theme/raw/save.tpl b/blocktype/googledrive/theme/raw/save.tpl
similarity index 100%
rename from cloud/blocktype/googledrive/theme/raw/save.tpl
rename to blocktype/googledrive/theme/raw/save.tpl
diff --git a/cloud/blocktype/googledrive/theme/raw/static/images/logo.png b/blocktype/googledrive/theme/raw/static/images/logo.png
similarity index 100%
rename from cloud/blocktype/googledrive/theme/raw/static/images/logo.png
rename to blocktype/googledrive/theme/raw/static/images/logo.png
diff --git a/cloud/blocktype/googledrive/theme/raw/static/images/service.png b/blocktype/googledrive/theme/raw/static/images/service.png
similarity index 100%
rename from cloud/blocktype/googledrive/theme/raw/static/images/service.png
rename to blocktype/googledrive/theme/raw/static/images/service.png
diff --git a/cloud/blocktype/googledrive/theme/raw/static/images/thumb.png b/blocktype/googledrive/theme/raw/static/images/thumb.png
similarity index 100%
rename from cloud/blocktype/googledrive/theme/raw/static/images/thumb.png
rename to blocktype/googledrive/theme/raw/static/images/thumb.png
diff --git a/cloud/blocktype/googledrive/version.php b/blocktype/googledrive/version.php
similarity index 100%
rename from cloud/blocktype/googledrive/version.php
rename to blocktype/googledrive/version.php
diff --git a/cloud/blocktype/microsoftdrive/account.php b/blocktype/microsoftdrive/account.php
similarity index 100%
rename from cloud/blocktype/microsoftdrive/account.php
rename to blocktype/microsoftdrive/account.php
diff --git a/cloud/blocktype/microsoftdrive/callback.php b/blocktype/microsoftdrive/callback.php
similarity index 100%
rename from cloud/blocktype/microsoftdrive/callback.php
rename to blocktype/microsoftdrive/callback.php
diff --git a/cloud/blocktype/microsoftdrive/details.php b/blocktype/microsoftdrive/details.php
similarity index 100%
rename from cloud/blocktype/microsoftdrive/details.php
rename to blocktype/microsoftdrive/details.php
diff --git a/cloud/blocktype/microsoftdrive/download.php b/blocktype/microsoftdrive/download.php
similarity index 100%
rename from cloud/blocktype/microsoftdrive/download.php
rename to blocktype/microsoftdrive/download.php
diff --git a/cloud/blocktype/microsoftdrive/lang/en.utf8/blocktype.microsoftdrive.php b/blocktype/microsoftdrive/lang/en.utf8/blocktype.microsoftdrive.php
similarity index 100%
rename from cloud/blocktype/microsoftdrive/lang/en.utf8/blocktype.microsoftdrive.php
rename to blocktype/microsoftdrive/lang/en.utf8/blocktype.microsoftdrive.php
diff --git a/cloud/blocktype/microsoftdrive/lib.php b/blocktype/microsoftdrive/lib.php
similarity index 100%
rename from cloud/blocktype/microsoftdrive/lib.php
rename to blocktype/microsoftdrive/lib.php
diff --git a/cloud/blocktype/microsoftdrive/manage.php b/blocktype/microsoftdrive/manage.php
similarity index 100%
rename from cloud/blocktype/microsoftdrive/manage.php
rename to blocktype/microsoftdrive/manage.php
diff --git a/cloud/blocktype/microsoftdrive/preview.php b/blocktype/microsoftdrive/preview.php
similarity index 100%
rename from cloud/blocktype/microsoftdrive/preview.php
rename to blocktype/microsoftdrive/preview.php
diff --git a/cloud/blocktype/microsoftdrive/theme/raw/details.tpl b/blocktype/microsoftdrive/theme/raw/details.tpl
similarity index 100%
rename from cloud/blocktype/microsoftdrive/theme/raw/details.tpl
rename to blocktype/microsoftdrive/theme/raw/details.tpl
diff --git a/cloud/blocktype/microsoftdrive/theme/raw/embed.tpl b/blocktype/microsoftdrive/theme/raw/embed.tpl
similarity index 100%
rename from cloud/blocktype/microsoftdrive/theme/raw/embed.tpl
rename to blocktype/microsoftdrive/theme/raw/embed.tpl
diff --git a/cloud/blocktype/microsoftdrive/theme/raw/list.tpl b/blocktype/microsoftdrive/theme/raw/list.tpl
similarity index 100%
rename from cloud/blocktype/microsoftdrive/theme/raw/list.tpl
rename to blocktype/microsoftdrive/theme/raw/list.tpl
diff --git a/cloud/blocktype/microsoftdrive/theme/raw/manage.tpl b/blocktype/microsoftdrive/theme/raw/manage.tpl
similarity index 100%
rename from cloud/blocktype/microsoftdrive/theme/raw/manage.tpl
rename to blocktype/microsoftdrive/theme/raw/manage.tpl
diff --git a/cloud/blocktype/microsoftdrive/theme/raw/save.tpl b/blocktype/microsoftdrive/theme/raw/save.tpl
similarity index 100%
rename from cloud/blocktype/microsoftdrive/theme/raw/save.tpl
rename to blocktype/microsoftdrive/theme/raw/save.tpl
diff --git a/cloud/blocktype/microsoftdrive/theme/raw/static/images/logo.png b/blocktype/microsoftdrive/theme/raw/static/images/logo.png
similarity index 100%
rename from cloud/blocktype/microsoftdrive/theme/raw/static/images/logo.png
rename to blocktype/microsoftdrive/theme/raw/static/images/logo.png
diff --git a/cloud/blocktype/microsoftdrive/theme/raw/static/images/service.png b/blocktype/microsoftdrive/theme/raw/static/images/service.png
similarity index 100%
rename from cloud/blocktype/microsoftdrive/theme/raw/static/images/service.png
rename to blocktype/microsoftdrive/theme/raw/static/images/service.png
diff --git a/cloud/blocktype/microsoftdrive/theme/raw/static/images/thumb.png b/blocktype/microsoftdrive/theme/raw/static/images/thumb.png
similarity index 100%
rename from cloud/blocktype/microsoftdrive/theme/raw/static/images/thumb.png
rename to blocktype/microsoftdrive/theme/raw/static/images/thumb.png
diff --git a/cloud/blocktype/microsoftdrive/version.php b/blocktype/microsoftdrive/version.php
similarity index 100%
rename from cloud/blocktype/microsoftdrive/version.php
rename to blocktype/microsoftdrive/version.php
diff --git a/cloud/blocktype/owncloud/account.php b/blocktype/owncloud/account.php
similarity index 100%
rename from cloud/blocktype/owncloud/account.php
rename to blocktype/owncloud/account.php
diff --git a/cloud/blocktype/owncloud/details.php b/blocktype/owncloud/details.php
similarity index 100%
rename from cloud/blocktype/owncloud/details.php
rename to blocktype/owncloud/details.php
diff --git a/cloud/blocktype/owncloud/download.php b/blocktype/owncloud/download.php
similarity index 100%
rename from cloud/blocktype/owncloud/download.php
rename to blocktype/owncloud/download.php
diff --git a/cloud/blocktype/owncloud/lang/en.utf8/blocktype.owncloud.php b/blocktype/owncloud/lang/en.utf8/blocktype.owncloud.php
similarity index 100%
rename from cloud/blocktype/owncloud/lang/en.utf8/blocktype.owncloud.php
rename to blocktype/owncloud/lang/en.utf8/blocktype.owncloud.php
diff --git a/cloud/blocktype/owncloud/lib.php b/blocktype/owncloud/lib.php
similarity index 100%
rename from cloud/blocktype/owncloud/lib.php
rename to blocktype/owncloud/lib.php
diff --git a/cloud/blocktype/owncloud/manage.php b/blocktype/owncloud/manage.php
similarity index 100%
rename from cloud/blocktype/owncloud/manage.php
rename to blocktype/owncloud/manage.php
diff --git a/cloud/blocktype/owncloud/theme/raw/details.tpl b/blocktype/owncloud/theme/raw/details.tpl
similarity index 100%
rename from cloud/blocktype/owncloud/theme/raw/details.tpl
rename to blocktype/owncloud/theme/raw/details.tpl
diff --git a/cloud/blocktype/owncloud/theme/raw/list.tpl b/blocktype/owncloud/theme/raw/list.tpl
similarity index 100%
rename from cloud/blocktype/owncloud/theme/raw/list.tpl
rename to blocktype/owncloud/theme/raw/list.tpl
diff --git a/cloud/blocktype/owncloud/theme/raw/manage.tpl b/blocktype/owncloud/theme/raw/manage.tpl
similarity index 100%
rename from cloud/blocktype/owncloud/theme/raw/manage.tpl
rename to blocktype/owncloud/theme/raw/manage.tpl
diff --git a/cloud/blocktype/owncloud/theme/raw/save.tpl b/blocktype/owncloud/theme/raw/save.tpl
similarity index 100%
rename from cloud/blocktype/owncloud/theme/raw/save.tpl
rename to blocktype/owncloud/theme/raw/save.tpl
diff --git a/cloud/blocktype/owncloud/theme/raw/static/images/logo.png b/blocktype/owncloud/theme/raw/static/images/logo.png
similarity index 100%
rename from cloud/blocktype/owncloud/theme/raw/static/images/logo.png
rename to blocktype/owncloud/theme/raw/static/images/logo.png
diff --git a/cloud/blocktype/owncloud/theme/raw/static/images/service.png b/blocktype/owncloud/theme/raw/static/images/service.png
similarity index 100%
rename from cloud/blocktype/owncloud/theme/raw/static/images/service.png
rename to blocktype/owncloud/theme/raw/static/images/service.png
diff --git a/cloud/blocktype/owncloud/theme/raw/static/images/thumb.png b/blocktype/owncloud/theme/raw/static/images/thumb.png
similarity index 100%
rename from cloud/blocktype/owncloud/theme/raw/static/images/thumb.png
rename to blocktype/owncloud/theme/raw/static/images/thumb.png
diff --git a/cloud/blocktype/owncloud/version.php b/blocktype/owncloud/version.php
similarity index 100%
rename from cloud/blocktype/owncloud/version.php
rename to blocktype/owncloud/version.php
diff --git a/cloud/blocktype/picasa/account.php b/blocktype/picasa/account.php
similarity index 100%
rename from cloud/blocktype/picasa/account.php
rename to blocktype/picasa/account.php
diff --git a/cloud/blocktype/picasa/callback.php b/blocktype/picasa/callback.php
similarity index 100%
rename from cloud/blocktype/picasa/callback.php
rename to blocktype/picasa/callback.php
diff --git a/cloud/blocktype/picasa/details.php b/blocktype/picasa/details.php
similarity index 100%
rename from cloud/blocktype/picasa/details.php
rename to blocktype/picasa/details.php
diff --git a/cloud/blocktype/picasa/download.php b/blocktype/picasa/download.php
similarity index 100%
rename from cloud/blocktype/picasa/download.php
rename to blocktype/picasa/download.php
diff --git a/cloud/blocktype/picasa/lang/en.utf8/blocktype.picasa.php b/blocktype/picasa/lang/en.utf8/blocktype.picasa.php
similarity index 100%
rename from cloud/blocktype/picasa/lang/en.utf8/blocktype.picasa.php
rename to blocktype/picasa/lang/en.utf8/blocktype.picasa.php
diff --git a/cloud/blocktype/picasa/lib.php b/blocktype/picasa/lib.php
similarity index 100%
rename from cloud/blocktype/picasa/lib.php
rename to blocktype/picasa/lib.php
diff --git a/cloud/blocktype/picasa/manage.php b/blocktype/picasa/manage.php
similarity index 100%
rename from cloud/blocktype/picasa/manage.php
rename to blocktype/picasa/manage.php
diff --git a/cloud/blocktype/picasa/preview.php b/blocktype/picasa/preview.php
similarity index 100%
rename from cloud/blocktype/picasa/preview.php
rename to blocktype/picasa/preview.php
diff --git a/cloud/blocktype/picasa/theme/raw/details.tpl b/blocktype/picasa/theme/raw/details.tpl
similarity index 100%
rename from cloud/blocktype/picasa/theme/raw/details.tpl
rename to blocktype/picasa/theme/raw/details.tpl
diff --git a/cloud/blocktype/picasa/theme/raw/embed.tpl b/blocktype/picasa/theme/raw/embed.tpl
similarity index 100%
rename from cloud/blocktype/picasa/theme/raw/embed.tpl
rename to blocktype/picasa/theme/raw/embed.tpl
diff --git a/cloud/blocktype/picasa/theme/raw/list.tpl b/blocktype/picasa/theme/raw/list.tpl
similarity index 100%
rename from cloud/blocktype/picasa/theme/raw/list.tpl
rename to blocktype/picasa/theme/raw/list.tpl
diff --git a/cloud/blocktype/picasa/theme/raw/manage.tpl b/blocktype/picasa/theme/raw/manage.tpl
similarity index 100%
rename from cloud/blocktype/picasa/theme/raw/manage.tpl
rename to blocktype/picasa/theme/raw/manage.tpl
diff --git a/cloud/blocktype/picasa/theme/raw/save.tpl b/blocktype/picasa/theme/raw/save.tpl
similarity index 100%
rename from cloud/blocktype/picasa/theme/raw/save.tpl
rename to blocktype/picasa/theme/raw/save.tpl
diff --git a/cloud/blocktype/picasa/theme/raw/static/images/logo.png b/blocktype/picasa/theme/raw/static/images/logo.png
similarity index 100%
rename from cloud/blocktype/picasa/theme/raw/static/images/logo.png
rename to blocktype/picasa/theme/raw/static/images/logo.png
diff --git a/cloud/blocktype/picasa/theme/raw/static/images/service.png b/blocktype/picasa/theme/raw/static/images/service.png
similarity index 100%
rename from cloud/blocktype/picasa/theme/raw/static/images/service.png
rename to blocktype/picasa/theme/raw/static/images/service.png
diff --git a/cloud/blocktype/picasa/theme/raw/static/images/thumb.png b/blocktype/picasa/theme/raw/static/images/thumb.png
similarity index 100%
rename from cloud/blocktype/picasa/theme/raw/static/images/thumb.png
rename to blocktype/picasa/theme/raw/static/images/thumb.png
diff --git a/cloud/blocktype/picasa/version.php b/blocktype/picasa/version.php
similarity index 100%
rename from cloud/blocktype/picasa/version.php
rename to blocktype/picasa/version.php
diff --git a/cloud/blocktype/zotero/account.php b/blocktype/zotero/account.php
similarity index 100%
rename from cloud/blocktype/zotero/account.php
rename to blocktype/zotero/account.php
diff --git a/cloud/blocktype/zotero/callback.php b/blocktype/zotero/callback.php
similarity index 100%
rename from cloud/blocktype/zotero/callback.php
rename to blocktype/zotero/callback.php
diff --git a/cloud/blocktype/zotero/details.php b/blocktype/zotero/details.php
similarity index 100%
rename from cloud/blocktype/zotero/details.php
rename to blocktype/zotero/details.php
diff --git a/cloud/blocktype/zotero/download.php b/blocktype/zotero/download.php
similarity index 100%
rename from cloud/blocktype/zotero/download.php
rename to blocktype/zotero/download.php
diff --git a/cloud/blocktype/zotero/export.php b/blocktype/zotero/export.php
similarity index 100%
rename from cloud/blocktype/zotero/export.php
rename to blocktype/zotero/export.php
diff --git a/cloud/blocktype/zotero/js/configform.js b/blocktype/zotero/js/configform.js
similarity index 100%
rename from cloud/blocktype/zotero/js/configform.js
rename to blocktype/zotero/js/configform.js
diff --git a/cloud/blocktype/zotero/lang/en.utf8/blocktype.zotero.php b/blocktype/zotero/lang/en.utf8/blocktype.zotero.php
similarity index 100%
rename from cloud/blocktype/zotero/lang/en.utf8/blocktype.zotero.php
rename to blocktype/zotero/lang/en.utf8/blocktype.zotero.php
diff --git a/cloud/blocktype/zotero/lib.php b/blocktype/zotero/lib.php
similarity index 100%
rename from cloud/blocktype/zotero/lib.php
rename to blocktype/zotero/lib.php
diff --git a/cloud/blocktype/zotero/manage.php b/blocktype/zotero/manage.php
similarity index 100%
rename from cloud/blocktype/zotero/manage.php
rename to blocktype/zotero/manage.php
diff --git a/cloud/blocktype/zotero/theme/raw/collection.tpl b/blocktype/zotero/theme/raw/collection.tpl
similarity index 100%
rename from cloud/blocktype/zotero/theme/raw/collection.tpl
rename to blocktype/zotero/theme/raw/collection.tpl
diff --git a/cloud/blocktype/zotero/theme/raw/details.tpl b/blocktype/zotero/theme/raw/details.tpl
similarity index 100%
rename from cloud/blocktype/zotero/theme/raw/details.tpl
rename to blocktype/zotero/theme/raw/details.tpl
diff --git a/cloud/blocktype/zotero/theme/raw/item.tpl b/blocktype/zotero/theme/raw/item.tpl
similarity index 100%
rename from cloud/blocktype/zotero/theme/raw/item.tpl
rename to blocktype/zotero/theme/raw/item.tpl
diff --git a/cloud/blocktype/zotero/theme/raw/list.tpl b/blocktype/zotero/theme/raw/list.tpl
similarity index 100%
rename from cloud/blocktype/zotero/theme/raw/list.tpl
rename to blocktype/zotero/theme/raw/list.tpl
diff --git a/cloud/blocktype/zotero/theme/raw/manage.tpl b/blocktype/zotero/theme/raw/manage.tpl
similarity index 100%
rename from cloud/blocktype/zotero/theme/raw/manage.tpl
rename to blocktype/zotero/theme/raw/manage.tpl
diff --git a/cloud/blocktype/zotero/theme/raw/static/images/logo.png b/blocktype/zotero/theme/raw/static/images/logo.png
similarity index 100%
rename from cloud/blocktype/zotero/theme/raw/static/images/logo.png
rename to blocktype/zotero/theme/raw/static/images/logo.png
diff --git a/cloud/blocktype/zotero/theme/raw/static/images/service.png b/blocktype/zotero/theme/raw/static/images/service.png
similarity index 100%
rename from cloud/blocktype/zotero/theme/raw/static/images/service.png
rename to blocktype/zotero/theme/raw/static/images/service.png
diff --git a/cloud/blocktype/zotero/theme/raw/static/images/thumb.png b/blocktype/zotero/theme/raw/static/images/thumb.png
similarity index 100%
rename from cloud/blocktype/zotero/theme/raw/static/images/thumb.png
rename to blocktype/zotero/theme/raw/static/images/thumb.png
diff --git a/cloud/blocktype/zotero/version.php b/blocktype/zotero/version.php
similarity index 100%
rename from cloud/blocktype/zotero/version.php
rename to blocktype/zotero/version.php
diff --git a/cloud/cert/PEM and CRT formats.txt b/cert/PEM and CRT formats.txt
similarity index 100%
rename from cloud/cert/PEM and CRT formats.txt
rename to cert/PEM and CRT formats.txt
diff --git a/cloud/cert/cacert.crt b/cert/cacert.crt
similarity index 100%
rename from cloud/cert/cacert.crt
rename to cert/cacert.crt
diff --git a/cloud/cert/download latest cacert file.url b/cert/download latest cacert file.url
similarity index 100%
rename from cloud/cert/download latest cacert file.url
rename to cert/download latest cacert file.url
diff --git a/cloud/datatables/Readme.txt b/datatables/Readme.txt
similarity index 100%
rename from cloud/datatables/Readme.txt
rename to datatables/Readme.txt
diff --git a/cloud/datatables/css/demo_page.css b/datatables/css/demo_page.css
similarity index 100%
rename from cloud/datatables/css/demo_page.css
rename to datatables/css/demo_page.css
diff --git a/cloud/datatables/css/demo_table.css b/datatables/css/demo_table.css
similarity index 100%
rename from cloud/datatables/css/demo_table.css
rename to datatables/css/demo_table.css
diff --git a/cloud/datatables/css/demo_table_jui.css b/datatables/css/demo_table_jui.css
similarity index 100%
rename from cloud/datatables/css/demo_table_jui.css
rename to datatables/css/demo_table_jui.css
diff --git a/cloud/datatables/css/jquery.dataTables.css b/datatables/css/jquery.dataTables.css
similarity index 100%
rename from cloud/datatables/css/jquery.dataTables.css
rename to datatables/css/jquery.dataTables.css
diff --git a/cloud/datatables/css/jquery.dataTables_themeroller.css b/datatables/css/jquery.dataTables_themeroller.css
similarity index 100%
rename from cloud/datatables/css/jquery.dataTables_themeroller.css
rename to datatables/css/jquery.dataTables_themeroller.css
diff --git a/cloud/datatables/images/Sorting icons.psd b/datatables/images/Sorting icons.psd
similarity index 100%
rename from cloud/datatables/images/Sorting icons.psd
rename to datatables/images/Sorting icons.psd
diff --git a/cloud/datatables/images/back_disabled.png b/datatables/images/back_disabled.png
similarity index 100%
rename from cloud/datatables/images/back_disabled.png
rename to datatables/images/back_disabled.png
diff --git a/cloud/datatables/images/back_enabled.png b/datatables/images/back_enabled.png
similarity index 100%
rename from cloud/datatables/images/back_enabled.png
rename to datatables/images/back_enabled.png
diff --git a/cloud/datatables/images/back_enabled_hover.png b/datatables/images/back_enabled_hover.png
similarity index 100%
rename from cloud/datatables/images/back_enabled_hover.png
rename to datatables/images/back_enabled_hover.png
diff --git a/cloud/datatables/images/favicon.ico b/datatables/images/favicon.ico
similarity index 100%
rename from cloud/datatables/images/favicon.ico
rename to datatables/images/favicon.ico
diff --git a/cloud/datatables/images/forward_disabled.png b/datatables/images/forward_disabled.png
similarity index 100%
rename from cloud/datatables/images/forward_disabled.png
rename to datatables/images/forward_disabled.png
diff --git a/cloud/datatables/images/forward_enabled.png b/datatables/images/forward_enabled.png
similarity index 100%
rename from cloud/datatables/images/forward_enabled.png
rename to datatables/images/forward_enabled.png
diff --git a/cloud/datatables/images/forward_enabled_hover.png b/datatables/images/forward_enabled_hover.png
similarity index 100%
rename from cloud/datatables/images/forward_enabled_hover.png
rename to datatables/images/forward_enabled_hover.png
diff --git a/cloud/datatables/images/sort_asc.png b/datatables/images/sort_asc.png
similarity index 100%
rename from cloud/datatables/images/sort_asc.png
rename to datatables/images/sort_asc.png
diff --git a/cloud/datatables/images/sort_asc_disabled.png b/datatables/images/sort_asc_disabled.png
similarity index 100%
rename from cloud/datatables/images/sort_asc_disabled.png
rename to datatables/images/sort_asc_disabled.png
diff --git a/cloud/datatables/images/sort_both.png b/datatables/images/sort_both.png
similarity index 100%
rename from cloud/datatables/images/sort_both.png
rename to datatables/images/sort_both.png
diff --git a/cloud/datatables/images/sort_desc.png b/datatables/images/sort_desc.png
similarity index 100%
rename from cloud/datatables/images/sort_desc.png
rename to datatables/images/sort_desc.png
diff --git a/cloud/datatables/images/sort_desc_disabled.png b/datatables/images/sort_desc_disabled.png
similarity index 100%
rename from cloud/datatables/images/sort_desc_disabled.png
rename to datatables/images/sort_desc_disabled.png
diff --git a/cloud/datatables/js/jquery.dataTables.js b/datatables/js/jquery.dataTables.js
similarity index 100%
rename from cloud/datatables/js/jquery.dataTables.js
rename to datatables/js/jquery.dataTables.js
diff --git a/cloud/datatables/js/jquery.dataTables.min.js b/datatables/js/jquery.dataTables.min.js
similarity index 100%
rename from cloud/datatables/js/jquery.dataTables.min.js
rename to datatables/js/jquery.dataTables.min.js
diff --git a/cloud/datatables/js/jquery.js b/datatables/js/jquery.js
similarity index 100%
rename from cloud/datatables/js/jquery.js
rename to datatables/js/jquery.js
diff --git a/cloud/datatables/license-bsd.txt b/datatables/license-bsd.txt
similarity index 100%
rename from cloud/datatables/license-bsd.txt
rename to datatables/license-bsd.txt
diff --git a/cloud/form/elements/css_select.php b/form/elements/css_select.php
similarity index 100%
rename from cloud/form/elements/css_select.php
rename to form/elements/css_select.php
diff --git a/cloud/form/elements/datatables.json.php b/form/elements/datatables.json.php
similarity index 100%
rename from cloud/form/elements/datatables.json.php
rename to form/elements/datatables.json.php
diff --git a/cloud/form/elements/datatables.php b/form/elements/datatables.php
similarity index 100%
rename from cloud/form/elements/datatables.php
rename to form/elements/datatables.php
diff --git a/cloud/form/renderers/datatables.php b/form/renderers/datatables.php
similarity index 100%
rename from cloud/form/renderers/datatables.php
rename to form/renderers/datatables.php
diff --git a/cloud/icons/016x016.jpg b/icons/016x016.jpg
similarity index 100%
rename from cloud/icons/016x016.jpg
rename to icons/016x016.jpg
diff --git a/cloud/icons/016x016.png b/icons/016x016.png
similarity index 100%
rename from cloud/icons/016x016.png
rename to icons/016x016.png
diff --git a/cloud/icons/032x032.png b/icons/032x032.png
similarity index 100%
rename from cloud/icons/032x032.png
rename to icons/032x032.png
diff --git a/cloud/icons/048x048.png b/icons/048x048.png
similarity index 100%
rename from cloud/icons/048x048.png
rename to icons/048x048.png
diff --git a/cloud/icons/064x064.png b/icons/064x064.png
similarity index 100%
rename from cloud/icons/064x064.png
rename to icons/064x064.png
diff --git a/cloud/icons/080x080.png b/icons/080x080.png
similarity index 100%
rename from cloud/icons/080x080.png
rename to icons/080x080.png
diff --git a/cloud/icons/096x096.png b/icons/096x096.png
similarity index 100%
rename from cloud/icons/096x096.png
rename to icons/096x096.png
diff --git a/cloud/icons/100x080.jpg b/icons/100x080.jpg
similarity index 100%
rename from cloud/icons/100x080.jpg
rename to icons/100x080.jpg
diff --git a/cloud/icons/120x060.png b/icons/120x060.png
similarity index 100%
rename from cloud/icons/120x060.png
rename to icons/120x060.png
diff --git a/cloud/icons/128x128.png b/icons/128x128.png
similarity index 100%
rename from cloud/icons/128x128.png
rename to icons/128x128.png
diff --git a/cloud/icons/160x160.png b/icons/160x160.png
similarity index 100%
rename from cloud/icons/160x160.png
rename to icons/160x160.png
diff --git a/cloud/icons/300x090.gif b/icons/300x090.gif
similarity index 100%
rename from cloud/icons/300x090.gif
rename to icons/300x090.gif
diff --git a/cloud/icons/original.png b/icons/original.png
similarity index 100%
rename from cloud/icons/original.png
rename to icons/original.png
diff --git a/cloud/index.php b/index.php
similarity index 100%
rename from cloud/index.php
rename to index.php
diff --git a/cloud/lang/en.utf8/artefact.cloud.php b/lang/en.utf8/artefact.cloud.php
similarity index 100%
rename from cloud/lang/en.utf8/artefact.cloud.php
rename to lang/en.utf8/artefact.cloud.php
diff --git a/cloud/lang/sl.utf8/artefact.cloud.php b/lang/sl.utf8/artefact.cloud.php
similarity index 100%
rename from cloud/lang/sl.utf8/artefact.cloud.php
rename to lang/sl.utf8/artefact.cloud.php
diff --git a/cloud/lib.php b/lib.php
similarity index 100%
rename from cloud/lib.php
rename to lib.php
diff --git a/cloud/lib/oauth.php b/lib/oauth.php
similarity index 100%
rename from cloud/lib/oauth.php
rename to lib/oauth.php
diff --git a/cloud/theme/raw/account.tpl b/theme/raw/account.tpl
similarity index 100%
rename from cloud/theme/raw/account.tpl
rename to theme/raw/account.tpl
diff --git a/cloud/theme/raw/consent.tpl b/theme/raw/consent.tpl
similarity index 100%
rename from cloud/theme/raw/consent.tpl
rename to theme/raw/consent.tpl
diff --git a/cloud/theme/raw/index.tpl b/theme/raw/index.tpl
similarity index 100%
rename from cloud/theme/raw/index.tpl
rename to theme/raw/index.tpl
diff --git a/cloud/theme/raw/static/images/btn_download.png b/theme/raw/static/images/btn_download.png
similarity index 100%
rename from cloud/theme/raw/static/images/btn_download.png
rename to theme/raw/static/images/btn_download.png
diff --git a/cloud/theme/raw/static/images/btn_preview.png b/theme/raw/static/images/btn_preview.png
similarity index 100%
rename from cloud/theme/raw/static/images/btn_preview.png
rename to theme/raw/static/images/btn_preview.png
diff --git a/cloud/theme/raw/static/images/btn_save.png b/theme/raw/static/images/btn_save.png
similarity index 100%
rename from cloud/theme/raw/static/images/btn_save.png
rename to theme/raw/static/images/btn_save.png
diff --git a/cloud/theme/raw/static/images/delete.gif b/theme/raw/static/images/delete.gif
similarity index 100%
rename from cloud/theme/raw/static/images/delete.gif
rename to theme/raw/static/images/delete.gif
diff --git a/cloud/theme/raw/static/images/download.gif b/theme/raw/static/images/download.gif
similarity index 100%
rename from cloud/theme/raw/static/images/download.gif
rename to theme/raw/static/images/download.gif
diff --git a/cloud/theme/raw/static/images/empty.gif b/theme/raw/static/images/empty.gif
similarity index 100%
rename from cloud/theme/raw/static/images/empty.gif
rename to theme/raw/static/images/empty.gif
diff --git a/cloud/theme/raw/static/images/maharamessage.gif b/theme/raw/static/images/maharamessage.gif
similarity index 100%
rename from cloud/theme/raw/static/images/maharamessage.gif
rename to theme/raw/static/images/maharamessage.gif
diff --git a/cloud/theme/raw/static/images/parentfolder.png b/theme/raw/static/images/parentfolder.png
similarity index 100%
rename from cloud/theme/raw/static/images/parentfolder.png
rename to theme/raw/static/images/parentfolder.png
diff --git a/cloud/theme/raw/static/images/powered-by-mahara.gif b/theme/raw/static/images/powered-by-mahara.gif
similarity index 100%
rename from cloud/theme/raw/static/images/powered-by-mahara.gif
rename to theme/raw/static/images/powered-by-mahara.gif
diff --git a/cloud/theme/raw/static/images/save2mahara.gif b/theme/raw/static/images/save2mahara.gif
similarity index 100%
rename from cloud/theme/raw/static/images/save2mahara.gif
rename to theme/raw/static/images/save2mahara.gif
diff --git a/cloud/theme/raw/static/images/tag.png b/theme/raw/static/images/tag.png
similarity index 100%
rename from cloud/theme/raw/static/images/tag.png
rename to theme/raw/static/images/tag.png
diff --git a/cloud/theme/raw/static/images/zip.gif b/theme/raw/static/images/zip.gif
similarity index 100%
rename from cloud/theme/raw/static/images/zip.gif
rename to theme/raw/static/images/zip.gif
diff --git a/cloud/theme/raw/static/style/style.css b/theme/raw/static/style/style.css
similarity index 100%
rename from cloud/theme/raw/static/style/style.css
rename to theme/raw/static/style/style.css
diff --git a/cloud/version.php b/version.php
similarity index 78%
rename from cloud/version.php
rename to version.php
index 84d6b1b..398af65 100644
--- a/cloud/version.php
+++ b/version.php
@@ -12,5 +12,5 @@
 defined('INTERNAL') || die();
 
 $config = new StdClass;
-$config->version = 2015022500;
-$config->release = '15.04.2';
+$config->version = 2016040400;
+$config->release = '15.04.3';