diff --git a/apps/files/js/filesummary.js b/apps/files/js/filesummary.js
index ed369ff0723..c866ccb4ff5 100644
--- a/apps/files/js/filesummary.js
+++ b/apps/files/js/filesummary.js
@@ -196,7 +196,7 @@
 			 *
 			 * handlebars -n OCA.Files.FileSummary.Templates filesummary.handlebars -f filesummary_template.js
 			 */
-			return OCA.Files.FileSummary.Templates['filesummary'](_.extend({
+			return OCA.Files.Templates['filesummary'](_.extend({
 				connectorLabel: t('files', '{dirs} and {files}', {dirs: '', files: ''})
 			}, data));
 		},
diff --git a/apps/files/js/merged-index.json b/apps/files/js/merged-index.json
index 5b2227b1d3a..e891d10bdae 100644
--- a/apps/files/js/merged-index.json
+++ b/apps/files/js/merged-index.json
@@ -1,12 +1,12 @@
 [
   "app.js",
+  "templates.js",
   "file-upload.js",
   "newfilemenu.js",
   "jquery.fileupload.js",
   "jquery-visibility.js",
   "fileinfomodel.js",
   "filesummary.js",
-  "filesummary_template.js",
   "filemultiselectmenu.js",
   "breadcrumb.js",
   "filelist.js",
diff --git a/apps/files/js/filesummary_template.js b/apps/files/js/templates.js
similarity index 85%
rename from apps/files/js/filesummary_template.js
rename to apps/files/js/templates.js
index 67a4d6b4e86..325592a3f88 100644
--- a/apps/files/js/filesummary_template.js
+++ b/apps/files/js/templates.js
@@ -1,5 +1,5 @@
 (function() {
-  var template = Handlebars.template, templates = OCA.Files.FileSummary.Templates = OCA.Files.FileSummary.Templates || {};
+  var template = Handlebars.template, templates = OCA.Files.Templates = OCA.Files.Templates || {};
 templates['filesummary'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
     var helper;
 
diff --git a/apps/files/js/templates/detailsview.handlebars.js b/apps/files/js/templates/detailsview.handlebars.js
deleted file mode 100644
index c109da77a63..00000000000
--- a/apps/files/js/templates/detailsview.handlebars.js
+++ /dev/null
@@ -1,28 +0,0 @@
-(function() {
-  var template = Handlebars.template, templates = OCA.Files.Templates = OCA.Files.Templates || {};
-templates['detailsview'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "<ul class=\"tabHeaders\">\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tabHeaders : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "</ul>\n";
-},"2":function(container,depth0,helpers,partials,data) {
-    var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
-
-  return "	<li class=\"tabHeader\" data-tabid=\""
-    + alias4(((helper = (helper = helpers.tabId || (depth0 != null ? depth0.tabId : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tabId","hash":{},"data":data}) : helper)))
-    + "\" data-tabindex=\""
-    + alias4(((helper = (helper = helpers.tabIndex || (depth0 != null ? depth0.tabIndex : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tabIndex","hash":{},"data":data}) : helper)))
-    + "\">\n		<a href=\"#\">"
-    + alias4(((helper = (helper = helpers.label || (depth0 != null ? depth0.label : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"label","hash":{},"data":data}) : helper)))
-    + "</a>\n	</li>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {};
-
-  return "<div class=\"detailFileInfoContainer\"></div>\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tabHeaders : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "<div class=\"tabsContainer\">\n</div>\n<a class=\"close icon-close\" href=\"#\" alt=\""
-    + container.escapeExpression(((helper = (helper = helpers.closeLabel || (depth0 != null ? depth0.closeLabel : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"closeLabel","hash":{},"data":data}) : helper)))
-    + "\"></a>\n";
-},"useData":true});
-})();
diff --git a/apps/files/js/filesummary.handlebars b/apps/files/js/templates/filesummary.handlebars
similarity index 100%
rename from apps/files/js/filesummary.handlebars
rename to apps/files/js/templates/filesummary.handlebars
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
index 9057f7abaed..2cc34dde8bb 100644
--- a/apps/files_sharing/lib/Controller/ShareController.php
+++ b/apps/files_sharing/lib/Controller/ShareController.php
@@ -397,7 +397,7 @@ class ShareController extends AuthPublicShareController {
 			// JS required for folders
 			\OCP\Util::addStyle('files', 'merged');
 			\OCP\Util::addScript('files', 'filesummary');
-			\OCP\Util::addScript('files', 'filesummary_template');
+			\OCP\Util::addScript('files', 'templates');
 			\OCP\Util::addScript('files', 'breadcrumb');
 			\OCP\Util::addScript('files', 'fileinfomodel');
 			\OCP\Util::addScript('files', 'newfilemenu');
diff --git a/build/compile-handlebars-templates.sh b/build/compile-handlebars-templates.sh
index 80e2e661f4d..585406c4e8f 100755
--- a/build/compile-handlebars-templates.sh
+++ b/build/compile-handlebars-templates.sh
@@ -11,7 +11,7 @@ handlebars -n OC.Settings.Templates  settings/js/authtoken.handlebars -f setting
 handlebars -n OC.ContactsMenu.Templates core/js/contactsmenu -f core/js/contactsmenu_templates.js
 
 # Files app
-handlebars -n OCA.Files.FileSummary.Templates apps/files/js/filesummary.handlebars -f apps/files/js/filesummary_template.js
+handlebars -n OCA.Files.Templates apps/files/js/templates -f apps/files/js/templates.js
 
 if [[ $(git diff --name-only) ]]; then
     echo "Please submit your compiled handlebars templates"