diff --git a/ccm-cms-types-article/web/themes/freemarker/ccm-cms-types-article/macros/article.ftl b/ccm-cms-types-article/web/themes/freemarker/ccm-cms-types-article/macros.ftl
similarity index 100%
rename from ccm-cms-types-article/web/themes/freemarker/ccm-cms-types-article/macros/article.ftl
rename to ccm-cms-types-article/web/themes/freemarker/ccm-cms-types-article/macros.ftl
diff --git a/ccm-cms-types-event/web/themes/freemarker/macros/ccm-cms-types-event.ftl b/ccm-cms-types-event/web/themes/freemarker/ccm-cms-types-event/macros.ftl
similarity index 100%
rename from ccm-cms-types-event/web/themes/freemarker/macros/ccm-cms-types-event.ftl
rename to ccm-cms-types-event/web/themes/freemarker/ccm-cms-types-event/macros.ftl
diff --git a/ccm-cms-types-newsitem/web/themes/freemarker/macros/ccm-cms-types-newsitem.ftl b/ccm-cms-types-newsitem/web/themes/freemarker/ccm-cms-types-newsitem/macros.ftl
similarity index 100%
rename from ccm-cms-types-newsitem/web/themes/freemarker/macros/ccm-cms-types-newsitem.ftl
rename to ccm-cms-types-newsitem/web/themes/freemarker/ccm-cms-types-newsitem/macros.ftl
diff --git a/ccm-cms/web/themes/freemarker/ccm-cms/macros/contentitems.ftl b/ccm-cms/web/themes/freemarker/ccm-cms/macros.ftl
similarity index 100%
rename from ccm-cms/web/themes/freemarker/ccm-cms/macros/contentitems.ftl
rename to ccm-cms/web/themes/freemarker/ccm-cms/macros.ftl