From d08387dd28ccdab969cafc52f262bf1f94652e55 Mon Sep 17 00:00:00 2001 From: Joshua Ferraro Date: Thu, 23 Aug 2007 21:02:17 -0500 Subject: [PATCH] first go at moving templates to a modules/ dir Signed-off-by: Chris Cormack --- .../prog/en/{images => img}/checkall.gif | Bin .../prog/en/{images => img}/fade-butt.png | Bin .../prog/en/{images => img}/koha-logo.gif | Bin .../prog/en/{images => img}/koha.org-logo.gif | Bin .../prog/en/{images => img}/patron-blank.png | Bin .../prog/en/{images => img}/regularDay.jpg | Bin .../prog/en/{images => img}/regularHoliday.jpg | Bin .../prog/en/{images => img}/repeatable.jpg | Bin .../prog/en/{images => img}/search-audio-books.gif | Bin .../prog/en/{images => img}/search-books.gif | Bin .../prog/en/{images => img}/search-kids.gif | Bin .../prog/en/{images => img}/search-large-print.gif | Bin .../en/{images => img}/search-local-history.gif | Bin .../prog/en/{images => img}/search-movies.gif | Bin .../prog/en/{images => img}/search-music.gif | Bin .../prog/en/{images => img}/search-reference.gif | Bin .../prog/en/{images => img}/search-software-web.gif | Bin .../intranet-tmpl/prog/en/{images => img}/up.png | Bin .../prog/en/{includes/javascript => js}/members.js | 0 .../intranet-tmpl/prog/en/{ => modules}/about.tmpl | 0 .../prog/en/{ => modules}/acqui/acqui-home.tmpl | 0 .../prog/en/{ => modules}/acqui/basket.tmpl | 0 .../prog/en/{ => modules}/acqui/booksellers.tmpl | 0 .../prog/en/{ => modules}/acqui/histsearch.tmpl | 0 .../prog/en/{ => modules}/acqui/lateorders.tmpl | 0 .../prog/en/{ => modules}/acqui/neworderbiblio.tmpl | 0 .../prog/en/{ => modules}/acqui/neworderempty.tmpl | 0 .../en/{ => modules}/acqui/newordersuggestion.tmpl | 0 .../prog/en/{ => modules}/acqui/orderreceive.tmpl | 0 .../prog/en/{ => modules}/acqui/parcel.tmpl | 0 .../prog/en/{ => modules}/acqui/parcels.tmpl | 0 .../prog/en/{ => modules}/acqui/supplier.tmpl | 0 .../prog/en/{ => modules}/admin/admin-home.tmpl | 0 .../prog/en/{ => modules}/admin/aqbookfund.tmpl | 0 .../prog/en/{ => modules}/admin/aqbudget.tmpl | 0 .../admin/auth_subfields_structure.tmpl | 0 .../en/{ => modules}/admin/auth_tag_structure.tmpl | 0 .../en/{ => modules}/admin/authorised_values.tmpl | 0 .../prog/en/{ => modules}/admin/authtypes.tmpl | 0 .../en/{ => modules}/admin/biblio_framework.tmpl | 0 .../prog/en/{ => modules}/admin/branches.tmpl | 0 .../prog/en/{ => modules}/admin/categorie.tmpl | 0 .../prog/en/{ => modules}/admin/categoryitem.tmpl | 0 .../prog/en/{ => modules}/admin/charges.tmpl | 0 .../prog/en/{ => modules}/admin/checkmarc.tmpl | 0 .../prog/en/{ => modules}/admin/cities.tmpl | 0 .../prog/en/{ => modules}/admin/currency.tmpl | 0 .../prog/en/{ => modules}/admin/finesrules.tmpl | 0 .../prog/en/{ => modules}/admin/issuingrules.tmpl | 0 .../prog/en/{ => modules}/admin/itemtypes.tmpl | 0 .../prog/en/{ => modules}/admin/koha2marclinks.tmpl | 0 .../admin/marc_subfields_structure.tmpl | 0 .../en/{ => modules}/admin/marctagstructure.tmpl | 0 .../prog/en/{ => modules}/admin/printers.tmpl | 0 .../prog/en/{ => modules}/admin/roadtype.tmpl | 0 .../en/{ => modules}/admin/systempreferences.tmpl | 0 .../prog/en/{ => modules}/admin/thesaurus.tmpl | 0 .../prog/en/{ => modules}/admin/z3950servers.tmpl | 0 .../intranet-tmpl/prog/en/{ => modules}/auth.tmpl | 0 .../en/{ => modules}/authorities/auth_finder.tmpl | 0 .../{ => modules}/authorities/authorities-home.tmpl | 0 .../en/{ => modules}/authorities/authorities.tmpl | 0 .../authorities/blinddetail-biblio-search.tmpl | 0 .../prog/en/{ => modules}/authorities/detail.tmpl | 0 .../authorities/searchresultlist-auth.tmpl | 0 .../{ => modules}/authorities/searchresultlist.tmpl | 0 .../prog/en/{ => modules}/catalogue/ISBDdetail.tmpl | 0 .../prog/en/{ => modules}/catalogue/MARCdetail.tmpl | 0 .../prog/en/{ => modules}/catalogue/advsearch.tmpl | 0 .../prog/en/{ => modules}/catalogue/detail.tmpl | 0 .../prog/en/{ => modules}/catalogue/dictionary.tmpl | 0 .../en/{ => modules}/catalogue/issuehistory.tmpl | 0 .../prog/en/{ => modules}/catalogue/moredetail.tmpl | 0 .../prog/en/{ => modules}/catalogue/results.tmpl | 0 .../prog/en/{ => modules}/catalogue/subject.tmpl | 0 .../prog/en/{ => modules}/catalogue/suggest.tmpl | 0 .../{ => modules}/cataloguing/addbiblio-nomarc.tmpl | 0 .../en/{ => modules}/cataloguing/addbiblio.tmpl | 0 .../prog/en/{ => modules}/cataloguing/addbooks.tmpl | 0 .../{ => modules}/cataloguing/additem-nomarc.tmpl | 0 .../prog/en/{ => modules}/cataloguing/additem.tmpl | 0 .../{ => modules}/cataloguing/thesaurus_popup.tmpl | 0 .../cataloguing/value_builder/labs_theses.tmpl | 0 .../cataloguing/value_builder/macles.tmpl | 0 .../cataloguing/value_builder/marc21_leader.tmpl | 0 .../value_builder/unimarc_field_100.tmpl | 0 .../value_builder/unimarc_field_105.tmpl | 0 .../value_builder/unimarc_field_106.tmpl | 0 .../value_builder/unimarc_field_110.tmpl | 0 .../value_builder/unimarc_field_115a.tmpl | 0 .../value_builder/unimarc_field_115b.tmpl | 0 .../value_builder/unimarc_field_116.tmpl | 0 .../value_builder/unimarc_field_117.tmpl | 0 .../value_builder/unimarc_field_120.tmpl | 0 .../value_builder/unimarc_field_121a.tmpl | 0 .../value_builder/unimarc_field_121b.tmpl | 0 .../value_builder/unimarc_field_122.tmpl | 0 .../value_builder/unimarc_field_123a.tmpl | 0 .../value_builder/unimarc_field_123d.tmpl | 0 .../value_builder/unimarc_field_123e.tmpl | 0 .../value_builder/unimarc_field_123f.tmpl | 0 .../value_builder/unimarc_field_123g.tmpl | 0 .../value_builder/unimarc_field_124a.tmpl | 0 .../value_builder/unimarc_field_124b.tmpl | 0 .../value_builder/unimarc_field_124c.tmpl | 0 .../value_builder/unimarc_field_124d.tmpl | 0 .../value_builder/unimarc_field_124e.tmpl | 0 .../value_builder/unimarc_field_124f.tmpl | 0 .../value_builder/unimarc_field_124g.tmpl | 0 .../value_builder/unimarc_field_125a.tmpl | 0 .../value_builder/unimarc_field_125b.tmpl | 0 .../value_builder/unimarc_field_126a.tmpl | 0 .../value_builder/unimarc_field_126b.tmpl | 0 .../value_builder/unimarc_field_127.tmpl | 0 .../value_builder/unimarc_field_128a.tmpl | 0 .../value_builder/unimarc_field_128b.tmpl | 0 .../value_builder/unimarc_field_128c.tmpl | 0 .../value_builder/unimarc_field_130.tmpl | 0 .../value_builder/unimarc_field_135a.tmpl | 0 .../value_builder/unimarc_field_140.tmpl | 0 .../value_builder/unimarc_field_141.tmpl | 0 .../value_builder/unimarc_field_210c.tmpl | 0 .../value_builder/unimarc_field_225a.tmpl | 0 .../value_builder/unimarc_field_4XX.tmpl | 0 .../value_builder/unimarc_field_60X.tmpl | 0 .../value_builder/unimarc_field_700-4.tmpl | 0 .../cataloguing/value_builder/unimarc_leader.tmpl | 0 .../en/{ => modules}/cataloguing/z3950_search.tmpl | 0 .../prog/en/{ => modules}/circ/bookcount.tmpl | 0 .../prog/en/{ => modules}/circ/branchoverdues.tmpl | 0 .../prog/en/{ => modules}/circ/branchtransfers.tmpl | 0 .../prog/en/{ => modules}/circ/circulation.tmpl | 0 .../prog/en/{ => modules}/circ/overdue.tmpl | 0 .../prog/en/{ => modules}/circ/pendingreserves.tmpl | 0 .../prog/en/{ => modules}/circ/returns.tmpl | 0 .../en/{ => modules}/circ/selectbranchprinter.tmpl | 0 .../prog/en/{ => modules}/circ/stats.tmpl | 0 .../prog/en/{ => modules}/circ/transferstodo.tmpl | 0 .../en/{ => modules}/circ/transferstoreceive.tmpl | 0 .../prog/en/{ => modules}/circ/waitingreserves.tmpl | 0 .../prog/en/{ => modules}/errors/400.tmpl | 0 .../prog/en/{ => modules}/errors/401.tmpl | 0 .../prog/en/{ => modules}/errors/402.tmpl | 0 .../prog/en/{ => modules}/errors/403.tmpl | 0 .../prog/en/{ => modules}/errors/404.tmpl | 0 .../prog/en/{ => modules}/errors/405.tmpl | 0 .../prog/en/{ => modules}/errors/500.tmpl | 0 .../prog/en/{ => modules}/help/acqui/newbiblio.tmpl | 0 .../en/{ => modules}/help/admin/aqbookfund.tmpl | 0 .../help/admin/auth_subfields_structure.tmpl | 0 .../{ => modules}/help/admin/authorised_values.tmpl | 0 .../prog/en/{ => modules}/help/admin/authtypes.tmpl | 0 .../{ => modules}/help/admin/biblio_framework.tmpl | 0 .../prog/en/{ => modules}/help/admin/branches.tmpl | 0 .../prog/en/{ => modules}/help/admin/categorie.tmpl | 0 .../prog/en/{ => modules}/help/admin/checkmarc.tmpl | 0 .../prog/en/{ => modules}/help/admin/currency.tmpl | 0 .../en/{ => modules}/help/admin/issuingrules.tmpl | 0 .../prog/en/{ => modules}/help/admin/itemtypes.tmpl | 0 .../en/{ => modules}/help/admin/koha2marclinks.tmpl | 0 .../help/admin/marc_subfields_structure.tmpl | 0 .../{ => modules}/help/admin/marctagstructure.tmpl | 0 .../prog/en/{ => modules}/help/admin/printers.tmpl | 0 .../prog/en/{ => modules}/help/admin/stopwords.tmpl | 0 .../{ => modules}/help/admin/systempreferences.tmpl | 0 .../en/{ => modules}/help/admin/z3950servers.tmpl | 0 .../{ => modules}/help/authorities/authorities.tmpl | 0 .../prog/en/{ => modules}/help/bull-home.tmpl | 0 .../prog/en/{ => modules}/help/bull/bull-home.tmpl | 0 .../en/{ => modules}/help/bull/statecollection.tmpl | 0 .../{ => modules}/help/bull/subscription-add.tmpl | 0 .../help/bull/subscription-detail.tmpl | 0 .../en/{ => modules}/help/circ/circulation.tmpl | 0 .../prog/en/{ => modules}/help/circ/returns.tmpl | 0 .../prog/en/{ => modules}/help/export/marc.tmpl | 0 .../prog/en/{ => modules}/help/import/breeding.tmpl | 0 .../en/{ => modules}/help/members/memberentry.tmpl | 0 .../en/{ => modules}/help/members/members-home.tmpl | 0 .../en/{ => modules}/help/members/moremember.tmpl | 0 .../prog/en/{ => modules}/help/nohelp.tmpl | 0 .../prog/en/{ => modules}/installer/auth.tmpl | 0 .../prog/en/{ => modules}/installer/step1.tmpl | 0 .../prog/en/{ => modules}/installer/step2.tmpl | 0 .../prog/en/{ => modules}/installer/step3.tmpl | 0 .../prog/en/{ => modules}/intranet-main.tmpl | 0 .../en/{ => modules}/labels/label-bib-search.tmpl | 0 .../{ => modules}/labels/label-create-layout.tmpl | 0 .../{ => modules}/labels/label-create-template.tmpl | 0 .../en/{ => modules}/labels/label-edit-layout.tmpl | 0 .../{ => modules}/labels/label-edit-template.tmpl | 0 .../prog/en/{ => modules}/labels/label-home.tmpl | 0 .../prog/en/{ => modules}/labels/label-manager.tmpl | 0 .../prog/en/{ => modules}/labels/label-print.tmpl | 0 .../en/{ => modules}/labels/label-templates.tmpl | 0 .../prog/en/{ => modules}/labels/result.tmpl | 0 .../prog/en/{ => modules}/labels/search.tmpl | 0 .../prog/en/{ => modules}/maint/catmaintain.tmpl | 0 .../prog/en/{ => modules}/members/boraccount.tmpl | 0 .../en/{ => modules}/members/borrowers_details.tmpl | 0 .../prog/en/{ => modules}/members/deletemem.tmpl | 0 .../en/{ => modules}/members/guarantor_search.tmpl | 0 .../prog/en/{ => modules}/members/mancredit.tmpl | 0 .../prog/en/{ => modules}/members/maninvoice.tmpl | 0 .../prog/en/{ => modules}/members/member-flags.tmpl | 0 .../en/{ => modules}/members/member-password.tmpl | 0 .../members/member-quicksearch-results.tmpl | 0 .../{ => modules}/members/member-quicksearch.tmpl | 0 .../prog/en/{ => modules}/members/member.tmpl | 0 .../prog/en/{ => modules}/members/memberentryA.tmpl | 0 .../prog/en/{ => modules}/members/memberentryC.tmpl | 0 .../prog/en/{ => modules}/members/memberentryI.tmpl | 0 .../prog/en/{ => modules}/members/memberentryP.tmpl | 0 .../en/{ => modules}/members/moremember-print.tmpl | 0 .../{ => modules}/members/moremember-receipt.tmpl | 0 .../prog/en/{ => modules}/members/moremember.tmpl | 0 .../prog/en/{ => modules}/members/pay.tmpl | 0 .../prog/en/{ => modules}/members/readingrec.tmpl | 0 .../{ => modules}/reports/acquisitions_stats.tmpl | 0 .../en/{ => modules}/reports/bor_issues_top.tmpl | 0 .../en/{ => modules}/reports/borrowers_out.tmpl | 0 .../en/{ => modules}/reports/borrowers_stats.tmpl | 0 .../en/{ => modules}/reports/cat_issues_top.tmpl | 0 .../en/{ => modules}/reports/catalogue_out.tmpl | 0 .../en/{ => modules}/reports/catalogue_stats.tmpl | 0 .../prog/en/{ => modules}/reports/inventory.tmpl | 0 .../en/{ => modules}/reports/issues_avg_stats.tmpl | 0 .../reports/issues_by_borrower_category.tmpl | 0 .../prog/en/{ => modules}/reports/issues_stats.tmpl | 0 .../prog/en/{ => modules}/reports/itemtypes.tmpl | 0 .../prog/en/{ => modules}/reports/reports-home.tmpl | 0 .../en/{ => modules}/reports/reservereport.tmpl | 0 .../prog/en/{ => modules}/reserve/request.tmpl | 0 .../en/{ => modules}/reviews/reviewswaiting.tmpl | 0 .../{ => modules}/serials/acqui-search-result.tmpl | 0 .../prog/en/{ => modules}/serials/acqui-search.tmpl | 0 .../en/{ => modules}/serials/checkexpiration.tmpl | 0 .../prog/en/{ => modules}/serials/claims.tmpl | 0 .../en/{ => modules}/serials/distributedto.tmpl | 0 .../en/{ => modules}/serials/member-search.tmpl | 0 .../serials/receipt-search-result.tmpl | 0 .../prog/en/{ => modules}/serials/result.tmpl | 0 .../{ => modules}/serials/routing-preview-slip.tmpl | 0 .../en/{ => modules}/serials/routing-preview.tmpl | 0 .../prog/en/{ => modules}/serials/routing.tmpl | 0 .../{ => modules}/serials/serial-issues-full.tmpl | 0 .../en/{ => modules}/serials/serial-issues.tmpl | 0 .../{ => modules}/serials/serials-collection.tmpl | 0 .../prog/en/{ => modules}/serials/serials-edit.tmpl | 0 .../prog/en/{ => modules}/serials/serials-home.tmpl | 0 .../en/{ => modules}/serials/serials-recieve.tmpl | 0 .../en/{ => modules}/serials/subscription-add.tmpl | 0 .../serials/subscription-bib-search.tmpl | 0 .../{ => modules}/serials/subscription-detail.tmpl | 0 .../{ => modules}/serials/subscription-renew.tmpl | 0 .../prog/en/{ => modules}/serials/viewalerts.tmpl | 0 .../en/{ => modules}/suggestion/acceptorreject.tmpl | 0 .../suggestion/mail_suggestion_ACCEPTED.tmpl | 0 .../suggestion/mail_suggestion_AVAILABLE.tmpl | 0 .../suggestion/mail_suggestion_ORDERED.tmpl | 0 .../suggestion/mail_suggestion_REJECTED.tmpl | 0 .../prog/en/{ => modules}/tools/barcodes.tmpl | 0 .../prog/en/{ => modules}/tools/breeding.tmpl | 0 .../prog/en/{ => modules}/tools/cleanborrowers.tmpl | 0 .../prog/en/{ => modules}/tools/export.tmpl | 0 .../prog/en/{ => modules}/tools/holidays.tmpl | 0 .../prog/en/{ => modules}/tools/import.tmpl | 0 .../prog/en/{ => modules}/tools/inventory.tmpl | 0 .../prog/en/{ => modules}/tools/itemslost.tmpl | 0 .../prog/en/{ => modules}/tools/koha-news.tmpl | 0 .../prog/en/{ => modules}/tools/letter.tmpl | 0 .../prog/en/{ => modules}/tools/overduerules.tmpl | 0 .../prog/en/{ => modules}/tools/printerConfig.tmpl | 0 .../prog/en/{ => modules}/tools/tools-home.tmpl | 0 .../prog/en/{ => modules}/tools/viewlog.tmpl | 0 .../virtualshelves/addbybiblionumber.tmpl | 0 .../en/{ => modules}/virtualshelves/shelves.tmpl | 0 .../prog/en/{ => modules}/z3950/searchresult.tmpl | 0 277 files changed, 0 insertions(+), 0 deletions(-) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/checkall.gif (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/fade-butt.png (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/koha-logo.gif (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/koha.org-logo.gif (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/patron-blank.png (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/regularDay.jpg (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/regularHoliday.jpg (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/repeatable.jpg (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/search-audio-books.gif (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/search-books.gif (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/search-kids.gif (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/search-large-print.gif (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/search-local-history.gif (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/search-movies.gif (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/search-music.gif (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/search-reference.gif (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/search-software-web.gif (100%) rename koha-tmpl/intranet-tmpl/prog/en/{images => img}/up.png (100%) rename koha-tmpl/intranet-tmpl/prog/en/{includes/javascript => js}/members.js (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/about.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/acqui/acqui-home.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/acqui/basket.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/acqui/booksellers.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/acqui/histsearch.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/acqui/lateorders.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/acqui/neworderbiblio.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/acqui/neworderempty.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/acqui/newordersuggestion.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/acqui/orderreceive.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/acqui/parcel.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/acqui/parcels.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/acqui/supplier.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/admin-home.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/aqbookfund.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/aqbudget.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/auth_subfields_structure.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/auth_tag_structure.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/authorised_values.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/authtypes.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/biblio_framework.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/branches.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/categorie.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/categoryitem.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/charges.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/checkmarc.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/cities.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/currency.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/finesrules.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/issuingrules.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/itemtypes.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/koha2marclinks.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/marc_subfields_structure.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/marctagstructure.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/printers.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/roadtype.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/systempreferences.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/thesaurus.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/admin/z3950servers.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/auth.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/authorities/auth_finder.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/authorities/authorities-home.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/authorities/authorities.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/authorities/blinddetail-biblio-search.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/authorities/detail.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/authorities/searchresultlist-auth.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/authorities/searchresultlist.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/catalogue/ISBDdetail.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/catalogue/MARCdetail.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/catalogue/advsearch.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/catalogue/detail.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/catalogue/dictionary.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/catalogue/issuehistory.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/catalogue/moredetail.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/catalogue/results.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/catalogue/subject.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/catalogue/suggest.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/addbiblio-nomarc.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/addbiblio.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/addbooks.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/additem-nomarc.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/additem.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/thesaurus_popup.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/labs_theses.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/macles.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/marc21_leader.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_100.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_105.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_106.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_110.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_115a.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_115b.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_116.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_117.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_120.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_121a.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_121b.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_122.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_123a.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_123d.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_123e.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_123f.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_123g.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_124a.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_124b.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_124c.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_124d.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_124e.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_124f.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_124g.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_125a.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_125b.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_126a.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_126b.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_127.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_128a.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_128b.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_128c.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_130.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_135a.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_140.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_141.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_210c.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_225a.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_4XX.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_60X.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_field_700-4.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/value_builder/unimarc_leader.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/cataloguing/z3950_search.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/circ/bookcount.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/circ/branchoverdues.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/circ/branchtransfers.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/circ/circulation.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/circ/overdue.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/circ/pendingreserves.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/circ/returns.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/circ/selectbranchprinter.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/circ/stats.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/circ/transferstodo.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/circ/transferstoreceive.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/circ/waitingreserves.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/errors/400.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/errors/401.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/errors/402.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/errors/403.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/errors/404.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/errors/405.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/errors/500.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/acqui/newbiblio.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/aqbookfund.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/auth_subfields_structure.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/authorised_values.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/authtypes.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/biblio_framework.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/branches.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/categorie.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/checkmarc.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/currency.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/issuingrules.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/itemtypes.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/koha2marclinks.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/marc_subfields_structure.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/marctagstructure.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/printers.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/stopwords.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/systempreferences.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/admin/z3950servers.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/authorities/authorities.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/bull-home.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/bull/bull-home.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/bull/statecollection.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/bull/subscription-add.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/bull/subscription-detail.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/circ/circulation.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/circ/returns.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/export/marc.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/import/breeding.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/members/memberentry.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/members/members-home.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/members/moremember.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/help/nohelp.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/installer/auth.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/installer/step1.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/installer/step2.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/installer/step3.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/intranet-main.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/labels/label-bib-search.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/labels/label-create-layout.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/labels/label-create-template.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/labels/label-edit-layout.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/labels/label-edit-template.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/labels/label-home.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/labels/label-manager.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/labels/label-print.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/labels/label-templates.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/labels/result.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/labels/search.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/maint/catmaintain.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/boraccount.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/borrowers_details.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/deletemem.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/guarantor_search.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/mancredit.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/maninvoice.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/member-flags.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/member-password.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/member-quicksearch-results.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/member-quicksearch.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/member.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/memberentryA.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/memberentryC.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/memberentryI.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/memberentryP.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/moremember-print.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/moremember-receipt.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/moremember.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/pay.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/members/readingrec.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reports/acquisitions_stats.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reports/bor_issues_top.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reports/borrowers_out.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reports/borrowers_stats.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reports/cat_issues_top.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reports/catalogue_out.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reports/catalogue_stats.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reports/inventory.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reports/issues_avg_stats.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reports/issues_by_borrower_category.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reports/issues_stats.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reports/itemtypes.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reports/reports-home.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reports/reservereport.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reserve/request.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/reviews/reviewswaiting.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/acqui-search-result.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/acqui-search.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/checkexpiration.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/claims.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/distributedto.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/member-search.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/receipt-search-result.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/result.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/routing-preview-slip.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/routing-preview.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/routing.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/serial-issues-full.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/serial-issues.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/serials-collection.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/serials-edit.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/serials-home.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/serials-recieve.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/subscription-add.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/subscription-bib-search.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/subscription-detail.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/subscription-renew.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/serials/viewalerts.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/suggestion/acceptorreject.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/suggestion/mail_suggestion_ACCEPTED.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/suggestion/mail_suggestion_AVAILABLE.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/suggestion/mail_suggestion_ORDERED.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/suggestion/mail_suggestion_REJECTED.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/tools/barcodes.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/tools/breeding.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/tools/cleanborrowers.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/tools/export.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/tools/holidays.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/tools/import.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/tools/inventory.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/tools/itemslost.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/tools/koha-news.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/tools/letter.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/tools/overduerules.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/tools/printerConfig.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/tools/tools-home.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/tools/viewlog.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/virtualshelves/addbybiblionumber.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/virtualshelves/shelves.tmpl (100%) rename koha-tmpl/intranet-tmpl/prog/en/{ => modules}/z3950/searchresult.tmpl (100%) diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/checkall.gif b/koha-tmpl/intranet-tmpl/prog/en/img/checkall.gif similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/checkall.gif rename to koha-tmpl/intranet-tmpl/prog/en/img/checkall.gif diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/fade-butt.png b/koha-tmpl/intranet-tmpl/prog/en/img/fade-butt.png similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/fade-butt.png rename to koha-tmpl/intranet-tmpl/prog/en/img/fade-butt.png diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/koha-logo.gif b/koha-tmpl/intranet-tmpl/prog/en/img/koha-logo.gif similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/koha-logo.gif rename to koha-tmpl/intranet-tmpl/prog/en/img/koha-logo.gif diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/koha.org-logo.gif b/koha-tmpl/intranet-tmpl/prog/en/img/koha.org-logo.gif similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/koha.org-logo.gif rename to koha-tmpl/intranet-tmpl/prog/en/img/koha.org-logo.gif diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/patron-blank.png b/koha-tmpl/intranet-tmpl/prog/en/img/patron-blank.png similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/patron-blank.png rename to koha-tmpl/intranet-tmpl/prog/en/img/patron-blank.png diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/regularDay.jpg b/koha-tmpl/intranet-tmpl/prog/en/img/regularDay.jpg similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/regularDay.jpg rename to koha-tmpl/intranet-tmpl/prog/en/img/regularDay.jpg diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/regularHoliday.jpg b/koha-tmpl/intranet-tmpl/prog/en/img/regularHoliday.jpg similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/regularHoliday.jpg rename to koha-tmpl/intranet-tmpl/prog/en/img/regularHoliday.jpg diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/repeatable.jpg b/koha-tmpl/intranet-tmpl/prog/en/img/repeatable.jpg similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/repeatable.jpg rename to koha-tmpl/intranet-tmpl/prog/en/img/repeatable.jpg diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/search-audio-books.gif b/koha-tmpl/intranet-tmpl/prog/en/img/search-audio-books.gif similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/search-audio-books.gif rename to koha-tmpl/intranet-tmpl/prog/en/img/search-audio-books.gif diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/search-books.gif b/koha-tmpl/intranet-tmpl/prog/en/img/search-books.gif similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/search-books.gif rename to koha-tmpl/intranet-tmpl/prog/en/img/search-books.gif diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/search-kids.gif b/koha-tmpl/intranet-tmpl/prog/en/img/search-kids.gif similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/search-kids.gif rename to koha-tmpl/intranet-tmpl/prog/en/img/search-kids.gif diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/search-large-print.gif b/koha-tmpl/intranet-tmpl/prog/en/img/search-large-print.gif similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/search-large-print.gif rename to koha-tmpl/intranet-tmpl/prog/en/img/search-large-print.gif diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/search-local-history.gif b/koha-tmpl/intranet-tmpl/prog/en/img/search-local-history.gif similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/search-local-history.gif rename to koha-tmpl/intranet-tmpl/prog/en/img/search-local-history.gif diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/search-movies.gif b/koha-tmpl/intranet-tmpl/prog/en/img/search-movies.gif similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/search-movies.gif rename to koha-tmpl/intranet-tmpl/prog/en/img/search-movies.gif diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/search-music.gif b/koha-tmpl/intranet-tmpl/prog/en/img/search-music.gif similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/search-music.gif rename to koha-tmpl/intranet-tmpl/prog/en/img/search-music.gif diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/search-reference.gif b/koha-tmpl/intranet-tmpl/prog/en/img/search-reference.gif similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/search-reference.gif rename to koha-tmpl/intranet-tmpl/prog/en/img/search-reference.gif diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/search-software-web.gif b/koha-tmpl/intranet-tmpl/prog/en/img/search-software-web.gif similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/search-software-web.gif rename to koha-tmpl/intranet-tmpl/prog/en/img/search-software-web.gif diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/up.png b/koha-tmpl/intranet-tmpl/prog/en/img/up.png similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/images/up.png rename to koha-tmpl/intranet-tmpl/prog/en/img/up.png diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js b/koha-tmpl/intranet-tmpl/prog/en/js/members.js similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js rename to koha-tmpl/intranet-tmpl/prog/en/js/members.js diff --git a/koha-tmpl/intranet-tmpl/prog/en/about.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/about.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/acqui/neworderbiblio.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/newordersuggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/acqui/newordersuggestion.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/acqui/orderreceive.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/aqbudget.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/categoryitem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/categoryitem.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/charges.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/charges.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/cities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/cities.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/currency.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/issuingrules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/issuingrules.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/koha2marclinks.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/printers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/printers.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/admin/z3950servers.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/auth.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/catalogue/ISBDdetail.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/dictionary.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/catalogue/dictionary.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/issuehistory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/catalogue/issuehistory.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/subject.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/catalogue/subject.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/suggest.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/suggest.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/catalogue/suggest.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/suggest.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio-nomarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio-nomarc.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem-nomarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem-nomarc.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/thesaurus_popup.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/thesaurus_popup.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/thesaurus_popup.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/thesaurus_popup.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/labs_theses.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/labs_theses.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/macles.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/macles.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/marc21_leader.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/marc21_leader.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_105.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_105.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_106.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_106.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_110.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_110.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_115a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_115a.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_115b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_115b.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_116.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_116.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_117.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_117.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_120.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_120.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_121a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_121a.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_121b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_121b.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_122.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_122.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123a.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123d.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123d.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123e.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123e.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123f.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123f.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123g.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123g.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124a.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124b.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124c.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124c.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124d.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124d.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124e.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124e.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124f.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124f.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124g.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124g.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_125a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_125a.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_125b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_125b.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_126a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_126a.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_126b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_126b.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_127.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_127.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128a.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128b.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128c.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128c.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_130.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_130.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_135a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_135a.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_140.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_140.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_141.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_141.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_210c.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_210c.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_225a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_225a.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_4XX.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_4XX.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_60X.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_60X.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_60X.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_60X.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_700-4.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_700-4.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_leader.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_leader.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/cataloguing/z3950_search.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/bookcount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/circ/bookcount.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/circ/overdue.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/circ/stats.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/errors/400.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/errors/400.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/errors/401.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/errors/401.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/errors/402.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/errors/402.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/errors/403.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/errors/403.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/errors/404.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/errors/404.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/errors/405.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/errors/405.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/errors/500.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/errors/500.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newbiblio.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/acqui/newbiblio.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newbiblio.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/aqbookfund.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/auth_subfields_structure.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/authorised_values.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/authtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/authtypes.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/biblio_framework.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/branches.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/categorie.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/checkmarc.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/currency.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/issuingrules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/issuingrules.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/issuingrules.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/issuingrules.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/itemtypes.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/koha2marclinks.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/marc_subfields_structure.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/marctagstructure.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/printers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/printers.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/stopwords.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/stopwords.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/systempreferences.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/z3950servers.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/authorities/authorities.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/bull-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull-home.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/bull-home.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/bull-home.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/bull/bull-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/bull-home.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/bull/bull-home.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/bull-home.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/bull/statecollection.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/statecollection.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/bull/statecollection.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/statecollection.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/bull/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-add.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/bull/subscription-add.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-add.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/bull/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-detail.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/bull/subscription-detail.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-detail.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/circ/circulation.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/circ/returns.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/export/marc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/export/marc.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/export/marc.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/export/marc.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/import/breeding.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/import/breeding.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/import/breeding.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/import/breeding.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/members/memberentry.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/members/members-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/members/members-home.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/members/moremember.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/nohelp.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/help/nohelp.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/installer/step2.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/installer/step2.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/intranet-main.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/label-bib-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/labels/label-bib-search.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/label-create-layout.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/labels/label-create-layout.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/label-create-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/labels/label-create-template.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/label-edit-layout.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/labels/label-edit-layout.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/label-edit-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/labels/label-edit-template.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/label-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/labels/label-home.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/label-manager.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/labels/label-manager.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/label-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/labels/label-print.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/label-templates.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/labels/label-templates.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/labels/result.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/labels/search.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/maint/catmaintain.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/maint/catmaintain.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/borrowers_details.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/borrowers_details.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/mancredit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/mancredit.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/member-password.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/moremember-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/moremember-print.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/moremember-receipt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/moremember-receipt.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/acquisitions_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reports/acquisitions_stats.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_stats.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reports/inventory.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reports/itemtypes.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/reservereport.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reports/reservereport.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/reviews/reviewswaiting.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/reviews/reviewswaiting.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/checkexpiration.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/checkexpiration.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/distributedto.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/distributedto.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/receipt-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/receipt-search-result.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/receipt-search-result.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/receipt-search-result.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/result.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview-slip.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview-slip.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/routing.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/routing.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues-full.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues-full.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serials-recieve.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/serials-recieve.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-renew.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/subscription-renew.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/suggestion/acceptorreject.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/suggestion/acceptorreject.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/suggestion/mail_suggestion_ACCEPTED.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ACCEPTED.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/suggestion/mail_suggestion_ACCEPTED.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ACCEPTED.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/suggestion/mail_suggestion_AVAILABLE.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_AVAILABLE.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/suggestion/mail_suggestion_AVAILABLE.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_AVAILABLE.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/suggestion/mail_suggestion_ORDERED.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ORDERED.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/suggestion/mail_suggestion_ORDERED.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ORDERED.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/suggestion/mail_suggestion_REJECTED.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_REJECTED.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/suggestion/mail_suggestion_REJECTED.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_REJECTED.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/barcodes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/barcodes.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/tools/barcodes.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/tools/barcodes.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/breeding.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/tools/breeding.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/cleanborrowers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/tools/cleanborrowers.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/holidays.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/tools/holidays.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/import.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/tools/import.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/tools/inventory.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/itemslost.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/tools/itemslost.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/overduerules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/tools/overduerules.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/printerConfig.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/printerConfig.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/tools/printerConfig.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/tools/printerConfig.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/tools-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/tools/tools-home.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/viewlog.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/tools/viewlog.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/virtualshelves/addbybiblionumber.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/virtualshelves/addbybiblionumber.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/virtualshelves/shelves.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/z3950/searchresult.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/z3950/searchresult.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tmpl -- 2.39.5