diff --git a/modules/webstyle/lib/invenio.wsgi b/invenio.wsgi
similarity index 100%
rename from modules/webstyle/lib/invenio.wsgi
rename to invenio.wsgi
diff --git a/modules/bibauthorid/lib/__init__.py b/invenio/base/__init__.py
similarity index 100%
rename from modules/bibauthorid/lib/__init__.py
rename to invenio/base/__init__.py
diff --git a/modules/webstyle/lib/webinterface_handler_flask.py b/invenio/base/factory.py
similarity index 100%
rename from modules/webstyle/lib/webinterface_handler_flask.py
rename to invenio/base/factory.py
diff --git a/modules/webtag/lib/webtag_validators.py b/invenio/base/globals.py
similarity index 100%
rename from modules/webtag/lib/webtag_validators.py
rename to invenio/base/globals.py
diff --git a/modules/miscutil/lib/messages.py b/invenio/base/i18n.py
similarity index 100%
rename from modules/miscutil/lib/messages.py
rename to invenio/base/i18n.py
diff --git a/modules/miscutil/lib/inveniomanage.py b/invenio/base/manage.py
similarity index 100%
rename from modules/miscutil/lib/inveniomanage.py
rename to invenio/base/manage.py
diff --git a/modules/bibfield/lib/functions/__init__.py b/invenio/base/scripts/__init__.py
similarity index 100%
rename from modules/bibfield/lib/functions/__init__.py
rename to invenio/base/scripts/__init__.py
diff --git a/modules/miscutil/lib/apache_manager.py b/invenio/base/scripts/apache.py
similarity index 100%
rename from modules/miscutil/lib/apache_manager.py
rename to invenio/base/scripts/apache.py
diff --git a/modules/miscutil/lib/cache_manager.py b/invenio/base/scripts/cache.py
similarity index 100%
rename from modules/miscutil/lib/cache_manager.py
rename to invenio/base/scripts/cache.py
diff --git a/modules/miscutil/lib/config_manager.py b/invenio/base/scripts/config.py
similarity index 100%
rename from modules/miscutil/lib/config_manager.py
rename to invenio/base/scripts/config.py
diff --git a/modules/miscutil/lib/database_manager.py b/invenio/base/scripts/database.py
similarity index 100%
rename from modules/miscutil/lib/database_manager.py
rename to invenio/base/scripts/database.py
diff --git a/modules/miscutil/lib/demosite_manager.py b/invenio/base/scripts/demosite.py
similarity index 100%
rename from modules/miscutil/lib/demosite_manager.py
rename to invenio/base/scripts/demosite.py
diff --git a/modules/miscutil/lib/signalutils.py b/invenio/base/signals.py
similarity index 100%
rename from modules/miscutil/lib/signalutils.py
rename to invenio/base/signals.py
diff --git a/modules/webstyle/img/apple-touch-icon-114-precomposed.png b/invenio/base/static/apple-touch-icon-114-precomposed.png
similarity index 100%
rename from modules/webstyle/img/apple-touch-icon-114-precomposed.png
rename to invenio/base/static/apple-touch-icon-114-precomposed.png
diff --git a/modules/webstyle/img/apple-touch-icon-144-precomposed.png b/invenio/base/static/apple-touch-icon-144-precomposed.png
similarity index 100%
rename from modules/webstyle/img/apple-touch-icon-144-precomposed.png
rename to invenio/base/static/apple-touch-icon-144-precomposed.png
diff --git a/modules/webstyle/img/apple-touch-icon-57-precomposed.png b/invenio/base/static/apple-touch-icon-57-precomposed.png
similarity index 100%
rename from modules/webstyle/img/apple-touch-icon-57-precomposed.png
rename to invenio/base/static/apple-touch-icon-57-precomposed.png
diff --git a/modules/webstyle/img/apple-touch-icon-72-precomposed.png b/invenio/base/static/apple-touch-icon-72-precomposed.png
similarity index 100%
rename from modules/webstyle/img/apple-touch-icon-72-precomposed.png
rename to invenio/base/static/apple-touch-icon-72-precomposed.png
diff --git a/modules/miscutil/etc/ckeditor_scientificchar/ScientificChar.gif b/invenio/base/static/ckeditor/plugins/scientificchar/ScientificChar.gif
similarity index 100%
rename from modules/miscutil/etc/ckeditor_scientificchar/ScientificChar.gif
rename to invenio/base/static/ckeditor/plugins/scientificchar/ScientificChar.gif
diff --git a/modules/miscutil/etc/ckeditor_scientificchar/dialogs/scientificchar.js b/invenio/base/static/ckeditor/plugins/scientificchar/dialogs/scientificchar.js
similarity index 100%
rename from modules/miscutil/etc/ckeditor_scientificchar/dialogs/scientificchar.js
rename to invenio/base/static/ckeditor/plugins/scientificchar/dialogs/scientificchar.js
diff --git a/modules/miscutil/etc/ckeditor_scientificchar/lang/en.js b/invenio/base/static/ckeditor/plugins/scientificchar/lang/en.js
similarity index 100%
rename from modules/miscutil/etc/ckeditor_scientificchar/lang/en.js
rename to invenio/base/static/ckeditor/plugins/scientificchar/lang/en.js
diff --git a/modules/miscutil/etc/ckeditor_scientificchar/lang/fr.js b/invenio/base/static/ckeditor/plugins/scientificchar/lang/fr.js
similarity index 100%
rename from modules/miscutil/etc/ckeditor_scientificchar/lang/fr.js
rename to invenio/base/static/ckeditor/plugins/scientificchar/lang/fr.js
diff --git a/modules/miscutil/etc/ckeditor_scientificchar/plugin.js b/invenio/base/static/ckeditor/plugins/scientificchar/plugin.js
similarity index 100%
rename from modules/miscutil/etc/ckeditor_scientificchar/plugin.js
rename to invenio/base/static/ckeditor/plugins/scientificchar/plugin.js
diff --git a/modules/webstyle/css/invenio-ie7.css b/invenio/base/static/css/invenio-ie7.css
similarity index 100%
rename from modules/webstyle/css/invenio-ie7.css
rename to invenio/base/static/css/invenio-ie7.css
diff --git a/modules/webstyle/css/invenio.css b/invenio/base/static/css/invenio.css
similarity index 100%
rename from modules/webstyle/css/invenio.css
rename to invenio/base/static/css/invenio.css
diff --git a/modules/webstyle/css/jquery.ajaxPager.css b/invenio/base/static/css/jquery.ajaxPager.css
similarity index 100%
rename from modules/webstyle/css/jquery.ajaxPager.css
rename to invenio/base/static/css/jquery.ajaxPager.css
diff --git a/modules/bibencode/www/mejs-invenio.css b/invenio/base/static/css/mejs-invenio.css
similarity index 100%
rename from modules/bibencode/www/mejs-invenio.css
rename to invenio/base/static/css/mejs-invenio.css
diff --git a/modules/webstyle/css/tablesorter.css b/invenio/base/static/css/tablesorter.css
similarity index 100%
rename from modules/webstyle/css/tablesorter.css
rename to invenio/base/static/css/tablesorter.css
diff --git a/modules/bibencode/www/video_platform_record.css b/invenio/base/static/css/video_platform_record.css
similarity index 100%
rename from modules/bibencode/www/video_platform_record.css
rename to invenio/base/static/css/video_platform_record.css
diff --git a/modules/webstyle/img/favicon.ico b/invenio/base/static/favicon.ico
similarity index 100%
rename from modules/webstyle/img/favicon.ico
rename to invenio/base/static/favicon.ico
diff --git a/modules/webstyle/img/add-small.png b/invenio/base/static/img/add-small.png
similarity index 100%
rename from modules/webstyle/img/add-small.png
rename to invenio/base/static/img/add-small.png
diff --git a/modules/webstyle/img/add.png b/invenio/base/static/img/add.png
similarity index 100%
rename from modules/webstyle/img/add.png
rename to invenio/base/static/img/add.png
diff --git a/modules/webstyle/img/aid_90low_right.png b/invenio/base/static/img/aid_90low_right.png
similarity index 100%
rename from modules/webstyle/img/aid_90low_right.png
rename to invenio/base/static/img/aid_90low_right.png
diff --git a/modules/webstyle/img/aid_btn_blue.png b/invenio/base/static/img/aid_btn_blue.png
similarity index 100%
rename from modules/webstyle/img/aid_btn_blue.png
rename to invenio/base/static/img/aid_btn_blue.png
diff --git a/modules/webstyle/img/aid_btn_green.png b/invenio/base/static/img/aid_btn_green.png
similarity index 100%
rename from modules/webstyle/img/aid_btn_green.png
rename to invenio/base/static/img/aid_btn_green.png
diff --git a/modules/webstyle/img/aid_btn_red.png b/invenio/base/static/img/aid_btn_red.png
similarity index 100%
rename from modules/webstyle/img/aid_btn_red.png
rename to invenio/base/static/img/aid_btn_red.png
diff --git a/modules/webstyle/img/aid_check.png b/invenio/base/static/img/aid_check.png
similarity index 100%
rename from modules/webstyle/img/aid_check.png
rename to invenio/base/static/img/aid_check.png
diff --git a/modules/webstyle/img/aid_check_gray.png b/invenio/base/static/img/aid_check_gray.png
similarity index 100%
rename from modules/webstyle/img/aid_check_gray.png
rename to invenio/base/static/img/aid_check_gray.png
diff --git a/modules/webstyle/img/aid_denied.png b/invenio/base/static/img/aid_denied.png
similarity index 100%
rename from modules/webstyle/img/aid_denied.png
rename to invenio/base/static/img/aid_denied.png
diff --git a/modules/webstyle/img/aid_granted.png b/invenio/base/static/img/aid_granted.png
similarity index 100%
rename from modules/webstyle/img/aid_granted.png
rename to invenio/base/static/img/aid_granted.png
diff --git a/modules/webstyle/img/aid_info.gif b/invenio/base/static/img/aid_info.gif
similarity index 100%
rename from modules/webstyle/img/aid_info.gif
rename to invenio/base/static/img/aid_info.gif
diff --git a/modules/webstyle/img/aid_minus_16.png b/invenio/base/static/img/aid_minus_16.png
similarity index 100%
rename from modules/webstyle/img/aid_minus_16.png
rename to invenio/base/static/img/aid_minus_16.png
diff --git a/modules/webstyle/img/aid_operator.png b/invenio/base/static/img/aid_operator.png
similarity index 100%
rename from modules/webstyle/img/aid_operator.png
rename to invenio/base/static/img/aid_operator.png
diff --git a/modules/webstyle/img/aid_plus_16.png b/invenio/base/static/img/aid_plus_16.png
similarity index 100%
rename from modules/webstyle/img/aid_plus_16.png
rename to invenio/base/static/img/aid_plus_16.png
diff --git a/modules/webstyle/img/aid_reject.png b/invenio/base/static/img/aid_reject.png
similarity index 100%
rename from modules/webstyle/img/aid_reject.png
rename to invenio/base/static/img/aid_reject.png
diff --git a/modules/webstyle/img/aid_reject_gray.png b/invenio/base/static/img/aid_reject_gray.png
similarity index 100%
rename from modules/webstyle/img/aid_reject_gray.png
rename to invenio/base/static/img/aid_reject_gray.png
diff --git a/modules/webstyle/img/aid_reset.png b/invenio/base/static/img/aid_reset.png
similarity index 100%
rename from modules/webstyle/img/aid_reset.png
rename to invenio/base/static/img/aid_reset.png
diff --git a/modules/webstyle/img/aid_reset_gray.png b/invenio/base/static/img/aid_reset_gray.png
similarity index 100%
rename from modules/webstyle/img/aid_reset_gray.png
rename to invenio/base/static/img/aid_reset_gray.png
diff --git a/modules/webstyle/img/aid_to_other.png b/invenio/base/static/img/aid_to_other.png
similarity index 100%
rename from modules/webstyle/img/aid_to_other.png
rename to invenio/base/static/img/aid_to_other.png
diff --git a/modules/webstyle/img/aid_to_other_gray.png b/invenio/base/static/img/aid_to_other_gray.png
similarity index 100%
rename from modules/webstyle/img/aid_to_other_gray.png
rename to invenio/base/static/img/aid_to_other_gray.png
diff --git a/modules/webstyle/img/aid_warning_denied.png b/invenio/base/static/img/aid_warning_denied.png
similarity index 100%
rename from modules/webstyle/img/aid_warning_denied.png
rename to invenio/base/static/img/aid_warning_denied.png
diff --git a/modules/webstyle/img/aid_warning_granted.png b/invenio/base/static/img/aid_warning_granted.png
similarity index 100%
rename from modules/webstyle/img/aid_warning_granted.png
rename to invenio/base/static/img/aid_warning_granted.png
diff --git a/modules/webstyle/img/ajax-loader.gif b/invenio/base/static/img/ajax-loader.gif
similarity index 100%
rename from modules/webstyle/img/ajax-loader.gif
rename to invenio/base/static/img/ajax-loader.gif
diff --git a/modules/webstyle/img/answer_bad.gif b/invenio/base/static/img/answer_bad.gif
similarity index 100%
rename from modules/webstyle/img/answer_bad.gif
rename to invenio/base/static/img/answer_bad.gif
diff --git a/modules/webstyle/img/aol_icon_24.png b/invenio/base/static/img/aol_icon_24.png
similarity index 100%
rename from modules/webstyle/img/aol_icon_24.png
rename to invenio/base/static/img/aol_icon_24.png
diff --git a/modules/webstyle/img/aol_icon_48.png b/invenio/base/static/img/aol_icon_48.png
similarity index 100%
rename from modules/webstyle/img/aol_icon_48.png
rename to invenio/base/static/img/aol_icon_48.png
diff --git a/modules/webstyle/img/application_pdf.png b/invenio/base/static/img/application_pdf.png
similarity index 100%
rename from modules/webstyle/img/application_pdf.png
rename to invenio/base/static/img/application_pdf.png
diff --git a/modules/webstyle/img/arrow_down.gif b/invenio/base/static/img/arrow_down.gif
similarity index 100%
rename from modules/webstyle/img/arrow_down.gif
rename to invenio/base/static/img/arrow_down.gif
diff --git a/modules/webstyle/img/arrow_down2.png b/invenio/base/static/img/arrow_down2.png
similarity index 100%
rename from modules/webstyle/img/arrow_down2.png
rename to invenio/base/static/img/arrow_down2.png
diff --git a/modules/webstyle/img/arrow_link-icon-15x11-right.gif b/invenio/base/static/img/arrow_link-icon-15x11-right.gif
similarity index 100%
rename from modules/webstyle/img/arrow_link-icon-15x11-right.gif
rename to invenio/base/static/img/arrow_link-icon-15x11-right.gif
diff --git a/modules/webstyle/img/arrow_up.gif b/invenio/base/static/img/arrow_up.gif
similarity index 100%
rename from modules/webstyle/img/arrow_up.gif
rename to invenio/base/static/img/arrow_up.gif
diff --git a/modules/webstyle/img/arrow_up2.png b/invenio/base/static/img/arrow_up2.png
similarity index 100%
rename from modules/webstyle/img/arrow_up2.png
rename to invenio/base/static/img/arrow_up2.png
diff --git a/modules/webstyle/img/at.gif b/invenio/base/static/img/at.gif
similarity index 100%
rename from modules/webstyle/img/at.gif
rename to invenio/base/static/img/at.gif
diff --git a/modules/webstyle/img/balloon_arrow_left_shadow.png b/invenio/base/static/img/balloon_arrow_left_shadow.png
similarity index 100%
rename from modules/webstyle/img/balloon_arrow_left_shadow.png
rename to invenio/base/static/img/balloon_arrow_left_shadow.png
diff --git a/modules/webstyle/img/balloon_arrow_shadow.png b/invenio/base/static/img/balloon_arrow_shadow.png
similarity index 100%
rename from modules/webstyle/img/balloon_arrow_shadow.png
rename to invenio/base/static/img/balloon_arrow_shadow.png
diff --git a/modules/webstyle/img/balloon_bottom_left_shadow.png b/invenio/base/static/img/balloon_bottom_left_shadow.png
similarity index 100%
rename from modules/webstyle/img/balloon_bottom_left_shadow.png
rename to invenio/base/static/img/balloon_bottom_left_shadow.png
diff --git a/modules/webstyle/img/balloon_bottom_right_shadow.png b/invenio/base/static/img/balloon_bottom_right_shadow.png
similarity index 100%
rename from modules/webstyle/img/balloon_bottom_right_shadow.png
rename to invenio/base/static/img/balloon_bottom_right_shadow.png
diff --git a/modules/webstyle/img/balloon_bottom_shadow.png b/invenio/base/static/img/balloon_bottom_shadow.png
similarity index 100%
rename from modules/webstyle/img/balloon_bottom_shadow.png
rename to invenio/base/static/img/balloon_bottom_shadow.png
diff --git a/modules/webstyle/img/balloon_left_shadow.png b/invenio/base/static/img/balloon_left_shadow.png
similarity index 100%
rename from modules/webstyle/img/balloon_left_shadow.png
rename to invenio/base/static/img/balloon_left_shadow.png
diff --git a/modules/webstyle/img/balloon_right_shadow.png b/invenio/base/static/img/balloon_right_shadow.png
similarity index 100%
rename from modules/webstyle/img/balloon_right_shadow.png
rename to invenio/base/static/img/balloon_right_shadow.png
diff --git a/modules/webstyle/img/balloon_top_left_shadow.png b/invenio/base/static/img/balloon_top_left_shadow.png
similarity index 100%
rename from modules/webstyle/img/balloon_top_left_shadow.png
rename to invenio/base/static/img/balloon_top_left_shadow.png
diff --git a/modules/webstyle/img/balloon_top_right_shadow.png b/invenio/base/static/img/balloon_top_right_shadow.png
similarity index 100%
rename from modules/webstyle/img/balloon_top_right_shadow.png
rename to invenio/base/static/img/balloon_top_right_shadow.png
diff --git a/modules/webstyle/img/balloon_top_shadow.png b/invenio/base/static/img/balloon_top_shadow.png
similarity index 100%
rename from modules/webstyle/img/balloon_top_shadow.png
rename to invenio/base/static/img/balloon_top_shadow.png
diff --git a/modules/webstyle/img/bibedit_extract_url.png b/invenio/base/static/img/bibedit_extract_url.png
similarity index 100%
rename from modules/webstyle/img/bibedit_extract_url.png
rename to invenio/base/static/img/bibedit_extract_url.png
diff --git a/modules/webstyle/img/bibedit_tableview.png b/invenio/base/static/img/bibedit_tableview.png
similarity index 100%
rename from modules/webstyle/img/bibedit_tableview.png
rename to invenio/base/static/img/bibedit_tableview.png
diff --git a/modules/webstyle/img/bibedit_textmarc.png b/invenio/base/static/img/bibedit_textmarc.png
similarity index 100%
rename from modules/webstyle/img/bibedit_textmarc.png
rename to invenio/base/static/img/bibedit_textmarc.png
diff --git a/modules/webstyle/img/blankicon.gif b/invenio/base/static/img/blankicon.gif
similarity index 100%
rename from modules/webstyle/img/blankicon.gif
rename to invenio/base/static/img/blankicon.gif
diff --git a/modules/webstyle/img/blogger_icon_24.png b/invenio/base/static/img/blogger_icon_24.png
similarity index 100%
rename from modules/webstyle/img/blogger_icon_24.png
rename to invenio/base/static/img/blogger_icon_24.png
diff --git a/modules/webstyle/img/blogger_icon_48.png b/invenio/base/static/img/blogger_icon_48.png
similarity index 100%
rename from modules/webstyle/img/blogger_icon_48.png
rename to invenio/base/static/img/blogger_icon_48.png
diff --git a/modules/webstyle/img/blue_gradient.gif b/invenio/base/static/img/blue_gradient.gif
similarity index 100%
rename from modules/webstyle/img/blue_gradient.gif
rename to invenio/base/static/img/blue_gradient.gif
diff --git a/modules/webstyle/img/book_cover_placeholder.gif b/invenio/base/static/img/book_cover_placeholder.gif
similarity index 100%
rename from modules/webstyle/img/book_cover_placeholder.gif
rename to invenio/base/static/img/book_cover_placeholder.gif
diff --git a/modules/webstyle/img/bullet_toggle_minus.png b/invenio/base/static/img/bullet_toggle_minus.png
similarity index 100%
rename from modules/webstyle/img/bullet_toggle_minus.png
rename to invenio/base/static/img/bullet_toggle_minus.png
diff --git a/modules/webstyle/img/bullet_toggle_plus.png b/invenio/base/static/img/bullet_toggle_plus.png
similarity index 100%
rename from modules/webstyle/img/bullet_toggle_plus.png
rename to invenio/base/static/img/bullet_toggle_plus.png
diff --git a/modules/webstyle/img/circle_green.png b/invenio/base/static/img/circle_green.png
similarity index 100%
rename from modules/webstyle/img/circle_green.png
rename to invenio/base/static/img/circle_green.png
diff --git a/modules/webstyle/img/circle_red.png b/invenio/base/static/img/circle_red.png
similarity index 100%
rename from modules/webstyle/img/circle_red.png
rename to invenio/base/static/img/circle_red.png
diff --git a/modules/webstyle/img/compare.png b/invenio/base/static/img/compare.png
similarity index 100%
rename from modules/webstyle/img/compare.png
rename to invenio/base/static/img/compare.png
diff --git a/modules/webstyle/img/cross_red.gif b/invenio/base/static/img/cross_red.gif
similarity index 100%
rename from modules/webstyle/img/cross_red.gif
rename to invenio/base/static/img/cross_red.gif
diff --git a/modules/bibencode/www/default_avatar.png b/invenio/base/static/img/default_avatar.png
similarity index 100%
rename from modules/bibencode/www/default_avatar.png
rename to invenio/base/static/img/default_avatar.png
diff --git a/modules/webstyle/img/delete-big.png b/invenio/base/static/img/delete-big.png
similarity index 100%
rename from modules/webstyle/img/delete-big.png
rename to invenio/base/static/img/delete-big.png
diff --git a/modules/webstyle/img/delete-small.png b/invenio/base/static/img/delete-small.png
similarity index 100%
rename from modules/webstyle/img/delete-small.png
rename to invenio/base/static/img/delete-small.png
diff --git a/modules/webstyle/img/delete.png b/invenio/base/static/img/delete.png
similarity index 100%
rename from modules/webstyle/img/delete.png
rename to invenio/base/static/img/delete.png
diff --git a/modules/webstyle/img/description.gif b/invenio/base/static/img/description.gif
similarity index 100%
rename from modules/webstyle/img/description.gif
rename to invenio/base/static/img/description.gif
diff --git a/modules/webstyle/img/diff.png b/invenio/base/static/img/diff.png
similarity index 100%
rename from modules/webstyle/img/diff.png
rename to invenio/base/static/img/diff.png
diff --git a/modules/webstyle/img/document-preview.png b/invenio/base/static/img/document-preview.png
similarity index 100%
rename from modules/webstyle/img/document-preview.png
rename to invenio/base/static/img/document-preview.png
diff --git a/modules/webstyle/img/document-print.png b/invenio/base/static/img/document-print.png
similarity index 100%
rename from modules/webstyle/img/document-print.png
rename to invenio/base/static/img/document-print.png
diff --git a/modules/webstyle/img/dot.gif b/invenio/base/static/img/dot.gif
similarity index 100%
rename from modules/webstyle/img/dot.gif
rename to invenio/base/static/img/dot.gif
diff --git a/modules/webstyle/img/down-trans.gif b/invenio/base/static/img/down-trans.gif
similarity index 100%
rename from modules/webstyle/img/down-trans.gif
rename to invenio/base/static/img/down-trans.gif
diff --git a/modules/webstyle/img/down.gif b/invenio/base/static/img/down.gif
similarity index 100%
rename from modules/webstyle/img/down.gif
rename to invenio/base/static/img/down.gif
diff --git a/modules/webstyle/img/drop_down_menu_arrow_down_b.gif b/invenio/base/static/img/drop_down_menu_arrow_down_b.gif
similarity index 100%
rename from modules/webstyle/img/drop_down_menu_arrow_down_b.gif
rename to invenio/base/static/img/drop_down_menu_arrow_down_b.gif
diff --git a/modules/webstyle/img/drop_down_menu_arrow_down_g.gif b/invenio/base/static/img/drop_down_menu_arrow_down_g.gif
similarity index 100%
rename from modules/webstyle/img/drop_down_menu_arrow_down_g.gif
rename to invenio/base/static/img/drop_down_menu_arrow_down_g.gif
diff --git a/modules/webstyle/img/drop_down_menu_arrow_down_lb.gif b/invenio/base/static/img/drop_down_menu_arrow_down_lb.gif
similarity index 100%
rename from modules/webstyle/img/drop_down_menu_arrow_down_lb.gif
rename to invenio/base/static/img/drop_down_menu_arrow_down_lb.gif
diff --git a/modules/webstyle/img/drop_down_menu_arrow_down_w.gif b/invenio/base/static/img/drop_down_menu_arrow_down_w.gif
similarity index 100%
rename from modules/webstyle/img/drop_down_menu_arrow_down_w.gif
rename to invenio/base/static/img/drop_down_menu_arrow_down_w.gif
diff --git a/modules/webstyle/img/edit-paste.png b/invenio/base/static/img/edit-paste.png
similarity index 100%
rename from modules/webstyle/img/edit-paste.png
rename to invenio/base/static/img/edit-paste.png
diff --git a/modules/webstyle/img/edit1.gif b/invenio/base/static/img/edit1.gif
similarity index 100%
rename from modules/webstyle/img/edit1.gif
rename to invenio/base/static/img/edit1.gif
diff --git a/modules/webstyle/img/external-icon-light-8x8.gif b/invenio/base/static/img/external-icon-light-8x8.gif
similarity index 100%
rename from modules/webstyle/img/external-icon-light-8x8.gif
rename to invenio/base/static/img/external-icon-light-8x8.gif
diff --git a/modules/webstyle/img/eye.png b/invenio/base/static/img/eye.png
similarity index 100%
rename from modules/webstyle/img/eye.png
rename to invenio/base/static/img/eye.png
diff --git a/modules/webstyle/img/facebook_icon_24.png b/invenio/base/static/img/facebook_icon_24.png
similarity index 100%
rename from modules/webstyle/img/facebook_icon_24.png
rename to invenio/base/static/img/facebook_icon_24.png
diff --git a/modules/webstyle/img/facebook_icon_48.png b/invenio/base/static/img/facebook_icon_48.png
similarity index 100%
rename from modules/webstyle/img/facebook_icon_48.png
rename to invenio/base/static/img/facebook_icon_48.png
diff --git a/modules/webstyle/img/feed-icon-12x12.gif b/invenio/base/static/img/feed-icon-12x12.gif
similarity index 100%
rename from modules/webstyle/img/feed-icon-12x12.gif
rename to invenio/base/static/img/feed-icon-12x12.gif
diff --git a/modules/webstyle/img/file-icon-none-96x128.gif b/invenio/base/static/img/file-icon-none-96x128.gif
similarity index 100%
rename from modules/webstyle/img/file-icon-none-96x128.gif
rename to invenio/base/static/img/file-icon-none-96x128.gif
diff --git a/modules/webstyle/img/file-icon-text-12x16.gif b/invenio/base/static/img/file-icon-text-12x16.gif
similarity index 100%
rename from modules/webstyle/img/file-icon-text-12x16.gif
rename to invenio/base/static/img/file-icon-text-12x16.gif
diff --git a/modules/webstyle/img/file-icon-text-15x20.gif b/invenio/base/static/img/file-icon-text-15x20.gif
similarity index 100%
rename from modules/webstyle/img/file-icon-text-15x20.gif
rename to invenio/base/static/img/file-icon-text-15x20.gif
diff --git a/modules/webstyle/img/file-icon-text-34x48.gif b/invenio/base/static/img/file-icon-text-34x48.gif
similarity index 100%
rename from modules/webstyle/img/file-icon-text-34x48.gif
rename to invenio/base/static/img/file-icon-text-34x48.gif
diff --git a/modules/webstyle/img/file-icon-text-96x128.gif b/invenio/base/static/img/file-icon-text-96x128.gif
similarity index 100%
rename from modules/webstyle/img/file-icon-text-96x128.gif
rename to invenio/base/static/img/file-icon-text-96x128.gif
diff --git a/modules/webstyle/img/flickr_icon_24.png b/invenio/base/static/img/flickr_icon_24.png
similarity index 100%
rename from modules/webstyle/img/flickr_icon_24.png
rename to invenio/base/static/img/flickr_icon_24.png
diff --git a/modules/webstyle/img/flickr_icon_48.png b/invenio/base/static/img/flickr_icon_48.png
similarity index 100%
rename from modules/webstyle/img/flickr_icon_48.png
rename to invenio/base/static/img/flickr_icon_48.png
diff --git a/modules/webstyle/img/forbidden_left.gif b/invenio/base/static/img/forbidden_left.gif
similarity index 100%
rename from modules/webstyle/img/forbidden_left.gif
rename to invenio/base/static/img/forbidden_left.gif
diff --git a/modules/webstyle/img/forbidden_right.gif b/invenio/base/static/img/forbidden_right.gif
similarity index 100%
rename from modules/webstyle/img/forbidden_right.gif
rename to invenio/base/static/img/forbidden_right.gif
diff --git a/modules/webstyle/img/foursquare_icon_24.png b/invenio/base/static/img/foursquare_icon_24.png
similarity index 100%
rename from modules/webstyle/img/foursquare_icon_24.png
rename to invenio/base/static/img/foursquare_icon_24.png
diff --git a/modules/webstyle/img/foursquare_icon_48.png b/invenio/base/static/img/foursquare_icon_48.png
similarity index 100%
rename from modules/webstyle/img/foursquare_icon_48.png
rename to invenio/base/static/img/foursquare_icon_48.png
diff --git a/modules/webstyle/img/google_icon_24.png b/invenio/base/static/img/google_icon_24.png
similarity index 100%
rename from modules/webstyle/img/google_icon_24.png
rename to invenio/base/static/img/google_icon_24.png
diff --git a/modules/webstyle/img/google_icon_48.png b/invenio/base/static/img/google_icon_48.png
similarity index 100%
rename from modules/webstyle/img/google_icon_48.png
rename to invenio/base/static/img/google_icon_48.png
diff --git a/modules/webstyle/img/googleoauth2_icon_24.png b/invenio/base/static/img/googleoauth2_icon_24.png
similarity index 100%
rename from modules/webstyle/img/googleoauth2_icon_24.png
rename to invenio/base/static/img/googleoauth2_icon_24.png
diff --git a/modules/webstyle/img/googleoauth2_icon_48.png b/invenio/base/static/img/googleoauth2_icon_48.png
similarity index 100%
rename from modules/webstyle/img/googleoauth2_icon_48.png
rename to invenio/base/static/img/googleoauth2_icon_48.png
diff --git a/modules/webstyle/img/gradient-lightgray-1x100.gif b/invenio/base/static/img/gradient-lightgray-1x100.gif
similarity index 100%
rename from modules/webstyle/img/gradient-lightgray-1x100.gif
rename to invenio/base/static/img/gradient-lightgray-1x100.gif
diff --git a/modules/webstyle/img/gradient_tab-gray-1x23.gif b/invenio/base/static/img/gradient_tab-gray-1x23.gif
similarity index 100%
rename from modules/webstyle/img/gradient_tab-gray-1x23.gif
rename to invenio/base/static/img/gradient_tab-gray-1x23.gif
diff --git a/modules/webstyle/img/gradient_tab_on-gray-1x23.gif b/invenio/base/static/img/gradient_tab_on-gray-1x23.gif
similarity index 100%
rename from modules/webstyle/img/gradient_tab_on-gray-1x23.gif
rename to invenio/base/static/img/gradient_tab_on-gray-1x23.gif
diff --git a/modules/webstyle/img/group_admin.png b/invenio/base/static/img/group_admin.png
similarity index 100%
rename from modules/webstyle/img/group_admin.png
rename to invenio/base/static/img/group_admin.png
diff --git a/modules/webstyle/img/head.gif b/invenio/base/static/img/head.gif
similarity index 100%
rename from modules/webstyle/img/head.gif
rename to invenio/base/static/img/head.gif
diff --git a/modules/webstyle/img/header_background.gif b/invenio/base/static/img/header_background.gif
similarity index 100%
rename from modules/webstyle/img/header_background.gif
rename to invenio/base/static/img/header_background.gif
diff --git a/modules/webstyle/img/help.png b/invenio/base/static/img/help.png
similarity index 100%
rename from modules/webstyle/img/help.png
rename to invenio/base/static/img/help.png
diff --git a/modules/webstyle/img/icon-journal_Athanasius_Kircher_Atlantis.gif b/invenio/base/static/img/icon-journal_Athanasius_Kircher_Atlantis.gif
similarity index 100%
rename from modules/webstyle/img/icon-journal_Athanasius_Kircher_Atlantis.gif
rename to invenio/base/static/img/icon-journal_Athanasius_Kircher_Atlantis.gif
diff --git a/modules/webstyle/img/icon-journal_hms_beagle.gif b/invenio/base/static/img/icon-journal_hms_beagle.gif
similarity index 100%
rename from modules/webstyle/img/icon-journal_hms_beagle.gif
rename to invenio/base/static/img/icon-journal_hms_beagle.gif
diff --git a/modules/webstyle/img/iconcross.gif b/invenio/base/static/img/iconcross.gif
similarity index 100%
rename from modules/webstyle/img/iconcross.gif
rename to invenio/base/static/img/iconcross.gif
diff --git a/modules/webstyle/img/iconcross2.gif b/invenio/base/static/img/iconcross2.gif
similarity index 100%
rename from modules/webstyle/img/iconcross2.gif
rename to invenio/base/static/img/iconcross2.gif
diff --git a/modules/webstyle/img/iconeye.gif b/invenio/base/static/img/iconeye.gif
similarity index 100%
rename from modules/webstyle/img/iconeye.gif
rename to invenio/base/static/img/iconeye.gif
diff --git a/modules/webstyle/img/iconpen.gif b/invenio/base/static/img/iconpen.gif
similarity index 100%
rename from modules/webstyle/img/iconpen.gif
rename to invenio/base/static/img/iconpen.gif
diff --git a/modules/webstyle/img/indicator.gif b/invenio/base/static/img/indicator.gif
similarity index 100%
rename from modules/webstyle/img/indicator.gif
rename to invenio/base/static/img/indicator.gif
diff --git a/modules/webstyle/img/instagram_icon_24.png b/invenio/base/static/img/instagram_icon_24.png
similarity index 100%
rename from modules/webstyle/img/instagram_icon_24.png
rename to invenio/base/static/img/instagram_icon_24.png
diff --git a/modules/webstyle/img/instagram_icon_48.png b/invenio/base/static/img/instagram_icon_48.png
similarity index 100%
rename from modules/webstyle/img/instagram_icon_48.png
rename to invenio/base/static/img/instagram_icon_48.png
diff --git a/modules/webstyle/img/journal-template1.gif b/invenio/base/static/img/journal-template1.gif
similarity index 100%
rename from modules/webstyle/img/journal-template1.gif
rename to invenio/base/static/img/journal-template1.gif
diff --git a/modules/webstyle/img/journal-template2.gif b/invenio/base/static/img/journal-template2.gif
similarity index 100%
rename from modules/webstyle/img/journal-template2.gif
rename to invenio/base/static/img/journal-template2.gif
diff --git a/modules/webstyle/img/journal-template3.gif b/invenio/base/static/img/journal-template3.gif
similarity index 100%
rename from modules/webstyle/img/journal-template3.gif
rename to invenio/base/static/img/journal-template3.gif
diff --git a/modules/webstyle/img/journal-template4.gif b/invenio/base/static/img/journal-template4.gif
similarity index 100%
rename from modules/webstyle/img/journal-template4.gif
rename to invenio/base/static/img/journal-template4.gif
diff --git a/modules/webstyle/img/journal-template5.gif b/invenio/base/static/img/journal-template5.gif
similarity index 100%
rename from modules/webstyle/img/journal-template5.gif
rename to invenio/base/static/img/journal-template5.gif
diff --git a/modules/webstyle/img/journal_Athanasius_Kircher_Atlantis.gif b/invenio/base/static/img/journal_Athanasius_Kircher_Atlantis.gif
similarity index 100%
rename from modules/webstyle/img/journal_Athanasius_Kircher_Atlantis.gif
rename to invenio/base/static/img/journal_Athanasius_Kircher_Atlantis.gif
diff --git a/modules/webstyle/img/journal_content.png b/invenio/base/static/img/journal_content.png
similarity index 100%
rename from modules/webstyle/img/journal_content.png
rename to invenio/base/static/img/journal_content.png
diff --git a/modules/webstyle/img/journal_footer.png b/invenio/base/static/img/journal_footer.png
similarity index 100%
rename from modules/webstyle/img/journal_footer.png
rename to invenio/base/static/img/journal_footer.png
diff --git a/modules/webstyle/img/journal_footer2.png b/invenio/base/static/img/journal_footer2.png
similarity index 100%
rename from modules/webstyle/img/journal_footer2.png
rename to invenio/base/static/img/journal_footer2.png
diff --git a/modules/webstyle/img/journal_header.png b/invenio/base/static/img/journal_header.png
similarity index 100%
rename from modules/webstyle/img/journal_header.png
rename to invenio/base/static/img/journal_header.png
diff --git a/modules/webstyle/img/journal_hms_beagle.gif b/invenio/base/static/img/journal_hms_beagle.gif
similarity index 100%
rename from modules/webstyle/img/journal_hms_beagle.gif
rename to invenio/base/static/img/journal_hms_beagle.gif
diff --git a/modules/webstyle/img/journal_new.png b/invenio/base/static/img/journal_new.png
similarity index 100%
rename from modules/webstyle/img/journal_new.png
rename to invenio/base/static/img/journal_new.png
diff --git a/modules/webstyle/img/journal_virgin_forest.gif b/invenio/base/static/img/journal_virgin_forest.gif
similarity index 100%
rename from modules/webstyle/img/journal_virgin_forest.gif
rename to invenio/base/static/img/journal_virgin_forest.gif
diff --git a/modules/webstyle/img/journal_water_dog.gif b/invenio/base/static/img/journal_water_dog.gif
similarity index 100%
rename from modules/webstyle/img/journal_water_dog.gif
rename to invenio/base/static/img/journal_water_dog.gif
diff --git a/modules/webstyle/img/keep_sso_connection_alive.gif b/invenio/base/static/img/keep_sso_connection_alive.gif
similarity index 100%
rename from modules/webstyle/img/keep_sso_connection_alive.gif
rename to invenio/base/static/img/keep_sso_connection_alive.gif
diff --git a/modules/webstyle/img/last-right-part-trans.gif b/invenio/base/static/img/last-right-part-trans.gif
similarity index 100%
rename from modules/webstyle/img/last-right-part-trans.gif
rename to invenio/base/static/img/last-right-part-trans.gif
diff --git a/modules/webstyle/img/left-part-topless-trans.gif b/invenio/base/static/img/left-part-topless-trans.gif
similarity index 100%
rename from modules/webstyle/img/left-part-topless-trans.gif
rename to invenio/base/static/img/left-part-topless-trans.gif
diff --git a/modules/webstyle/img/left-part-trans.gif b/invenio/base/static/img/left-part-trans.gif
similarity index 100%
rename from modules/webstyle/img/left-part-trans.gif
rename to invenio/base/static/img/left-part-trans.gif
diff --git a/modules/webstyle/img/left-trans.gif b/invenio/base/static/img/left-trans.gif
similarity index 100%
rename from modules/webstyle/img/left-trans.gif
rename to invenio/base/static/img/left-trans.gif
diff --git a/modules/webstyle/img/left.gif b/invenio/base/static/img/left.gif
similarity index 100%
rename from modules/webstyle/img/left.gif
rename to invenio/base/static/img/left.gif
diff --git a/modules/webstyle/img/line-up-trans.gif b/invenio/base/static/img/line-up-trans.gif
similarity index 100%
rename from modules/webstyle/img/line-up-trans.gif
rename to invenio/base/static/img/line-up-trans.gif
diff --git a/modules/webstyle/img/line.gif b/invenio/base/static/img/line.gif
similarity index 100%
rename from modules/webstyle/img/line.gif
rename to invenio/base/static/img/line.gif
diff --git a/modules/webstyle/img/linkedin_icon_24.png b/invenio/base/static/img/linkedin_icon_24.png
similarity index 100%
rename from modules/webstyle/img/linkedin_icon_24.png
rename to invenio/base/static/img/linkedin_icon_24.png
diff --git a/modules/webstyle/img/linkedin_icon_48.png b/invenio/base/static/img/linkedin_icon_48.png
similarity index 100%
rename from modules/webstyle/img/linkedin_icon_48.png
rename to invenio/base/static/img/linkedin_icon_48.png
diff --git a/modules/webstyle/img/livejournal_icon_24.png b/invenio/base/static/img/livejournal_icon_24.png
similarity index 100%
rename from modules/webstyle/img/livejournal_icon_24.png
rename to invenio/base/static/img/livejournal_icon_24.png
diff --git a/modules/webstyle/img/livejournal_icon_48.png b/invenio/base/static/img/livejournal_icon_48.png
similarity index 100%
rename from modules/webstyle/img/livejournal_icon_48.png
rename to invenio/base/static/img/livejournal_icon_48.png
diff --git a/modules/webstyle/img/loading.gif b/invenio/base/static/img/loading.gif
similarity index 100%
rename from modules/webstyle/img/loading.gif
rename to invenio/base/static/img/loading.gif
diff --git a/modules/webstyle/img/logo_white.png b/invenio/base/static/img/logo_white.png
similarity index 100%
rename from modules/webstyle/img/logo_white.png
rename to invenio/base/static/img/logo_white.png
diff --git a/modules/webstyle/img/magnifying_minus.png b/invenio/base/static/img/magnifying_minus.png
similarity index 100%
rename from modules/webstyle/img/magnifying_minus.png
rename to invenio/base/static/img/magnifying_minus.png
diff --git a/modules/webstyle/img/magnifying_plus.png b/invenio/base/static/img/magnifying_plus.png
similarity index 100%
rename from modules/webstyle/img/magnifying_plus.png
rename to invenio/base/static/img/magnifying_plus.png
diff --git a/modules/webstyle/img/mail-icon-12x8.gif b/invenio/base/static/img/mail-icon-12x8.gif
similarity index 100%
rename from modules/webstyle/img/mail-icon-12x8.gif
rename to invenio/base/static/img/mail-icon-12x8.gif
diff --git a/modules/webstyle/img/mainmenu.gif b/invenio/base/static/img/mainmenu.gif
similarity index 100%
rename from modules/webstyle/img/mainmenu.gif
rename to invenio/base/static/img/mainmenu.gif
diff --git a/modules/webstyle/img/merge-small.png b/invenio/base/static/img/merge-small.png
similarity index 100%
rename from modules/webstyle/img/merge-small.png
rename to invenio/base/static/img/merge-small.png
diff --git a/modules/webstyle/img/merge.png b/invenio/base/static/img/merge.png
similarity index 100%
rename from modules/webstyle/img/merge.png
rename to invenio/base/static/img/merge.png
diff --git a/modules/webstyle/img/mergeNC.png b/invenio/base/static/img/mergeNC.png
similarity index 100%
rename from modules/webstyle/img/mergeNC.png
rename to invenio/base/static/img/mergeNC.png
diff --git a/modules/webstyle/img/minus-9x9.png b/invenio/base/static/img/minus-9x9.png
similarity index 100%
rename from modules/webstyle/img/minus-9x9.png
rename to invenio/base/static/img/minus-9x9.png
diff --git a/modules/webstyle/img/move.png b/invenio/base/static/img/move.png
similarity index 100%
rename from modules/webstyle/img/move.png
rename to invenio/base/static/img/move.png
diff --git a/modules/webstyle/img/move_from.gif b/invenio/base/static/img/move_from.gif
similarity index 100%
rename from modules/webstyle/img/move_from.gif
rename to invenio/base/static/img/move_from.gif
diff --git a/modules/webstyle/img/move_to.gif b/invenio/base/static/img/move_to.gif
similarity index 100%
rename from modules/webstyle/img/move_to.gif
rename to invenio/base/static/img/move_to.gif
diff --git a/modules/webstyle/img/myopenid_icon_24.png b/invenio/base/static/img/myopenid_icon_24.png
similarity index 100%
rename from modules/webstyle/img/myopenid_icon_24.png
rename to invenio/base/static/img/myopenid_icon_24.png
diff --git a/modules/webstyle/img/myopenid_icon_48.png b/invenio/base/static/img/myopenid_icon_48.png
similarity index 100%
rename from modules/webstyle/img/myopenid_icon_48.png
rename to invenio/base/static/img/myopenid_icon_48.png
diff --git a/modules/webstyle/img/myspace_icon_24.png b/invenio/base/static/img/myspace_icon_24.png
similarity index 100%
rename from modules/webstyle/img/myspace_icon_24.png
rename to invenio/base/static/img/myspace_icon_24.png
diff --git a/modules/webstyle/img/myspace_icon_48.png b/invenio/base/static/img/myspace_icon_48.png
similarity index 100%
rename from modules/webstyle/img/myspace_icon_48.png
rename to invenio/base/static/img/myspace_icon_48.png
diff --git a/modules/webstyle/img/myvidoop_icon_24.png b/invenio/base/static/img/myvidoop_icon_24.png
similarity index 100%
rename from modules/webstyle/img/myvidoop_icon_24.png
rename to invenio/base/static/img/myvidoop_icon_24.png
diff --git a/modules/webstyle/img/myvidoop_icon_48.png b/invenio/base/static/img/myvidoop_icon_48.png
similarity index 100%
rename from modules/webstyle/img/myvidoop_icon_48.png
rename to invenio/base/static/img/myvidoop_icon_48.png
diff --git a/modules/webstyle/img/noway.gif b/invenio/base/static/img/noway.gif
similarity index 100%
rename from modules/webstyle/img/noway.gif
rename to invenio/base/static/img/noway.gif
diff --git a/modules/webstyle/img/okay.gif b/invenio/base/static/img/okay.gif
similarity index 100%
rename from modules/webstyle/img/okay.gif
rename to invenio/base/static/img/okay.gif
diff --git a/modules/webstyle/img/openid_icon_24.png b/invenio/base/static/img/openid_icon_24.png
similarity index 100%
rename from modules/webstyle/img/openid_icon_24.png
rename to invenio/base/static/img/openid_icon_24.png
diff --git a/modules/webstyle/img/openid_icon_48.png b/invenio/base/static/img/openid_icon_48.png
similarity index 100%
rename from modules/webstyle/img/openid_icon_48.png
rename to invenio/base/static/img/openid_icon_48.png
diff --git a/modules/webstyle/img/orcid_icon_24.png b/invenio/base/static/img/orcid_icon_24.png
similarity index 100%
rename from modules/webstyle/img/orcid_icon_24.png
rename to invenio/base/static/img/orcid_icon_24.png
diff --git a/modules/webstyle/img/out.gif b/invenio/base/static/img/out.gif
similarity index 100%
rename from modules/webstyle/img/out.gif
rename to invenio/base/static/img/out.gif
diff --git a/modules/webstyle/img/page_edit.png b/invenio/base/static/img/page_edit.png
similarity index 100%
rename from modules/webstyle/img/page_edit.png
rename to invenio/base/static/img/page_edit.png
diff --git a/modules/webstyle/img/paper-texture-128x128.gif b/invenio/base/static/img/paper-texture-128x128.gif
similarity index 100%
rename from modules/webstyle/img/paper-texture-128x128.gif
rename to invenio/base/static/img/paper-texture-128x128.gif
diff --git a/modules/webstyle/img/paper_clip-72x72.gif b/invenio/base/static/img/paper_clip-72x72.gif
similarity index 100%
rename from modules/webstyle/img/paper_clip-72x72.gif
rename to invenio/base/static/img/paper_clip-72x72.gif
diff --git a/modules/webstyle/img/pix.png b/invenio/base/static/img/pix.png
similarity index 100%
rename from modules/webstyle/img/pix.png
rename to invenio/base/static/img/pix.png
diff --git a/modules/webstyle/img/plus-9x9.png b/invenio/base/static/img/plus-9x9.png
similarity index 100%
rename from modules/webstyle/img/plus-9x9.png
rename to invenio/base/static/img/plus-9x9.png
diff --git a/modules/webstyle/img/plus_orange.png b/invenio/base/static/img/plus_orange.png
similarity index 100%
rename from modules/webstyle/img/plus_orange.png
rename to invenio/base/static/img/plus_orange.png
diff --git a/modules/webstyle/img/r.gif b/invenio/base/static/img/r.gif
similarity index 100%
rename from modules/webstyle/img/r.gif
rename to invenio/base/static/img/r.gif
diff --git a/modules/webstyle/img/rcorners-gray-1280x18.gif b/invenio/base/static/img/rcorners-gray-1280x18.gif
similarity index 100%
rename from modules/webstyle/img/rcorners-gray-1280x18.gif
rename to invenio/base/static/img/rcorners-gray-1280x18.gif
diff --git a/modules/webstyle/img/rcorners-gray-1280x60-folded.gif b/invenio/base/static/img/rcorners-gray-1280x60-folded.gif
similarity index 100%
rename from modules/webstyle/img/rcorners-gray-1280x60-folded.gif
rename to invenio/base/static/img/rcorners-gray-1280x60-folded.gif
diff --git a/modules/webstyle/img/red_gradient.gif b/invenio/base/static/img/red_gradient.gif
similarity index 100%
rename from modules/webstyle/img/red_gradient.gif
rename to invenio/base/static/img/red_gradient.gif
diff --git a/modules/webstyle/img/ref_extract.png b/invenio/base/static/img/ref_extract.png
similarity index 100%
rename from modules/webstyle/img/ref_extract.png
rename to invenio/base/static/img/ref_extract.png
diff --git a/modules/webstyle/img/refresh.png b/invenio/base/static/img/refresh.png
similarity index 100%
rename from modules/webstyle/img/refresh.png
rename to invenio/base/static/img/refresh.png
diff --git a/modules/webstyle/img/replace.png b/invenio/base/static/img/replace.png
similarity index 100%
rename from modules/webstyle/img/replace.png
rename to invenio/base/static/img/replace.png
diff --git a/modules/webstyle/img/restricted.gif b/invenio/base/static/img/restricted.gif
similarity index 100%
rename from modules/webstyle/img/restricted.gif
rename to invenio/base/static/img/restricted.gif
diff --git a/modules/webstyle/img/right-part-topless-trans.gif b/invenio/base/static/img/right-part-topless-trans.gif
similarity index 100%
rename from modules/webstyle/img/right-part-topless-trans.gif
rename to invenio/base/static/img/right-part-topless-trans.gif
diff --git a/modules/webstyle/img/right-part-trans.gif b/invenio/base/static/img/right-part-trans.gif
similarity index 100%
rename from modules/webstyle/img/right-part-trans.gif
rename to invenio/base/static/img/right-part-trans.gif
diff --git a/modules/webstyle/img/right-trans.gif b/invenio/base/static/img/right-trans.gif
similarity index 100%
rename from modules/webstyle/img/right-trans.gif
rename to invenio/base/static/img/right-trans.gif
diff --git a/modules/webstyle/img/right.gif b/invenio/base/static/img/right.gif
similarity index 100%
rename from modules/webstyle/img/right.gif
rename to invenio/base/static/img/right.gif
diff --git a/modules/webstyle/img/rss.png b/invenio/base/static/img/rss.png
similarity index 100%
rename from modules/webstyle/img/rss.png
rename to invenio/base/static/img/rss.png
diff --git a/modules/webstyle/img/sb.gif b/invenio/base/static/img/sb.gif
similarity index 100%
rename from modules/webstyle/img/sb.gif
rename to invenio/base/static/img/sb.gif
diff --git a/modules/webstyle/img/sbm_guide_accessnumber.png b/invenio/base/static/img/sbm_guide_accessnumber.png
similarity index 100%
rename from modules/webstyle/img/sbm_guide_accessnumber.png
rename to invenio/base/static/img/sbm_guide_accessnumber.png
diff --git a/modules/webstyle/img/sbm_guide_approvals.png b/invenio/base/static/img/sbm_guide_approvals.png
similarity index 100%
rename from modules/webstyle/img/sbm_guide_approvals.png
rename to invenio/base/static/img/sbm_guide_approvals.png
diff --git a/modules/webstyle/img/sbm_guide_approve_button.png b/invenio/base/static/img/sbm_guide_approve_button.png
similarity index 100%
rename from modules/webstyle/img/sbm_guide_approve_button.png
rename to invenio/base/static/img/sbm_guide_approve_button.png
diff --git a/modules/webstyle/img/sbm_guide_browse.png b/invenio/base/static/img/sbm_guide_browse.png
similarity index 100%
rename from modules/webstyle/img/sbm_guide_browse.png
rename to invenio/base/static/img/sbm_guide_browse.png
diff --git a/modules/webstyle/img/sbm_guide_description.png b/invenio/base/static/img/sbm_guide_description.png
similarity index 100%
rename from modules/webstyle/img/sbm_guide_description.png
rename to invenio/base/static/img/sbm_guide_description.png
diff --git a/modules/webstyle/img/sbm_guide_login.png b/invenio/base/static/img/sbm_guide_login.png
similarity index 100%
rename from modules/webstyle/img/sbm_guide_login.png
rename to invenio/base/static/img/sbm_guide_login.png
diff --git a/modules/webstyle/img/sbm_guide_logout.png b/invenio/base/static/img/sbm_guide_logout.png
similarity index 100%
rename from modules/webstyle/img/sbm_guide_logout.png
rename to invenio/base/static/img/sbm_guide_logout.png
diff --git a/modules/webstyle/img/sbm_guide_modify_button.png b/invenio/base/static/img/sbm_guide_modify_button.png
similarity index 100%
rename from modules/webstyle/img/sbm_guide_modify_button.png
rename to invenio/base/static/img/sbm_guide_modify_button.png
diff --git a/modules/webstyle/img/sbm_guide_revise_button.png b/invenio/base/static/img/sbm_guide_revise_button.png
similarity index 100%
rename from modules/webstyle/img/sbm_guide_revise_button.png
rename to invenio/base/static/img/sbm_guide_revise_button.png
diff --git a/modules/webstyle/img/sbm_guide_submissions.png b/invenio/base/static/img/sbm_guide_submissions.png
similarity index 100%
rename from modules/webstyle/img/sbm_guide_submissions.png
rename to invenio/base/static/img/sbm_guide_submissions.png
diff --git a/modules/webstyle/img/sbm_guide_submit_button.png b/invenio/base/static/img/sbm_guide_submit_button.png
similarity index 100%
rename from modules/webstyle/img/sbm_guide_submit_button.png
rename to invenio/base/static/img/sbm_guide_submit_button.png
diff --git a/modules/webstyle/img/sbm_guide_subnumber.png b/invenio/base/static/img/sbm_guide_subnumber.png
similarity index 100%
rename from modules/webstyle/img/sbm_guide_subnumber.png
rename to invenio/base/static/img/sbm_guide_subnumber.png
diff --git a/modules/webstyle/img/sbm_guide_summary.png b/invenio/base/static/img/sbm_guide_summary.png
similarity index 100%
rename from modules/webstyle/img/sbm_guide_summary.png
rename to invenio/base/static/img/sbm_guide_summary.png
diff --git a/modules/webstyle/img/sciencewise.png b/invenio/base/static/img/sciencewise.png
similarity index 100%
rename from modules/webstyle/img/sciencewise.png
rename to invenio/base/static/img/sciencewise.png
diff --git a/modules/webstyle/img/sclose.gif b/invenio/base/static/img/sclose.gif
similarity index 100%
rename from modules/webstyle/img/sclose.gif
rename to invenio/base/static/img/sclose.gif
diff --git a/modules/webstyle/img/se.gif b/invenio/base/static/img/se.gif
similarity index 100%
rename from modules/webstyle/img/se.gif
rename to invenio/base/static/img/se.gif
diff --git a/modules/webstyle/img/search.png b/invenio/base/static/img/search.png
similarity index 100%
rename from modules/webstyle/img/search.png
rename to invenio/base/static/img/search.png
diff --git a/modules/webstyle/img/site_logo.gif b/invenio/base/static/img/site_logo.gif
similarity index 100%
rename from modules/webstyle/img/site_logo.gif
rename to invenio/base/static/img/site_logo.gif
diff --git a/modules/webstyle/img/site_logo_rss.png b/invenio/base/static/img/site_logo_rss.png
similarity index 100%
rename from modules/webstyle/img/site_logo_rss.png
rename to invenio/base/static/img/site_logo_rss.png
diff --git a/modules/webstyle/img/site_logo_small.gif b/invenio/base/static/img/site_logo_small.gif
similarity index 100%
rename from modules/webstyle/img/site_logo_small.gif
rename to invenio/base/static/img/site_logo_small.gif
diff --git a/modules/webstyle/img/smallbin.gif b/invenio/base/static/img/smallbin.gif
similarity index 100%
rename from modules/webstyle/img/smallbin.gif
rename to invenio/base/static/img/smallbin.gif
diff --git a/modules/webstyle/img/smalldown.gif b/invenio/base/static/img/smalldown.gif
similarity index 100%
rename from modules/webstyle/img/smalldown.gif
rename to invenio/base/static/img/smalldown.gif
diff --git a/modules/webstyle/img/smallfiles.gif b/invenio/base/static/img/smallfiles.gif
similarity index 100%
rename from modules/webstyle/img/smallfiles.gif
rename to invenio/base/static/img/smallfiles.gif
diff --git a/modules/webstyle/img/smallup.gif b/invenio/base/static/img/smallup.gif
similarity index 100%
rename from modules/webstyle/img/smallup.gif
rename to invenio/base/static/img/smallup.gif
diff --git a/modules/webstyle/img/smchk_gr.gif b/invenio/base/static/img/smchk_gr.gif
similarity index 100%
rename from modules/webstyle/img/smchk_gr.gif
rename to invenio/base/static/img/smchk_gr.gif
diff --git a/modules/webstyle/img/smchk_rd.gif b/invenio/base/static/img/smchk_rd.gif
similarity index 100%
rename from modules/webstyle/img/smchk_rd.gif
rename to invenio/base/static/img/smchk_rd.gif
diff --git a/modules/webstyle/img/sn.gif b/invenio/base/static/img/sn.gif
similarity index 100%
rename from modules/webstyle/img/sn.gif
rename to invenio/base/static/img/sn.gif
diff --git a/modules/webstyle/img/sp.gif b/invenio/base/static/img/sp.gif
similarity index 100%
rename from modules/webstyle/img/sp.gif
rename to invenio/base/static/img/sp.gif
diff --git a/modules/webstyle/img/star-icon-30x30.gif b/invenio/base/static/img/star-icon-30x30.gif
similarity index 100%
rename from modules/webstyle/img/star-icon-30x30.gif
rename to invenio/base/static/img/star-icon-30x30.gif
diff --git a/modules/webstyle/img/star_dot-icon-30x30.gif b/invenio/base/static/img/star_dot-icon-30x30.gif
similarity index 100%
rename from modules/webstyle/img/star_dot-icon-30x30.gif
rename to invenio/base/static/img/star_dot-icon-30x30.gif
diff --git a/modules/webstyle/img/star_empty-icon-30x30.gif b/invenio/base/static/img/star_empty-icon-30x30.gif
similarity index 100%
rename from modules/webstyle/img/star_empty-icon-30x30.gif
rename to invenio/base/static/img/star_empty-icon-30x30.gif
diff --git a/modules/webstyle/img/star_half-icon-30x30.gif b/invenio/base/static/img/star_half-icon-30x30.gif
similarity index 100%
rename from modules/webstyle/img/star_half-icon-30x30.gif
rename to invenio/base/static/img/star_half-icon-30x30.gif
diff --git a/modules/webstyle/img/stars-0-0.png b/invenio/base/static/img/stars-0-0.png
similarity index 100%
rename from modules/webstyle/img/stars-0-0.png
rename to invenio/base/static/img/stars-0-0.png
diff --git a/modules/webstyle/img/stars-0-5.png b/invenio/base/static/img/stars-0-5.png
similarity index 100%
rename from modules/webstyle/img/stars-0-5.png
rename to invenio/base/static/img/stars-0-5.png
diff --git a/modules/webstyle/img/stars-1-0.png b/invenio/base/static/img/stars-1-0.png
similarity index 100%
rename from modules/webstyle/img/stars-1-0.png
rename to invenio/base/static/img/stars-1-0.png
diff --git a/modules/webstyle/img/stars-1-5.png b/invenio/base/static/img/stars-1-5.png
similarity index 100%
rename from modules/webstyle/img/stars-1-5.png
rename to invenio/base/static/img/stars-1-5.png
diff --git a/modules/webstyle/img/stars-2-0.png b/invenio/base/static/img/stars-2-0.png
similarity index 100%
rename from modules/webstyle/img/stars-2-0.png
rename to invenio/base/static/img/stars-2-0.png
diff --git a/modules/webstyle/img/stars-2-5.png b/invenio/base/static/img/stars-2-5.png
similarity index 100%
rename from modules/webstyle/img/stars-2-5.png
rename to invenio/base/static/img/stars-2-5.png
diff --git a/modules/webstyle/img/stars-3-0.png b/invenio/base/static/img/stars-3-0.png
similarity index 100%
rename from modules/webstyle/img/stars-3-0.png
rename to invenio/base/static/img/stars-3-0.png
diff --git a/modules/webstyle/img/stars-3-5.png b/invenio/base/static/img/stars-3-5.png
similarity index 100%
rename from modules/webstyle/img/stars-3-5.png
rename to invenio/base/static/img/stars-3-5.png
diff --git a/modules/webstyle/img/stars-4-0.png b/invenio/base/static/img/stars-4-0.png
similarity index 100%
rename from modules/webstyle/img/stars-4-0.png
rename to invenio/base/static/img/stars-4-0.png
diff --git a/modules/webstyle/img/stars-4-5.png b/invenio/base/static/img/stars-4-5.png
similarity index 100%
rename from modules/webstyle/img/stars-4-5.png
rename to invenio/base/static/img/stars-4-5.png
diff --git a/modules/webstyle/img/stars-5-0.png b/invenio/base/static/img/stars-5-0.png
similarity index 100%
rename from modules/webstyle/img/stars-5-0.png
rename to invenio/base/static/img/stars-5-0.png
diff --git a/modules/webstyle/img/summary.gif b/invenio/base/static/img/summary.gif
similarity index 100%
rename from modules/webstyle/img/summary.gif
rename to invenio/base/static/img/summary.gif
diff --git a/modules/webstyle/img/table.png b/invenio/base/static/img/table.png
similarity index 100%
rename from modules/webstyle/img/table.png
rename to invenio/base/static/img/table.png
diff --git a/modules/webstyle/img/table_add.png b/invenio/base/static/img/table_add.png
similarity index 100%
rename from modules/webstyle/img/table_add.png
rename to invenio/base/static/img/table_add.png
diff --git a/modules/webstyle/img/table_delete.png b/invenio/base/static/img/table_delete.png
similarity index 100%
rename from modules/webstyle/img/table_delete.png
rename to invenio/base/static/img/table_delete.png
diff --git a/modules/webstyle/img/table_multiple.png b/invenio/base/static/img/table_multiple.png
similarity index 100%
rename from modules/webstyle/img/table_multiple.png
rename to invenio/base/static/img/table_multiple.png
diff --git a/modules/webstyle/img/table_row_delete.png b/invenio/base/static/img/table_row_delete.png
similarity index 100%
rename from modules/webstyle/img/table_row_delete.png
rename to invenio/base/static/img/table_row_delete.png
diff --git a/modules/webstyle/img/table_row_insert.png b/invenio/base/static/img/table_row_insert.png
similarity index 100%
rename from modules/webstyle/img/table_row_insert.png
rename to invenio/base/static/img/table_row_insert.png
diff --git a/modules/webstyle/img/table_sort.png b/invenio/base/static/img/table_sort.png
similarity index 100%
rename from modules/webstyle/img/table_sort.png
rename to invenio/base/static/img/table_sort.png
diff --git a/modules/webstyle/img/test b/invenio/base/static/img/test
similarity index 100%
rename from modules/webstyle/img/test
rename to invenio/base/static/img/test
diff --git a/modules/webstyle/img/test.foo b/invenio/base/static/img/test.foo
similarity index 100%
rename from modules/webstyle/img/test.foo
rename to invenio/base/static/img/test.foo
diff --git a/modules/webstyle/img/test.gif b/invenio/base/static/img/test.gif
similarity index 100%
rename from modules/webstyle/img/test.gif
rename to invenio/base/static/img/test.gif
diff --git a/modules/webstyle/img/testgif b/invenio/base/static/img/testgif
similarity index 100%
rename from modules/webstyle/img/testgif
rename to invenio/base/static/img/testgif
diff --git a/modules/webstyle/img/tick.gif b/invenio/base/static/img/tick.gif
similarity index 100%
rename from modules/webstyle/img/tick.gif
rename to invenio/base/static/img/tick.gif
diff --git a/modules/webstyle/img/tree_branch.gif b/invenio/base/static/img/tree_branch.gif
similarity index 100%
rename from modules/webstyle/img/tree_branch.gif
rename to invenio/base/static/img/tree_branch.gif
diff --git a/modules/webstyle/img/twitter_icon_24.png b/invenio/base/static/img/twitter_icon_24.png
similarity index 100%
rename from modules/webstyle/img/twitter_icon_24.png
rename to invenio/base/static/img/twitter_icon_24.png
diff --git a/modules/webstyle/img/twitter_icon_48.png b/invenio/base/static/img/twitter_icon_48.png
similarity index 100%
rename from modules/webstyle/img/twitter_icon_48.png
rename to invenio/base/static/img/twitter_icon_48.png
diff --git a/modules/webstyle/img/ui-anim_basic_16x16.gif b/invenio/base/static/img/ui-anim_basic_16x16.gif
similarity index 100%
rename from modules/webstyle/img/ui-anim_basic_16x16.gif
rename to invenio/base/static/img/ui-anim_basic_16x16.gif
diff --git a/modules/webstyle/img/up.gif b/invenio/base/static/img/up.gif
similarity index 100%
rename from modules/webstyle/img/up.gif
rename to invenio/base/static/img/up.gif
diff --git a/modules/webstyle/img/user-icon-1-16x16.gif b/invenio/base/static/img/user-icon-1-16x16.gif
similarity index 100%
rename from modules/webstyle/img/user-icon-1-16x16.gif
rename to invenio/base/static/img/user-icon-1-16x16.gif
diff --git a/modules/webstyle/img/user-icon-1-20x20.gif b/invenio/base/static/img/user-icon-1-20x20.gif
similarity index 100%
rename from modules/webstyle/img/user-icon-1-20x20.gif
rename to invenio/base/static/img/user-icon-1-20x20.gif
diff --git a/modules/webstyle/img/user-icon-1-24x24.gif b/invenio/base/static/img/user-icon-1-24x24.gif
similarity index 100%
rename from modules/webstyle/img/user-icon-1-24x24.gif
rename to invenio/base/static/img/user-icon-1-24x24.gif
diff --git a/modules/webstyle/img/verisign_icon_24.png b/invenio/base/static/img/verisign_icon_24.png
similarity index 100%
rename from modules/webstyle/img/verisign_icon_24.png
rename to invenio/base/static/img/verisign_icon_24.png
diff --git a/modules/webstyle/img/verisign_icon_48.png b/invenio/base/static/img/verisign_icon_48.png
similarity index 100%
rename from modules/webstyle/img/verisign_icon_48.png
rename to invenio/base/static/img/verisign_icon_48.png
diff --git a/modules/webstyle/img/waiting_or.gif b/invenio/base/static/img/waiting_or.gif
similarity index 100%
rename from modules/webstyle/img/waiting_or.gif
rename to invenio/base/static/img/waiting_or.gif
diff --git a/modules/webstyle/img/warning.png b/invenio/base/static/img/warning.png
similarity index 100%
rename from modules/webstyle/img/warning.png
rename to invenio/base/static/img/warning.png
diff --git a/modules/webstyle/img/wb-add-note.png b/invenio/base/static/img/wb-add-note.png
similarity index 100%
rename from modules/webstyle/img/wb-add-note.png
rename to invenio/base/static/img/wb-add-note.png
diff --git a/modules/webstyle/img/wb-copy-item.png b/invenio/base/static/img/wb-copy-item.png
similarity index 100%
rename from modules/webstyle/img/wb-copy-item.png
rename to invenio/base/static/img/wb-copy-item.png
diff --git a/modules/webstyle/img/wb-create-basket.png b/invenio/base/static/img/wb-create-basket.png
similarity index 100%
rename from modules/webstyle/img/wb-create-basket.png
rename to invenio/base/static/img/wb-create-basket.png
diff --git a/modules/webstyle/img/wb-delete-basket.png b/invenio/base/static/img/wb-delete-basket.png
similarity index 100%
rename from modules/webstyle/img/wb-delete-basket.png
rename to invenio/base/static/img/wb-delete-basket.png
diff --git a/modules/webstyle/img/wb-delete-item.png b/invenio/base/static/img/wb-delete-item.png
similarity index 100%
rename from modules/webstyle/img/wb-delete-item.png
rename to invenio/base/static/img/wb-delete-item.png
diff --git a/modules/webstyle/img/wb-edit-basket.png b/invenio/base/static/img/wb-edit-basket.png
similarity index 100%
rename from modules/webstyle/img/wb-edit-basket.png
rename to invenio/base/static/img/wb-edit-basket.png
diff --git a/modules/webstyle/img/wb-edit-topic.png b/invenio/base/static/img/wb-edit-topic.png
similarity index 100%
rename from modules/webstyle/img/wb-edit-topic.png
rename to invenio/base/static/img/wb-edit-topic.png
diff --git a/modules/webstyle/img/wb-external-item.png b/invenio/base/static/img/wb-external-item.png
similarity index 100%
rename from modules/webstyle/img/wb-external-item.png
rename to invenio/base/static/img/wb-external-item.png
diff --git a/modules/webstyle/img/wb-go-back.png b/invenio/base/static/img/wb-go-back.png
similarity index 100%
rename from modules/webstyle/img/wb-go-back.png
rename to invenio/base/static/img/wb-go-back.png
diff --git a/modules/webstyle/img/wb-move-item-down-disabled.png b/invenio/base/static/img/wb-move-item-down-disabled.png
similarity index 100%
rename from modules/webstyle/img/wb-move-item-down-disabled.png
rename to invenio/base/static/img/wb-move-item-down-disabled.png
diff --git a/modules/webstyle/img/wb-move-item-down.png b/invenio/base/static/img/wb-move-item-down.png
similarity index 100%
rename from modules/webstyle/img/wb-move-item-down.png
rename to invenio/base/static/img/wb-move-item-down.png
diff --git a/modules/webstyle/img/wb-move-item-up-disabled.png b/invenio/base/static/img/wb-move-item-up-disabled.png
similarity index 100%
rename from modules/webstyle/img/wb-move-item-up-disabled.png
rename to invenio/base/static/img/wb-move-item-up-disabled.png
diff --git a/modules/webstyle/img/wb-move-item-up.png b/invenio/base/static/img/wb-move-item-up.png
similarity index 100%
rename from modules/webstyle/img/wb-move-item-up.png
rename to invenio/base/static/img/wb-move-item-up.png
diff --git a/modules/webstyle/img/wb-next-item-disabled.png b/invenio/base/static/img/wb-next-item-disabled.png
similarity index 100%
rename from modules/webstyle/img/wb-next-item-disabled.png
rename to invenio/base/static/img/wb-next-item-disabled.png
diff --git a/modules/webstyle/img/wb-next-item.png b/invenio/base/static/img/wb-next-item.png
similarity index 100%
rename from modules/webstyle/img/wb-next-item.png
rename to invenio/base/static/img/wb-next-item.png
diff --git a/modules/webstyle/img/wb-notes.png b/invenio/base/static/img/wb-notes.png
similarity index 100%
rename from modules/webstyle/img/wb-notes.png
rename to invenio/base/static/img/wb-notes.png
diff --git a/modules/webstyle/img/wb-previous-item-disabled.png b/invenio/base/static/img/wb-previous-item-disabled.png
similarity index 100%
rename from modules/webstyle/img/wb-previous-item-disabled.png
rename to invenio/base/static/img/wb-previous-item-disabled.png
diff --git a/modules/webstyle/img/wb-previous-item.png b/invenio/base/static/img/wb-previous-item.png
similarity index 100%
rename from modules/webstyle/img/wb-previous-item.png
rename to invenio/base/static/img/wb-previous-item.png
diff --git a/modules/webstyle/img/wb-sort-asc.gif b/invenio/base/static/img/wb-sort-asc.gif
similarity index 100%
rename from modules/webstyle/img/wb-sort-asc.gif
rename to invenio/base/static/img/wb-sort-asc.gif
diff --git a/modules/webstyle/img/wb-sort-desc.gif b/invenio/base/static/img/wb-sort-desc.gif
similarity index 100%
rename from modules/webstyle/img/wb-sort-desc.gif
rename to invenio/base/static/img/wb-sort-desc.gif
diff --git a/modules/webstyle/img/wb-sort-none.gif b/invenio/base/static/img/wb-sort-none.gif
similarity index 100%
rename from modules/webstyle/img/wb-sort-none.gif
rename to invenio/base/static/img/wb-sort-none.gif
diff --git a/modules/webstyle/img/wb-subscribe.png b/invenio/base/static/img/wb-subscribe.png
similarity index 100%
rename from modules/webstyle/img/wb-subscribe.png
rename to invenio/base/static/img/wb-subscribe.png
diff --git a/modules/webstyle/img/wb-unsubscribe.png b/invenio/base/static/img/wb-unsubscribe.png
similarity index 100%
rename from modules/webstyle/img/wb-unsubscribe.png
rename to invenio/base/static/img/wb-unsubscribe.png
diff --git a/modules/webstyle/img/webbasket_create.png b/invenio/base/static/img/webbasket_create.png
similarity index 100%
rename from modules/webstyle/img/webbasket_create.png
rename to invenio/base/static/img/webbasket_create.png
diff --git a/modules/webstyle/img/webbasket_create_small.png b/invenio/base/static/img/webbasket_create_small.png
similarity index 100%
rename from modules/webstyle/img/webbasket_create_small.png
rename to invenio/base/static/img/webbasket_create_small.png
diff --git a/modules/webstyle/img/webbasket_delete.png b/invenio/base/static/img/webbasket_delete.png
similarity index 100%
rename from modules/webstyle/img/webbasket_delete.png
rename to invenio/base/static/img/webbasket_delete.png
diff --git a/modules/webstyle/img/webbasket_down.png b/invenio/base/static/img/webbasket_down.png
similarity index 100%
rename from modules/webstyle/img/webbasket_down.png
rename to invenio/base/static/img/webbasket_down.png
diff --git a/modules/webstyle/img/webbasket_extern.png b/invenio/base/static/img/webbasket_extern.png
similarity index 100%
rename from modules/webstyle/img/webbasket_extern.png
rename to invenio/base/static/img/webbasket_extern.png
diff --git a/modules/webstyle/img/webbasket_intern.png b/invenio/base/static/img/webbasket_intern.png
similarity index 100%
rename from modules/webstyle/img/webbasket_intern.png
rename to invenio/base/static/img/webbasket_intern.png
diff --git a/modules/webstyle/img/webbasket_move.png b/invenio/base/static/img/webbasket_move.png
similarity index 100%
rename from modules/webstyle/img/webbasket_move.png
rename to invenio/base/static/img/webbasket_move.png
diff --git a/modules/webstyle/img/webbasket_right.png b/invenio/base/static/img/webbasket_right.png
similarity index 100%
rename from modules/webstyle/img/webbasket_right.png
rename to invenio/base/static/img/webbasket_right.png
diff --git a/modules/webstyle/img/webbasket_ugs.png b/invenio/base/static/img/webbasket_ugs.png
similarity index 100%
rename from modules/webstyle/img/webbasket_ugs.png
rename to invenio/base/static/img/webbasket_ugs.png
diff --git a/modules/webstyle/img/webbasket_up.png b/invenio/base/static/img/webbasket_up.png
similarity index 100%
rename from modules/webstyle/img/webbasket_up.png
rename to invenio/base/static/img/webbasket_up.png
diff --git a/modules/webstyle/img/webbasket_us.png b/invenio/base/static/img/webbasket_us.png
similarity index 100%
rename from modules/webstyle/img/webbasket_us.png
rename to invenio/base/static/img/webbasket_us.png
diff --git a/modules/webstyle/img/webbasket_user.png b/invenio/base/static/img/webbasket_user.png
similarity index 100%
rename from modules/webstyle/img/webbasket_user.png
rename to invenio/base/static/img/webbasket_user.png
diff --git a/modules/webstyle/img/webbasket_usergroup.png b/invenio/base/static/img/webbasket_usergroup.png
similarity index 100%
rename from modules/webstyle/img/webbasket_usergroup.png
rename to invenio/base/static/img/webbasket_usergroup.png
diff --git a/modules/webstyle/img/webbasket_usergroup_gray.png b/invenio/base/static/img/webbasket_usergroup_gray.png
similarity index 100%
rename from modules/webstyle/img/webbasket_usergroup_gray.png
rename to invenio/base/static/img/webbasket_usergroup_gray.png
diff --git a/modules/webstyle/img/webbasket_world.png b/invenio/base/static/img/webbasket_world.png
similarity index 100%
rename from modules/webstyle/img/webbasket_world.png
rename to invenio/base/static/img/webbasket_world.png
diff --git a/modules/webstyle/img/webbasket_ws.png b/invenio/base/static/img/webbasket_ws.png
similarity index 100%
rename from modules/webstyle/img/webbasket_ws.png
rename to invenio/base/static/img/webbasket_ws.png
diff --git a/modules/webstyle/img/white_field.gif b/invenio/base/static/img/white_field.gif
similarity index 100%
rename from modules/webstyle/img/white_field.gif
rename to invenio/base/static/img/white_field.gif
diff --git a/modules/webstyle/img/wordpress_icon_24.png b/invenio/base/static/img/wordpress_icon_24.png
similarity index 100%
rename from modules/webstyle/img/wordpress_icon_24.png
rename to invenio/base/static/img/wordpress_icon_24.png
diff --git a/modules/webstyle/img/wordpress_icon_48.png b/invenio/base/static/img/wordpress_icon_48.png
similarity index 100%
rename from modules/webstyle/img/wordpress_icon_48.png
rename to invenio/base/static/img/wordpress_icon_48.png
diff --git a/modules/webstyle/img/wsignout.gif b/invenio/base/static/img/wsignout.gif
similarity index 100%
rename from modules/webstyle/img/wsignout.gif
rename to invenio/base/static/img/wsignout.gif
diff --git a/modules/webstyle/img/yahoo_icon_24.png b/invenio/base/static/img/yahoo_icon_24.png
similarity index 100%
rename from modules/webstyle/img/yahoo_icon_24.png
rename to invenio/base/static/img/yahoo_icon_24.png
diff --git a/modules/webstyle/img/yahoo_icon_48.png b/invenio/base/static/img/yahoo_icon_48.png
similarity index 100%
rename from modules/webstyle/img/yahoo_icon_48.png
rename to invenio/base/static/img/yahoo_icon_48.png
diff --git a/modules/webstyle/img/yammer_icon_24.png b/invenio/base/static/img/yammer_icon_24.png
similarity index 100%
rename from modules/webstyle/img/yammer_icon_24.png
rename to invenio/base/static/img/yammer_icon_24.png
diff --git a/modules/webstyle/img/yammer_icon_48.png b/invenio/base/static/img/yammer_icon_48.png
similarity index 100%
rename from modules/webstyle/img/yammer_icon_48.png
rename to invenio/base/static/img/yammer_icon_48.png
diff --git a/modules/webstyle/lib/bootstrap-select.js b/invenio/base/static/js/bootstrap-select.js
similarity index 100%
rename from modules/webstyle/lib/bootstrap-select.js
rename to invenio/base/static/js/bootstrap-select.js
diff --git a/modules/webstyle/etc/invenio-ckeditor-config.js b/invenio/base/static/js/ckeditor/invenio-ckeditor-config.js
similarity index 100%
rename from modules/webstyle/etc/invenio-ckeditor-config.js
rename to invenio/base/static/js/ckeditor/invenio-ckeditor-config.js
diff --git a/modules/webstyle/etc/invenio-ckeditor-content.css b/invenio/base/static/js/ckeditor/invenio-ckeditor-content.css
similarity index 100%
rename from modules/webstyle/etc/invenio-ckeditor-content.css
rename to invenio/base/static/js/ckeditor/invenio-ckeditor-content.css
diff --git a/modules/webstyle/etc/journal-editor-config.js b/invenio/base/static/js/ckeditor/journal-editor-config.js
similarity index 100%
rename from modules/webstyle/etc/journal-editor-config.js
rename to invenio/base/static/js/ckeditor/journal-editor-config.js
diff --git a/modules/webstyle/etc/journal-editor-styles.js b/invenio/base/static/js/ckeditor/journal-editor-styles.js
similarity index 100%
rename from modules/webstyle/etc/journal-editor-styles.js
rename to invenio/base/static/js/ckeditor/journal-editor-styles.js
diff --git a/modules/webstyle/etc/journal-editor-templates.js b/invenio/base/static/js/ckeditor/journal-editor-templates.js
similarity index 100%
rename from modules/webstyle/etc/journal-editor-templates.js
rename to invenio/base/static/js/ckeditor/journal-editor-templates.js
diff --git a/modules/webstyle/lib/invenio.js b/invenio/base/static/js/invenio.js
similarity index 100%
rename from modules/webstyle/lib/invenio.js
rename to invenio/base/static/js/invenio.js
diff --git a/modules/miscutil/lib/jquery.mathpreview.js b/invenio/base/static/js/jquery.mathpreview.js
similarity index 100%
rename from modules/miscutil/lib/jquery.mathpreview.js
rename to invenio/base/static/js/jquery.mathpreview.js
diff --git a/modules/bibencode/www/mejs-invenio.js b/invenio/base/static/js/mejs-invenio.js
similarity index 100%
rename from modules/bibencode/www/mejs-invenio.js
rename to invenio/base/static/js/mejs-invenio.js
diff --git a/modules/bibencode/www/video_platform_record.js b/invenio/base/static/js/video_platform_record.js
similarity index 100%
rename from modules/bibencode/www/video_platform_record.js
rename to invenio/base/static/js/video_platform_record.js
diff --git a/modules/webstyle/etc/templates/404.html b/invenio/base/templates/404.html
similarity index 100%
rename from modules/webstyle/etc/templates/404.html
rename to invenio/base/templates/404.html
diff --git a/modules/webstyle/etc/templates/_formhelpers.html b/invenio/base/templates/_formhelpers.html
similarity index 100%
rename from modules/webstyle/etc/templates/_formhelpers.html
rename to invenio/base/templates/_formhelpers.html
diff --git a/modules/miscutil/etc/templates/admin_base.html b/invenio/base/templates/admin_base.html
similarity index 100%
rename from modules/miscutil/etc/templates/admin_base.html
rename to invenio/base/templates/admin_base.html
diff --git a/modules/webstyle/etc/templates/breadcrumbs.html b/invenio/base/templates/breadcrumbs.html
similarity index 100%
rename from modules/webstyle/etc/templates/breadcrumbs.html
rename to invenio/base/templates/breadcrumbs.html
diff --git a/modules/webstyle/etc/templates/footer.html b/invenio/base/templates/footer.html
similarity index 100%
rename from modules/webstyle/etc/templates/footer.html
rename to invenio/base/templates/footer.html
diff --git a/modules/webstyle/etc/templates/header.html b/invenio/base/templates/header.html
similarity index 100%
rename from modules/webstyle/etc/templates/header.html
rename to invenio/base/templates/header.html
diff --git a/modules/miscutil/etc/templates/invenio-apache-vhost-ssl.conf.tpl b/invenio/base/templates/invenio-apache-vhost-ssl.conf.tpl
similarity index 100%
rename from modules/miscutil/etc/templates/invenio-apache-vhost-ssl.conf.tpl
rename to invenio/base/templates/invenio-apache-vhost-ssl.conf.tpl
diff --git a/modules/miscutil/etc/templates/invenio-apache-vhost.conf.tpl b/invenio/base/templates/invenio-apache-vhost.conf.tpl
similarity index 100%
rename from modules/miscutil/etc/templates/invenio-apache-vhost.conf.tpl
rename to invenio/base/templates/invenio-apache-vhost.conf.tpl
diff --git a/modules/miscutil/etc/templates/invenio-apache-vhost.tpl b/invenio/base/templates/invenio-apache-vhost.tpl
similarity index 100%
rename from modules/miscutil/etc/templates/invenio-apache-vhost.tpl
rename to invenio/base/templates/invenio-apache-vhost.tpl
diff --git a/modules/webstyle/etc/templates/legacy_page.html b/invenio/base/templates/legacy_page.html
similarity index 100%
rename from modules/webstyle/etc/templates/legacy_page.html
rename to invenio/base/templates/legacy_page.html
diff --git a/modules/miscutil/etc/templates/mail_html.tpl b/invenio/base/templates/mail_html.tpl
similarity index 100%
rename from modules/miscutil/etc/templates/mail_html.tpl
rename to invenio/base/templates/mail_html.tpl
diff --git a/modules/miscutil/etc/templates/mail_text.tpl b/invenio/base/templates/mail_text.tpl
similarity index 100%
rename from modules/miscutil/etc/templates/mail_text.tpl
rename to invenio/base/templates/mail_text.tpl
diff --git a/modules/webstyle/etc/templates/page.html b/invenio/base/templates/page.html
similarity index 100%
rename from modules/webstyle/etc/templates/page.html
rename to invenio/base/templates/page.html
diff --git a/po/af.po b/invenio/base/translations/af/LC_MESSAGES/messages.po
similarity index 100%
rename from po/af.po
rename to invenio/base/translations/af/LC_MESSAGES/messages.po
diff --git a/po/ar.po b/invenio/base/translations/ar/LC_MESSAGES/messages.po
similarity index 100%
rename from po/ar.po
rename to invenio/base/translations/ar/LC_MESSAGES/messages.po
diff --git a/po/bg.po b/invenio/base/translations/bg/LC_MESSAGES/messages.po
similarity index 100%
rename from po/bg.po
rename to invenio/base/translations/bg/LC_MESSAGES/messages.po
diff --git a/po/ca.po b/invenio/base/translations/ca/LC_MESSAGES/messages.po
similarity index 100%
rename from po/ca.po
rename to invenio/base/translations/ca/LC_MESSAGES/messages.po
diff --git a/po/cs.po b/invenio/base/translations/cs/LC_MESSAGES/messages.po
similarity index 100%
rename from po/cs.po
rename to invenio/base/translations/cs/LC_MESSAGES/messages.po
diff --git a/po/de.po b/invenio/base/translations/de/LC_MESSAGES/messages.po
similarity index 100%
rename from po/de.po
rename to invenio/base/translations/de/LC_MESSAGES/messages.po
diff --git a/po/el.po b/invenio/base/translations/el/LC_MESSAGES/messages.po
similarity index 100%
rename from po/el.po
rename to invenio/base/translations/el/LC_MESSAGES/messages.po
diff --git a/po/en.po b/invenio/base/translations/en/LC_MESSAGES/messages.po
similarity index 100%
rename from po/en.po
rename to invenio/base/translations/en/LC_MESSAGES/messages.po
diff --git a/po/es.po b/invenio/base/translations/es/LC_MESSAGES/messages.po
similarity index 100%
rename from po/es.po
rename to invenio/base/translations/es/LC_MESSAGES/messages.po
diff --git a/po/fr.po b/invenio/base/translations/fr/LC_MESSAGES/messages.po
similarity index 100%
rename from po/fr.po
rename to invenio/base/translations/fr/LC_MESSAGES/messages.po
diff --git a/po/gl.po b/invenio/base/translations/gl/LC_MESSAGES/messages.po
similarity index 100%
rename from po/gl.po
rename to invenio/base/translations/gl/LC_MESSAGES/messages.po
diff --git a/po/hr.po b/invenio/base/translations/hr/LC_MESSAGES/messages.po
similarity index 100%
rename from po/hr.po
rename to invenio/base/translations/hr/LC_MESSAGES/messages.po
diff --git a/po/hu.po b/invenio/base/translations/hu/LC_MESSAGES/messages.po
similarity index 100%
rename from po/hu.po
rename to invenio/base/translations/hu/LC_MESSAGES/messages.po
diff --git a/po/invenio.pot b/invenio/base/translations/invenio.pot
similarity index 100%
rename from po/invenio.pot
rename to invenio/base/translations/invenio.pot
diff --git a/po/it.po b/invenio/base/translations/it/LC_MESSAGES/messages.po
similarity index 100%
rename from po/it.po
rename to invenio/base/translations/it/LC_MESSAGES/messages.po
diff --git a/po/ja.po b/invenio/base/translations/ja/LC_MESSAGES/messages.po
similarity index 100%
rename from po/ja.po
rename to invenio/base/translations/ja/LC_MESSAGES/messages.po
diff --git a/po/ka.po b/invenio/base/translations/ka/LC_MESSAGES/messages.po
similarity index 100%
rename from po/ka.po
rename to invenio/base/translations/ka/LC_MESSAGES/messages.po
diff --git a/po/lt.po b/invenio/base/translations/lt/LC_MESSAGES/messages.po
similarity index 100%
rename from po/lt.po
rename to invenio/base/translations/lt/LC_MESSAGES/messages.po
diff --git a/po/no.po b/invenio/base/translations/no/LC_MESSAGES/messages.po
similarity index 100%
rename from po/no.po
rename to invenio/base/translations/no/LC_MESSAGES/messages.po
diff --git a/po/pl.po b/invenio/base/translations/pl/LC_MESSAGES/messages.po
similarity index 100%
rename from po/pl.po
rename to invenio/base/translations/pl/LC_MESSAGES/messages.po
diff --git a/po/pt.po b/invenio/base/translations/pt/LC_MESSAGES/messages.po
similarity index 100%
rename from po/pt.po
rename to invenio/base/translations/pt/LC_MESSAGES/messages.po
diff --git a/po/ro.po b/invenio/base/translations/ro/LC_MESSAGES/messages.po
similarity index 100%
rename from po/ro.po
rename to invenio/base/translations/ro/LC_MESSAGES/messages.po
diff --git a/po/ru.po b/invenio/base/translations/ru/LC_MESSAGES/messages.po
similarity index 100%
rename from po/ru.po
rename to invenio/base/translations/ru/LC_MESSAGES/messages.po
diff --git a/po/rw.po b/invenio/base/translations/rw/LC_MESSAGES/messages.po
similarity index 100%
rename from po/rw.po
rename to invenio/base/translations/rw/LC_MESSAGES/messages.po
diff --git a/po/sk.po b/invenio/base/translations/sk/LC_MESSAGES/messages.po
similarity index 100%
rename from po/sk.po
rename to invenio/base/translations/sk/LC_MESSAGES/messages.po
diff --git a/po/sv.po b/invenio/base/translations/sv/LC_MESSAGES/messages.po
similarity index 100%
rename from po/sv.po
rename to invenio/base/translations/sv/LC_MESSAGES/messages.po
diff --git a/po/uk.po b/invenio/base/translations/uk/LC_MESSAGES/messages.po
similarity index 100%
rename from po/uk.po
rename to invenio/base/translations/uk/LC_MESSAGES/messages.po
diff --git a/po/zh_CN.po b/invenio/base/translations/zh_CN/LC_MESSAGES/messages.po
similarity index 100%
rename from po/zh_CN.po
rename to invenio/base/translations/zh_CN/LC_MESSAGES/messages.po
diff --git a/po/zh_TW.po b/invenio/base/translations/zh_TW/LC_MESSAGES/messages.po
similarity index 100%
rename from po/zh_TW.po
rename to invenio/base/translations/zh_TW/LC_MESSAGES/messages.po
diff --git a/modules/webstyle/lib/webinterface_handler_flask_utils.py b/invenio/base/utils.py
similarity index 100%
rename from modules/webstyle/lib/webinterface_handler_flask_utils.py
rename to invenio/base/utils.py
diff --git a/modules/miscutil/lib/celery.py b/invenio/celery/__init__.py
similarity index 100%
rename from modules/miscutil/lib/celery.py
rename to invenio/celery/__init__.py
diff --git a/modules/miscutil/lib/celery_config.py b/invenio/celery/config.py
similarity index 100%
rename from modules/miscutil/lib/celery_config.py
rename to invenio/celery/config.py
diff --git a/modules/miscutil/lib/celery_tasks.py b/invenio/celery/tasks.py
similarity index 100%
rename from modules/miscutil/lib/celery_tasks.py
rename to invenio/celery/tasks.py
diff --git a/modules/miscutil/lib/adminutils.py b/invenio/ext/admin/views.py
similarity index 100%
rename from modules/miscutil/lib/adminutils.py
rename to invenio/ext/admin/views.py
diff --git a/modules/websearch/lib/facets/Makefile.am b/invenio/ext/cache/__init__.py
similarity index 100%
rename from modules/websearch/lib/facets/Makefile.am
rename to invenio/ext/cache/__init__.py
diff --git a/modules/miscutil/lib/mailutils.py b/invenio/ext/email/__init__.py
similarity index 100%
rename from modules/miscutil/lib/mailutils.py
rename to invenio/ext/email/__init__.py
diff --git a/modules/miscutil/lib/mailutils_backend_adminonly.py b/invenio/ext/email/backends/__init__.py
similarity index 100%
rename from modules/miscutil/lib/mailutils_backend_adminonly.py
rename to invenio/ext/email/backends/__init__.py
diff --git a/modules/miscutil/lib/miscutil_config.py b/invenio/ext/email/errors.py
similarity index 100%
rename from modules/miscutil/lib/miscutil_config.py
rename to invenio/ext/email/errors.py
diff --git a/modules/cloudutils/lib/DropboxFS.py b/invenio/ext/fs/cloudfs/dropboxfs.py
similarity index 100%
rename from modules/cloudutils/lib/DropboxFS.py
rename to invenio/ext/fs/cloudfs/dropboxfs.py
diff --git a/modules/cloudutils/lib/GoogleDriveFS.py b/invenio/ext/fs/cloudfs/googledrivefs.py
similarity index 100%
rename from modules/cloudutils/lib/GoogleDriveFS.py
rename to invenio/ext/fs/cloudfs/googledrivefs.py
diff --git a/modules/cloudutils/lib/SkyDriveFS.py b/invenio/ext/fs/cloudfs/skydrivefs.py
similarity index 100%
rename from modules/cloudutils/lib/SkyDriveFS.py
rename to invenio/ext/fs/cloudfs/skydrivefs.py
diff --git a/modules/miscutil/lib/jinja2utils.py b/invenio/ext/jinja2hacks.py
similarity index 100%
rename from modules/miscutil/lib/jinja2utils.py
rename to invenio/ext/jinja2hacks.py
diff --git a/modules/webstyle/lib/webinterface_handler.py b/invenio/ext/legacy/handler.py
similarity index 100%
rename from modules/webstyle/lib/webinterface_handler.py
rename to invenio/ext/legacy/handler.py
diff --git a/modules/webstyle/lib/webinterface_layout.py b/invenio/ext/legacy/layout.py
similarity index 100%
rename from modules/webstyle/lib/webinterface_layout.py
rename to invenio/ext/legacy/layout.py
diff --git a/modules/miscutil/lib/errorlib.py b/invenio/ext/logging/wrappers.py
similarity index 100%
rename from modules/miscutil/lib/errorlib.py
rename to invenio/ext/logging/wrappers.py
diff --git a/modules/websession/lib/webuser_flask.py b/invenio/ext/login/legacy_user.py
similarity index 100%
rename from modules/websession/lib/webuser_flask.py
rename to invenio/ext/login/legacy_user.py
diff --git a/modules/miscutil/lib/cache.py b/invenio/ext/menu/__init__.py
similarity index 100%
rename from modules/miscutil/lib/cache.py
rename to invenio/ext/menu/__init__.py
diff --git a/modules/miscutil/lib/scriptutils.py b/invenio/ext/script/__init__.py
similarity index 100%
rename from modules/miscutil/lib/scriptutils.py
rename to invenio/ext/script/__init__.py
diff --git a/modules/websession/lib/session_flask.py b/invenio/ext/session/legacy_session.py
similarity index 100%
rename from modules/websession/lib/session_flask.py
rename to invenio/ext/session/legacy_session.py
diff --git a/modules/miscutil/lib/sqlalchemyutils.py b/invenio/ext/sqlalchemy/__init__.py
similarity index 100%
rename from modules/miscutil/lib/sqlalchemyutils.py
rename to invenio/ext/sqlalchemy/__init__.py
diff --git a/modules/miscutil/lib/sqlalchemyutils_mysql.py b/invenio/ext/sqlalchemy/engines/mysql.py
similarity index 100%
rename from modules/miscutil/lib/sqlalchemyutils_mysql.py
rename to invenio/ext/sqlalchemy/engines/mysql.py
diff --git a/modules/miscutil/lib/flask_sslify.py b/invenio/ext/sslify/wrappers.py
similarity index 100%
rename from modules/miscutil/lib/flask_sslify.py
rename to invenio/ext/sslify/wrappers.py
diff --git a/modules/miscutil/lib/intbitset.c b/invenio/intbitset.c
similarity index 100%
rename from modules/miscutil/lib/intbitset.c
rename to invenio/intbitset.c
diff --git a/modules/miscutil/lib/intbitset.h b/invenio/intbitset.h
similarity index 100%
rename from modules/miscutil/lib/intbitset.h
rename to invenio/intbitset.h
diff --git a/modules/miscutil/lib/intbitset.pyx b/invenio/intbitset.pyx
similarity index 100%
rename from modules/miscutil/lib/intbitset.pyx
rename to invenio/intbitset.pyx
diff --git a/modules/miscutil/lib/intbitset_helper.py b/invenio/intbitset_helper.py
similarity index 100%
rename from modules/miscutil/lib/intbitset_helper.py
rename to invenio/intbitset_helper.py
diff --git a/modules/miscutil/lib/intbitset_impl.c b/invenio/intbitset_impl.c
similarity index 100%
rename from modules/miscutil/lib/intbitset_impl.c
rename to invenio/intbitset_impl.c
diff --git a/modules/docextract/lib/authorextract_re.py b/invenio/legacy/authorextract/regexs.py
similarity index 100%
rename from modules/docextract/lib/authorextract_re.py
rename to invenio/legacy/authorextract/regexs.py
diff --git a/modules/bibupload/lib/batchuploader.py b/invenio/legacy/batchuploader/cli.py
similarity index 100%
rename from modules/bibupload/lib/batchuploader.py
rename to invenio/legacy/batchuploader/cli.py
diff --git a/modules/bibupload/lib/batchuploader_engine.py b/invenio/legacy/batchuploader/engine.py
similarity index 100%
rename from modules/bibupload/lib/batchuploader_engine.py
rename to invenio/legacy/batchuploader/engine.py
diff --git a/modules/bibupload/lib/batchuploader_templates.py b/invenio/legacy/batchuploader/templates.py
similarity index 100%
rename from modules/bibupload/lib/batchuploader_templates.py
rename to invenio/legacy/batchuploader/templates.py
diff --git a/modules/bibupload/lib/batchuploader_webinterface.py b/invenio/legacy/batchuploader/webinterface.py
similarity index 100%
rename from modules/bibupload/lib/batchuploader_webinterface.py
rename to invenio/legacy/batchuploader/webinterface.py
diff --git a/modules/bibformat/lib/elements/__init__.py b/invenio/legacy/bibauthorid/__init__.py
similarity index 100%
rename from modules/bibformat/lib/elements/__init__.py
rename to invenio/legacy/bibauthorid/__init__.py
diff --git a/modules/bibauthorid/lib/bibauthorid_backinterface.py b/invenio/legacy/bibauthorid/backinterface.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_backinterface.py
rename to invenio/legacy/bibauthorid/backinterface.py
diff --git a/modules/bibauthorid/lib/bibauthorid_cli.py b/invenio/legacy/bibauthorid/cli.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_cli.py
rename to invenio/legacy/bibauthorid/cli.py
diff --git a/modules/bibauthorid/lib/bibauthorid_cluster_set.py b/invenio/legacy/bibauthorid/cluster_set.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_cluster_set.py
rename to invenio/legacy/bibauthorid/cluster_set.py
diff --git a/modules/bibauthorid/lib/bibauthorid_comparison.py b/invenio/legacy/bibauthorid/comparison.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_comparison.py
rename to invenio/legacy/bibauthorid/comparison.py
diff --git a/modules/bibauthorid/lib/bibauthorid_config.py b/invenio/legacy/bibauthorid/config.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_config.py
rename to invenio/legacy/bibauthorid/config.py
diff --git a/modules/bibauthorid/lib/bibauthorid_daemon.py b/invenio/legacy/bibauthorid/daemon.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_daemon.py
rename to invenio/legacy/bibauthorid/daemon.py
diff --git a/modules/bibauthorid/lib/bibauthorid_dbinterface.py b/invenio/legacy/bibauthorid/dbinterface.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_dbinterface.py
rename to invenio/legacy/bibauthorid/dbinterface.py
diff --git a/modules/bibauthorid/doc/hacking/bibauthorid-internals.webdoc b/invenio/legacy/bibauthorid/doc/hacking/bibauthorid-internals.webdoc
similarity index 100%
rename from modules/bibauthorid/doc/hacking/bibauthorid-internals.webdoc
rename to invenio/legacy/bibauthorid/doc/hacking/bibauthorid-internals.webdoc
diff --git a/modules/bibauthorid/lib/bibauthorid_frontinterface.py b/invenio/legacy/bibauthorid/frontinterface.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_frontinterface.py
rename to invenio/legacy/bibauthorid/frontinterface.py
diff --git a/modules/bibauthorid/lib/bibauthorid_general_utils.py b/invenio/legacy/bibauthorid/general_utils.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_general_utils.py
rename to invenio/legacy/bibauthorid/general_utils.py
diff --git a/modules/bibauthorid/lib/bibauthorid_least_squares.py b/invenio/legacy/bibauthorid/least_squares.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_least_squares.py
rename to invenio/legacy/bibauthorid/least_squares.py
diff --git a/modules/bibauthorid/lib/bibauthorid_matrix_optimization.py b/invenio/legacy/bibauthorid/matrix_optimization.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_matrix_optimization.py
rename to invenio/legacy/bibauthorid/matrix_optimization.py
diff --git a/modules/bibauthorid/lib/bibauthorid_merge.py b/invenio/legacy/bibauthorid/merge.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_merge.py
rename to invenio/legacy/bibauthorid/merge.py
diff --git a/modules/bibauthorid/lib/bibauthorid_name_utils.py b/invenio/legacy/bibauthorid/name_utils.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_name_utils.py
rename to invenio/legacy/bibauthorid/name_utils.py
diff --git a/modules/bibauthorid/lib/bibauthorid_personid_maintenance.py b/invenio/legacy/bibauthorid/personid_maintenance.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_personid_maintenance.py
rename to invenio/legacy/bibauthorid/personid_maintenance.py
diff --git a/modules/bibauthorid/lib/bibauthorid_prob_matrix.py b/invenio/legacy/bibauthorid/prob_matrix.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_prob_matrix.py
rename to invenio/legacy/bibauthorid/prob_matrix.py
diff --git a/modules/bibauthorid/lib/bibauthorid_rabbit.py b/invenio/legacy/bibauthorid/rabbit.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_rabbit.py
rename to invenio/legacy/bibauthorid/rabbit.py
diff --git a/modules/bibauthorid/lib/bibauthorid_recipes.py b/invenio/legacy/bibauthorid/recipes.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_recipes.py
rename to invenio/legacy/bibauthorid/recipes.py
diff --git a/modules/bibauthorid/lib/bibauthorid_scheduler.py b/invenio/legacy/bibauthorid/scheduler.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_scheduler.py
rename to invenio/legacy/bibauthorid/scheduler.py
diff --git a/modules/bibauthorid/lib/bibauthorid_searchinterface.py b/invenio/legacy/bibauthorid/searchinterface.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_searchinterface.py
rename to invenio/legacy/bibauthorid/searchinterface.py
diff --git a/modules/bibauthorid/lib/bibauthorid_string_utils.py b/invenio/legacy/bibauthorid/string_utils.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_string_utils.py
rename to invenio/legacy/bibauthorid/string_utils.py
diff --git a/modules/bibauthorid/lib/bibauthorid_templates.py b/invenio/legacy/bibauthorid/templates.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_templates.py
rename to invenio/legacy/bibauthorid/templates.py
diff --git a/modules/bibauthorid/lib/bibauthorid_tortoise.py b/invenio/legacy/bibauthorid/tortoise.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_tortoise.py
rename to invenio/legacy/bibauthorid/tortoise.py
diff --git a/modules/bibauthorid/lib/bibauthorid_webapi.py b/invenio/legacy/bibauthorid/webapi.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_webapi.py
rename to invenio/legacy/bibauthorid/webapi.py
diff --git a/modules/bibauthorid/lib/bibauthorid_webauthorprofileinterface.py b/invenio/legacy/bibauthorid/webauthorprofileinterface.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_webauthorprofileinterface.py
rename to invenio/legacy/bibauthorid/webauthorprofileinterface.py
diff --git a/modules/bibauthorid/lib/bibauthorid_webinterface.py b/invenio/legacy/bibauthorid/webinterface.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_webinterface.py
rename to invenio/legacy/bibauthorid/webinterface.py
diff --git a/modules/bibauthorid/lib/bibauthorid_wedge.py b/invenio/legacy/bibauthorid/wedge.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_wedge.py
rename to invenio/legacy/bibauthorid/wedge.py
diff --git a/modules/bibauthority/lib/bibauthority_config.py b/invenio/legacy/bibauthority/config.py
similarity index 100%
rename from modules/bibauthority/lib/bibauthority_config.py
rename to invenio/legacy/bibauthority/config.py
diff --git a/modules/bibauthority/doc/admin/bibauthority-admin-guide.webdoc b/invenio/legacy/bibauthority/doc/admin/bibauthority-admin-guide.webdoc
similarity index 100%
rename from modules/bibauthority/doc/admin/bibauthority-admin-guide.webdoc
rename to invenio/legacy/bibauthority/doc/admin/bibauthority-admin-guide.webdoc
diff --git a/modules/bibauthority/doc/hacking/bibauthority-internals.webdoc b/invenio/legacy/bibauthority/doc/hacking/bibauthority-internals.webdoc
similarity index 100%
rename from modules/bibauthority/doc/hacking/bibauthority-internals.webdoc
rename to invenio/legacy/bibauthority/doc/hacking/bibauthority-internals.webdoc
diff --git a/modules/bibauthority/lib/bibauthority_engine.py b/invenio/legacy/bibauthority/engine.py
similarity index 100%
rename from modules/bibauthority/lib/bibauthority_engine.py
rename to invenio/legacy/bibauthority/engine.py
diff --git a/modules/bibformat/lib/template_context_functions/__init__.py b/invenio/legacy/bibcatalog/__init__.py
similarity index 100%
rename from modules/bibformat/lib/template_context_functions/__init__.py
rename to invenio/legacy/bibcatalog/__init__.py
diff --git a/modules/bibcatalog/lib/bibcatalog.py b/invenio/legacy/bibcatalog/api.py
similarity index 100%
rename from modules/bibcatalog/lib/bibcatalog.py
rename to invenio/legacy/bibcatalog/api.py
diff --git a/modules/bibcatalog/doc/hacking/bibcatalog-api.webdoc b/invenio/legacy/bibcatalog/doc/hacking/hacking/bibcatalog-api.webdoc
similarity index 100%
rename from modules/bibcatalog/doc/hacking/bibcatalog-api.webdoc
rename to invenio/legacy/bibcatalog/doc/hacking/hacking/bibcatalog-api.webdoc
diff --git a/modules/bibcatalog/lib/bibcatalog_system.py b/invenio/legacy/bibcatalog/system.py
similarity index 100%
rename from modules/bibcatalog/lib/bibcatalog_system.py
rename to invenio/legacy/bibcatalog/system.py
diff --git a/modules/bibcatalog/lib/bibcatalog_system_email.py b/invenio/legacy/bibcatalog/system_email.py
similarity index 100%
rename from modules/bibcatalog/lib/bibcatalog_system_email.py
rename to invenio/legacy/bibcatalog/system_email.py
diff --git a/modules/bibcatalog/lib/bibcatalog_system_rt.py b/invenio/legacy/bibcatalog/system_rt.py
similarity index 100%
rename from modules/bibcatalog/lib/bibcatalog_system_rt.py
rename to invenio/legacy/bibcatalog/system_rt.py
diff --git a/modules/bibcatalog/lib/bibcatalog_templates.py b/invenio/legacy/bibcatalog/templates.py
similarity index 100%
rename from modules/bibcatalog/lib/bibcatalog_templates.py
rename to invenio/legacy/bibcatalog/templates.py
diff --git a/modules/bibcheck/doc/admin/bibcheck-admin-guide.webdoc b/invenio/legacy/bibcheck/doc/admin/bibcheck-admin-guide.webdoc
similarity index 100%
rename from modules/bibcheck/doc/admin/bibcheck-admin-guide.webdoc
rename to invenio/legacy/bibcheck/doc/admin/bibcheck-admin-guide.webdoc
diff --git a/modules/bibcheck/etc/sample.cfg b/invenio/legacy/bibcheck/sample.cfg
similarity index 100%
rename from modules/bibcheck/etc/sample.cfg
rename to invenio/legacy/bibcheck/sample.cfg
diff --git a/modules/bibcheck/web/admin/bibcheckadmin.py b/invenio/legacy/bibcheck/web/admin/bibcheckadmin.py
similarity index 100%
rename from modules/bibcheck/web/admin/bibcheckadmin.py
rename to invenio/legacy/bibcheck/web/admin/bibcheckadmin.py
diff --git a/modules/bibcirculation/lib/bibcirculationadmin_webinterface.py b/invenio/legacy/bibcirculation/admin_webinterface.py
similarity index 100%
rename from modules/bibcirculation/lib/bibcirculationadmin_webinterface.py
rename to invenio/legacy/bibcirculation/admin_webinterface.py
diff --git a/modules/bibcirculation/lib/bibcirculationadminlib.py b/invenio/legacy/bibcirculation/adminlib.py
similarity index 100%
rename from modules/bibcirculation/lib/bibcirculationadminlib.py
rename to invenio/legacy/bibcirculation/adminlib.py
diff --git a/modules/bibcirculation/lib/bibcirculation.py b/invenio/legacy/bibcirculation/api.py
similarity index 100%
rename from modules/bibcirculation/lib/bibcirculation.py
rename to invenio/legacy/bibcirculation/api.py
diff --git a/modules/bibcirculation/lib/bibcirculation_cern_ldap.py b/invenio/legacy/bibcirculation/cern_ldap.py
similarity index 100%
rename from modules/bibcirculation/lib/bibcirculation_cern_ldap.py
rename to invenio/legacy/bibcirculation/cern_ldap.py
diff --git a/modules/bibcirculation/lib/bibcirculation_config.py b/invenio/legacy/bibcirculation/config.py
similarity index 100%
rename from modules/bibcirculation/lib/bibcirculation_config.py
rename to invenio/legacy/bibcirculation/config.py
diff --git a/modules/bibcirculation/lib/bibcirculation_daemon.py b/invenio/legacy/bibcirculation/daemon.py
similarity index 100%
rename from modules/bibcirculation/lib/bibcirculation_daemon.py
rename to invenio/legacy/bibcirculation/daemon.py
diff --git a/modules/bibcirculation/lib/bibcirculation_dblayer.py b/invenio/legacy/bibcirculation/db_layer.py
similarity index 100%
rename from modules/bibcirculation/lib/bibcirculation_dblayer.py
rename to invenio/legacy/bibcirculation/db_layer.py
diff --git a/modules/bibcirculation/doc/admin/bibcirculation-admin-guide.webdoc b/invenio/legacy/bibcirculation/doc/admin/bibcirculation-admin-guide.webdoc
similarity index 100%
rename from modules/bibcirculation/doc/admin/bibcirculation-admin-guide.webdoc
rename to invenio/legacy/bibcirculation/doc/admin/bibcirculation-admin-guide.webdoc
diff --git a/modules/bibcirculation/bin/bibcircd.in b/invenio/legacy/bibcirculation/scripts/bibcircd.py
similarity index 100%
rename from modules/bibcirculation/bin/bibcircd.in
rename to invenio/legacy/bibcirculation/scripts/bibcircd.py
diff --git a/modules/bibcirculation/lib/bibcirculation_templates.py b/invenio/legacy/bibcirculation/templates.py
similarity index 100%
rename from modules/bibcirculation/lib/bibcirculation_templates.py
rename to invenio/legacy/bibcirculation/templates.py
diff --git a/modules/bibcirculation/lib/bibcirculation_utils.py b/invenio/legacy/bibcirculation/utils.py
similarity index 100%
rename from modules/bibcirculation/lib/bibcirculation_utils.py
rename to invenio/legacy/bibcirculation/utils.py
diff --git a/modules/bibcirculation/web/admin/bibcirculationadmin.py b/invenio/legacy/bibcirculation/web/admin/bibcirculationadmin.py
similarity index 100%
rename from modules/bibcirculation/web/admin/bibcirculationadmin.py
rename to invenio/legacy/bibcirculation/web/admin/bibcirculationadmin.py
diff --git a/modules/bibcirculation/lib/bibcirculation_webinterface.py b/invenio/legacy/bibcirculation/webinterface.py
similarity index 100%
rename from modules/bibcirculation/lib/bibcirculation_webinterface.py
rename to invenio/legacy/bibcirculation/webinterface.py
diff --git a/modules/bibclassify/lib/bibclassify_acronym_analyzer.py b/invenio/legacy/bibclassify/acronym_analyzer.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_acronym_analyzer.py
rename to invenio/legacy/bibclassify/acronym_analyzer.py
diff --git a/modules/bibclassify/lib/bibclassify_cli.py b/invenio/legacy/bibclassify/cli.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_cli.py
rename to invenio/legacy/bibclassify/cli.py
diff --git a/modules/bibclassify/lib/bibclassify_config.py b/invenio/legacy/bibclassify/config.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_config.py
rename to invenio/legacy/bibclassify/config.py
diff --git a/modules/bibclassify/lib/bibclassify_daemon.py b/invenio/legacy/bibclassify/daemon.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_daemon.py
rename to invenio/legacy/bibclassify/daemon.py
diff --git a/modules/bibclassify/doc/admin/bibclassify-admin-guide-cloud.jpeg b/invenio/legacy/bibclassify/doc/admin/bibclassify-admin-guide-cloud.jpeg
similarity index 100%
rename from modules/bibclassify/doc/admin/bibclassify-admin-guide-cloud.jpeg
rename to invenio/legacy/bibclassify/doc/admin/bibclassify-admin-guide-cloud.jpeg
diff --git a/modules/bibclassify/doc/admin/bibclassify-admin-guide.webdoc b/invenio/legacy/bibclassify/doc/admin/bibclassify-admin-guide.webdoc
similarity index 100%
rename from modules/bibclassify/doc/admin/bibclassify-admin-guide.webdoc
rename to invenio/legacy/bibclassify/doc/admin/bibclassify-admin-guide.webdoc
diff --git a/modules/bibclassify/doc/hacking/bibclassify-extraction-algorithm.webdoc b/invenio/legacy/bibclassify/doc/hacking/bibclassify-extraction-algorithm.webdoc
similarity index 100%
rename from modules/bibclassify/doc/hacking/bibclassify-extraction-algorithm.webdoc
rename to invenio/legacy/bibclassify/doc/hacking/bibclassify-extraction-algorithm.webdoc
diff --git a/modules/bibclassify/doc/hacking/bibclassify-hep-taxonomy.webdoc b/invenio/legacy/bibclassify/doc/hacking/bibclassify-hep-taxonomy.webdoc
similarity index 100%
rename from modules/bibclassify/doc/hacking/bibclassify-hep-taxonomy.webdoc
rename to invenio/legacy/bibclassify/doc/hacking/bibclassify-hep-taxonomy.webdoc
diff --git a/modules/bibclassify/doc/hacking/bibclassify-internals.webdoc b/invenio/legacy/bibclassify/doc/hacking/bibclassify-internals.webdoc
similarity index 100%
rename from modules/bibclassify/doc/hacking/bibclassify-internals.webdoc
rename to invenio/legacy/bibclassify/doc/hacking/bibclassify-internals.webdoc
diff --git a/modules/bibclassify/lib/bibclassify_engine.py b/invenio/legacy/bibclassify/engine.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_engine.py
rename to invenio/legacy/bibclassify/engine.py
diff --git a/modules/bibclassify/lib/bibclassify_keyword_analyzer.py b/invenio/legacy/bibclassify/keyword_analyzer.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_keyword_analyzer.py
rename to invenio/legacy/bibclassify/keyword_analyzer.py
diff --git a/modules/bibclassify/lib/bibclassify_microtests.py b/invenio/legacy/bibclassify/microtests.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_microtests.py
rename to invenio/legacy/bibclassify/microtests.py
diff --git a/modules/bibclassify/lib/bibclassify_ontology_reader.py b/invenio/legacy/bibclassify/ontology_reader.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_ontology_reader.py
rename to invenio/legacy/bibclassify/ontology_reader.py
diff --git a/modules/bibclassify/lib/bibclassify_templates.py b/invenio/legacy/bibclassify/templates.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_templates.py
rename to invenio/legacy/bibclassify/templates.py
diff --git a/modules/bibclassify/lib/bibclassify_text_extractor.py b/invenio/legacy/bibclassify/text_extractor.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_text_extractor.py
rename to invenio/legacy/bibclassify/text_extractor.py
diff --git a/modules/bibclassify/lib/bibclassify_text_normalizer.py b/invenio/legacy/bibclassify/text_normalizer.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_text_normalizer.py
rename to invenio/legacy/bibclassify/text_normalizer.py
diff --git a/modules/bibclassify/lib/bibclassify_webinterface.py b/invenio/legacy/bibclassify/webinterface.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_webinterface.py
rename to invenio/legacy/bibclassify/webinterface.py
diff --git a/modules/bibconvert/lib/bibconvert.py b/invenio/legacy/bibconvert/api.py
similarity index 100%
rename from modules/bibconvert/lib/bibconvert.py
rename to invenio/legacy/bibconvert/api.py
diff --git a/modules/bibconvert/lib/bibconvert_bfx_engine.py b/invenio/legacy/bibconvert/bfx_engine.py
similarity index 100%
rename from modules/bibconvert/lib/bibconvert_bfx_engine.py
rename to invenio/legacy/bibconvert/bfx_engine.py
diff --git a/modules/bibconvert/doc/admin/bibconvert-admin-guide.webdoc b/invenio/legacy/bibconvert/doc/admin/bibconvert-admin-guide.webdoc
similarity index 100%
rename from modules/bibconvert/doc/admin/bibconvert-admin-guide.webdoc
rename to invenio/legacy/bibconvert/doc/admin/bibconvert-admin-guide.webdoc
diff --git a/modules/bibconvert/doc/admin/bibtex.cfg b/invenio/legacy/bibconvert/doc/admin/bibtex.cfg
similarity index 100%
rename from modules/bibconvert/doc/admin/bibtex.cfg
rename to invenio/legacy/bibconvert/doc/admin/bibtex.cfg
diff --git a/modules/bibconvert/doc/admin/dcq.cfg b/invenio/legacy/bibconvert/doc/admin/dcq.cfg
similarity index 100%
rename from modules/bibconvert/doc/admin/dcq.cfg
rename to invenio/legacy/bibconvert/doc/admin/dcq.cfg
diff --git a/modules/bibconvert/doc/admin/dcq.dat b/invenio/legacy/bibconvert/doc/admin/dcq.dat
similarity index 100%
rename from modules/bibconvert/doc/admin/dcq.dat
rename to invenio/legacy/bibconvert/doc/admin/dcq.dat
diff --git a/modules/bibconvert/doc/admin/dcxml-to-marcxml.cfg b/invenio/legacy/bibconvert/doc/admin/dcxml-to-marcxml.cfg
similarity index 100%
rename from modules/bibconvert/doc/admin/dcxml-to-marcxml.cfg
rename to invenio/legacy/bibconvert/doc/admin/dcxml-to-marcxml.cfg
diff --git a/modules/bibconvert/doc/admin/example_oaimarc2xm.xsl b/invenio/legacy/bibconvert/doc/admin/example_oaimarc2xm.xsl
similarity index 100%
rename from modules/bibconvert/doc/admin/example_oaimarc2xm.xsl
rename to invenio/legacy/bibconvert/doc/admin/example_oaimarc2xm.xsl
diff --git a/modules/bibconvert/doc/admin/example_oaimarc2xm_collID.kb b/invenio/legacy/bibconvert/doc/admin/example_oaimarc2xm_collID.kb
similarity index 100%
rename from modules/bibconvert/doc/admin/example_oaimarc2xm_collID.kb
rename to invenio/legacy/bibconvert/doc/admin/example_oaimarc2xm_collID.kb
diff --git a/modules/bibconvert/doc/admin/sample.cfg b/invenio/legacy/bibconvert/doc/admin/sample.cfg
similarity index 100%
rename from modules/bibconvert/doc/admin/sample.cfg
rename to invenio/legacy/bibconvert/doc/admin/sample.cfg
diff --git a/modules/bibconvert/doc/admin/sample.dat b/invenio/legacy/bibconvert/doc/admin/sample.dat
similarity index 100%
rename from modules/bibconvert/doc/admin/sample.dat
rename to invenio/legacy/bibconvert/doc/admin/sample.dat
diff --git a/modules/bibconvert/doc/admin/sample.kb b/invenio/legacy/bibconvert/doc/admin/sample.kb
similarity index 100%
rename from modules/bibconvert/doc/admin/sample.kb
rename to invenio/legacy/bibconvert/doc/admin/sample.kb
diff --git a/modules/bibconvert/doc/hacking/bibconvert-api.webdoc b/invenio/legacy/bibconvert/doc/hacking/bibconvert-api.webdoc
similarity index 100%
rename from modules/bibconvert/doc/hacking/bibconvert-api.webdoc
rename to invenio/legacy/bibconvert/doc/hacking/bibconvert-api.webdoc
diff --git a/modules/bibconvert/doc/hacking/bibconvert-internals.webdoc b/invenio/legacy/bibconvert/doc/hacking/bibconvert-internals.webdoc
similarity index 100%
rename from modules/bibconvert/doc/hacking/bibconvert-internals.webdoc
rename to invenio/legacy/bibconvert/doc/hacking/bibconvert-internals.webdoc
diff --git a/modules/bibconvert/lib/bibconvert_manager.py b/invenio/legacy/bibconvert/manager.py
similarity index 100%
rename from modules/bibconvert/lib/bibconvert_manager.py
rename to invenio/legacy/bibconvert/manager.py
diff --git a/modules/bibconvert/lib/bibconvert_xslt_engine.py b/invenio/legacy/bibconvert/xslt_engine.py
similarity index 100%
rename from modules/bibconvert/lib/bibconvert_xslt_engine.py
rename to invenio/legacy/bibconvert/xslt_engine.py
diff --git a/modules/bibdocfile/lib/bibdocfile.py b/invenio/legacy/bibdocfile/api.py
similarity index 100%
rename from modules/bibdocfile/lib/bibdocfile.py
rename to invenio/legacy/bibdocfile/api.py
diff --git a/modules/bibdocfile/lib/bibdocfilecli.py b/invenio/legacy/bibdocfile/cli.py
similarity index 100%
rename from modules/bibdocfile/lib/bibdocfilecli.py
rename to invenio/legacy/bibdocfile/cli.py
diff --git a/modules/bibdocfile/lib/bibdocfile_config.py b/invenio/legacy/bibdocfile/config.py
similarity index 100%
rename from modules/bibdocfile/lib/bibdocfile_config.py
rename to invenio/legacy/bibdocfile/config.py
diff --git a/modules/bibdocfile/doc/hacking/bibdocfile-api.webdoc b/invenio/legacy/bibdocfile/doc/hacking/bibdocfile-api.webdoc
similarity index 100%
rename from modules/bibdocfile/doc/hacking/bibdocfile-api.webdoc
rename to invenio/legacy/bibdocfile/doc/hacking/bibdocfile-api.webdoc
diff --git a/modules/bibdocfile/doc/hacking/bibdocfile-internals.webdoc b/invenio/legacy/bibdocfile/doc/hacking/bibdocfile-internals.webdoc
similarity index 100%
rename from modules/bibdocfile/doc/hacking/bibdocfile-internals.webdoc
rename to invenio/legacy/bibdocfile/doc/hacking/bibdocfile-internals.webdoc
diff --git a/modules/bibdocfile/lib/file.py b/invenio/legacy/bibdocfile/file.py
similarity index 100%
rename from modules/bibdocfile/lib/file.py
rename to invenio/legacy/bibdocfile/file.py
diff --git a/modules/bibdocfile/lib/fulltext_files_migration_kit.py b/invenio/legacy/bibdocfile/fulltext_files_migration_kit.py
similarity index 100%
rename from modules/bibdocfile/lib/fulltext_files_migration_kit.py
rename to invenio/legacy/bibdocfile/fulltext_files_migration_kit.py
diff --git a/modules/bibdocfile/lib/icon_migration_kit.py b/invenio/legacy/bibdocfile/icon_migration_kit.py
similarity index 100%
rename from modules/bibdocfile/lib/icon_migration_kit.py
rename to invenio/legacy/bibdocfile/icon_migration_kit.py
diff --git a/modules/bibdocfile/lib/bibdocfile_managedocfiles.py b/invenio/legacy/bibdocfile/managedocfiles.py
similarity index 100%
rename from modules/bibdocfile/lib/bibdocfile_managedocfiles.py
rename to invenio/legacy/bibdocfile/managedocfiles.py
diff --git a/modules/bibdocfile/lib/bom_textdoc.py b/invenio/legacy/bibdocfile/plugins/bom_textdoc.py
similarity index 100%
rename from modules/bibdocfile/lib/bom_textdoc.py
rename to invenio/legacy/bibdocfile/plugins/bom_textdoc.py
diff --git a/modules/bibdocfile/bin/bibdocfile.in b/invenio/legacy/bibdocfile/scripts/bibdocfile.py
similarity index 100%
rename from modules/bibdocfile/bin/bibdocfile.in
rename to invenio/legacy/bibdocfile/scripts/bibdocfile.py
diff --git a/modules/bibdocfile/lib/bibdocfile_templates.py b/invenio/legacy/bibdocfile/templates.py
similarity index 100%
rename from modules/bibdocfile/lib/bibdocfile_templates.py
rename to invenio/legacy/bibdocfile/templates.py
diff --git a/modules/bibdocfile/lib/bibdocfile_webinterface.py b/invenio/legacy/bibdocfile/webinterface.py
similarity index 100%
rename from modules/bibdocfile/lib/bibdocfile_webinterface.py
rename to invenio/legacy/bibdocfile/webinterface.py
diff --git a/modules/bibedit/lib/bibeditcli.py b/invenio/legacy/bibedit/cli.py
similarity index 100%
rename from modules/bibedit/lib/bibeditcli.py
rename to invenio/legacy/bibedit/cli.py
diff --git a/modules/bibedit/lib/bibedit_config.py b/invenio/legacy/bibedit/config.py
similarity index 100%
rename from modules/bibedit/lib/bibedit_config.py
rename to invenio/legacy/bibedit/config.py
diff --git a/modules/bibedit/lib/bibedit_dblayer.py b/invenio/legacy/bibedit/db_layer.py
similarity index 100%
rename from modules/bibedit/lib/bibedit_dblayer.py
rename to invenio/legacy/bibedit/db_layer.py
diff --git a/modules/bibedit/doc/admin/bibedit-admin-guide.webdoc b/invenio/legacy/bibedit/doc/admin/bibedit-admin-guide.webdoc
similarity index 100%
rename from modules/bibedit/doc/admin/bibedit-admin-guide.webdoc
rename to invenio/legacy/bibedit/doc/admin/bibedit-admin-guide.webdoc
diff --git a/modules/bibedit/lib/bibedit_engine.py b/invenio/legacy/bibedit/engine.py
similarity index 100%
rename from modules/bibedit/lib/bibedit_engine.py
rename to invenio/legacy/bibedit/engine.py
diff --git a/modules/bibedit/lib/bibedit_templates.py b/invenio/legacy/bibedit/templates.py
similarity index 100%
rename from modules/bibedit/lib/bibedit_templates.py
rename to invenio/legacy/bibedit/templates.py
diff --git a/modules/bibedit/lib/bibedit_utils.py b/invenio/legacy/bibedit/utils.py
similarity index 100%
rename from modules/bibedit/lib/bibedit_utils.py
rename to invenio/legacy/bibedit/utils.py
diff --git a/modules/bibedit/lib/bibedit_webinterface.py b/invenio/legacy/bibedit/webinterface.py
similarity index 100%
rename from modules/bibedit/lib/bibedit_webinterface.py
rename to invenio/legacy/bibedit/webinterface.py
diff --git a/modules/bibedit/lib/bibeditmulti_engine.py b/invenio/legacy/bibeditmulti/engine.py
similarity index 100%
rename from modules/bibedit/lib/bibeditmulti_engine.py
rename to invenio/legacy/bibeditmulti/engine.py
diff --git a/modules/bibedit/lib/bibeditmulti_templates.py b/invenio/legacy/bibeditmulti/templates.py
similarity index 100%
rename from modules/bibedit/lib/bibeditmulti_templates.py
rename to invenio/legacy/bibeditmulti/templates.py
diff --git a/modules/bibedit/lib/bibeditmulti_webinterface.py b/invenio/legacy/bibeditmulti/webinterface.py
similarity index 100%
rename from modules/bibedit/lib/bibeditmulti_webinterface.py
rename to invenio/legacy/bibeditmulti/webinterface.py
diff --git a/modules/bibexport/lib/bibexport.py b/invenio/legacy/bibexport/daemon.py
similarity index 100%
rename from modules/bibexport/lib/bibexport.py
rename to invenio/legacy/bibexport/daemon.py
diff --git a/modules/bibexport/lib/bibexport_method_fieldexporter.py b/invenio/legacy/bibexport/fieldexporter.py
similarity index 100%
rename from modules/bibexport/lib/bibexport_method_fieldexporter.py
rename to invenio/legacy/bibexport/fieldexporter.py
diff --git a/modules/bibexport/lib/bibexport_method_fieldexporter_dblayer.py b/invenio/legacy/bibexport/fieldexporter_dblayer.py
similarity index 100%
rename from modules/bibexport/lib/bibexport_method_fieldexporter_dblayer.py
rename to invenio/legacy/bibexport/fieldexporter_dblayer.py
diff --git a/modules/bibexport/lib/bibexport_method_googlescholar.py b/invenio/legacy/bibexport/googlescholar.py
similarity index 100%
rename from modules/bibexport/lib/bibexport_method_googlescholar.py
rename to invenio/legacy/bibexport/googlescholar.py
diff --git a/modules/bibexport/lib/bibexport_method_marcxml.py b/invenio/legacy/bibexport/marcxml.py
similarity index 100%
rename from modules/bibexport/lib/bibexport_method_marcxml.py
rename to invenio/legacy/bibexport/marcxml.py
diff --git a/modules/bibexport/bin/bibexport.in b/invenio/legacy/bibexport/scripts/bibexport.py
similarity index 100%
rename from modules/bibexport/bin/bibexport.in
rename to invenio/legacy/bibexport/scripts/bibexport.py
diff --git a/modules/bibexport/lib/bibexport_method_sitemap.py b/invenio/legacy/bibexport/sitemap.py
similarity index 100%
rename from modules/bibexport/lib/bibexport_method_sitemap.py
rename to invenio/legacy/bibexport/sitemap.py
diff --git a/modules/bibexport/lib/bibexport_method_fieldexporter_templates.py b/invenio/legacy/bibexport/templates.py
similarity index 100%
rename from modules/bibexport/lib/bibexport_method_fieldexporter_templates.py
rename to invenio/legacy/bibexport/templates.py
diff --git a/modules/bibexport/lib/bibexport_method_fieldexporter_webinterface.py b/invenio/legacy/bibexport/webinterface.py
similarity index 100%
rename from modules/bibexport/lib/bibexport_method_fieldexporter_webinterface.py
rename to invenio/legacy/bibexport/webinterface.py
diff --git a/modules/bibfield/lib/bibfield.py b/invenio/legacy/bibfield/__init__.py
similarity index 100%
rename from modules/bibfield/lib/bibfield.py
rename to invenio/legacy/bibfield/__init__.py
diff --git a/modules/bibfield/lib/bibfield_jsonreader.py b/invenio/legacy/bibfield/bibfield_jsonreader.py
similarity index 100%
rename from modules/bibfield/lib/bibfield_jsonreader.py
rename to invenio/legacy/bibfield/bibfield_jsonreader.py
diff --git a/modules/bibfield/lib/bibfield_manager.py b/invenio/legacy/bibfield/bibfield_manager.py
similarity index 100%
rename from modules/bibfield/lib/bibfield_manager.py
rename to invenio/legacy/bibfield/bibfield_manager.py
diff --git a/modules/bibfield/lib/bibfield_marcreader.py b/invenio/legacy/bibfield/bibfield_marcreader.py
similarity index 100%
rename from modules/bibfield/lib/bibfield_marcreader.py
rename to invenio/legacy/bibfield/bibfield_marcreader.py
diff --git a/modules/bibfield/lib/bibfield_utils.py b/invenio/legacy/bibfield/bibfield_utils.py
similarity index 100%
rename from modules/bibfield/lib/bibfield_utils.py
rename to invenio/legacy/bibfield/bibfield_utils.py
diff --git a/modules/bibfield/lib/functions/Makefile.am b/invenio/legacy/bibfield/functions/Makefile.am
similarity index 100%
rename from modules/bibfield/lib/functions/Makefile.am
rename to invenio/legacy/bibfield/functions/Makefile.am
diff --git a/modules/bibindex/lib/tokenizers/__init__.py b/invenio/legacy/bibfield/functions/__init__.py
similarity index 100%
rename from modules/bibindex/lib/tokenizers/__init__.py
rename to invenio/legacy/bibfield/functions/__init__.py
diff --git a/modules/bibfield/lib/functions/check_field_existence.py b/invenio/legacy/bibfield/functions/check_field_existence.py
similarity index 100%
rename from modules/bibfield/lib/functions/check_field_existence.py
rename to invenio/legacy/bibfield/functions/check_field_existence.py
diff --git a/modules/bibfield/lib/functions/check_field_type.py b/invenio/legacy/bibfield/functions/check_field_type.py
similarity index 100%
rename from modules/bibfield/lib/functions/check_field_type.py
rename to invenio/legacy/bibfield/functions/check_field_type.py
diff --git a/modules/bibfield/lib/functions/get_bibdoc.py b/invenio/legacy/bibfield/functions/get_bibdoc.py
similarity index 100%
rename from modules/bibfield/lib/functions/get_bibdoc.py
rename to invenio/legacy/bibfield/functions/get_bibdoc.py
diff --git a/modules/bibfield/lib/functions/get_cited_by_count.py b/invenio/legacy/bibfield/functions/get_cited_by_count.py
similarity index 100%
rename from modules/bibfield/lib/functions/get_cited_by_count.py
rename to invenio/legacy/bibfield/functions/get_cited_by_count.py
diff --git a/modules/bibfield/lib/functions/get_creation_date.py b/invenio/legacy/bibfield/functions/get_creation_date.py
similarity index 100%
rename from modules/bibfield/lib/functions/get_creation_date.py
rename to invenio/legacy/bibfield/functions/get_creation_date.py
diff --git a/modules/bibfield/lib/functions/get_doi.py b/invenio/legacy/bibfield/functions/get_doi.py
similarity index 100%
rename from modules/bibfield/lib/functions/get_doi.py
rename to invenio/legacy/bibfield/functions/get_doi.py
diff --git a/modules/bibfield/lib/functions/get_files_from_bibdoc.py b/invenio/legacy/bibfield/functions/get_files_from_bibdoc.py
similarity index 100%
rename from modules/bibfield/lib/functions/get_files_from_bibdoc.py
rename to invenio/legacy/bibfield/functions/get_files_from_bibdoc.py
diff --git a/modules/bibfield/lib/functions/get_number_of_comments.py b/invenio/legacy/bibfield/functions/get_number_of_comments.py
similarity index 100%
rename from modules/bibfield/lib/functions/get_number_of_comments.py
rename to invenio/legacy/bibfield/functions/get_number_of_comments.py
diff --git a/modules/bibfield/lib/functions/get_number_of_copies.py b/invenio/legacy/bibfield/functions/get_number_of_copies.py
similarity index 100%
rename from modules/bibfield/lib/functions/get_number_of_copies.py
rename to invenio/legacy/bibfield/functions/get_number_of_copies.py
diff --git a/modules/bibfield/lib/functions/get_number_of_reviews.py b/invenio/legacy/bibfield/functions/get_number_of_reviews.py
similarity index 100%
rename from modules/bibfield/lib/functions/get_number_of_reviews.py
rename to invenio/legacy/bibfield/functions/get_number_of_reviews.py
diff --git a/modules/bibfield/lib/functions/get_persistent_identifiers_keys.py b/invenio/legacy/bibfield/functions/get_persistent_identifiers_keys.py
similarity index 100%
rename from modules/bibfield/lib/functions/get_persistent_identifiers_keys.py
rename to invenio/legacy/bibfield/functions/get_persistent_identifiers_keys.py
diff --git a/modules/bibfield/lib/functions/is_local_url.py b/invenio/legacy/bibfield/functions/is_local_url.py
similarity index 100%
rename from modules/bibfield/lib/functions/is_local_url.py
rename to invenio/legacy/bibfield/functions/is_local_url.py
diff --git a/modules/bibfield/lib/functions/is_type_isbn.py b/invenio/legacy/bibfield/functions/is_type_isbn.py
similarity index 100%
rename from modules/bibfield/lib/functions/is_type_isbn.py
rename to invenio/legacy/bibfield/functions/is_type_isbn.py
diff --git a/modules/bibfield/lib/functions/is_type_isbn_issn_unit_tests.py b/invenio/legacy/bibfield/functions/is_type_isbn_issn_unit_tests.py
similarity index 100%
rename from modules/bibfield/lib/functions/is_type_isbn_issn_unit_tests.py
rename to invenio/legacy/bibfield/functions/is_type_isbn_issn_unit_tests.py
diff --git a/modules/bibfield/lib/functions/is_type_issn.py b/invenio/legacy/bibfield/functions/is_type_issn.py
similarity index 100%
rename from modules/bibfield/lib/functions/is_type_issn.py
rename to invenio/legacy/bibfield/functions/is_type_issn.py
diff --git a/modules/bibfield/lib/functions/is_type_num.py b/invenio/legacy/bibfield/functions/is_type_num.py
similarity index 100%
rename from modules/bibfield/lib/functions/is_type_num.py
rename to invenio/legacy/bibfield/functions/is_type_num.py
diff --git a/modules/bibfield/lib/functions/is_type_str.py b/invenio/legacy/bibfield/functions/is_type_str.py
similarity index 100%
rename from modules/bibfield/lib/functions/is_type_str.py
rename to invenio/legacy/bibfield/functions/is_type_str.py
diff --git a/modules/bibfield/lib/functions/list_tags.py b/invenio/legacy/bibfield/functions/list_tags.py
similarity index 100%
rename from modules/bibfield/lib/functions/list_tags.py
rename to invenio/legacy/bibfield/functions/list_tags.py
diff --git a/modules/bibfield/lib/functions/util_split.py b/invenio/legacy/bibfield/functions/util_split.py
similarity index 100%
rename from modules/bibfield/lib/functions/util_split.py
rename to invenio/legacy/bibfield/functions/util_split.py
diff --git a/modules/bibformat/lib/bibformatadminlib.py b/invenio/legacy/bibformat/adminlib.py
similarity index 100%
rename from modules/bibformat/lib/bibformatadminlib.py
rename to invenio/legacy/bibformat/adminlib.py
diff --git a/modules/bibformat/lib/bibreformat.py b/invenio/legacy/bibformat/bibreformat.py
similarity index 100%
rename from modules/bibformat/lib/bibreformat.py
rename to invenio/legacy/bibformat/bibreformat.py
diff --git a/modules/bibformat/doc/admin/bibformat-admin-guide.webdoc b/invenio/legacy/bibformat/doc/admin/bibformat-admin-guide.webdoc
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-admin-guide.webdoc
rename to invenio/legacy/bibformat/doc/admin/bibformat-admin-guide.webdoc
diff --git a/modules/bibformat/doc/admin/bibformat-guide-bfe.gif b/invenio/legacy/bibformat/doc/admin/bibformat-guide-bfe.gif
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-guide-bfe.gif
rename to invenio/legacy/bibformat/doc/admin/bibformat-guide-bfe.gif
diff --git a/modules/bibformat/doc/admin/bibformat-guide-bfo_attributes.png b/invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_attributes.png
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-guide-bfo_attributes.png
rename to invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_attributes.png
diff --git a/modules/bibformat/doc/admin/bibformat-guide-bfo_check_deps.png b/invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_check_deps.png
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-guide-bfo_check_deps.png
rename to invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_check_deps.png
diff --git a/modules/bibformat/doc/admin/bibformat-guide-bfo_edit_rule.png b/invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_edit_rule.png
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-guide-bfo_edit_rule.png
rename to invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_edit_rule.png
diff --git a/modules/bibformat/doc/admin/bibformat-guide-bfo_edit_rule2.png b/invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_edit_rule2.png
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-guide-bfo_edit_rule2.png
rename to invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_edit_rule2.png
diff --git a/modules/bibformat/doc/admin/bibformat-guide-bfo_hb_migrate.png b/invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_hb_migrate.png
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-guide-bfo_hb_migrate.png
rename to invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_hb_migrate.png
diff --git a/modules/bibformat/doc/admin/bibformat-guide-bfo_hd_rules.png b/invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_hd_rules.png
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-guide-bfo_hd_rules.png
rename to invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_hd_rules.png
diff --git a/modules/bibformat/doc/admin/bibformat-guide-bfo_manage.png b/invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_manage.png
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-guide-bfo_manage.png
rename to invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_manage.png
diff --git a/modules/bibformat/doc/admin/bibformat-guide-bfo_rules.png b/invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_rules.png
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-guide-bfo_rules.png
rename to invenio/legacy/bibformat/doc/admin/bibformat-guide-bfo_rules.png
diff --git a/modules/bibformat/doc/admin/bibformat-guide-bft_attributes.png b/invenio/legacy/bibformat/doc/admin/bibformat-guide-bft_attributes.png
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-guide-bft_attributes.png
rename to invenio/legacy/bibformat/doc/admin/bibformat-guide-bft_attributes.png
diff --git a/modules/bibformat/doc/admin/bibformat-guide-bft_editor.png b/invenio/legacy/bibformat/doc/admin/bibformat-guide-bft_editor.png
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-guide-bft_editor.png
rename to invenio/legacy/bibformat/doc/admin/bibformat-guide-bft_editor.png
diff --git a/modules/bibformat/doc/admin/bibformat-guide-bft_editor2.png b/invenio/legacy/bibformat/doc/admin/bibformat-guide-bft_editor2.png
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-guide-bft_editor2.png
rename to invenio/legacy/bibformat/doc/admin/bibformat-guide-bft_editor2.png
diff --git a/modules/bibformat/doc/admin/bibformat-guide-bft_manage.png b/invenio/legacy/bibformat/doc/admin/bibformat-guide-bft_manage.png
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-guide-bft_manage.png
rename to invenio/legacy/bibformat/doc/admin/bibformat-guide-bft_manage.png
diff --git a/modules/bibformat/doc/admin/bibformat-guide-bft_preview.png b/invenio/legacy/bibformat/doc/admin/bibformat-guide-bft_preview.png
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-guide-bft_preview.png
rename to invenio/legacy/bibformat/doc/admin/bibformat-guide-bft_preview.png
diff --git a/modules/bibformat/doc/admin/bibformat-guide-url_bar.png b/invenio/legacy/bibformat/doc/admin/bibformat-guide-url_bar.png
similarity index 100%
rename from modules/bibformat/doc/admin/bibformat-guide-url_bar.png
rename to invenio/legacy/bibformat/doc/admin/bibformat-guide-url_bar.png
diff --git a/modules/bibformat/doc/hacking/bibformat-api.webdoc b/invenio/legacy/bibformat/doc/hacking/bibformat-api.webdoc
similarity index 100%
rename from modules/bibformat/doc/hacking/bibformat-api.webdoc
rename to invenio/legacy/bibformat/doc/hacking/bibformat-api.webdoc
diff --git a/modules/bibformat/doc/hacking/bibformat-internals.webdoc b/invenio/legacy/bibformat/doc/hacking/bibformat-internals.webdoc
similarity index 100%
rename from modules/bibformat/doc/hacking/bibformat-internals.webdoc
rename to invenio/legacy/bibformat/doc/hacking/bibformat-internals.webdoc
diff --git a/modules/bibformat/bin/bibreformat.in b/invenio/legacy/bibformat/scripts/bibreformat.py
similarity index 100%
rename from modules/bibformat/bin/bibreformat.in
rename to invenio/legacy/bibformat/scripts/bibreformat.py
diff --git a/modules/bibformat/lib/bibformat_templates.py b/invenio/legacy/bibformat/templates.py
similarity index 100%
rename from modules/bibformat/lib/bibformat_templates.py
rename to invenio/legacy/bibformat/templates.py
diff --git a/modules/bibformat/web/admin/bibformatadmin.py b/invenio/legacy/bibformat/web/admin/bibformatadmin.py
similarity index 100%
rename from modules/bibformat/web/admin/bibformatadmin.py
rename to invenio/legacy/bibformat/web/admin/bibformatadmin.py
diff --git a/modules/bibindex/lib/bibindexadminlib.py b/invenio/legacy/bibindex/adminlib.py
similarity index 100%
rename from modules/bibindex/lib/bibindexadminlib.py
rename to invenio/legacy/bibindex/adminlib.py
diff --git a/modules/bibindex/doc/admin/bibindex-admin-guide.webdoc b/invenio/legacy/bibindex/doc/admin/bibindex-admin-guide.webdoc
similarity index 100%
rename from modules/bibindex/doc/admin/bibindex-admin-guide.webdoc
rename to invenio/legacy/bibindex/doc/admin/bibindex-admin-guide.webdoc
diff --git a/modules/bibindex/lib/bibindex_engine.py b/invenio/legacy/bibindex/engine.py
similarity index 100%
rename from modules/bibindex/lib/bibindex_engine.py
rename to invenio/legacy/bibindex/engine.py
diff --git a/modules/bibindex/lib/bibindex_engine_config.py b/invenio/legacy/bibindex/engine_config.py
similarity index 100%
rename from modules/bibindex/lib/bibindex_engine_config.py
rename to invenio/legacy/bibindex/engine_config.py
diff --git a/modules/bibindex/lib/bibindex_engine_stemmer.py b/invenio/legacy/bibindex/engine_stemmer.py
similarity index 100%
rename from modules/bibindex/lib/bibindex_engine_stemmer.py
rename to invenio/legacy/bibindex/engine_stemmer.py
diff --git a/modules/bibindex/lib/bibindex_engine_stemmer_greek.py b/invenio/legacy/bibindex/engine_stemmer_greek.py
similarity index 100%
rename from modules/bibindex/lib/bibindex_engine_stemmer_greek.py
rename to invenio/legacy/bibindex/engine_stemmer_greek.py
diff --git a/modules/bibindex/lib/bibindex_engine_stopwords.py b/invenio/legacy/bibindex/engine_stopwords.py
similarity index 100%
rename from modules/bibindex/lib/bibindex_engine_stopwords.py
rename to invenio/legacy/bibindex/engine_stopwords.py
diff --git a/modules/bibindex/lib/bibindex_engine_utils.py b/invenio/legacy/bibindex/engine_utils.py
similarity index 100%
rename from modules/bibindex/lib/bibindex_engine_utils.py
rename to invenio/legacy/bibindex/engine_utils.py
diff --git a/modules/bibindex/lib/bibindex_engine_washer.py b/invenio/legacy/bibindex/engine_washer.py
similarity index 100%
rename from modules/bibindex/lib/bibindex_engine_washer.py
rename to invenio/legacy/bibindex/engine_washer.py
diff --git a/modules/bibindex/bin/bibindex.in b/invenio/legacy/bibindex/scripts/bibindex.py
similarity index 100%
rename from modules/bibindex/bin/bibindex.in
rename to invenio/legacy/bibindex/scripts/bibindex.py
diff --git a/modules/bibindex/bin/bibstat.in b/invenio/legacy/bibindex/scripts/bibstat.py
similarity index 100%
rename from modules/bibindex/bin/bibstat.in
rename to invenio/legacy/bibindex/scripts/bibstat.py
diff --git a/modules/bibindex/web/admin/bibindexadmin.py b/invenio/legacy/bibindex/web/admin/bibindexadmin.py
similarity index 100%
rename from modules/bibindex/web/admin/bibindexadmin.py
rename to invenio/legacy/bibindex/web/admin/bibindexadmin.py
diff --git a/modules/bibknowledge/lib/bibknowledgeadmin.py b/invenio/legacy/bibknowledge/admin.py
similarity index 100%
rename from modules/bibknowledge/lib/bibknowledgeadmin.py
rename to invenio/legacy/bibknowledge/admin.py
diff --git a/modules/bibknowledge/lib/bibknowledgeadminlib.py b/invenio/legacy/bibknowledge/adminlib.py
similarity index 100%
rename from modules/bibknowledge/lib/bibknowledgeadminlib.py
rename to invenio/legacy/bibknowledge/adminlib.py
diff --git a/modules/bibknowledge/doc/admin/bibknowledge-admin-guide.webdoc b/invenio/legacy/bibknowledge/doc/admin/bibknowledge-admin-guide.webdoc
similarity index 100%
rename from modules/bibknowledge/doc/admin/bibknowledge-admin-guide.webdoc
rename to invenio/legacy/bibknowledge/doc/admin/bibknowledge-admin-guide.webdoc
diff --git a/modules/bibknowledge/doc/hacking/bibknowledge-api.webdoc b/invenio/legacy/bibknowledge/doc/hacking/bibknowledge-api.webdoc
similarity index 100%
rename from modules/bibknowledge/doc/hacking/bibknowledge-api.webdoc
rename to invenio/legacy/bibknowledge/doc/hacking/bibknowledge-api.webdoc
diff --git a/modules/bibknowledge/lib/bibknowledge_templates.py b/invenio/legacy/bibknowledge/templates.py
similarity index 100%
rename from modules/bibknowledge/lib/bibknowledge_templates.py
rename to invenio/legacy/bibknowledge/templates.py
diff --git a/modules/bibknowledge/lib/bibknowledge_webinterface.py b/invenio/legacy/bibknowledge/webinterface.py
similarity index 100%
rename from modules/bibknowledge/lib/bibknowledge_webinterface.py
rename to invenio/legacy/bibknowledge/webinterface.py
diff --git a/modules/bibmatch/lib/bibmatch_config.py b/invenio/legacy/bibmatch/config.py
similarity index 100%
rename from modules/bibmatch/lib/bibmatch_config.py
rename to invenio/legacy/bibmatch/config.py
diff --git a/modules/bibmatch/doc/admin/bibmatch-admin-guide.webdoc b/invenio/legacy/bibmatch/doc/admin/bibmatch-admin-guide.webdoc
similarity index 100%
rename from modules/bibmatch/doc/admin/bibmatch-admin-guide.webdoc
rename to invenio/legacy/bibmatch/doc/admin/bibmatch-admin-guide.webdoc
diff --git a/modules/bibmatch/doc/hacking/bibmatch-hacking-guide.webdoc b/invenio/legacy/bibmatch/doc/hacking/bibmatch-hacking-guide.webdoc
similarity index 100%
rename from modules/bibmatch/doc/hacking/bibmatch-hacking-guide.webdoc
rename to invenio/legacy/bibmatch/doc/hacking/bibmatch-hacking-guide.webdoc
diff --git a/modules/bibmatch/lib/bibmatch_engine.py b/invenio/legacy/bibmatch/engine.py
similarity index 100%
rename from modules/bibmatch/lib/bibmatch_engine.py
rename to invenio/legacy/bibmatch/engine.py
diff --git a/modules/bibmatch/bin/bibmatch.in b/invenio/legacy/bibmatch/scripts/bibmatch.py
similarity index 100%
rename from modules/bibmatch/bin/bibmatch.in
rename to invenio/legacy/bibmatch/scripts/bibmatch.py
diff --git a/modules/bibmatch/lib/bibmatch_validator.py b/invenio/legacy/bibmatch/validator.py
similarity index 100%
rename from modules/bibmatch/lib/bibmatch_validator.py
rename to invenio/legacy/bibmatch/validator.py
diff --git a/modules/bibmerge/lib/bibmerge_differ.py b/invenio/legacy/bibmerge/differ.py
similarity index 100%
rename from modules/bibmerge/lib/bibmerge_differ.py
rename to invenio/legacy/bibmerge/differ.py
diff --git a/modules/bibmerge/lib/bibmerge_engine.py b/invenio/legacy/bibmerge/engine.py
similarity index 100%
rename from modules/bibmerge/lib/bibmerge_engine.py
rename to invenio/legacy/bibmerge/engine.py
diff --git a/modules/bibmerge/lib/bibmerge_merger.py b/invenio/legacy/bibmerge/merger.py
similarity index 100%
rename from modules/bibmerge/lib/bibmerge_merger.py
rename to invenio/legacy/bibmerge/merger.py
diff --git a/modules/bibmerge/lib/bibmerge_templates.py b/invenio/legacy/bibmerge/templates.py
similarity index 100%
rename from modules/bibmerge/lib/bibmerge_templates.py
rename to invenio/legacy/bibmerge/templates.py
diff --git a/modules/bibmerge/lib/bibmerge_webinterface.py b/invenio/legacy/bibmerge/webinterface.py
similarity index 100%
rename from modules/bibmerge/lib/bibmerge_webinterface.py
rename to invenio/legacy/bibmerge/webinterface.py
diff --git a/modules/bibrank/lib/bibrankadminlib.py b/invenio/legacy/bibrank/adminlib.py
similarity index 100%
rename from modules/bibrank/lib/bibrankadminlib.py
rename to invenio/legacy/bibrank/adminlib.py
diff --git a/modules/bibrank/lib/bibrank_bridge_config.py b/invenio/legacy/bibrank/bridge_config.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_bridge_config.py
rename to invenio/legacy/bibrank/bridge_config.py
diff --git a/modules/bibrank/lib/bibrank_bridge_utils.py b/invenio/legacy/bibrank/bridge_utils.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_bridge_utils.py
rename to invenio/legacy/bibrank/bridge_utils.py
diff --git a/modules/bibrank/lib/bibrank_citation_grapher.py b/invenio/legacy/bibrank/citation_grapher.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_citation_grapher.py
rename to invenio/legacy/bibrank/citation_grapher.py
diff --git a/modules/bibrank/lib/bibrank_citation_indexer.py b/invenio/legacy/bibrank/citation_indexer.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_citation_indexer.py
rename to invenio/legacy/bibrank/citation_indexer.py
diff --git a/modules/bibrank/lib/bibrank_citation_searcher.py b/invenio/legacy/bibrank/citation_searcher.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_citation_searcher.py
rename to invenio/legacy/bibrank/citation_searcher.py
diff --git a/modules/bibrank/lib/bibrank_citerank_indexer.py b/invenio/legacy/bibrank/citerank_indexer.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_citerank_indexer.py
rename to invenio/legacy/bibrank/citerank_indexer.py
diff --git a/modules/bibrank/lib/bibrank.py b/invenio/legacy/bibrank/cli.py
similarity index 100%
rename from modules/bibrank/lib/bibrank.py
rename to invenio/legacy/bibrank/cli.py
diff --git a/modules/bibrank/doc/admin/bibrank-admin-guide.webdoc b/invenio/legacy/bibrank/doc/admin/bibrank-admin-guide.webdoc
similarity index 100%
rename from modules/bibrank/doc/admin/bibrank-admin-guide.webdoc
rename to invenio/legacy/bibrank/doc/admin/bibrank-admin-guide.webdoc
diff --git a/modules/bibrank/doc/hacking/bibrank-api.webdoc b/invenio/legacy/bibrank/doc/hacking/bibrank-api.webdoc
similarity index 100%
rename from modules/bibrank/doc/hacking/bibrank-api.webdoc
rename to invenio/legacy/bibrank/doc/hacking/bibrank-api.webdoc
diff --git a/modules/bibrank/doc/hacking/bibrank-bibrankgkb.webdoc b/invenio/legacy/bibrank/doc/hacking/bibrank-bibrankgkb.webdoc
similarity index 100%
rename from modules/bibrank/doc/hacking/bibrank-bibrankgkb.webdoc
rename to invenio/legacy/bibrank/doc/hacking/bibrank-bibrankgkb.webdoc
diff --git a/modules/bibrank/doc/hacking/bibrank-citation-t.webdoc b/invenio/legacy/bibrank/doc/hacking/bibrank-citation-t.webdoc
similarity index 100%
rename from modules/bibrank/doc/hacking/bibrank-citation-t.webdoc
rename to invenio/legacy/bibrank/doc/hacking/bibrank-citation-t.webdoc
diff --git a/modules/bibrank/doc/hacking/bibrank-internals.webdoc b/invenio/legacy/bibrank/doc/hacking/bibrank-internals.webdoc
similarity index 100%
rename from modules/bibrank/doc/hacking/bibrank-internals.webdoc
rename to invenio/legacy/bibrank/doc/hacking/bibrank-internals.webdoc
diff --git a/modules/bibrank/doc/hacking/bibrank-pagerank-c.webdoc b/invenio/legacy/bibrank/doc/hacking/bibrank-pagerank-c.webdoc
similarity index 100%
rename from modules/bibrank/doc/hacking/bibrank-pagerank-c.webdoc
rename to invenio/legacy/bibrank/doc/hacking/bibrank-pagerank-c.webdoc
diff --git a/modules/bibrank/doc/hacking/bibrank-pagerank-t.webdoc b/invenio/legacy/bibrank/doc/hacking/bibrank-pagerank-t.webdoc
similarity index 100%
rename from modules/bibrank/doc/hacking/bibrank-pagerank-t.webdoc
rename to invenio/legacy/bibrank/doc/hacking/bibrank-pagerank-t.webdoc
diff --git a/modules/bibrank/doc/hacking/bibrank-single-tag-rank.webdoc b/invenio/legacy/bibrank/doc/hacking/bibrank-single-tag-rank.webdoc
similarity index 100%
rename from modules/bibrank/doc/hacking/bibrank-single-tag-rank.webdoc
rename to invenio/legacy/bibrank/doc/hacking/bibrank-single-tag-rank.webdoc
diff --git a/modules/bibrank/doc/hacking/bibrank-word-similarity.webdoc b/invenio/legacy/bibrank/doc/hacking/bibrank-word-similarity.webdoc
similarity index 100%
rename from modules/bibrank/doc/hacking/bibrank-word-similarity.webdoc
rename to invenio/legacy/bibrank/doc/hacking/bibrank-word-similarity.webdoc
diff --git a/modules/bibrank/lib/bibrank_downloads_grapher.py b/invenio/legacy/bibrank/downloads_grapher.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_downloads_grapher.py
rename to invenio/legacy/bibrank/downloads_grapher.py
diff --git a/modules/bibrank/lib/bibrank_downloads_indexer.py b/invenio/legacy/bibrank/downloads_indexer.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_downloads_indexer.py
rename to invenio/legacy/bibrank/downloads_indexer.py
diff --git a/modules/bibrank/lib/bibrank_downloads_similarity.py b/invenio/legacy/bibrank/downloads_similarity.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_downloads_similarity.py
rename to invenio/legacy/bibrank/downloads_similarity.py
diff --git a/modules/bibrank/lib/bibrankgkb.py b/invenio/legacy/bibrank/gkb.py
similarity index 100%
rename from modules/bibrank/lib/bibrankgkb.py
rename to invenio/legacy/bibrank/gkb.py
diff --git a/modules/bibrank/lib/bibrank_grapher.py b/invenio/legacy/bibrank/grapher.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_grapher.py
rename to invenio/legacy/bibrank/grapher.py
diff --git a/modules/bibrank/lib/bibrank_record_sorter.py b/invenio/legacy/bibrank/record_sorter.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_record_sorter.py
rename to invenio/legacy/bibrank/record_sorter.py
diff --git a/modules/bibrank/bin/bibrank.in b/invenio/legacy/bibrank/scripts/bibrank.py
similarity index 100%
rename from modules/bibrank/bin/bibrank.in
rename to invenio/legacy/bibrank/scripts/bibrank.py
diff --git a/modules/bibrank/bin/bibrankgkb.in b/invenio/legacy/bibrank/scripts/bibrankgkb.py
similarity index 100%
rename from modules/bibrank/bin/bibrankgkb.in
rename to invenio/legacy/bibrank/scripts/bibrankgkb.py
diff --git a/modules/bibrank/lib/bibrank_selfcites_indexer.py b/invenio/legacy/bibrank/selfcites_indexer.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_selfcites_indexer.py
rename to invenio/legacy/bibrank/selfcites_indexer.py
diff --git a/modules/bibrank/lib/bibrank_selfcites_task.py b/invenio/legacy/bibrank/selfcites_task.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_selfcites_task.py
rename to invenio/legacy/bibrank/selfcites_task.py
diff --git a/modules/bibrank/lib/bibrank_tag_based_indexer.py b/invenio/legacy/bibrank/tag_based_indexer.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_tag_based_indexer.py
rename to invenio/legacy/bibrank/tag_based_indexer.py
diff --git a/modules/bibrank/web/admin/bibrankadmin.py b/invenio/legacy/bibrank/web/admin/bibrankadmin.py
similarity index 100%
rename from modules/bibrank/web/admin/bibrankadmin.py
rename to invenio/legacy/bibrank/web/admin/bibrankadmin.py
diff --git a/modules/bibrank/lib/bibrank_word_indexer.py b/invenio/legacy/bibrank/word_indexer.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_word_indexer.py
rename to invenio/legacy/bibrank/word_indexer.py
diff --git a/modules/bibrank/lib/bibrank_word_searcher.py b/invenio/legacy/bibrank/word_searcher.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_word_searcher.py
rename to invenio/legacy/bibrank/word_searcher.py
diff --git a/modules/bibrecord/lib/bibrecord.py b/invenio/legacy/bibrecord/__init__.py
similarity index 100%
rename from modules/bibrecord/lib/bibrecord.py
rename to invenio/legacy/bibrecord/__init__.py
diff --git a/modules/bibrecord/lib/bibrecord_config.py b/invenio/legacy/bibrecord/bibrecord_config.py
similarity index 100%
rename from modules/bibrecord/lib/bibrecord_config.py
rename to invenio/legacy/bibrecord/bibrecord_config.py
diff --git a/modules/bibrecord/lib/bibrecord_manager.py b/invenio/legacy/bibrecord/bibrecord_manager.py
similarity index 100%
rename from modules/bibrecord/lib/bibrecord_manager.py
rename to invenio/legacy/bibrecord/bibrecord_manager.py
diff --git a/modules/bibrecord/etc/MARC21slim.dtd b/invenio/legacy/bibrecord/data/MARC21slim.dtd
similarity index 100%
rename from modules/bibrecord/etc/MARC21slim.dtd
rename to invenio/legacy/bibrecord/data/MARC21slim.dtd
diff --git a/modules/bibrecord/doc/hacking/bibrecord-internals.webdoc b/invenio/legacy/bibrecord/doc/hacking/bibrecord-internals.webdoc
similarity index 100%
rename from modules/bibrecord/doc/hacking/bibrecord-internals.webdoc
rename to invenio/legacy/bibrecord/doc/hacking/bibrecord-internals.webdoc
diff --git a/modules/bibrecord/lib/textmarc2xmlmarc.py b/invenio/legacy/bibrecord/scripts/textmarc2xmlmarc.py
similarity index 100%
rename from modules/bibrecord/lib/textmarc2xmlmarc.py
rename to invenio/legacy/bibrecord/scripts/textmarc2xmlmarc.py
diff --git a/modules/bibrecord/lib/xmlmarc2textmarc.py b/invenio/legacy/bibrecord/scripts/xmlmarc2textmarc.py
similarity index 100%
rename from modules/bibrecord/lib/xmlmarc2textmarc.py
rename to invenio/legacy/bibrecord/scripts/xmlmarc2textmarc.py
diff --git a/modules/bibsched/lib/bibtask.py b/invenio/legacy/bibsched/bibtask.py
similarity index 100%
rename from modules/bibsched/lib/bibtask.py
rename to invenio/legacy/bibsched/bibtask.py
diff --git a/modules/bibsched/lib/bibtask_config.py b/invenio/legacy/bibsched/bibtask_config.py
similarity index 100%
rename from modules/bibsched/lib/bibtask_config.py
rename to invenio/legacy/bibsched/bibtask_config.py
diff --git a/modules/bibsched/doc/admin/bibsched-admin-guide.webdoc b/invenio/legacy/bibsched/doc/admin/bibsched-admin-guide.webdoc
similarity index 100%
rename from modules/bibsched/doc/admin/bibsched-admin-guide.webdoc
rename to invenio/legacy/bibsched/doc/admin/bibsched-admin-guide.webdoc
diff --git a/modules/bibsched/doc/hacking/bibsched-internals.webdoc b/invenio/legacy/bibsched/doc/hacking/bibsched-internals.webdoc
similarity index 100%
rename from modules/bibsched/doc/hacking/bibsched-internals.webdoc
rename to invenio/legacy/bibsched/doc/hacking/bibsched-internals.webdoc
diff --git a/modules/bibsched/doc/hacking/bibtask-api.webdoc b/invenio/legacy/bibsched/doc/hacking/bibtask-api.webdoc
similarity index 100%
rename from modules/bibsched/doc/hacking/bibtask-api.webdoc
rename to invenio/legacy/bibsched/doc/hacking/bibtask-api.webdoc
diff --git a/modules/bibsched/lib/bibsched.py b/invenio/legacy/bibsched/scripts/bibsched.py
similarity index 100%
rename from modules/bibsched/lib/bibsched.py
rename to invenio/legacy/bibsched/scripts/bibsched.py
diff --git a/modules/bibsched/lib/bibtaskex.py b/invenio/legacy/bibsched/scripts/bibtaskex.py
similarity index 100%
rename from modules/bibsched/lib/bibtaskex.py
rename to invenio/legacy/bibsched/scripts/bibtaskex.py
diff --git a/modules/bibsched/lib/bibtasklet.py b/invenio/legacy/bibsched/scripts/bibtasklet.py
similarity index 100%
rename from modules/bibsched/lib/bibtasklet.py
rename to invenio/legacy/bibsched/scripts/bibtasklet.py
diff --git a/modules/bibsched/lib/tasklets/bst_fibonacci.py b/invenio/legacy/bibsched/tasklets/bst_fibonacci.py
similarity index 100%
rename from modules/bibsched/lib/tasklets/bst_fibonacci.py
rename to invenio/legacy/bibsched/tasklets/bst_fibonacci.py
diff --git a/modules/bibsched/lib/tasklets/bst_notify_url.py b/invenio/legacy/bibsched/tasklets/bst_notify_url.py
similarity index 100%
rename from modules/bibsched/lib/tasklets/bst_notify_url.py
rename to invenio/legacy/bibsched/tasklets/bst_notify_url.py
diff --git a/modules/bibsched/lib/tasklets/bst_run_bibtask.py b/invenio/legacy/bibsched/tasklets/bst_run_bibtask.py
similarity index 100%
rename from modules/bibsched/lib/tasklets/bst_run_bibtask.py
rename to invenio/legacy/bibsched/tasklets/bst_run_bibtask.py
diff --git a/modules/bibsched/lib/tasklets/bst_send_email.py b/invenio/legacy/bibsched/tasklets/bst_send_email.py
similarity index 100%
rename from modules/bibsched/lib/tasklets/bst_send_email.py
rename to invenio/legacy/bibsched/tasklets/bst_send_email.py
diff --git a/modules/bibsched/lib/tasklets/bst_twitter_fetcher.py b/invenio/legacy/bibsched/tasklets/bst_twitter_fetcher.py
similarity index 100%
rename from modules/bibsched/lib/tasklets/bst_twitter_fetcher.py
rename to invenio/legacy/bibsched/tasklets/bst_twitter_fetcher.py
diff --git a/modules/bibsched/lib/tasklets/bst_weblinkback_updater.py b/invenio/legacy/bibsched/tasklets/bst_weblinkback_updater.py
similarity index 100%
rename from modules/bibsched/lib/tasklets/bst_weblinkback_updater.py
rename to invenio/legacy/bibsched/tasklets/bst_weblinkback_updater.py
diff --git a/modules/bibsched/lib/bibsched_webapi.py b/invenio/legacy/bibsched/webapi.py
similarity index 100%
rename from modules/bibsched/lib/bibsched_webapi.py
rename to invenio/legacy/bibsched/webapi.py
diff --git a/modules/bibsched/lib/bibsched_webinterface.py b/invenio/legacy/bibsched/webinterface.py
similarity index 100%
rename from modules/bibsched/lib/bibsched_webinterface.py
rename to invenio/legacy/bibsched/webinterface.py
diff --git a/modules/bibsort/lib/bibsortadminlib.py b/invenio/legacy/bibsort/adminlib.py
similarity index 100%
rename from modules/bibsort/lib/bibsortadminlib.py
rename to invenio/legacy/bibsort/adminlib.py
diff --git a/modules/bibsort/etc/bibsort.cfg b/invenio/legacy/bibsort/bibsort.cfg
similarity index 100%
rename from modules/bibsort/etc/bibsort.cfg
rename to invenio/legacy/bibsort/bibsort.cfg
diff --git a/modules/bibsort/lib/bibsort_daemon.py b/invenio/legacy/bibsort/daemon.py
similarity index 100%
rename from modules/bibsort/lib/bibsort_daemon.py
rename to invenio/legacy/bibsort/daemon.py
diff --git a/modules/bibsort/doc/admin/bibsort-admin-guide.webdoc b/invenio/legacy/bibsort/doc/admin/bibsort-admin-guide.webdoc
similarity index 100%
rename from modules/bibsort/doc/admin/bibsort-admin-guide.webdoc
rename to invenio/legacy/bibsort/doc/admin/bibsort-admin-guide.webdoc
diff --git a/modules/bibsort/doc/hacking/bibsort-internals.webdoc b/invenio/legacy/bibsort/doc/hacking/bibsort-internals.webdoc
similarity index 100%
rename from modules/bibsort/doc/hacking/bibsort-internals.webdoc
rename to invenio/legacy/bibsort/doc/hacking/bibsort-internals.webdoc
diff --git a/modules/bibsort/lib/bibsort_engine.py b/invenio/legacy/bibsort/engine.py
similarity index 100%
rename from modules/bibsort/lib/bibsort_engine.py
rename to invenio/legacy/bibsort/engine.py
diff --git a/modules/bibsort/bin/bibsort.in b/invenio/legacy/bibsort/scripts/bibsort.py
similarity index 100%
rename from modules/bibsort/bin/bibsort.in
rename to invenio/legacy/bibsort/scripts/bibsort.py
diff --git a/modules/bibsort/lib/bibsort_washer.py b/invenio/legacy/bibsort/washer.py
similarity index 100%
rename from modules/bibsort/lib/bibsort_washer.py
rename to invenio/legacy/bibsort/washer.py
diff --git a/modules/bibsort/web/admin/bibsortadmin.py b/invenio/legacy/bibsort/web/admin/bibsortadmin.py
similarity index 100%
rename from modules/bibsort/web/admin/bibsortadmin.py
rename to invenio/legacy/bibsort/web/admin/bibsortadmin.py
diff --git a/modules/bibsword/lib/bibsword_client.py b/invenio/legacy/bibsword/client.py
similarity index 100%
rename from modules/bibsword/lib/bibsword_client.py
rename to invenio/legacy/bibsword/client.py
diff --git a/modules/bibsword/lib/bibsword_client_dblayer.py b/invenio/legacy/bibsword/client_dblayer.py
similarity index 100%
rename from modules/bibsword/lib/bibsword_client_dblayer.py
rename to invenio/legacy/bibsword/client_dblayer.py
diff --git a/modules/bibsword/lib/bibsword_client_formatter.py b/invenio/legacy/bibsword/client_formatter.py
similarity index 100%
rename from modules/bibsword/lib/bibsword_client_formatter.py
rename to invenio/legacy/bibsword/client_formatter.py
diff --git a/modules/bibsword/lib/bibsword_client_http.py b/invenio/legacy/bibsword/client_http.py
similarity index 100%
rename from modules/bibsword/lib/bibsword_client_http.py
rename to invenio/legacy/bibsword/client_http.py
diff --git a/modules/bibsword/lib/bibsword_client_templates.py b/invenio/legacy/bibsword/client_templates.py
similarity index 100%
rename from modules/bibsword/lib/bibsword_client_templates.py
rename to invenio/legacy/bibsword/client_templates.py
diff --git a/modules/bibsword/lib/bibsword_client_tester.py b/invenio/legacy/bibsword/client_tester.py
similarity index 100%
rename from modules/bibsword/lib/bibsword_client_tester.py
rename to invenio/legacy/bibsword/client_tester.py
diff --git a/modules/bibsword/lib/bibsword_config.py b/invenio/legacy/bibsword/config.py
similarity index 100%
rename from modules/bibsword/lib/bibsword_config.py
rename to invenio/legacy/bibsword/config.py
diff --git a/modules/bibsword/etc/Test_marcxml_file_1.xml b/invenio/legacy/bibsword/data/Test_marcxml_file_1.xml
similarity index 100%
rename from modules/bibsword/etc/Test_marcxml_file_1.xml
rename to invenio/legacy/bibsword/data/Test_marcxml_file_1.xml
diff --git a/modules/bibsword/etc/Test_marcxml_file_2.xml b/invenio/legacy/bibsword/data/Test_marcxml_file_2.xml
similarity index 100%
rename from modules/bibsword/etc/Test_marcxml_file_2.xml
rename to invenio/legacy/bibsword/data/Test_marcxml_file_2.xml
diff --git a/modules/bibsword/etc/Test_marcxml_file_3.xml b/invenio/legacy/bibsword/data/Test_marcxml_file_3.xml
similarity index 100%
rename from modules/bibsword/etc/Test_marcxml_file_3.xml
rename to invenio/legacy/bibsword/data/Test_marcxml_file_3.xml
diff --git a/modules/bibsword/etc/Test_media_deposit.xml b/invenio/legacy/bibsword/data/Test_media_deposit.xml
similarity index 100%
rename from modules/bibsword/etc/Test_media_deposit.xml
rename to invenio/legacy/bibsword/data/Test_media_deposit.xml
diff --git a/modules/bibsword/etc/Test_submission_status_onhold.xml b/invenio/legacy/bibsword/data/Test_submission_status_onhold.xml
similarity index 100%
rename from modules/bibsword/etc/Test_submission_status_onhold.xml
rename to invenio/legacy/bibsword/data/Test_submission_status_onhold.xml
diff --git a/modules/bibsword/etc/Test_submission_status_published.xml b/invenio/legacy/bibsword/data/Test_submission_status_published.xml
similarity index 100%
rename from modules/bibsword/etc/Test_submission_status_published.xml
rename to invenio/legacy/bibsword/data/Test_submission_status_published.xml
diff --git a/modules/bibsword/etc/Test_submission_status_submitted.xml b/invenio/legacy/bibsword/data/Test_submission_status_submitted.xml
similarity index 100%
rename from modules/bibsword/etc/Test_submission_status_submitted.xml
rename to invenio/legacy/bibsword/data/Test_submission_status_submitted.xml
diff --git a/modules/bibsword/etc/Test_submission_status_unknown.xml b/invenio/legacy/bibsword/data/Test_submission_status_unknown.xml
similarity index 100%
rename from modules/bibsword/etc/Test_submission_status_unknown.xml
rename to invenio/legacy/bibsword/data/Test_submission_status_unknown.xml
diff --git a/modules/bibsword/doc/admin/bibsword-client-admin-guide.webdoc b/invenio/legacy/bibsword/doc/admin/bibsword-client-admin-guide.webdoc
similarity index 100%
rename from modules/bibsword/doc/admin/bibsword-client-admin-guide.webdoc
rename to invenio/legacy/bibsword/doc/admin/bibsword-client-admin-guide.webdoc
diff --git a/modules/bibsword/doc/hacking/bibsword-client-hacking-guide.webdoc b/invenio/legacy/bibsword/doc/hacking/bibsword-client-hacking-guide.webdoc
similarity index 100%
rename from modules/bibsword/doc/hacking/bibsword-client-hacking-guide.webdoc
rename to invenio/legacy/bibsword/doc/hacking/bibsword-client-hacking-guide.webdoc
diff --git a/modules/bibsword/lib/bibsword_webinterface.py b/invenio/legacy/bibsword/webinterface.py
similarity index 100%
rename from modules/bibsword/lib/bibsword_webinterface.py
rename to invenio/legacy/bibsword/webinterface.py
diff --git a/modules/bibupload/lib/bibupload_config.py b/invenio/legacy/bibupload/config.py
similarity index 100%
rename from modules/bibupload/lib/bibupload_config.py
rename to invenio/legacy/bibupload/config.py
diff --git a/modules/bibupload/doc/admin/bibupload-admin-guide.webdoc b/invenio/legacy/bibupload/doc/admin/bibupload-admin-guide.webdoc
similarity index 100%
rename from modules/bibupload/doc/admin/bibupload-admin-guide.webdoc
rename to invenio/legacy/bibupload/doc/admin/bibupload-admin-guide.webdoc
diff --git a/modules/bibupload/lib/bibupload.py b/invenio/legacy/bibupload/engine.py
similarity index 100%
rename from modules/bibupload/lib/bibupload.py
rename to invenio/legacy/bibupload/engine.py
diff --git a/modules/bibupload/lib/bibupload_revisionverifier.py b/invenio/legacy/bibupload/revisionverifier.py
similarity index 100%
rename from modules/bibupload/lib/bibupload_revisionverifier.py
rename to invenio/legacy/bibupload/revisionverifier.py
diff --git a/modules/bibupload/bin/batchuploader.in b/invenio/legacy/bibupload/scripts/batchuploader.py
similarity index 100%
rename from modules/bibupload/bin/batchuploader.in
rename to invenio/legacy/bibupload/scripts/batchuploader.py
diff --git a/modules/bibupload/bin/bibupload.in b/invenio/legacy/bibupload/scripts/bibupload.py
similarity index 100%
rename from modules/bibupload/bin/bibupload.in
rename to invenio/legacy/bibupload/scripts/bibupload.py
diff --git a/modules/miscutil/lib/bibuploadutils.py b/invenio/legacy/bibupload/utils.py
similarity index 100%
rename from modules/miscutil/lib/bibuploadutils.py
rename to invenio/legacy/bibupload/utils.py
diff --git a/modules/webstyle/lib/ckeditor_invenio_connector.py b/invenio/legacy/ckeditor/connector.py
similarity index 100%
rename from modules/webstyle/lib/ckeditor_invenio_connector.py
rename to invenio/legacy/ckeditor/connector.py
diff --git a/modules/miscutil/lib/dbquery.py b/invenio/legacy/dbquery.py
similarity index 100%
rename from modules/miscutil/lib/dbquery.py
rename to invenio/legacy/dbquery.py
diff --git a/modules/docextract/etc/job-preprints.cfg b/invenio/legacy/docextract/data/job-preprints.cfg
similarity index 100%
rename from modules/docextract/etc/job-preprints.cfg
rename to invenio/legacy/docextract/data/job-preprints.cfg
diff --git a/modules/docextract/etc/test1.txt b/invenio/legacy/docextract/data/test1.txt
similarity index 100%
rename from modules/docextract/etc/test1.txt
rename to invenio/legacy/docextract/data/test1.txt
diff --git a/modules/docextract/etc/test2.txt b/invenio/legacy/docextract/data/test2.txt
similarity index 100%
rename from modules/docextract/etc/test2.txt
rename to invenio/legacy/docextract/data/test2.txt
diff --git a/modules/docextract/doc/admin/docextract-admin-guide.webdoc b/invenio/legacy/docextract/doc/admin/docextract-admin-guide.webdoc
similarity index 100%
rename from modules/docextract/doc/admin/docextract-admin-guide.webdoc
rename to invenio/legacy/docextract/doc/admin/docextract-admin-guide.webdoc
diff --git a/modules/docextract/doc/hacking/docextract-internals.webdoc b/invenio/legacy/docextract/doc/hacking/docextract-internals.webdoc
similarity index 100%
rename from modules/docextract/doc/hacking/docextract-internals.webdoc
rename to invenio/legacy/docextract/doc/hacking/docextract-internals.webdoc
diff --git a/modules/docextract/lib/docextract_pdf.py b/invenio/legacy/docextract/pdf.py
similarity index 100%
rename from modules/docextract/lib/docextract_pdf.py
rename to invenio/legacy/docextract/pdf.py
diff --git a/modules/docextract/bin/docextract.in b/invenio/legacy/docextract/scripts/docextract.py
similarity index 100%
rename from modules/docextract/bin/docextract.in
rename to invenio/legacy/docextract/scripts/docextract.py
diff --git a/modules/docextract/lib/docextract_task.py b/invenio/legacy/docextract/task.py
similarity index 100%
rename from modules/docextract/lib/docextract_task.py
rename to invenio/legacy/docextract/task.py
diff --git a/modules/docextract/lib/docextract_text.py b/invenio/legacy/docextract/text.py
similarity index 100%
rename from modules/docextract/lib/docextract_text.py
rename to invenio/legacy/docextract/text.py
diff --git a/modules/docextract/lib/docextract_utils.py b/invenio/legacy/docextract/utils.py
similarity index 100%
rename from modules/docextract/lib/docextract_utils.py
rename to invenio/legacy/docextract/utils.py
diff --git a/modules/docextract/lib/docextract_webinterface.py b/invenio/legacy/docextract/webinterface.py
similarity index 100%
rename from modules/docextract/lib/docextract_webinterface.py
rename to invenio/legacy/docextract/webinterface.py
diff --git a/modules/elmsubmit/lib/elmsubmit_EZArchive.py b/invenio/legacy/elmsubmit/EZArchive.py
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit_EZArchive.py
rename to invenio/legacy/elmsubmit/EZArchive.py
diff --git a/modules/elmsubmit/lib/elmsubmit_EZArchive_examples.txt b/invenio/legacy/elmsubmit/EZArchive_examples.txt
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit_EZArchive_examples.txt
rename to invenio/legacy/elmsubmit/EZArchive_examples.txt
diff --git a/modules/elmsubmit/lib/elmsubmit_EZEmail.py b/invenio/legacy/elmsubmit/EZEmail.py
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit_EZEmail.py
rename to invenio/legacy/elmsubmit/EZEmail.py
diff --git a/modules/elmsubmit/lib/elmsubmit.py b/invenio/legacy/elmsubmit/api.py
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit.py
rename to invenio/legacy/elmsubmit/api.py
diff --git a/modules/elmsubmit/lib/elmsubmit_config.py b/invenio/legacy/elmsubmit/config.py
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit_config.py
rename to invenio/legacy/elmsubmit/config.py
diff --git a/modules/elmsubmit/doc/admin/elmsubmit-admin-guide.webdoc b/invenio/legacy/elmsubmit/doc/admin/elmsubmit-admin-guide.webdoc
similarity index 100%
rename from modules/elmsubmit/doc/admin/elmsubmit-admin-guide.webdoc
rename to invenio/legacy/elmsubmit/doc/admin/elmsubmit-admin-guide.webdoc
diff --git a/modules/elmsubmit/etc/elmsubmit.cfg.in b/invenio/legacy/elmsubmit/elmsubmit.cfg.in
similarity index 100%
rename from modules/elmsubmit/etc/elmsubmit.cfg.in
rename to invenio/legacy/elmsubmit/elmsubmit.cfg.in
diff --git a/modules/elmsubmit/lib/elmsubmit_enriched2txt.py b/invenio/legacy/elmsubmit/enriched2txt.py
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit_enriched2txt.py
rename to invenio/legacy/elmsubmit/enriched2txt.py
diff --git a/modules/elmsubmit/lib/elmsubmit_field_validation.py b/invenio/legacy/elmsubmit/field_validation.py
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit_field_validation.py
rename to invenio/legacy/elmsubmit/field_validation.py
diff --git a/modules/elmsubmit/lib/elmsubmit_filename_generator.py b/invenio/legacy/elmsubmit/filename_generator.py
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit_filename_generator.py
rename to invenio/legacy/elmsubmit/filename_generator.py
diff --git a/modules/elmsubmit/lib/elmsubmit_generate_marc.py b/invenio/legacy/elmsubmit/generate_marc.py
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit_generate_marc.py
rename to invenio/legacy/elmsubmit/generate_marc.py
diff --git a/modules/elmsubmit/lib/elmsubmit_html2txt.py b/invenio/legacy/elmsubmit/html2txt.py
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit_html2txt.py
rename to invenio/legacy/elmsubmit/html2txt.py
diff --git a/modules/elmsubmit/lib/myhtmlentitydefs.py b/invenio/legacy/elmsubmit/htmlentitydefs.py
similarity index 100%
rename from modules/elmsubmit/lib/myhtmlentitydefs.py
rename to invenio/legacy/elmsubmit/htmlentitydefs.py
diff --git a/modules/elmsubmit/lib/mime.types.edited b/invenio/legacy/elmsubmit/mime.types.edited
similarity index 100%
rename from modules/elmsubmit/lib/mime.types.edited
rename to invenio/legacy/elmsubmit/mime.types.edited
diff --git a/modules/elmsubmit/lib/elmsubmit_misc.py b/invenio/legacy/elmsubmit/misc.py
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit_misc.py
rename to invenio/legacy/elmsubmit/misc.py
diff --git a/modules/elmsubmit/lib/elmsubmit_richtext2txt.py b/invenio/legacy/elmsubmit/richtext2txt.py
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit_richtext2txt.py
rename to invenio/legacy/elmsubmit/richtext2txt.py
diff --git a/modules/elmsubmit/bin/elmsubmit.in b/invenio/legacy/elmsubmit/scripts/elmsubmit.py
similarity index 100%
rename from modules/elmsubmit/bin/elmsubmit.in
rename to invenio/legacy/elmsubmit/scripts/elmsubmit.py
diff --git a/modules/elmsubmit/lib/elmsubmit_submission_parser.py b/invenio/legacy/elmsubmit/submission_parser.py
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit_submission_parser.py
rename to invenio/legacy/elmsubmit/submission_parser.py
diff --git a/modules/miscutil/lib/errorlib_webinterface.py b/invenio/legacy/errorlib/webinterface.py
similarity index 100%
rename from modules/miscutil/lib/errorlib_webinterface.py
rename to invenio/legacy/errorlib/webinterface.py
diff --git a/modules/webaccess/lib/external_authentication.py b/invenio/legacy/external_authentication/__init__.py
similarity index 100%
rename from modules/webaccess/lib/external_authentication.py
rename to invenio/legacy/external_authentication/__init__.py
diff --git a/modules/webaccess/lib/external_authentication_cern.py b/invenio/legacy/external_authentication/cern.py
similarity index 100%
rename from modules/webaccess/lib/external_authentication_cern.py
rename to invenio/legacy/external_authentication/cern.py
diff --git a/modules/webaccess/lib/external_authentication_cern_wrapper.py b/invenio/legacy/external_authentication/cern_wrapper.py
similarity index 100%
rename from modules/webaccess/lib/external_authentication_cern_wrapper.py
rename to invenio/legacy/external_authentication/cern_wrapper.py
diff --git a/modules/webaccess/lib/external_authentication_ldap.py b/invenio/legacy/external_authentication/ldap.py
similarity index 100%
rename from modules/webaccess/lib/external_authentication_ldap.py
rename to invenio/legacy/external_authentication/ldap.py
diff --git a/modules/webaccess/lib/external_authentication_oauth1.py b/invenio/legacy/external_authentication/oauth1.py
similarity index 100%
rename from modules/webaccess/lib/external_authentication_oauth1.py
rename to invenio/legacy/external_authentication/oauth1.py
diff --git a/modules/webaccess/lib/external_authentication_oauth2.py b/invenio/legacy/external_authentication/oauth2.py
similarity index 100%
rename from modules/webaccess/lib/external_authentication_oauth2.py
rename to invenio/legacy/external_authentication/oauth2.py
diff --git a/modules/webaccess/lib/external_authentication_openid.py b/invenio/legacy/external_authentication/openid.py
similarity index 100%
rename from modules/webaccess/lib/external_authentication_openid.py
rename to invenio/legacy/external_authentication/openid.py
diff --git a/modules/webaccess/lib/external_authentication_robot.py b/invenio/legacy/external_authentication/robot.py
similarity index 100%
rename from modules/webaccess/lib/external_authentication_robot.py
rename to invenio/legacy/external_authentication/robot.py
diff --git a/modules/webaccess/lib/external_authentication_sso.py b/invenio/legacy/external_authentication/sso.py
similarity index 100%
rename from modules/webaccess/lib/external_authentication_sso.py
rename to invenio/legacy/external_authentication/sso.py
diff --git a/modules/miscutil/lib/inveniocfg.py b/invenio/legacy/inveniocfg.py
similarity index 100%
rename from modules/miscutil/lib/inveniocfg.py
rename to invenio/legacy/inveniocfg.py
diff --git a/modules/miscutil/lib/data_cacher.py b/invenio/legacy/miscutil/data_cacher.py
similarity index 100%
rename from modules/miscutil/lib/data_cacher.py
rename to invenio/legacy/miscutil/data_cacher.py
diff --git a/modules/miscutil/lib/dbdump.py b/invenio/legacy/miscutil/dbdump.py
similarity index 100%
rename from modules/miscutil/lib/dbdump.py
rename to invenio/legacy/miscutil/dbdump.py
diff --git a/modules/miscutil/doc/hacking/miscutil-dateutils.webdoc b/invenio/legacy/miscutil/doc/hacking/miscutil-dateutils.webdoc
similarity index 100%
rename from modules/miscutil/doc/hacking/miscutil-dateutils.webdoc
rename to invenio/legacy/miscutil/doc/hacking/miscutil-dateutils.webdoc
diff --git a/modules/miscutil/doc/hacking/miscutil-dbquery.webdoc b/invenio/legacy/miscutil/doc/hacking/miscutil-dbquery.webdoc
similarity index 100%
rename from modules/miscutil/doc/hacking/miscutil-dbquery.webdoc
rename to invenio/legacy/miscutil/doc/hacking/miscutil-dbquery.webdoc
diff --git a/modules/miscutil/doc/hacking/miscutil-errorlib.webdoc b/invenio/legacy/miscutil/doc/hacking/miscutil-errorlib.webdoc
similarity index 100%
rename from modules/miscutil/doc/hacking/miscutil-errorlib.webdoc
rename to invenio/legacy/miscutil/doc/hacking/miscutil-errorlib.webdoc
diff --git a/modules/miscutil/doc/hacking/miscutil-internals.webdoc b/invenio/legacy/miscutil/doc/hacking/miscutil-internals.webdoc
similarity index 100%
rename from modules/miscutil/doc/hacking/miscutil-internals.webdoc
rename to invenio/legacy/miscutil/doc/hacking/miscutil-internals.webdoc
diff --git a/modules/miscutil/doc/hacking/miscutil-remote-debugger.webdoc b/invenio/legacy/miscutil/doc/hacking/miscutil-remote-debugger.webdoc
similarity index 100%
rename from modules/miscutil/doc/hacking/miscutil-remote-debugger.webdoc
rename to invenio/legacy/miscutil/doc/hacking/miscutil-remote-debugger.webdoc
diff --git a/modules/miscutil/lib/inveniocfg_dumperloader.py b/invenio/legacy/miscutil/inveniocfg_dumperloader.py
similarity index 100%
rename from modules/miscutil/lib/inveniocfg_dumperloader.py
rename to invenio/legacy/miscutil/inveniocfg_dumperloader.py
diff --git a/modules/miscutil/lib/miscutil_model.py b/invenio/legacy/miscutil/models.py
similarity index 100%
rename from modules/miscutil/lib/miscutil_model.py
rename to invenio/legacy/miscutil/models.py
diff --git a/modules/miscutil/lib/solrutils/java_sources.txt b/invenio/legacy/miscutil/solrutils/java_sources.txt
similarity index 100%
rename from modules/miscutil/lib/solrutils/java_sources.txt
rename to invenio/legacy/miscutil/solrutils/java_sources.txt
diff --git a/modules/miscutil/lib/solrutils/org/invenio_software/solr/BitSetFieldCollector.java b/invenio/legacy/miscutil/solrutils/org/invenio_software/solr/BitSetFieldCollector.java
similarity index 100%
rename from modules/miscutil/lib/solrutils/org/invenio_software/solr/BitSetFieldCollector.java
rename to invenio/legacy/miscutil/solrutils/org/invenio_software/solr/BitSetFieldCollector.java
diff --git a/modules/miscutil/lib/solrutils/org/invenio_software/solr/FieldCollector.java b/invenio/legacy/miscutil/solrutils/org/invenio_software/solr/FieldCollector.java
similarity index 100%
rename from modules/miscutil/lib/solrutils/org/invenio_software/solr/FieldCollector.java
rename to invenio/legacy/miscutil/solrutils/org/invenio_software/solr/FieldCollector.java
diff --git a/modules/miscutil/lib/solrutils/org/invenio_software/solr/FieldCollectorBase.java b/invenio/legacy/miscutil/solrutils/org/invenio_software/solr/FieldCollectorBase.java
similarity index 100%
rename from modules/miscutil/lib/solrutils/org/invenio_software/solr/FieldCollectorBase.java
rename to invenio/legacy/miscutil/solrutils/org/invenio_software/solr/FieldCollectorBase.java
diff --git a/modules/miscutil/lib/solrutils/org/invenio_software/solr/IntFieldCollector.java b/invenio/legacy/miscutil/solrutils/org/invenio_software/solr/IntFieldCollector.java
similarity index 100%
rename from modules/miscutil/lib/solrutils/org/invenio_software/solr/IntFieldCollector.java
rename to invenio/legacy/miscutil/solrutils/org/invenio_software/solr/IntFieldCollector.java
diff --git a/modules/miscutil/lib/solrutils/org/invenio_software/solr/InvenioBitSet.java b/invenio/legacy/miscutil/solrutils/org/invenio_software/solr/InvenioBitSet.java
similarity index 100%
rename from modules/miscutil/lib/solrutils/org/invenio_software/solr/InvenioBitSet.java
rename to invenio/legacy/miscutil/solrutils/org/invenio_software/solr/InvenioBitSet.java
diff --git a/modules/miscutil/lib/solrutils/org/invenio_software/solr/InvenioBitsetStreamResponseWriter.java b/invenio/legacy/miscutil/solrutils/org/invenio_software/solr/InvenioBitsetStreamResponseWriter.java
similarity index 100%
rename from modules/miscutil/lib/solrutils/org/invenio_software/solr/InvenioBitsetStreamResponseWriter.java
rename to invenio/legacy/miscutil/solrutils/org/invenio_software/solr/InvenioBitsetStreamResponseWriter.java
diff --git a/modules/miscutil/lib/solrutils/org/invenio_software/solr/InvenioFacetComponent.java b/invenio/legacy/miscutil/solrutils/org/invenio_software/solr/InvenioFacetComponent.java
similarity index 100%
rename from modules/miscutil/lib/solrutils/org/invenio_software/solr/InvenioFacetComponent.java
rename to invenio/legacy/miscutil/solrutils/org/invenio_software/solr/InvenioFacetComponent.java
diff --git a/modules/miscutil/lib/solrutils/org/invenio_software/solr/InvenioQueryComponent.java b/invenio/legacy/miscutil/solrutils/org/invenio_software/solr/InvenioQueryComponent.java
similarity index 100%
rename from modules/miscutil/lib/solrutils/org/invenio_software/solr/InvenioQueryComponent.java
rename to invenio/legacy/miscutil/solrutils/org/invenio_software/solr/InvenioQueryComponent.java
diff --git a/modules/miscutil/lib/solrutils/org/invenio_software/solr/StringFieldCollector.java b/invenio/legacy/miscutil/solrutils/org/invenio_software/solr/StringFieldCollector.java
similarity index 100%
rename from modules/miscutil/lib/solrutils/org/invenio_software/solr/StringFieldCollector.java
rename to invenio/legacy/miscutil/solrutils/org/invenio_software/solr/StringFieldCollector.java
diff --git a/modules/miscutil/lib/solrutils/schema.xml b/invenio/legacy/miscutil/solrutils/schema.xml
similarity index 100%
rename from modules/miscutil/lib/solrutils/schema.xml
rename to invenio/legacy/miscutil/solrutils/schema.xml
diff --git a/modules/miscutil/lib/solrutils/solrconfig.xml b/invenio/legacy/miscutil/solrutils/solrconfig.xml
similarity index 100%
rename from modules/miscutil/lib/solrutils/solrconfig.xml
rename to invenio/legacy/miscutil/solrutils/solrconfig.xml
diff --git a/modules/miscutil/lib/solrutils_bibindex_indexer.py b/invenio/legacy/miscutil/solrutils_bibindex_indexer.py
similarity index 100%
rename from modules/miscutil/lib/solrutils_bibindex_indexer.py
rename to invenio/legacy/miscutil/solrutils_bibindex_indexer.py
diff --git a/modules/miscutil/lib/solrutils_bibindex_searcher.py b/invenio/legacy/miscutil/solrutils_bibindex_searcher.py
similarity index 100%
rename from modules/miscutil/lib/solrutils_bibindex_searcher.py
rename to invenio/legacy/miscutil/solrutils_bibindex_searcher.py
diff --git a/modules/miscutil/lib/solrutils_bibrank_indexer.py b/invenio/legacy/miscutil/solrutils_bibrank_indexer.py
similarity index 100%
rename from modules/miscutil/lib/solrutils_bibrank_indexer.py
rename to invenio/legacy/miscutil/solrutils_bibrank_indexer.py
diff --git a/modules/miscutil/lib/solrutils_bibrank_searcher.py b/invenio/legacy/miscutil/solrutils_bibrank_searcher.py
similarity index 100%
rename from modules/miscutil/lib/solrutils_bibrank_searcher.py
rename to invenio/legacy/miscutil/solrutils_bibrank_searcher.py
diff --git a/modules/miscutil/lib/solrutils_config.py b/invenio/legacy/miscutil/solrutils_config.py
similarity index 100%
rename from modules/miscutil/lib/solrutils_config.py
rename to invenio/legacy/miscutil/solrutils_config.py
diff --git a/modules/miscutil/sql/tabbibclean.sql b/invenio/legacy/miscutil/sql/tabbibclean.sql
similarity index 100%
rename from modules/miscutil/sql/tabbibclean.sql
rename to invenio/legacy/miscutil/sql/tabbibclean.sql
diff --git a/modules/miscutil/sql/tabcreate.sql b/invenio/legacy/miscutil/sql/tabcreate.sql
similarity index 100%
rename from modules/miscutil/sql/tabcreate.sql
rename to invenio/legacy/miscutil/sql/tabcreate.sql
diff --git a/modules/miscutil/sql/tabdrop.sql b/invenio/legacy/miscutil/sql/tabdrop.sql
similarity index 100%
rename from modules/miscutil/sql/tabdrop.sql
rename to invenio/legacy/miscutil/sql/tabdrop.sql
diff --git a/modules/miscutil/sql/tabfill.sql b/invenio/legacy/miscutil/sql/tabfill.sql
similarity index 100%
rename from modules/miscutil/sql/tabfill.sql
rename to invenio/legacy/miscutil/sql/tabfill.sql
diff --git a/modules/miscutil/lib/xapianutils_bibindex_indexer.py b/invenio/legacy/miscutil/xapianutils_bibindex_indexer.py
similarity index 100%
rename from modules/miscutil/lib/xapianutils_bibindex_indexer.py
rename to invenio/legacy/miscutil/xapianutils_bibindex_indexer.py
diff --git a/modules/miscutil/lib/xapianutils_bibindex_searcher.py b/invenio/legacy/miscutil/xapianutils_bibindex_searcher.py
similarity index 100%
rename from modules/miscutil/lib/xapianutils_bibindex_searcher.py
rename to invenio/legacy/miscutil/xapianutils_bibindex_searcher.py
diff --git a/modules/miscutil/lib/xapianutils_bibrank_indexer.py b/invenio/legacy/miscutil/xapianutils_bibrank_indexer.py
similarity index 100%
rename from modules/miscutil/lib/xapianutils_bibrank_indexer.py
rename to invenio/legacy/miscutil/xapianutils_bibrank_indexer.py
diff --git a/modules/miscutil/lib/xapianutils_bibrank_searcher.py b/invenio/legacy/miscutil/xapianutils_bibrank_searcher.py
similarity index 100%
rename from modules/miscutil/lib/xapianutils_bibrank_searcher.py
rename to invenio/legacy/miscutil/xapianutils_bibrank_searcher.py
diff --git a/modules/miscutil/lib/xapianutils_config.py b/invenio/legacy/miscutil/xapianutils_config.py
similarity index 100%
rename from modules/miscutil/lib/xapianutils_config.py
rename to invenio/legacy/miscutil/xapianutils_config.py
diff --git a/modules/oaiharvest/lib/oai_harvest_admin.py b/invenio/legacy/oaiharvest/admin.py
similarity index 100%
rename from modules/oaiharvest/lib/oai_harvest_admin.py
rename to invenio/legacy/oaiharvest/admin.py
diff --git a/modules/oaiharvest/lib/oai_harvest_config.py b/invenio/legacy/oaiharvest/config.py
similarity index 100%
rename from modules/oaiharvest/lib/oai_harvest_config.py
rename to invenio/legacy/oaiharvest/config.py
diff --git a/modules/oaiharvest/lib/oai_harvest_daemon.py b/invenio/legacy/oaiharvest/daemon.py
similarity index 100%
rename from modules/oaiharvest/lib/oai_harvest_daemon.py
rename to invenio/legacy/oaiharvest/daemon.py
diff --git a/modules/oaiharvest/lib/oai_harvest_dblayer.py b/invenio/legacy/oaiharvest/dblayer.py
similarity index 100%
rename from modules/oaiharvest/lib/oai_harvest_dblayer.py
rename to invenio/legacy/oaiharvest/dblayer.py
diff --git a/modules/oaiharvest/doc/admin/oaiharvest-admin-guide.webdoc b/invenio/legacy/oaiharvest/doc/admin/oaiharvest-admin-guide.webdoc
similarity index 100%
rename from modules/oaiharvest/doc/admin/oaiharvest-admin-guide.webdoc
rename to invenio/legacy/oaiharvest/doc/admin/oaiharvest-admin-guide.webdoc
diff --git a/modules/oaiharvest/lib/oai_harvest_getter.py b/invenio/legacy/oaiharvest/getter.py
similarity index 100%
rename from modules/oaiharvest/lib/oai_harvest_getter.py
rename to invenio/legacy/oaiharvest/getter.py
diff --git a/modules/oaiharvest/bin/oaiharvest.in b/invenio/legacy/oaiharvest/scripts/oaiharvest.py
similarity index 100%
rename from modules/oaiharvest/bin/oaiharvest.in
rename to invenio/legacy/oaiharvest/scripts/oaiharvest.py
diff --git a/modules/oaiharvest/lib/oai_harvest_templates.py b/invenio/legacy/oaiharvest/templates.py
similarity index 100%
rename from modules/oaiharvest/lib/oai_harvest_templates.py
rename to invenio/legacy/oaiharvest/templates.py
diff --git a/modules/oaiharvest/web/admin/oai_harvest_admin.js b/invenio/legacy/oaiharvest/web/admin/oai_harvest_admin.js
similarity index 100%
rename from modules/oaiharvest/web/admin/oai_harvest_admin.js
rename to invenio/legacy/oaiharvest/web/admin/oai_harvest_admin.js
diff --git a/modules/oaiharvest/web/admin/oaiharvestadmin.py b/invenio/legacy/oaiharvest/web/admin/oaiharvestadmin.py
similarity index 100%
rename from modules/oaiharvest/web/admin/oaiharvestadmin.py
rename to invenio/legacy/oaiharvest/web/admin/oaiharvestadmin.py
diff --git a/modules/oairepository/etc/OAI-PMH.xsd b/invenio/legacy/oairepository/OAI-PMH.xsd
similarity index 100%
rename from modules/oairepository/etc/OAI-PMH.xsd
rename to invenio/legacy/oairepository/OAI-PMH.xsd
diff --git a/modules/oairepository/lib/oai_repository_admin.py b/invenio/legacy/oairepository/admin.py
similarity index 100%
rename from modules/oairepository/lib/oai_repository_admin.py
rename to invenio/legacy/oairepository/admin.py
diff --git a/modules/oairepository/lib/oai_repository_config.py b/invenio/legacy/oairepository/config.py
similarity index 100%
rename from modules/oairepository/lib/oai_repository_config.py
rename to invenio/legacy/oairepository/config.py
diff --git a/modules/oairepository/doc/admin/oairepository-admin-guide.webdoc b/invenio/legacy/oairepository/doc/admin/oairepository-admin-guide.webdoc
similarity index 100%
rename from modules/oairepository/doc/admin/oairepository-admin-guide.webdoc
rename to invenio/legacy/oairepository/doc/admin/oairepository-admin-guide.webdoc
diff --git a/modules/oairepository/bin/oairepositoryupdater.in b/invenio/legacy/oairepository/scripts/oairepositoryupdater.py
similarity index 100%
rename from modules/oairepository/bin/oairepositoryupdater.in
rename to invenio/legacy/oairepository/scripts/oairepositoryupdater.py
diff --git a/modules/oairepository/lib/oai_repository_server.py b/invenio/legacy/oairepository/server.py
similarity index 100%
rename from modules/oairepository/lib/oai_repository_server.py
rename to invenio/legacy/oairepository/server.py
diff --git a/modules/oairepository/lib/oai_repository_updater.py b/invenio/legacy/oairepository/updater.py
similarity index 100%
rename from modules/oairepository/lib/oai_repository_updater.py
rename to invenio/legacy/oairepository/updater.py
diff --git a/modules/oairepository/web/admin/oairepositoryadmin.py b/invenio/legacy/oairepository/web/admin/oairepositoryadmin.py
similarity index 100%
rename from modules/oairepository/web/admin/oairepositoryadmin.py
rename to invenio/legacy/oairepository/web/admin/oairepositoryadmin.py
diff --git a/modules/oairepository/lib/oai_repository_webinterface.py b/invenio/legacy/oairepository/webinterface.py
similarity index 100%
rename from modules/oairepository/lib/oai_repository_webinterface.py
rename to invenio/legacy/oairepository/webinterface.py
diff --git a/modules/docextract/lib/refextract_api.py b/invenio/legacy/refextract/api.py
similarity index 100%
rename from modules/docextract/lib/refextract_api.py
rename to invenio/legacy/refextract/api.py
diff --git a/modules/docextract/lib/refextract_cli.py b/invenio/legacy/refextract/cli.py
similarity index 100%
rename from modules/docextract/lib/refextract_cli.py
rename to invenio/legacy/refextract/cli.py
diff --git a/modules/docextract/lib/refextract_config.py b/invenio/legacy/refextract/config.py
similarity index 100%
rename from modules/docextract/lib/refextract_config.py
rename to invenio/legacy/refextract/config.py
diff --git a/modules/docextract/lib/refextract_engine.py b/invenio/legacy/refextract/engine.py
similarity index 100%
rename from modules/docextract/lib/refextract_engine.py
rename to invenio/legacy/refextract/engine.py
diff --git a/modules/docextract/lib/refextract_find.py b/invenio/legacy/refextract/find.py
similarity index 100%
rename from modules/docextract/lib/refextract_find.py
rename to invenio/legacy/refextract/find.py
diff --git a/modules/docextract/lib/refextract_kbs.py b/invenio/legacy/refextract/kbs.py
similarity index 100%
rename from modules/docextract/lib/refextract_kbs.py
rename to invenio/legacy/refextract/kbs.py
diff --git a/modules/docextract/etc/authors.kb b/invenio/legacy/refextract/kbs/authors.kb
similarity index 100%
rename from modules/docextract/etc/authors.kb
rename to invenio/legacy/refextract/kbs/authors.kb
diff --git a/modules/docextract/etc/books.kb b/invenio/legacy/refextract/kbs/books.kb
similarity index 100%
rename from modules/docextract/etc/books.kb
rename to invenio/legacy/refextract/kbs/books.kb
diff --git a/modules/docextract/etc/collaborations.kb b/invenio/legacy/refextract/kbs/collaborations.kb
similarity index 100%
rename from modules/docextract/etc/collaborations.kb
rename to invenio/legacy/refextract/kbs/collaborations.kb
diff --git a/modules/docextract/etc/conferences.kb b/invenio/legacy/refextract/kbs/conferences.kb
similarity index 100%
rename from modules/docextract/etc/conferences.kb
rename to invenio/legacy/refextract/kbs/conferences.kb
diff --git a/modules/docextract/etc/journal-titles-re.kb b/invenio/legacy/refextract/kbs/journal-titles-re.kb
similarity index 100%
rename from modules/docextract/etc/journal-titles-re.kb
rename to invenio/legacy/refextract/kbs/journal-titles-re.kb
diff --git a/modules/docextract/etc/journal-titles.kb b/invenio/legacy/refextract/kbs/journal-titles.kb
similarity index 100%
rename from modules/docextract/etc/journal-titles.kb
rename to invenio/legacy/refextract/kbs/journal-titles.kb
diff --git a/modules/docextract/etc/publishers.kb b/invenio/legacy/refextract/kbs/publishers.kb
similarity index 100%
rename from modules/docextract/etc/publishers.kb
rename to invenio/legacy/refextract/kbs/publishers.kb
diff --git a/modules/docextract/etc/report-numbers.kb b/invenio/legacy/refextract/kbs/report-numbers.kb
similarity index 100%
rename from modules/docextract/etc/report-numbers.kb
rename to invenio/legacy/refextract/kbs/report-numbers.kb
diff --git a/modules/docextract/etc/special-journals.kb b/invenio/legacy/refextract/kbs/special-journals.kb
similarity index 100%
rename from modules/docextract/etc/special-journals.kb
rename to invenio/legacy/refextract/kbs/special-journals.kb
diff --git a/modules/docextract/lib/refextract_linker.py b/invenio/legacy/refextract/linker.py
similarity index 100%
rename from modules/docextract/lib/refextract_linker.py
rename to invenio/legacy/refextract/linker.py
diff --git a/modules/docextract/lib/refextract_re.py b/invenio/legacy/refextract/regexs.py
similarity index 100%
rename from modules/docextract/lib/refextract_re.py
rename to invenio/legacy/refextract/regexs.py
diff --git a/modules/docextract/bin/refextract.in b/invenio/legacy/refextract/scripts/refextract.py
similarity index 100%
rename from modules/docextract/bin/refextract.in
rename to invenio/legacy/refextract/scripts/refextract.py
diff --git a/modules/docextract/lib/refextract_tag.py b/invenio/legacy/refextract/tag.py
similarity index 100%
rename from modules/docextract/lib/refextract_tag.py
rename to invenio/legacy/refextract/tag.py
diff --git a/modules/docextract/lib/refextract_task.py b/invenio/legacy/refextract/task.py
similarity index 100%
rename from modules/docextract/lib/refextract_task.py
rename to invenio/legacy/refextract/task.py
diff --git a/modules/docextract/lib/refextract_text.py b/invenio/legacy/refextract/text.py
similarity index 100%
rename from modules/docextract/lib/refextract_text.py
rename to invenio/legacy/refextract/text.py
diff --git a/modules/docextract/lib/refextract_xml.py b/invenio/legacy/refextract/xml.py
similarity index 100%
rename from modules/docextract/lib/refextract_xml.py
rename to invenio/legacy/refextract/xml.py
diff --git a/modules/websearch/lib/search_engine.py b/invenio/legacy/search_engine/__init__.py
similarity index 100%
rename from modules/websearch/lib/search_engine.py
rename to invenio/legacy/search_engine/__init__.py
diff --git a/modules/websearch/lib/search_engine_query_parser.py b/invenio/legacy/search_engine/query_parser.py
similarity index 100%
rename from modules/websearch/lib/search_engine_query_parser.py
rename to invenio/legacy/search_engine/query_parser.py
diff --git a/modules/websearch/lib/search_engine_summarizer.py b/invenio/legacy/search_engine/summarizer.py
similarity index 100%
rename from modules/websearch/lib/search_engine_summarizer.py
rename to invenio/legacy/search_engine/summarizer.py
diff --git a/modules/websearch/lib/search_engine_utils.py b/invenio/legacy/search_engine/utils.py
similarity index 100%
rename from modules/websearch/lib/search_engine_utils.py
rename to invenio/legacy/search_engine/utils.py
diff --git a/modules/webstyle/lib/template.py b/invenio/legacy/template.py
similarity index 100%
rename from modules/webstyle/lib/template.py
rename to invenio/legacy/template.py
diff --git a/modules/webaccess/doc/admin/webaccess-admin-guide.webdoc b/invenio/legacy/webaccess/admin/webaccess-admin-guide.webdoc
similarity index 100%
rename from modules/webaccess/doc/admin/webaccess-admin-guide.webdoc
rename to invenio/legacy/webaccess/admin/webaccess-admin-guide.webdoc
diff --git a/modules/webaccess/doc/hacking/webaccess-admin-internals.webdoc b/invenio/legacy/webaccess/hacking/webaccess-admin-internals.webdoc
similarity index 100%
rename from modules/webaccess/doc/hacking/webaccess-admin-internals.webdoc
rename to invenio/legacy/webaccess/hacking/webaccess-admin-internals.webdoc
diff --git a/modules/webaccess/doc/hacking/webaccess-api.webdoc b/invenio/legacy/webaccess/hacking/webaccess-api.webdoc
similarity index 100%
rename from modules/webaccess/doc/hacking/webaccess-api.webdoc
rename to invenio/legacy/webaccess/hacking/webaccess-api.webdoc
diff --git a/modules/webaccess/doc/hacking/webaccess-firerole-api.webdoc b/invenio/legacy/webaccess/hacking/webaccess-firerole-api.webdoc
similarity index 100%
rename from modules/webaccess/doc/hacking/webaccess-firerole-api.webdoc
rename to invenio/legacy/webaccess/hacking/webaccess-firerole-api.webdoc
diff --git a/modules/webaccess/doc/hacking/webaccess-internals.webdoc b/invenio/legacy/webaccess/hacking/webaccess-internals.webdoc
similarity index 100%
rename from modules/webaccess/doc/hacking/webaccess-internals.webdoc
rename to invenio/legacy/webaccess/hacking/webaccess-internals.webdoc
diff --git a/modules/webaccess/doc/hacking/webaccess-table-structure.webdoc b/invenio/legacy/webaccess/hacking/webaccess-table-structure.webdoc
similarity index 100%
rename from modules/webaccess/doc/hacking/webaccess-table-structure.webdoc
rename to invenio/legacy/webaccess/hacking/webaccess-table-structure.webdoc
diff --git a/modules/webaccess/web/admin/webaccessadmin.py b/invenio/legacy/webaccess/web/admin/webaccessadmin.py
similarity index 100%
rename from modules/webaccess/web/admin/webaccessadmin.py
rename to invenio/legacy/webaccess/web/admin/webaccessadmin.py
diff --git a/modules/webalert/lib/alert_engine.py b/invenio/legacy/webalert/alert_engine.py
similarity index 100%
rename from modules/webalert/lib/alert_engine.py
rename to invenio/legacy/webalert/alert_engine.py
diff --git a/modules/webalert/lib/alert_engine_config.py b/invenio/legacy/webalert/alert_engine_config.py
similarity index 100%
rename from modules/webalert/lib/alert_engine_config.py
rename to invenio/legacy/webalert/alert_engine_config.py
diff --git a/modules/webalert/lib/webalert.py b/invenio/legacy/webalert/api.py
similarity index 100%
rename from modules/webalert/lib/webalert.py
rename to invenio/legacy/webalert/api.py
diff --git a/modules/webalert/doc/admin/webalert-admin-guide.webdoc b/invenio/legacy/webalert/doc/webalert-admin-guide.webdoc
similarity index 100%
rename from modules/webalert/doc/admin/webalert-admin-guide.webdoc
rename to invenio/legacy/webalert/doc/webalert-admin-guide.webdoc
diff --git a/modules/webalert/lib/htmlparser.py b/invenio/legacy/webalert/htmlparser.py
similarity index 100%
rename from modules/webalert/lib/htmlparser.py
rename to invenio/legacy/webalert/htmlparser.py
diff --git a/modules/webalert/bin/alertengine.in b/invenio/legacy/webalert/scripts/alertengine.py
similarity index 100%
rename from modules/webalert/bin/alertengine.in
rename to invenio/legacy/webalert/scripts/alertengine.py
diff --git a/modules/webalert/lib/webalert_templates.py b/invenio/legacy/webalert/templates.py
similarity index 100%
rename from modules/webalert/lib/webalert_templates.py
rename to invenio/legacy/webalert/templates.py
diff --git a/modules/webalert/lib/webalert_webinterface.py b/invenio/legacy/webalert/webinterface.py
similarity index 100%
rename from modules/webalert/lib/webalert_webinterface.py
rename to invenio/legacy/webalert/webinterface.py
diff --git a/modules/webauthorprofile/lib/webauthorprofile_cli.py b/invenio/legacy/webauthorprofile/cli.py
similarity index 100%
rename from modules/webauthorprofile/lib/webauthorprofile_cli.py
rename to invenio/legacy/webauthorprofile/cli.py
diff --git a/modules/webauthorprofile/lib/webauthorprofile_corefunctions.py b/invenio/legacy/webauthorprofile/corefunctions.py
similarity index 100%
rename from modules/webauthorprofile/lib/webauthorprofile_corefunctions.py
rename to invenio/legacy/webauthorprofile/corefunctions.py
diff --git a/modules/webauthorprofile/lib/webauthorprofile_daemon.py b/invenio/legacy/webauthorprofile/daemon.py
similarity index 100%
rename from modules/webauthorprofile/lib/webauthorprofile_daemon.py
rename to invenio/legacy/webauthorprofile/daemon.py
diff --git a/modules/webauthorprofile/lib/webauthorprofile_dbapi.py b/invenio/legacy/webauthorprofile/dbapi.py
similarity index 100%
rename from modules/webauthorprofile/lib/webauthorprofile_dbapi.py
rename to invenio/legacy/webauthorprofile/dbapi.py
diff --git a/modules/webauthorprofile/lib/webauthorprofile_interface.py b/invenio/legacy/webauthorprofile/interface.py
similarity index 100%
rename from modules/webauthorprofile/lib/webauthorprofile_interface.py
rename to invenio/legacy/webauthorprofile/interface.py
diff --git a/modules/bibsched/lib/tasklets/__init__.py b/invenio/legacy/webauthorprofile/scripts/__init__.py
similarity index 100%
rename from modules/bibsched/lib/tasklets/__init__.py
rename to invenio/legacy/webauthorprofile/scripts/__init__.py
diff --git a/modules/webauthorprofile/lib/webauthorprofile_templates.py b/invenio/legacy/webauthorprofile/templates.py
similarity index 100%
rename from modules/webauthorprofile/lib/webauthorprofile_templates.py
rename to invenio/legacy/webauthorprofile/templates.py
diff --git a/modules/webauthorprofile/lib/webauthorprofile_webinterface.py b/invenio/legacy/webauthorprofile/webinterface.py
similarity index 100%
rename from modules/webauthorprofile/lib/webauthorprofile_webinterface.py
rename to invenio/legacy/webauthorprofile/webinterface.py
diff --git a/modules/webbasket/lib/webbasket.py b/invenio/legacy/webbasket/api.py
similarity index 100%
rename from modules/webbasket/lib/webbasket.py
rename to invenio/legacy/webbasket/api.py
diff --git a/modules/webbasket/lib/webbasket_dblayer.py b/invenio/legacy/webbasket/db_layer.py
similarity index 100%
rename from modules/webbasket/lib/webbasket_dblayer.py
rename to invenio/legacy/webbasket/db_layer.py
diff --git a/modules/webbasket/doc/admin/webbasket-admin-guide.webdoc b/invenio/legacy/webbasket/doc/webbasket-admin-guide.webdoc
similarity index 100%
rename from modules/webbasket/doc/admin/webbasket-admin-guide.webdoc
rename to invenio/legacy/webbasket/doc/webbasket-admin-guide.webdoc
diff --git a/modules/webbasket/lib/webbasket_migration_kit.py b/invenio/legacy/webbasket/migration_kit.py
similarity index 100%
rename from modules/webbasket/lib/webbasket_migration_kit.py
rename to invenio/legacy/webbasket/migration_kit.py
diff --git a/modules/webbasket/lib/webbasket_templates.py b/invenio/legacy/webbasket/templates.py
similarity index 100%
rename from modules/webbasket/lib/webbasket_templates.py
rename to invenio/legacy/webbasket/templates.py
diff --git a/modules/webbasket/lib/webbasket_webinterface.py b/invenio/legacy/webbasket/webinterface.py
similarity index 100%
rename from modules/webbasket/lib/webbasket_webinterface.py
rename to invenio/legacy/webbasket/webinterface.py
diff --git a/modules/webcomment/lib/webcommentadminlib.py b/invenio/legacy/webcomment/adminlib.py
similarity index 100%
rename from modules/webcomment/lib/webcommentadminlib.py
rename to invenio/legacy/webcomment/adminlib.py
diff --git a/modules/webcomment/doc/admin/webcomment-admin-guide.webdoc b/invenio/legacy/webcomment/doc/admin/webcomment-admin-guide.webdoc
similarity index 100%
rename from modules/webcomment/doc/admin/webcomment-admin-guide.webdoc
rename to invenio/legacy/webcomment/doc/admin/webcomment-admin-guide.webdoc
diff --git a/modules/webcomment/lib/webcomment_templates.py b/invenio/legacy/webcomment/templates.py
similarity index 100%
rename from modules/webcomment/lib/webcomment_templates.py
rename to invenio/legacy/webcomment/templates.py
diff --git a/modules/webcomment/web/admin/webcommentadmin.py b/invenio/legacy/webcomment/web/admin/webcommentadmin.py
similarity index 100%
rename from modules/webcomment/web/admin/webcommentadmin.py
rename to invenio/legacy/webcomment/web/admin/webcommentadmin.py
diff --git a/modules/webcomment/lib/webcomment_webinterface.py b/invenio/legacy/webcomment/webinterface.py
similarity index 100%
rename from modules/webcomment/lib/webcomment_webinterface.py
rename to invenio/legacy/webcomment/webinterface.py
diff --git a/modules/webhelp/web/admin/admin.webdoc b/invenio/legacy/webhelp/web/admin/admin.webdoc
similarity index 100%
rename from modules/webhelp/web/admin/admin.webdoc
rename to invenio/legacy/webhelp/web/admin/admin.webdoc
diff --git a/modules/webhelp/web/admin/howto/howto-authority-1.png b/invenio/legacy/webhelp/web/admin/howto/howto-authority-1.png
similarity index 100%
rename from modules/webhelp/web/admin/howto/howto-authority-1.png
rename to invenio/legacy/webhelp/web/admin/howto/howto-authority-1.png
diff --git a/modules/webhelp/web/admin/howto/howto-authority-2.png b/invenio/legacy/webhelp/web/admin/howto/howto-authority-2.png
similarity index 100%
rename from modules/webhelp/web/admin/howto/howto-authority-2.png
rename to invenio/legacy/webhelp/web/admin/howto/howto-authority-2.png
diff --git a/modules/webhelp/web/admin/howto/howto-authority.webdoc b/invenio/legacy/webhelp/web/admin/howto/howto-authority.webdoc
similarity index 100%
rename from modules/webhelp/web/admin/howto/howto-authority.webdoc
rename to invenio/legacy/webhelp/web/admin/howto/howto-authority.webdoc
diff --git a/modules/webhelp/web/admin/howto/howto-fulltext.webdoc b/invenio/legacy/webhelp/web/admin/howto/howto-fulltext.webdoc
similarity index 100%
rename from modules/webhelp/web/admin/howto/howto-fulltext.webdoc
rename to invenio/legacy/webhelp/web/admin/howto/howto-fulltext.webdoc
diff --git a/modules/webhelp/web/admin/howto/howto-marc.webdoc b/invenio/legacy/webhelp/web/admin/howto/howto-marc.webdoc
similarity index 100%
rename from modules/webhelp/web/admin/howto/howto-marc.webdoc
rename to invenio/legacy/webhelp/web/admin/howto/howto-marc.webdoc
diff --git a/modules/webhelp/web/admin/howto/howto-migrate.webdoc b/invenio/legacy/webhelp/web/admin/howto/howto-migrate.webdoc
similarity index 100%
rename from modules/webhelp/web/admin/howto/howto-migrate.webdoc
rename to invenio/legacy/webhelp/web/admin/howto/howto-migrate.webdoc
diff --git a/modules/webhelp/web/admin/howto/howto-run.webdoc b/invenio/legacy/webhelp/web/admin/howto/howto-run.webdoc
similarity index 100%
rename from modules/webhelp/web/admin/howto/howto-run.webdoc
rename to invenio/legacy/webhelp/web/admin/howto/howto-run.webdoc
diff --git a/modules/webhelp/web/admin/howto/howto.webdoc b/invenio/legacy/webhelp/web/admin/howto/howto.webdoc
similarity index 100%
rename from modules/webhelp/web/admin/howto/howto.webdoc
rename to invenio/legacy/webhelp/web/admin/howto/howto.webdoc
diff --git a/modules/webhelp/web/hacking/ckeditor.webdoc b/invenio/legacy/webhelp/web/hacking/ckeditor.webdoc
similarity index 100%
rename from modules/webhelp/web/hacking/ckeditor.webdoc
rename to invenio/legacy/webhelp/web/hacking/ckeditor.webdoc
diff --git a/modules/webhelp/web/hacking/coding-style.webdoc b/invenio/legacy/webhelp/web/hacking/coding-style.webdoc
similarity index 100%
rename from modules/webhelp/web/hacking/coding-style.webdoc
rename to invenio/legacy/webhelp/web/hacking/coding-style.webdoc
diff --git a/modules/webhelp/web/hacking/common-concepts.webdoc b/invenio/legacy/webhelp/web/hacking/common-concepts.webdoc
similarity index 100%
rename from modules/webhelp/web/hacking/common-concepts.webdoc
rename to invenio/legacy/webhelp/web/hacking/common-concepts.webdoc
diff --git a/modules/webhelp/web/hacking/directory-organization.webdoc b/invenio/legacy/webhelp/web/hacking/directory-organization.webdoc
similarity index 100%
rename from modules/webhelp/web/hacking/directory-organization.webdoc
rename to invenio/legacy/webhelp/web/hacking/directory-organization.webdoc
diff --git a/modules/webhelp/web/hacking/hacking.webdoc b/invenio/legacy/webhelp/web/hacking/hacking.webdoc
similarity index 100%
rename from modules/webhelp/web/hacking/hacking.webdoc
rename to invenio/legacy/webhelp/web/hacking/hacking.webdoc
diff --git a/modules/webhelp/web/hacking/modules-overview-diagram.dia b/invenio/legacy/webhelp/web/hacking/modules-overview-diagram.dia
similarity index 100%
rename from modules/webhelp/web/hacking/modules-overview-diagram.dia
rename to invenio/legacy/webhelp/web/hacking/modules-overview-diagram.dia
diff --git a/modules/webhelp/web/hacking/modules-overview-diagram.jpeg b/invenio/legacy/webhelp/web/hacking/modules-overview-diagram.jpeg
similarity index 100%
rename from modules/webhelp/web/hacking/modules-overview-diagram.jpeg
rename to invenio/legacy/webhelp/web/hacking/modules-overview-diagram.jpeg
diff --git a/modules/webhelp/web/hacking/modules-overview.webdoc b/invenio/legacy/webhelp/web/hacking/modules-overview.webdoc
similarity index 100%
rename from modules/webhelp/web/hacking/modules-overview.webdoc
rename to invenio/legacy/webhelp/web/hacking/modules-overview.webdoc
diff --git a/modules/webhelp/web/hacking/release-numbering.webdoc b/invenio/legacy/webhelp/web/hacking/release-numbering.webdoc
similarity index 100%
rename from modules/webhelp/web/hacking/release-numbering.webdoc
rename to invenio/legacy/webhelp/web/hacking/release-numbering.webdoc
diff --git a/modules/webhelp/web/hacking/test-suite.webdoc b/invenio/legacy/webhelp/web/hacking/test-suite.webdoc
similarity index 100%
rename from modules/webhelp/web/hacking/test-suite.webdoc
rename to invenio/legacy/webhelp/web/hacking/test-suite.webdoc
diff --git a/modules/webhelp/web/help-central.webdoc b/invenio/legacy/webhelp/web/help-central.webdoc
similarity index 100%
rename from modules/webhelp/web/help-central.webdoc
rename to invenio/legacy/webhelp/web/help-central.webdoc
diff --git a/modules/webjournal/lib/webjournaladminlib.py b/invenio/legacy/webjournal/adminlib.py
similarity index 100%
rename from modules/webjournal/lib/webjournaladminlib.py
rename to invenio/legacy/webjournal/adminlib.py
diff --git a/modules/webjournal/lib/webjournal.py b/invenio/legacy/webjournal/api.py
similarity index 100%
rename from modules/webjournal/lib/webjournal.py
rename to invenio/legacy/webjournal/api.py
diff --git a/modules/webjournal/lib/webjournal_config.py b/invenio/legacy/webjournal/config.py
similarity index 100%
rename from modules/webjournal/lib/webjournal_config.py
rename to invenio/legacy/webjournal/config.py
diff --git a/modules/webjournal/doc/admin/webjournal-admin-guide.webdoc b/invenio/legacy/webjournal/doc/admin/webjournal-admin-guide.webdoc
similarity index 100%
rename from modules/webjournal/doc/admin/webjournal-admin-guide.webdoc
rename to invenio/legacy/webjournal/doc/admin/webjournal-admin-guide.webdoc
diff --git a/modules/webjournal/doc/admin/webjournal-editor-guide.webdoc b/invenio/legacy/webjournal/doc/admin/webjournal-editor-guide.webdoc
similarity index 100%
rename from modules/webjournal/doc/admin/webjournal-editor-guide.webdoc
rename to invenio/legacy/webjournal/doc/admin/webjournal-editor-guide.webdoc
diff --git a/modules/webjournal/doc/hacking/webjournal-internals.webdoc b/invenio/legacy/webjournal/doc/hacking/webjournal-internals.webdoc
similarity index 100%
rename from modules/webjournal/doc/hacking/webjournal-internals.webdoc
rename to invenio/legacy/webjournal/doc/hacking/webjournal-internals.webdoc
diff --git a/modules/webjournal/doc/hacking/webjournal-record-metadata.webdoc b/invenio/legacy/webjournal/doc/hacking/webjournal-record-metadata.webdoc
similarity index 100%
rename from modules/webjournal/doc/hacking/webjournal-record-metadata.webdoc
rename to invenio/legacy/webjournal/doc/hacking/webjournal-record-metadata.webdoc
diff --git a/modules/webjournal/doc/hacking/webjournal-table-structure.webdoc b/invenio/legacy/webjournal/doc/hacking/webjournal-table-structure.webdoc
similarity index 100%
rename from modules/webjournal/doc/hacking/webjournal-table-structure.webdoc
rename to invenio/legacy/webjournal/doc/hacking/webjournal-table-structure.webdoc
diff --git a/modules/webjournal/lib/webjournal_templates.py b/invenio/legacy/webjournal/templates.py
similarity index 100%
rename from modules/webjournal/lib/webjournal_templates.py
rename to invenio/legacy/webjournal/templates.py
diff --git a/modules/webjournal/lib/webjournal_utils.py b/invenio/legacy/webjournal/utils.py
similarity index 100%
rename from modules/webjournal/lib/webjournal_utils.py
rename to invenio/legacy/webjournal/utils.py
diff --git a/modules/webjournal/lib/webjournal_washer.py b/invenio/legacy/webjournal/washer.py
similarity index 100%
rename from modules/webjournal/lib/webjournal_washer.py
rename to invenio/legacy/webjournal/washer.py
diff --git a/modules/webjournal/web/admin/webjournaladmin.py b/invenio/legacy/webjournal/web/admin/webjournaladmin.py
similarity index 100%
rename from modules/webjournal/web/admin/webjournaladmin.py
rename to invenio/legacy/webjournal/web/admin/webjournaladmin.py
diff --git a/modules/webjournal/lib/webjournal_webinterface.py b/invenio/legacy/webjournal/webinterface.py
similarity index 100%
rename from modules/webjournal/lib/webjournal_webinterface.py
rename to invenio/legacy/webjournal/webinterface.py
diff --git a/modules/weblinkback/lib/weblinkbackadminlib.py b/invenio/legacy/weblinkback/adminlib.py
similarity index 100%
rename from modules/weblinkback/lib/weblinkbackadminlib.py
rename to invenio/legacy/weblinkback/adminlib.py
diff --git a/modules/weblinkback/lib/weblinkback.py b/invenio/legacy/weblinkback/api.py
similarity index 100%
rename from modules/weblinkback/lib/weblinkback.py
rename to invenio/legacy/weblinkback/api.py
diff --git a/modules/weblinkback/lib/weblinkback_config.py b/invenio/legacy/weblinkback/config.py
similarity index 100%
rename from modules/weblinkback/lib/weblinkback_config.py
rename to invenio/legacy/weblinkback/config.py
diff --git a/modules/weblinkback/lib/weblinkback_dblayer.py b/invenio/legacy/weblinkback/db_layer.py
similarity index 100%
rename from modules/weblinkback/lib/weblinkback_dblayer.py
rename to invenio/legacy/weblinkback/db_layer.py
diff --git a/modules/weblinkback/lib/weblinkback_templates.py b/invenio/legacy/weblinkback/templates.py
similarity index 100%
rename from modules/weblinkback/lib/weblinkback_templates.py
rename to invenio/legacy/weblinkback/templates.py
diff --git a/modules/weblinkback/web/admin/weblinkbackadmin.py b/invenio/legacy/weblinkback/web/admin/weblinkbackadmin.py
similarity index 100%
rename from modules/weblinkback/web/admin/weblinkbackadmin.py
rename to invenio/legacy/weblinkback/web/admin/weblinkbackadmin.py
diff --git a/modules/weblinkback/lib/weblinkback_webinterface.py b/invenio/legacy/weblinkback/webinterface.py
similarity index 100%
rename from modules/weblinkback/lib/weblinkback_webinterface.py
rename to invenio/legacy/weblinkback/webinterface.py
diff --git a/modules/webmessage/lib/webmessage.py b/invenio/legacy/webmessage/api.py
similarity index 100%
rename from modules/webmessage/lib/webmessage.py
rename to invenio/legacy/webmessage/api.py
diff --git a/modules/webmessage/doc/admin/webmessage-admin-guide.webdoc b/invenio/legacy/webmessage/doc/admin/webmessage-admin-guide.webdoc
similarity index 100%
rename from modules/webmessage/doc/admin/webmessage-admin-guide.webdoc
rename to invenio/legacy/webmessage/doc/admin/webmessage-admin-guide.webdoc
diff --git a/modules/webmessage/bin/webmessageadmin.in b/invenio/legacy/webmessage/scripts/webmessageadmin.py
similarity index 100%
rename from modules/webmessage/bin/webmessageadmin.in
rename to invenio/legacy/webmessage/scripts/webmessageadmin.py
diff --git a/modules/webmessage/lib/webmessage_templates.py b/invenio/legacy/webmessage/templates.py
similarity index 100%
rename from modules/webmessage/lib/webmessage_templates.py
rename to invenio/legacy/webmessage/templates.py
diff --git a/modules/webmessage/lib/webmessage_webinterface.py b/invenio/legacy/webmessage/webinterface.py
similarity index 100%
rename from modules/webmessage/lib/webmessage_webinterface.py
rename to invenio/legacy/webmessage/webinterface.py
diff --git a/modules/webstyle/lib/webpage.py b/invenio/legacy/webpage.py
similarity index 100%
rename from modules/webstyle/lib/webpage.py
rename to invenio/legacy/webpage.py
diff --git a/modules/websearch/lib/websearch_admin_templates.py b/invenio/legacy/websearch/admin_templates.py
similarity index 100%
rename from modules/websearch/lib/websearch_admin_templates.py
rename to invenio/legacy/websearch/admin_templates.py
diff --git a/modules/websearch/lib/websearchadminlib.py b/invenio/legacy/websearch/adminlib.py
similarity index 100%
rename from modules/websearch/lib/websearchadminlib.py
rename to invenio/legacy/websearch/adminlib.py
diff --git a/modules/websearch/doc/admin/websearch-admin-guide.webdoc b/invenio/legacy/websearch/doc/admin/websearch-admin-guide.webdoc
similarity index 100%
rename from modules/websearch/doc/admin/websearch-admin-guide.webdoc
rename to invenio/legacy/websearch/doc/admin/websearch-admin-guide.webdoc
diff --git a/modules/websearch/doc/citation-metrics.webdoc b/invenio/legacy/websearch/doc/citation-metrics.webdoc
similarity index 100%
rename from modules/websearch/doc/citation-metrics.webdoc
rename to invenio/legacy/websearch/doc/citation-metrics.webdoc
diff --git a/modules/websearch/doc/hacking/search-engine-api.webdoc b/invenio/legacy/websearch/doc/hacking/search-engine-api.webdoc
similarity index 100%
rename from modules/websearch/doc/hacking/search-engine-api.webdoc
rename to invenio/legacy/websearch/doc/hacking/search-engine-api.webdoc
diff --git a/modules/websearch/doc/hacking/search-engine-internals.webdoc b/invenio/legacy/websearch/doc/hacking/search-engine-internals.webdoc
similarity index 100%
rename from modules/websearch/doc/hacking/search-engine-internals.webdoc
rename to invenio/legacy/websearch/doc/hacking/search-engine-internals.webdoc
diff --git a/modules/websearch/doc/hacking/search-engine-stages.webdoc b/invenio/legacy/websearch/doc/hacking/search-engine-stages.webdoc
similarity index 100%
rename from modules/websearch/doc/hacking/search-engine-stages.webdoc
rename to invenio/legacy/websearch/doc/hacking/search-engine-stages.webdoc
diff --git a/modules/websearch/doc/search-guide.webdoc b/invenio/legacy/websearch/doc/search-guide.webdoc
similarity index 100%
rename from modules/websearch/doc/search-guide.webdoc
rename to invenio/legacy/websearch/doc/search-guide.webdoc
diff --git a/modules/websearch/doc/search-tips.webdoc b/invenio/legacy/websearch/doc/search-tips.webdoc
similarity index 100%
rename from modules/websearch/doc/search-tips.webdoc
rename to invenio/legacy/websearch/doc/search-tips.webdoc
diff --git a/modules/websearch/lib/websearch_templates.py b/invenio/legacy/websearch/templates.py
similarity index 100%
rename from modules/websearch/lib/websearch_templates.py
rename to invenio/legacy/websearch/templates.py
diff --git a/modules/websearch/web/admin/websearchadmin.py b/invenio/legacy/websearch/web/admin/websearchadmin.py
similarity index 100%
rename from modules/websearch/web/admin/websearchadmin.py
rename to invenio/legacy/websearch/web/admin/websearchadmin.py
diff --git a/modules/websearch/lib/websearch_webcoll.py b/invenio/legacy/websearch/webcoll.py
similarity index 100%
rename from modules/websearch/lib/websearch_webcoll.py
rename to invenio/legacy/websearch/webcoll.py
diff --git a/modules/websearch/lib/websearch_webinterface.py b/invenio/legacy/websearch/webinterface.py
similarity index 100%
rename from modules/websearch/lib/websearch_webinterface.py
rename to invenio/legacy/websearch/webinterface.py
diff --git a/modules/websearch/lib/websearch_external_collections.py b/invenio/legacy/websearch_external_collections/__init__.py
similarity index 100%
rename from modules/websearch/lib/websearch_external_collections.py
rename to invenio/legacy/websearch_external_collections/__init__.py
diff --git a/modules/websearch/lib/websearch_external_collections_config.py b/invenio/legacy/websearch_external_collections/config.py
similarity index 100%
rename from modules/websearch/lib/websearch_external_collections_config.py
rename to invenio/legacy/websearch_external_collections/config.py
diff --git a/modules/websearch/lib/websearch_external_collections_getter.py b/invenio/legacy/websearch_external_collections/getter.py
similarity index 100%
rename from modules/websearch/lib/websearch_external_collections_getter.py
rename to invenio/legacy/websearch_external_collections/getter.py
diff --git a/modules/websearch/lib/websearch_external_collections_parser.py b/invenio/legacy/websearch_external_collections/parser.py
similarity index 100%
rename from modules/websearch/lib/websearch_external_collections_parser.py
rename to invenio/legacy/websearch_external_collections/parser.py
diff --git a/modules/websearch/lib/websearch_external_collections_searcher.py b/invenio/legacy/websearch_external_collections/searcher.py
similarity index 100%
rename from modules/websearch/lib/websearch_external_collections_searcher.py
rename to invenio/legacy/websearch_external_collections/searcher.py
diff --git a/modules/websearch/lib/websearch_external_collections_templates.py b/invenio/legacy/websearch_external_collections/templates.py
similarity index 100%
rename from modules/websearch/lib/websearch_external_collections_templates.py
rename to invenio/legacy/websearch_external_collections/templates.py
diff --git a/modules/websearch/lib/websearch_external_collections_utils.py b/invenio/legacy/websearch_external_collections/utils.py
similarity index 100%
rename from modules/websearch/lib/websearch_external_collections_utils.py
rename to invenio/legacy/websearch_external_collections/utils.py
diff --git a/modules/websession/lib/webgroup_dblayer.py b/invenio/legacy/websession/dblayer.py
similarity index 100%
rename from modules/websession/lib/webgroup_dblayer.py
rename to invenio/legacy/websession/dblayer.py
diff --git a/modules/websession/doc/admin/websession-admin-guide.webdoc b/invenio/legacy/websession/doc/admin/websession-admin-guide.webdoc
similarity index 100%
rename from modules/websession/doc/admin/websession-admin-guide.webdoc
rename to invenio/legacy/websession/doc/admin/websession-admin-guide.webdoc
diff --git a/modules/websession/lib/inveniogc.py b/invenio/legacy/websession/inveniogc.py
similarity index 100%
rename from modules/websession/lib/inveniogc.py
rename to invenio/legacy/websession/inveniogc.py
diff --git a/modules/websession/lib/session.py b/invenio/legacy/websession/session.py
similarity index 100%
rename from modules/websession/lib/session.py
rename to invenio/legacy/websession/session.py
diff --git a/modules/websession/lib/websession_templates.py b/invenio/legacy/websession/templates.py
similarity index 100%
rename from modules/websession/lib/websession_templates.py
rename to invenio/legacy/websession/templates.py
diff --git a/modules/websession/lib/webaccount.py b/invenio/legacy/websession/webaccount.py
similarity index 100%
rename from modules/websession/lib/webaccount.py
rename to invenio/legacy/websession/webaccount.py
diff --git a/modules/websession/lib/webgroup.py b/invenio/legacy/websession/webgroup.py
similarity index 100%
rename from modules/websession/lib/webgroup.py
rename to invenio/legacy/websession/webgroup.py
diff --git a/modules/websession/lib/websession_webinterface.py b/invenio/legacy/websession/webinterface.py
similarity index 100%
rename from modules/websession/lib/websession_webinterface.py
rename to invenio/legacy/websession/webinterface.py
diff --git a/modules/websession/lib/websession_config.py b/invenio/legacy/websession/websession_config.py
similarity index 100%
rename from modules/websession/lib/websession_config.py
rename to invenio/legacy/websession/websession_config.py
diff --git a/modules/websession/lib/webuser_config.py b/invenio/legacy/websession/webuser_config.py
similarity index 100%
rename from modules/websession/lib/webuser_config.py
rename to invenio/legacy/websession/webuser_config.py
diff --git a/modules/webstat/lib/webstatadmin.py b/invenio/legacy/webstat/admin.py
similarity index 100%
rename from modules/webstat/lib/webstatadmin.py
rename to invenio/legacy/webstat/admin.py
diff --git a/modules/webstat/lib/webstat.py b/invenio/legacy/webstat/api.py
similarity index 100%
rename from modules/webstat/lib/webstat.py
rename to invenio/legacy/webstat/api.py
diff --git a/modules/webstat/lib/webstat_config.py b/invenio/legacy/webstat/config.py
similarity index 100%
rename from modules/webstat/lib/webstat_config.py
rename to invenio/legacy/webstat/config.py
diff --git a/modules/webstat/doc/admin/webstat-admin-guide.webdoc b/invenio/legacy/webstat/doc/admin/webstat-admin-guide.webdoc
similarity index 100%
rename from modules/webstat/doc/admin/webstat-admin-guide.webdoc
rename to invenio/legacy/webstat/doc/admin/webstat-admin-guide.webdoc
diff --git a/modules/webstat/lib/webstat_engine.py b/invenio/legacy/webstat/engine.py
similarity index 100%
rename from modules/webstat/lib/webstat_engine.py
rename to invenio/legacy/webstat/engine.py
diff --git a/modules/webstat/lib/load.lisp b/invenio/legacy/webstat/load.lisp
similarity index 100%
rename from modules/webstat/lib/load.lisp
rename to invenio/legacy/webstat/load.lisp
diff --git a/modules/webstat/lib/webstat_templates.py b/invenio/legacy/webstat/templates.py
similarity index 100%
rename from modules/webstat/lib/webstat_templates.py
rename to invenio/legacy/webstat/templates.py
diff --git a/modules/webstat/lib/webstat_webinterface.py b/invenio/legacy/webstat/webinterface.py
similarity index 100%
rename from modules/webstat/lib/webstat_webinterface.py
rename to invenio/legacy/webstat/webinterface.py
diff --git a/modules/webstat/etc/webstat.cfg b/invenio/legacy/webstat/webstat.cfg
similarity index 100%
rename from modules/webstat/etc/webstat.cfg
rename to invenio/legacy/webstat/webstat.cfg
diff --git a/modules/webstat/bin/webstat.in b/invenio/legacy/webstat/webstat.in
similarity index 100%
rename from modules/webstat/bin/webstat.in
rename to invenio/legacy/webstat/webstat.in
diff --git a/modules/webstat/lib/webstatlib.lisp b/invenio/legacy/webstat/webstatlib.lisp
similarity index 100%
rename from modules/webstat/lib/webstatlib.lisp
rename to invenio/legacy/webstat/webstatlib.lisp
diff --git a/modules/webstyle/doc/admin/webstyle-admin-guide.webdoc b/invenio/legacy/webstyle/doc/admin/webstyle-admin-guide.webdoc
similarity index 100%
rename from modules/webstyle/doc/admin/webstyle-admin-guide.webdoc
rename to invenio/legacy/webstyle/doc/admin/webstyle-admin-guide.webdoc
diff --git a/modules/webstyle/doc/hacking/webstyle-internals.webdoc b/invenio/legacy/webstyle/doc/hacking/webstyle-internals.webdoc
similarity index 100%
rename from modules/webstyle/doc/hacking/webstyle-internals.webdoc
rename to invenio/legacy/webstyle/doc/hacking/webstyle-internals.webdoc
diff --git a/modules/webstyle/doc/hacking/webstyle-webdoc-syntax.webdoc b/invenio/legacy/webstyle/doc/hacking/webstyle-webdoc-syntax.webdoc
similarity index 100%
rename from modules/webstyle/doc/hacking/webstyle-webdoc-syntax.webdoc
rename to invenio/legacy/webstyle/doc/hacking/webstyle-webdoc-syntax.webdoc
diff --git a/modules/webstyle/lib/goto_webinterface.py b/invenio/legacy/webstyle/goto_webinterface.py
similarity index 100%
rename from modules/webstyle/lib/goto_webinterface.py
rename to invenio/legacy/webstyle/goto_webinterface.py
diff --git a/modules/webstyle/lib/httptest_webinterface.py b/invenio/legacy/webstyle/httptest_webinterface.py
similarity index 100%
rename from modules/webstyle/lib/httptest_webinterface.py
rename to invenio/legacy/webstyle/httptest_webinterface.py
diff --git a/modules/webstyle/lib/ping_webinterface.py b/invenio/legacy/webstyle/ping_webinterface.py
similarity index 100%
rename from modules/webstyle/lib/ping_webinterface.py
rename to invenio/legacy/webstyle/ping_webinterface.py
diff --git a/modules/webstyle/bin/webdoc.in b/invenio/legacy/webstyle/scripts/webdoc.py
similarity index 100%
rename from modules/webstyle/bin/webdoc.in
rename to invenio/legacy/webstyle/scripts/webdoc.py
diff --git a/modules/webstyle/lib/webstyle_templates.py b/invenio/legacy/webstyle/templates.py
similarity index 100%
rename from modules/webstyle/lib/webstyle_templates.py
rename to invenio/legacy/webstyle/templates.py
diff --git a/modules/webstyle/lib/webdoc.py b/invenio/legacy/webstyle/webdoc.py
similarity index 100%
rename from modules/webstyle/lib/webdoc.py
rename to invenio/legacy/webstyle/webdoc.py
diff --git a/modules/webstyle/lib/webdoc_webinterface.py b/invenio/legacy/webstyle/webdoc_webinterface.py
similarity index 100%
rename from modules/webstyle/lib/webdoc_webinterface.py
rename to invenio/legacy/webstyle/webdoc_webinterface.py
diff --git a/modules/bibworkflow/lib/tasks/__init__.py b/invenio/legacy/websubmit/__init__.py
similarity index 100%
rename from modules/bibworkflow/lib/tasks/__init__.py
rename to invenio/legacy/websubmit/__init__.py
diff --git a/modules/websubmit/lib/websubmitadmin_config.py b/invenio/legacy/websubmit/admin_config.py
similarity index 100%
rename from modules/websubmit/lib/websubmitadmin_config.py
rename to invenio/legacy/websubmit/admin_config.py
diff --git a/modules/websubmit/lib/websubmitadmin_dblayer.py b/invenio/legacy/websubmit/admin_dblayer.py
similarity index 100%
rename from modules/websubmit/lib/websubmitadmin_dblayer.py
rename to invenio/legacy/websubmit/admin_dblayer.py
diff --git a/modules/websubmit/lib/websubmitadmin_engine.py b/invenio/legacy/websubmit/admin_engine.py
similarity index 100%
rename from modules/websubmit/lib/websubmitadmin_engine.py
rename to invenio/legacy/websubmit/admin_engine.py
diff --git a/modules/websubmit/lib/websubmitadmin_templates.py b/invenio/legacy/websubmit/admin_templates.py
similarity index 100%
rename from modules/websubmit/lib/websubmitadmin_templates.py
rename to invenio/legacy/websubmit/admin_templates.py
diff --git a/modules/websubmit/lib/websubmitadmincli.py b/invenio/legacy/websubmit/admincli.py
similarity index 100%
rename from modules/websubmit/lib/websubmitadmincli.py
rename to invenio/legacy/websubmit/admincli.py
diff --git a/modules/websubmit/lib/websubmit_config.py b/invenio/legacy/websubmit/config.py
similarity index 100%
rename from modules/websubmit/lib/websubmit_config.py
rename to invenio/legacy/websubmit/config.py
diff --git a/modules/websubmit/lib/websubmit_dblayer.py b/invenio/legacy/websubmit/db_layer.py
similarity index 100%
rename from modules/websubmit/lib/websubmit_dblayer.py
rename to invenio/legacy/websubmit/db_layer.py
diff --git a/modules/websubmit/doc/admin/publiline-admin-guide.webdoc b/invenio/legacy/websubmit/doc/admin/publiline-admin-guide.webdoc
similarity index 100%
rename from modules/websubmit/doc/admin/publiline-admin-guide.webdoc
rename to invenio/legacy/websubmit/doc/admin/publiline-admin-guide.webdoc
diff --git a/modules/websubmit/doc/admin/publiline-guide-flow.png b/invenio/legacy/websubmit/doc/admin/publiline-guide-flow.png
similarity index 100%
rename from modules/websubmit/doc/admin/publiline-guide-flow.png
rename to invenio/legacy/websubmit/doc/admin/publiline-guide-flow.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-elements.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-elements.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-elements.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-elements.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-end_action.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-end_action.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-end_action.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-end_action.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-form.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-form.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-form.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-form.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-implement.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-implement.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-implement.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-implement.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-list_functions.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-list_functions.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-list_functions.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-list_functions.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-main_menu.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-main_menu.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-main_menu.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-main_menu.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-main_page.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-main_page.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-main_page.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-main_page.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-menu_doc.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-menu_doc.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-menu_doc.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-menu_doc.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-menu_page.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-menu_page.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-menu_page.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-menu_page.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-page0.jpg b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-page0.jpg
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-page0.jpg
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-page0.jpg
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-preview.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-preview.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-preview.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-preview.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-screenshot1-small.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot1-small.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-screenshot1-small.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot1-small.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-screenshot1.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot1.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-screenshot1.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot1.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-screenshot2-small.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot2-small.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-screenshot2-small.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot2-small.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-screenshot2.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot2.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-screenshot2.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot2.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-screenshot3-small.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot3-small.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-screenshot3-small.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot3-small.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-screenshot3.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot3.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-screenshot3.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot3.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-screenshot4-small.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot4-small.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-screenshot4-small.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot4-small.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-screenshot4.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot4.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-screenshot4.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-screenshot4.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-workflow1.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-workflow1.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-workflow1.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-workflow1.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-workflow2.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-workflow2.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-workflow2.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-workflow2.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-workflow3.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-workflow3.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-workflow3.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-workflow3.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-workflow4.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-workflow4.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-workflow4.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-workflow4.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide-workflow4b.png b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-workflow4b.png
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide-workflow4b.png
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide-workflow4b.png
diff --git a/modules/websubmit/doc/admin/websubmit-admin-guide.webdoc b/invenio/legacy/websubmit/doc/admin/websubmit-admin-guide.webdoc
similarity index 100%
rename from modules/websubmit/doc/admin/websubmit-admin-guide.webdoc
rename to invenio/legacy/websubmit/doc/admin/websubmit-admin-guide.webdoc
diff --git a/modules/websubmit/doc/hacking/websubmit-file-converter.webdoc b/invenio/legacy/websubmit/doc/hacking/websubmit-file-converter.webdoc
similarity index 100%
rename from modules/websubmit/doc/hacking/websubmit-file-converter.webdoc
rename to invenio/legacy/websubmit/doc/hacking/websubmit-file-converter.webdoc
diff --git a/modules/websubmit/doc/hacking/websubmit-file-metadata.webdoc b/invenio/legacy/websubmit/doc/hacking/websubmit-file-metadata.webdoc
similarity index 100%
rename from modules/websubmit/doc/hacking/websubmit-file-metadata.webdoc
rename to invenio/legacy/websubmit/doc/hacking/websubmit-file-metadata.webdoc
diff --git a/modules/websubmit/doc/hacking/websubmit-file-stamper.webdoc b/invenio/legacy/websubmit/doc/hacking/websubmit-file-stamper.webdoc
similarity index 100%
rename from modules/websubmit/doc/hacking/websubmit-file-stamper.webdoc
rename to invenio/legacy/websubmit/doc/hacking/websubmit-file-stamper.webdoc
diff --git a/modules/websubmit/doc/hacking/websubmit-icon-creator.webdoc b/invenio/legacy/websubmit/doc/hacking/websubmit-icon-creator.webdoc
similarity index 100%
rename from modules/websubmit/doc/hacking/websubmit-icon-creator.webdoc
rename to invenio/legacy/websubmit/doc/hacking/websubmit-icon-creator.webdoc
diff --git a/modules/websubmit/doc/hacking/websubmit-internals.webdoc b/invenio/legacy/websubmit/doc/hacking/websubmit-internals.webdoc
similarity index 100%
rename from modules/websubmit/doc/hacking/websubmit-internals.webdoc
rename to invenio/legacy/websubmit/doc/hacking/websubmit-internals.webdoc
diff --git a/modules/websubmit/doc/submit-guide.webdoc b/invenio/legacy/websubmit/doc/submit-guide.webdoc
similarity index 100%
rename from modules/websubmit/doc/submit-guide.webdoc
rename to invenio/legacy/websubmit/doc/submit-guide.webdoc
diff --git a/modules/websubmit/lib/websubmit_engine.py b/invenio/legacy/websubmit/engine.py
similarity index 100%
rename from modules/websubmit/lib/websubmit_engine.py
rename to invenio/legacy/websubmit/engine.py
diff --git a/modules/websubmit/lib/websubmit_file_converter.py b/invenio/legacy/websubmit/file_converter.py
similarity index 100%
rename from modules/websubmit/lib/websubmit_file_converter.py
rename to invenio/legacy/websubmit/file_converter.py
diff --git a/modules/websubmit/etc/PDFA_def.ps b/invenio/legacy/websubmit/file_converter_templates/PDFA_def.ps
similarity index 100%
rename from modules/websubmit/etc/PDFA_def.ps
rename to invenio/legacy/websubmit/file_converter_templates/PDFA_def.ps
diff --git a/modules/websubmit/etc/PDFX_def.ps b/invenio/legacy/websubmit/file_converter_templates/PDFX_def.ps
similarity index 100%
rename from modules/websubmit/etc/PDFX_def.ps
rename to invenio/legacy/websubmit/file_converter_templates/PDFX_def.ps
diff --git a/modules/websubmit/etc/deskew.lua b/invenio/legacy/websubmit/file_converter_templates/deskew.lua
similarity index 100%
rename from modules/websubmit/etc/deskew.lua
rename to invenio/legacy/websubmit/file_converter_templates/deskew.lua
diff --git a/modules/websubmit/lib/websubmit_file_metadata.py b/invenio/legacy/websubmit/file_metadata.py
similarity index 100%
rename from modules/websubmit/lib/websubmit_file_metadata.py
rename to invenio/legacy/websubmit/file_metadata.py
diff --git a/modules/websubmit/lib/wsm_extractor_plugin.py b/invenio/legacy/websubmit/file_metadata_plugins/extractor_plugin.py
similarity index 100%
rename from modules/websubmit/lib/wsm_extractor_plugin.py
rename to invenio/legacy/websubmit/file_metadata_plugins/extractor_plugin.py
diff --git a/modules/websubmit/lib/wsm_pdftk_plugin.py b/invenio/legacy/websubmit/file_metadata_plugins/pdftk_plugin.py
similarity index 100%
rename from modules/websubmit/lib/wsm_pdftk_plugin.py
rename to invenio/legacy/websubmit/file_metadata_plugins/pdftk_plugin.py
diff --git a/modules/websubmit/lib/wsm_pyexiv2_plugin.py b/invenio/legacy/websubmit/file_metadata_plugins/pyexiv2_plugin.py
similarity index 100%
rename from modules/websubmit/lib/wsm_pyexiv2_plugin.py
rename to invenio/legacy/websubmit/file_metadata_plugins/pyexiv2_plugin.py
diff --git a/modules/websubmit/lib/websubmit_file_stamper.py b/invenio/legacy/websubmit/file_stamper.py
similarity index 100%
rename from modules/websubmit/lib/websubmit_file_stamper.py
rename to invenio/legacy/websubmit/file_stamper.py
diff --git a/modules/websubmit/etc/demo-stamp-left-logo.png b/invenio/legacy/websubmit/file_stamper_templates/demo-stamp-left-logo.png
similarity index 100%
rename from modules/websubmit/etc/demo-stamp-left-logo.png
rename to invenio/legacy/websubmit/file_stamper_templates/demo-stamp-left-logo.png
diff --git a/modules/websubmit/etc/demo-stamp-left.tex b/invenio/legacy/websubmit/file_stamper_templates/demo-stamp-left.tex
similarity index 100%
rename from modules/websubmit/etc/demo-stamp-left.tex
rename to invenio/legacy/websubmit/file_stamper_templates/demo-stamp-left.tex
diff --git a/modules/websubmit/lib/functions/Add_Files.py b/invenio/legacy/websubmit/functions/Add_Files.py
similarity index 100%
rename from modules/websubmit/lib/functions/Add_Files.py
rename to invenio/legacy/websubmit/functions/Add_Files.py
diff --git a/modules/websubmit/lib/functions/Allocate_ALEPH_SYS.py b/invenio/legacy/websubmit/functions/Allocate_ALEPH_SYS.py
similarity index 100%
rename from modules/websubmit/lib/functions/Allocate_ALEPH_SYS.py
rename to invenio/legacy/websubmit/functions/Allocate_ALEPH_SYS.py
diff --git a/modules/websubmit/lib/functions/Ask_For_Record_Details_Confirmation.py b/invenio/legacy/websubmit/functions/Ask_For_Record_Details_Confirmation.py
similarity index 100%
rename from modules/websubmit/lib/functions/Ask_For_Record_Details_Confirmation.py
rename to invenio/legacy/websubmit/functions/Ask_For_Record_Details_Confirmation.py
diff --git a/modules/websubmit/lib/functions/CaseEDS.py b/invenio/legacy/websubmit/functions/CaseEDS.py
similarity index 100%
rename from modules/websubmit/lib/functions/CaseEDS.py
rename to invenio/legacy/websubmit/functions/CaseEDS.py
diff --git a/modules/websubmit/lib/functions/Check_Group.py b/invenio/legacy/websubmit/functions/Check_Group.py
similarity index 100%
rename from modules/websubmit/lib/functions/Check_Group.py
rename to invenio/legacy/websubmit/functions/Check_Group.py
diff --git a/modules/websubmit/lib/functions/Convert_RecXML_to_RecALEPH.py b/invenio/legacy/websubmit/functions/Convert_RecXML_to_RecALEPH.py
similarity index 100%
rename from modules/websubmit/lib/functions/Convert_RecXML_to_RecALEPH.py
rename to invenio/legacy/websubmit/functions/Convert_RecXML_to_RecALEPH.py
diff --git a/modules/websubmit/lib/functions/Convert_RecXML_to_RecALEPH_DELETE.py b/invenio/legacy/websubmit/functions/Convert_RecXML_to_RecALEPH_DELETE.py
similarity index 100%
rename from modules/websubmit/lib/functions/Convert_RecXML_to_RecALEPH_DELETE.py
rename to invenio/legacy/websubmit/functions/Convert_RecXML_to_RecALEPH_DELETE.py
diff --git a/modules/websubmit/lib/functions/Create_Cplx_Approval.py b/invenio/legacy/websubmit/functions/Create_Cplx_Approval.py
similarity index 100%
rename from modules/websubmit/lib/functions/Create_Cplx_Approval.py
rename to invenio/legacy/websubmit/functions/Create_Cplx_Approval.py
diff --git a/modules/websubmit/lib/functions/Create_Modify_Interface.py b/invenio/legacy/websubmit/functions/Create_Modify_Interface.py
similarity index 100%
rename from modules/websubmit/lib/functions/Create_Modify_Interface.py
rename to invenio/legacy/websubmit/functions/Create_Modify_Interface.py
diff --git a/modules/websubmit/lib/functions/Create_Recid.py b/invenio/legacy/websubmit/functions/Create_Recid.py
similarity index 100%
rename from modules/websubmit/lib/functions/Create_Recid.py
rename to invenio/legacy/websubmit/functions/Create_Recid.py
diff --git a/modules/websubmit/lib/functions/Create_Upload_Files_Interface.py b/invenio/legacy/websubmit/functions/Create_Upload_Files_Interface.py
similarity index 100%
rename from modules/websubmit/lib/functions/Create_Upload_Files_Interface.py
rename to invenio/legacy/websubmit/functions/Create_Upload_Files_Interface.py
diff --git a/modules/websubmit/lib/functions/DEMOVID_Validation.py b/invenio/legacy/websubmit/functions/DEMOVID_Validation.py
similarity index 100%
rename from modules/websubmit/lib/functions/DEMOVID_Validation.py
rename to invenio/legacy/websubmit/functions/DEMOVID_Validation.py
diff --git a/modules/websubmit/lib/functions/Export_Via_SWORD.py b/invenio/legacy/websubmit/functions/Export_Via_SWORD.py
similarity index 100%
rename from modules/websubmit/lib/functions/Export_Via_SWORD.py
rename to invenio/legacy/websubmit/functions/Export_Via_SWORD.py
diff --git a/modules/websubmit/lib/functions/Finish_Submission.py b/invenio/legacy/websubmit/functions/Finish_Submission.py
similarity index 100%
rename from modules/websubmit/lib/functions/Finish_Submission.py
rename to invenio/legacy/websubmit/functions/Finish_Submission.py
diff --git a/modules/websubmit/lib/functions/Format_Record.py b/invenio/legacy/websubmit/functions/Format_Record.py
similarity index 100%
rename from modules/websubmit/lib/functions/Format_Record.py
rename to invenio/legacy/websubmit/functions/Format_Record.py
diff --git a/modules/websubmit/lib/functions/Generate_Group_File.py b/invenio/legacy/websubmit/functions/Generate_Group_File.py
similarity index 100%
rename from modules/websubmit/lib/functions/Generate_Group_File.py
rename to invenio/legacy/websubmit/functions/Generate_Group_File.py
diff --git a/modules/websubmit/lib/functions/Get_Info.py b/invenio/legacy/websubmit/functions/Get_Info.py
similarity index 100%
rename from modules/websubmit/lib/functions/Get_Info.py
rename to invenio/legacy/websubmit/functions/Get_Info.py
diff --git a/modules/websubmit/lib/functions/Get_Recid.py b/invenio/legacy/websubmit/functions/Get_Recid.py
similarity index 100%
rename from modules/websubmit/lib/functions/Get_Recid.py
rename to invenio/legacy/websubmit/functions/Get_Recid.py
diff --git a/modules/websubmit/lib/functions/Get_Report_Number.py b/invenio/legacy/websubmit/functions/Get_Report_Number.py
similarity index 100%
rename from modules/websubmit/lib/functions/Get_Report_Number.py
rename to invenio/legacy/websubmit/functions/Get_Report_Number.py
diff --git a/modules/websubmit/lib/functions/Get_Sysno.py b/invenio/legacy/websubmit/functions/Get_Sysno.py
similarity index 100%
rename from modules/websubmit/lib/functions/Get_Sysno.py
rename to invenio/legacy/websubmit/functions/Get_Sysno.py
diff --git a/modules/websubmit/lib/functions/Insert_Modify_Record.py b/invenio/legacy/websubmit/functions/Insert_Modify_Record.py
similarity index 100%
rename from modules/websubmit/lib/functions/Insert_Modify_Record.py
rename to invenio/legacy/websubmit/functions/Insert_Modify_Record.py
diff --git a/modules/websubmit/lib/functions/Insert_Record.py b/invenio/legacy/websubmit/functions/Insert_Record.py
similarity index 100%
rename from modules/websubmit/lib/functions/Insert_Record.py
rename to invenio/legacy/websubmit/functions/Insert_Record.py
diff --git a/modules/websubmit/lib/functions/Is_Original_Submitter.py b/invenio/legacy/websubmit/functions/Is_Original_Submitter.py
similarity index 100%
rename from modules/websubmit/lib/functions/Is_Original_Submitter.py
rename to invenio/legacy/websubmit/functions/Is_Original_Submitter.py
diff --git a/modules/websubmit/lib/functions/Is_Referee.py b/invenio/legacy/websubmit/functions/Is_Referee.py
similarity index 100%
rename from modules/websubmit/lib/functions/Is_Referee.py
rename to invenio/legacy/websubmit/functions/Is_Referee.py
diff --git a/modules/websubmit/lib/functions/Link_Records.py b/invenio/legacy/websubmit/functions/Link_Records.py
similarity index 100%
rename from modules/websubmit/lib/functions/Link_Records.py
rename to invenio/legacy/websubmit/functions/Link_Records.py
diff --git a/modules/websubmit/lib/functions/Mail_Approval_Request_to_Committee_Chair.py b/invenio/legacy/websubmit/functions/Mail_Approval_Request_to_Committee_Chair.py
similarity index 100%
rename from modules/websubmit/lib/functions/Mail_Approval_Request_to_Committee_Chair.py
rename to invenio/legacy/websubmit/functions/Mail_Approval_Request_to_Committee_Chair.py
diff --git a/modules/websubmit/lib/functions/Mail_Approval_Request_to_Referee.py b/invenio/legacy/websubmit/functions/Mail_Approval_Request_to_Referee.py
similarity index 100%
rename from modules/websubmit/lib/functions/Mail_Approval_Request_to_Referee.py
rename to invenio/legacy/websubmit/functions/Mail_Approval_Request_to_Referee.py
diff --git a/modules/websubmit/lib/functions/Mail_Approval_Withdrawn_to_Referee.py b/invenio/legacy/websubmit/functions/Mail_Approval_Withdrawn_to_Referee.py
similarity index 100%
rename from modules/websubmit/lib/functions/Mail_Approval_Withdrawn_to_Referee.py
rename to invenio/legacy/websubmit/functions/Mail_Approval_Withdrawn_to_Referee.py
diff --git a/modules/websubmit/lib/functions/Mail_New_Record_Notification.py b/invenio/legacy/websubmit/functions/Mail_New_Record_Notification.py
similarity index 100%
rename from modules/websubmit/lib/functions/Mail_New_Record_Notification.py
rename to invenio/legacy/websubmit/functions/Mail_New_Record_Notification.py
diff --git a/modules/websubmit/lib/functions/Mail_Submitter.py b/invenio/legacy/websubmit/functions/Mail_Submitter.py
similarity index 100%
rename from modules/websubmit/lib/functions/Mail_Submitter.py
rename to invenio/legacy/websubmit/functions/Mail_Submitter.py
diff --git a/modules/websubmit/lib/functions/Make_Dummy_MARC_XML_Record.py b/invenio/legacy/websubmit/functions/Make_Dummy_MARC_XML_Record.py
similarity index 100%
rename from modules/websubmit/lib/functions/Make_Dummy_MARC_XML_Record.py
rename to invenio/legacy/websubmit/functions/Make_Dummy_MARC_XML_Record.py
diff --git a/modules/websubmit/lib/functions/Make_Modify_Record.py b/invenio/legacy/websubmit/functions/Make_Modify_Record.py
similarity index 100%
rename from modules/websubmit/lib/functions/Make_Modify_Record.py
rename to invenio/legacy/websubmit/functions/Make_Modify_Record.py
diff --git a/modules/websubmit/lib/functions/Make_Record.py b/invenio/legacy/websubmit/functions/Make_Record.py
similarity index 100%
rename from modules/websubmit/lib/functions/Make_Record.py
rename to invenio/legacy/websubmit/functions/Make_Record.py
diff --git a/modules/websubmit/lib/functions/Move_CKEditor_Files_to_Storage.py b/invenio/legacy/websubmit/functions/Move_CKEditor_Files_to_Storage.py
similarity index 100%
rename from modules/websubmit/lib/functions/Move_CKEditor_Files_to_Storage.py
rename to invenio/legacy/websubmit/functions/Move_CKEditor_Files_to_Storage.py
diff --git a/modules/websubmit/lib/functions/Move_Files_Archive.py b/invenio/legacy/websubmit/functions/Move_Files_Archive.py
similarity index 100%
rename from modules/websubmit/lib/functions/Move_Files_Archive.py
rename to invenio/legacy/websubmit/functions/Move_Files_Archive.py
diff --git a/modules/websubmit/lib/functions/Move_Files_to_Storage.py b/invenio/legacy/websubmit/functions/Move_Files_to_Storage.py
similarity index 100%
rename from modules/websubmit/lib/functions/Move_Files_to_Storage.py
rename to invenio/legacy/websubmit/functions/Move_Files_to_Storage.py
diff --git a/modules/websubmit/lib/functions/Move_From_Pending.py b/invenio/legacy/websubmit/functions/Move_From_Pending.py
similarity index 100%
rename from modules/websubmit/lib/functions/Move_From_Pending.py
rename to invenio/legacy/websubmit/functions/Move_From_Pending.py
diff --git a/modules/websubmit/lib/functions/Move_Photos_to_Storage.py b/invenio/legacy/websubmit/functions/Move_Photos_to_Storage.py
similarity index 100%
rename from modules/websubmit/lib/functions/Move_Photos_to_Storage.py
rename to invenio/legacy/websubmit/functions/Move_Photos_to_Storage.py
diff --git a/modules/websubmit/lib/functions/Move_Revised_Files_to_Storage.py b/invenio/legacy/websubmit/functions/Move_Revised_Files_to_Storage.py
similarity index 100%
rename from modules/websubmit/lib/functions/Move_Revised_Files_to_Storage.py
rename to invenio/legacy/websubmit/functions/Move_Revised_Files_to_Storage.py
diff --git a/modules/websubmit/lib/functions/Move_Uploaded_Files_to_Storage.py b/invenio/legacy/websubmit/functions/Move_Uploaded_Files_to_Storage.py
similarity index 100%
rename from modules/websubmit/lib/functions/Move_Uploaded_Files_to_Storage.py
rename to invenio/legacy/websubmit/functions/Move_Uploaded_Files_to_Storage.py
diff --git a/modules/websubmit/lib/functions/Move_to_Done.py b/invenio/legacy/websubmit/functions/Move_to_Done.py
similarity index 100%
rename from modules/websubmit/lib/functions/Move_to_Done.py
rename to invenio/legacy/websubmit/functions/Move_to_Done.py
diff --git a/modules/websubmit/lib/functions/Move_to_Pending.py b/invenio/legacy/websubmit/functions/Move_to_Pending.py
similarity index 100%
rename from modules/websubmit/lib/functions/Move_to_Pending.py
rename to invenio/legacy/websubmit/functions/Move_to_Pending.py
diff --git a/modules/websubmit/lib/functions/Notify_URL.py b/invenio/legacy/websubmit/functions/Notify_URL.py
similarity index 100%
rename from modules/websubmit/lib/functions/Notify_URL.py
rename to invenio/legacy/websubmit/functions/Notify_URL.py
diff --git a/modules/websubmit/lib/functions/Print_Success.py b/invenio/legacy/websubmit/functions/Print_Success.py
similarity index 100%
rename from modules/websubmit/lib/functions/Print_Success.py
rename to invenio/legacy/websubmit/functions/Print_Success.py
diff --git a/modules/websubmit/lib/functions/Print_Success_APP.py b/invenio/legacy/websubmit/functions/Print_Success_APP.py
similarity index 100%
rename from modules/websubmit/lib/functions/Print_Success_APP.py
rename to invenio/legacy/websubmit/functions/Print_Success_APP.py
diff --git a/modules/websubmit/lib/functions/Print_Success_Approval_Request.py b/invenio/legacy/websubmit/functions/Print_Success_Approval_Request.py
similarity index 100%
rename from modules/websubmit/lib/functions/Print_Success_Approval_Request.py
rename to invenio/legacy/websubmit/functions/Print_Success_Approval_Request.py
diff --git a/modules/websubmit/lib/functions/Print_Success_CPLX.py b/invenio/legacy/websubmit/functions/Print_Success_CPLX.py
similarity index 100%
rename from modules/websubmit/lib/functions/Print_Success_CPLX.py
rename to invenio/legacy/websubmit/functions/Print_Success_CPLX.py
diff --git a/modules/websubmit/lib/functions/Print_Success_DEL.py b/invenio/legacy/websubmit/functions/Print_Success_DEL.py
similarity index 100%
rename from modules/websubmit/lib/functions/Print_Success_DEL.py
rename to invenio/legacy/websubmit/functions/Print_Success_DEL.py
diff --git a/modules/websubmit/lib/functions/Print_Success_MBI.py b/invenio/legacy/websubmit/functions/Print_Success_MBI.py
similarity index 100%
rename from modules/websubmit/lib/functions/Print_Success_MBI.py
rename to invenio/legacy/websubmit/functions/Print_Success_MBI.py
diff --git a/modules/websubmit/lib/functions/Print_Success_SRV.py b/invenio/legacy/websubmit/functions/Print_Success_SRV.py
similarity index 100%
rename from modules/websubmit/lib/functions/Print_Success_SRV.py
rename to invenio/legacy/websubmit/functions/Print_Success_SRV.py
diff --git a/modules/websubmit/lib/functions/Register_Approval_Request.py b/invenio/legacy/websubmit/functions/Register_Approval_Request.py
similarity index 100%
rename from modules/websubmit/lib/functions/Register_Approval_Request.py
rename to invenio/legacy/websubmit/functions/Register_Approval_Request.py
diff --git a/modules/websubmit/lib/functions/Register_Referee_Decision.py b/invenio/legacy/websubmit/functions/Register_Referee_Decision.py
similarity index 100%
rename from modules/websubmit/lib/functions/Register_Referee_Decision.py
rename to invenio/legacy/websubmit/functions/Register_Referee_Decision.py
diff --git a/modules/websubmit/lib/functions/Report_Number_Generation.py b/invenio/legacy/websubmit/functions/Report_Number_Generation.py
similarity index 100%
rename from modules/websubmit/lib/functions/Report_Number_Generation.py
rename to invenio/legacy/websubmit/functions/Report_Number_Generation.py
diff --git a/modules/websubmit/lib/functions/Retrieve_Data.py b/invenio/legacy/websubmit/functions/Retrieve_Data.py
similarity index 100%
rename from modules/websubmit/lib/functions/Retrieve_Data.py
rename to invenio/legacy/websubmit/functions/Retrieve_Data.py
diff --git a/modules/websubmit/lib/functions/Second_Report_Number_Generation.py b/invenio/legacy/websubmit/functions/Second_Report_Number_Generation.py
similarity index 100%
rename from modules/websubmit/lib/functions/Second_Report_Number_Generation.py
rename to invenio/legacy/websubmit/functions/Second_Report_Number_Generation.py
diff --git a/modules/websubmit/lib/functions/Send_APP_Mail.py b/invenio/legacy/websubmit/functions/Send_APP_Mail.py
similarity index 100%
rename from modules/websubmit/lib/functions/Send_APP_Mail.py
rename to invenio/legacy/websubmit/functions/Send_APP_Mail.py
diff --git a/modules/websubmit/lib/functions/Send_Approval_Request.py b/invenio/legacy/websubmit/functions/Send_Approval_Request.py
similarity index 100%
rename from modules/websubmit/lib/functions/Send_Approval_Request.py
rename to invenio/legacy/websubmit/functions/Send_Approval_Request.py
diff --git a/modules/websubmit/lib/functions/Send_Delete_Mail.py b/invenio/legacy/websubmit/functions/Send_Delete_Mail.py
similarity index 100%
rename from modules/websubmit/lib/functions/Send_Delete_Mail.py
rename to invenio/legacy/websubmit/functions/Send_Delete_Mail.py
diff --git a/modules/websubmit/lib/functions/Send_Modify_Mail.py b/invenio/legacy/websubmit/functions/Send_Modify_Mail.py
similarity index 100%
rename from modules/websubmit/lib/functions/Send_Modify_Mail.py
rename to invenio/legacy/websubmit/functions/Send_Modify_Mail.py
diff --git a/modules/websubmit/lib/functions/Send_Request_For_Direct_Approval.py b/invenio/legacy/websubmit/functions/Send_Request_For_Direct_Approval.py
similarity index 100%
rename from modules/websubmit/lib/functions/Send_Request_For_Direct_Approval.py
rename to invenio/legacy/websubmit/functions/Send_Request_For_Direct_Approval.py
diff --git a/modules/websubmit/lib/functions/Send_Request_For_Publication.py b/invenio/legacy/websubmit/functions/Send_Request_For_Publication.py
similarity index 100%
rename from modules/websubmit/lib/functions/Send_Request_For_Publication.py
rename to invenio/legacy/websubmit/functions/Send_Request_For_Publication.py
diff --git a/modules/websubmit/lib/functions/Send_Request_For_Refereeing_Process.py b/invenio/legacy/websubmit/functions/Send_Request_For_Refereeing_Process.py
similarity index 100%
rename from modules/websubmit/lib/functions/Send_Request_For_Refereeing_Process.py
rename to invenio/legacy/websubmit/functions/Send_Request_For_Refereeing_Process.py
diff --git a/modules/websubmit/lib/functions/Send_SRV_Mail.py b/invenio/legacy/websubmit/functions/Send_SRV_Mail.py
similarity index 100%
rename from modules/websubmit/lib/functions/Send_SRV_Mail.py
rename to invenio/legacy/websubmit/functions/Send_SRV_Mail.py
diff --git a/modules/websubmit/lib/functions/Set_Embargo.py b/invenio/legacy/websubmit/functions/Set_Embargo.py
similarity index 100%
rename from modules/websubmit/lib/functions/Set_Embargo.py
rename to invenio/legacy/websubmit/functions/Set_Embargo.py
diff --git a/modules/websubmit/lib/functions/Set_RN_From_Sysno.py b/invenio/legacy/websubmit/functions/Set_RN_From_Sysno.py
similarity index 100%
rename from modules/websubmit/lib/functions/Set_RN_From_Sysno.py
rename to invenio/legacy/websubmit/functions/Set_RN_From_Sysno.py
diff --git a/modules/websubmit/lib/functions/Shared_Functions.py b/invenio/legacy/websubmit/functions/Shared_Functions.py
similarity index 100%
rename from modules/websubmit/lib/functions/Shared_Functions.py
rename to invenio/legacy/websubmit/functions/Shared_Functions.py
diff --git a/modules/websubmit/lib/functions/Stamp_Replace_Single_File_Approval.py b/invenio/legacy/websubmit/functions/Stamp_Replace_Single_File_Approval.py
similarity index 100%
rename from modules/websubmit/lib/functions/Stamp_Replace_Single_File_Approval.py
rename to invenio/legacy/websubmit/functions/Stamp_Replace_Single_File_Approval.py
diff --git a/modules/websubmit/lib/functions/Stamp_Uploaded_Files.py b/invenio/legacy/websubmit/functions/Stamp_Uploaded_Files.py
similarity index 100%
rename from modules/websubmit/lib/functions/Stamp_Uploaded_Files.py
rename to invenio/legacy/websubmit/functions/Stamp_Uploaded_Files.py
diff --git a/modules/websubmit/lib/functions/Test_Status.py b/invenio/legacy/websubmit/functions/Test_Status.py
similarity index 100%
rename from modules/websubmit/lib/functions/Test_Status.py
rename to invenio/legacy/websubmit/functions/Test_Status.py
diff --git a/modules/websubmit/lib/functions/Update_Approval_DB.py b/invenio/legacy/websubmit/functions/Update_Approval_DB.py
similarity index 100%
rename from modules/websubmit/lib/functions/Update_Approval_DB.py
rename to invenio/legacy/websubmit/functions/Update_Approval_DB.py
diff --git a/modules/websubmit/lib/functions/User_is_Record_Owner_or_Curator.py b/invenio/legacy/websubmit/functions/User_is_Record_Owner_or_Curator.py
similarity index 100%
rename from modules/websubmit/lib/functions/User_is_Record_Owner_or_Curator.py
rename to invenio/legacy/websubmit/functions/User_is_Record_Owner_or_Curator.py
diff --git a/modules/websubmit/lib/functions/Video_Processing.py b/invenio/legacy/websubmit/functions/Video_Processing.py
similarity index 100%
rename from modules/websubmit/lib/functions/Video_Processing.py
rename to invenio/legacy/websubmit/functions/Video_Processing.py
diff --git a/modules/websubmit/lib/functions/Withdraw_Approval_Request.py b/invenio/legacy/websubmit/functions/Withdraw_Approval_Request.py
similarity index 100%
rename from modules/websubmit/lib/functions/Withdraw_Approval_Request.py
rename to invenio/legacy/websubmit/functions/Withdraw_Approval_Request.py
diff --git a/modules/websubmit/lib/hocrlib.py b/invenio/legacy/websubmit/hocrlib.py
similarity index 100%
rename from modules/websubmit/lib/hocrlib.py
rename to invenio/legacy/websubmit/hocrlib.py
diff --git a/modules/websubmit/lib/websubmit_icon_creator.py b/invenio/legacy/websubmit/icon_creator.py
similarity index 100%
rename from modules/websubmit/lib/websubmit_icon_creator.py
rename to invenio/legacy/websubmit/icon_creator.py
diff --git a/modules/websubmit/bin/inveniounoconv.in b/invenio/legacy/websubmit/inveniounoconv.py
similarity index 100%
rename from modules/websubmit/bin/inveniounoconv.in
rename to invenio/legacy/websubmit/inveniounoconv.py
diff --git a/modules/websubmit/bin/websubmitadmin.in b/invenio/legacy/websubmit/scripts/websubmitadmin.py
similarity index 100%
rename from modules/websubmit/bin/websubmitadmin.in
rename to invenio/legacy/websubmit/scripts/websubmitadmin.py
diff --git a/modules/websubmit/lib/websubmit_templates.py b/invenio/legacy/websubmit/templates.py
similarity index 100%
rename from modules/websubmit/lib/websubmit_templates.py
rename to invenio/legacy/websubmit/templates.py
diff --git a/modules/websubmit/web/admin/referees.py b/invenio/legacy/websubmit/web/admin/referees.py
similarity index 100%
rename from modules/websubmit/web/admin/referees.py
rename to invenio/legacy/websubmit/web/admin/referees.py
diff --git a/modules/websubmit/web/admin/websubmitadmin.py b/invenio/legacy/websubmit/web/admin/websubmitadmin.py
similarity index 100%
rename from modules/websubmit/web/admin/websubmitadmin.py
rename to invenio/legacy/websubmit/web/admin/websubmitadmin.py
diff --git a/modules/websubmit/web/approve.py b/invenio/legacy/websubmit/web/approve.py
similarity index 100%
rename from modules/websubmit/web/approve.py
rename to invenio/legacy/websubmit/web/approve.py
diff --git a/modules/websubmit/web/publiline.py b/invenio/legacy/websubmit/web/publiline.py
similarity index 100%
rename from modules/websubmit/web/publiline.py
rename to invenio/legacy/websubmit/web/publiline.py
diff --git a/modules/websubmit/web/yourapprovals.py b/invenio/legacy/websubmit/web/yourapprovals.py
similarity index 100%
rename from modules/websubmit/web/yourapprovals.py
rename to invenio/legacy/websubmit/web/yourapprovals.py
diff --git a/modules/websubmit/web/yoursubmissions.py b/invenio/legacy/websubmit/web/yoursubmissions.py
similarity index 100%
rename from modules/websubmit/web/yoursubmissions.py
rename to invenio/legacy/websubmit/web/yoursubmissions.py
diff --git a/modules/websubmit/lib/websubmit_webinterface.py b/invenio/legacy/websubmit/webinterface.py
similarity index 100%
rename from modules/websubmit/lib/websubmit_webinterface.py
rename to invenio/legacy/websubmit/webinterface.py
diff --git a/modules/websession/lib/webuser.py b/invenio/legacy/webuser.py
similarity index 100%
rename from modules/websession/lib/webuser.py
rename to invenio/legacy/webuser.py
diff --git a/modules/webstyle/lib/webinterface_handler_wsgi.py b/invenio/legacy/wsgi/__init__.py
similarity index 100%
rename from modules/webstyle/lib/webinterface_handler_wsgi.py
rename to invenio/legacy/wsgi/__init__.py
diff --git a/modules/webstyle/lib/webinterface_handler_wsgi_utils.py b/invenio/legacy/wsgi/utils.py
similarity index 100%
rename from modules/webstyle/lib/webinterface_handler_wsgi_utils.py
rename to invenio/legacy/wsgi/utils.py
diff --git a/modules/webaccess/lib/webaccessadmin_lib.py b/invenio/modules/access/admin_lib.py
similarity index 100%
rename from modules/webaccess/lib/webaccessadmin_lib.py
rename to invenio/modules/access/admin_lib.py
diff --git a/modules/webaccess/lib/access_control_admin.py b/invenio/modules/access/control.py
similarity index 100%
rename from modules/webaccess/lib/access_control_admin.py
rename to invenio/modules/access/control.py
diff --git a/modules/webaccess/lib/access_control_engine.py b/invenio/modules/access/engine.py
similarity index 100%
rename from modules/webaccess/lib/access_control_engine.py
rename to invenio/modules/access/engine.py
diff --git a/modules/webaccess/lib/access_control_firerole.py b/invenio/modules/access/firerole.py
similarity index 100%
rename from modules/webaccess/lib/access_control_firerole.py
rename to invenio/modules/access/firerole.py
diff --git a/modules/webaccess/lib/access_control_config.py b/invenio/modules/access/local_config.py
similarity index 100%
rename from modules/webaccess/lib/access_control_config.py
rename to invenio/modules/access/local_config.py
diff --git a/modules/webaccess/lib/access_control_mailcookie.py b/invenio/modules/access/mailcookie.py
similarity index 100%
rename from modules/webaccess/lib/access_control_mailcookie.py
rename to invenio/modules/access/mailcookie.py
diff --git a/modules/webaccess/lib/webaccess_model.py b/invenio/modules/access/models.py
similarity index 100%
rename from modules/webaccess/lib/webaccess_model.py
rename to invenio/modules/access/models.py
diff --git a/modules/webaccess/bin/authaction.in b/invenio/modules/access/scripts/authaction.py
similarity index 100%
rename from modules/webaccess/bin/authaction.in
rename to invenio/modules/access/scripts/authaction.py
diff --git a/modules/webaccess/etc/templates/webaccess_admin_actionarea.html b/invenio/modules/access/templates/access/admin_actionarea.html
similarity index 100%
rename from modules/webaccess/etc/templates/webaccess_admin_actionarea.html
rename to invenio/modules/access/templates/access/admin_actionarea.html
diff --git a/modules/webaccess/etc/templates/webaccess_admin_index.html b/invenio/modules/access/templates/access/admin_index.html
similarity index 100%
rename from modules/webaccess/etc/templates/webaccess_admin_index.html
rename to invenio/modules/access/templates/access/admin_index.html
diff --git a/modules/webaccess/etc/templates/webaccess_admin_rolearea.html b/invenio/modules/access/templates/access/admin_rolearea.html
similarity index 100%
rename from modules/webaccess/etc/templates/webaccess_admin_rolearea.html
rename to invenio/modules/access/templates/access/admin_rolearea.html
diff --git a/modules/webaccess/etc/templates/webaccess_admin_showroledetails.html b/invenio/modules/access/templates/access/admin_showroledetails.html
similarity index 100%
rename from modules/webaccess/etc/templates/webaccess_admin_showroledetails.html
rename to invenio/modules/access/templates/access/admin_showroledetails.html
diff --git a/modules/webaccess/etc/templates/webaccess_admin_userarea.html b/invenio/modules/access/templates/access/admin_userarea.html
similarity index 100%
rename from modules/webaccess/etc/templates/webaccess_admin_userarea.html
rename to invenio/modules/access/templates/access/admin_userarea.html
diff --git a/modules/webaccess/lib/external_authentication_cern_unit_tests.py b/invenio/modules/access/testsuite/test_external_authentication_cern.py
similarity index 100%
rename from modules/webaccess/lib/external_authentication_cern_unit_tests.py
rename to invenio/modules/access/testsuite/test_external_authentication_cern.py
diff --git a/modules/webaccess/lib/access_control_firerole_unit_tests.py b/invenio/modules/access/testsuite/test_firerole.py
similarity index 100%
rename from modules/webaccess/lib/access_control_firerole_unit_tests.py
rename to invenio/modules/access/testsuite/test_firerole.py
diff --git a/modules/webaccess/lib/webaccess_admin_blueprint.py b/invenio/modules/access/views/admin.py
similarity index 100%
rename from modules/webaccess/lib/webaccess_admin_blueprint.py
rename to invenio/modules/access/views/admin.py
diff --git a/modules/websession/lib/webaccount_forms.py b/invenio/modules/accounts/forms.py
similarity index 100%
rename from modules/websession/lib/webaccount_forms.py
rename to invenio/modules/accounts/forms.py
diff --git a/modules/websession/lib/websession_model.py b/invenio/modules/accounts/models.py
similarity index 100%
rename from modules/websession/lib/websession_model.py
rename to invenio/modules/accounts/models.py
diff --git a/modules/websession/etc/templates/webaccount_edit.html b/invenio/modules/accounts/templates/accounts/edit.html
similarity index 100%
rename from modules/websession/etc/templates/webaccount_edit.html
rename to invenio/modules/accounts/templates/accounts/edit.html
diff --git a/modules/websession/etc/templates/webaccount_index.html b/invenio/modules/accounts/templates/accounts/index.html
similarity index 100%
rename from modules/websession/etc/templates/webaccount_index.html
rename to invenio/modules/accounts/templates/accounts/index.html
diff --git a/modules/websession/etc/templates/webaccount_login.html b/invenio/modules/accounts/templates/accounts/login.html
similarity index 100%
rename from modules/websession/etc/templates/webaccount_login.html
rename to invenio/modules/accounts/templates/accounts/login.html
diff --git a/modules/websession/etc/templates/webaccount_logout.html b/invenio/modules/accounts/templates/accounts/logout.html
similarity index 100%
rename from modules/websession/etc/templates/webaccount_logout.html
rename to invenio/modules/accounts/templates/accounts/logout.html
diff --git a/modules/websession/etc/templates/webaccount_lost.html b/invenio/modules/accounts/templates/accounts/lost.html
similarity index 100%
rename from modules/websession/etc/templates/webaccount_lost.html
rename to invenio/modules/accounts/templates/accounts/lost.html
diff --git a/modules/websession/etc/templates/webaccount_register.html b/invenio/modules/accounts/templates/accounts/register.html
similarity index 100%
rename from modules/websession/etc/templates/webaccount_register.html
rename to invenio/modules/accounts/templates/accounts/register.html
diff --git a/modules/websession/etc/templates/webaccount_widget.html b/invenio/modules/accounts/templates/accounts/widget.html
similarity index 100%
rename from modules/websession/etc/templates/webaccount_widget.html
rename to invenio/modules/accounts/templates/accounts/widget.html
diff --git a/modules/websession/lib/webgroup_unit_tests.py b/invenio/modules/accounts/testsuite/test_accounts_group.py
similarity index 100%
rename from modules/websession/lib/webgroup_unit_tests.py
rename to invenio/modules/accounts/testsuite/test_accounts_group.py
diff --git a/modules/websession/lib/webuser_unit_tests.py b/invenio/modules/accounts/testsuite/test_accounts_user.py
similarity index 100%
rename from modules/websession/lib/webuser_unit_tests.py
rename to invenio/modules/accounts/testsuite/test_accounts_user.py
diff --git a/modules/websession/lib/webaccount_user_settings.py b/invenio/modules/accounts/user_settings/email.py
similarity index 100%
rename from modules/websession/lib/webaccount_user_settings.py
rename to invenio/modules/accounts/user_settings/email.py
diff --git a/modules/websession/lib/webaccount_password_user_settings.py b/invenio/modules/accounts/user_settings/password.py
similarity index 100%
rename from modules/websession/lib/webaccount_password_user_settings.py
rename to invenio/modules/accounts/user_settings/password.py
diff --git a/modules/websession/lib/webaccount_blueprint.py b/invenio/modules/accounts/views.py
similarity index 100%
rename from modules/websession/lib/webaccount_blueprint.py
rename to invenio/modules/accounts/views.py
diff --git a/modules/webalert/lib/webalert_model.py b/invenio/modules/alerts/models.py
similarity index 100%
rename from modules/webalert/lib/webalert_model.py
rename to invenio/modules/alerts/models.py
diff --git a/modules/webalert/lib/alert_engine_unit_tests.py b/invenio/modules/alerts/testsuite/test_alert_engine.py
similarity index 100%
rename from modules/webalert/lib/alert_engine_unit_tests.py
rename to invenio/modules/alerts/testsuite/test_alert_engine.py
diff --git a/modules/webalert/lib/webalert_user_settings.py b/invenio/modules/alerts/user_settings.py
similarity index 100%
rename from modules/webalert/lib/webalert_user_settings.py
rename to invenio/modules/alerts/user_settings.py
diff --git a/modules/miscutil/lib/web_api_key.py b/invenio/modules/apikeys/__init__.py
similarity index 100%
rename from modules/miscutil/lib/web_api_key.py
rename to invenio/modules/apikeys/__init__.py
diff --git a/modules/miscutil/lib/web_api_key_model.py b/invenio/modules/apikeys/models.py
similarity index 100%
rename from modules/miscutil/lib/web_api_key_model.py
rename to invenio/modules/apikeys/models.py
diff --git a/modules/miscutil/lib/web_api_key_unit_tests.py b/invenio/modules/apikeys/testsuite/test_apikeys.py
similarity index 100%
rename from modules/miscutil/lib/web_api_key_unit_tests.py
rename to invenio/modules/apikeys/testsuite/test_apikeys.py
diff --git a/modules/bibauthorid/lib/bibauthorid_model.py b/invenio/modules/authorids/models.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_model.py
rename to invenio/modules/authorids/models.py
diff --git a/modules/bibauthorid/etc/name_authority_files/female_firstnames.txt b/invenio/modules/authorids/name_authority_files/female_firstnames.txt
similarity index 100%
rename from modules/bibauthorid/etc/name_authority_files/female_firstnames.txt
rename to invenio/modules/authorids/name_authority_files/female_firstnames.txt
diff --git a/modules/bibauthorid/etc/name_authority_files/male_firstnames.txt b/invenio/modules/authorids/name_authority_files/male_firstnames.txt
similarity index 100%
rename from modules/bibauthorid/etc/name_authority_files/male_firstnames.txt
rename to invenio/modules/authorids/name_authority_files/male_firstnames.txt
diff --git a/modules/bibauthorid/etc/name_authority_files/name_variants.txt b/invenio/modules/authorids/name_authority_files/name_variants.txt
similarity index 100%
rename from modules/bibauthorid/etc/name_authority_files/name_variants.txt
rename to invenio/modules/authorids/name_authority_files/name_variants.txt
diff --git a/modules/bibauthorid/web/bibauthorid.css b/invenio/modules/authorids/static/css/authorids/base.css
similarity index 100%
rename from modules/bibauthorid/web/bibauthorid.css
rename to invenio/modules/authorids/static/css/authorids/base.css
diff --git a/modules/bibauthorid/lib/bibauthorid.js b/invenio/modules/authorids/static/js/authorids/base.css
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid.js
rename to invenio/modules/authorids/static/js/authorids/base.css
diff --git a/modules/webauthorprofile/lib/webauthorprofile_model.py b/invenio/modules/authorprofiles/models.py
similarity index 100%
rename from modules/webauthorprofile/lib/webauthorprofile_model.py
rename to invenio/modules/authorprofiles/models.py
diff --git a/modules/webauthorprofile/lib/webauthorprofile.js b/invenio/modules/authorprofiles/static/js/authorprofiles/base.js
similarity index 100%
rename from modules/webauthorprofile/lib/webauthorprofile.js
rename to invenio/modules/authorprofiles/static/js/authorprofiles/base.js
diff --git a/modules/webbasket/lib/webbasket_config.py b/invenio/modules/baskets/config.py
similarity index 100%
rename from modules/webbasket/lib/webbasket_config.py
rename to invenio/modules/baskets/config.py
diff --git a/modules/webbasket/lib/webbasket_model.py b/invenio/modules/baskets/models.py
similarity index 100%
rename from modules/webbasket/lib/webbasket_model.py
rename to invenio/modules/baskets/models.py
diff --git a/modules/webbasket/lib/webbasket_user_settings.py b/invenio/modules/baskets/user_settings.py
similarity index 100%
rename from modules/webbasket/lib/webbasket_user_settings.py
rename to invenio/modules/baskets/user_settings.py
diff --git a/modules/bibworkflow/lib/workflows/__init__.py b/invenio/modules/bulletin/format_elements/__init__.py
similarity index 100%
rename from modules/bibworkflow/lib/workflows/__init__.py
rename to invenio/modules/bulletin/format_elements/__init__.py
diff --git a/modules/webjournal/lib/elements/bfe_webjournal_archive.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_archive.py
similarity index 100%
rename from modules/webjournal/lib/elements/bfe_webjournal_archive.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_archive.py
diff --git a/modules/webjournal/lib/elements/bfe_webjournal_article_admin_links.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_article_admin_links.py
similarity index 100%
rename from modules/webjournal/lib/elements/bfe_webjournal_article_admin_links.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_article_admin_links.py
diff --git a/modules/webjournal/lib/elements/bfe_webjournal_article_author.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_article_author.py
similarity index 100%
rename from modules/webjournal/lib/elements/bfe_webjournal_article_author.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_article_author.py
diff --git a/modules/webjournal/lib/elements/bfe_webjournal_article_body.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_article_body.py
similarity index 100%
rename from modules/webjournal/lib/elements/bfe_webjournal_article_body.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_article_body.py
diff --git a/modules/webjournal/lib/elements/bfe_webjournal_article_title.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_article_title.py
similarity index 100%
rename from modules/webjournal/lib/elements/bfe_webjournal_article_title.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_article_title.py
diff --git a/modules/webjournal/lib/elements/bfe_webjournal_articles.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_articles.py
similarity index 100%
rename from modules/webjournal/lib/elements/bfe_webjournal_articles.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_articles.py
diff --git a/modules/webjournal/lib/elements/bfe_webjournal_articles_overview.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_articles_overview.py
similarity index 100%
rename from modules/webjournal/lib/elements/bfe_webjournal_articles_overview.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_articles_overview.py
diff --git a/modules/webjournal/lib/elements/bfe_webjournal_imprint.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_imprint.py
similarity index 100%
rename from modules/webjournal/lib/elements/bfe_webjournal_imprint.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_imprint.py
diff --git a/modules/webjournal/lib/elements/bfe_webjournal_info.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_info.py
similarity index 100%
rename from modules/webjournal/lib/elements/bfe_webjournal_info.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_info.py
diff --git a/modules/webjournal/lib/elements/bfe_webjournal_main_navigation.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_main_navigation.py
similarity index 100%
rename from modules/webjournal/lib/elements/bfe_webjournal_main_navigation.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_main_navigation.py
diff --git a/modules/webjournal/lib/elements/bfe_webjournal_rss.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_rss.py
similarity index 100%
rename from modules/webjournal/lib/elements/bfe_webjournal_rss.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_rss.py
diff --git a/modules/webjournal/lib/elements/bfe_webjournal_sub_navigation.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_sub_navigation.py
similarity index 100%
rename from modules/webjournal/lib/elements/bfe_webjournal_sub_navigation.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_sub_navigation.py
diff --git a/modules/webjournal/lib/elements/bfe_webjournal_trackback_auto_discovery.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_trackback_auto_discovery.py
similarity index 100%
rename from modules/webjournal/lib/elements/bfe_webjournal_trackback_auto_discovery.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_trackback_auto_discovery.py
diff --git a/modules/webjournal/lib/widgets/bfe_webjournal_widget_featureRecord.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_widget_featureRecord.py
similarity index 100%
rename from modules/webjournal/lib/widgets/bfe_webjournal_widget_featureRecord.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_widget_featureRecord.py
diff --git a/modules/webjournal/lib/widgets/bfe_webjournal_widget_latestPhoto.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_widget_latestPhoto.py
similarity index 100%
rename from modules/webjournal/lib/widgets/bfe_webjournal_widget_latestPhoto.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_widget_latestPhoto.py
diff --git a/modules/webjournal/lib/widgets/bfe_webjournal_widget_seminars.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_widget_seminars.py
similarity index 100%
rename from modules/webjournal/lib/widgets/bfe_webjournal_widget_seminars.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_widget_seminars.py
diff --git a/modules/webjournal/lib/widgets/bfe_webjournal_widget_weather.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_widget_weather.py
similarity index 100%
rename from modules/webjournal/lib/widgets/bfe_webjournal_widget_weather.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_widget_weather.py
diff --git a/modules/webjournal/lib/widgets/bfe_webjournal_widget_whatsNew.py b/invenio/modules/bulletin/format_elements/bfe_webjournal_widget_whatsNew.py
similarity index 100%
rename from modules/webjournal/lib/widgets/bfe_webjournal_widget_whatsNew.py
rename to invenio/modules/bulletin/format_elements/bfe_webjournal_widget_whatsNew.py
diff --git a/modules/webjournal/lib/webjournal_model.py b/invenio/modules/bulletin/models.py
similarity index 100%
rename from modules/webjournal/lib/webjournal_model.py
rename to invenio/modules/bulletin/models.py
diff --git a/modules/webjournal/lib/webjournal_unit_tests.py b/invenio/modules/bulletin/testsuite/test_bulletin.py
similarity index 100%
rename from modules/webjournal/lib/webjournal_unit_tests.py
rename to invenio/modules/bulletin/testsuite/test_bulletin.py
diff --git a/modules/bibcirculation/lib/bibcirculation_model.py b/invenio/modules/circulation/models.py
similarity index 100%
rename from modules/bibcirculation/lib/bibcirculation_model.py
rename to invenio/modules/circulation/models.py
diff --git a/modules/bibclassify/lib/bibclassify_model.py b/invenio/modules/classifier/models.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_model.py
rename to invenio/modules/classifier/models.py
diff --git a/modules/bibclassify/bin/bibclassify.in b/invenio/modules/classifier/scripts/classifier.py
similarity index 100%
rename from modules/bibclassify/bin/bibclassify.in
rename to invenio/modules/classifier/scripts/classifier.py
diff --git a/modules/bibclassify/etc/microtests.cfg b/invenio/modules/classifier/testsuite/taxonomies/microtests.cfg
similarity index 100%
rename from modules/bibclassify/etc/microtests.cfg
rename to invenio/modules/classifier/testsuite/taxonomies/microtests.cfg
diff --git a/modules/bibclassify/etc/test.rdf b/invenio/modules/classifier/testsuite/taxonomies/test.rdf
similarity index 100%
rename from modules/bibclassify/etc/test.rdf
rename to invenio/modules/classifier/testsuite/taxonomies/test.rdf
diff --git a/modules/bibclassify/lib/bibclassify_unit_tests.py b/invenio/modules/classifier/testsuite/test_classifier.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_unit_tests.py
rename to invenio/modules/classifier/testsuite/test_classifier.py
diff --git a/modules/cloudutils/lib/__init__.py b/invenio/modules/cloudconnector/__init__.py
similarity index 100%
rename from modules/cloudutils/lib/__init__.py
rename to invenio/modules/cloudconnector/__init__.py
diff --git a/modules/cloudutils/lib/cloudutils_config.py b/invenio/modules/cloudconnector/config.py
similarity index 100%
rename from modules/cloudutils/lib/cloudutils_config.py
rename to invenio/modules/cloudconnector/config.py
diff --git a/modules/cloudutils/lib/cloudutils.py b/invenio/modules/cloudconnector/errors.py
similarity index 100%
rename from modules/cloudutils/lib/cloudutils.py
rename to invenio/modules/cloudconnector/errors.py
diff --git a/modules/cloudutils/lib/cloudutils_factory.py b/invenio/modules/cloudconnector/factory.py
similarity index 100%
rename from modules/cloudutils/lib/cloudutils_factory.py
rename to invenio/modules/cloudconnector/factory.py
diff --git a/modules/cloudutils/lib/cloudutils_factories/__init__.py b/invenio/modules/cloudconnector/fsopeners/__init__.py
similarity index 100%
rename from modules/cloudutils/lib/cloudutils_factories/__init__.py
rename to invenio/modules/cloudconnector/fsopeners/__init__.py
diff --git a/modules/cloudutils/lib/cloudutils_factories/dropbox_factory.py b/invenio/modules/cloudconnector/fsopeners/dropbox_factory.py
similarity index 100%
rename from modules/cloudutils/lib/cloudutils_factories/dropbox_factory.py
rename to invenio/modules/cloudconnector/fsopeners/dropbox_factory.py
diff --git a/modules/cloudutils/lib/cloudutils_factories/google_drive_factory.py b/invenio/modules/cloudconnector/fsopeners/google_drive_factory.py
similarity index 100%
rename from modules/cloudutils/lib/cloudutils_factories/google_drive_factory.py
rename to invenio/modules/cloudconnector/fsopeners/google_drive_factory.py
diff --git a/modules/cloudutils/lib/cloudutils_factories/skydrive_factory.py b/invenio/modules/cloudconnector/fsopeners/skydrive_factory.py
similarity index 100%
rename from modules/cloudutils/lib/cloudutils_factories/skydrive_factory.py
rename to invenio/modules/cloudconnector/fsopeners/skydrive_factory.py
diff --git a/modules/webstyle/img/dropbox_icon.png b/invenio/modules/cloudconnector/static/img/cloudconnector/dropbox_icon.png
similarity index 100%
rename from modules/webstyle/img/dropbox_icon.png
rename to invenio/modules/cloudconnector/static/img/cloudconnector/dropbox_icon.png
diff --git a/modules/webstyle/img/google_drive_icon.png b/invenio/modules/cloudconnector/static/img/cloudconnector/google_drive_icon.png
similarity index 100%
rename from modules/webstyle/img/google_drive_icon.png
rename to invenio/modules/cloudconnector/static/img/cloudconnector/google_drive_icon.png
diff --git a/modules/webstyle/img/skydrive_icon.png b/invenio/modules/cloudconnector/static/img/cloudconnector/skydrive_icon.png
similarity index 100%
rename from modules/webstyle/img/skydrive_icon.png
rename to invenio/modules/cloudconnector/static/img/cloudconnector/skydrive_icon.png
diff --git a/modules/cloudutils/etc/templates/service_index.html b/invenio/modules/cloudconnector/templates/cloudconnector/browser.html
similarity index 100%
rename from modules/cloudutils/etc/templates/service_index.html
rename to invenio/modules/cloudconnector/templates/cloudconnector/browser.html
diff --git a/modules/cloudutils/etc/templates/cloudutils_files.html b/invenio/modules/cloudconnector/templates/cloudconnector/files.html
similarity index 100%
rename from modules/cloudutils/etc/templates/cloudutils_files.html
rename to invenio/modules/cloudconnector/templates/cloudconnector/files.html
diff --git a/modules/cloudutils/etc/templates/cloudutils_macros.html b/invenio/modules/cloudconnector/templates/cloudconnector/macros.html
similarity index 100%
rename from modules/cloudutils/etc/templates/cloudutils_macros.html
rename to invenio/modules/cloudconnector/templates/cloudconnector/macros.html
diff --git a/modules/cloudutils/lib/cloudutils_user_settings.py b/invenio/modules/cloudconnector/user_settings.py
similarity index 100%
rename from modules/cloudutils/lib/cloudutils_user_settings.py
rename to invenio/modules/cloudconnector/user_settings.py
diff --git a/modules/cloudutils/lib/cloudutils_blueprint.py b/invenio/modules/cloudconnector/views.py
similarity index 100%
rename from modules/cloudutils/lib/cloudutils_blueprint.py
rename to invenio/modules/cloudconnector/views.py
diff --git a/modules/webcomment/lib/webcomment.py b/invenio/modules/comments/api.py
similarity index 100%
rename from modules/webcomment/lib/webcomment.py
rename to invenio/modules/comments/api.py
diff --git a/modules/webcomment/lib/webcomment_config.py b/invenio/modules/comments/config.py
similarity index 100%
rename from modules/webcomment/lib/webcomment_config.py
rename to invenio/modules/comments/config.py
diff --git a/modules/webcomment/lib/webcomment_forms.py b/invenio/modules/comments/forms.py
similarity index 100%
rename from modules/webcomment/lib/webcomment_forms.py
rename to invenio/modules/comments/forms.py
diff --git a/modules/webcomment/lib/webcomment_model.py b/invenio/modules/comments/models.py
similarity index 100%
rename from modules/webcomment/lib/webcomment_model.py
rename to invenio/modules/comments/models.py
diff --git a/modules/webcomment/etc/templates/webcomment_add.html b/invenio/modules/comments/templates/comments/add.html
similarity index 100%
rename from modules/webcomment/etc/templates/webcomment_add.html
rename to invenio/modules/comments/templates/comments/add.html
diff --git a/modules/webcomment/etc/templates/webcomment_add_review.html b/invenio/modules/comments/templates/comments/add_review.html
similarity index 100%
rename from modules/webcomment/etc/templates/webcomment_add_review.html
rename to invenio/modules/comments/templates/comments/add_review.html
diff --git a/modules/webcomment/etc/templates/webcomment_comments.html b/invenio/modules/comments/templates/comments/comments.html
similarity index 100%
rename from modules/webcomment/etc/templates/webcomment_comments.html
rename to invenio/modules/comments/templates/comments/comments.html
diff --git a/modules/webcomment/etc/templates/webcomment_reviews.html b/invenio/modules/comments/templates/comments/reviews.html
similarity index 100%
rename from modules/webcomment/etc/templates/webcomment_reviews.html
rename to invenio/modules/comments/templates/comments/reviews.html
diff --git a/modules/webcomment/etc/templates/webcomment_subscriptions.html b/invenio/modules/comments/templates/comments/subscriptions.html
similarity index 100%
rename from modules/webcomment/etc/templates/webcomment_subscriptions.html
rename to invenio/modules/comments/templates/comments/subscriptions.html
diff --git a/modules/webcomment/lib/webcomment_unit_tests.py b/invenio/modules/comments/testsuite/test_comments.py
similarity index 100%
rename from modules/webcomment/lib/webcomment_unit_tests.py
rename to invenio/modules/comments/testsuite/test_comments.py
diff --git a/modules/webcomment/lib/webcomment_blueprint.py b/invenio/modules/comments/views.py
similarity index 100%
rename from modules/webcomment/lib/webcomment_blueprint.py
rename to invenio/modules/comments/views.py
diff --git a/modules/bibconvert/etc/entdec-to-latin1.kb b/invenio/modules/converter/converterext/kb/entdec-to-latin1.kb
similarity index 100%
rename from modules/bibconvert/etc/entdec-to-latin1.kb
rename to invenio/modules/converter/converterext/kb/entdec-to-latin1.kb
diff --git a/modules/bibconvert/etc/entdec-to-utf8.kb b/invenio/modules/converter/converterext/kb/entdec-to-utf8.kb
similarity index 100%
rename from modules/bibconvert/etc/entdec-to-utf8.kb
rename to invenio/modules/converter/converterext/kb/entdec-to-utf8.kb
diff --git a/modules/bibconvert/etc/enthex-to-latin1.kb b/invenio/modules/converter/converterext/kb/enthex-to-latin1.kb
similarity index 100%
rename from modules/bibconvert/etc/enthex-to-latin1.kb
rename to invenio/modules/converter/converterext/kb/enthex-to-latin1.kb
diff --git a/modules/bibconvert/etc/enthex-to-utf8.kb b/invenio/modules/converter/converterext/kb/enthex-to-utf8.kb
similarity index 100%
rename from modules/bibconvert/etc/enthex-to-utf8.kb
rename to invenio/modules/converter/converterext/kb/enthex-to-utf8.kb
diff --git a/modules/bibconvert/etc/authorlist2marcxml.xsl b/invenio/modules/converter/converterext/templates/authorlist2marcxml.xsl
similarity index 100%
rename from modules/bibconvert/etc/authorlist2marcxml.xsl
rename to invenio/modules/converter/converterext/templates/authorlist2marcxml.xsl
diff --git a/modules/bibconvert/etc/bibtex2marcxml.cfg b/invenio/modules/converter/converterext/templates/bibtex2marcxml.cfg
similarity index 100%
rename from modules/bibconvert/etc/bibtex2marcxml.cfg
rename to invenio/modules/converter/converterext/templates/bibtex2marcxml.cfg
diff --git a/modules/bibconvert/etc/crossref2marcxml.xsl b/invenio/modules/converter/converterext/templates/crossref2marcxml.xsl
similarity index 100%
rename from modules/bibconvert/etc/crossref2marcxml.xsl
rename to invenio/modules/converter/converterext/templates/crossref2marcxml.xsl
diff --git a/modules/bibconvert/etc/oaiarxiv2marcxml.xsl b/invenio/modules/converter/converterext/templates/oaiarxiv2marcxml.xsl
similarity index 100%
rename from modules/bibconvert/etc/oaiarxiv2marcxml.xsl
rename to invenio/modules/converter/converterext/templates/oaiarxiv2marcxml.xsl
diff --git a/modules/bibconvert/etc/oaidc2marcxml.bfx b/invenio/modules/converter/converterext/templates/oaidc2marcxml.bfx
similarity index 100%
rename from modules/bibconvert/etc/oaidc2marcxml.bfx
rename to invenio/modules/converter/converterext/templates/oaidc2marcxml.bfx
diff --git a/modules/bibconvert/etc/oaidc2marcxml.xsl b/invenio/modules/converter/converterext/templates/oaidc2marcxml.xsl
similarity index 100%
rename from modules/bibconvert/etc/oaidc2marcxml.xsl
rename to invenio/modules/converter/converterext/templates/oaidc2marcxml.xsl
diff --git a/modules/bibconvert/etc/oaidmf2marcxml.xsl b/invenio/modules/converter/converterext/templates/oaidmf2marcxml.xsl
similarity index 100%
rename from modules/bibconvert/etc/oaidmf2marcxml.xsl
rename to invenio/modules/converter/converterext/templates/oaidmf2marcxml.xsl
diff --git a/modules/bibconvert/etc/oaimarc2marcxml.xsl b/invenio/modules/converter/converterext/templates/oaimarc2marcxml.xsl
similarity index 100%
rename from modules/bibconvert/etc/oaimarc2marcxml.xsl
rename to invenio/modules/converter/converterext/templates/oaimarc2marcxml.xsl
diff --git a/modules/bibconvert/lib/bibconvert_unit_tests.py b/invenio/modules/converter/testsuite/test_converter.py
similarity index 100%
rename from modules/bibconvert/lib/bibconvert_unit_tests.py
rename to invenio/modules/converter/testsuite/test_converter.py
diff --git a/modules/miscutil/lib/settings.py b/invenio/modules/dashboard/settings.py
similarity index 100%
rename from modules/miscutil/lib/settings.py
rename to invenio/modules/dashboard/settings.py
diff --git a/modules/websession/lib/dashboard_user_settings.py b/invenio/modules/dashboard/user_settings.py
similarity index 100%
rename from modules/websession/lib/dashboard_user_settings.py
rename to invenio/modules/dashboard/user_settings.py
diff --git a/modules/webauthorprofile/lib/__init__.py b/invenio/modules/deposit/__init__.py
similarity index 100%
rename from modules/webauthorprofile/lib/__init__.py
rename to invenio/modules/deposit/__init__.py
diff --git a/modules/webdeposit/lib/webdeposit_autocomplete_utils.py b/invenio/modules/deposit/autocomplete_utils.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_autocomplete_utils.py
rename to invenio/modules/deposit/autocomplete_utils.py
diff --git a/modules/webdeposit/lib/webdeposit_field.py b/invenio/modules/deposit/field_base.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_field.py
rename to invenio/modules/deposit/field_base.py
diff --git a/modules/webdeposit/lib/webdeposit_field_widgets.py b/invenio/modules/deposit/field_widgets.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_field_widgets.py
rename to invenio/modules/deposit/field_widgets.py
diff --git a/modules/webdeposit/lib/deposition_fields/abstract_field.py b/invenio/modules/deposit/fields/abstract.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/abstract_field.py
rename to invenio/modules/deposit/fields/abstract.py
diff --git a/modules/webdeposit/lib/deposition_fields/author_field.py b/invenio/modules/deposit/fields/author.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/author_field.py
rename to invenio/modules/deposit/fields/author.py
diff --git a/modules/webdeposit/lib/deposition_fields/date_field.py b/invenio/modules/deposit/fields/date.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/date_field.py
rename to invenio/modules/deposit/fields/date.py
diff --git a/modules/webdeposit/lib/deposition_fields/doi_field.py b/invenio/modules/deposit/fields/doi.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/doi_field.py
rename to invenio/modules/deposit/fields/doi.py
diff --git a/modules/webdeposit/lib/deposition_fields/file_upload_field.py b/invenio/modules/deposit/fields/file_upload.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/file_upload_field.py
rename to invenio/modules/deposit/fields/file_upload.py
diff --git a/modules/webdeposit/lib/deposition_fields/issn_field.py b/invenio/modules/deposit/fields/issn.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/issn_field.py
rename to invenio/modules/deposit/fields/issn.py
diff --git a/modules/webdeposit/lib/deposition_fields/journal_field.py b/invenio/modules/deposit/fields/journal.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/journal_field.py
rename to invenio/modules/deposit/fields/journal.py
diff --git a/modules/webdeposit/lib/deposition_fields/keywords_field.py b/invenio/modules/deposit/fields/keywords.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/keywords_field.py
rename to invenio/modules/deposit/fields/keywords.py
diff --git a/modules/webdeposit/lib/deposition_fields/language_field.py b/invenio/modules/deposit/fields/language.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/language_field.py
rename to invenio/modules/deposit/fields/language.py
diff --git a/modules/webdeposit/lib/deposition_fields/notes_field.py b/invenio/modules/deposit/fields/notes.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/notes_field.py
rename to invenio/modules/deposit/fields/notes.py
diff --git a/modules/webdeposit/lib/deposition_fields/pages_number_field.py b/invenio/modules/deposit/fields/pages_number.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/pages_number_field.py
rename to invenio/modules/deposit/fields/pages_number.py
diff --git a/modules/webdeposit/lib/deposition_fields/publisher_field.py b/invenio/modules/deposit/fields/publisher.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/publisher_field.py
rename to invenio/modules/deposit/fields/publisher.py
diff --git a/modules/webdeposit/lib/deposition_fields/record_id_field.py b/invenio/modules/deposit/fields/record_id.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/record_id_field.py
rename to invenio/modules/deposit/fields/record_id.py
diff --git a/modules/webdeposit/lib/deposition_fields/title_field.py b/invenio/modules/deposit/fields/title.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/title_field.py
rename to invenio/modules/deposit/fields/title.py
diff --git a/modules/webdeposit/lib/deposition_fields/wtforms_field.py b/invenio/modules/deposit/fields/wtformsext.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/wtforms_field.py
rename to invenio/modules/deposit/fields/wtformsext.py
diff --git a/modules/webdeposit/lib/webdeposit_filter_utils.py b/invenio/modules/deposit/filter_utils.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_filter_utils.py
rename to invenio/modules/deposit/filter_utils.py
diff --git a/modules/webdeposit/lib/webdeposit_form.py b/invenio/modules/deposit/form.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_form.py
rename to invenio/modules/deposit/form.py
diff --git a/modules/webdeposit/lib/deposition_forms/article_form.py b/invenio/modules/deposit/forms/article.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_forms/article_form.py
rename to invenio/modules/deposit/forms/article.py
diff --git a/modules/webdeposit/lib/deposition_forms/photo_form.py b/invenio/modules/deposit/forms/photo.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_forms/photo_form.py
rename to invenio/modules/deposit/forms/photo.py
diff --git a/modules/webdeposit/lib/deposition_forms/poem_form.py b/invenio/modules/deposit/forms/poem.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_forms/poem_form.py
rename to invenio/modules/deposit/forms/poem.py
diff --git a/modules/webdeposit/lib/deposition_forms/preprint_form.py b/invenio/modules/deposit/forms/preprint.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_forms/preprint_form.py
rename to invenio/modules/deposit/forms/preprint.py
diff --git a/modules/webdeposit/lib/deposition_forms/thesis_form.py b/invenio/modules/deposit/forms/thesis.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_forms/thesis_form.py
rename to invenio/modules/deposit/forms/thesis.py
diff --git a/modules/webdeposit/lib/webdeposit_load_deposition_types.py b/invenio/modules/deposit/loader.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_load_deposition_types.py
rename to invenio/modules/deposit/loader.py
diff --git a/modules/webdeposit/lib/webdeposit_models.py b/invenio/modules/deposit/models.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_models.py
rename to invenio/modules/deposit/models.py
diff --git a/modules/webdeposit/lib/webdeposit_processor_utils.py b/invenio/modules/deposit/processor_utils.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_processor_utils.py
rename to invenio/modules/deposit/processor_utils.py
diff --git a/modules/webdeposit/lib/webdeposit_signals.py b/invenio/modules/deposit/signals.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_signals.py
rename to invenio/modules/deposit/signals.py
diff --git a/modules/webdeposit/lib/webdeposit_form.js b/invenio/modules/deposit/static/js/deposit/form.js
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_form.js
rename to invenio/modules/deposit/static/js/deposit/form.js
diff --git a/modules/webdeposit/lib/webdeposit_templates.js b/invenio/modules/deposit/static/js/deposit/templates.js
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_templates.js
rename to invenio/modules/deposit/static/js/deposit/templates.js
diff --git a/modules/webdeposit/lib/webdeposit_storage.py b/invenio/modules/deposit/storage.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_storage.py
rename to invenio/modules/deposit/storage.py
diff --git a/modules/webdeposit/lib/webdeposit_workflow_tasks.py b/invenio/modules/deposit/tasks.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_workflow_tasks.py
rename to invenio/modules/deposit/tasks.py
diff --git a/modules/webdeposit/etc/templates/webdeposit_completed.html b/invenio/modules/deposit/templates/deposit/completed.html
similarity index 100%
rename from modules/webdeposit/etc/templates/webdeposit_completed.html
rename to invenio/modules/deposit/templates/deposit/completed.html
diff --git a/modules/webdeposit/etc/templates/webdeposit_deposition_type.html b/invenio/modules/deposit/templates/deposit/deposition_type.html
similarity index 100%
rename from modules/webdeposit/etc/templates/webdeposit_deposition_type.html
rename to invenio/modules/deposit/templates/deposit/deposition_type.html
diff --git a/modules/webdeposit/etc/templates/webdeposit_error.html b/invenio/modules/deposit/templates/deposit/error.html
similarity index 100%
rename from modules/webdeposit/etc/templates/webdeposit_error.html
rename to invenio/modules/deposit/templates/deposit/error.html
diff --git a/modules/webdeposit/etc/templates/webdeposit_index.html b/invenio/modules/deposit/templates/deposit/index.html
similarity index 100%
rename from modules/webdeposit/etc/templates/webdeposit_index.html
rename to invenio/modules/deposit/templates/deposit/index.html
diff --git a/modules/webdeposit/etc/templates/webdeposit_myview.html b/invenio/modules/deposit/templates/deposit/myview.html
similarity index 100%
rename from modules/webdeposit/etc/templates/webdeposit_myview.html
rename to invenio/modules/deposit/templates/deposit/myview.html
diff --git a/modules/webdeposit/etc/templates/webdeposit_run.html b/invenio/modules/deposit/templates/deposit/run.html
similarity index 100%
rename from modules/webdeposit/etc/templates/webdeposit_run.html
rename to invenio/modules/deposit/templates/deposit/run.html
diff --git a/modules/webdeposit/etc/templates/webdeposit_run_action_bar.html b/invenio/modules/deposit/templates/deposit/run_action_bar.html
similarity index 100%
rename from modules/webdeposit/etc/templates/webdeposit_run_action_bar.html
rename to invenio/modules/deposit/templates/deposit/run_action_bar.html
diff --git a/modules/webdeposit/etc/templates/webdeposit_run_base.html b/invenio/modules/deposit/templates/deposit/run_base.html
similarity index 100%
rename from modules/webdeposit/etc/templates/webdeposit_run_base.html
rename to invenio/modules/deposit/templates/deposit/run_base.html
diff --git a/modules/webdeposit/etc/templates/webdeposit_run_field.html b/invenio/modules/deposit/templates/deposit/run_field.html
similarity index 100%
rename from modules/webdeposit/etc/templates/webdeposit_run_field.html
rename to invenio/modules/deposit/templates/deposit/run_field.html
diff --git a/modules/webdeposit/etc/templates/webdeposit_run_field_label.html b/invenio/modules/deposit/templates/deposit/run_field_label.html
similarity index 100%
rename from modules/webdeposit/etc/templates/webdeposit_run_field_label.html
rename to invenio/modules/deposit/templates/deposit/run_field_label.html
diff --git a/modules/webdeposit/etc/templates/webdeposit_run_field_subform.html b/invenio/modules/deposit/templates/deposit/run_field_subform.html
similarity index 100%
rename from modules/webdeposit/etc/templates/webdeposit_run_field_subform.html
rename to invenio/modules/deposit/templates/deposit/run_field_subform.html
diff --git a/modules/webdeposit/etc/templates/webdeposit_run_group_end.html b/invenio/modules/deposit/templates/deposit/run_group_end.html
similarity index 100%
rename from modules/webdeposit/etc/templates/webdeposit_run_group_end.html
rename to invenio/modules/deposit/templates/deposit/run_group_end.html
diff --git a/modules/webdeposit/etc/templates/webdeposit_run_group_start.html b/invenio/modules/deposit/templates/deposit/run_group_start.html
similarity index 100%
rename from modules/webdeposit/etc/templates/webdeposit_run_group_start.html
rename to invenio/modules/deposit/templates/deposit/run_group_start.html
diff --git a/modules/webdeposit/etc/templates/webdeposit_widget_plupload.html b/invenio/modules/deposit/templates/deposit/widget_plupload.html
similarity index 100%
rename from modules/webdeposit/etc/templates/webdeposit_widget_plupload.html
rename to invenio/modules/deposit/templates/deposit/widget_plupload.html
diff --git a/modules/webdeposit/lib/webdeposit_form_unit_tests.py b/invenio/modules/deposit/testsuite/test_deposit_form.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_form_unit_tests.py
rename to invenio/modules/deposit/testsuite/test_deposit_form.py
diff --git a/modules/webdeposit/lib/webdeposit_validation_utils.py b/invenio/modules/deposit/validation_utils.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_validation_utils.py
rename to invenio/modules/deposit/validation_utils.py
diff --git a/modules/webdeposit/lib/webdeposit_api_blueprint.py b/invenio/modules/deposit/views/api.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_api_blueprint.py
rename to invenio/modules/deposit/views/api.py
diff --git a/modules/webdeposit/lib/webdeposit_blueprint.py b/invenio/modules/deposit/views/deposit.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_blueprint.py
rename to invenio/modules/deposit/views/deposit.py
diff --git a/modules/webdeposit/lib/__init__.py b/invenio/modules/deposit/workflows/__init__.py
similarity index 100%
rename from modules/webdeposit/lib/__init__.py
rename to invenio/modules/deposit/workflows/__init__.py
diff --git a/modules/webdeposit/lib/deposition_types/article_metadata.py b/invenio/modules/deposit/workflows/article_metadata.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_types/article_metadata.py
rename to invenio/modules/deposit/workflows/article_metadata.py
diff --git a/modules/webdeposit/lib/deposition_types/photo_metadata.py b/invenio/modules/deposit/workflows/photo_metadata.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_types/photo_metadata.py
rename to invenio/modules/deposit/workflows/photo_metadata.py
diff --git a/modules/webdeposit/lib/deposition_types/poetry_metadata.py b/invenio/modules/deposit/workflows/poetry_metadata.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_types/poetry_metadata.py
rename to invenio/modules/deposit/workflows/poetry_metadata.py
diff --git a/modules/webdeposit/lib/deposition_types/preprint_metadata.py b/invenio/modules/deposit/workflows/preprint_metadata.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_types/preprint_metadata.py
rename to invenio/modules/deposit/workflows/preprint_metadata.py
diff --git a/modules/webdeposit/lib/deposition_types/testworkflow_metadata.py b/invenio/modules/deposit/workflows/testworkflow_metadata.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_types/testworkflow_metadata.py
rename to invenio/modules/deposit/workflows/testworkflow_metadata.py
diff --git a/modules/webdeposit/lib/deposition_types/thesis_metadata.py b/invenio/modules/deposit/workflows/thesis_metadata.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_types/thesis_metadata.py
rename to invenio/modules/deposit/workflows/thesis_metadata.py
diff --git a/modules/bibdocfile/lib/bibdocfile_model.py b/invenio/modules/documents/models.py
similarity index 100%
rename from modules/bibdocfile/lib/bibdocfile_model.py
rename to invenio/modules/documents/models.py
diff --git a/modules/bibedit/etc/field_FFT.xml b/invenio/modules/editor/editorext/field_templates/field_FFT.xml
similarity index 100%
rename from modules/bibedit/etc/field_FFT.xml
rename to invenio/modules/editor/editorext/field_templates/field_FFT.xml
diff --git a/modules/bibedit/etc/field_firstauthor.xml b/invenio/modules/editor/editorext/field_templates/field_firstauthor.xml
similarity index 100%
rename from modules/bibedit/etc/field_firstauthor.xml
rename to invenio/modules/editor/editorext/field_templates/field_firstauthor.xml
diff --git a/modules/bibedit/etc/field_reference.xml b/invenio/modules/editor/editorext/field_templates/field_reference.xml
similarity index 100%
rename from modules/bibedit/etc/field_reference.xml
rename to invenio/modules/editor/editorext/field_templates/field_reference.xml
diff --git a/modules/bibedit/etc/record_poem.xml b/invenio/modules/editor/editorext/record_templates/record_poem.xml
similarity index 100%
rename from modules/bibedit/etc/record_poem.xml
rename to invenio/modules/editor/editorext/record_templates/record_poem.xml
diff --git a/modules/bibedit/lib/bibedit.css b/invenio/modules/editor/static/css/editor/base.css
similarity index 100%
rename from modules/bibedit/lib/bibedit.css
rename to invenio/modules/editor/static/css/editor/base.css
diff --git a/modules/bibedit/lib/bibedit_clipboard.js b/invenio/modules/editor/static/js/editor/clipboard.js
similarity index 100%
rename from modules/bibedit/lib/bibedit_clipboard.js
rename to invenio/modules/editor/static/js/editor/clipboard.js
diff --git a/modules/bibedit/lib/bibedit_display.js b/invenio/modules/editor/static/js/editor/display.js
similarity index 100%
rename from modules/bibedit/lib/bibedit_display.js
rename to invenio/modules/editor/static/js/editor/display.js
diff --git a/modules/bibedit/lib/bibedit_engine.js b/invenio/modules/editor/static/js/editor/engine.js
similarity index 100%
rename from modules/bibedit/lib/bibedit_engine.js
rename to invenio/modules/editor/static/js/editor/engine.js
diff --git a/modules/bibedit/lib/bibedit_holdingpen.js b/invenio/modules/editor/static/js/editor/holdingpen.js
similarity index 100%
rename from modules/bibedit/lib/bibedit_holdingpen.js
rename to invenio/modules/editor/static/js/editor/holdingpen.js
diff --git a/modules/bibedit/lib/bibedit_keys.js b/invenio/modules/editor/static/js/editor/keys.js
similarity index 100%
rename from modules/bibedit/lib/bibedit_keys.js
rename to invenio/modules/editor/static/js/editor/keys.js
diff --git a/modules/bibedit/lib/marcxml.js b/invenio/modules/editor/static/js/editor/marcxml.js
similarity index 100%
rename from modules/bibedit/lib/marcxml.js
rename to invenio/modules/editor/static/js/editor/marcxml.js
diff --git a/modules/bibedit/lib/bibedit_menu.js b/invenio/modules/editor/static/js/editor/menu.js
similarity index 100%
rename from modules/bibedit/lib/bibedit_menu.js
rename to invenio/modules/editor/static/js/editor/menu.js
diff --git a/modules/bibedit/lib/bibeditmulti.js b/invenio/modules/editor/static/js/editor/multi.js
similarity index 100%
rename from modules/bibedit/lib/bibeditmulti.js
rename to invenio/modules/editor/static/js/editor/multi.js
diff --git a/modules/bibedit/lib/bibedit_refextract.js b/invenio/modules/editor/static/js/editor/refextract.js
similarity index 100%
rename from modules/bibedit/lib/bibedit_refextract.js
rename to invenio/modules/editor/static/js/editor/refextract.js
diff --git a/modules/bibedit/lib/bibedit_template_interface.js b/invenio/modules/editor/static/js/editor/template_interface.js
similarity index 100%
rename from modules/bibedit/lib/bibedit_template_interface.js
rename to invenio/modules/editor/static/js/editor/template_interface.js
diff --git a/modules/bibedit/lib/bibedit_unit_tests.py b/invenio/modules/editor/testsuite/test_editor.py
similarity index 100%
rename from modules/bibedit/lib/bibedit_unit_tests.py
rename to invenio/modules/editor/testsuite/test_editor.py
diff --git a/modules/bibedit/lib/bibedit_engine_unit_tests.conf b/invenio/modules/editor/testsuite/test_editor_engine.conf
similarity index 100%
rename from modules/bibedit/lib/bibedit_engine_unit_tests.conf
rename to invenio/modules/editor/testsuite/test_editor_engine.conf
diff --git a/modules/bibedit/lib/bibedit_engine_unit_tests.js b/invenio/modules/editor/testsuite/test_editor_engine.js
similarity index 100%
rename from modules/bibedit/lib/bibedit_engine_unit_tests.js
rename to invenio/modules/editor/testsuite/test_editor_engine.js
diff --git a/modules/bibencode/lib/bibencode_batch_engine.py b/invenio/modules/encoder/batch_engine.py
similarity index 100%
rename from modules/bibencode/lib/bibencode_batch_engine.py
rename to invenio/modules/encoder/batch_engine.py
diff --git a/modules/bibencode/etc/batch_template_new_formats.json b/invenio/modules/encoder/batch_template_new_formats.json
similarity index 100%
rename from modules/bibencode/etc/batch_template_new_formats.json
rename to invenio/modules/encoder/batch_template_new_formats.json
diff --git a/modules/bibencode/etc/batch_template_submission.json b/invenio/modules/encoder/batch_template_submission.json
similarity index 100%
rename from modules/bibencode/etc/batch_template_submission.json
rename to invenio/modules/encoder/batch_template_submission.json
diff --git a/modules/bibencode/lib/bibencode_config.py b/invenio/modules/encoder/config.py
similarity index 100%
rename from modules/bibencode/lib/bibencode_config.py
rename to invenio/modules/encoder/config.py
diff --git a/modules/bibencode/lib/bibencode_daemon.py b/invenio/modules/encoder/daemon.py
similarity index 100%
rename from modules/bibencode/lib/bibencode_daemon.py
rename to invenio/modules/encoder/daemon.py
diff --git a/modules/bibencode/lib/bibencode_encode.py b/invenio/modules/encoder/encode.py
similarity index 100%
rename from modules/bibencode/lib/bibencode_encode.py
rename to invenio/modules/encoder/encode.py
diff --git a/modules/bibencode/etc/encoding_profiles.json b/invenio/modules/encoder/encoding_profiles.json
similarity index 100%
rename from modules/bibencode/etc/encoding_profiles.json
rename to invenio/modules/encoder/encoding_profiles.json
diff --git a/modules/bibencode/lib/bibencode_extract.py b/invenio/modules/encoder/extract.py
similarity index 100%
rename from modules/bibencode/lib/bibencode_extract.py
rename to invenio/modules/encoder/extract.py
diff --git a/modules/bibencode/etc/extract_profiles.json b/invenio/modules/encoder/extract_profiles.json
similarity index 100%
rename from modules/bibencode/etc/extract_profiles.json
rename to invenio/modules/encoder/extract_profiles.json
diff --git a/modules/bibencode/lib/bibencode_metadata.py b/invenio/modules/encoder/metadata.py
similarity index 100%
rename from modules/bibencode/lib/bibencode_metadata.py
rename to invenio/modules/encoder/metadata.py
diff --git a/modules/bibencode/etc/pbcore_mappings.json b/invenio/modules/encoder/pbcore_mappings.json
similarity index 100%
rename from modules/bibencode/etc/pbcore_mappings.json
rename to invenio/modules/encoder/pbcore_mappings.json
diff --git a/modules/bibencode/etc/pbcore_to_marc.xsl b/invenio/modules/encoder/pbcore_to_marc.xsl
similarity index 100%
rename from modules/bibencode/etc/pbcore_to_marc.xsl
rename to invenio/modules/encoder/pbcore_to_marc.xsl
diff --git a/modules/bibencode/etc/pbcore_to_marc_nons.xsl b/invenio/modules/encoder/pbcore_to_marc_nons.xsl
similarity index 100%
rename from modules/bibencode/etc/pbcore_to_marc_nons.xsl
rename to invenio/modules/encoder/pbcore_to_marc_nons.xsl
diff --git a/modules/bibencode/lib/bibencode_profiles.py b/invenio/modules/encoder/profiles.py
similarity index 100%
rename from modules/bibencode/lib/bibencode_profiles.py
rename to invenio/modules/encoder/profiles.py
diff --git a/modules/bibencode/bin/bibencode.in b/invenio/modules/encoder/scripts/encoder.py
similarity index 100%
rename from modules/bibencode/bin/bibencode.in
rename to invenio/modules/encoder/scripts/encoder.py
diff --git a/modules/bibencode/lib/bibencode.py b/invenio/modules/encoder/tasks.py
similarity index 100%
rename from modules/bibencode/lib/bibencode.py
rename to invenio/modules/encoder/tasks.py
diff --git a/modules/bibencode/lib/bibencode_tester.py b/invenio/modules/encoder/tester.py
similarity index 100%
rename from modules/bibencode/lib/bibencode_tester.py
rename to invenio/modules/encoder/tester.py
diff --git a/modules/bibencode/lib/bibencode_utils.py b/invenio/modules/encoder/utils.py
similarity index 100%
rename from modules/bibencode/lib/bibencode_utils.py
rename to invenio/modules/encoder/utils.py
diff --git a/modules/bibencode/lib/bibencode_websubmit.js b/invenio/modules/encoder/websubmit.js
similarity index 100%
rename from modules/bibencode/lib/bibencode_websubmit.js
rename to invenio/modules/encoder/websubmit.js
diff --git a/modules/bibencode/lib/bibencode_websubmit.py b/invenio/modules/encoder/websubmit.py
similarity index 100%
rename from modules/bibencode/lib/bibencode_websubmit.py
rename to invenio/modules/encoder/websubmit.py
diff --git a/modules/miscutil/lib/errorlib_model.py b/invenio/modules/error_log/models.py
similarity index 100%
rename from modules/miscutil/lib/errorlib_model.py
rename to invenio/modules/error_log/models.py
diff --git a/modules/bibexport/etc/googlescholar.cfg b/invenio/modules/export/exportext/configurations/googlescholar.cfg
similarity index 100%
rename from modules/bibexport/etc/googlescholar.cfg
rename to invenio/modules/export/exportext/configurations/googlescholar.cfg
diff --git a/modules/bibexport/etc/marcxml.cfg b/invenio/modules/export/exportext/configurations/marcxml.cfg
similarity index 100%
rename from modules/bibexport/etc/marcxml.cfg
rename to invenio/modules/export/exportext/configurations/marcxml.cfg
diff --git a/modules/bibexport/etc/sitemap.cfg b/invenio/modules/export/exportext/configurations/sitemap.cfg
similarity index 100%
rename from modules/bibexport/etc/sitemap.cfg
rename to invenio/modules/export/exportext/configurations/sitemap.cfg
diff --git a/modules/bibexport/lib/bibexport_model.py b/invenio/modules/export/models.py
similarity index 100%
rename from modules/bibexport/lib/bibexport_model.py
rename to invenio/modules/export/models.py
diff --git a/modules/bibexport/lib/bibexport_method_fieldexporter_unit_tests.py b/invenio/modules/export/testsuite/test_export.py
similarity index 100%
rename from modules/bibexport/lib/bibexport_method_fieldexporter_unit_tests.py
rename to invenio/modules/export/testsuite/test_export.py
diff --git a/modules/bibformat/lib/bibformat.py b/invenio/modules/formatter/__init__.py
similarity index 100%
rename from modules/bibformat/lib/bibformat.py
rename to invenio/modules/formatter/__init__.py
diff --git a/modules/bibformat/lib/bibformat_dblayer.py b/invenio/modules/formatter/api.py
similarity index 100%
rename from modules/bibformat/lib/bibformat_dblayer.py
rename to invenio/modules/formatter/api.py
diff --git a/modules/bibformat/lib/bibformat_config.py b/invenio/modules/formatter/config.py
similarity index 100%
rename from modules/bibformat/lib/bibformat_config.py
rename to invenio/modules/formatter/config.py
diff --git a/modules/bibformat/lib/bibformat_engine.py b/invenio/modules/formatter/engine.py
similarity index 100%
rename from modules/bibformat/lib/bibformat_engine.py
rename to invenio/modules/formatter/engine.py
diff --git a/modules/bibformat/lib/bibformat_bfx_engine.py b/invenio/modules/formatter/engines/bfx.py
similarity index 100%
rename from modules/bibformat/lib/bibformat_bfx_engine.py
rename to invenio/modules/formatter/engines/bfx.py
diff --git a/modules/bibformat/lib/bibformat_bfx_engine_config.py b/invenio/modules/formatter/engines/bfx_config.py
similarity index 100%
rename from modules/bibformat/lib/bibformat_bfx_engine_config.py
rename to invenio/modules/formatter/engines/bfx_config.py
diff --git a/modules/bibformat/lib/bibformat_xslt_engine.py b/invenio/modules/formatter/engines/xslt.py
similarity index 100%
rename from modules/bibformat/lib/bibformat_xslt_engine.py
rename to invenio/modules/formatter/engines/xslt.py
diff --git a/modules/bibformat/lib/elements/bfe_abstract.py b/invenio/modules/formatter/format_elements/bfe_abstract.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_abstract.py
rename to invenio/modules/formatter/format_elements/bfe_abstract.py
diff --git a/modules/bibformat/lib/elements/bfe_additional_report_numbers.py b/invenio/modules/formatter/format_elements/bfe_additional_report_numbers.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_additional_report_numbers.py
rename to invenio/modules/formatter/format_elements/bfe_additional_report_numbers.py
diff --git a/modules/bibformat/lib/elements/bfe_addresses.py b/invenio/modules/formatter/format_elements/bfe_addresses.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_addresses.py
rename to invenio/modules/formatter/format_elements/bfe_addresses.py
diff --git a/modules/bibformat/lib/elements/bfe_addthis.py b/invenio/modules/formatter/format_elements/bfe_addthis.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_addthis.py
rename to invenio/modules/formatter/format_elements/bfe_addthis.py
diff --git a/modules/bibformat/lib/elements/bfe_affiliation.py b/invenio/modules/formatter/format_elements/bfe_affiliation.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_affiliation.py
rename to invenio/modules/formatter/format_elements/bfe_affiliation.py
diff --git a/modules/bibformat/lib/elements/bfe_aid_authors.py b/invenio/modules/formatter/format_elements/bfe_aid_authors.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_aid_authors.py
rename to invenio/modules/formatter/format_elements/bfe_aid_authors.py
diff --git a/modules/bibformat/lib/elements/bfe_appears_in_collections.py b/invenio/modules/formatter/format_elements/bfe_appears_in_collections.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_appears_in_collections.py
rename to invenio/modules/formatter/format_elements/bfe_appears_in_collections.py
diff --git a/modules/bibformat/lib/elements/bfe_authority_author.py b/invenio/modules/formatter/format_elements/bfe_authority_author.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_authority_author.py
rename to invenio/modules/formatter/format_elements/bfe_authority_author.py
diff --git a/modules/bibformat/lib/elements/bfe_authority_control_no.py b/invenio/modules/formatter/format_elements/bfe_authority_control_no.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_authority_control_no.py
rename to invenio/modules/formatter/format_elements/bfe_authority_control_no.py
diff --git a/modules/bibformat/lib/elements/bfe_authority_institution.py b/invenio/modules/formatter/format_elements/bfe_authority_institution.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_authority_institution.py
rename to invenio/modules/formatter/format_elements/bfe_authority_institution.py
diff --git a/modules/bibformat/lib/elements/bfe_authority_journal.py b/invenio/modules/formatter/format_elements/bfe_authority_journal.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_authority_journal.py
rename to invenio/modules/formatter/format_elements/bfe_authority_journal.py
diff --git a/modules/bibformat/lib/elements/bfe_authority_subject.py b/invenio/modules/formatter/format_elements/bfe_authority_subject.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_authority_subject.py
rename to invenio/modules/formatter/format_elements/bfe_authority_subject.py
diff --git a/modules/bibformat/lib/elements/bfe_authors.py b/invenio/modules/formatter/format_elements/bfe_authors.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_authors.py
rename to invenio/modules/formatter/format_elements/bfe_authors.py
diff --git a/modules/bibformat/lib/elements/bfe_bfx_engine.py b/invenio/modules/formatter/format_elements/bfe_bfx_engine.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_bfx_engine.py
rename to invenio/modules/formatter/format_elements/bfe_bfx_engine.py
diff --git a/modules/bibformat/lib/elements/bfe_bibtex.py b/invenio/modules/formatter/format_elements/bfe_bibtex.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_bibtex.py
rename to invenio/modules/formatter/format_elements/bfe_bibtex.py
diff --git a/modules/bibformat/lib/elements/bfe_bookmark.py b/invenio/modules/formatter/format_elements/bfe_bookmark.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_bookmark.py
rename to invenio/modules/formatter/format_elements/bfe_bookmark.py
diff --git a/modules/bibformat/lib/elements/bfe_cited_by.py b/invenio/modules/formatter/format_elements/bfe_cited_by.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_cited_by.py
rename to invenio/modules/formatter/format_elements/bfe_cited_by.py
diff --git a/modules/bibformat/lib/elements/bfe_client_info.py b/invenio/modules/formatter/format_elements/bfe_client_info.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_client_info.py
rename to invenio/modules/formatter/format_elements/bfe_client_info.py
diff --git a/modules/bibformat/lib/elements/bfe_collection.py b/invenio/modules/formatter/format_elements/bfe_collection.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_collection.py
rename to invenio/modules/formatter/format_elements/bfe_collection.py
diff --git a/modules/bibformat/lib/elements/bfe_comments.py b/invenio/modules/formatter/format_elements/bfe_comments.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_comments.py
rename to invenio/modules/formatter/format_elements/bfe_comments.py
diff --git a/modules/bibformat/lib/elements/bfe_contact.py b/invenio/modules/formatter/format_elements/bfe_contact.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_contact.py
rename to invenio/modules/formatter/format_elements/bfe_contact.py
diff --git a/modules/bibformat/lib/elements/bfe_copyright.py b/invenio/modules/formatter/format_elements/bfe_copyright.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_copyright.py
rename to invenio/modules/formatter/format_elements/bfe_copyright.py
diff --git a/modules/bibformat/lib/elements/bfe_creation_date.py b/invenio/modules/formatter/format_elements/bfe_creation_date.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_creation_date.py
rename to invenio/modules/formatter/format_elements/bfe_creation_date.py
diff --git a/modules/bibformat/lib/elements/bfe_date.py b/invenio/modules/formatter/format_elements/bfe_date.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_date.py
rename to invenio/modules/formatter/format_elements/bfe_date.py
diff --git a/modules/bibformat/lib/elements/bfe_date_rec.py b/invenio/modules/formatter/format_elements/bfe_date_rec.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_date_rec.py
rename to invenio/modules/formatter/format_elements/bfe_date_rec.py
diff --git a/modules/bibformat/lib/elements/bfe_doi.py b/invenio/modules/formatter/format_elements/bfe_doi.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_doi.py
rename to invenio/modules/formatter/format_elements/bfe_doi.py
diff --git a/modules/bibformat/lib/elements/bfe_duration.py b/invenio/modules/formatter/format_elements/bfe_duration.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_duration.py
rename to invenio/modules/formatter/format_elements/bfe_duration.py
diff --git a/modules/bibformat/lib/elements/bfe_edit_files.py b/invenio/modules/formatter/format_elements/bfe_edit_files.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_edit_files.py
rename to invenio/modules/formatter/format_elements/bfe_edit_files.py
diff --git a/modules/bibformat/lib/elements/bfe_edit_record.py b/invenio/modules/formatter/format_elements/bfe_edit_record.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_edit_record.py
rename to invenio/modules/formatter/format_elements/bfe_edit_record.py
diff --git a/modules/bibformat/lib/elements/bfe_editors.py b/invenio/modules/formatter/format_elements/bfe_editors.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_editors.py
rename to invenio/modules/formatter/format_elements/bfe_editors.py
diff --git a/modules/bibformat/lib/elements/bfe_external_publications.py b/invenio/modules/formatter/format_elements/bfe_external_publications.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_external_publications.py
rename to invenio/modules/formatter/format_elements/bfe_external_publications.py
diff --git a/modules/bibformat/lib/elements/bfe_field.py b/invenio/modules/formatter/format_elements/bfe_field.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_field.py
rename to invenio/modules/formatter/format_elements/bfe_field.py
diff --git a/modules/bibformat/lib/elements/bfe_fulltext.py b/invenio/modules/formatter/format_elements/bfe_fulltext.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_fulltext.py
rename to invenio/modules/formatter/format_elements/bfe_fulltext.py
diff --git a/modules/bibformat/lib/elements/bfe_fulltext_mini.py b/invenio/modules/formatter/format_elements/bfe_fulltext_mini.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_fulltext_mini.py
rename to invenio/modules/formatter/format_elements/bfe_fulltext_mini.py
diff --git a/modules/bibformat/lib/elements/bfe_imprint.py b/invenio/modules/formatter/format_elements/bfe_imprint.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_imprint.py
rename to invenio/modules/formatter/format_elements/bfe_imprint.py
diff --git a/modules/bibformat/lib/elements/bfe_isbn.py b/invenio/modules/formatter/format_elements/bfe_isbn.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_isbn.py
rename to invenio/modules/formatter/format_elements/bfe_isbn.py
diff --git a/modules/bibformat/lib/elements/bfe_issn.py b/invenio/modules/formatter/format_elements/bfe_issn.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_issn.py
rename to invenio/modules/formatter/format_elements/bfe_issn.py
diff --git a/modules/bibformat/lib/elements/bfe_keywords.py b/invenio/modules/formatter/format_elements/bfe_keywords.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_keywords.py
rename to invenio/modules/formatter/format_elements/bfe_keywords.py
diff --git a/modules/bibformat/lib/elements/bfe_language.py b/invenio/modules/formatter/format_elements/bfe_language.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_language.py
rename to invenio/modules/formatter/format_elements/bfe_language.py
diff --git a/modules/bibformat/lib/elements/bfe_meta.py b/invenio/modules/formatter/format_elements/bfe_meta.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_meta.py
rename to invenio/modules/formatter/format_elements/bfe_meta.py
diff --git a/modules/bibformat/lib/elements/bfe_meta_opengraph_image.py b/invenio/modules/formatter/format_elements/bfe_meta_opengraph_image.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_meta_opengraph_image.py
rename to invenio/modules/formatter/format_elements/bfe_meta_opengraph_image.py
diff --git a/modules/bibformat/lib/elements/bfe_meta_opengraph_video.py b/invenio/modules/formatter/format_elements/bfe_meta_opengraph_video.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_meta_opengraph_video.py
rename to invenio/modules/formatter/format_elements/bfe_meta_opengraph_video.py
diff --git a/modules/bibformat/lib/elements/bfe_notes.py b/invenio/modules/formatter/format_elements/bfe_notes.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_notes.py
rename to invenio/modules/formatter/format_elements/bfe_notes.py
diff --git a/modules/bibformat/lib/elements/bfe_oai_marcxml.py b/invenio/modules/formatter/format_elements/bfe_oai_marcxml.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_oai_marcxml.py
rename to invenio/modules/formatter/format_elements/bfe_oai_marcxml.py
diff --git a/modules/bibformat/lib/elements/bfe_pagination.py b/invenio/modules/formatter/format_elements/bfe_pagination.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_pagination.py
rename to invenio/modules/formatter/format_elements/bfe_pagination.py
diff --git a/modules/bibformat/lib/elements/bfe_photo_resources_brief.py b/invenio/modules/formatter/format_elements/bfe_photo_resources_brief.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_photo_resources_brief.py
rename to invenio/modules/formatter/format_elements/bfe_photo_resources_brief.py
diff --git a/modules/bibformat/lib/elements/bfe_photos.py b/invenio/modules/formatter/format_elements/bfe_photos.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_photos.py
rename to invenio/modules/formatter/format_elements/bfe_photos.py
diff --git a/modules/bibformat/lib/elements/bfe_place.py b/invenio/modules/formatter/format_elements/bfe_place.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_place.py
rename to invenio/modules/formatter/format_elements/bfe_place.py
diff --git a/modules/bibformat/lib/elements/bfe_plots.py b/invenio/modules/formatter/format_elements/bfe_plots.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_plots.py
rename to invenio/modules/formatter/format_elements/bfe_plots.py
diff --git a/modules/bibformat/lib/elements/bfe_plots_thumb.py b/invenio/modules/formatter/format_elements/bfe_plots_thumb.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_plots_thumb.py
rename to invenio/modules/formatter/format_elements/bfe_plots_thumb.py
diff --git a/modules/bibformat/lib/elements/bfe_publi_info.py b/invenio/modules/formatter/format_elements/bfe_publi_info.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_publi_info.py
rename to invenio/modules/formatter/format_elements/bfe_publi_info.py
diff --git a/modules/bibformat/lib/elements/bfe_publisher.py b/invenio/modules/formatter/format_elements/bfe_publisher.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_publisher.py
rename to invenio/modules/formatter/format_elements/bfe_publisher.py
diff --git a/modules/bibformat/lib/elements/bfe_qrcode.py b/invenio/modules/formatter/format_elements/bfe_qrcode.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_qrcode.py
rename to invenio/modules/formatter/format_elements/bfe_qrcode.py
diff --git a/modules/bibformat/lib/elements/bfe_record_id.py b/invenio/modules/formatter/format_elements/bfe_record_id.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_record_id.py
rename to invenio/modules/formatter/format_elements/bfe_record_id.py
diff --git a/modules/bibformat/lib/elements/bfe_record_stats.py b/invenio/modules/formatter/format_elements/bfe_record_stats.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_record_stats.py
rename to invenio/modules/formatter/format_elements/bfe_record_stats.py
diff --git a/modules/bibformat/lib/elements/bfe_record_url.py b/invenio/modules/formatter/format_elements/bfe_record_url.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_record_url.py
rename to invenio/modules/formatter/format_elements/bfe_record_url.py
diff --git a/modules/bibformat/lib/elements/bfe_references.py b/invenio/modules/formatter/format_elements/bfe_references.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_references.py
rename to invenio/modules/formatter/format_elements/bfe_references.py
diff --git a/modules/bibformat/lib/elements/bfe_report_numbers.py b/invenio/modules/formatter/format_elements/bfe_report_numbers.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_report_numbers.py
rename to invenio/modules/formatter/format_elements/bfe_report_numbers.py
diff --git a/modules/bibformat/lib/elements/bfe_reprints.py b/invenio/modules/formatter/format_elements/bfe_reprints.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_reprints.py
rename to invenio/modules/formatter/format_elements/bfe_reprints.py
diff --git a/modules/bibformat/lib/elements/bfe_sciencewise.py b/invenio/modules/formatter/format_elements/bfe_sciencewise.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_sciencewise.py
rename to invenio/modules/formatter/format_elements/bfe_sciencewise.py
diff --git a/modules/bibformat/lib/elements/bfe_server_info.py b/invenio/modules/formatter/format_elements/bfe_server_info.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_server_info.py
rename to invenio/modules/formatter/format_elements/bfe_server_info.py
diff --git a/modules/bibformat/lib/elements/bfe_sword_push.py b/invenio/modules/formatter/format_elements/bfe_sword_push.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_sword_push.py
rename to invenio/modules/formatter/format_elements/bfe_sword_push.py
diff --git a/modules/bibformat/lib/elements/bfe_title.py b/invenio/modules/formatter/format_elements/bfe_title.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_title.py
rename to invenio/modules/formatter/format_elements/bfe_title.py
diff --git a/modules/bibformat/lib/elements/bfe_title_brief.py b/invenio/modules/formatter/format_elements/bfe_title_brief.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_title_brief.py
rename to invenio/modules/formatter/format_elements/bfe_title_brief.py
diff --git a/modules/bibformat/lib/elements/bfe_topbanner.py b/invenio/modules/formatter/format_elements/bfe_topbanner.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_topbanner.py
rename to invenio/modules/formatter/format_elements/bfe_topbanner.py
diff --git a/modules/bibformat/lib/elements/bfe_url.py b/invenio/modules/formatter/format_elements/bfe_url.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_url.py
rename to invenio/modules/formatter/format_elements/bfe_url.py
diff --git a/modules/bibformat/lib/elements/bfe_video_bigthumb.py b/invenio/modules/formatter/format_elements/bfe_video_bigthumb.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_video_bigthumb.py
rename to invenio/modules/formatter/format_elements/bfe_video_bigthumb.py
diff --git a/modules/bibformat/lib/elements/bfe_video_platform_downloads.py b/invenio/modules/formatter/format_elements/bfe_video_platform_downloads.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_video_platform_downloads.py
rename to invenio/modules/formatter/format_elements/bfe_video_platform_downloads.py
diff --git a/modules/bibformat/lib/elements/bfe_video_platform_sources.py b/invenio/modules/formatter/format_elements/bfe_video_platform_sources.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_video_platform_sources.py
rename to invenio/modules/formatter/format_elements/bfe_video_platform_sources.py
diff --git a/modules/bibformat/lib/elements/bfe_video_platform_suggestions.py b/invenio/modules/formatter/format_elements/bfe_video_platform_suggestions.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_video_platform_suggestions.py
rename to invenio/modules/formatter/format_elements/bfe_video_platform_suggestions.py
diff --git a/modules/bibformat/lib/elements/bfe_video_selector.py b/invenio/modules/formatter/format_elements/bfe_video_selector.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_video_selector.py
rename to invenio/modules/formatter/format_elements/bfe_video_selector.py
diff --git a/modules/bibformat/lib/elements/bfe_video_sources.py b/invenio/modules/formatter/format_elements/bfe_video_sources.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_video_sources.py
rename to invenio/modules/formatter/format_elements/bfe_video_sources.py
diff --git a/modules/bibformat/lib/elements/bfe_webauthorpage_affiliations.py b/invenio/modules/formatter/format_elements/bfe_webauthorpage_affiliations.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_webauthorpage_affiliations.py
rename to invenio/modules/formatter/format_elements/bfe_webauthorpage_affiliations.py
diff --git a/modules/bibformat/lib/elements/bfe_xml_record.py b/invenio/modules/formatter/format_elements/bfe_xml_record.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_xml_record.py
rename to invenio/modules/formatter/format_elements/bfe_xml_record.py
diff --git a/modules/bibformat/lib/elements/bfe_year.py b/invenio/modules/formatter/format_elements/bfe_year.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_year.py
rename to invenio/modules/formatter/format_elements/bfe_year.py
diff --git a/modules/bibformat/etc/format_templates/AID_HTML_very_brief.bft b/invenio/modules/formatter/format_templates/AID_HTML_very_brief.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/AID_HTML_very_brief.bft
rename to invenio/modules/formatter/format_templates/AID_HTML_very_brief.bft
diff --git a/modules/bibformat/etc/format_templates/Authority_HTML_brief.bft b/invenio/modules/formatter/format_templates/Authority_HTML_brief.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Authority_HTML_brief.bft
rename to invenio/modules/formatter/format_templates/Authority_HTML_brief.bft
diff --git a/modules/bibformat/etc/format_templates/Authority_HTML_detailed.bft b/invenio/modules/formatter/format_templates/Authority_HTML_detailed.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Authority_HTML_detailed.bft
rename to invenio/modules/formatter/format_templates/Authority_HTML_detailed.bft
diff --git a/modules/bibformat/etc/format_templates/Basket_Search_Result.bft b/invenio/modules/formatter/format_templates/Basket_Search_Result.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Basket_Search_Result.bft
rename to invenio/modules/formatter/format_templates/Basket_Search_Result.bft
diff --git a/modules/bibformat/etc/format_templates/BibTeX.bft b/invenio/modules/formatter/format_templates/BibTeX.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/BibTeX.bft
rename to invenio/modules/formatter/format_templates/BibTeX.bft
diff --git a/modules/bibformat/etc/format_templates/DC.xsl b/invenio/modules/formatter/format_templates/DC.xsl
similarity index 100%
rename from modules/bibformat/etc/format_templates/DC.xsl
rename to invenio/modules/formatter/format_templates/DC.xsl
diff --git a/modules/bibformat/etc/format_templates/DataCite.xsl b/invenio/modules/formatter/format_templates/DataCite.xsl
similarity index 100%
rename from modules/bibformat/etc/format_templates/DataCite.xsl
rename to invenio/modules/formatter/format_templates/DataCite.xsl
diff --git a/modules/bibformat/etc/format_templates/Default_HTML_actions.bft b/invenio/modules/formatter/format_templates/Default_HTML_actions.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Default_HTML_actions.bft
rename to invenio/modules/formatter/format_templates/Default_HTML_actions.bft
diff --git a/modules/bibformat/etc/format_templates/Default_HTML_brief.bft b/invenio/modules/formatter/format_templates/Default_HTML_brief.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Default_HTML_brief.bft
rename to invenio/modules/formatter/format_templates/Default_HTML_brief.bft
diff --git a/modules/bibformat/etc/format_templates/Default_HTML_captions.bft b/invenio/modules/formatter/format_templates/Default_HTML_captions.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Default_HTML_captions.bft
rename to invenio/modules/formatter/format_templates/Default_HTML_captions.bft
diff --git a/modules/bibformat/etc/format_templates/Default_HTML_detailed.bft b/invenio/modules/formatter/format_templates/Default_HTML_detailed.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Default_HTML_detailed.bft
rename to invenio/modules/formatter/format_templates/Default_HTML_detailed.bft
diff --git a/modules/bibformat/etc/format_templates/Default_HTML_files.bft b/invenio/modules/formatter/format_templates/Default_HTML_files.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Default_HTML_files.bft
rename to invenio/modules/formatter/format_templates/Default_HTML_files.bft
diff --git a/modules/bibformat/etc/format_templates/Default_HTML_meta.bft b/invenio/modules/formatter/format_templates/Default_HTML_meta.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Default_HTML_meta.bft
rename to invenio/modules/formatter/format_templates/Default_HTML_meta.bft
diff --git a/modules/bibformat/etc/format_templates/Default_HTML_portfolio.bft b/invenio/modules/formatter/format_templates/Default_HTML_portfolio.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Default_HTML_portfolio.bft
rename to invenio/modules/formatter/format_templates/Default_HTML_portfolio.bft
diff --git a/modules/bibformat/etc/format_templates/Default_HTML_references.bft b/invenio/modules/formatter/format_templates/Default_HTML_references.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Default_HTML_references.bft
rename to invenio/modules/formatter/format_templates/Default_HTML_references.bft
diff --git a/modules/bibformat/etc/format_templates/Default_HTML_similarity.bft b/invenio/modules/formatter/format_templates/Default_HTML_similarity.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Default_HTML_similarity.bft
rename to invenio/modules/formatter/format_templates/Default_HTML_similarity.bft
diff --git a/modules/bibformat/etc/format_templates/Default_Mobile_brief.bft b/invenio/modules/formatter/format_templates/Default_Mobile_brief.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Default_Mobile_brief.bft
rename to invenio/modules/formatter/format_templates/Default_Mobile_brief.bft
diff --git a/modules/bibformat/etc/format_templates/Default_Mobile_detailed.bft b/invenio/modules/formatter/format_templates/Default_Mobile_detailed.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Default_Mobile_detailed.bft
rename to invenio/modules/formatter/format_templates/Default_Mobile_detailed.bft
diff --git a/modules/bibformat/etc/format_templates/EndNote.xsl b/invenio/modules/formatter/format_templates/EndNote.xsl
similarity index 100%
rename from modules/bibformat/etc/format_templates/EndNote.xsl
rename to invenio/modules/formatter/format_templates/EndNote.xsl
diff --git a/modules/bibformat/etc/format_templates/Excel.bft b/invenio/modules/formatter/format_templates/Excel.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Excel.bft
rename to invenio/modules/formatter/format_templates/Excel.bft
diff --git a/modules/bibformat/etc/format_templates/Journal_HTML_brief.bft b/invenio/modules/formatter/format_templates/Journal_HTML_brief.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Journal_HTML_brief.bft
rename to invenio/modules/formatter/format_templates/Journal_HTML_brief.bft
diff --git a/modules/bibformat/etc/format_templates/Journal_HTML_detailed.bft b/invenio/modules/formatter/format_templates/Journal_HTML_detailed.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Journal_HTML_detailed.bft
rename to invenio/modules/formatter/format_templates/Journal_HTML_detailed.bft
diff --git a/modules/bibformat/etc/format_templates/MARCXML.bft b/invenio/modules/formatter/format_templates/MARCXML.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/MARCXML.bft
rename to invenio/modules/formatter/format_templates/MARCXML.bft
diff --git a/modules/bibformat/etc/format_templates/MODS.xsl b/invenio/modules/formatter/format_templates/MODS.xsl
similarity index 100%
rename from modules/bibformat/etc/format_templates/MODS.xsl
rename to invenio/modules/formatter/format_templates/MODS.xsl
diff --git a/modules/bibformat/etc/format_templates/NLM.xsl b/invenio/modules/formatter/format_templates/NLM.xsl
similarity index 100%
rename from modules/bibformat/etc/format_templates/NLM.xsl
rename to invenio/modules/formatter/format_templates/NLM.xsl
diff --git a/modules/bibformat/etc/format_templates/OAI_DC.xsl b/invenio/modules/formatter/format_templates/OAI_DC.xsl
similarity index 100%
rename from modules/bibformat/etc/format_templates/OAI_DC.xsl
rename to invenio/modules/formatter/format_templates/OAI_DC.xsl
diff --git a/modules/bibformat/etc/format_templates/OAI_MARC.bft b/invenio/modules/formatter/format_templates/OAI_MARC.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/OAI_MARC.bft
rename to invenio/modules/formatter/format_templates/OAI_MARC.bft
diff --git a/modules/bibformat/etc/format_templates/Picture_HTML_brief.bft b/invenio/modules/formatter/format_templates/Picture_HTML_brief.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Picture_HTML_brief.bft
rename to invenio/modules/formatter/format_templates/Picture_HTML_brief.bft
diff --git a/modules/bibformat/etc/format_templates/Picture_HTML_detailed.bft b/invenio/modules/formatter/format_templates/Picture_HTML_detailed.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Picture_HTML_detailed.bft
rename to invenio/modules/formatter/format_templates/Picture_HTML_detailed.bft
diff --git a/modules/bibformat/etc/format_templates/Podcast.xsl b/invenio/modules/formatter/format_templates/Podcast.xsl
similarity index 100%
rename from modules/bibformat/etc/format_templates/Podcast.xsl
rename to invenio/modules/formatter/format_templates/Podcast.xsl
diff --git a/modules/bibformat/etc/format_templates/Poetry_HTML_brief.bft b/invenio/modules/formatter/format_templates/Poetry_HTML_brief.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Poetry_HTML_brief.bft
rename to invenio/modules/formatter/format_templates/Poetry_HTML_brief.bft
diff --git a/modules/bibformat/etc/format_templates/Poetry_HTML_detailed.bft b/invenio/modules/formatter/format_templates/Poetry_HTML_detailed.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Poetry_HTML_detailed.bft
rename to invenio/modules/formatter/format_templates/Poetry_HTML_detailed.bft
diff --git a/modules/bibformat/etc/format_templates/RSS.xsl b/invenio/modules/formatter/format_templates/RSS.xsl
similarity index 100%
rename from modules/bibformat/etc/format_templates/RSS.xsl
rename to invenio/modules/formatter/format_templates/RSS.xsl
diff --git a/modules/bibformat/etc/format_templates/RefWorks.xsl b/invenio/modules/formatter/format_templates/RefWorks.xsl
similarity index 100%
rename from modules/bibformat/etc/format_templates/RefWorks.xsl
rename to invenio/modules/formatter/format_templates/RefWorks.xsl
diff --git a/modules/bibformat/etc/format_templates/Video_HTML_brief.bft b/invenio/modules/formatter/format_templates/Video_HTML_brief.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Video_HTML_brief.bft
rename to invenio/modules/formatter/format_templates/Video_HTML_brief.bft
diff --git a/modules/bibformat/etc/format_templates/Video_HTML_detailed.bft b/invenio/modules/formatter/format_templates/Video_HTML_detailed.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Video_HTML_detailed.bft
rename to invenio/modules/formatter/format_templates/Video_HTML_detailed.bft
diff --git a/modules/bibformat/etc/format_templates/WebAuthorProfile_affiliations_helper.bft b/invenio/modules/formatter/format_templates/WebAuthorProfile_affiliations_helper.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/WebAuthorProfile_affiliations_helper.bft
rename to invenio/modules/formatter/format_templates/WebAuthorProfile_affiliations_helper.bft
diff --git a/modules/bibformat/lib/bibformat_manager.py b/invenio/modules/formatter/manager.py
similarity index 100%
rename from modules/bibformat/lib/bibformat_manager.py
rename to invenio/modules/formatter/manager.py
diff --git a/modules/bibformat/etc/output_formats/BSR.bfo b/invenio/modules/formatter/output_formats/BSR.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/BSR.bfo
rename to invenio/modules/formatter/output_formats/BSR.bfo
diff --git a/modules/bibformat/etc/output_formats/DCITE.bfo b/invenio/modules/formatter/output_formats/DCITE.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/DCITE.bfo
rename to invenio/modules/formatter/output_formats/DCITE.bfo
diff --git a/modules/bibformat/etc/output_formats/EXCEL.bfo b/invenio/modules/formatter/output_formats/EXCEL.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/EXCEL.bfo
rename to invenio/modules/formatter/output_formats/EXCEL.bfo
diff --git a/modules/bibformat/etc/output_formats/HA.bfo b/invenio/modules/formatter/output_formats/HA.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/HA.bfo
rename to invenio/modules/formatter/output_formats/HA.bfo
diff --git a/modules/bibformat/etc/output_formats/HB.bfo b/invenio/modules/formatter/output_formats/HB.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/HB.bfo
rename to invenio/modules/formatter/output_formats/HB.bfo
diff --git a/modules/bibformat/etc/output_formats/HC.bfo b/invenio/modules/formatter/output_formats/HC.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/HC.bfo
rename to invenio/modules/formatter/output_formats/HC.bfo
diff --git a/modules/bibformat/etc/output_formats/HD.bfo b/invenio/modules/formatter/output_formats/HD.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/HD.bfo
rename to invenio/modules/formatter/output_formats/HD.bfo
diff --git a/modules/bibformat/etc/output_formats/HDACT.bfo b/invenio/modules/formatter/output_formats/HDACT.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/HDACT.bfo
rename to invenio/modules/formatter/output_formats/HDACT.bfo
diff --git a/modules/bibformat/etc/output_formats/HDFILE.bfo b/invenio/modules/formatter/output_formats/HDFILE.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/HDFILE.bfo
rename to invenio/modules/formatter/output_formats/HDFILE.bfo
diff --git a/modules/bibformat/etc/output_formats/HDM.bfo b/invenio/modules/formatter/output_formats/HDM.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/HDM.bfo
rename to invenio/modules/formatter/output_formats/HDM.bfo
diff --git a/modules/bibformat/etc/output_formats/HDREF.bfo b/invenio/modules/formatter/output_formats/HDREF.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/HDREF.bfo
rename to invenio/modules/formatter/output_formats/HDREF.bfo
diff --git a/modules/bibformat/etc/output_formats/HM.bfo b/invenio/modules/formatter/output_formats/HM.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/HM.bfo
rename to invenio/modules/formatter/output_formats/HM.bfo
diff --git a/modules/bibformat/etc/output_formats/HP.bfo b/invenio/modules/formatter/output_formats/HP.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/HP.bfo
rename to invenio/modules/formatter/output_formats/HP.bfo
diff --git a/modules/bibformat/etc/output_formats/HS.bfo b/invenio/modules/formatter/output_formats/HS.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/HS.bfo
rename to invenio/modules/formatter/output_formats/HS.bfo
diff --git a/modules/bibformat/etc/output_formats/HX.bfo b/invenio/modules/formatter/output_formats/HX.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/HX.bfo
rename to invenio/modules/formatter/output_formats/HX.bfo
diff --git a/modules/bibformat/etc/output_formats/MOBB.bfo b/invenio/modules/formatter/output_formats/MOBB.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/MOBB.bfo
rename to invenio/modules/formatter/output_formats/MOBB.bfo
diff --git a/modules/bibformat/etc/output_formats/MOBD.bfo b/invenio/modules/formatter/output_formats/MOBD.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/MOBD.bfo
rename to invenio/modules/formatter/output_formats/MOBD.bfo
diff --git a/modules/bibformat/etc/output_formats/UNTLD.bfo b/invenio/modules/formatter/output_formats/UNTLD.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/UNTLD.bfo
rename to invenio/modules/formatter/output_formats/UNTLD.bfo
diff --git a/modules/bibformat/etc/output_formats/WAPAFF.bfo b/invenio/modules/formatter/output_formats/WAPAFF.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/WAPAFF.bfo
rename to invenio/modules/formatter/output_formats/WAPAFF.bfo
diff --git a/modules/bibformat/etc/output_formats/XD.bfo b/invenio/modules/formatter/output_formats/XD.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/XD.bfo
rename to invenio/modules/formatter/output_formats/XD.bfo
diff --git a/modules/bibformat/etc/output_formats/XE.bfo b/invenio/modules/formatter/output_formats/XE.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/XE.bfo
rename to invenio/modules/formatter/output_formats/XE.bfo
diff --git a/modules/bibformat/etc/output_formats/XE8X.bfo b/invenio/modules/formatter/output_formats/XE8X.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/XE8X.bfo
rename to invenio/modules/formatter/output_formats/XE8X.bfo
diff --git a/modules/bibformat/etc/output_formats/XM.bfo b/invenio/modules/formatter/output_formats/XM.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/XM.bfo
rename to invenio/modules/formatter/output_formats/XM.bfo
diff --git a/modules/bibformat/etc/output_formats/XN.bfo b/invenio/modules/formatter/output_formats/XN.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/XN.bfo
rename to invenio/modules/formatter/output_formats/XN.bfo
diff --git a/modules/bibformat/etc/output_formats/XO.bfo b/invenio/modules/formatter/output_formats/XO.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/XO.bfo
rename to invenio/modules/formatter/output_formats/XO.bfo
diff --git a/modules/bibformat/etc/output_formats/XOAIDC.bfo b/invenio/modules/formatter/output_formats/XOAIDC.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/XOAIDC.bfo
rename to invenio/modules/formatter/output_formats/XOAIDC.bfo
diff --git a/modules/bibformat/etc/output_formats/XOAIMARC.bfo b/invenio/modules/formatter/output_formats/XOAIMARC.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/XOAIMARC.bfo
rename to invenio/modules/formatter/output_formats/XOAIMARC.bfo
diff --git a/modules/bibformat/etc/output_formats/XP.bfo b/invenio/modules/formatter/output_formats/XP.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/XP.bfo
rename to invenio/modules/formatter/output_formats/XP.bfo
diff --git a/modules/bibformat/etc/output_formats/XR.bfo b/invenio/modules/formatter/output_formats/XR.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/XR.bfo
rename to invenio/modules/formatter/output_formats/XR.bfo
diff --git a/modules/bibformat/etc/output_formats/XW.bfo b/invenio/modules/formatter/output_formats/XW.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/XW.bfo
rename to invenio/modules/formatter/output_formats/XW.bfo
diff --git a/modules/bibformat/web/admin/js_quicktags.js b/invenio/modules/formatter/static/js/formatter/quicktags.js
similarity index 100%
rename from modules/bibformat/web/admin/js_quicktags.js
rename to invenio/modules/formatter/static/js/formatter/quicktags.js
diff --git a/modules/bibformat/lib/template_context_functions/tfn_get_back_to_search_links.py b/invenio/modules/formatter/template_context_functions/tfn_get_back_to_search_links.py
similarity index 100%
rename from modules/bibformat/lib/template_context_functions/tfn_get_back_to_search_links.py
rename to invenio/modules/formatter/template_context_functions/tfn_get_back_to_search_links.py
diff --git a/modules/bibformat/lib/template_context_functions/tfn_get_fulltext_snippets.py b/invenio/modules/formatter/template_context_functions/tfn_get_fulltext_snippets.py
similarity index 100%
rename from modules/bibformat/lib/template_context_functions/tfn_get_fulltext_snippets.py
rename to invenio/modules/formatter/template_context_functions/tfn_get_fulltext_snippets.py
diff --git a/modules/bibformat/etc/templates/format_templates/Default_HTML_MARC.tpl b/invenio/modules/formatter/templates/format/record/Default_HTML_MARC.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_templates/Default_HTML_MARC.tpl
rename to invenio/modules/formatter/templates/format/record/Default_HTML_MARC.tpl
diff --git a/modules/bibformat/etc/templates/format_templates/Default_HTML_brief.tpl b/invenio/modules/formatter/templates/format/record/Default_HTML_brief.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_templates/Default_HTML_brief.tpl
rename to invenio/modules/formatter/templates/format/record/Default_HTML_brief.tpl
diff --git a/modules/bibformat/etc/templates/format_templates/Default_HTML_detailed.tpl b/invenio/modules/formatter/templates/format/record/Default_HTML_detailed.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_templates/Default_HTML_detailed.tpl
rename to invenio/modules/formatter/templates/format/record/Default_HTML_detailed.tpl
diff --git a/modules/bibformat/etc/templates/format_templates/Default_Mobile_detailed.tpl b/invenio/modules/formatter/templates/format/record/Default_Mobile_detailed.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_templates/Default_Mobile_detailed.tpl
rename to invenio/modules/formatter/templates/format/record/Default_Mobile_detailed.tpl
diff --git a/modules/bibformat/etc/templates/format_templates/Journal_HTML_brief.tpl b/invenio/modules/formatter/templates/format/record/Journal_HTML_brief.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_templates/Journal_HTML_brief.tpl
rename to invenio/modules/formatter/templates/format/record/Journal_HTML_brief.tpl
diff --git a/modules/bibformat/etc/templates/format_templates/Picture_HTML_brief.tpl b/invenio/modules/formatter/templates/format/record/Picture_HTML_brief.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_templates/Picture_HTML_brief.tpl
rename to invenio/modules/formatter/templates/format/record/Picture_HTML_brief.tpl
diff --git a/modules/bibformat/etc/templates/format_templates/Picture_HTML_detailed.tpl b/invenio/modules/formatter/templates/format/record/Picture_HTML_detailed.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_templates/Picture_HTML_detailed.tpl
rename to invenio/modules/formatter/templates/format/record/Picture_HTML_detailed.tpl
diff --git a/modules/bibformat/etc/templates/format_templates/Poetry_HTML_brief.tpl b/invenio/modules/formatter/templates/format/record/Poetry_HTML_brief.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_templates/Poetry_HTML_brief.tpl
rename to invenio/modules/formatter/templates/format/record/Poetry_HTML_brief.tpl
diff --git a/modules/bibformat/etc/templates/format_templates/Poetry_HTML_detailed.tpl b/invenio/modules/formatter/templates/format/record/Poetry_HTML_detailed.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_templates/Poetry_HTML_detailed.tpl
rename to invenio/modules/formatter/templates/format/record/Poetry_HTML_detailed.tpl
diff --git a/modules/bibformat/etc/templates/format_templates/Video_HTML_brief.tpl b/invenio/modules/formatter/templates/format/record/Video_HTML_brief.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_templates/Video_HTML_brief.tpl
rename to invenio/modules/formatter/templates/format/record/Video_HTML_brief.tpl
diff --git a/modules/bibformat/etc/templates/format_templates/Video_HTML_detailed.tpl b/invenio/modules/formatter/templates/format/record/Video_HTML_detailed.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_templates/Video_HTML_detailed.tpl
rename to invenio/modules/formatter/templates/format/record/Video_HTML_detailed.tpl
diff --git a/modules/bibformat/etc/templates/format_records_hcs.tpl b/invenio/modules/formatter/templates/format/records/hcs.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_records_hcs.tpl
rename to invenio/modules/formatter/templates/format/records/hcs.tpl
diff --git a/modules/bibformat/etc/templates/format_records_id.tpl b/invenio/modules/formatter/templates/format/records/id.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_records_id.tpl
rename to invenio/modules/formatter/templates/format/records/id.tpl
diff --git a/modules/bibformat/etc/templates/format_records_text_html.tpl b/invenio/modules/formatter/templates/format/records/text_html.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_records_text_html.tpl
rename to invenio/modules/formatter/templates/format/records/text_html.tpl
diff --git a/modules/bibformat/etc/templates/format_records_x.tpl b/invenio/modules/formatter/templates/format/records/x.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_records_x.tpl
rename to invenio/modules/formatter/templates/format/records/x.tpl
diff --git a/modules/bibformat/etc/templates/format_records_xd.tpl b/invenio/modules/formatter/templates/format/records/xd.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_records_xd.tpl
rename to invenio/modules/formatter/templates/format/records/xd.tpl
diff --git a/modules/bibformat/etc/templates/format_records_xe.tpl b/invenio/modules/formatter/templates/format/records/xe.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_records_xe.tpl
rename to invenio/modules/formatter/templates/format/records/xe.tpl
diff --git a/modules/bibformat/etc/templates/format_records_xe8x.tpl b/invenio/modules/formatter/templates/format/records/xe8x.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_records_xe8x.tpl
rename to invenio/modules/formatter/templates/format/records/xe8x.tpl
diff --git a/modules/bibformat/etc/templates/format_records_xm.tpl b/invenio/modules/formatter/templates/format/records/xm.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_records_xm.tpl
rename to invenio/modules/formatter/templates/format/records/xm.tpl
diff --git a/modules/bibformat/etc/templates/format_records_xn.tpl b/invenio/modules/formatter/templates/format/records/xn.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_records_xn.tpl
rename to invenio/modules/formatter/templates/format/records/xn.tpl
diff --git a/modules/bibformat/etc/templates/format_records_xo.tpl b/invenio/modules/formatter/templates/format/records/xo.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_records_xo.tpl
rename to invenio/modules/formatter/templates/format/records/xo.tpl
diff --git a/modules/bibformat/etc/templates/format_records_xp.tpl b/invenio/modules/formatter/templates/format/records/xp.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_records_xp.tpl
rename to invenio/modules/formatter/templates/format/records/xp.tpl
diff --git a/modules/bibformat/etc/templates/format_records_xr.tpl b/invenio/modules/formatter/templates/format/records/xr.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_records_xr.tpl
rename to invenio/modules/formatter/templates/format/records/xr.tpl
diff --git a/modules/bibformat/etc/templates/format_records_xw.tpl b/invenio/modules/formatter/templates/format/records/xw.tpl
similarity index 100%
rename from modules/bibformat/etc/templates/format_records_xw.tpl
rename to invenio/modules/formatter/templates/format/records/xw.tpl
diff --git a/modules/bibformat/lib/elements/bfe_test_2.py b/invenio/modules/formatter/testsuite/format_elements/bfe_test_2.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_test_2.py
rename to invenio/modules/formatter/testsuite/format_elements/bfe_test_2.py
diff --git a/modules/bibformat/lib/elements/bfe_test_4.py b/invenio/modules/formatter/testsuite/format_elements/bfe_test_4.py
similarity index 100%
rename from modules/bibformat/lib/elements/bfe_test_4.py
rename to invenio/modules/formatter/testsuite/format_elements/bfe_test_4.py
diff --git a/modules/bibformat/lib/elements/test3.py b/invenio/modules/formatter/testsuite/format_elements/test3.py
similarity index 100%
rename from modules/bibformat/lib/elements/test3.py
rename to invenio/modules/formatter/testsuite/format_elements/test3.py
diff --git a/modules/bibformat/lib/elements/test_1.py b/invenio/modules/formatter/testsuite/format_elements/test_1.py
similarity index 100%
rename from modules/bibformat/lib/elements/test_1.py
rename to invenio/modules/formatter/testsuite/format_elements/test_1.py
diff --git a/modules/bibformat/lib/elements/test_5.py b/invenio/modules/formatter/testsuite/format_elements/test_5.py
similarity index 100%
rename from modules/bibformat/lib/elements/test_5.py
rename to invenio/modules/formatter/testsuite/format_elements/test_5.py
diff --git a/modules/bibformat/lib/elements/test_no_element.test b/invenio/modules/formatter/testsuite/format_elements/test_no_element.test
similarity index 100%
rename from modules/bibformat/lib/elements/test_no_element.test
rename to invenio/modules/formatter/testsuite/format_elements/test_no_element.test
diff --git a/modules/bibformat/etc/format_templates/Test1.bft b/invenio/modules/formatter/testsuite/format_templates/Test1.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Test1.bft
rename to invenio/modules/formatter/testsuite/format_templates/Test1.bft
diff --git a/modules/bibformat/etc/format_templates/Test3.bft b/invenio/modules/formatter/testsuite/format_templates/Test3.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Test3.bft
rename to invenio/modules/formatter/testsuite/format_templates/Test3.bft
diff --git a/modules/bibformat/etc/format_templates/Test_2.bft b/invenio/modules/formatter/testsuite/format_templates/Test_2.bft
similarity index 100%
rename from modules/bibformat/etc/format_templates/Test_2.bft
rename to invenio/modules/formatter/testsuite/format_templates/Test_2.bft
diff --git a/modules/bibformat/etc/format_templates/Test_no_template.test b/invenio/modules/formatter/testsuite/format_templates/Test_no_template.test
similarity index 100%
rename from modules/bibformat/etc/format_templates/Test_no_template.test
rename to invenio/modules/formatter/testsuite/format_templates/Test_no_template.test
diff --git a/modules/bibformat/etc/output_formats/TEST1.bfo b/invenio/modules/formatter/testsuite/output_formats/TEST1.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/TEST1.bfo
rename to invenio/modules/formatter/testsuite/output_formats/TEST1.bfo
diff --git a/modules/bibformat/etc/output_formats/TEST2.bfo b/invenio/modules/formatter/testsuite/output_formats/TEST2.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/TEST2.bfo
rename to invenio/modules/formatter/testsuite/output_formats/TEST2.bfo
diff --git a/modules/bibformat/etc/output_formats/TEST3.bfo b/invenio/modules/formatter/testsuite/output_formats/TEST3.bfo
similarity index 100%
rename from modules/bibformat/etc/output_formats/TEST3.bfo
rename to invenio/modules/formatter/testsuite/output_formats/TEST3.bfo
diff --git a/modules/bibformat/lib/bibformat_engine_unit_tests.py b/invenio/modules/formatter/testsuite/test_formatter_engine.py
similarity index 100%
rename from modules/bibformat/lib/bibformat_engine_unit_tests.py
rename to invenio/modules/formatter/testsuite/test_formatter_engine.py
diff --git a/modules/bibformat/lib/bibformat_utils_unit_tests.py b/invenio/modules/formatter/testsuite/test_formatter_utils.py
similarity index 100%
rename from modules/bibformat/lib/bibformat_utils_unit_tests.py
rename to invenio/modules/formatter/testsuite/test_formatter_utils.py
diff --git a/modules/bibformat/lib/bibformat_utils.py b/invenio/modules/formatter/utils.py
similarity index 100%
rename from modules/bibformat/lib/bibformat_utils.py
rename to invenio/modules/formatter/utils.py
diff --git a/modules/websession/etc/templates/webgroup_index.html b/invenio/modules/groups/templates/groups/index.html
similarity index 100%
rename from modules/websession/etc/templates/webgroup_index.html
rename to invenio/modules/groups/templates/groups/index.html
diff --git a/modules/websession/lib/webgroup_user_settings.py b/invenio/modules/groups/user_settings.py
similarity index 100%
rename from modules/websession/lib/webgroup_user_settings.py
rename to invenio/modules/groups/user_settings.py
diff --git a/modules/websession/lib/webgroup_blueprint.py b/invenio/modules/groups/views.py
similarity index 100%
rename from modules/websession/lib/webgroup_blueprint.py
rename to invenio/modules/groups/views.py
diff --git a/modules/bibindex/lib/bibindex_fixtures.py b/invenio/modules/indexer/fixtures.py
similarity index 100%
rename from modules/bibindex/lib/bibindex_fixtures.py
rename to invenio/modules/indexer/fixtures.py
diff --git a/modules/bibindex/lib/bibindex_model.py b/invenio/modules/indexer/models.py
similarity index 100%
rename from modules/bibindex/lib/bibindex_model.py
rename to invenio/modules/indexer/models.py
diff --git a/modules/bibindex/lib/bibindex_engine_unit_tests.py b/invenio/modules/indexer/testsuite/test_indexer_engine.py
similarity index 100%
rename from modules/bibindex/lib/bibindex_engine_unit_tests.py
rename to invenio/modules/indexer/testsuite/test_indexer_engine.py
diff --git a/modules/bibindex/lib/bibindex_engine_stemmer_unit_tests.py b/invenio/modules/indexer/testsuite/test_indexer_engine_stemmer.py
similarity index 100%
rename from modules/bibindex/lib/bibindex_engine_stemmer_unit_tests.py
rename to invenio/modules/indexer/testsuite/test_indexer_engine_stemmer.py
diff --git a/modules/bibindex/lib/bibindex_engine_tokenizer_unit_tests.py b/invenio/modules/indexer/testsuite/test_indexer_engine_tokenizer.py
similarity index 100%
rename from modules/bibindex/lib/bibindex_engine_tokenizer_unit_tests.py
rename to invenio/modules/indexer/testsuite/test_indexer_engine_tokenizer.py
diff --git a/modules/bibindex/lib/tokenizers/BibIndexAuthorCountTokenizer.py b/invenio/modules/indexer/tokenizers/BibIndexAuthorCountTokenizer.py
similarity index 100%
rename from modules/bibindex/lib/tokenizers/BibIndexAuthorCountTokenizer.py
rename to invenio/modules/indexer/tokenizers/BibIndexAuthorCountTokenizer.py
diff --git a/modules/bibindex/lib/tokenizers/BibIndexAuthorTokenizer.py b/invenio/modules/indexer/tokenizers/BibIndexAuthorTokenizer.py
similarity index 100%
rename from modules/bibindex/lib/tokenizers/BibIndexAuthorTokenizer.py
rename to invenio/modules/indexer/tokenizers/BibIndexAuthorTokenizer.py
diff --git a/modules/bibindex/lib/tokenizers/BibIndexCJKTokenizer.py b/invenio/modules/indexer/tokenizers/BibIndexCJKTokenizer.py
similarity index 100%
rename from modules/bibindex/lib/tokenizers/BibIndexCJKTokenizer.py
rename to invenio/modules/indexer/tokenizers/BibIndexCJKTokenizer.py
diff --git a/modules/bibindex/lib/tokenizers/BibIndexDefaultTokenizer.py b/invenio/modules/indexer/tokenizers/BibIndexDefaultTokenizer.py
similarity index 100%
rename from modules/bibindex/lib/tokenizers/BibIndexDefaultTokenizer.py
rename to invenio/modules/indexer/tokenizers/BibIndexDefaultTokenizer.py
diff --git a/modules/bibindex/lib/tokenizers/BibIndexEmptyTokenizer.py b/invenio/modules/indexer/tokenizers/BibIndexEmptyTokenizer.py
similarity index 100%
rename from modules/bibindex/lib/tokenizers/BibIndexEmptyTokenizer.py
rename to invenio/modules/indexer/tokenizers/BibIndexEmptyTokenizer.py
diff --git a/modules/bibindex/lib/tokenizers/BibIndexExactAuthorTokenizer.py b/invenio/modules/indexer/tokenizers/BibIndexExactAuthorTokenizer.py
similarity index 100%
rename from modules/bibindex/lib/tokenizers/BibIndexExactAuthorTokenizer.py
rename to invenio/modules/indexer/tokenizers/BibIndexExactAuthorTokenizer.py
diff --git a/modules/bibindex/lib/tokenizers/BibIndexFiletypeTokenizer.py b/invenio/modules/indexer/tokenizers/BibIndexFiletypeTokenizer.py
similarity index 100%
rename from modules/bibindex/lib/tokenizers/BibIndexFiletypeTokenizer.py
rename to invenio/modules/indexer/tokenizers/BibIndexFiletypeTokenizer.py
diff --git a/modules/bibindex/lib/tokenizers/BibIndexFulltextTokenizer.py b/invenio/modules/indexer/tokenizers/BibIndexFulltextTokenizer.py
similarity index 100%
rename from modules/bibindex/lib/tokenizers/BibIndexFulltextTokenizer.py
rename to invenio/modules/indexer/tokenizers/BibIndexFulltextTokenizer.py
diff --git a/modules/bibindex/lib/tokenizers/BibIndexItemCountTokenizer.py b/invenio/modules/indexer/tokenizers/BibIndexItemCountTokenizer.py
similarity index 100%
rename from modules/bibindex/lib/tokenizers/BibIndexItemCountTokenizer.py
rename to invenio/modules/indexer/tokenizers/BibIndexItemCountTokenizer.py
diff --git a/modules/bibindex/lib/tokenizers/BibIndexJournalTokenizer.py b/invenio/modules/indexer/tokenizers/BibIndexJournalTokenizer.py
similarity index 100%
rename from modules/bibindex/lib/tokenizers/BibIndexJournalTokenizer.py
rename to invenio/modules/indexer/tokenizers/BibIndexJournalTokenizer.py
diff --git a/modules/bibindex/lib/tokenizers/BibIndexTokenizer.py b/invenio/modules/indexer/tokenizers/BibIndexTokenizer.py
similarity index 100%
rename from modules/bibindex/lib/tokenizers/BibIndexTokenizer.py
rename to invenio/modules/indexer/tokenizers/BibIndexTokenizer.py
diff --git a/modules/bibindex/lib/tokenizers/BibIndexYearTokenizer.py b/invenio/modules/indexer/tokenizers/BibIndexYearTokenizer.py
similarity index 100%
rename from modules/bibindex/lib/tokenizers/BibIndexYearTokenizer.py
rename to invenio/modules/indexer/tokenizers/BibIndexYearTokenizer.py
diff --git a/modules/webdeposit/lib/deposition_fields/__init__.py b/invenio/modules/indexer/tokenizers/__init__.py
similarity index 100%
rename from modules/webdeposit/lib/deposition_fields/__init__.py
rename to invenio/modules/indexer/tokenizers/__init__.py
diff --git a/modules/bibknowledge/lib/bibknowledge.py b/invenio/modules/knowledge/api.py
similarity index 100%
rename from modules/bibknowledge/lib/bibknowledge.py
rename to invenio/modules/knowledge/api.py
diff --git a/modules/bibknowledge/lib/bibknowledge_dblayer.py b/invenio/modules/knowledge/dblayer.py
similarity index 100%
rename from modules/bibknowledge/lib/bibknowledge_dblayer.py
rename to invenio/modules/knowledge/dblayer.py
diff --git a/modules/bibknowledge/lib/bibknowledge_model.py b/invenio/modules/knowledge/models.py
similarity index 100%
rename from modules/bibknowledge/lib/bibknowledge_model.py
rename to invenio/modules/knowledge/models.py
diff --git a/modules/bibknowledge/lib/bibknowledge_unit_tests.py b/invenio/modules/knowledge/testsuite/test_knowledge.py
similarity index 100%
rename from modules/bibknowledge/lib/bibknowledge_unit_tests.py
rename to invenio/modules/knowledge/testsuite/test_knowledge.py
diff --git a/modules/weblinkback/lib/weblinkback_model.py b/invenio/modules/linkbacks/models.py
similarity index 100%
rename from modules/weblinkback/lib/weblinkback_model.py
rename to invenio/modules/linkbacks/models.py
diff --git a/modules/weblinkback/etc/templates/weblinkback_index.html b/invenio/modules/linkbacks/templates/linkbacks/index.html
similarity index 100%
rename from modules/weblinkback/etc/templates/weblinkback_index.html
rename to invenio/modules/linkbacks/templates/linkbacks/index.html
diff --git a/modules/weblinkback/lib/weblinkback_unit_tests.py b/invenio/modules/linkbacks/testsuite/test_linkbacks.py
similarity index 100%
rename from modules/weblinkback/lib/weblinkback_unit_tests.py
rename to invenio/modules/linkbacks/testsuite/test_linkbacks.py
diff --git a/modules/weblinkback/lib/weblinkback_blueprint.py b/invenio/modules/linkbacks/views.py
similarity index 100%
rename from modules/weblinkback/lib/weblinkback_blueprint.py
rename to invenio/modules/linkbacks/views.py
diff --git a/modules/bibmatch/lib/bibmatch_unit_tests.py b/invenio/modules/matcher/testsuite/test_matcher.py
similarity index 100%
rename from modules/bibmatch/lib/bibmatch_unit_tests.py
rename to invenio/modules/matcher/testsuite/test_matcher.py
diff --git a/modules/bibmerge/lib/bibmerge_engine.js b/invenio/modules/merger/static/js/merger/engine.js
similarity index 100%
rename from modules/bibmerge/lib/bibmerge_engine.js
rename to invenio/modules/merger/static/js/merger/engine.js
diff --git a/modules/webmessage/lib/webmessage_config.py b/invenio/modules/messages/config.py
similarity index 100%
rename from modules/webmessage/lib/webmessage_config.py
rename to invenio/modules/messages/config.py
diff --git a/modules/webmessage/lib/webmessage_dblayer.py b/invenio/modules/messages/dblayer.py
similarity index 100%
rename from modules/webmessage/lib/webmessage_dblayer.py
rename to invenio/modules/messages/dblayer.py
diff --git a/modules/webmessage/lib/webmessage_forms.py b/invenio/modules/messages/forms.py
similarity index 100%
rename from modules/webmessage/lib/webmessage_forms.py
rename to invenio/modules/messages/forms.py
diff --git a/modules/webmessage/lib/webmessage_model.py b/invenio/modules/messages/models.py
similarity index 100%
rename from modules/webmessage/lib/webmessage_model.py
rename to invenio/modules/messages/models.py
diff --git a/modules/webmessage/lib/webmessage_query.py b/invenio/modules/messages/query.py
similarity index 100%
rename from modules/webmessage/lib/webmessage_query.py
rename to invenio/modules/messages/query.py
diff --git a/modules/webmessage/etc/templates/webmessage_add.html b/invenio/modules/messages/templates/messages/add.html
similarity index 100%
rename from modules/webmessage/etc/templates/webmessage_add.html
rename to invenio/modules/messages/templates/messages/add.html
diff --git a/modules/webmessage/etc/templates/webmessage_confirm_delete.html b/invenio/modules/messages/templates/messages/confirm_delete.html
similarity index 100%
rename from modules/webmessage/etc/templates/webmessage_confirm_delete.html
rename to invenio/modules/messages/templates/messages/confirm_delete.html
diff --git a/modules/webmessage/etc/templates/webmessage_email_alert.html b/invenio/modules/messages/templates/messages/email_alert.html
similarity index 100%
rename from modules/webmessage/etc/templates/webmessage_email_alert.html
rename to invenio/modules/messages/templates/messages/email_alert.html
diff --git a/modules/webmessage/etc/templates/webmessage_index.html b/invenio/modules/messages/templates/messages/index.html
similarity index 100%
rename from modules/webmessage/etc/templates/webmessage_index.html
rename to invenio/modules/messages/templates/messages/index.html
diff --git a/modules/webmessage/etc/templates/webmessage_menu.html b/invenio/modules/messages/templates/messages/menu.html
similarity index 100%
rename from modules/webmessage/etc/templates/webmessage_menu.html
rename to invenio/modules/messages/templates/messages/menu.html
diff --git a/modules/webmessage/etc/templates/webmessage_view.html b/invenio/modules/messages/templates/messages/view.html
similarity index 100%
rename from modules/webmessage/etc/templates/webmessage_view.html
rename to invenio/modules/messages/templates/messages/view.html
diff --git a/modules/webmessage/lib/webmessage_unit_tests.py b/invenio/modules/messages/testsuite/test_messages.py
similarity index 100%
rename from modules/webmessage/lib/webmessage_unit_tests.py
rename to invenio/modules/messages/testsuite/test_messages.py
diff --git a/modules/webmessage/lib/webmessage_user_settings.py b/invenio/modules/messages/user_settings.py
similarity index 100%
rename from modules/webmessage/lib/webmessage_user_settings.py
rename to invenio/modules/messages/user_settings.py
diff --git a/modules/webmessage/lib/webmessage_blueprint.py b/invenio/modules/messages/views.py
similarity index 100%
rename from modules/webmessage/lib/webmessage_blueprint.py
rename to invenio/modules/messages/views.py
diff --git a/modules/oaiharvest/lib/oai_harvest_model.py b/invenio/modules/oai_harvest/models.py
similarity index 100%
rename from modules/oaiharvest/lib/oai_harvest_model.py
rename to invenio/modules/oai_harvest/models.py
diff --git a/modules/oairepository/etc/oai2.xsl.v1.0 b/invenio/modules/oairepository/static/xsl/oairepository/oai2.xsl.v1.0
similarity index 100%
rename from modules/oairepository/etc/oai2.xsl.v1.0
rename to invenio/modules/oairepository/static/xsl/oairepository/oai2.xsl.v1.0
diff --git a/modules/oairepository/lib/oai_repository_unit_tests.py b/invenio/modules/oairepository/testsuite/test_oairepository.py
similarity index 100%
rename from modules/oairepository/lib/oai_repository_unit_tests.py
rename to invenio/modules/oairepository/testsuite/test_oairepository.py
diff --git a/modules/bibrank/lib/bibrank_fixtures.py b/invenio/modules/rank/fixtures.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_fixtures.py
rename to invenio/modules/rank/fixtures.py
diff --git a/modules/bibrank/lib/bibrank_model.py b/invenio/modules/rank/models.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_model.py
rename to invenio/modules/rank/models.py
diff --git a/modules/bibrank/etc/bibrankgkb_jif_conv.kb b/invenio/modules/rank/rankext/configuration/bibrankgkb_jif_conv.kb
similarity index 100%
rename from modules/bibrank/etc/bibrankgkb_jif_conv.kb
rename to invenio/modules/rank/rankext/configuration/bibrankgkb_jif_conv.kb
diff --git a/modules/bibrank/etc/bibrankgkb_jif_example.kb b/invenio/modules/rank/rankext/configuration/bibrankgkb_jif_example.kb
similarity index 100%
rename from modules/bibrank/etc/bibrankgkb_jif_example.kb
rename to invenio/modules/rank/rankext/configuration/bibrankgkb_jif_example.kb
diff --git a/modules/bibrank/etc/citation.cfg b/invenio/modules/rank/rankext/configuration/citation.cfg
similarity index 100%
rename from modules/bibrank/etc/citation.cfg
rename to invenio/modules/rank/rankext/configuration/citation.cfg
diff --git a/modules/bibrank/etc/citerank_citation_t.cfg b/invenio/modules/rank/rankext/configuration/citerank_citation_t.cfg
similarity index 100%
rename from modules/bibrank/etc/citerank_citation_t.cfg
rename to invenio/modules/rank/rankext/configuration/citerank_citation_t.cfg
diff --git a/modules/bibrank/etc/citerank_pagerank_c.cfg b/invenio/modules/rank/rankext/configuration/citerank_pagerank_c.cfg
similarity index 100%
rename from modules/bibrank/etc/citerank_pagerank_c.cfg
rename to invenio/modules/rank/rankext/configuration/citerank_pagerank_c.cfg
diff --git a/modules/bibrank/etc/citerank_pagerank_t.cfg b/invenio/modules/rank/rankext/configuration/citerank_pagerank_t.cfg
similarity index 100%
rename from modules/bibrank/etc/citerank_pagerank_t.cfg
rename to invenio/modules/rank/rankext/configuration/citerank_pagerank_t.cfg
diff --git a/modules/bibrank/etc/demo_jif.kb b/invenio/modules/rank/rankext/configuration/demo_jif.kb
similarity index 100%
rename from modules/bibrank/etc/demo_jif.kb
rename to invenio/modules/rank/rankext/configuration/demo_jif.kb
diff --git a/modules/bibrank/etc/bibrankgkb.cfg.in b/invenio/modules/rank/rankext/configuration/gkb.cfg
similarity index 100%
rename from modules/bibrank/etc/bibrankgkb.cfg.in
rename to invenio/modules/rank/rankext/configuration/gkb.cfg
diff --git a/modules/bibrank/etc/selfcites.cfg b/invenio/modules/rank/rankext/configuration/selfcites.cfg
similarity index 100%
rename from modules/bibrank/etc/selfcites.cfg
rename to invenio/modules/rank/rankext/configuration/selfcites.cfg
diff --git a/modules/bibrank/etc/stopwords.de.kb b/invenio/modules/rank/rankext/configuration/stopwords.de.kb
similarity index 100%
rename from modules/bibrank/etc/stopwords.de.kb
rename to invenio/modules/rank/rankext/configuration/stopwords.de.kb
diff --git a/modules/bibrank/etc/stopwords.el.kb b/invenio/modules/rank/rankext/configuration/stopwords.el.kb
similarity index 100%
rename from modules/bibrank/etc/stopwords.el.kb
rename to invenio/modules/rank/rankext/configuration/stopwords.el.kb
diff --git a/modules/bibrank/etc/stopwords.kb b/invenio/modules/rank/rankext/configuration/stopwords.kb
similarity index 100%
rename from modules/bibrank/etc/stopwords.kb
rename to invenio/modules/rank/rankext/configuration/stopwords.kb
diff --git a/modules/bibrank/etc/template_citation.cfg b/invenio/modules/rank/rankext/configuration/template_citation.cfg
similarity index 100%
rename from modules/bibrank/etc/template_citation.cfg
rename to invenio/modules/rank/rankext/configuration/template_citation.cfg
diff --git a/modules/bibrank/etc/template_combine_method.cfg b/invenio/modules/rank/rankext/configuration/template_combine_method.cfg
similarity index 100%
rename from modules/bibrank/etc/template_combine_method.cfg
rename to invenio/modules/rank/rankext/configuration/template_combine_method.cfg
diff --git a/modules/bibrank/etc/template_download_similarity.cfg b/invenio/modules/rank/rankext/configuration/template_download_similarity.cfg
similarity index 100%
rename from modules/bibrank/etc/template_download_similarity.cfg
rename to invenio/modules/rank/rankext/configuration/template_download_similarity.cfg
diff --git a/modules/bibrank/etc/template_download_total.cfg b/invenio/modules/rank/rankext/configuration/template_download_total.cfg
similarity index 100%
rename from modules/bibrank/etc/template_download_total.cfg
rename to invenio/modules/rank/rankext/configuration/template_download_total.cfg
diff --git a/modules/bibrank/etc/template_download_users.cfg b/invenio/modules/rank/rankext/configuration/template_download_users.cfg
similarity index 100%
rename from modules/bibrank/etc/template_download_users.cfg
rename to invenio/modules/rank/rankext/configuration/template_download_users.cfg
diff --git a/modules/bibrank/etc/template_index_term_count.cfg b/invenio/modules/rank/rankext/configuration/template_index_term_count.cfg
similarity index 100%
rename from modules/bibrank/etc/template_index_term_count.cfg
rename to invenio/modules/rank/rankext/configuration/template_index_term_count.cfg
diff --git a/modules/bibrank/etc/template_single_tag_rank_method.cfg.in b/invenio/modules/rank/rankext/configuration/template_single_tag_rank_method.cfg
similarity index 100%
rename from modules/bibrank/etc/template_single_tag_rank_method.cfg.in
rename to invenio/modules/rank/rankext/configuration/template_single_tag_rank_method.cfg
diff --git a/modules/bibrank/etc/template_word_similarity.cfg b/invenio/modules/rank/rankext/configuration/template_word_similarity.cfg
similarity index 100%
rename from modules/bibrank/etc/template_word_similarity.cfg
rename to invenio/modules/rank/rankext/configuration/template_word_similarity.cfg
diff --git a/modules/bibrank/etc/template_word_similarity_solr.cfg b/invenio/modules/rank/rankext/configuration/template_word_similarity_solr.cfg
similarity index 100%
rename from modules/bibrank/etc/template_word_similarity_solr.cfg
rename to invenio/modules/rank/rankext/configuration/template_word_similarity_solr.cfg
diff --git a/modules/bibrank/etc/template_word_similarity_xapian.cfg b/invenio/modules/rank/rankext/configuration/template_word_similarity_xapian.cfg
similarity index 100%
rename from modules/bibrank/etc/template_word_similarity_xapian.cfg
rename to invenio/modules/rank/rankext/configuration/template_word_similarity_xapian.cfg
diff --git a/modules/bibrank/etc/wrd.cfg b/invenio/modules/rank/rankext/configuration/wrd.cfg
similarity index 100%
rename from modules/bibrank/etc/wrd.cfg
rename to invenio/modules/rank/rankext/configuration/wrd.cfg
diff --git a/modules/bibrank/lib/bibrank_citation_searcher_unit_tests.py b/invenio/modules/rank/testsuite/test_citation_searcher.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_citation_searcher_unit_tests.py
rename to invenio/modules/rank/testsuite/test_citation_searcher.py
diff --git a/modules/bibrank/lib/bibrank_citerank_indexer_unit_tests.py b/invenio/modules/rank/testsuite/test_citerank_indexer.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_citerank_indexer_unit_tests.py
rename to invenio/modules/rank/testsuite/test_citerank_indexer.py
diff --git a/modules/bibrank/lib/bibrank_downloads_indexer_unit_tests.py b/invenio/modules/rank/testsuite/test_donwloads_indexer.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_downloads_indexer_unit_tests.py
rename to invenio/modules/rank/testsuite/test_donwloads_indexer.py
diff --git a/modules/bibrank/lib/bibrank_record_sorter_unit_tests.py b/invenio/modules/rank/testsuite/test_record_sorter.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_record_sorter_unit_tests.py
rename to invenio/modules/rank/testsuite/test_record_sorter.py
diff --git a/modules/bibrank/lib/bibrank_selfcites_unit_tests.py b/invenio/modules/rank/testsuite/test_selfcites.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_selfcites_unit_tests.py
rename to invenio/modules/rank/testsuite/test_selfcites.py
diff --git a/modules/bibrank/lib/bibrank_tag_based_indexer_unit_tests.py b/invenio/modules/rank/testsuite/test_tag_based_indexer.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_tag_based_indexer_unit_tests.py
rename to invenio/modules/rank/testsuite/test_tag_based_indexer.py
diff --git a/modules/bibedit/lib/bibedit_model.py b/invenio/modules/record_editor/models.py
similarity index 100%
rename from modules/bibedit/lib/bibedit_model.py
rename to invenio/modules/record_editor/models.py
diff --git a/modules/websearch/etc/templates/record_back_to_search_links.html b/invenio/modules/records/templates/records/back_to_search_links.html
similarity index 100%
rename from modules/websearch/etc/templates/record_back_to_search_links.html
rename to invenio/modules/records/templates/records/back_to_search_links.html
diff --git a/modules/websearch/etc/templates/record.html b/invenio/modules/records/templates/records/base.html
similarity index 100%
rename from modules/websearch/etc/templates/record.html
rename to invenio/modules/records/templates/records/base.html
diff --git a/modules/websearch/etc/templates/record_citations.html b/invenio/modules/records/templates/records/citations.html
similarity index 100%
rename from modules/websearch/etc/templates/record_citations.html
rename to invenio/modules/records/templates/records/citations.html
diff --git a/modules/websearch/etc/templates/record_comments.html b/invenio/modules/records/templates/records/comments.html
similarity index 100%
rename from modules/websearch/etc/templates/record_comments.html
rename to invenio/modules/records/templates/records/comments.html
diff --git a/modules/websearch/etc/templates/record_files.html b/invenio/modules/records/templates/records/files.html
similarity index 100%
rename from modules/websearch/etc/templates/record_files.html
rename to invenio/modules/records/templates/records/files.html
diff --git a/modules/websearch/etc/templates/record_keywords.html b/invenio/modules/records/templates/records/keywords.html
similarity index 100%
rename from modules/websearch/etc/templates/record_keywords.html
rename to invenio/modules/records/templates/records/keywords.html
diff --git a/modules/websearch/etc/templates/record_metadata.html b/invenio/modules/records/templates/records/metadata.html
similarity index 100%
rename from modules/websearch/etc/templates/record_metadata.html
rename to invenio/modules/records/templates/records/metadata.html
diff --git a/modules/websearch/etc/templates/record_references.html b/invenio/modules/records/templates/records/references.html
similarity index 100%
rename from modules/websearch/etc/templates/record_references.html
rename to invenio/modules/records/templates/records/references.html
diff --git a/modules/websearch/etc/templates/record_usage.html b/invenio/modules/records/templates/records/usage.html
similarity index 100%
rename from modules/websearch/etc/templates/record_usage.html
rename to invenio/modules/records/templates/records/usage.html
diff --git a/modules/bibfield/lib/bibfield_config_engine_unit_tests.py b/invenio/modules/records/testsuite/deprecated_test_bibfield_config_engine.py
similarity index 100%
rename from modules/bibfield/lib/bibfield_config_engine_unit_tests.py
rename to invenio/modules/records/testsuite/deprecated_test_bibfield_config_engine.py
diff --git a/modules/bibfield/lib/bibfield_utils_unit_tests.py b/invenio/modules/records/testsuite/deprecated_test_bibfield_utils.py
similarity index 100%
rename from modules/bibfield/lib/bibfield_utils_unit_tests.py
rename to invenio/modules/records/testsuite/deprecated_test_bibfield_utils.py
diff --git a/modules/bibrecord/lib/bibrecord_unit_tests.py b/invenio/modules/records/testsuite/test_legacy_record.py
similarity index 100%
rename from modules/bibrecord/lib/bibrecord_unit_tests.py
rename to invenio/modules/records/testsuite/test_legacy_record.py
diff --git a/modules/websearch/lib/record_blueprint.py b/invenio/modules/records/views.py
similarity index 100%
rename from modules/websearch/lib/record_blueprint.py
rename to invenio/modules/records/views.py
diff --git a/modules/webstyle/lib/goto_engine.py b/invenio/modules/redirector/api.py
similarity index 100%
rename from modules/webstyle/lib/goto_engine.py
rename to invenio/modules/redirector/api.py
diff --git a/modules/webstyle/lib/goto_model.py b/invenio/modules/redirector/models.py
similarity index 100%
rename from modules/webstyle/lib/goto_model.py
rename to invenio/modules/redirector/models.py
diff --git a/modules/websearch/lib/facets/__init__.py b/invenio/modules/redirector/redirect_methods/__init__.py
similarity index 100%
rename from modules/websearch/lib/facets/__init__.py
rename to invenio/modules/redirector/redirect_methods/__init__.py
diff --git a/modules/webstyle/lib/goto_plugins/goto_plugin_cern_hr_documents.py b/invenio/modules/redirector/redirect_methods/goto_plugin_cern_hr_documents.py
similarity index 100%
rename from modules/webstyle/lib/goto_plugins/goto_plugin_cern_hr_documents.py
rename to invenio/modules/redirector/redirect_methods/goto_plugin_cern_hr_documents.py
diff --git a/modules/webstyle/lib/goto_plugins/goto_plugin_latest_record.py b/invenio/modules/redirector/redirect_methods/goto_plugin_latest_record.py
similarity index 100%
rename from modules/webstyle/lib/goto_plugins/goto_plugin_latest_record.py
rename to invenio/modules/redirector/redirect_methods/goto_plugin_latest_record.py
diff --git a/modules/webstyle/lib/goto_plugins/goto_plugin_simple.py b/invenio/modules/redirector/redirect_methods/goto_plugin_simple.py
similarity index 100%
rename from modules/webstyle/lib/goto_plugins/goto_plugin_simple.py
rename to invenio/modules/redirector/redirect_methods/goto_plugin_simple.py
diff --git a/modules/docextract/lib/refextract_model.py b/invenio/modules/refextract/models.py
similarity index 100%
rename from modules/docextract/lib/refextract_model.py
rename to invenio/modules/refextract/models.py
diff --git a/modules/bibsched/lib/bibsched_model.py b/invenio/modules/scheduler/models.py
similarity index 100%
rename from modules/bibsched/lib/bibsched_model.py
rename to invenio/modules/scheduler/models.py
diff --git a/modules/bibsched/lib/bibsched.js b/invenio/modules/scheduler/static/js/scheduler/base.js
similarity index 100%
rename from modules/bibsched/lib/bibsched.js
rename to invenio/modules/scheduler/static/js/scheduler/base.js
diff --git a/modules/websearch/lib/websearch_admin_forms.py b/invenio/modules/search/admin_forms.py
similarity index 100%
rename from modules/websearch/lib/websearch_admin_forms.py
rename to invenio/modules/search/admin_forms.py
diff --git a/modules/websearch/lib/websearch_cache.py b/invenio/modules/search/cache.py
similarity index 100%
rename from modules/websearch/lib/websearch_cache.py
rename to invenio/modules/search/cache.py
diff --git a/modules/websearch/lib/search_engine_config.py b/invenio/modules/search/config.py
similarity index 100%
rename from modules/websearch/lib/search_engine_config.py
rename to invenio/modules/search/config.py
diff --git a/modules/websearch/lib/websearch_facet_builders.py b/invenio/modules/search/facet_builders.py
similarity index 100%
rename from modules/websearch/lib/websearch_facet_builders.py
rename to invenio/modules/search/facet_builders.py
diff --git a/modules/websearch/lib/facets/facet_author.py b/invenio/modules/search/facets/facet_author.py
similarity index 100%
rename from modules/websearch/lib/facets/facet_author.py
rename to invenio/modules/search/facets/facet_author.py
diff --git a/modules/websearch/lib/facets/facet_collection.py b/invenio/modules/search/facets/facet_collection.py
similarity index 100%
rename from modules/websearch/lib/facets/facet_collection.py
rename to invenio/modules/search/facets/facet_collection.py
diff --git a/modules/websearch/lib/facets/facet_year.py b/invenio/modules/search/facets/facet_year.py
similarity index 100%
rename from modules/websearch/lib/facets/facet_year.py
rename to invenio/modules/search/facets/facet_year.py
diff --git a/modules/websearch/lib/websearch_fixtures.py b/invenio/modules/search/fixtures.py
similarity index 100%
rename from modules/websearch/lib/websearch_fixtures.py
rename to invenio/modules/search/fixtures.py
diff --git a/modules/websearch/lib/websearch_forms.py b/invenio/modules/search/forms.py
similarity index 100%
rename from modules/websearch/lib/websearch_forms.py
rename to invenio/modules/search/forms.py
diff --git a/modules/websearch/lib/websearch_model.py b/invenio/modules/search/models.py
similarity index 100%
rename from modules/websearch/lib/websearch_model.py
rename to invenio/modules/search/models.py
diff --git a/modules/websearch/lib/websearch_receivers.py b/invenio/modules/search/receivers.py
similarity index 100%
rename from modules/websearch/lib/websearch_receivers.py
rename to invenio/modules/search/receivers.py
diff --git a/modules/websearch/lib/websearch_facet.js b/invenio/modules/search/static/js/search/facet.js
similarity index 100%
rename from modules/websearch/lib/websearch_facet.js
rename to invenio/modules/search/static/js/search/facet.js
diff --git a/modules/websearch/lib/websearch_hotkeys.js b/invenio/modules/search/static/js/search/hotkeys.js
similarity index 100%
rename from modules/websearch/lib/websearch_hotkeys.js
rename to invenio/modules/search/static/js/search/hotkeys.js
diff --git a/modules/websearch/lib/websearch_typeahead.js b/invenio/modules/search/static/js/search/typeahead.js
similarity index 100%
rename from modules/websearch/lib/websearch_typeahead.js
rename to invenio/modules/search/static/js/search/typeahead.js
diff --git a/modules/websearch/lib/template_context_functions/tfn_get_fieldvalues_alephseq_like.py b/invenio/modules/search/template_context_functions/tfn_get_fieldvalues_alephseq_like.py
similarity index 100%
rename from modules/websearch/lib/template_context_functions/tfn_get_fieldvalues_alephseq_like.py
rename to invenio/modules/search/template_context_functions/tfn_get_fieldvalues_alephseq_like.py
diff --git a/modules/websearch/lib/template_context_functions/tfn_summarize_records.py b/invenio/modules/search/template_context_functions/tfn_summarize_records.py
similarity index 100%
rename from modules/websearch/lib/template_context_functions/tfn_summarize_records.py
rename to invenio/modules/search/template_context_functions/tfn_summarize_records.py
diff --git a/modules/websearch/etc/templates/websearch_admin_collection.html b/invenio/modules/search/templates/search/admin_collection.html
similarity index 100%
rename from modules/websearch/etc/templates/websearch_admin_collection.html
rename to invenio/modules/search/templates/search/admin_collection.html
diff --git a/modules/websearch/etc/templates/websearch_admin_helpers.html b/invenio/modules/search/templates/search/admin_helpers.html
similarity index 100%
rename from modules/websearch/etc/templates/websearch_admin_helpers.html
rename to invenio/modules/search/templates/search/admin_helpers.html
diff --git a/modules/websearch/etc/templates/websearch_admin_index.html b/invenio/modules/search/templates/search/admin_index.html
similarity index 100%
rename from modules/websearch/etc/templates/websearch_admin_index.html
rename to invenio/modules/search/templates/search/admin_index.html
diff --git a/modules/websearch/etc/templates/websearch_browse.html b/invenio/modules/search/templates/search/browse.html
similarity index 100%
rename from modules/websearch/etc/templates/websearch_browse.html
rename to invenio/modules/search/templates/search/browse.html
diff --git a/modules/websearch/etc/templates/websearch_helpers.html b/invenio/modules/search/templates/search/helpers.html
similarity index 100%
rename from modules/websearch/etc/templates/websearch_helpers.html
rename to invenio/modules/search/templates/search/helpers.html
diff --git a/modules/websearch/etc/templates/websearch_index.html b/invenio/modules/search/templates/search/index.html
similarity index 100%
rename from modules/websearch/etc/templates/websearch_index.html
rename to invenio/modules/search/templates/search/index.html
diff --git a/modules/websearch/etc/templates/websearch_results.html b/invenio/modules/search/templates/search/results.html
similarity index 100%
rename from modules/websearch/etc/templates/websearch_results.html
rename to invenio/modules/search/templates/search/results.html
diff --git a/modules/websearch/etc/templates/websearch_search.html b/invenio/modules/search/templates/search/search.html
similarity index 100%
rename from modules/websearch/etc/templates/websearch_search.html
rename to invenio/modules/search/templates/search/search.html
diff --git a/modules/websearch/lib/search_engine_unit_tests.py b/invenio/modules/search/testsuite/test_search_engine.py
similarity index 100%
rename from modules/websearch/lib/search_engine_unit_tests.py
rename to invenio/modules/search/testsuite/test_search_engine.py
diff --git a/modules/websearch/lib/search_engine_query_parser_unit_tests.py b/invenio/modules/search/testsuite/test_search_engine_query_parser.py
similarity index 100%
rename from modules/websearch/lib/search_engine_query_parser_unit_tests.py
rename to invenio/modules/search/testsuite/test_search_engine_query_parser.py
diff --git a/modules/websearch/lib/search_engine_summarizer_unit_tests.py b/invenio/modules/search/testsuite/test_search_engine_summarizer.py
similarity index 100%
rename from modules/websearch/lib/search_engine_summarizer_unit_tests.py
rename to invenio/modules/search/testsuite/test_search_engine_summarizer.py
diff --git a/modules/websearch/lib/websearch_external_collections_unit_tests.py b/invenio/modules/search/testsuite/test_search_external_collections.py
similarity index 100%
rename from modules/websearch/lib/websearch_external_collections_unit_tests.py
rename to invenio/modules/search/testsuite/test_search_external_collections.py
diff --git a/modules/websearch/lib/websearch_external_collections_getter_unit_tests.py b/invenio/modules/search/testsuite/test_search_external_collections_getter.py
similarity index 100%
rename from modules/websearch/lib/websearch_external_collections_getter_unit_tests.py
rename to invenio/modules/search/testsuite/test_search_external_collections_getter.py
diff --git a/modules/websearch/lib/websearch_user_settings.py b/invenio/modules/search/user_settings.py
similarity index 100%
rename from modules/websearch/lib/websearch_user_settings.py
rename to invenio/modules/search/user_settings.py
diff --git a/modules/websearch/lib/websearch_admin_blueprint.py b/invenio/modules/search/views/admin.py
similarity index 100%
rename from modules/websearch/lib/websearch_admin_blueprint.py
rename to invenio/modules/search/views/admin.py
diff --git a/modules/websearch/lib/websearch_blueprint.py b/invenio/modules/search/views/search.py
similarity index 100%
rename from modules/websearch/lib/websearch_blueprint.py
rename to invenio/modules/search/views/search.py
diff --git a/modules/miscutil/lib/sequtils.py b/invenio/modules/sequencegenerator/backend.py
similarity index 100%
rename from modules/miscutil/lib/sequtils.py
rename to invenio/modules/sequencegenerator/backend.py
diff --git a/modules/miscutil/lib/sequtils_cnum.py b/invenio/modules/sequencegenerator/cnum.py
similarity index 100%
rename from modules/miscutil/lib/sequtils_cnum.py
rename to invenio/modules/sequencegenerator/cnum.py
diff --git a/modules/miscutil/lib/sequtils_model.py b/invenio/modules/sequencegenerator/models.py
similarity index 100%
rename from modules/miscutil/lib/sequtils_model.py
rename to invenio/modules/sequencegenerator/models.py
diff --git a/modules/bibsort/lib/bibsort_model.py b/invenio/modules/sorter/models.py
similarity index 100%
rename from modules/bibsort/lib/bibsort_model.py
rename to invenio/modules/sorter/models.py
diff --git a/modules/bibsort/lib/bibsort_engine_unit_tests.py b/invenio/modules/sorter/testsuite/test_sorter_engine.py
similarity index 100%
rename from modules/bibsort/lib/bibsort_engine_unit_tests.py
rename to invenio/modules/sorter/testsuite/test_sorter_engine.py
diff --git a/modules/bibsort/lib/bibsort_washer_unit_tests.py b/invenio/modules/sorter/testsuite/test_sorter_washer.py
similarity index 100%
rename from modules/bibsort/lib/bibsort_washer_unit_tests.py
rename to invenio/modules/sorter/testsuite/test_sorter_washer.py
diff --git a/modules/webstat/lib/webstat_model.py b/invenio/modules/statistics/models.py
similarity index 100%
rename from modules/webstat/lib/webstat_model.py
rename to invenio/modules/statistics/models.py
diff --git a/modules/websubmit/lib/websubmit_fixtures.py b/invenio/modules/submit/fixtures.py
similarity index 100%
rename from modules/websubmit/lib/websubmit_fixtures.py
rename to invenio/modules/submit/fixtures.py
diff --git a/modules/websubmit/lib/websubmit_model.py b/invenio/modules/submit/models.py
similarity index 100%
rename from modules/websubmit/lib/websubmit_model.py
rename to invenio/modules/submit/models.py
diff --git a/modules/bibsword/lib/bibsword_fixtures.py b/invenio/modules/sword/fixtures.py
similarity index 100%
rename from modules/bibsword/lib/bibsword_fixtures.py
rename to invenio/modules/sword/fixtures.py
diff --git a/modules/bibsword/lib/bibsword_model.py b/invenio/modules/sword/models.py
similarity index 100%
rename from modules/bibsword/lib/bibsword_model.py
rename to invenio/modules/sword/models.py
diff --git a/modules/miscutil/bin/inveniomanage.in b/invenio/modules/tags/__init__.py
similarity index 100%
rename from modules/miscutil/bin/inveniomanage.in
rename to invenio/modules/tags/__init__.py
diff --git a/modules/webtag/lib/webtag_config.py b/invenio/modules/tags/config.py
similarity index 100%
rename from modules/webtag/lib/webtag_config.py
rename to invenio/modules/tags/config.py
diff --git a/modules/webtag/lib/webtag_forms.py b/invenio/modules/tags/forms.py
similarity index 100%
rename from modules/webtag/lib/webtag_forms.py
rename to invenio/modules/tags/forms.py
diff --git a/modules/webtag/lib/webtag_model.py b/invenio/modules/tags/models.py
similarity index 100%
rename from modules/webtag/lib/webtag_model.py
rename to invenio/modules/tags/models.py
diff --git a/modules/webtag/lib/webtag_editor.js b/invenio/modules/tags/static/js/tags/record_editor.js
similarity index 100%
rename from modules/webtag/lib/webtag_editor.js
rename to invenio/modules/tags/static/js/tags/record_editor.js
diff --git a/modules/webtag/lib/template_context_functions/tfn_webtag_record_tags.py b/invenio/modules/tags/template_context_functions/tfn_webtag_record_tags.py
similarity index 100%
rename from modules/webtag/lib/template_context_functions/tfn_webtag_record_tags.py
rename to invenio/modules/tags/template_context_functions/tfn_webtag_record_tags.py
diff --git a/modules/webtag/etc/templates/webtag_record.html b/invenio/modules/tags/templates/tags/create.html
similarity index 100%
rename from modules/webtag/etc/templates/webtag_record.html
rename to invenio/modules/tags/templates/tags/create.html
diff --git a/modules/webtag/etc/templates/webtag_create_base.html b/invenio/modules/tags/templates/tags/create_base.html
similarity index 100%
rename from modules/webtag/etc/templates/webtag_create_base.html
rename to invenio/modules/tags/templates/tags/create_base.html
diff --git a/modules/webtag/etc/templates/webtag_display_base.html b/invenio/modules/tags/templates/tags/display_base.html
similarity index 100%
rename from modules/webtag/etc/templates/webtag_display_base.html
rename to invenio/modules/tags/templates/tags/display_base.html
diff --git a/modules/webtag/etc/templates/webtag_display_cloud.html b/invenio/modules/tags/templates/tags/display_cloud.html
similarity index 100%
rename from modules/webtag/etc/templates/webtag_display_cloud.html
rename to invenio/modules/tags/templates/tags/display_cloud.html
diff --git a/modules/webtag/etc/templates/webtag_display_cloud_base.html b/invenio/modules/tags/templates/tags/display_cloud_base.html
similarity index 100%
rename from modules/webtag/etc/templates/webtag_display_cloud_base.html
rename to invenio/modules/tags/templates/tags/display_cloud_base.html
diff --git a/modules/webtag/etc/templates/webtag_display.html b/invenio/modules/tags/templates/tags/display_list.html
similarity index 100%
rename from modules/webtag/etc/templates/webtag_display.html
rename to invenio/modules/tags/templates/tags/display_list.html
diff --git a/modules/webtag/etc/templates/webtag_display_list_base.html b/invenio/modules/tags/templates/tags/display_list_base.html
similarity index 100%
rename from modules/webtag/etc/templates/webtag_display_list_base.html
rename to invenio/modules/tags/templates/tags/display_list_base.html
diff --git a/modules/webtag/etc/templates/webtag_editor.html b/invenio/modules/tags/templates/tags/editor.html
similarity index 100%
rename from modules/webtag/etc/templates/webtag_editor.html
rename to invenio/modules/tags/templates/tags/editor.html
diff --git a/modules/webtag/etc/templates/webtag_editor_base.html b/invenio/modules/tags/templates/tags/record_editor_base.html
similarity index 100%
rename from modules/webtag/etc/templates/webtag_editor_base.html
rename to invenio/modules/tags/templates/tags/record_editor_base.html
diff --git a/modules/webtag/etc/templates/webtag_record_base.html b/invenio/modules/tags/templates/tags/record_tags_base.html
similarity index 100%
rename from modules/webtag/etc/templates/webtag_record_base.html
rename to invenio/modules/tags/templates/tags/record_tags_base.html
diff --git a/modules/webtag/etc/templates/webtag_user_settings.html b/invenio/modules/tags/templates/tags/user_settings.html
similarity index 100%
rename from modules/webtag/etc/templates/webtag_user_settings.html
rename to invenio/modules/tags/templates/tags/user_settings.html
diff --git a/modules/webtag/etc/templates/webtag_user_settings_base.html b/invenio/modules/tags/templates/tags/user_settings_base.html
similarity index 100%
rename from modules/webtag/etc/templates/webtag_user_settings_base.html
rename to invenio/modules/tags/templates/tags/user_settings_base.html
diff --git a/modules/webtag/lib/webtag_unit_tests.py b/invenio/modules/tags/testsuite/test_tags.py
similarity index 100%
rename from modules/webtag/lib/webtag_unit_tests.py
rename to invenio/modules/tags/testsuite/test_tags.py
diff --git a/modules/webtag/lib/webtag_user_settings.py b/invenio/modules/tags/user_settings.py
similarity index 100%
rename from modules/webtag/lib/webtag_user_settings.py
rename to invenio/modules/tags/user_settings.py
diff --git a/modules/webtag/etc/templates/webtag_create.html b/invenio/modules/tags/validators.py
similarity index 100%
rename from modules/webtag/etc/templates/webtag_create.html
rename to invenio/modules/tags/validators.py
diff --git a/modules/webtag/lib/webtag_blueprint.py b/invenio/modules/tags/views.py
similarity index 100%
rename from modules/webtag/lib/webtag_blueprint.py
rename to invenio/modules/tags/views.py
diff --git a/modules/docextract/etc/example.pdf b/invenio/modules/textminer/testsuite/data/example.pdf
similarity index 100%
rename from modules/docextract/etc/example.pdf
rename to invenio/modules/textminer/testsuite/data/example.pdf
diff --git a/modules/docextract/etc/example.txt b/invenio/modules/textminer/testsuite/data/example.txt
similarity index 100%
rename from modules/docextract/etc/example.txt
rename to invenio/modules/textminer/testsuite/data/example.txt
diff --git a/modules/docextract/lib/docextract_webinterface_unit_tests.py b/invenio/modules/textminer/testsuite/test_textminer_documents.py
similarity index 100%
rename from modules/docextract/lib/docextract_webinterface_unit_tests.py
rename to invenio/modules/textminer/testsuite/test_textminer_documents.py
diff --git a/modules/docextract/lib/refextract_unit_tests.py b/invenio/modules/textminer/testsuite/test_textminer_references.py
similarity index 100%
rename from modules/docextract/lib/refextract_unit_tests.py
rename to invenio/modules/textminer/testsuite/test_textminer_references.py
diff --git a/modules/docextract/lib/refextract_api_unit_tests.py b/invenio/modules/textminer/testsuite/test_textminer_references_api.py
similarity index 100%
rename from modules/docextract/lib/refextract_api_unit_tests.py
rename to invenio/modules/textminer/testsuite/test_textminer_references_api.py
diff --git a/modules/bibcatalog/lib/bibcatalog_system_email_unit_tests.py b/invenio/modules/tickets/testsuite/test_system_email.py
similarity index 100%
rename from modules/bibcatalog/lib/bibcatalog_system_email_unit_tests.py
rename to invenio/modules/tickets/testsuite/test_system_email.py
diff --git a/modules/bibcatalog/lib/bibcatalog_system_rt_unit_tests.py b/invenio/modules/tickets/testsuite/test_system_rt.py
similarity index 100%
rename from modules/bibcatalog/lib/bibcatalog_system_rt_unit_tests.py
rename to invenio/modules/tickets/testsuite/test_system_rt.py
diff --git a/modules/miscutil/lib/inveniocfg_upgrader.py b/invenio/modules/upgrader/engine.py
similarity index 100%
rename from modules/miscutil/lib/inveniocfg_upgrader.py
rename to invenio/modules/upgrader/engine.py
diff --git a/modules/miscutil/lib/upgrade_manager.py b/invenio/modules/upgrader/manage.py
similarity index 100%
rename from modules/miscutil/lib/upgrade_manager.py
rename to invenio/modules/upgrader/manage.py
diff --git a/modules/miscutil/lib/inveniocfg_upgrader_model.py b/invenio/modules/upgrader/models.py
similarity index 100%
rename from modules/miscutil/lib/inveniocfg_upgrader_model.py
rename to invenio/modules/upgrader/models.py
diff --git a/modules/miscutil/lib/inveniocfg_upgrader_unit_tests.py b/invenio/modules/upgrader/testsuite/test_upgrader.py
similarity index 100%
rename from modules/miscutil/lib/inveniocfg_upgrader_unit_tests.py
rename to invenio/modules/upgrader/testsuite/test_upgrader.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2012_10_29_idxINDEX_new_indexer_column.py b/invenio/modules/upgrader/upgrades/invenio_2012_10_29_idxINDEX_new_indexer_column.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2012_10_29_idxINDEX_new_indexer_column.py
rename to invenio/modules/upgrader/upgrades/invenio_2012_10_29_idxINDEX_new_indexer_column.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2012_10_31_tablesorter_location.py b/invenio/modules/upgrader/upgrades/invenio_2012_10_31_tablesorter_location.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2012_10_31_tablesorter_location.py
rename to invenio/modules/upgrader/upgrades/invenio_2012_10_31_tablesorter_location.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2012_11_01_lower_user_email.py b/invenio/modules/upgrader/upgrades/invenio_2012_11_01_lower_user_email.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2012_11_01_lower_user_email.py
rename to invenio/modules/upgrader/upgrades/invenio_2012_11_01_lower_user_email.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2012_11_04_circulation_and_linkback_updates.py b/invenio/modules/upgrader/upgrades/invenio_2012_11_04_circulation_and_linkback_updates.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2012_11_04_circulation_and_linkback_updates.py
rename to invenio/modules/upgrader/upgrades/invenio_2012_11_04_circulation_and_linkback_updates.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2012_11_07_xtrjob_last_recid.py b/invenio/modules/upgrader/upgrades/invenio_2012_11_07_xtrjob_last_recid.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2012_11_07_xtrjob_last_recid.py
rename to invenio/modules/upgrader/upgrades/invenio_2012_11_07_xtrjob_last_recid.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2012_11_15_bibdocfile_model.py b/invenio/modules/upgrader/upgrades/invenio_2012_11_15_bibdocfile_model.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2012_11_15_bibdocfile_model.py
rename to invenio/modules/upgrader/upgrades/invenio_2012_11_15_bibdocfile_model.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2012_11_15_hstRECORD_marcxml_longblob.py b/invenio/modules/upgrader/upgrades/invenio_2012_11_15_hstRECORD_marcxml_longblob.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2012_11_15_hstRECORD_marcxml_longblob.py
rename to invenio/modules/upgrader/upgrades/invenio_2012_11_15_hstRECORD_marcxml_longblob.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2012_11_21_aiduserinputlog_userid_check.py b/invenio/modules/upgrader/upgrades/invenio_2012_11_21_aiduserinputlog_userid_check.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2012_11_21_aiduserinputlog_userid_check.py
rename to invenio/modules/upgrader/upgrades/invenio_2012_11_21_aiduserinputlog_userid_check.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2012_11_27_new_selfcite_tables.py b/invenio/modules/upgrader/upgrades/invenio_2012_11_27_new_selfcite_tables.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2012_11_27_new_selfcite_tables.py
rename to invenio/modules/upgrader/upgrades/invenio_2012_11_27_new_selfcite_tables.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2012_12_11_new_citation_errors_table.py b/invenio/modules/upgrader/upgrades/invenio_2012_12_11_new_citation_errors_table.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2012_12_11_new_citation_errors_table.py
rename to invenio/modules/upgrader/upgrades/invenio_2012_12_11_new_citation_errors_table.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_01_08_new_goto_table.py b/invenio/modules/upgrader/upgrades/invenio_2013_01_08_new_goto_table.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_01_08_new_goto_table.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_01_08_new_goto_table.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_01_12_bibrec_master_format.py b/invenio/modules/upgrader/upgrades/invenio_2013_01_12_bibrec_master_format.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_01_12_bibrec_master_format.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_01_12_bibrec_master_format.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_02_01_oaiREPOSITORY_last_updated.py b/invenio/modules/upgrader/upgrades/invenio_2013_02_01_oaiREPOSITORY_last_updated.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_02_01_oaiREPOSITORY_last_updated.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_02_01_oaiREPOSITORY_last_updated.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_03_07_crcILLREQUEST_overdue_letter.py b/invenio/modules/upgrader/upgrades/invenio_2013_03_07_crcILLREQUEST_overdue_letter.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_03_07_crcILLREQUEST_overdue_letter.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_03_07_crcILLREQUEST_overdue_letter.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_03_20_idxINDEX_synonym_kb.py b/invenio/modules/upgrader/upgrades/invenio_2013_03_20_idxINDEX_synonym_kb.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_03_20_idxINDEX_synonym_kb.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_03_20_idxINDEX_synonym_kb.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_03_21_idxINDEX_stopwords.py b/invenio/modules/upgrader/upgrades/invenio_2013_03_21_idxINDEX_stopwords.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_03_21_idxINDEX_stopwords.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_03_21_idxINDEX_stopwords.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_03_25_idxINDEX_html_markup.py b/invenio/modules/upgrader/upgrades/invenio_2013_03_25_idxINDEX_html_markup.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_03_25_idxINDEX_html_markup.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_03_25_idxINDEX_html_markup.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_03_28_idxINDEX_tokenizer.py b/invenio/modules/upgrader/upgrades/invenio_2013_03_28_idxINDEX_tokenizer.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_03_28_idxINDEX_tokenizer.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_03_28_idxINDEX_tokenizer.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_03_29_idxINDEX_stopwords_update.py b/invenio/modules/upgrader/upgrades/invenio_2013_03_29_idxINDEX_stopwords_update.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_03_29_idxINDEX_stopwords_update.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_03_29_idxINDEX_stopwords_update.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_06_11_rnkDOWNLOADS_file_format.py b/invenio/modules/upgrader/upgrades/invenio_2013_06_11_rnkDOWNLOADS_file_format.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_06_11_rnkDOWNLOADS_file_format.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_06_11_rnkDOWNLOADS_file_format.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_08_20_bibauthority_updates.py b/invenio/modules/upgrader/upgrades/invenio_2013_08_20_bibauthority_updates.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_08_20_bibauthority_updates.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_08_20_bibauthority_updates.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_08_22_hstRECORD_affected_fields.py b/invenio/modules/upgrader/upgrades/invenio_2013_08_22_hstRECORD_affected_fields.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_08_22_hstRECORD_affected_fields.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_08_22_hstRECORD_affected_fields.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_08_22_new_index_itemcount.py b/invenio/modules/upgrader/upgrades/invenio_2013_08_22_new_index_itemcount.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_08_22_new_index_itemcount.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_08_22_new_index_itemcount.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_09_25_virtual_indexes.py b/invenio/modules/upgrader/upgrades/invenio_2013_09_25_virtual_indexes.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_09_25_virtual_indexes.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_09_25_virtual_indexes.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_09_30_indexer_interface.py b/invenio/modules/upgrader/upgrades/invenio_2013_09_30_indexer_interface.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_09_30_indexer_interface.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_09_30_indexer_interface.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_10_18_crcLIBRARY_type.py b/invenio/modules/upgrader/upgrades/invenio_2013_10_18_crcLIBRARY_type.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_10_18_crcLIBRARY_type.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_10_18_crcLIBRARY_type.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_10_18_new_index_filetype.py b/invenio/modules/upgrader/upgrades/invenio_2013_10_18_new_index_filetype.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_10_18_new_index_filetype.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_10_18_new_index_filetype.py
diff --git a/modules/miscutil/lib/upgrades/invenio_2013_10_25_delete_recjson_cache.py b/invenio/modules/upgrader/upgrades/invenio_2013_10_25_delete_recjson_cache.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_2013_10_25_delete_recjson_cache.py
rename to invenio/modules/upgrader/upgrades/invenio_2013_10_25_delete_recjson_cache.py
diff --git a/modules/miscutil/lib/upgrades/invenio_release_1_1_0.py b/invenio/modules/upgrader/upgrades/invenio_release_1_1_0.py
similarity index 100%
rename from modules/miscutil/lib/upgrades/invenio_release_1_1_0.py
rename to invenio/modules/upgrader/upgrades/invenio_release_1_1_0.py
diff --git a/modules/bibupload/lib/bibupload_model.py b/invenio/modules/uploader/models.py
similarity index 100%
rename from modules/bibupload/lib/bibupload_model.py
rename to invenio/modules/uploader/models.py
diff --git a/modules/bibupload/lib/batchuploader.js b/invenio/modules/uploader/static/js/uploader/batchuploader.js
similarity index 100%
rename from modules/bibupload/lib/batchuploader.js
rename to invenio/modules/uploader/static/js/uploader/batchuploader.js
diff --git a/modules/websearch/etc/templates/websearch_collection.html b/invenio/modules/workflows/__init__.py
similarity index 100%
rename from modules/websearch/etc/templates/websearch_collection.html
rename to invenio/modules/workflows/__init__.py
diff --git a/modules/bibworkflow/lib/bibworkflow_api.py b/invenio/modules/workflows/api.py
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_api.py
rename to invenio/modules/workflows/api.py
diff --git a/modules/bibworkflow/lib/bibworkflow_client.py b/invenio/modules/workflows/client.py
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_client.py
rename to invenio/modules/workflows/client.py
diff --git a/modules/bibworkflow/lib/bibworkflow_config.py b/invenio/modules/workflows/config.py
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_config.py
rename to invenio/modules/workflows/config.py
diff --git a/modules/bibworkflow/lib/bibworkflow_engine.py b/invenio/modules/workflows/engine.py
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_engine.py
rename to invenio/modules/workflows/engine.py
diff --git a/modules/bibworkflow/lib/bibworkflow_hp_field_widgets.py b/invenio/modules/workflows/hp_field_widgets.py
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_hp_field_widgets.py
rename to invenio/modules/workflows/hp_field_widgets.py
diff --git a/modules/bibworkflow/lib/bibworkflow_load_workflows.py b/invenio/modules/workflows/loader.py
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_load_workflows.py
rename to invenio/modules/workflows/loader.py
diff --git a/modules/bibworkflow/lib/bibworkflow_model.py b/invenio/modules/workflows/models.py
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_model.py
rename to invenio/modules/workflows/models.py
diff --git a/modules/bibworkflow/web/DT_bootstrap.css b/invenio/modules/workflows/static/css/workflows/DT_bootstrap.css
similarity index 100%
rename from modules/bibworkflow/web/DT_bootstrap.css
rename to invenio/modules/workflows/static/css/workflows/DT_bootstrap.css
diff --git a/modules/bibworkflow/web/bibworkflow_style.css b/invenio/modules/workflows/static/css/workflows/style.css
similarity index 100%
rename from modules/bibworkflow/web/bibworkflow_style.css
rename to invenio/modules/workflows/static/css/workflows/style.css
diff --git a/modules/bibworkflow/web/DT_bootstrap.js b/invenio/modules/workflows/static/js/workflows/DT_bootstrap.js
similarity index 100%
rename from modules/bibworkflow/web/DT_bootstrap.js
rename to invenio/modules/workflows/static/js/workflows/DT_bootstrap.js
diff --git a/modules/bibworkflow/lib/bibworkflow_entry_details.js b/invenio/modules/workflows/static/js/workflows/entry_details.js
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_entry_details.js
rename to invenio/modules/workflows/static/js/workflows/entry_details.js
diff --git a/modules/bibworkflow/lib/bibworkflow_hp_details.js b/invenio/modules/workflows/static/js/workflows/hp_details.js
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_hp_details.js
rename to invenio/modules/workflows/static/js/workflows/hp_details.js
diff --git a/modules/bibworkflow/lib/bibworkflow_hp_index.js b/invenio/modules/workflows/static/js/workflows/hp_index.js
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_hp_index.js
rename to invenio/modules/workflows/static/js/workflows/hp_index.js
diff --git a/modules/bibworkflow/lib/bibworkflow_index.js b/invenio/modules/workflows/static/js/workflows/index.js
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_index.js
rename to invenio/modules/workflows/static/js/workflows/index.js
diff --git a/modules/bibworkflow/lib/widgets/approval_widget.js b/invenio/modules/workflows/static/js/workflows/widgets/approval.js
similarity index 100%
rename from modules/bibworkflow/lib/widgets/approval_widget.js
rename to invenio/modules/workflows/static/js/workflows/widgets/approval.js
diff --git a/modules/bibworkflow/lib/bibworkflow_workflows.js b/invenio/modules/workflows/static/js/workflows/workflows.js
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_workflows.js
rename to invenio/modules/workflows/static/js/workflows/workflows.js
diff --git a/modules/webstyle/lib/goto_plugins/__init__.py b/invenio/modules/workflows/tasks/__init__.py
similarity index 100%
rename from modules/webstyle/lib/goto_plugins/__init__.py
rename to invenio/modules/workflows/tasks/__init__.py
diff --git a/modules/bibworkflow/lib/tasks/marcxml_tasks.py b/invenio/modules/workflows/tasks/marcxml_tasks.py
similarity index 100%
rename from modules/bibworkflow/lib/tasks/marcxml_tasks.py
rename to invenio/modules/workflows/tasks/marcxml_tasks.py
diff --git a/modules/bibworkflow/lib/tasks/my_tasks.py b/invenio/modules/workflows/tasks/sample_tasks.py
similarity index 100%
rename from modules/bibworkflow/lib/tasks/my_tasks.py
rename to invenio/modules/workflows/tasks/sample_tasks.py
diff --git a/modules/bibworkflow/lib/tasks/simplified_data_tasks.py b/invenio/modules/workflows/tasks/simplified_data_tasks.py
similarity index 100%
rename from modules/bibworkflow/lib/tasks/simplified_data_tasks.py
rename to invenio/modules/workflows/tasks/simplified_data_tasks.py
diff --git a/modules/bibworkflow/lib/tasks/test_tasks.py b/invenio/modules/workflows/tasks/test_tasks.py
similarity index 100%
rename from modules/bibworkflow/lib/tasks/test_tasks.py
rename to invenio/modules/workflows/tasks/test_tasks.py
diff --git a/modules/bibworkflow/etc/templates/bibworkflow_entry_details.html b/invenio/modules/workflows/templates/workflows/entry_details.html
similarity index 100%
rename from modules/bibworkflow/etc/templates/bibworkflow_entry_details.html
rename to invenio/modules/workflows/templates/workflows/entry_details.html
diff --git a/modules/bibworkflow/etc/templates/bibworkflow_hp_approval_widget.html b/invenio/modules/workflows/templates/workflows/hp_approval_widget.html
similarity index 100%
rename from modules/bibworkflow/etc/templates/bibworkflow_hp_approval_widget.html
rename to invenio/modules/workflows/templates/workflows/hp_approval_widget.html
diff --git a/modules/bibworkflow/etc/templates/bibworkflow_hp_bibmatch_widget.html b/invenio/modules/workflows/templates/workflows/hp_bibmatch_widget.html
similarity index 100%
rename from modules/bibworkflow/etc/templates/bibworkflow_hp_bibmatch_widget.html
rename to invenio/modules/workflows/templates/workflows/hp_bibmatch_widget.html
diff --git a/modules/bibworkflow/etc/templates/bibworkflow_hp_details.html b/invenio/modules/workflows/templates/workflows/hp_details.html
similarity index 100%
rename from modules/bibworkflow/etc/templates/bibworkflow_hp_details.html
rename to invenio/modules/workflows/templates/workflows/hp_details.html
diff --git a/modules/bibworkflow/etc/templates/bibworkflow_hp_index.html b/invenio/modules/workflows/templates/workflows/hp_index.html
similarity index 100%
rename from modules/bibworkflow/etc/templates/bibworkflow_hp_index.html
rename to invenio/modules/workflows/templates/workflows/hp_index.html
diff --git a/modules/bibworkflow/etc/templates/bibworkflow_hp_layout.html b/invenio/modules/workflows/templates/workflows/hp_layout.html
similarity index 100%
rename from modules/bibworkflow/etc/templates/bibworkflow_hp_layout.html
rename to invenio/modules/workflows/templates/workflows/hp_layout.html
diff --git a/modules/bibworkflow/etc/templates/bibworkflow_hp_utils.html b/invenio/modules/workflows/templates/workflows/hp_utils.html
similarity index 100%
rename from modules/bibworkflow/etc/templates/bibworkflow_hp_utils.html
rename to invenio/modules/workflows/templates/workflows/hp_utils.html
diff --git a/modules/bibworkflow/etc/templates/bibworkflow_index.html b/invenio/modules/workflows/templates/workflows/index.html
similarity index 100%
rename from modules/bibworkflow/etc/templates/bibworkflow_index.html
rename to invenio/modules/workflows/templates/workflows/index.html
diff --git a/modules/bibworkflow/etc/templates/bibworkflow_layout.html b/invenio/modules/workflows/templates/workflows/layout.html
similarity index 100%
rename from modules/bibworkflow/etc/templates/bibworkflow_layout.html
rename to invenio/modules/workflows/templates/workflows/layout.html
diff --git a/modules/bibworkflow/etc/templates/bibworkflow_layout_workflow_details.html b/invenio/modules/workflows/templates/workflows/layout_workflow_details.html
similarity index 100%
rename from modules/bibworkflow/etc/templates/bibworkflow_layout_workflow_details.html
rename to invenio/modules/workflows/templates/workflows/layout_workflow_details.html
diff --git a/modules/bibworkflow/etc/templates/bibworkflow_utils.html b/invenio/modules/workflows/templates/workflows/utils.html
similarity index 100%
rename from modules/bibworkflow/etc/templates/bibworkflow_utils.html
rename to invenio/modules/workflows/templates/workflows/utils.html
diff --git a/modules/bibworkflow/etc/templates/bibworkflow_workflow_details.html b/invenio/modules/workflows/templates/workflows/workflow_details.html
similarity index 100%
rename from modules/bibworkflow/etc/templates/bibworkflow_workflow_details.html
rename to invenio/modules/workflows/templates/workflows/workflow_details.html
diff --git a/modules/bibworkflow/etc/templates/bibworkflow_workflows.html b/invenio/modules/workflows/templates/workflows/workflows.html
similarity index 100%
rename from modules/bibworkflow/etc/templates/bibworkflow_workflows.html
rename to invenio/modules/workflows/templates/workflows/workflows.html
diff --git a/modules/bibworkflow/lib/bibworkflow_utils.py b/invenio/modules/workflows/utils.py
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_utils.py
rename to invenio/modules/workflows/utils.py
diff --git a/modules/bibworkflow/lib/bibworkflow_admin_blueprint.py b/invenio/modules/workflows/views/admin.py
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_admin_blueprint.py
rename to invenio/modules/workflows/views/admin.py
diff --git a/modules/bibworkflow/lib/bibworkflow_hp_blueprint.py b/invenio/modules/workflows/views/holdingpen.py
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_hp_blueprint.py
rename to invenio/modules/workflows/views/holdingpen.py
diff --git a/modules/bibworkflow/lib/widgets/approval_widget.py b/invenio/modules/workflows/widgets/approval_widget.py
similarity index 100%
rename from modules/bibworkflow/lib/widgets/approval_widget.py
rename to invenio/modules/workflows/widgets/approval_widget.py
diff --git a/modules/bibworkflow/lib/widgets/bibmatch_widget.py b/invenio/modules/workflows/widgets/bibmatch_widget.py
similarity index 100%
rename from modules/bibworkflow/lib/widgets/bibmatch_widget.py
rename to invenio/modules/workflows/widgets/bibmatch_widget.py
diff --git a/modules/bibworkflow/lib/bibworkflow_worker_engine.py b/invenio/modules/workflows/worker_engine.py
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_worker_engine.py
rename to invenio/modules/workflows/worker_engine.py
diff --git a/modules/bibworkflow/lib/workers/worker_celery.py b/invenio/modules/workflows/workers/worker_celery.py
similarity index 100%
rename from modules/bibworkflow/lib/workers/worker_celery.py
rename to invenio/modules/workflows/workers/worker_celery.py
diff --git a/modules/bibworkflow/lib/workers/worker_redis.py b/invenio/modules/workflows/workers/worker_redis.py
similarity index 100%
rename from modules/bibworkflow/lib/workers/worker_redis.py
rename to invenio/modules/workflows/workers/worker_redis.py
diff --git a/modules/websubmit/lib/functions/__init__.py b/invenio/modules/workflows/workflows/__init__.py
similarity index 100%
rename from modules/websubmit/lib/functions/__init__.py
rename to invenio/modules/workflows/workflows/__init__.py
diff --git a/modules/bibworkflow/lib/workflows/marcxml_workflow.py b/invenio/modules/workflows/workflows/marcxml_workflow.py
similarity index 100%
rename from modules/bibworkflow/lib/workflows/marcxml_workflow.py
rename to invenio/modules/workflows/workflows/marcxml_workflow.py
diff --git a/modules/bibworkflow/lib/workflows/my_workflow.py b/invenio/modules/workflows/workflows/sample_workflow.py
similarity index 100%
rename from modules/bibworkflow/lib/workflows/my_workflow.py
rename to invenio/modules/workflows/workflows/sample_workflow.py
diff --git a/modules/bibworkflow/lib/workflows/simplified_data_test_workflow.py b/invenio/modules/workflows/workflows/simplified_data_test_workflow.py
similarity index 100%
rename from modules/bibworkflow/lib/workflows/simplified_data_test_workflow.py
rename to invenio/modules/workflows/workflows/simplified_data_test_workflow.py
diff --git a/modules/bibworkflow/lib/workflows/test_workflow.py b/invenio/modules/workflows/workflows/test_workflow.py
similarity index 100%
rename from modules/bibworkflow/lib/workflows/test_workflow.py
rename to invenio/modules/workflows/workflows/test_workflow.py
diff --git a/modules/bibworkflow/lib/workflows/test_workflow_2.py b/invenio/modules/workflows/workflows/test_workflow_2.py
similarity index 100%
rename from modules/bibworkflow/lib/workflows/test_workflow_2.py
rename to invenio/modules/workflows/workflows/test_workflow_2.py
diff --git a/modules/miscutil/lib/testutils.py b/invenio/testsuite/__init__.py
similarity index 100%
rename from modules/miscutil/lib/testutils.py
rename to invenio/testsuite/__init__.py
diff --git a/modules/miscutil/demo/demobibdata.xml b/invenio/testsuite/data/demo_record_marc_data.xml
similarity index 100%
rename from modules/miscutil/demo/demobibdata.xml
rename to invenio/testsuite/data/demo_record_marc_data.xml
diff --git a/modules/elmsubmit/lib/elmsubmit_tests_1.mbox b/invenio/testsuite/data/elmsubmit_tests_1.mbox
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit_tests_1.mbox
rename to invenio/testsuite/data/elmsubmit_tests_1.mbox
diff --git a/modules/elmsubmit/lib/elmsubmit_tests_2.mbox b/invenio/testsuite/data/elmsubmit_tests_2.mbox
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit_tests_2.mbox
rename to invenio/testsuite/data/elmsubmit_tests_2.mbox
diff --git a/modules/bibfield/etc/test_authors.cfg b/invenio/testsuite/data/test_authors.cfg
similarity index 100%
rename from modules/bibfield/etc/test_authors.cfg
rename to invenio/testsuite/data/test_authors.cfg
diff --git a/modules/bibfield/etc/test_bibfield.cfg b/invenio/testsuite/data/test_bibfield.cfg
similarity index 100%
rename from modules/bibfield/etc/test_bibfield.cfg
rename to invenio/testsuite/data/test_bibfield.cfg
diff --git a/modules/bibfield/etc/test_title.cfg b/invenio/testsuite/data/test_title.cfg
similarity index 100%
rename from modules/bibfield/etc/test_title.cfg
rename to invenio/testsuite/data/test_title.cfg
diff --git a/modules/miscutil/lib/inveniocfg_unit_tests.py b/invenio/testsuite/deprecated_test_inveniocfg.py
similarity index 100%
rename from modules/miscutil/lib/inveniocfg_unit_tests.py
rename to invenio/testsuite/deprecated_test_inveniocfg.py
diff --git a/modules/miscutil/lib/intbitset_example.int b/invenio/testsuite/intbitset_example.int
similarity index 100%
rename from modules/miscutil/lib/intbitset_example.int
rename to invenio/testsuite/intbitset_example.int
diff --git a/modules/bibauthority/lib/bibauthority_unit_tests.py b/invenio/testsuite/test_bibauthority.py
similarity index 100%
rename from modules/bibauthority/lib/bibauthority_unit_tests.py
rename to invenio/testsuite/test_bibauthority.py
diff --git a/modules/miscutil/lib/celery_unit_tests.py b/invenio/testsuite/test_celery.py
similarity index 100%
rename from modules/miscutil/lib/celery_unit_tests.py
rename to invenio/testsuite/test_celery.py
diff --git a/modules/miscutil/lib/datastructures_unit_tests.py b/invenio/testsuite/test_datastructures.py
similarity index 100%
rename from modules/miscutil/lib/datastructures_unit_tests.py
rename to invenio/testsuite/test_datastructures.py
diff --git a/modules/miscutil/lib/errorlib_unit_tests.py b/invenio/testsuite/test_emergency_recipients.py
similarity index 100%
rename from modules/miscutil/lib/errorlib_unit_tests.py
rename to invenio/testsuite/test_emergency_recipients.py
diff --git a/modules/miscutil/lib/mailutils_unit_tests.py b/invenio/testsuite/test_ext_email.py
similarity index 100%
rename from modules/miscutil/lib/mailutils_unit_tests.py
rename to invenio/testsuite/test_ext_email.py
diff --git a/modules/miscutil/lib/jinja2utils_unit_tests.py b/invenio/testsuite/test_ext_template.py
similarity index 100%
rename from modules/miscutil/lib/jinja2utils_unit_tests.py
rename to invenio/testsuite/test_ext_template.py
diff --git a/modules/miscutil/lib/messages_unit_tests.py b/invenio/testsuite/test_i18n.py
similarity index 100%
rename from modules/miscutil/lib/messages_unit_tests.py
rename to invenio/testsuite/test_i18n.py
diff --git a/modules/miscutil/lib/intbitset_unit_tests.py b/invenio/testsuite/test_intbitset.py
similarity index 100%
rename from modules/miscutil/lib/intbitset_unit_tests.py
rename to invenio/testsuite/test_intbitset.py
diff --git a/modules/miscutil/lib/dbquery_unit_tests.py b/invenio/testsuite/test_legacy_dbquery.py
similarity index 100%
rename from modules/miscutil/lib/dbquery_unit_tests.py
rename to invenio/testsuite/test_legacy_dbquery.py
diff --git a/modules/elmsubmit/lib/elmsubmit_unit_tests.py b/invenio/testsuite/test_legacy_elmsubmit.py
similarity index 100%
rename from modules/elmsubmit/lib/elmsubmit_unit_tests.py
rename to invenio/testsuite/test_legacy_elmsubmit.py
diff --git a/modules/webstyle/lib/webdoc_unit_tests.py b/invenio/testsuite/test_legacy_webdoc.py
similarity index 100%
rename from modules/webstyle/lib/webdoc_unit_tests.py
rename to invenio/testsuite/test_legacy_webdoc.py
diff --git a/modules/webstyle/lib/webinterface_unit_tests.py b/invenio/testsuite/test_legacy_webinterface.py
similarity index 100%
rename from modules/webstyle/lib/webinterface_unit_tests.py
rename to invenio/testsuite/test_legacy_webinterface.py
diff --git a/modules/miscutil/lib/inveniomanage_unit_tests.py b/invenio/testsuite/test_manage.py
similarity index 100%
rename from modules/miscutil/lib/inveniomanage_unit_tests.py
rename to invenio/testsuite/test_manage.py
diff --git a/modules/miscutil/lib/plotextractor_unit_tests.py b/invenio/testsuite/test_plotextractor.py
similarity index 100%
rename from modules/miscutil/lib/plotextractor_unit_tests.py
rename to invenio/testsuite/test_plotextractor.py
diff --git a/modules/miscutil/lib/importutils_unit_tests.py b/invenio/testsuite/test_utils_autodiscovery.py
similarity index 100%
rename from modules/miscutil/lib/importutils_unit_tests.py
rename to invenio/testsuite/test_utils_autodiscovery.py
diff --git a/modules/miscutil/lib/dateutils_unit_tests.py b/invenio/testsuite/test_utils_date.py
similarity index 100%
rename from modules/miscutil/lib/dateutils_unit_tests.py
rename to invenio/testsuite/test_utils_date.py
diff --git a/modules/miscutil/lib/hashutils_unit_tests.py b/invenio/testsuite/test_utils_hash.py
similarity index 100%
rename from modules/miscutil/lib/hashutils_unit_tests.py
rename to invenio/testsuite/test_utils_hash.py
diff --git a/modules/miscutil/lib/htmlutils_unit_tests.py b/invenio/testsuite/test_utils_html.py
similarity index 100%
rename from modules/miscutil/lib/htmlutils_unit_tests.py
rename to invenio/testsuite/test_utils_html.py
diff --git a/modules/miscutil/lib/jsonutils_unit_tests.py b/invenio/testsuite/test_utils_json.py
similarity index 100%
rename from modules/miscutil/lib/jsonutils_unit_tests.py
rename to invenio/testsuite/test_utils_json.py
diff --git a/modules/miscutil/lib/logicutils_unit_tests.py b/invenio/testsuite/test_utils_logic.py
similarity index 100%
rename from modules/miscutil/lib/logicutils_unit_tests.py
rename to invenio/testsuite/test_utils_logic.py
diff --git a/modules/miscutil/lib/memoiseutils_unit_tests.py b/invenio/testsuite/test_utils_memoise.py
similarity index 100%
rename from modules/miscutil/lib/memoiseutils_unit_tests.py
rename to invenio/testsuite/test_utils_memoise.py
diff --git a/modules/miscutil/lib/mimetypeutils_unit_tests.py b/invenio/testsuite/test_utils_mimetype.py
similarity index 100%
rename from modules/miscutil/lib/mimetypeutils_unit_tests.py
rename to invenio/testsuite/test_utils_mimetype.py
diff --git a/modules/miscutil/lib/paginationutils_unit_tests.py b/invenio/testsuite/test_utils_pagination.py
similarity index 100%
rename from modules/miscutil/lib/paginationutils_unit_tests.py
rename to invenio/testsuite/test_utils_pagination.py
diff --git a/modules/miscutil/lib/pidutils_unit_tests.py b/invenio/testsuite/test_utils_pid.py
similarity index 100%
rename from modules/miscutil/lib/pidutils_unit_tests.py
rename to invenio/testsuite/test_utils_pid.py
diff --git a/modules/miscutil/lib/shellutils_unit_tests.py b/invenio/testsuite/test_utils_shell.py
similarity index 100%
rename from modules/miscutil/lib/shellutils_unit_tests.py
rename to invenio/testsuite/test_utils_shell.py
diff --git a/modules/miscutil/lib/solrutils_unit_tests.py b/invenio/testsuite/test_utils_solr.py
similarity index 100%
rename from modules/miscutil/lib/solrutils_unit_tests.py
rename to invenio/testsuite/test_utils_solr.py
diff --git a/modules/miscutil/lib/textutils_unit_tests.py b/invenio/testsuite/test_utils_text.py
similarity index 100%
rename from modules/miscutil/lib/textutils_unit_tests.py
rename to invenio/testsuite/test_utils_text.py
diff --git a/modules/miscutil/lib/urlutils_unit_tests.py b/invenio/testsuite/test_utils_url.py
similarity index 100%
rename from modules/miscutil/lib/urlutils_unit_tests.py
rename to invenio/testsuite/test_utils_url.py
diff --git a/modules/miscutil/lib/dataciteutils_tester.py b/invenio/testsuite/tester_utils_datacite.py
similarity index 100%
rename from modules/miscutil/lib/dataciteutils_tester.py
rename to invenio/testsuite/tester_utils_datacite.py
diff --git a/modules/miscutil/lib/sherpa_romeo_testing.py b/invenio/testsuite/tester_utils_sherpa_romeo.py
similarity index 100%
rename from modules/miscutil/lib/sherpa_romeo_testing.py
rename to invenio/testsuite/tester_utils_sherpa_romeo.py
diff --git a/modules/webstyle/lib/webinterface_handler_config.py b/invenio/utils/apache.py
similarity index 100%
rename from modules/webstyle/lib/webinterface_handler_config.py
rename to invenio/utils/apache.py
diff --git a/modules/miscutil/lib/invenio_connector.py b/invenio/utils/connector.py
similarity index 100%
rename from modules/miscutil/lib/invenio_connector.py
rename to invenio/utils/connector.py
diff --git a/modules/miscutil/lib/containerutils.py b/invenio/utils/container.py
similarity index 100%
rename from modules/miscutil/lib/containerutils.py
rename to invenio/utils/container.py
diff --git a/modules/miscutil/lib/crossrefutils.py b/invenio/utils/crossref.py
similarity index 100%
rename from modules/miscutil/lib/crossrefutils.py
rename to invenio/utils/crossref.py
diff --git a/modules/bibconvert/etc/latex-to-unicode.kb b/invenio/utils/data/latex-to-unicode.kb
similarity index 100%
rename from modules/bibconvert/etc/latex-to-unicode.kb
rename to invenio/utils/data/latex-to-unicode.kb
diff --git a/modules/miscutil/lib/dataciteutils.py b/invenio/utils/datacite.py
similarity index 100%
rename from modules/miscutil/lib/dataciteutils.py
rename to invenio/utils/datacite.py
diff --git a/modules/miscutil/lib/datastructures.py b/invenio/utils/datastructures.py
similarity index 100%
rename from modules/miscutil/lib/datastructures.py
rename to invenio/utils/datastructures.py
diff --git a/modules/miscutil/lib/dateutils.py b/invenio/utils/date.py
similarity index 100%
rename from modules/miscutil/lib/dateutils.py
rename to invenio/utils/date.py
diff --git a/modules/miscutil/lib/wtforms_utils.py b/invenio/utils/forms.py
similarity index 100%
rename from modules/miscutil/lib/wtforms_utils.py
rename to invenio/utils/forms.py
diff --git a/modules/miscutil/lib/hashutils.py b/invenio/utils/hash.py
similarity index 100%
rename from modules/miscutil/lib/hashutils.py
rename to invenio/utils/hash.py
diff --git a/modules/miscutil/lib/htmlutils.py b/invenio/utils/html.py
similarity index 100%
rename from modules/miscutil/lib/htmlutils.py
rename to invenio/utils/html.py
diff --git a/modules/webcomment/lib/webcomment_washer.py b/invenio/utils/htmlwasher.py
similarity index 100%
rename from modules/webcomment/lib/webcomment_washer.py
rename to invenio/utils/htmlwasher.py
diff --git a/modules/miscutil/lib/jsonutils.py b/invenio/utils/json.py
similarity index 100%
rename from modules/miscutil/lib/jsonutils.py
rename to invenio/utils/json.py
diff --git a/modules/miscutil/lib/logicutils.py b/invenio/utils/logic.py
similarity index 100%
rename from modules/miscutil/lib/logicutils.py
rename to invenio/utils/logic.py
diff --git a/modules/webmessage/lib/webmessage_mailutils.py b/invenio/utils/mail.py
similarity index 100%
rename from modules/webmessage/lib/webmessage_mailutils.py
rename to invenio/utils/mail.py
diff --git a/modules/miscutil/lib/memoiseutils.py b/invenio/utils/memoise.py
similarity index 100%
rename from modules/miscutil/lib/memoiseutils.py
rename to invenio/utils/memoise.py
diff --git a/modules/miscutil/lib/mimetypeutils.py b/invenio/utils/mimetype.py
similarity index 100%
rename from modules/miscutil/lib/mimetypeutils.py
rename to invenio/utils/mimetype.py
diff --git a/modules/miscutil/lib/orcid.py b/invenio/utils/orcid.py
similarity index 100%
rename from modules/miscutil/lib/orcid.py
rename to invenio/utils/orcid.py
diff --git a/modules/miscutil/lib/paginationutils.py b/invenio/utils/pagination.py
similarity index 100%
rename from modules/miscutil/lib/paginationutils.py
rename to invenio/utils/pagination.py
diff --git a/modules/miscutil/lib/pidutils.py b/invenio/utils/persistentid.py
similarity index 100%
rename from modules/miscutil/lib/pidutils.py
rename to invenio/utils/persistentid.py
diff --git a/modules/miscutil/lib/plotextractor.py b/invenio/utils/plotextractor/cli.py
similarity index 100%
rename from modules/miscutil/lib/plotextractor.py
rename to invenio/utils/plotextractor/cli.py
diff --git a/modules/miscutil/lib/plotextractor_config.py b/invenio/utils/plotextractor/config.py
similarity index 100%
rename from modules/miscutil/lib/plotextractor_config.py
rename to invenio/utils/plotextractor/config.py
diff --git a/modules/miscutil/lib/plotextractor_converter.py b/invenio/utils/plotextractor/converter.py
similarity index 100%
rename from modules/miscutil/lib/plotextractor_converter.py
rename to invenio/utils/plotextractor/converter.py
diff --git a/modules/miscutil/lib/plotextractor_getter.py b/invenio/utils/plotextractor/getter.py
similarity index 100%
rename from modules/miscutil/lib/plotextractor_getter.py
rename to invenio/utils/plotextractor/getter.py
diff --git a/modules/miscutil/lib/plotextractor_output_utils.py b/invenio/utils/plotextractor/output_utils.py
similarity index 100%
rename from modules/miscutil/lib/plotextractor_output_utils.py
rename to invenio/utils/plotextractor/output_utils.py
diff --git a/modules/webstyle/img/plotextractor_dummy.png b/invenio/utils/plotextractor/plotextractor_dummy.png
similarity index 100%
rename from modules/webstyle/img/plotextractor_dummy.png
rename to invenio/utils/plotextractor/plotextractor_dummy.png
diff --git a/modules/miscutil/lib/remote_debugger.py b/invenio/utils/remote_debugger/__init__.py
similarity index 100%
rename from modules/miscutil/lib/remote_debugger.py
rename to invenio/utils/remote_debugger/__init__.py
diff --git a/modules/miscutil/lib/remote_debugger_config.py b/invenio/utils/remote_debugger/config.py
similarity index 100%
rename from modules/miscutil/lib/remote_debugger_config.py
rename to invenio/utils/remote_debugger/config.py
diff --git a/modules/miscutil/lib/remote_debugger_wsgi_reload.py b/invenio/utils/remote_debugger/wsgi_reload.py
similarity index 100%
rename from modules/miscutil/lib/remote_debugger_wsgi_reload.py
rename to invenio/utils/remote_debugger/wsgi_reload.py
diff --git a/modules/miscutil/lib/shellutils.py b/invenio/utils/shell.py
similarity index 100%
rename from modules/miscutil/lib/shellutils.py
rename to invenio/utils/shell.py
diff --git a/modules/miscutil/lib/sherpa_romeo.py b/invenio/utils/sherpa_romeo.py
similarity index 100%
rename from modules/miscutil/lib/sherpa_romeo.py
rename to invenio/utils/sherpa_romeo.py
diff --git a/modules/miscutil/lib/textutils.py b/invenio/utils/text.py
similarity index 100%
rename from modules/miscutil/lib/textutils.py
rename to invenio/utils/text.py
diff --git a/modules/miscutil/lib/urlutils.py b/invenio/utils/url.py
similarity index 100%
rename from modules/miscutil/lib/urlutils.py
rename to invenio/utils/url.py
diff --git a/modules/miscutil/lib/w3c_validator.py b/invenio/utils/w3c_validator.py
similarity index 100%
rename from modules/miscutil/lib/w3c_validator.py
rename to invenio/utils/w3c_validator.py
diff --git a/modules/miscutil/lib/xmlDict.py b/invenio/utils/xmlDict.py
similarity index 100%
rename from modules/miscutil/lib/xmlDict.py
rename to invenio/utils/xmlDict.py
diff --git a/modules/webjournal/etc/AtlantisTimes-config.xml b/invenio_demosite/bulletinext/AtlantisTimes/config.xml
similarity index 100%
rename from modules/webjournal/etc/AtlantisTimes-config.xml
rename to invenio_demosite/bulletinext/AtlantisTimes/config.xml
diff --git a/modules/websubmit/etc/DEMOART.tpl b/invenio_demosite/converterext/templates/DEMOART.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOART.tpl
rename to invenio_demosite/converterext/templates/DEMOART.tpl
diff --git a/modules/websubmit/etc/DEMOARTcreate.tpl b/invenio_demosite/converterext/templates/DEMOARTcreate.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOARTcreate.tpl
rename to invenio_demosite/converterext/templates/DEMOARTcreate.tpl
diff --git a/modules/websubmit/etc/DEMOARTmodify.tpl b/invenio_demosite/converterext/templates/DEMOARTmodify.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOARTmodify.tpl
rename to invenio_demosite/converterext/templates/DEMOARTmodify.tpl
diff --git a/modules/websubmit/etc/DEMOBOO.tpl b/invenio_demosite/converterext/templates/DEMOBOO.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOBOO.tpl
rename to invenio_demosite/converterext/templates/DEMOBOO.tpl
diff --git a/modules/websubmit/etc/DEMOBOOcreate.tpl b/invenio_demosite/converterext/templates/DEMOBOOcreate.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOBOOcreate.tpl
rename to invenio_demosite/converterext/templates/DEMOBOOcreate.tpl
diff --git a/modules/websubmit/etc/DEMOBOOmodify.tpl b/invenio_demosite/converterext/templates/DEMOBOOmodify.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOBOOmodify.tpl
rename to invenio_demosite/converterext/templates/DEMOBOOmodify.tpl
diff --git a/modules/websubmit/etc/DEMOJRN.tpl b/invenio_demosite/converterext/templates/DEMOJRN.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOJRN.tpl
rename to invenio_demosite/converterext/templates/DEMOJRN.tpl
diff --git a/modules/websubmit/etc/DEMOJRNcreate.tpl b/invenio_demosite/converterext/templates/DEMOJRNcreate.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOJRNcreate.tpl
rename to invenio_demosite/converterext/templates/DEMOJRNcreate.tpl
diff --git a/modules/websubmit/etc/DEMOJRNmodify.tpl b/invenio_demosite/converterext/templates/DEMOJRNmodify.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOJRNmodify.tpl
rename to invenio_demosite/converterext/templates/DEMOJRNmodify.tpl
diff --git a/modules/websubmit/etc/DEMOPIC.tpl b/invenio_demosite/converterext/templates/DEMOPIC.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOPIC.tpl
rename to invenio_demosite/converterext/templates/DEMOPIC.tpl
diff --git a/modules/websubmit/etc/DEMOPICcreate.tpl b/invenio_demosite/converterext/templates/DEMOPICcreate.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOPICcreate.tpl
rename to invenio_demosite/converterext/templates/DEMOPICcreate.tpl
diff --git a/modules/websubmit/etc/DEMOPICmodify.tpl b/invenio_demosite/converterext/templates/DEMOPICmodify.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOPICmodify.tpl
rename to invenio_demosite/converterext/templates/DEMOPICmodify.tpl
diff --git a/modules/websubmit/etc/DEMOPOE.tpl b/invenio_demosite/converterext/templates/DEMOPOE.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOPOE.tpl
rename to invenio_demosite/converterext/templates/DEMOPOE.tpl
diff --git a/modules/websubmit/etc/DEMOPOEcreate.tpl b/invenio_demosite/converterext/templates/DEMOPOEcreate.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOPOEcreate.tpl
rename to invenio_demosite/converterext/templates/DEMOPOEcreate.tpl
diff --git a/modules/websubmit/etc/DEMOPOEmodify.tpl b/invenio_demosite/converterext/templates/DEMOPOEmodify.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOPOEmodify.tpl
rename to invenio_demosite/converterext/templates/DEMOPOEmodify.tpl
diff --git a/modules/websubmit/etc/DEMOTHE.tpl b/invenio_demosite/converterext/templates/DEMOTHE.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOTHE.tpl
rename to invenio_demosite/converterext/templates/DEMOTHE.tpl
diff --git a/modules/websubmit/etc/DEMOTHEcreate.tpl b/invenio_demosite/converterext/templates/DEMOTHEcreate.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOTHEcreate.tpl
rename to invenio_demosite/converterext/templates/DEMOTHEcreate.tpl
diff --git a/modules/websubmit/etc/DEMOTHEmodify.tpl b/invenio_demosite/converterext/templates/DEMOTHEmodify.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOTHEmodify.tpl
rename to invenio_demosite/converterext/templates/DEMOTHEmodify.tpl
diff --git a/modules/websubmit/etc/DEMOVID.tpl b/invenio_demosite/converterext/templates/DEMOVID.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOVID.tpl
rename to invenio_demosite/converterext/templates/DEMOVID.tpl
diff --git a/modules/websubmit/etc/DEMOVIDcreate.tpl b/invenio_demosite/converterext/templates/DEMOVIDcreate.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOVIDcreate.tpl
rename to invenio_demosite/converterext/templates/DEMOVIDcreate.tpl
diff --git a/modules/websubmit/etc/DEMOVIDmodify.tpl b/invenio_demosite/converterext/templates/DEMOVIDmodify.tpl
similarity index 100%
rename from modules/websubmit/etc/DEMOVIDmodify.tpl
rename to invenio_demosite/converterext/templates/DEMOVIDmodify.tpl
diff --git a/modules/bibauthorid/lib/bibauthorid_fixtures_demosite.py b/invenio_demosite/fixtures/bibauthorid.py
similarity index 100%
rename from modules/bibauthorid/lib/bibauthorid_fixtures_demosite.py
rename to invenio_demosite/fixtures/bibauthorid.py
diff --git a/modules/bibclassify/lib/bibclassify_fixtures_demosite.py b/invenio_demosite/fixtures/bibclassify.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_fixtures_demosite.py
rename to invenio_demosite/fixtures/bibclassify.py
diff --git a/modules/bibexport/lib/bibexport_fixtures_demosite.py b/invenio_demosite/fixtures/bibexport.py
similarity index 100%
rename from modules/bibexport/lib/bibexport_fixtures_demosite.py
rename to invenio_demosite/fixtures/bibexport.py
diff --git a/modules/bibknowledge/lib/bibknowledge_fixtures_demosite.py b/invenio_demosite/fixtures/bibknowledge.py
similarity index 100%
rename from modules/bibknowledge/lib/bibknowledge_fixtures_demosite.py
rename to invenio_demosite/fixtures/bibknowledge.py
diff --git a/modules/bibrank/lib/bibrank_fixtures_demosite.py b/invenio_demosite/fixtures/bibrank.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_fixtures_demosite.py
rename to invenio_demosite/fixtures/bibrank.py
diff --git a/modules/oaiharvest/lib/oai_harvest_fixtures_demosite.py b/invenio_demosite/fixtures/oai_harvest.py
similarity index 100%
rename from modules/oaiharvest/lib/oai_harvest_fixtures_demosite.py
rename to invenio_demosite/fixtures/oai_harvest.py
diff --git a/modules/webjournal/lib/webjournal_fixtures_demosite.py b/invenio_demosite/fixtures/webjournal.py
similarity index 100%
rename from modules/webjournal/lib/webjournal_fixtures_demosite.py
rename to invenio_demosite/fixtures/webjournal.py
diff --git a/modules/websearch/lib/websearch_fixtures_demosite.py b/invenio_demosite/fixtures/websearch.py
similarity index 100%
rename from modules/websearch/lib/websearch_fixtures_demosite.py
rename to invenio_demosite/fixtures/websearch.py
diff --git a/modules/websession/lib/websession_fixtures_demosite.py b/invenio_demosite/fixtures/websession.py
similarity index 100%
rename from modules/websession/lib/websession_fixtures_demosite.py
rename to invenio_demosite/fixtures/websession.py
diff --git a/modules/websubmit/lib/websubmit_fixtures_demosite.py b/invenio_demosite/fixtures/websubmit.py
similarity index 100%
rename from modules/websubmit/lib/websubmit_fixtures_demosite.py
rename to invenio_demosite/fixtures/websubmit.py
diff --git a/modules/webjournal/etc/AtlantisTimes_Detailed.bft b/invenio_demosite/format_templates/webjournal/AtlantisTimes_Detailed.bft
similarity index 100%
rename from modules/webjournal/etc/AtlantisTimes_Detailed.bft
rename to invenio_demosite/format_templates/webjournal/AtlantisTimes_Detailed.bft
diff --git a/modules/webjournal/etc/AtlantisTimes_Index.bft b/invenio_demosite/format_templates/webjournal/AtlantisTimes_Index.bft
similarity index 100%
rename from modules/webjournal/etc/AtlantisTimes_Index.bft
rename to invenio_demosite/format_templates/webjournal/AtlantisTimes_Index.bft
diff --git a/modules/webjournal/etc/AtlantisTimes_Search.bft b/invenio_demosite/format_templates/webjournal/AtlantisTimes_Search.bft
similarity index 100%
rename from modules/webjournal/etc/AtlantisTimes_Search.bft
rename to invenio_demosite/format_templates/webjournal/AtlantisTimes_Search.bft
diff --git a/modules/bibrank/etc/demo_itc_collection.cfg b/invenio_demosite/rankext/configuration/demo_itc_collection.cfg
similarity index 100%
rename from modules/bibrank/etc/demo_itc_collection.cfg
rename to invenio_demosite/rankext/configuration/demo_itc_collection.cfg
diff --git a/modules/bibrank/etc/demo_jif.cfg.in b/invenio_demosite/rankext/configuration/demo_jif.cfg
similarity index 100%
rename from modules/bibrank/etc/demo_jif.cfg.in
rename to invenio_demosite/rankext/configuration/demo_jif.cfg
diff --git a/modules/bibcirculation/lib/bibcirculation_receivers.py b/invenio_demosite/receivers.py
similarity index 100%
rename from modules/bibcirculation/lib/bibcirculation_receivers.py
rename to invenio_demosite/receivers.py
diff --git a/modules/miscutil/demo/democfgdata.sql b/invenio_demosite/sql
similarity index 100%
rename from modules/miscutil/demo/democfgdata.sql
rename to invenio_demosite/sql
diff --git a/modules/webjournal/etc/AtlantisTimes.css b/invenio_demosite/static/css/AtlantisTimes.css
similarity index 100%
rename from modules/webjournal/etc/AtlantisTimes.css
rename to invenio_demosite/static/css/AtlantisTimes.css
diff --git a/modules/websession/lib/webaccount_flask_tests.py b/invenio_demosite/testsuite/flask/test_accounts.py
similarity index 100%
rename from modules/websession/lib/webaccount_flask_tests.py
rename to invenio_demosite/testsuite/flask/test_accounts.py
diff --git a/modules/webmessage/lib/webmessage_flask_tests.py b/invenio_demosite/testsuite/flask/test_messages.py
similarity index 100%
rename from modules/webmessage/lib/webmessage_flask_tests.py
rename to invenio_demosite/testsuite/flask/test_messages.py
diff --git a/modules/websearch/lib/websearch_flask_tests.py b/invenio_demosite/testsuite/flask/test_search.py
similarity index 100%
rename from modules/websearch/lib/websearch_flask_tests.py
rename to invenio_demosite/testsuite/flask/test_search.py
diff --git a/modules/websubmit/web/icon-test.gif b/invenio_demosite/testsuite/regression/data/icon-test.gif
similarity index 100%
rename from modules/websubmit/web/icon-test.gif
rename to invenio_demosite/testsuite/regression/data/icon-test.gif
diff --git a/modules/websubmit/web/test.doc b/invenio_demosite/testsuite/regression/data/test.doc
similarity index 100%
rename from modules/websubmit/web/test.doc
rename to invenio_demosite/testsuite/regression/data/test.doc
diff --git a/modules/websubmit/web/test.docx b/invenio_demosite/testsuite/regression/data/test.docx
similarity index 100%
rename from modules/websubmit/web/test.docx
rename to invenio_demosite/testsuite/regression/data/test.docx
diff --git a/modules/websubmit/web/test.gif b/invenio_demosite/testsuite/regression/data/test.gif
similarity index 100%
rename from modules/websubmit/web/test.gif
rename to invenio_demosite/testsuite/regression/data/test.gif
diff --git a/modules/websubmit/web/test.html b/invenio_demosite/testsuite/regression/data/test.html
similarity index 100%
rename from modules/websubmit/web/test.html
rename to invenio_demosite/testsuite/regression/data/test.html
diff --git a/modules/websubmit/web/test.jpg b/invenio_demosite/testsuite/regression/data/test.jpg
similarity index 100%
rename from modules/websubmit/web/test.jpg
rename to invenio_demosite/testsuite/regression/data/test.jpg
diff --git a/modules/websubmit/web/test.odt b/invenio_demosite/testsuite/regression/data/test.odt
similarity index 100%
rename from modules/websubmit/web/test.odt
rename to invenio_demosite/testsuite/regression/data/test.odt
diff --git a/modules/websubmit/web/test.pdf b/invenio_demosite/testsuite/regression/data/test.pdf
similarity index 100%
rename from modules/websubmit/web/test.pdf
rename to invenio_demosite/testsuite/regression/data/test.pdf
diff --git a/modules/websubmit/web/test.ps.gz b/invenio_demosite/testsuite/regression/data/test.ps.gz
similarity index 100%
rename from modules/websubmit/web/test.ps.gz
rename to invenio_demosite/testsuite/regression/data/test.ps.gz
diff --git a/modules/websubmit/web/test.tar.gz b/invenio_demosite/testsuite/regression/data/test.tar.gz
similarity index 100%
rename from modules/websubmit/web/test.tar.gz
rename to invenio_demosite/testsuite/regression/data/test.tar.gz
diff --git a/modules/bibupload/lib/batchuploader_regression_tests.py b/invenio_demosite/testsuite/regression/test_batchuploader.py
similarity index 100%
rename from modules/bibupload/lib/batchuploader_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_batchuploader.py
diff --git a/modules/bibcirculation/lib/bibcirculation_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibcirculation.py
similarity index 100%
rename from modules/bibcirculation/lib/bibcirculation_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibcirculation.py
diff --git a/modules/bibclassify/lib/bibclassify_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibclassify.py
similarity index 100%
rename from modules/bibclassify/lib/bibclassify_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibclassify.py
diff --git a/modules/bibconvert/lib/bibconvert_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibconvert.py
similarity index 100%
rename from modules/bibconvert/lib/bibconvert_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibconvert.py
diff --git a/modules/bibdocfile/lib/bibdocfile_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibdocfile.py
similarity index 100%
rename from modules/bibdocfile/lib/bibdocfile_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibdocfile.py
diff --git a/modules/bibedit/lib/bibedit_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibedit.py
similarity index 100%
rename from modules/bibedit/lib/bibedit_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibedit.py
diff --git a/modules/bibfield/lib/bibfield_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibfield.py
similarity index 100%
rename from modules/bibfield/lib/bibfield_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibfield.py
diff --git a/modules/bibfield/lib/bibfield_marcreader_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibfield_marcreader.py
similarity index 100%
rename from modules/bibfield/lib/bibfield_marcreader_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibfield_marcreader.py
diff --git a/modules/bibformat/lib/bibformat_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibformat.py
similarity index 100%
rename from modules/bibformat/lib/bibformat_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibformat.py
diff --git a/modules/bibformat/lib/bibformatadmin_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibformatadmin.py
similarity index 100%
rename from modules/bibformat/lib/bibformatadmin_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibformatadmin.py
diff --git a/modules/bibindex/lib/bibindex_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibindex.py
similarity index 100%
rename from modules/bibindex/lib/bibindex_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibindex.py
diff --git a/modules/bibindex/lib/bibindexadmin_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibindexadmin.py
similarity index 100%
rename from modules/bibindex/lib/bibindexadmin_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibindexadmin.py
diff --git a/modules/bibknowledge/lib/bibknowledge_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibknowledge.py
similarity index 100%
rename from modules/bibknowledge/lib/bibknowledge_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibknowledge.py
diff --git a/modules/bibmatch/lib/bibmatch_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibmatch.py
similarity index 100%
rename from modules/bibmatch/lib/bibmatch_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibmatch.py
diff --git a/modules/bibrank/lib/bibrank_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibrank.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibrank.py
diff --git a/modules/bibrank/lib/bibrank_citation_indexer_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibrank_citation_indexer.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_citation_indexer_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibrank_citation_indexer.py
diff --git a/modules/bibrank/lib/bibrank_selfcites_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibrank_selfcites.py
similarity index 100%
rename from modules/bibrank/lib/bibrank_selfcites_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibrank_selfcites.py
diff --git a/modules/bibrank/lib/bibrankadmin_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibrankadmin.py
similarity index 100%
rename from modules/bibrank/lib/bibrankadmin_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibrankadmin.py
diff --git a/modules/bibupload/lib/bibupload_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibupload.py
similarity index 100%
rename from modules/bibupload/lib/bibupload_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibupload.py
diff --git a/modules/bibupload/lib/bibupload_revisionverifier_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibupload_revisionverifier.py
similarity index 100%
rename from modules/bibupload/lib/bibupload_revisionverifier_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibupload_revisionverifier.py
diff --git a/modules/bibworkflow/lib/bibworkflow_regression_tests.py b/invenio_demosite/testsuite/regression/test_bibworkflow.py
similarity index 100%
rename from modules/bibworkflow/lib/bibworkflow_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_bibworkflow.py
diff --git a/modules/miscutil/lib/dbquery_regression_tests.py b/invenio_demosite/testsuite/regression/test_dbquery.py
similarity index 100%
rename from modules/miscutil/lib/dbquery_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_dbquery.py
diff --git a/modules/miscutil/lib/errorlib_regression_tests.py b/invenio_demosite/testsuite/regression/test_errorlib.py
similarity index 100%
rename from modules/miscutil/lib/errorlib_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_errorlib.py
diff --git a/modules/miscutil/lib/invenio_connector_regression_tests.py b/invenio_demosite/testsuite/regression/test_invenio_connector.py
similarity index 100%
rename from modules/miscutil/lib/invenio_connector_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_invenio_connector.py
diff --git a/modules/oaiharvest/lib/oai_harvest_admin_regression_tests.py b/invenio_demosite/testsuite/regression/test_oai_harvest_admin.py
similarity index 100%
rename from modules/oaiharvest/lib/oai_harvest_admin_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_oai_harvest_admin.py
diff --git a/modules/oairepository/lib/oai_repository_regression_tests.py b/invenio_demosite/testsuite/regression/test_oai_repository.py
similarity index 100%
rename from modules/oairepository/lib/oai_repository_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_oai_repository.py
diff --git a/modules/oairepository/lib/oai_repository_admin_regression_tests.py b/invenio_demosite/testsuite/regression/test_oai_repository_admin.py
similarity index 100%
rename from modules/oairepository/lib/oai_repository_admin_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_oai_repository_admin.py
diff --git a/modules/miscutil/lib/plotextractor_regression_tests.py b/invenio_demosite/testsuite/regression/test_plotextractor.py
similarity index 100%
rename from modules/miscutil/lib/plotextractor_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_plotextractor.py
diff --git a/modules/docextract/lib/refextract_regression_tests.py b/invenio_demosite/testsuite/regression/test_refextract.py
similarity index 100%
rename from modules/docextract/lib/refextract_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_refextract.py
diff --git a/modules/docextract/lib/refextract_api_regression_tests.py b/invenio_demosite/testsuite/regression/test_refextract_api.py
similarity index 100%
rename from modules/docextract/lib/refextract_api_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_refextract_api.py
diff --git a/modules/websearch/lib/search_engine_summarizer_regression_tests.py b/invenio_demosite/testsuite/regression/test_search_engine_summarizer.py
similarity index 100%
rename from modules/websearch/lib/search_engine_summarizer_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_search_engine_summarizer.py
diff --git a/modules/miscutil/lib/sequtils_regression_tests.py b/invenio_demosite/testsuite/regression/test_sequencegenerator.py
similarity index 100%
rename from modules/miscutil/lib/sequtils_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_sequencegenerator.py
diff --git a/modules/miscutil/lib/solrutils_regression_tests.py b/invenio_demosite/testsuite/regression/test_solrutils.py
similarity index 100%
rename from modules/miscutil/lib/solrutils_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_solrutils.py
diff --git a/modules/miscutil/lib/testutils_regression_tests.py b/invenio_demosite/testsuite/regression/test_testutils.py
similarity index 100%
rename from modules/miscutil/lib/testutils_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_testutils.py
diff --git a/modules/miscutil/lib/web_api_key_regression_tests.py b/invenio_demosite/testsuite/regression/test_web_api_key.py
similarity index 100%
rename from modules/miscutil/lib/web_api_key_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_web_api_key.py
diff --git a/modules/webaccess/lib/webaccess_regression_tests.py b/invenio_demosite/testsuite/regression/test_webaccess.py
similarity index 100%
rename from modules/webaccess/lib/webaccess_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_webaccess.py
diff --git a/modules/webalert/lib/webalert_regression_tests.py b/invenio_demosite/testsuite/regression/test_webalert.py
similarity index 100%
rename from modules/webalert/lib/webalert_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_webalert.py
diff --git a/modules/webbasket/lib/webbasket_regression_tests.py b/invenio_demosite/testsuite/regression/test_webbasket.py
similarity index 100%
rename from modules/webbasket/lib/webbasket_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_webbasket.py
diff --git a/modules/webcomment/lib/webcomment_regression_tests.py b/invenio_demosite/testsuite/regression/test_webcomment.py
similarity index 100%
rename from modules/webcomment/lib/webcomment_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_webcomment.py
diff --git a/modules/webdeposit/lib/webdeposit_regression_tests.py b/invenio_demosite/testsuite/regression/test_webdeposit.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_webdeposit.py
diff --git a/modules/webdeposit/lib/webdeposit_api_regression_tests.py b/invenio_demosite/testsuite/regression/test_webdeposit_api.py
similarity index 100%
rename from modules/webdeposit/lib/webdeposit_api_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_webdeposit_api.py
diff --git a/modules/websession/lib/webgroup_regression_tests.py b/invenio_demosite/testsuite/regression/test_webgroup.py
similarity index 100%
rename from modules/websession/lib/webgroup_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_webgroup.py
diff --git a/modules/webjournal/lib/webjournal_regression_tests.py b/invenio_demosite/testsuite/regression/test_webjournal.py
similarity index 100%
rename from modules/webjournal/lib/webjournal_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_webjournal.py
diff --git a/modules/weblinkback/lib/weblinkback_regression_tests.py b/invenio_demosite/testsuite/regression/test_weblinkback.py
similarity index 100%
rename from modules/weblinkback/lib/weblinkback_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_weblinkback.py
diff --git a/modules/webmessage/lib/webmessage_regression_tests.py b/invenio_demosite/testsuite/regression/test_webmessage.py
similarity index 100%
rename from modules/webmessage/lib/webmessage_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_webmessage.py
diff --git a/modules/websearch/lib/websearch_regression_tests.py b/invenio_demosite/testsuite/regression/test_websearch.py
similarity index 100%
rename from modules/websearch/lib/websearch_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_websearch.py
diff --git a/modules/websearch/lib/websearchadmin_regression_tests.py b/invenio_demosite/testsuite/regression/test_websearchadmin.py
similarity index 100%
rename from modules/websearch/lib/websearchadmin_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_websearchadmin.py
diff --git a/modules/websession/lib/websession_regression_tests.py b/invenio_demosite/testsuite/regression/test_websession.py
similarity index 100%
rename from modules/websession/lib/websession_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_websession.py
diff --git a/modules/webstat/lib/webstat_regression_tests.py b/invenio_demosite/testsuite/regression/test_webstat.py
similarity index 100%
rename from modules/webstat/lib/webstat_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_webstat.py
diff --git a/modules/webstyle/lib/webstyle_regression_tests.py b/invenio_demosite/testsuite/regression/test_webstyle.py
similarity index 100%
rename from modules/webstyle/lib/webstyle_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_webstyle.py
diff --git a/modules/websubmit/lib/websubmit_regression_tests.py b/invenio_demosite/testsuite/regression/test_websubmit.py
similarity index 100%
rename from modules/websubmit/lib/websubmit_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_websubmit.py
diff --git a/modules/websubmit/lib/websubmitadmin_regression_tests.py b/invenio_demosite/testsuite/regression/test_websubmitadmin.py
similarity index 100%
rename from modules/websubmit/lib/websubmitadmin_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_websubmitadmin.py
diff --git a/modules/webtag/lib/webtag_regression_tests.py b/invenio_demosite/testsuite/regression/test_webtag.py
similarity index 100%
rename from modules/webtag/lib/webtag_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_webtag.py
diff --git a/modules/websession/lib/webuser_regression_tests.py b/invenio_demosite/testsuite/regression/test_webuser.py
similarity index 100%
rename from modules/websession/lib/webuser_regression_tests.py
rename to invenio_demosite/testsuite/regression/test_webuser.py
diff --git a/modules/bibcirculation/lib/bibcirculation_web_tests.py b/invenio_demosite/testsuite/web/test_bibcirculation.py
similarity index 100%
rename from modules/bibcirculation/lib/bibcirculation_web_tests.py
rename to invenio_demosite/testsuite/web/test_bibcirculation.py
diff --git a/modules/bibedit/lib/bibedit_web_tests.py b/invenio_demosite/testsuite/web/test_bibedit.py
similarity index 100%
rename from modules/bibedit/lib/bibedit_web_tests.py
rename to invenio_demosite/testsuite/web/test_bibedit.py
diff --git a/modules/bibformat/lib/bibformat_web_tests.py b/invenio_demosite/testsuite/web/test_bibformat.py
similarity index 100%
rename from modules/bibformat/lib/bibformat_web_tests.py
rename to invenio_demosite/testsuite/web/test_bibformat.py
diff --git a/modules/oaiharvest/lib/oai_harvest_web_tests.py b/invenio_demosite/testsuite/web/test_oai_harvest.py
similarity index 100%
rename from modules/oaiharvest/lib/oai_harvest_web_tests.py
rename to invenio_demosite/testsuite/web/test_oai_harvest.py
diff --git a/modules/webalert/lib/webalert_web_tests.py b/invenio_demosite/testsuite/web/test_webalert.py
similarity index 100%
rename from modules/webalert/lib/webalert_web_tests.py
rename to invenio_demosite/testsuite/web/test_webalert.py
diff --git a/modules/webcomment/lib/webcomment_web_tests.py b/invenio_demosite/testsuite/web/test_webcomment.py
similarity index 100%
rename from modules/webcomment/lib/webcomment_web_tests.py
rename to invenio_demosite/testsuite/web/test_webcomment.py
diff --git a/modules/webjournal/lib/webjournal_web_tests.py b/invenio_demosite/testsuite/web/test_webjournal.py
similarity index 100%
rename from modules/webjournal/lib/webjournal_web_tests.py
rename to invenio_demosite/testsuite/web/test_webjournal.py
diff --git a/modules/webmessage/lib/webmessage_web_tests.py b/invenio_demosite/testsuite/web/test_webmessage.py
similarity index 100%
rename from modules/webmessage/lib/webmessage_web_tests.py
rename to invenio_demosite/testsuite/web/test_webmessage.py
diff --git a/modules/websearch/lib/websearch_web_tests.py b/invenio_demosite/testsuite/web/test_websearch.py
similarity index 100%
rename from modules/websearch/lib/websearch_web_tests.py
rename to invenio_demosite/testsuite/web/test_websearch.py
diff --git a/modules/websession/lib/websession_web_tests.py b/invenio_demosite/testsuite/web/test_websession.py
similarity index 100%
rename from modules/websession/lib/websession_web_tests.py
rename to invenio_demosite/testsuite/web/test_websession.py
diff --git a/modules/websubmit/lib/websubmit_web_tests.py b/invenio_demosite/testsuite/web/test_websubmit.py
similarity index 100%
rename from modules/websubmit/lib/websubmit_web_tests.py
rename to invenio_demosite/testsuite/web/test_websubmit.py
diff --git a/modules/miscutil/etc/bash_completion.d/inveniocfg.in b/scripts/bash_completion.d/inveniocfg
similarity index 100%
rename from modules/miscutil/etc/bash_completion.d/inveniocfg.in
rename to scripts/bash_completion.d/inveniocfg
diff --git a/modules/webaccess/lib/collection_restrictions_migration_kit.py b/scripts/collection_restrictions_migration_kit.py
similarity index 100%
rename from modules/webaccess/lib/collection_restrictions_migration_kit.py
rename to scripts/collection_restrictions_migration_kit.py
diff --git a/modules/miscutil/lib/kwalitee.py b/scripts/kwalitee.py
similarity index 100%
rename from modules/miscutil/lib/kwalitee.py
rename to scripts/kwalitee.py
diff --git a/modules/websession/lib/password_migration_kit.py b/scripts/password_migration_kit.py
similarity index 100%
rename from modules/websession/lib/password_migration_kit.py
rename to scripts/password_migration_kit.py
diff --git a/modules/miscutil/lib/pep8.py b/scripts/pep8.py
similarity index 100%
rename from modules/miscutil/lib/pep8.py
rename to scripts/pep8.py