diff --git a/admin-dev/themes/default/template/controllers/addresses/form.tpl b/admin-dev/themes/default/template/controllers/addresses/form.tpl
index 7e04c2503..0546126ad 100644
--- a/admin-dev/themes/default/template/controllers/addresses/form.tpl
+++ b/admin-dev/themes/default/template/controllers/addresses/form.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="label"}
 {/block}
diff --git a/admin-dev/themes/default/template/controllers/attributes/form.tpl b/admin-dev/themes/default/template/controllers/attributes/form.tpl
index 3e18f9ba2..f4aa833bf 100644
--- a/admin-dev/themes/default/template/controllers/attributes/form.tpl
+++ b/admin-dev/themes/default/template/controllers/attributes/form.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="label"}
 	{if $input.type == 'color'}
diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/form.tpl b/admin-dev/themes/default/template/controllers/attributes_groups/form.tpl
index 48f2d0e3b..c25320bc0 100644
--- a/admin-dev/themes/default/template/controllers/attributes_groups/form.tpl
+++ b/admin-dev/themes/default/template/controllers/attributes_groups/form.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="end_field_block"}
 		</div>
diff --git a/admin-dev/themes/default/template/controllers/backup/download/view.tpl b/admin-dev/themes/default/template/controllers/backup/download/view.tpl
index 43c5d3cd9..a19dd339b 100644
--- a/admin-dev/themes/default/template/controllers/backup/download/view.tpl
+++ b/admin-dev/themes/default/template/controllers/backup/download/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 
diff --git a/admin-dev/themes/default/template/controllers/backup/list_header.tpl b/admin-dev/themes/default/template/controllers/backup/list_header.tpl
index 47ac95877..2db8f4837 100644
--- a/admin-dev/themes/default/template/controllers/backup/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/backup/list_header.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 
 {block name="override_header"}
 
diff --git a/admin-dev/themes/default/template/controllers/backup/view.tpl b/admin-dev/themes/default/template/controllers/backup/view.tpl
index 6a439d8f9..3b8040cef 100644
--- a/admin-dev/themes/default/template/controllers/backup/view.tpl
+++ b/admin-dev/themes/default/template/controllers/backup/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 
diff --git a/admin-dev/themes/default/template/controllers/carriers/form.tpl b/admin-dev/themes/default/template/controllers/carriers/form.tpl
index 13fb01b44..b1895ea21 100644
--- a/admin-dev/themes/default/template/controllers/carriers/form.tpl
+++ b/admin-dev/themes/default/template/controllers/carriers/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name=script}
 	// At the loading
diff --git a/admin-dev/themes/default/template/controllers/carts/view.tpl b/admin-dev/themes/default/template/controllers/carts/view.tpl
index 8d153494a..215d39ce0 100755
--- a/admin-dev/themes/default/template/controllers/carts/view.tpl
+++ b/admin-dev/themes/default/template/controllers/carts/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	
diff --git a/admin-dev/themes/default/template/controllers/categories/form.tpl b/admin-dev/themes/default/template/controllers/categories/form.tpl
index 2474082b4..cf0e9c045 100644
--- a/admin-dev/themes/default/template/controllers/categories/form.tpl
+++ b/admin-dev/themes/default/template/controllers/categories/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="end_field_block"}
 	{if ($input.name == 'groupBox')}
diff --git a/admin-dev/themes/default/template/controllers/categories/list_header.tpl b/admin-dev/themes/default/template/controllers/categories/list_header.tpl
index f59d98a0d..fc9d74451 100644
--- a/admin-dev/themes/default/template/controllers/categories/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/categories/list_header.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 
 {block name=leadin}
 <div class="cat_bar2">
diff --git a/admin-dev/themes/default/template/controllers/cms/form.tpl b/admin-dev/themes/default/template/controllers/cms/form.tpl
index 09c4561f5..9f1392c75 100644
--- a/admin-dev/themes/default/template/controllers/cms/form.tpl
+++ b/admin-dev/themes/default/template/controllers/cms/form.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="script"}
 	$(document).ready(function() {
diff --git a/admin-dev/themes/default/template/controllers/cms_categories/form.tpl b/admin-dev/themes/default/template/controllers/cms_categories/form.tpl
index 5989231e6..63542b4fd 100644
--- a/admin-dev/themes/default/template/controllers/cms_categories/form.tpl
+++ b/admin-dev/themes/default/template/controllers/cms_categories/form.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="start_field_block"}
 	<div class="margin-form">
diff --git a/admin-dev/themes/default/template/controllers/countries/form.tpl b/admin-dev/themes/default/template/controllers/countries/form.tpl
index b57d017d4..27fd10840 100644
--- a/admin-dev/themes/default/template/controllers/countries/form.tpl
+++ b/admin-dev/themes/default/template/controllers/countries/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="start_field_block"}
 	<div class="margin-form">
diff --git a/admin-dev/themes/default/template/controllers/customer_threads/list_header.tpl b/admin-dev/themes/default/template/controllers/customer_threads/list_header.tpl
index 02841a9b2..db4e875c2 100644
--- a/admin-dev/themes/default/template/controllers/customer_threads/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/customer_threads/list_header.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 
 {block name="override_header"}
 
diff --git a/admin-dev/themes/default/template/controllers/customer_threads/options.tpl b/admin-dev/themes/default/template/controllers/customer_threads/options.tpl
index 0289341f1..97fa08959 100644
--- a/admin-dev/themes/default/template/controllers/customer_threads/options.tpl
+++ b/admin-dev/themes/default/template/controllers/customer_threads/options.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/options/options.tpl"}
+{extends file="helpers/options/options.tpl"}
 {block name="after"}
 {if $use_sync}
 		<fieldset><legend>{l s='Sync'}</legend>
diff --git a/admin-dev/themes/default/template/controllers/customer_threads/view.tpl b/admin-dev/themes/default/template/controllers/customer_threads/view.tpl
index 54f3bc2d7..3cdcc42d9 100644
--- a/admin-dev/themes/default/template/controllers/customer_threads/view.tpl
+++ b/admin-dev/themes/default/template/controllers/customer_threads/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	<form action="{$current}&token={$token}&viewcustomer_thread&id_customer_thread={$id_customer_thread}" method="post" enctype="multipart/form-data">
diff --git a/admin-dev/themes/default/template/controllers/customers/list_header.tpl b/admin-dev/themes/default/template/controllers/customers/list_header.tpl
index f5545c7f8..21262fe79 100644
--- a/admin-dev/themes/default/template/controllers/customers/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/customers/list_header.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 
 {block name=leadin}
 	{if isset($delete_customer) && $delete_customer}
diff --git a/admin-dev/themes/default/template/controllers/customers/view.tpl b/admin-dev/themes/default/template/controllers/customers/view.tpl
index 6b02f572e..bd6097e02 100644
--- a/admin-dev/themes/default/template/controllers/customers/view.tpl
+++ b/admin-dev/themes/default/template/controllers/customers/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	<script type="text/javascript">
diff --git a/admin-dev/themes/default/template/controllers/db/form.tpl b/admin-dev/themes/default/template/controllers/db/form.tpl
index cbc173434..017269f57 100644
--- a/admin-dev/themes/default/template/controllers/db/form.tpl
+++ b/admin-dev/themes/default/template/controllers/db/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="label"}
 	{if $input.type == 'table'}
diff --git a/admin-dev/themes/default/template/controllers/employees/form.tpl b/admin-dev/themes/default/template/controllers/employees/form.tpl
index 026447ff8..c869bc301 100644
--- a/admin-dev/themes/default/template/controllers/employees/form.tpl
+++ b/admin-dev/themes/default/template/controllers/employees/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="start_field_block"}
 	<div class="margin-form">
diff --git a/admin-dev/themes/default/template/controllers/feature_value/form.tpl b/admin-dev/themes/default/template/controllers/feature_value/form.tpl
index e3cf0bcf9..ae9fb8d9d 100644
--- a/admin-dev/themes/default/template/controllers/feature_value/form.tpl
+++ b/admin-dev/themes/default/template/controllers/feature_value/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="end_field_block"}
 	</div>
diff --git a/admin-dev/themes/default/template/controllers/features/form.tpl b/admin-dev/themes/default/template/controllers/features/form.tpl
index 865c70edd..7d20d0224 100644
--- a/admin-dev/themes/default/template/controllers/features/form.tpl
+++ b/admin-dev/themes/default/template/controllers/features/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="end_field_block"}
 	</div>
diff --git a/admin-dev/themes/default/template/controllers/generator/options.tpl b/admin-dev/themes/default/template/controllers/generator/options.tpl
index f3f302fca..a7cadb6ea 100644
--- a/admin-dev/themes/default/template/controllers/generator/options.tpl
+++ b/admin-dev/themes/default/template/controllers/generator/options.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/options/options.tpl"}
+{extends file="helpers/options/options.tpl"}
 {block name="defaultOptions"}
 		<form action="{$current}&amp;token={$token}" method="post" enctype="multipart/form-data">
 		<fieldset><legend><img src="../img/admin/htaccess.gif" alt="" />{l s='Htaccess file generation'}</legend>
diff --git a/admin-dev/themes/default/template/controllers/geolocation/options.tpl b/admin-dev/themes/default/template/controllers/geolocation/options.tpl
index 48a112257..bb05b4253 100644
--- a/admin-dev/themes/default/template/controllers/geolocation/options.tpl
+++ b/admin-dev/themes/default/template/controllers/geolocation/options.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/options/options.tpl"} 
+{extends file="helpers/options/options.tpl"}
 {block name="start_field_block"}
 	{if $field['type'] == 'checkbox_table'}
 		<div class="margin-form" style="float: left; padding-left: 0; width: 317px; margin-top: 6px; height: 300px; overflow-y: auto;">
diff --git a/admin-dev/themes/default/template/controllers/group_shop/form.tpl b/admin-dev/themes/default/template/controllers/group_shop/form.tpl
index 7a60bb77f..fd3628a24 100644
--- a/admin-dev/themes/default/template/controllers/group_shop/form.tpl
+++ b/admin-dev/themes/default/template/controllers/group_shop/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name=script}
 
diff --git a/admin-dev/themes/default/template/controllers/groups/form.tpl b/admin-dev/themes/default/template/controllers/groups/form.tpl
index 7d23b0f89..02a1b9be4 100644
--- a/admin-dev/themes/default/template/controllers/groups/form.tpl
+++ b/admin-dev/themes/default/template/controllers/groups/form.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/form/form.tpl"} 
+{extends file="helpers/form/form.tpl"}
 
 {block name="label"}
 	{if $input['type'] == 'modules'}
diff --git a/admin-dev/themes/default/template/controllers/groups/view.tpl b/admin-dev/themes/default/template/controllers/groups/view.tpl
index 2566c9506..12c19f748 100755
--- a/admin-dev/themes/default/template/controllers/groups/view.tpl
+++ b/admin-dev/themes/default/template/controllers/groups/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 
diff --git a/admin-dev/themes/default/template/controllers/import/view.tpl b/admin-dev/themes/default/template/controllers/import/view.tpl
index 997d72b95..e8e64af49 100644
--- a/admin-dev/themes/default/template/controllers/import/view.tpl
+++ b/admin-dev/themes/default/template/controllers/import/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	<script type="text/javascript">
diff --git a/admin-dev/themes/default/template/controllers/information/view.tpl b/admin-dev/themes/default/template/controllers/information/view.tpl
index bf610c33a..53bd581e1 100644
--- a/admin-dev/themes/default/template/controllers/information/view.tpl
+++ b/admin-dev/themes/default/template/controllers/information/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 
diff --git a/admin-dev/themes/default/template/controllers/invoices/form.tpl b/admin-dev/themes/default/template/controllers/invoices/form.tpl
index 1b296009d..259251c10 100644
--- a/admin-dev/themes/default/template/controllers/invoices/form.tpl
+++ b/admin-dev/themes/default/template/controllers/invoices/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name=script}
 
diff --git a/admin-dev/themes/default/template/controllers/languages/form.tpl b/admin-dev/themes/default/template/controllers/languages/form.tpl
index 8cdc53f90..2d53c5535 100644
--- a/admin-dev/themes/default/template/controllers/languages/form.tpl
+++ b/admin-dev/themes/default/template/controllers/languages/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="start_field_block"}
 	<div class="margin-form">
diff --git a/admin-dev/themes/default/template/controllers/logs/list_header.tpl b/admin-dev/themes/default/template/controllers/logs/list_header.tpl
index 1e0b13806..2dcca3f60 100644
--- a/admin-dev/themes/default/template/controllers/logs/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/logs/list_header.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 
 {block name="override_header"}
 
diff --git a/admin-dev/themes/default/template/controllers/manufacturers/view.tpl b/admin-dev/themes/default/template/controllers/manufacturers/view.tpl
index 5de42b631..1685ff730 100644
--- a/admin-dev/themes/default/template/controllers/manufacturers/view.tpl
+++ b/admin-dev/themes/default/template/controllers/manufacturers/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 
diff --git a/admin-dev/themes/default/template/controllers/orders/view.tpl b/admin-dev/themes/default/template/controllers/orders/view.tpl
index 050ddc684..360cef802 100755
--- a/admin-dev/themes/default/template/controllers/orders/view.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	<script type="text/javascript">
diff --git a/admin-dev/themes/default/template/controllers/payment/view.tpl b/admin-dev/themes/default/template/controllers/payment/view.tpl
index 50c531738..728f8384f 100644
--- a/admin-dev/themes/default/template/controllers/payment/view.tpl
+++ b/admin-dev/themes/default/template/controllers/payment/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 {block name="override_tpl"}
 {if !$shop_context}
 	<div class="warn">{l s='You have more than one shop. You need to select one to configure payment.'}</div>
diff --git a/admin-dev/themes/default/template/controllers/performance/form.tpl b/admin-dev/themes/default/template/controllers/performance/form.tpl
index 31b3ecab9..797bcfa92 100644
--- a/admin-dev/themes/default/template/controllers/performance/form.tpl
+++ b/admin-dev/themes/default/template/controllers/performance/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="label"}
 
diff --git a/admin-dev/themes/default/template/controllers/preferences/options.tpl b/admin-dev/themes/default/template/controllers/preferences/options.tpl
index b8f0e39c5..51beb85d5 100644
--- a/admin-dev/themes/default/template/controllers/preferences/options.tpl
+++ b/admin-dev/themes/default/template/controllers/preferences/options.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/options/options.tpl"} 
+{extends file="helpers/options/options.tpl"}
 {block name="start_field_block"}
 	{if $field['type'] == 'disabled'}
 		<div class="margin-form">
diff --git a/admin-dev/themes/default/template/controllers/products/combination/list_footer.tpl b/admin-dev/themes/default/template/controllers/products/combination/list_footer.tpl
index 911b3f0c4..014150500 100644
--- a/admin-dev/themes/default/template/controllers/products/combination/list_footer.tpl
+++ b/admin-dev/themes/default/template/controllers/products/combination/list_footer.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/list/list_footer.tpl"}
+{extends file="helpers/list/list_footer.tpl"}
 
 {block name="after"}
 
diff --git a/admin-dev/themes/default/template/controllers/products/form.tpl b/admin-dev/themes/default/template/controllers/products/form.tpl
index e95aed86c..b0324ceda 100644
--- a/admin-dev/themes/default/template/controllers/products/form.tpl
+++ b/admin-dev/themes/default/template/controllers/products/form.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="autoload_tinyMCE"}
 	// Execute when tab Informations has finished loading
diff --git a/admin-dev/themes/default/template/controllers/products/list_header.tpl b/admin-dev/themes/default/template/controllers/products/list_header.tpl
index c25442474..a4545d2c9 100644
--- a/admin-dev/themes/default/template/controllers/products/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/products/list_header.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 
 {block name=leadin}
 	{if isset($category_tree)}
diff --git a/admin-dev/themes/default/template/controllers/referrers/form.tpl b/admin-dev/themes/default/template/controllers/referrers/form.tpl
index f90365bf1..d65a79499 100644
--- a/admin-dev/themes/default/template/controllers/referrers/form.tpl
+++ b/admin-dev/themes/default/template/controllers/referrers/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="other_fieldsets"}
 	{if $f == 1}
diff --git a/admin-dev/themes/default/template/controllers/referrers/list_header.tpl b/admin-dev/themes/default/template/controllers/referrers/list_header.tpl
index 6c0a09d24..de74cbcae 100644
--- a/admin-dev/themes/default/template/controllers/referrers/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/referrers/list_header.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 
 {block name="override_header"}
 	<script language="javascript">
diff --git a/admin-dev/themes/default/template/controllers/referrers/view.tpl b/admin-dev/themes/default/template/controllers/referrers/view.tpl
index 56616cda2..b33616232 100644
--- a/admin-dev/themes/default/template/controllers/referrers/view.tpl
+++ b/admin-dev/themes/default/template/controllers/referrers/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	<script language="javascript">
diff --git a/admin-dev/themes/default/template/controllers/request_sql/form.tpl b/admin-dev/themes/default/template/controllers/request_sql/form.tpl
index 3ebd3a719..43581bffd 100644
--- a/admin-dev/themes/default/template/controllers/request_sql/form.tpl
+++ b/admin-dev/themes/default/template/controllers/request_sql/form.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="after"}
 	<br />
diff --git a/admin-dev/themes/default/template/controllers/request_sql/view.tpl b/admin-dev/themes/default/template/controllers/request_sql/view.tpl
index 6f38cdf30..a0df93896 100644
--- a/admin-dev/themes/default/template/controllers/request_sql/view.tpl
+++ b/admin-dev/themes/default/template/controllers/request_sql/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	{if isset($view['error'])}
diff --git a/admin-dev/themes/default/template/controllers/return/form.tpl b/admin-dev/themes/default/template/controllers/return/form.tpl
index d40079aab..979ace49c 100644
--- a/admin-dev/themes/default/template/controllers/return/form.tpl
+++ b/admin-dev/themes/default/template/controllers/return/form.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file='helper/form/form.tpl'}
+{extends file='helpers/form/form.tpl'}
 
 {block name="start_field_block"}
 	<div class="margin-form">
diff --git a/admin-dev/themes/default/template/controllers/scenes/form.tpl b/admin-dev/themes/default/template/controllers/scenes/form.tpl
index 0c6c6992f..7c9b29451 100644
--- a/admin-dev/themes/default/template/controllers/scenes/form.tpl
+++ b/admin-dev/themes/default/template/controllers/scenes/form.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="end_field_block"}
 	{if ($input.type == "description")}
diff --git a/admin-dev/themes/default/template/controllers/shop/form.tpl b/admin-dev/themes/default/template/controllers/shop/form.tpl
index c816fe066..26b946bae 100644
--- a/admin-dev/themes/default/template/controllers/shop/form.tpl
+++ b/admin-dev/themes/default/template/controllers/shop/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 {debug}
 {block name="label"}
 
diff --git a/admin-dev/themes/default/template/controllers/shop_url/form.tpl b/admin-dev/themes/default/template/controllers/shop_url/form.tpl
index 957b7a138..3a4040fa1 100644
--- a/admin-dev/themes/default/template/controllers/shop_url/form.tpl
+++ b/admin-dev/themes/default/template/controllers/shop_url/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name=script}
 	$(document).ready(function(){
diff --git a/admin-dev/themes/default/template/controllers/slip/form.tpl b/admin-dev/themes/default/template/controllers/slip/form.tpl
index 3fa2a8a1f..ec43820ec 100644
--- a/admin-dev/themes/default/template/controllers/slip/form.tpl
+++ b/admin-dev/themes/default/template/controllers/slip/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name=script}
 
diff --git a/admin-dev/themes/default/template/controllers/specific_price_rule/form.tpl b/admin-dev/themes/default/template/controllers/specific_price_rule/form.tpl
index b186deb94..ea41057ef 100755
--- a/admin-dev/themes/default/template/controllers/specific_price_rule/form.tpl
+++ b/admin-dev/themes/default/template/controllers/specific_price_rule/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="other_fieldsets"}
 
diff --git a/admin-dev/themes/default/template/controllers/stats/view.tpl b/admin-dev/themes/default/template/controllers/stats/view.tpl
index 4a218729e..5bb6d80f5 100644
--- a/admin-dev/themes/default/template/controllers/stats/view.tpl
+++ b/admin-dev/themes/default/template/controllers/stats/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	<script language="javascript">
diff --git a/admin-dev/themes/default/template/controllers/statuses/form.tpl b/admin-dev/themes/default/template/controllers/statuses/form.tpl
index 553f5334f..3b3d68923 100644
--- a/admin-dev/themes/default/template/controllers/statuses/form.tpl
+++ b/admin-dev/themes/default/template/controllers/statuses/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="label"}
 	{if $input.type == "select_template"}
diff --git a/admin-dev/themes/default/template/controllers/stock_cover/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_cover/list_header.tpl
index fc2489889..ff0631b7a 100644
--- a/admin-dev/themes/default/template/controllers/stock_cover/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/stock_cover/list_header.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 {block name=override_header}
 <div class="filter-stock-extended">
 	<form id="stock_cover" type="get">
diff --git a/admin-dev/themes/default/template/controllers/stock_instant_state/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_instant_state/list_header.tpl
index 34ff8d2eb..0dd17ee30 100644
--- a/admin-dev/themes/default/template/controllers/stock_instant_state/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/stock_instant_state/list_header.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 {block name=override_header}
 <div class="filter-stock">
 	<form id="stock_instant_state" type="get">
diff --git a/admin-dev/themes/default/template/controllers/stock_mvt/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_mvt/list_header.tpl
index 58d0f6a9e..799dc228d 100644
--- a/admin-dev/themes/default/template/controllers/stock_mvt/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/stock_mvt/list_header.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 {block name=override_header}
 	{if count($list_warehouses) > 0}
 <div class="filter-stock">
diff --git a/admin-dev/themes/default/template/controllers/stores/form.tpl b/admin-dev/themes/default/template/controllers/stores/form.tpl
index 1bb953fb3..b568c6816 100644
--- a/admin-dev/themes/default/template/controllers/stores/form.tpl
+++ b/admin-dev/themes/default/template/controllers/stores/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name=script}
 
diff --git a/admin-dev/themes/default/template/controllers/suppliers/view.tpl b/admin-dev/themes/default/template/controllers/suppliers/view.tpl
index 208a859ec..7c576b4f5 100644
--- a/admin-dev/themes/default/template/controllers/suppliers/view.tpl
+++ b/admin-dev/themes/default/template/controllers/suppliers/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 
diff --git a/admin-dev/themes/default/template/controllers/supply_orders/form.tpl b/admin-dev/themes/default/template/controllers/supply_orders/form.tpl
index 59a1654eb..cea00dc1d 100644
--- a/admin-dev/themes/default/template/controllers/supply_orders/form.tpl
+++ b/admin-dev/themes/default/template/controllers/supply_orders/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="other_fieldsets"}
 	{if isset($show_product_management_form)}
diff --git a/admin-dev/themes/default/template/controllers/supply_orders/list_header.tpl b/admin-dev/themes/default/template/controllers/supply_orders/list_header.tpl
index 4030af281..8670d815f 100644
--- a/admin-dev/themes/default/template/controllers/supply_orders/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/supply_orders/list_header.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 {block name=override_header}
 {if isset($warehouses) && count($warehouses) > 0 && isset($filter_status)}
 <div class="filter-stock-extended">
diff --git a/admin-dev/themes/default/template/controllers/supply_orders/view.tpl b/admin-dev/themes/default/template/controllers/supply_orders/view.tpl
index e3235322d..94f3973b1 100755
--- a/admin-dev/themes/default/template/controllers/supply_orders/view.tpl
+++ b/admin-dev/themes/default/template/controllers/supply_orders/view.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	<div style="margin-top: 20px;">
diff --git a/admin-dev/themes/default/template/controllers/supply_orders_change_state/form.tpl b/admin-dev/themes/default/template/controllers/supply_orders_change_state/form.tpl
index 384ce0c7d..322861d81 100644
--- a/admin-dev/themes/default/template/controllers/supply_orders_change_state/form.tpl
+++ b/admin-dev/themes/default/template/controllers/supply_orders_change_state/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="other_input"}
 
diff --git a/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/list_header.tpl b/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/list_header.tpl
index 2086ab1f2..c1b30909b 100644
--- a/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/list_header.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 {block name=override_header}
 <script language="javascript">
 $(document).ready(function() {
diff --git a/admin-dev/themes/default/template/controllers/tags/form.tpl b/admin-dev/themes/default/template/controllers/tags/form.tpl
index 98ef449b4..7c43f213c 100644
--- a/admin-dev/themes/default/template/controllers/tags/form.tpl
+++ b/admin-dev/themes/default/template/controllers/tags/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="other_input"}
 	{if $key eq 'selects'}
diff --git a/admin-dev/themes/default/template/controllers/tax_rules/form.tpl b/admin-dev/themes/default/template/controllers/tax_rules/form.tpl
index faed1bdf3..28a37864c 100644
--- a/admin-dev/themes/default/template/controllers/tax_rules/form.tpl
+++ b/admin-dev/themes/default/template/controllers/tax_rules/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="label"}
 	{if isset($input.label)}
diff --git a/admin-dev/themes/default/template/controllers/tax_rules_group/form.tpl b/admin-dev/themes/default/template/controllers/tax_rules_group/form.tpl
index 882807024..a98a7fc21 100644
--- a/admin-dev/themes/default/template/controllers/tax_rules_group/form.tpl
+++ b/admin-dev/themes/default/template/controllers/tax_rules_group/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="after"}
 	<br />
diff --git a/admin-dev/themes/default/template/controllers/themes/options.tpl b/admin-dev/themes/default/template/controllers/themes/options.tpl
index 8bfc6f531..639d40a94 100644
--- a/admin-dev/themes/default/template/controllers/themes/options.tpl
+++ b/admin-dev/themes/default/template/controllers/themes/options.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/options/options.tpl"}
+{extends file="helpers/options/options.tpl"}
 {block name="after"}
 <br/><br/>
 <fieldset id="prestastore-content" class="width3"></fieldset>
diff --git a/admin-dev/themes/default/template/controllers/tracking/list_header.tpl b/admin-dev/themes/default/template/controllers/tracking/list_header.tpl
index a94934ce5..58d63be65 100644
--- a/admin-dev/themes/default/template/controllers/tracking/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/tracking/list_header.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 
 {block name="override_header"}
 	<h2>{$sub_title}</h2>
diff --git a/admin-dev/themes/default/template/controllers/translations/main.tpl b/admin-dev/themes/default/template/controllers/translations/main.tpl
index c8abd82bd..a61806915 100644
--- a/admin-dev/themes/default/template/controllers/translations/main.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/main.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	<script type="text/javascript">
diff --git a/admin-dev/themes/default/template/controllers/translations/translation_errors.tpl b/admin-dev/themes/default/template/controllers/translations/translation_errors.tpl
index 1d1af5920..1d35caf12 100644
--- a/admin-dev/themes/default/template/controllers/translations/translation_errors.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/translation_errors.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	
diff --git a/admin-dev/themes/default/template/controllers/translations/translation_form.tpl b/admin-dev/themes/default/template/controllers/translations/translation_form.tpl
index 23c90b311..28e0ed697 100644
--- a/admin-dev/themes/default/template/controllers/translations/translation_form.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/translation_form.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 
diff --git a/admin-dev/themes/default/template/controllers/translations/translation_mails.tpl b/admin-dev/themes/default/template/controllers/translations/translation_mails.tpl
index e5f41fc4d..e4646e904 100644
--- a/admin-dev/themes/default/template/controllers/translations/translation_mails.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/translation_mails.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	
diff --git a/admin-dev/themes/default/template/controllers/translations/translation_modules.tpl b/admin-dev/themes/default/template/controllers/translations/translation_modules.tpl
index 502c78c92..3a6e1a9f7 100644
--- a/admin-dev/themes/default/template/controllers/translations/translation_modules.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/translation_modules.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	
diff --git a/admin-dev/themes/default/template/controllers/warehouses/view.tpl b/admin-dev/themes/default/template/controllers/warehouses/view.tpl
index 9af4c825b..1f67ad786 100644
--- a/admin-dev/themes/default/template/controllers/warehouses/view.tpl
+++ b/admin-dev/themes/default/template/controllers/warehouses/view.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 {block name="override_tpl"}
 {if isset($warehouse)}
 	<div>
diff --git a/admin-dev/themes/default/template/controllers/webservice/form.tpl b/admin-dev/themes/default/template/controllers/webservice/form.tpl
index 92679324a..d8fe716f7 100644
--- a/admin-dev/themes/default/template/controllers/webservice/form.tpl
+++ b/admin-dev/themes/default/template/controllers/webservice/form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="end_field_block"}
 	{if $input.type == 'text' && $input.name == 'key'}
diff --git a/admin-dev/themes/default/template/helper/assoshop.tpl b/admin-dev/themes/default/template/helpers/assoshop.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/assoshop.tpl
rename to admin-dev/themes/default/template/helpers/assoshop.tpl
diff --git a/admin-dev/themes/default/template/helper/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
similarity index 98%
rename from admin-dev/themes/default/template/helper/form/form.tpl
rename to admin-dev/themes/default/template/helpers/form/form.tpl
index abba10d96..c4a091ed3 100644
--- a/admin-dev/themes/default/template/helper/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -288,11 +288,11 @@
 								{/foreach}
 							{elseif $input.type == 'group'}
 								{assign var=groups value=$input.values}
-								{include file='helper/form/form_group.tpl'}
+								{include file='helpers/form/form_group.tpl'}
 							{elseif $input.type == 'shop' OR $input.type == 'group_shop'}
-								{include file='helper/assoshop.tpl' input=$input fields_value=$fields_value}
+								{include file='helpers/assoshop.tpl' input=$input fields_value=$fields_value}
 							{elseif $input.type == 'categories'}
-								{include file='helper/form/form_category.tpl' categories=$input.values}
+								{include file='helpers/form/form_category.tpl' categories=$input.values}
 							{elseif $input.type == 'categories_select'}
 								{$input.category_tree}
 							{elseif $input.type == 'asso_shop' && isset($asso_shop) && $asso_shop}
diff --git a/admin-dev/themes/default/template/helper/form/form_category.tpl b/admin-dev/themes/default/template/helpers/form/form_category.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/form/form_category.tpl
rename to admin-dev/themes/default/template/helpers/form/form_category.tpl
diff --git a/admin-dev/themes/default/template/helper/form/form_group.tpl b/admin-dev/themes/default/template/helpers/form/form_group.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/form/form_group.tpl
rename to admin-dev/themes/default/template/helpers/form/form_group.tpl
diff --git a/admin-dev/themes/default/template/helper/help_access/button.tpl b/admin-dev/themes/default/template/helpers/help_access/button.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/help_access/button.tpl
rename to admin-dev/themes/default/template/helpers/help_access/button.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list.tpl b/admin-dev/themes/default/template/helpers/list/list.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list.tpl
rename to admin-dev/themes/default/template/helpers/list/list.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_action_addstock.tpl b/admin-dev/themes/default/template/helpers/list/list_action_addstock.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_action_addstock.tpl
rename to admin-dev/themes/default/template/helpers/list/list_action_addstock.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_action_default.tpl b/admin-dev/themes/default/template/helpers/list/list_action_default.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_action_default.tpl
rename to admin-dev/themes/default/template/helpers/list/list_action_default.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_action_delete.tpl b/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_action_delete.tpl
rename to admin-dev/themes/default/template/helpers/list/list_action_delete.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_action_details.tpl b/admin-dev/themes/default/template/helpers/list/list_action_details.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_action_details.tpl
rename to admin-dev/themes/default/template/helpers/list/list_action_details.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_action_duplicate.tpl b/admin-dev/themes/default/template/helpers/list/list_action_duplicate.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_action_duplicate.tpl
rename to admin-dev/themes/default/template/helpers/list/list_action_duplicate.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_action_edit.tpl b/admin-dev/themes/default/template/helpers/list/list_action_edit.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_action_edit.tpl
rename to admin-dev/themes/default/template/helpers/list/list_action_edit.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_action_enable.tpl b/admin-dev/themes/default/template/helpers/list/list_action_enable.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_action_enable.tpl
rename to admin-dev/themes/default/template/helpers/list/list_action_enable.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_action_removestock.tpl b/admin-dev/themes/default/template/helpers/list/list_action_removestock.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_action_removestock.tpl
rename to admin-dev/themes/default/template/helpers/list/list_action_removestock.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_action_supplier_order_receipt.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supplier_order_receipt.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_action_supplier_order_receipt.tpl
rename to admin-dev/themes/default/template/helpers/list/list_action_supplier_order_receipt.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_action_supply_order_change_state.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_action_supply_order_change_state.tpl
rename to admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_action_supply_order_create_from_template.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_action_supply_order_create_from_template.tpl
rename to admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_action_supply_order_receipt.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_action_supply_order_receipt.tpl
rename to admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_action_transferstock.tpl b/admin-dev/themes/default/template/helpers/list/list_action_transferstock.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_action_transferstock.tpl
rename to admin-dev/themes/default/template/helpers/list/list_action_transferstock.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_action_view.tpl b/admin-dev/themes/default/template/helpers/list/list_action_view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_action_view.tpl
rename to admin-dev/themes/default/template/helpers/list/list_action_view.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_content.tpl b/admin-dev/themes/default/template/helpers/list/list_content.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_content.tpl
rename to admin-dev/themes/default/template/helpers/list/list_content.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_footer.tpl b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_footer.tpl
rename to admin-dev/themes/default/template/helpers/list/list_footer.tpl
diff --git a/admin-dev/themes/default/template/helper/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/list/list_header.tpl
rename to admin-dev/themes/default/template/helpers/list/list_header.tpl
diff --git a/admin-dev/themes/default/template/helper/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/options/options.tpl
rename to admin-dev/themes/default/template/helpers/options/options.tpl
diff --git a/admin-dev/themes/default/template/helper/required_fields.tpl b/admin-dev/themes/default/template/helpers/required_fields.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/required_fields.tpl
rename to admin-dev/themes/default/template/helpers/required_fields.tpl
diff --git a/admin-dev/themes/default/template/helper/view/view.tpl b/admin-dev/themes/default/template/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/helper/view/view.tpl
rename to admin-dev/themes/default/template/helpers/view/view.tpl
diff --git a/classes/helper/HelperForm.php b/classes/helper/HelperForm.php
index 1e89a7262..e1ee2de18 100644
--- a/classes/helper/HelperForm.php
+++ b/classes/helper/HelperForm.php
@@ -55,7 +55,7 @@ class HelperFormCore extends Helper
 
 	public function __construct()
 	{
-		$this->base_folder = 'helper/form/';
+		$this->base_folder = 'helpers/form/';
 		$this->base_tpl = 'form.tpl';
 		parent::__construct();
 	}
diff --git a/classes/helper/HelperHelpAccess.php b/classes/helper/HelperHelpAccess.php
index ca7bad4b7..855e78bfa 100644
--- a/classes/helper/HelperHelpAccess.php
+++ b/classes/helper/HelperHelpAccess.php
@@ -38,7 +38,7 @@ class HelperHelpAccessCore extends Helper
     public function __construct($label, $iso_lang, $country, $ps_version)
     {
         parent::__construct();
-        $this->base_folder = 'helper/help_access/';
+        $this->base_folder = 'helpers/help_access/';
 
         $this->tpl = $this->createTemplate('button.tpl');
         $this->label = $label;
diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php
index f77e2f3e1..e2cb35024 100644
--- a/classes/helper/HelperList.php
+++ b/classes/helper/HelperList.php
@@ -122,7 +122,7 @@ class HelperListCore extends Helper
 
 	public function __construct()
 	{
-		$this->base_folder = 'helper/list/';
+		$this->base_folder = 'helpers/list/';
 		$this->base_tpl = 'list.tpl';
 
 		parent::__construct();
diff --git a/classes/helper/HelperOptions.php b/classes/helper/HelperOptions.php
index a30787153..6fbd41d1d 100644
--- a/classes/helper/HelperOptions.php
+++ b/classes/helper/HelperOptions.php
@@ -34,7 +34,7 @@ class HelperOptionsCore extends Helper
 
 	public function __construct()
 	{
-		$this->base_folder = 'helper/options/';
+		$this->base_folder = 'helpers/options/';
 		$this->base_tpl = 'options.tpl';
 		parent::__construct();
 	}
diff --git a/classes/helper/HelperView.php b/classes/helper/HelperView.php
index 23ad4c47f..ac2d21c8f 100644
--- a/classes/helper/HelperView.php
+++ b/classes/helper/HelperView.php
@@ -37,7 +37,7 @@ class HelperViewCore extends Helper
 
 	public function __construct()
 	{
-		$this->base_folder = 'helper/view/';
+		$this->base_folder = 'helpers/view/';
 		$this->base_tpl = 'view.tpl';
 		parent::__construct();
 	}
diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php
index 2e2683003..0f4a14604 100644
--- a/controllers/admin/AdminCustomersController.php
+++ b/controllers/admin/AdminCustomersController.php
@@ -857,7 +857,7 @@ class AdminCustomersControllerCore extends AdminController
 	 */
 	public function displayDeleteLink($token = null, $id, $name = null)
 	{
-		$tpl = $this->createTemplate('helper/list/list_action_delete.tpl');
+		$tpl = $this->createTemplate('helpers/list/list_action_delete.tpl');
 
 		$customer = new Customer($id);
 		$name = $customer->lastname.' '.$customer->firstname;
diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php
index 11b845e7f..3f2f68504 100644
--- a/controllers/admin/AdminManufacturersController.php
+++ b/controllers/admin/AdminManufacturersController.php
@@ -227,7 +227,7 @@ class AdminManufacturersControllerCore extends AdminController
 			'action' => self::$cache_lang['editaddresses'],
 		));
 
-		return $this->context->smarty->fetch('helper/list/list_action_edit.tpl');
+		return $this->context->smarty->fetch('helpers/list/list_action_edit.tpl');
 	}
 
 	public function renderForm()
diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php
index dd0b69b81..cd580c360 100644
--- a/controllers/admin/AdminStatusesController.php
+++ b/controllers/admin/AdminStatusesController.php
@@ -477,7 +477,7 @@ class AdminStatusesControllerCore extends AdminController
 			'action' => self::$cache_lang['editstatus'],
 		));
 
-		return $this->context->smarty->fetch('helper/list/list_action_edit.tpl');
+		return $this->context->smarty->fetch('helpers/list/list_action_edit.tpl');
 	}
 
 	public function postProcess()
diff --git a/controllers/admin/AdminStockManagementController.php b/controllers/admin/AdminStockManagementController.php
index e3eb78e43..3ecbba0c7 100644
--- a/controllers/admin/AdminStockManagementController.php
+++ b/controllers/admin/AdminStockManagementController.php
@@ -1095,7 +1095,7 @@ class AdminStockManagementControllerCore extends AdminController
             'action' => self::$cache_lang['AddStock'],
         ));
 
-        return $this->context->smarty->fetch('helper/list/list_action_addstock.tpl');
+        return $this->context->smarty->fetch('helpers/list/list_action_addstock.tpl');
 	}
 
     /**
@@ -1116,7 +1116,7 @@ class AdminStockManagementControllerCore extends AdminController
             'action' => self::$cache_lang['RemoveStock'],
         ));
 
-        return $this->context->smarty->fetch('helper/list/list_action_removestock.tpl');
+        return $this->context->smarty->fetch('helpers/list/list_action_removestock.tpl');
     }
 
     /**
@@ -1137,6 +1137,6 @@ class AdminStockManagementControllerCore extends AdminController
             'action' => self::$cache_lang['TransferStock'],
         ));
 
-        return $this->context->smarty->fetch('helper/list/list_action_transferstock.tpl');
+        return $this->context->smarty->fetch('helpers/list/list_action_transferstock.tpl');
     }
 }
\ No newline at end of file
diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php
index 0ef7a7656..f2a93db90 100644
--- a/controllers/admin/AdminSupplyOrdersController.php
+++ b/controllers/admin/AdminSupplyOrdersController.php
@@ -1377,7 +1377,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
             'action' => self::$cache_lang['Receipt'],
         ));
 
-        return $this->context->smarty->fetch('helper/list/list_action_supply_order_receipt.tpl');
+        return $this->context->smarty->fetch('helpers/list/list_action_supply_order_receipt.tpl');
     }
 
     /**
@@ -1398,7 +1398,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
             'action' => self::$cache_lang['State'],
         ));
 
-        return $this->context->smarty->fetch('helper/list/list_action_supply_order_change_state.tpl');
+        return $this->context->smarty->fetch('helpers/list/list_action_supply_order_change_state.tpl');
     }
 
     /**
@@ -1423,7 +1423,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
             'action' => self::$cache_lang['CreateSupplyOrder'],
         ));
 
-        return $this->context->smarty->fetch('helper/list/list_action_supply_order_create_from_template.tpl');
+        return $this->context->smarty->fetch('helpers/list/list_action_supply_order_create_from_template.tpl');
     }
 
 	/**
diff --git a/controllers/admin/AdminTaxesController.php b/controllers/admin/AdminTaxesController.php
index 50c24e276..ed1246467 100644
--- a/controllers/admin/AdminTaxesController.php
+++ b/controllers/admin/AdminTaxesController.php
@@ -86,7 +86,7 @@ class AdminTaxesControllerCore extends AdminController
 			'action' => self::$cache_lang['Delete'],
 		));
 
-		return $this->context->smarty->fetch('helper/list/list_action_delete.tpl');
+		return $this->context->smarty->fetch('helpers/list/list_action_delete.tpl');
 	}
 
 	/**
@@ -104,7 +104,7 @@ class AdminTaxesControllerCore extends AdminController
 		if ($value && TaxRule::isTaxInUse($id))
 			$confirm = $this->l('This tax is currently in use in a tax rule. If you continue this tax will be removed from the tax rule, are you sure?');
 
-		$tpl_enable = $this->context->smarty->createTemplate('helper/list/list_action_enable.tpl');
+		$tpl_enable = $this->context->smarty->createTemplate('helpers/list/list_action_enable.tpl');
 		$tpl_enable->assign(array(
 			'enabled' => (bool)$value,
 			'url_enable' => self::$currentIndex.'&'.$this->identifier.'='.$id.'&'.$active.$this->table.