diff --git a/resources/views/v1/form/amount-no-currency.twig b/resources/views/v1/form/amount-no-currency.twig
index a5b2d39ba9..6076d303b8 100644
--- a/resources/views/v1/form/amount-no-currency.twig
+++ b/resources/views/v1/form/amount-no-currency.twig
@@ -2,7 +2,7 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
     <div class="col-sm-8">
         {{ Form.input('number', name, value, options) }}
-        {% include 'form/help' %}
-        {% include 'form/feedback' %}
+        {% include 'v1.form.help' %}
+        {% include 'v1.form.feedback' %}
     </div>
 </div>
diff --git a/resources/views/v1/form/amount.twig b/resources/views/v1/form/amount.twig
index 652f355148..8d0527a535 100644
--- a/resources/views/v1/form/amount.twig
+++ b/resources/views/v1/form/amount.twig
@@ -26,7 +26,7 @@
 
         </div>
 
-        {% include 'form/feedback' %}
+        {% include 'v1.form.feedback' %}
     </div>
     <!-- Going to put in this value: {{ defaultCurrency.id }} -->
     <input type="hidden" name="amount_currency_id_{{ name }}" value="{{ defaultCurrency.id }}" data-backup="{{ defaultCurrency.id }}"/>
diff --git a/resources/views/v1/form/assetAccountCheckList.twig b/resources/views/v1/form/assetAccountCheckList.twig
index d47ea5d1e3..09c8c0e450 100644
--- a/resources/views/v1/form/assetAccountCheckList.twig
+++ b/resources/views/v1/form/assetAccountCheckList.twig
@@ -17,8 +17,8 @@
                 </div>
             {% endfor %}
         {% endfor %}
-        {% include 'form/help' %}
-        {% include 'form/feedback' %}
+        {% include 'v1.form.help' %}
+        {% include 'v1.form.feedback' %}
 
     </div>
 </div>
diff --git a/resources/views/v1/form/balance.twig b/resources/views/v1/form/balance.twig
index c28227d1f7..c31047bfec 100644
--- a/resources/views/v1/form/balance.twig
+++ b/resources/views/v1/form/balance.twig
@@ -26,7 +26,7 @@
 
         </div>
 
-        {% include 'form/feedback' %}
+        {% include 'v1.form.feedback' %}
     </div>
 
     <input type="hidden" name="amount_currency_id_{{ name }}" value="{{ defaultCurrency.id }}"/>
diff --git a/resources/views/v1/form/checkbox.twig b/resources/views/v1/form/checkbox.twig
index d4a0143871..ef21567902 100644
--- a/resources/views/v1/form/checkbox.twig
+++ b/resources/views/v1/form/checkbox.twig
@@ -13,7 +13,7 @@
                 {{ Form.checkbox(name, value, options.checked, options) }}
             </label>
         </div>
-        {% include 'form/help' %}
-        {% include 'form/feedback' %}
+        {% include 'v1.form.help' %}
+        {% include 'v1.form.feedback' %}
     </div>
 </div>
diff --git a/resources/views/v1/form/date.twig b/resources/views/v1/form/date.twig
index 0e86cf5a07..c2238acfdb 100644
--- a/resources/views/v1/form/date.twig
+++ b/resources/views/v1/form/date.twig
@@ -8,7 +8,7 @@
             </div>
             {{ Form.input('date', name, value, options) }}
         </div>
-        {% include 'form/help' %}
-        {% include 'form/feedback' %}
+        {% include 'v1.form.help' %}
+        {% include 'v1.form.feedback' %}
     </div>
 </div>
diff --git a/resources/views/v1/form/file.twig b/resources/views/v1/form/file.twig
index 21da01da64..827ed1016c 100644
--- a/resources/views/v1/form/file.twig
+++ b/resources/views/v1/form/file.twig
@@ -3,7 +3,7 @@
 
     <div class="col-sm-8">
         {{ Form.file(name, options) }}
-        {% include 'form/help' %}
-        {% include 'form/feedback' %}
+        {% include 'v1.form.help' %}
+        {% include 'v1.form.feedback' %}
     </div>
 </div>
diff --git a/resources/views/v1/form/integer.twig b/resources/views/v1/form/integer.twig
index 54be537886..2b328fc1c6 100644
--- a/resources/views/v1/form/integer.twig
+++ b/resources/views/v1/form/integer.twig
@@ -3,7 +3,7 @@
 
     <div class="col-sm-8">
         {{ Form.input('number', name, value, options) }}
-        {% include 'form/help' %}
-        {% include 'form/feedback' %}
+        {% include 'v1.form.help' %}
+        {% include 'v1.form.feedback' %}
     </div>
 </div>
diff --git a/resources/views/v1/form/location.twig b/resources/views/v1/form/location.twig
index 98f97c6e24..247df184f4 100644
--- a/resources/views/v1/form/location.twig
+++ b/resources/views/v1/form/location.twig
@@ -39,7 +39,7 @@
 
             {# has location set? #}
             <input type="hidden" name="{{ name }}_has_location" value="{{ options.locations[name].has_location|default('false') }}"/>
-            {% include 'form/feedback' %}
+            {% include 'v1.form.feedback' %}
         {% endif %}
     </div>
 </div>
diff --git a/resources/views/v1/form/non-selectable-amount.twig b/resources/views/v1/form/non-selectable-amount.twig
index 1391873842..e9eb950ebf 100644
--- a/resources/views/v1/form/non-selectable-amount.twig
+++ b/resources/views/v1/form/non-selectable-amount.twig
@@ -6,6 +6,6 @@
             <span class="input-group-addon non-selectable-currency-symbol">{{ selectedCurrency.symbol }}</span>
             {{ Form.input('number', name, value, options) }}
         </div>
-        {% include 'form/feedback' %}
+        {% include 'v1.form.feedback' %}
     </div>
 </div>
diff --git a/resources/views/v1/form/number.twig b/resources/views/v1/form/number.twig
index 54be537886..2b328fc1c6 100644
--- a/resources/views/v1/form/number.twig
+++ b/resources/views/v1/form/number.twig
@@ -3,7 +3,7 @@
 
     <div class="col-sm-8">
         {{ Form.input('number', name, value, options) }}
-        {% include 'form/help' %}
-        {% include 'form/feedback' %}
+        {% include 'v1.form.help' %}
+        {% include 'v1.form.feedback' %}
     </div>
 </div>
diff --git a/resources/views/v1/form/object_group.twig b/resources/views/v1/form/object_group.twig
index e94cee84fb..c68ed927ad 100644
--- a/resources/views/v1/form/object_group.twig
+++ b/resources/views/v1/form/object_group.twig
@@ -3,7 +3,7 @@
 
     <div class="col-sm-8">
         {{ Form.input('text', name, value, options) }}
-        {% include 'form/help' %}
-        {% include 'form/feedback' %}
+        {% include 'v1.form.help' %}
+        {% include 'v1.form.feedback' %}
     </div>
 </div>
diff --git a/resources/views/v1/form/password.twig b/resources/views/v1/form/password.twig
index aa700af9cd..dafba75c2e 100644
--- a/resources/views/v1/form/password.twig
+++ b/resources/views/v1/form/password.twig
@@ -3,7 +3,7 @@
 
     <div class="col-sm-8">
         {{ Form.input('password', name, value, options) }}
-        {% include 'form/help' %}
-        {% include 'form/feedback' %}
+        {% include 'v1.form.help' %}
+        {% include 'v1.form.feedback' %}
     </div>
 </div>
diff --git a/resources/views/v1/form/percentage.twig b/resources/views/v1/form/percentage.twig
index b5e73b7b91..6da539d8f7 100644
--- a/resources/views/v1/form/percentage.twig
+++ b/resources/views/v1/form/percentage.twig
@@ -6,7 +6,7 @@
             {{ Form.input('number', name, value, options) }}
             <div class="input-group-addon">%</div>
         </div>
-        {% include 'form/help' %}
-        {% include 'form/feedback' %}
+        {% include 'v1.form.help' %}
+        {% include 'v1.form.feedback' %}
     </div>
 </div>
diff --git a/resources/views/v1/form/select.twig b/resources/views/v1/form/select.twig
index 2d48ddfcaa..94579eac24 100644
--- a/resources/views/v1/form/select.twig
+++ b/resources/views/v1/form/select.twig
@@ -3,8 +3,8 @@
 
     <div class="col-sm-8">
         {{ Form.select(name, list, selected , options ) }}
-        {% include 'form/help' %}
-        {% include 'form/feedback' %}
+        {% include 'v1.form.help' %}
+        {% include 'v1.form.feedback' %}
 
     </div>
 </div>
diff --git a/resources/views/v1/form/tags.twig b/resources/views/v1/form/tags.twig
index e504f6c452..5cfa03e504 100644
--- a/resources/views/v1/form/tags.twig
+++ b/resources/views/v1/form/tags.twig
@@ -3,6 +3,6 @@
 
     <div class="col-sm-8">
         {{ Form.input('text', name, value, options) }}
-        {% include 'form/feedback' %}
+        {% include 'v1.form.feedback' %}
     </div>
 </div>
diff --git a/resources/views/v1/form/text.twig b/resources/views/v1/form/text.twig
index e94cee84fb..c68ed927ad 100644
--- a/resources/views/v1/form/text.twig
+++ b/resources/views/v1/form/text.twig
@@ -3,7 +3,7 @@
 
     <div class="col-sm-8">
         {{ Form.input('text', name, value, options) }}
-        {% include 'form/help' %}
-        {% include 'form/feedback' %}
+        {% include 'v1.form.help' %}
+        {% include 'v1.form.feedback' %}
     </div>
 </div>
diff --git a/resources/views/v1/form/textarea.twig b/resources/views/v1/form/textarea.twig
index c765ee4eee..04c83add7c 100644
--- a/resources/views/v1/form/textarea.twig
+++ b/resources/views/v1/form/textarea.twig
@@ -3,7 +3,7 @@
 
     <div class="col-sm-8">
         {{ Form.textarea(name, value, options) }}
-        {% include 'form/help' %}
-        {% include 'form/feedback' %}
+        {% include 'v1.form.help' %}
+        {% include 'v1.form.feedback' %}
     </div>
 </div>
diff --git a/resources/views/v1/layout/default.twig b/resources/views/v1/layout/default.twig
index 1506dbab53..590f56f58e 100644
--- a/resources/views/v1/layout/default.twig
+++ b/resources/views/v1/layout/default.twig
@@ -122,7 +122,7 @@
                 <div class="row no-print">
                     <div class="col-lg-12">
                         <p class="well">
-                            {% include ['demo.' ~ Route.getCurrentRoute.getName, 'demo.no-demo-text'] %}
+                            {% include ['v1.demo.' ~ Route.getCurrentRoute.getName, 'v1.demo.no-demo-text'] %}
                         </p>
                     </div>
                 </div>
diff --git a/resources/views/v1/popup/report/balance-amount.twig b/resources/views/v1/popup/report/balance-amount.twig
index 8301c7fa71..98cac1f7dc 100644
--- a/resources/views/v1/popup/report/balance-amount.twig
+++ b/resources/views/v1/popup/report/balance-amount.twig
@@ -9,7 +9,7 @@
         <div class="modal-body">
             {% set hideSource = true %}
             {% set hideBudget = true %}
-            {% include 'popup/list/journals' %}
+            {% include 'v1.popup.list.journals' %}
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
diff --git a/resources/views/v1/popup/report/budget-spent-amount.twig b/resources/views/v1/popup/report/budget-spent-amount.twig
index fa88bae9ae..4923700298 100644
--- a/resources/views/v1/popup/report/budget-spent-amount.twig
+++ b/resources/views/v1/popup/report/budget-spent-amount.twig
@@ -8,7 +8,7 @@
         </div>
         <div class="modal-body">
             {% set hideBudget = true %}
-            {% include 'popup/list/journals' %}
+            {% include 'v1.popup.list.journals' %}
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
diff --git a/resources/views/v1/popup/report/category-entry.twig b/resources/views/v1/popup/report/category-entry.twig
index 0539cedc55..218fec31ae 100644
--- a/resources/views/v1/popup/report/category-entry.twig
+++ b/resources/views/v1/popup/report/category-entry.twig
@@ -7,7 +7,7 @@
         </div>
         <div class="modal-body">
             {% set hideCategory = true %}
-            {% include 'popup/list/journals' %}
+            {% include 'v1.popup.list.journals' %}
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
diff --git a/resources/views/v1/popup/report/expense-entry.twig b/resources/views/v1/popup/report/expense-entry.twig
index 7f831804b6..02ee7bc5dd 100644
--- a/resources/views/v1/popup/report/expense-entry.twig
+++ b/resources/views/v1/popup/report/expense-entry.twig
@@ -7,7 +7,7 @@
         </div>
         <div class="modal-body">
             {% set hideDestination = true %}
-            {% include 'popup/list/journals' %}
+            {% include 'v1.popup.list.journals' %}
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
diff --git a/resources/views/v1/popup/report/income-entry.twig b/resources/views/v1/popup/report/income-entry.twig
index 5161c585b9..b2bbf8e451 100644
--- a/resources/views/v1/popup/report/income-entry.twig
+++ b/resources/views/v1/popup/report/income-entry.twig
@@ -10,7 +10,7 @@
             {% set hideSource = true %}
             {% set accountPerspective = account %}
             {% set inverseAmount = true %}
-            {% include 'popup/list/journals' %}
+            {% include 'v1.popup.list.journals' %}
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
diff --git a/resources/views/v1/reports/audit/report.twig b/resources/views/v1/reports/audit/report.twig
index 5f6764f62c..08328174a7 100644
--- a/resources/views/v1/reports/audit/report.twig
+++ b/resources/views/v1/reports/audit/report.twig
@@ -61,7 +61,7 @@
                             balance: formatAmountByAccount(account, auditData[account.id].dayBeforeBalance)
                         })|raw }}
                 </p>
-                {% include 'reports.partials.journals-audit'  with {'journals': auditData[account.id].journals,'account':account} %}
+                {% include 'v1.reports.partials.journals-audit'  with {'journals': auditData[account.id].journals,'account':account} %}
 
                 <p style="padding:10px;">
 
diff --git a/resources/views/v1/reports/default/month.twig b/resources/views/v1/reports/default/month.twig
index 5e89a5f1a4..febf544c38 100644
--- a/resources/views/v1/reports/default/month.twig
+++ b/resources/views/v1/reports/default/month.twig
@@ -140,7 +140,6 @@
             </div>
         </div>
     </div>
-    {#{% include 'reports/partials/bills' %}#}
 {% endblock %}
 {% block styles %}
     <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all"/>
diff --git a/resources/views/v1/rules/index.twig b/resources/views/v1/rules/index.twig
index c24e8aa28f..5c739219c9 100644
--- a/resources/views/v1/rules/index.twig
+++ b/resources/views/v1/rules/index.twig
@@ -179,7 +179,7 @@
         </div>
     {% endfor %}
 
-    {% include '/rules/partials/test-trigger-modal' %}
+    {% include 'v1.rules.partials.test-trigger-modal' %}
 
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">
diff --git a/resources/views/v1/rules/rule/create.twig b/resources/views/v1/rules/rule/create.twig
index 9c13a2fd4d..65894fecf4 100644
--- a/resources/views/v1/rules/rule/create.twig
+++ b/resources/views/v1/rules/rule/create.twig
@@ -90,7 +90,7 @@
             </div>
         </div>
 
-        {% include '/rules/partials/test-trigger-modal' %}
+        {% include 'v1.rules.partials.test-trigger-modal' %}
 
         <div class="row">
             <div class="col-lg-12 col-md-12 col-sm-12">
diff --git a/resources/views/v1/rules/rule/edit.twig b/resources/views/v1/rules/rule/edit.twig
index cbada66a52..f92cad9abf 100644
--- a/resources/views/v1/rules/rule/edit.twig
+++ b/resources/views/v1/rules/rule/edit.twig
@@ -72,7 +72,7 @@
         </div>
     </div>
 
-    {% include '/rules/partials/test-trigger-modal' %}
+    {% include 'v1.rules.partials.test-trigger-modal' %}
 
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">