diff --git a/web-module/src/main/webapp/templates/celAjax/Messages.vm b/web-module/src/main/webapp/templates/celAjax/Messages.vm
deleted file mode 100644
index 9d22bf72..00000000
--- a/web-module/src/main/webapp/templates/celAjax/Messages.vm
+++ /dev/null
@@ -1,6 +0,0 @@
-#set($jsonBuilder = $services.celementsweb.getNewJSONBuilder())
-$jsonBuilder.openDictionary()
-#parse('celMacros/CelMessages.vm')
-#parse('celMacros/StructEditorMessages.vm')
-$jsonBuilder.closeDictionary()
-$jsonBuilder.getJSON()
diff --git a/web-module/src/main/webapp/templates/celMacros/StructEditorMessages.vm b/web-module/src/main/webapp/templates/celMacros/StructEditorMessages.vm
deleted file mode 100644
index 7b42059c..00000000
--- a/web-module/src/main/webapp/templates/celMacros/StructEditorMessages.vm
+++ /dev/null
@@ -1,20 +0,0 @@
-$jsonBuilder.openDictionary('structEditor')
-
-  $jsonBuilder.addStringProperty('unsavedChangesOnCloseMessage', "$!adminMsg.get('cel_tm_unsavedChangesOnCloseMessage')")
-  $jsonBuilder.addStringProperty('savingDialogWarningHeader', "$!adminMsg.get('cel_tm_saving_dialog_warning_header')")
-  $jsonBuilder.addStringProperty('savingDialogMessage', "$!adminMsg.get('cel_tm_saving_dialog_unsaved_changes')")
-  $jsonBuilder.addStringProperty('savingDialogButtonCancel', "$!adminMsg.get('cel_cancel')")
-  $jsonBuilder.addStringProperty('savingDialogButtonSave', "$!adminMsg.get('cel_tm_saving_dialog_button_save')")
-  $jsonBuilder.addStringProperty('savingDialogButtonDoNotSave', "$!adminMsg.get('cel_tm_saving_dialog_button_donotsave')")
-  $jsonBuilder.addStringProperty('savingDialogHeader', "$!adminMsg.get('cel_tm_saving_dialog_header')")
-  $jsonBuilder.addStringProperty('savingFailed', "$!adminMsg.get('cel_tm_saving_failed')")
-  $jsonBuilder.addStringProperty('savingFailedDialogHeader', "$!adminMsg.get('cel_tm_saving_failed_dialog_header')")
-  $jsonBuilder.addStringProperty('savingFailedDialogText', "$!adminMsg.get('cel_tm_saving_failed_dialog_text')")
-  $jsonBuilder.addStringProperty('objectRemoveConfirm', "$!adminMsg.get('cel_objectedit_removeobject')?")
-
-  $jsonBuilder.openDictionary('autocomplete')
-    $jsonBuilder.addStringProperty('placeholder_default', "$!adminMsg.cel_struct_autocomplete_placeholder_default")
-    $jsonBuilder.addStringProperty('UrlToNewElementEditorButtonText_default', "$!adminMsg.cel_struct_autocomplete_UrlToNewElementEditorButtonText_default")
-  $jsonBuilder.closeDictionary()
-
-$jsonBuilder.closeDictionary()
diff --git a/web-module/src/main/webapp/templates/celMessages/general/structured-data-editor.vm b/web-module/src/main/webapp/templates/celMessages/general/structured-data-editor.vm
new file mode 100644
index 00000000..8e55a518
--- /dev/null
+++ b/web-module/src/main/webapp/templates/celMessages/general/structured-data-editor.vm
@@ -0,0 +1,20 @@
+$jsonBuilder.openDictionary('structEditor')
+
+  $jsonBuilder.addProperty('unsavedChangesOnCloseMessage', "$!adminMsg.get('cel_tm_unsavedChangesOnCloseMessage')")
+  $jsonBuilder.addProperty('savingDialogWarningHeader', "$!adminMsg.get('cel_tm_saving_dialog_warning_header')")
+  $jsonBuilder.addProperty('savingDialogMessage', "$!adminMsg.get('cel_tm_saving_dialog_unsaved_changes')")
+  $jsonBuilder.addProperty('savingDialogButtonCancel', "$!adminMsg.get('cel_cancel')")
+  $jsonBuilder.addProperty('savingDialogButtonSave', "$!adminMsg.get('cel_tm_saving_dialog_button_save')")
+  $jsonBuilder.addProperty('savingDialogButtonDoNotSave', "$!adminMsg.get('cel_tm_saving_dialog_button_donotsave')")
+  $jsonBuilder.addProperty('savingDialogHeader', "$!adminMsg.get('cel_tm_saving_dialog_header')")
+  $jsonBuilder.addProperty('savingFailed', "$!adminMsg.get('cel_tm_saving_failed')")
+  $jsonBuilder.addProperty('savingFailedDialogHeader', "$!adminMsg.get('cel_tm_saving_failed_dialog_header')")
+  $jsonBuilder.addProperty('savingFailedDialogText', "$!adminMsg.get('cel_tm_saving_failed_dialog_text')")
+  $jsonBuilder.addProperty('objectRemoveConfirm', "$!adminMsg.get('cel_objectedit_removeobject')?")
+
+  $jsonBuilder.openDictionary('autocomplete')
+    $jsonBuilder.addProperty('placeholder_default', "$!adminMsg.cel_struct_autocomplete_placeholder_default")
+    $jsonBuilder.addProperty('UrlToNewElementEditorButtonText_default', "$!adminMsg.cel_struct_autocomplete_UrlToNewElementEditorButtonText_default")
+  $jsonBuilder.closeDictionary()
+
+$jsonBuilder.closeDictionary()