diff --git a/src/BulkManager/BulkManager.php b/src/BulkManager/BulkManager.php
index 9b56414..5137e97 100644
--- a/src/BulkManager/BulkManager.php
+++ b/src/BulkManager/BulkManager.php
@@ -287,7 +287,7 @@ class BulkManager implements GridField_HTMLProvider, GridField_ColumnProvider, G
         $templateData = new ArrayData($templateData);
 
         return array(
-            'header' => $templateData->renderWith('BulkManagerButtons'),
+            'header' => $templateData->renderWith('Colymba\\BulkManager\\BulkManagerButtons'),
         );
     }
 
diff --git a/templates/BulkManagerButtons.ss b/templates/Colymba/BulkManager/BulkManagerButtons.ss
similarity index 100%
rename from templates/BulkManagerButtons.ss
rename to templates/Colymba/BulkManager/BulkManagerButtons.ss
diff --git a/templates/BulkUploader.ss b/templates/Colymba/Bulkupload/BulkUploader.ss
similarity index 100%
rename from templates/BulkUploader.ss
rename to templates/Colymba/Bulkupload/BulkUploader.ss