diff --git a/admin-dev/themes/default/template/controllers/addresses/form.tpl b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/addresses/form.tpl
rename to admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/attributes/form.tpl b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/attributes/form.tpl
rename to admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/attributes/list_content.tpl b/admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/attributes/list_content.tpl
rename to admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl
diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/form.tpl b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/attributes_groups/form.tpl
rename to admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/list_content.tpl b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/list_content.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/attributes_groups/list_content.tpl
rename to admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/list_content.tpl
diff --git a/admin-dev/themes/default/template/controllers/backup/list_header.tpl b/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/backup/list_header.tpl
rename to admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
diff --git a/admin-dev/themes/default/template/controllers/backup/view.tpl b/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/backup/view.tpl
rename to admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl
diff --git a/admin-dev/themes/default/template/controllers/carriers/form.tpl b/admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/carriers/form.tpl
rename to admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/carts/view.tpl b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/carts/view.tpl
rename to admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
diff --git a/admin-dev/themes/default/template/controllers/categories/form.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/categories/form.tpl
rename to admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/categories/list_header.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/categories/list_header.tpl
rename to admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
diff --git a/admin-dev/themes/default/template/controllers/cms/form.tpl b/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/cms/form.tpl
rename to admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/cms_categories/form.tpl b/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/cms_categories/form.tpl
rename to admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/countries/form.tpl b/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/countries/form.tpl
rename to admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/countries/list_footer.tpl b/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/countries/list_footer.tpl
rename to admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
diff --git a/admin-dev/themes/default/template/controllers/customer_threads/list_header.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/list/list_header.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/customer_threads/list_header.tpl
rename to admin-dev/themes/default/template/controllers/customer_threads/helpers/list/list_header.tpl
diff --git a/admin-dev/themes/default/template/controllers/customer_threads/options.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/customer_threads/options.tpl
rename to admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl
diff --git a/admin-dev/themes/default/template/controllers/customer_threads/view.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/customer_threads/view.tpl
rename to admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl
diff --git a/admin-dev/themes/default/template/controllers/customers/list_header.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/customers/list_header.tpl
rename to admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
diff --git a/admin-dev/themes/default/template/controllers/customers/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/customers/view.tpl
rename to admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
diff --git a/admin-dev/themes/default/template/controllers/db/form.tpl b/admin-dev/themes/default/template/controllers/db/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/db/form.tpl
rename to admin-dev/themes/default/template/controllers/db/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/employees/form.tpl b/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/employees/form.tpl
rename to admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/feature_value/form.tpl b/admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/feature_value/form.tpl
rename to admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/features/form.tpl b/admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/features/form.tpl
rename to admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/generator/options.tpl b/admin-dev/themes/default/template/controllers/generator/helpers/options/options.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/generator/options.tpl
rename to admin-dev/themes/default/template/controllers/generator/helpers/options/options.tpl
diff --git a/admin-dev/themes/default/template/controllers/geolocation/options.tpl b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/geolocation/options.tpl
rename to admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl
diff --git a/admin-dev/themes/default/template/controllers/group_shop/form.tpl b/admin-dev/themes/default/template/controllers/group_shop/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/group_shop/form.tpl
rename to admin-dev/themes/default/template/controllers/group_shop/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/groups/form.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/groups/form.tpl
rename to admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/groups/view.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/groups/view.tpl
rename to admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
diff --git a/admin-dev/themes/default/template/controllers/import/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/import/form.tpl
rename to admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/import/view.tpl b/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/import/view.tpl
rename to admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
diff --git a/admin-dev/themes/default/template/controllers/information/view.tpl b/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/information/view.tpl
rename to admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
diff --git a/admin-dev/themes/default/template/controllers/invoices/form.tpl b/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/invoices/form.tpl
rename to admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/languages/form.tpl b/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/languages/form.tpl
rename to admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/logs/list_header.tpl b/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/logs/list_header.tpl
rename to admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl
diff --git a/admin-dev/themes/default/template/controllers/manufacturers/view.tpl b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/manufacturers/view.tpl
rename to admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl
diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/orders/form.tpl
rename to admin-dev/themes/default/template/controllers/orders/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/orders/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/orders/view.tpl
rename to admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
diff --git a/admin-dev/themes/default/template/controllers/payment/view.tpl b/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/payment/view.tpl
rename to admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
diff --git a/admin-dev/themes/default/template/controllers/performance/form.tpl b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/performance/form.tpl
rename to admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/preferences/options.tpl b/admin-dev/themes/default/template/controllers/preferences/helpers/options/options.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/preferences/options.tpl
rename to admin-dev/themes/default/template/controllers/preferences/helpers/options/options.tpl
diff --git a/admin-dev/themes/default/template/controllers/products/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/products/form.tpl
rename to admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/products/list_header.tpl b/admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/products/list_header.tpl
rename to admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl
diff --git a/admin-dev/themes/default/template/controllers/referrers/form.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/referrers/form.tpl
rename to admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/referrers/list_header.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/list/list_header.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/referrers/list_header.tpl
rename to admin-dev/themes/default/template/controllers/referrers/helpers/list/list_header.tpl
diff --git a/admin-dev/themes/default/template/controllers/referrers/view.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/referrers/view.tpl
rename to admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
diff --git a/admin-dev/themes/default/template/controllers/request_sql/form.tpl b/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/request_sql/form.tpl
rename to admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/request_sql/view.tpl b/admin-dev/themes/default/template/controllers/request_sql/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/request_sql/view.tpl
rename to admin-dev/themes/default/template/controllers/request_sql/helpers/view/view.tpl
diff --git a/admin-dev/themes/default/template/controllers/return/form.tpl b/admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/return/form.tpl
rename to admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/scenes/form.tpl b/admin-dev/themes/default/template/controllers/scenes/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/scenes/form.tpl
rename to admin-dev/themes/default/template/controllers/scenes/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/shop/form.tpl b/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/shop/form.tpl
rename to admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/shop_url/form.tpl b/admin-dev/themes/default/template/controllers/shop_url/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/shop_url/form.tpl
rename to admin-dev/themes/default/template/controllers/shop_url/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/slip/form.tpl b/admin-dev/themes/default/template/controllers/slip/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/slip/form.tpl
rename to admin-dev/themes/default/template/controllers/slip/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/specific_price_rule/form.tpl b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/specific_price_rule/form.tpl
rename to admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/stats/view.tpl b/admin-dev/themes/default/template/controllers/stats/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/stats/view.tpl
rename to admin-dev/themes/default/template/controllers/stats/helpers/view/view.tpl
diff --git a/admin-dev/themes/default/template/controllers/statuses/form.tpl b/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/statuses/form.tpl
rename to admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/stock_cover/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/stock_cover/list_header.tpl
rename to admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl
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/helpers/list/list_header.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/stock_instant_state/list_header.tpl
rename to admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl
diff --git a/admin-dev/themes/default/template/controllers/stock_mvt/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/stock_mvt/list_header.tpl
rename to admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl
diff --git a/admin-dev/themes/default/template/controllers/stores/form.tpl b/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/stores/form.tpl
rename to admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/suppliers/view.tpl b/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/suppliers/view.tpl
rename to admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl
diff --git a/admin-dev/themes/default/template/controllers/supply_orders/form.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/supply_orders/form.tpl
rename to admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/supply_orders/list_header.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/supply_orders/list_header.tpl
rename to admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl
diff --git a/admin-dev/themes/default/template/controllers/supply_orders/view.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/supply_orders/view.tpl
rename to admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl
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/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/supply_orders_change_state/form.tpl
rename to admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl
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/helpers/list/list_header.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/supply_orders_receipt_history/list_header.tpl
rename to admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/list/list_header.tpl
diff --git a/admin-dev/themes/default/template/controllers/tags/form.tpl b/admin-dev/themes/default/template/controllers/tags/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/tags/form.tpl
rename to admin-dev/themes/default/template/controllers/tags/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/tax_rules/form.tpl b/admin-dev/themes/default/template/controllers/tax_rules/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/tax_rules/form.tpl
rename to admin-dev/themes/default/template/controllers/tax_rules/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/tax_rules/list_action_edit.tpl b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_action_edit.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/tax_rules/list_action_edit.tpl
rename to admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_action_edit.tpl
diff --git a/admin-dev/themes/default/template/controllers/tax_rules/list_content.tpl b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/tax_rules/list_content.tpl
rename to admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl
diff --git a/admin-dev/themes/default/template/controllers/tax_rules_group/form.tpl b/admin-dev/themes/default/template/controllers/tax_rules_group/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/tax_rules_group/form.tpl
rename to admin-dev/themes/default/template/controllers/tax_rules_group/helpers/form/form.tpl
diff --git a/admin-dev/themes/default/template/controllers/themes/options.tpl b/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/themes/options.tpl
rename to admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl
diff --git a/admin-dev/themes/default/template/controllers/tracking/list_header.tpl b/admin-dev/themes/default/template/controllers/tracking/helpers/list/list_header.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/tracking/list_header.tpl
rename to admin-dev/themes/default/template/controllers/tracking/helpers/list/list_header.tpl
diff --git a/admin-dev/themes/default/template/controllers/translations/main.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/translations/main.tpl
rename to admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
diff --git a/admin-dev/themes/default/template/controllers/translations/translation_errors.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_errors.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/translations/translation_errors.tpl
rename to admin-dev/themes/default/template/controllers/translations/helpers/view/translation_errors.tpl
diff --git a/admin-dev/themes/default/template/controllers/translations/translation_form.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/translations/translation_form.tpl
rename to admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl
diff --git a/admin-dev/themes/default/template/controllers/translations/translation_mails.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/translations/translation_mails.tpl
rename to admin-dev/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl
diff --git a/admin-dev/themes/default/template/controllers/translations/translation_modules.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/translations/translation_modules.tpl
rename to admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
diff --git a/admin-dev/themes/default/template/controllers/warehouses/view.tpl b/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/warehouses/view.tpl
rename to admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl
diff --git a/admin-dev/themes/default/template/controllers/webservice/form.tpl b/admin-dev/themes/default/template/controllers/webservice/helpers/form/form.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/webservice/form.tpl
rename to admin-dev/themes/default/template/controllers/webservice/helpers/form/form.tpl
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 0d03f2d99..b1bb22dbe 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -472,11 +472,6 @@ class AdminControllerCore extends Controller
 				return $this->{'ajaxProcess'.Tools::toCamelCase($action)}();
 			else if (method_exists($this, 'ajaxProcess'))
 				return $this->ajaxProcess();
-
-			/*if (!empty($action) && method_exists($this, 'displayAjax'.Tools::toCamelCase($action)))
-				$this->{'displayAjax'.$action}();
-			else
-				$this->displayAjax();	*/
 		}
 		else
 		{
diff --git a/classes/helper/Helper.php b/classes/helper/Helper.php
index 575418e6a..e6cee2f71 100755
--- a/classes/helper/Helper.php
+++ b/classes/helper/Helper.php
@@ -79,15 +79,18 @@ class HelperCore
 	 */
 	public function createTemplate($tpl_name)
 	{
-		if ($this->context->controller instanceof ModuleAdminController)
+		if ($this->override_folder)
 		{
-			if ($this->override_folder && file_exists($this->context->controller->getTemplatePath().$this->override_folder.$tpl_name))
-				return $this->context->smarty->createTemplate($this->context->controller->getTemplatePath().$this->override_folder.$tpl_name);
+			if ($this->context->controller instanceof ModuleAdminController)
+				$override_tpl_path = $this->context->controller->getTemplatePath().$this->override_folder.$this->base_folder.$tpl_name;
+			else
+				$override_tpl_path = $this->context->smarty->getTemplateDir(0).'controllers/'.$this->override_folder.$this->base_folder.$tpl_name;
 		}
-		else if ($this->override_folder && file_exists($this->context->smarty->getTemplateDir(0).'controllers/'.$this->override_folder.$tpl_name))
-			return $this->context->smarty->createTemplate('controllers/'.$this->override_folder.$tpl_name);
 
-		return $this->context->smarty->createTemplate($this->base_folder.$tpl_name);
+		if (isset($override_tpl_path) && file_exists($override_tpl_path))
+			return $this->context->smarty->createTemplate($override_tpl_path);
+		else
+			return $this->context->smarty->createTemplate($this->base_folder.$tpl_name);
 	}
 
 	/**
@@ -323,7 +326,7 @@ class HelperCore
 			foreach (Db::getInstance()->executeS($sql) as $row)
 				$assos[$row['id_'.$type]] = $row['id_'.$type];
 		}
-		$tpl = $this->createTemplate('helper/assoshop.tpl');
+		$tpl = $this->createTemplate('helpers/assoshop.tpl');
 		$tpl->assign(array(
 			'input' => array(
 				'type' => $type,
@@ -369,7 +372,7 @@ class HelperCore
 			'token' => $this->token
 		);
 
-		$tpl = $this->createTemplate('helper/required_fields.tpl');
+		$tpl = $this->createTemplate('helpers/required_fields.tpl');
 		$tpl->assign($this->tpl_vars);
 
 		return $tpl->fetch();