diff --git a/views/smarty/flow/documents/deliverynote/deliverynote.tpl b/views/smarty/documents/deliverynote/deliverynote.tpl
similarity index 100%
rename from views/smarty/flow/documents/deliverynote/deliverynote.tpl
rename to views/smarty/documents/deliverynote/deliverynote.tpl
diff --git a/views/smarty/flow/documents/deliverynote/deliverynoteNoLogo.tpl b/views/smarty/documents/deliverynote/deliverynoteNoLogo.tpl
similarity index 100%
rename from views/smarty/flow/documents/deliverynote/deliverynoteNoLogo.tpl
rename to views/smarty/documents/deliverynote/deliverynoteNoLogo.tpl
diff --git a/views/smarty/flow/documents/deliverynote/inc/conclusion.tpl b/views/smarty/documents/deliverynote/inc/conclusion.tpl
similarity index 100%
rename from views/smarty/flow/documents/deliverynote/inc/conclusion.tpl
rename to views/smarty/documents/deliverynote/inc/conclusion.tpl
diff --git a/views/smarty/flow/documents/deliverynote/inc/informations.tpl b/views/smarty/documents/deliverynote/inc/informations.tpl
similarity index 100%
rename from views/smarty/flow/documents/deliverynote/inc/informations.tpl
rename to views/smarty/documents/deliverynote/inc/informations.tpl
diff --git a/views/smarty/flow/documents/deliverynote/inc/recipientAddress.tpl b/views/smarty/documents/deliverynote/inc/recipientAddress.tpl
similarity index 100%
rename from views/smarty/flow/documents/deliverynote/inc/recipientAddress.tpl
rename to views/smarty/documents/deliverynote/inc/recipientAddress.tpl
diff --git a/views/smarty/flow/documents/deliverynote/inc/salutation.tpl b/views/smarty/documents/deliverynote/inc/salutation.tpl
similarity index 100%
rename from views/smarty/flow/documents/deliverynote/inc/salutation.tpl
rename to views/smarty/documents/deliverynote/inc/salutation.tpl
diff --git a/views/smarty/flow/documents/inc/elements/addressarea.tpl b/views/smarty/documents/inc/elements/addressarea.tpl
similarity index 100%
rename from views/smarty/flow/documents/inc/elements/addressarea.tpl
rename to views/smarty/documents/inc/elements/addressarea.tpl
diff --git a/views/smarty/flow/documents/inc/elements/articlecostssummary.tpl b/views/smarty/documents/inc/elements/articlecostssummary.tpl
similarity index 100%
rename from views/smarty/flow/documents/inc/elements/articlecostssummary.tpl
rename to views/smarty/documents/inc/elements/articlecostssummary.tpl
diff --git a/views/smarty/flow/documents/inc/elements/articlelist.tpl b/views/smarty/documents/inc/elements/articlelist.tpl
similarity index 100%
rename from views/smarty/flow/documents/inc/elements/articlelist.tpl
rename to views/smarty/documents/inc/elements/articlelist.tpl
diff --git a/views/smarty/flow/documents/inc/elements/deliveryaddress.tpl b/views/smarty/documents/inc/elements/deliveryaddress.tpl
similarity index 100%
rename from views/smarty/flow/documents/inc/elements/deliveryaddress.tpl
rename to views/smarty/documents/inc/elements/deliveryaddress.tpl
diff --git a/views/smarty/flow/documents/inc/elements/foldmarks.tpl b/views/smarty/documents/inc/elements/foldmarks.tpl
similarity index 100%
rename from views/smarty/flow/documents/inc/elements/foldmarks.tpl
rename to views/smarty/documents/inc/elements/foldmarks.tpl
diff --git a/views/smarty/flow/documents/inc/elements/informations.tpl b/views/smarty/documents/inc/elements/informations.tpl
similarity index 100%
rename from views/smarty/flow/documents/inc/elements/informations.tpl
rename to views/smarty/documents/inc/elements/informations.tpl
diff --git a/views/smarty/flow/documents/inc/elements/recipientAddress.tpl b/views/smarty/documents/inc/elements/recipientAddress.tpl
similarity index 100%
rename from views/smarty/flow/documents/inc/elements/recipientAddress.tpl
rename to views/smarty/documents/inc/elements/recipientAddress.tpl
diff --git a/views/smarty/flow/documents/inc/helper/rulers.tpl b/views/smarty/documents/inc/helper/rulers.tpl
similarity index 100%
rename from views/smarty/flow/documents/inc/helper/rulers.tpl
rename to views/smarty/documents/inc/helper/rulers.tpl
diff --git a/views/smarty/flow/documents/inc/page/base.tpl b/views/smarty/documents/inc/page/base.tpl
similarity index 100%
rename from views/smarty/flow/documents/inc/page/base.tpl
rename to views/smarty/documents/inc/page/base.tpl
diff --git a/views/smarty/flow/documents/inc/page/footer.tpl b/views/smarty/documents/inc/page/footer.tpl
similarity index 100%
rename from views/smarty/flow/documents/inc/page/footer.tpl
rename to views/smarty/documents/inc/page/footer.tpl
diff --git a/views/smarty/flow/documents/inc/page/header.tpl b/views/smarty/documents/inc/page/header.tpl
similarity index 100%
rename from views/smarty/flow/documents/inc/page/header.tpl
rename to views/smarty/documents/inc/page/header.tpl
diff --git a/views/smarty/flow/documents/inc/page/returnaddress.tpl b/views/smarty/documents/inc/page/returnaddress.tpl
similarity index 100%
rename from views/smarty/flow/documents/inc/page/returnaddress.tpl
rename to views/smarty/documents/inc/page/returnaddress.tpl
diff --git a/views/smarty/flow/documents/invoice/inc/conclusion.tpl b/views/smarty/documents/invoice/inc/conclusion.tpl
similarity index 100%
rename from views/smarty/flow/documents/invoice/inc/conclusion.tpl
rename to views/smarty/documents/invoice/inc/conclusion.tpl
diff --git a/views/smarty/flow/documents/invoice/inc/informations.tpl b/views/smarty/documents/invoice/inc/informations.tpl
similarity index 100%
rename from views/smarty/flow/documents/invoice/inc/informations.tpl
rename to views/smarty/documents/invoice/inc/informations.tpl
diff --git a/views/smarty/flow/documents/invoice/inc/payinfo.tpl b/views/smarty/documents/invoice/inc/payinfo.tpl
similarity index 100%
rename from views/smarty/flow/documents/invoice/inc/payinfo.tpl
rename to views/smarty/documents/invoice/inc/payinfo.tpl
diff --git a/views/smarty/flow/documents/invoice/inc/salutation.tpl b/views/smarty/documents/invoice/inc/salutation.tpl
similarity index 100%
rename from views/smarty/flow/documents/invoice/inc/salutation.tpl
rename to views/smarty/documents/invoice/inc/salutation.tpl
diff --git a/views/smarty/flow/documents/invoice/invoice.tpl b/views/smarty/documents/invoice/invoice.tpl
similarity index 100%
rename from views/smarty/flow/documents/invoice/invoice.tpl
rename to views/smarty/documents/invoice/invoice.tpl
diff --git a/views/smarty/flow/documents/invoice/invoiceNoLogo.tpl b/views/smarty/documents/invoice/invoiceNoLogo.tpl
similarity index 100%
rename from views/smarty/flow/documents/invoice/invoiceNoLogo.tpl
rename to views/smarty/documents/invoice/invoiceNoLogo.tpl
diff --git a/views/twig/admin/documents/deliverynote/inc/conclusion.tpl b/views/twig/admin/documents/deliverynote/inc/conclusion.tpl
deleted file mode 100644
index 45544e6..0000000
--- a/views/twig/admin/documents/deliverynote/inc/conclusion.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-[{block name="conclusion"}]
-