diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/colors.css b/koha-tmpl/opac-tmpl/prog/en/css/colors.css
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/includes/colors.css
rename to koha-tmpl/opac-tmpl/prog/en/css/colors.css
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/colors.npl.css b/koha-tmpl/opac-tmpl/prog/en/css/colors.npl.css
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/includes/colors.npl.css
rename to koha-tmpl/opac-tmpl/prog/en/css/colors.npl.css
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/hierarchy.css b/koha-tmpl/opac-tmpl/prog/en/css/hierarchy.css
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/includes/hierarchy.css
rename to koha-tmpl/opac-tmpl/prog/en/css/hierarchy.css
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
similarity index 99%
rename from koha-tmpl/opac-tmpl/prog/en/includes/opac.css
rename to koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 54cb4bda52..86abb314b5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -1,3 +1,5 @@
+@import url("/intranet-tmpl/prog/en/lib/yui/reset-fonts-grids.css");
+
 /* color scheme :
 - #6699CC smooth blue for buttons background
 - #FFFFCC smooth yellow for button text
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/print.css b/koha-tmpl/opac-tmpl/prog/en/css/print.css
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/includes/print.css
rename to koha-tmpl/opac-tmpl/prog/en/css/print.css
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/sanop.css b/koha-tmpl/opac-tmpl/prog/en/css/sanop.css
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/includes/sanop.css
rename to koha-tmpl/opac-tmpl/prog/en/css/sanop.css
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc
index d86e149807..465f4bd6ad 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc
@@ -3,13 +3,10 @@
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
 <meta http-equiv="Content-Language" content="en-us" />
 <style type="text/css"> 
-    @import url(<!-- TMPL_VAR NAME="themelang" -->/includes/print.css);
+    @import url(<!-- TMPL_VAR NAME="themelang" -->/css/print.css);
 </style>
-
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/script.js"></script>
-
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
-
+<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/script.js"></script>
+<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"></script>
     <script type="text/javascript" language="javascript">
         var MSG_NO_RECORD_SELECTED = "No biblio selected";
         var MSG_NO_RECORD_ADDED = "No biblio added";
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc
index 3068e0cf89..eb2724f8f4 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc
@@ -2,26 +2,21 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Content-Language" content="en-us" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
-
-<!-- TMPL_IF name="opacstylesheet" -->
-        <style type="text/css"> 
+<!-- TMPL_IF name="opacstylesheet" --><style type="text/css"> 
             @import url(<!-- TMPL_VAR NAME="opacstylesheet" -->);
         </style>
 <!-- TMPL_ELSE -->
-    <!-- TMPL_IF name="opaccolorstylesheet" -->
-        <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR NAME="opaccolorstylesheet" -->" />
+<!-- TMPL_IF name="opaccolorstylesheet" -->
+        <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css<!-- TMPL_VAR NAME="opaccolorstylesheet" -->" />
     <!-- TMPL_ELSE -->
-        <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/opac.css" />
+        <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/opac.css" />
     <!-- /TMPL_IF -->
     <style type="text/css">
-        @import url(<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->);
+        @import url(<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->);
     </style>
 <!-- /TMPL_IF -->
-
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/script.js" ></script>
-
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js" ></script>
-
+<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/script.js" ></script>
+<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js" ></script>
 <script type="text/javascript" language="javascript">
     var MSG_NO_RECORD_SELECTED = "No biblio selected";
     var MSG_NO_RECORD_ADDED = "No biblio added";
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc
index 82fce9858e..b413dda6bf 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc
@@ -4,15 +4,15 @@
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang">/includes/favicon.ico" type="image/x-icon" />
 <!-- TMPL_IF NAME="searchdesc" --><!-- TMPL_IF name="total" --><link rel="alternate" type="application/rss+xml" title="RSS" href="http://a9.com/-/opensearch/search/B0007WF826/<!-- TMPL_VAR NAME="searchdesc" -->?count=10&amp;startPage=1" /><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF name="opacstylesheet" --><style type="text/css">
-    @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="opacstylesheet" -->);
-</style><!-- TMPL_ELSE --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR NAME="opaccolorstylesheet" -->" />
+    @import url(<!-- TMPL_VAR NAME='themelang' -->/css/<!-- TMPL_VAR NAME="opacstylesheet" -->);
+</style><!-- TMPL_ELSE --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="opaccolorstylesheet" -->" />
 <style type="text/css">
-    @import url(<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->);
+    @import url(<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->);
 </style><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="livesearch" --><style type="text/css">
-	@import url(<!-- TMPL_VAR NAME="themelang" -->/includes/livesearch.css);
+	@import url(<!-- TMPL_VAR NAME="themelang" -->/css/livesearch.css);
 </style><!-- /TMPL_IF -->
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
+<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"></script>
 <script type="text/javascript" language="javascript">
 	var MSG_BASKET_EMPTY = "You book bag is currently empty";
 	var MSG_RECORD_IN_BASKET = "This item is already in your book bag";
@@ -27,5 +27,5 @@
 	<!-- TMPL_VAR NAME="opacuserjs" -->
 </script>	
 <!-- /TMPL_IF -->
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/main.js"></script>
+<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/main.js"></script>
 </head>
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
index 8454c7f7b0..7d73f2ab62 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
@@ -9,25 +9,18 @@
         </style>
 <!-- TMPL_ELSE -->
     <!-- TMPL_IF name="opaccolorstylesheet" -->
-        <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR NAME="opaccolorstylesheet" -->" />
+        <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="opaccolorstylesheet" -->" />
     <!-- TMPL_ELSE -->
-        <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/opac.css" />
+        <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/opac.css" />
     <!-- /TMPL_IF -->
     <style type="text/css">
-        @import url(<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->);
+        @import url(<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->);
     </style>
 <!-- /TMPL_IF -->
-
-<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/includes/main.js" ></script>
-
-<!-- TMPL_IF NAME="AmazonContent" -->
-<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/includes/amazonimages.js" ></script>
-<!-- /TMPL_IF -->
-
-<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/includes/script.js" ></script>
-
-<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js" ></script>
-
+<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/js/main.js" ></script>
+<!-- TMPL_IF NAME="AmazonContent" --><script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/js/amazonimages.js" ></script><!-- /TMPL_IF -->
+<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/js/script.js" ></script>
+<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/js/basket.js" ></script>
 <script type="text/javascript" language="javascript">
     function _(s) { return s } // dummy function for gettext
     var MSG_BASKET_EMPTY = _("You book bag is currently empty");
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/amazonimages.js b/koha-tmpl/opac-tmpl/prog/en/js/amazonimages.js
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/includes/amazonimages.js
rename to koha-tmpl/opac-tmpl/prog/en/js/amazonimages.js
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/basket.js b/koha-tmpl/opac-tmpl/prog/en/js/basket.js
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/includes/basket.js
rename to koha-tmpl/opac-tmpl/prog/en/js/basket.js
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/main.js b/koha-tmpl/opac-tmpl/prog/en/js/main.js
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/includes/main.js
rename to koha-tmpl/opac-tmpl/prog/en/js/main.js
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/script.js b/koha-tmpl/opac-tmpl/prog/en/js/script.js
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/includes/script.js
rename to koha-tmpl/opac-tmpl/prog/en/js/script.js
diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css b/koha-tmpl/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css
new file mode 100644
index 0000000000..a21e2c4458
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css
@@ -0,0 +1,9 @@
+/*
+Copyright (c) 2007, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.3.0
+*/
+/*reset.css*/body{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup,sub{line-height:-1px;vertical-align:text-top;}sub{vertical-align:text-bottom;}input, textarea, select{font-family:inherit;font-size:inherit;font-weight:inherit;}
+/*fonts.css*/body {font:13px/1.22 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}table {font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:99%;}
+/*grids.css*/body{text-align:center;}#ft{clear:both;}#doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.301em;min-width:750px;}#doc2{width:73.074em;*width:71.313em;}#doc3{margin:auto 10px;width:auto;}#doc4{width:74.923em;*width:73.117em;}.yui-b{position:relative;}.yui-b{_position:static;}#yui-main .yui-b{position:static;}#yui-main{width:100%;}.yui-t1 #yui-main,.yui-t2 #yui-main,.yui-t3 #yui-main{float:right;margin-left:-25em;}.yui-t4 #yui-main,.yui-t5 #yui-main,.yui-t6 #yui-main{float:left;margin-right:-25em;}.yui-t1 .yui-b{float:left;width:12.3207em;*width:12.0106em;}.yui-t1 #yui-main .yui-b{margin-left:13.3207em;*margin-left:13.0106em;}.yui-t2 .yui-b{float:left;width:13.8456em;*width:13.512em;}.yui-t2 #yui-main .yui-b{margin-left:14.8456em;*margin-left:14.512em;}.yui-t3 .yui-b{float:left;width:23.0759em;*width:22.52em;}.yui-t3 #yui-main .yui-b{margin-left:24.0759em;*margin-left:23.52em;}.yui-t4 .yui-b{float:right;width:13.8456em;*width:13.512em;}.yui-t4 #yui-main .yui-b{margin-right:14.8456em;*margin-right:14.512em;}.yui-t5 .yui-b{float:right;width:18.4608em;*width:18.016em;}.yui-t5 #yui-main .yui-b{margin-right:19.4608em;*margin-right:19.016em;}.yui-t6 .yui-b{float:right;width:23.0759em;*width:22.52em;}.yui-t6 #yui-main .yui-b{margin-right:24.0759em;*margin-right:23.52em;}.yui-t7 #yui-main .yui-b{display:block;margin:0 0 1em 0;}#yui-main .yui-b{float:none;width:auto;}.yui-gb .yui-g,.yui-gb .yui-gb,.yui-gb .yui-u,.yui-g .yui-gb .yui-u,.yui-gb .yui-gc,.yui-gb .yui-gd,.yui-gb .yui-ge,.yui-gb .yui-gf,.yui-gc .yui-u,.yui-gc .yui-g,.yui-gd .yui-u{float:left;margin-left:2%;width:32%;}.yui-gb .yui-gb .yui-u,.yui-gb .yui-gc .yui-u{_margin-left:1.2%;*margin-left:1.7%;}.yui-g .yui-gb .yui-u{_margin-left:.8%;}.yui-gb .yui-u{margin-left:2%;width:32%;float:right;*width:31.8%;}.yui-gb div.first{margin-left:0;*margin-right:1px;float:left;}.yui-gb .yui-gb div.first{*margin-right:0;width:31.7%;}.yui-gb .yui-gc div.first,.yui-gb .yui-gd div.first{*margin-right:0;}.yui-g .yui-gc div.first,.yui-g .yui-ge div.first{float:left;}.yui-gb .yui-gd .yui-u{*width:66%;_width:61.2%;}.yui-gb .yui-gd div.first{*width:31%;_width:29.5%;}.yui-gb .yui-gc .yui-u,.yui-g .yui-gc .yui-u{_float:right;width:32%;_width:29.9%;}.yui-gb .yui-gc div.first{width:66%;*width:64.5%;*float:left;*margin-left:0;}.yui-gb .yui-ge .yui-u,.yui-gb .yui-gf .yui-u{margin:0;}.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf,.yui-gc .yui-u,.yui-gd .yui-g,.yui-g .yui-gc .yui-u,.yui-ge .yui-u,.yui-ge .yui-g,.yui-gf .yui-g,.yui-gf .yui-u{float:right;display:inline;}.yui-g div.first,.yui-g div.first,.yui-gc div.first,.yui-gc div.first div.first,.yui-gd div.first,.yui-ge div.first,.yui-gf div.first{float:left;}.yui-g .yui-g .yui-u,.yui-gb .yui-g .yui-u,.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u,.yui-ge .yui-g .yui-u,.yui-gf .yui-g .yui-u{width:48.1%;*margin-left:0;}.yui-g .yui-g div.first{*margin:0;}.yui-gb .yui-g div.first{*margin-right:1px;}.yui-gb .yui-gb .yui-u{_margin-left:.7%;}.yui-gb .yui-g div.first,.yui-gb .yui-gb div.first{*margin-left:0;}.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u{_width:48.1%;*width:48.1%;*margin-left:0;}.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf{width:49.1%;}.yui-g .yui-gb div.first,.yui-gb div.first,.yui-gc div.first,.yui-gd div.first{margin-left:0;}.yui-g .yui-gc div.first,.yui-gc div.first,.yui-gd .yui-g,.yui-gd .yui-u{width:66%;}.yui-gd div.first,.yui-gb .yui-gd div.first{width:32%;}.yui-g .yui-gd div.first{_width:29.9%;}.yui-ge .yui-u,.yui-ge .yui-g,.yui-gf div.first{width:24%;}.yui-ge div.first,.yui-gf .yui-g,.yui-gf .yui-u{width:74.2%;}.yui-gb .yui-ge .yui-u,.yui-gb .yui-gf div.first{*width:24%;_width:20%;}.yui-gb .yui-ge div.first,.yui-gb .yui-gf .yui-u{*width:73.5%;_width:65.5%;}#bd:after,.yui-g:after,.yui-gb:after,.yui-gc:after,.yui-gd:after,.yui-ge:after,.yui-gf:after{content:".";display:block;height:0;clear:both;visibility:hidden;}#bd,.yui-g,.yui-gb,.yui-gc,.yui-gd,.yui-ge,.yui-gf{zoom:1;}
diff --git a/koha-tmpl/opac-tmpl/prog/en/kohaerror.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/kohaerror.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/maintenance.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/maintenance.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-addbybiblionumber.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-addbybiblionumber.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-auth.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-auth.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-authoritiesdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-authoritiesdetail.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-browser.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-browser.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-detailprint.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-detailprint.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-dictionary.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-dictionary.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-recacquisitions.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-recacquisitions.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-recacquisitions.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-recacquisitions.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-review.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-review.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-sendbasket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-sendbasket.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-sendbasketform.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-sendbasketform.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-showreviews.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-showreviews.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-tags_subject.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-tags_subject.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-topissues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-topissues.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
similarity index 100%
rename from koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl
rename to koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl