diff --git a/ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionApplicationController.java b/ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionApplicationController.java
index 0a021aa06..c2dd62829 100644
--- a/ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionApplicationController.java
+++ b/ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionApplicationController.java
@@ -34,7 +34,7 @@ import javax.ws.rs.PathParam;
  */
 @RequestScoped
 @Controller
-@Path("/applications/content-sections")
+@Path("/applications/contentsections")
 public class ContentSectionApplicationController
     implements ApplicationController {
 
@@ -49,7 +49,7 @@ public class ContentSectionApplicationController
 
     @Override
     public String getControllerLink() {
-        return "applications/content-sections";
+        return "applications/contentsections";
     }
     
     @GET
@@ -71,7 +71,7 @@ public class ContentSectionApplicationController
                 .collect(Collectors.toList())
         );
 
-        return "org/libreccm/ui/admin/applications/content-sections/content-sections.xhtml";
+        return "org/libreccm/ui/admin/applications/contentsections/contentsections.xhtml";
     }
 
     @POST
@@ -84,7 +84,7 @@ public class ContentSectionApplicationController
     ) {
         sectionManager.createContentSection(label);
 
-        return "redirect:applications/content-sections";
+        return "redirect:applications/contentsections";
     }
 
     @POST
@@ -103,7 +103,7 @@ public class ContentSectionApplicationController
             sectionManager.renameContentSection(result.get(), label);
         }
 
-        return "redirect:applications/content-sections";
+        return "redirect:applications/contentsections";
     }
 
     @POST
@@ -122,7 +122,7 @@ public class ContentSectionApplicationController
             sectionRepository.delete(result.get());
         }
 
-        return "redirect:applications/content-sections";
+        return "redirect:applications/contentsections";
     }
 
     private ContentSectionTableRow buildContentSectionTableRow(
diff --git a/ccm-cms/src/main/java/org/librecms/ui/ContentSectionsTableModel.java b/ccm-cms/src/main/java/org/librecms/ui/ContentSectionsTableModel.java
index 978e0d02a..578f99a33 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/ContentSectionsTableModel.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/ContentSectionsTableModel.java
@@ -30,6 +30,7 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.transaction.Transactional;
 
+
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
diff --git a/ccm-cms/src/main/java/org/librecms/ui/ContentSectionApplication.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ContentSectionApplication.java
similarity index 89%
rename from ccm-cms/src/main/java/org/librecms/ui/ContentSectionApplication.java
rename to ccm-cms/src/main/java/org/librecms/ui/contentsections/ContentSectionApplication.java
index 25f0334ac..c6f147d5e 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/ContentSectionApplication.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ContentSectionApplication.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.librecms.ui;
+package org.librecms.ui.contentsections;
 
 import org.libreccm.ui.IsAuthenticatedFilter;
 
@@ -25,7 +25,7 @@ public class ContentSectionApplication extends Application {
         final Set<Class<?>> classes = new HashSet<>();
         
         classes.add(IsAuthenticatedFilter.class);
-        classes.add(ContentSectionController.class);
+        classes.add(DocumentFolderController.class);
         
         return classes;
     }
diff --git a/ccm-cms/src/main/java/org/librecms/ui/ContentSectionModel.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ContentSectionModel.java
similarity index 96%
rename from ccm-cms/src/main/java/org/librecms/ui/ContentSectionModel.java
rename to ccm-cms/src/main/java/org/librecms/ui/contentsections/ContentSectionModel.java
index 5a85bc951..ec2a0de33 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/ContentSectionModel.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ContentSectionModel.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.librecms.ui;
+package org.librecms.ui.contentsections;
 
 import org.librecms.contentsection.ContentSection;
 
diff --git a/ccm-cms/src/main/java/org/librecms/ui/DocumentFolderBreadcrumbModel.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderBreadcrumbModel.java
similarity index 95%
rename from ccm-cms/src/main/java/org/librecms/ui/DocumentFolderBreadcrumbModel.java
rename to ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderBreadcrumbModel.java
index 15be9ecb0..a12f76eb4 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/DocumentFolderBreadcrumbModel.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderBreadcrumbModel.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.librecms.ui;
+package org.librecms.ui.contentsections;
 
 /**
  *
diff --git a/ccm-cms/src/main/java/org/librecms/ui/ContentSectionController.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderController.java
similarity index 95%
rename from ccm-cms/src/main/java/org/librecms/ui/ContentSectionController.java
rename to ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderController.java
index 66664b08c..69caa92de 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/ContentSectionController.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderController.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.librecms.ui;
+package org.librecms.ui.contentsections;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -54,17 +54,18 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.QueryParam;
 
+import org.librecms.ui.CmsAdminMessages;
+
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
 @Controller
-@Path("/{sectionIdentifier}")
-public class ContentSectionController {
+@Path("/{sectionIdentifier}/documentfolders")
+public class DocumentFolderController {
 
-    private static final Logger LOGGER = LogManager.getLogger(
-        ContentSectionController.class
+    private static final Logger LOGGER = LogManager.getLogger(DocumentFolderController.class
     );
 
     @Inject
@@ -113,7 +114,7 @@ public class ContentSectionController {
     private PermissionChecker permissionChecker;
 
     @GET
-    @Path("/document-folders{folderPath:(/.+)?}")
+    @Path("/{folderPath:(/.+)?}")
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String listItems(
@@ -195,7 +196,7 @@ public class ContentSectionController {
                     } else {
                         models.put("contentSection", section.getLabel());
                         models.put("folderPath", folderPath);
-                        return "org/librecms/ui/content-section/document-folder-not-found.xhtml";
+                        return "org/librecms/ui/contentsection/documentfolder/documentfolder-not-found.xhtml";
                     }
                 }
 
@@ -238,14 +239,14 @@ public class ContentSectionController {
                     System.currentTimeMillis() - rowsStart
                 );
 
-                return "org/librecms/ui/content-section/document-folder.xhtml";
+                return "org/librecms/ui/contentsection/documentfolder/documentfolder.xhtml";
             } else {
                 models.put("sectionidentifier", sectionIdentifier);
-                return "org/librecms/ui/content-section/access-denied.xhtml";
+                return "org/librecms/ui/contentsection/access-denied.xhtml";
             }
         } else {
             models.put("sectionIdentifier", sectionIdentifier);
-            return "org/librecms/ui/content-section/contentsection-not-found.xhtml";
+            return "org/librecms/ui/contentsection/contentsection-not-found.xhtml";
         }
 
     }
@@ -326,20 +327,20 @@ public class ContentSectionController {
                     models.put(
                         "testdataMessage", "Test data created successfully."
                     );
-                    return "org/librecms/ui/content-section/testdata.xhtml";
+                    return "org/librecms/ui/contentsection/documentfolder/testdata.xhtml";
                 } else {
                     models.put(
                         "testdataMessage", "Test data was already created..."
                     );
-                    return "org/librecms/ui/content-section/testdata.xhtml";
+                    return "org/librecms/ui/contentsection/documentfolder/testdata.xhtml";
                 }
             } else {
                 models.put("sectionidentifier", sectionIdentifier);
-                return "org/librecms/ui/content-section/access-denied.xhtml";
+                return "org/librecms/ui/contentsection/access-denied.xhtml";
             }
         } else {
             models.put("sectionIdentifier", sectionIdentifier);
-            return "org/librecms/ui/content-section/contentsection-not-found.xhtml";
+            return "org/librecms/ui/contentsection/contentsection-not-found.xhtml";
         }
     }
 
diff --git a/ccm-cms/src/main/java/org/librecms/ui/DocumentFolderModel.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderModel.java
similarity index 97%
rename from ccm-cms/src/main/java/org/librecms/ui/DocumentFolderModel.java
rename to ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderModel.java
index 1ac295a7c..5a96b6a2a 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/DocumentFolderModel.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderModel.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.librecms.ui;
+package org.librecms.ui.contentsections;
 
 import java.util.ArrayList;
 
diff --git a/ccm-cms/src/main/java/org/librecms/ui/DocumentFolderRowModel.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderRowModel.java
similarity index 98%
rename from ccm-cms/src/main/java/org/librecms/ui/DocumentFolderRowModel.java
rename to ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderRowModel.java
index 3baba5db3..839b15501 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/DocumentFolderRowModel.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderRowModel.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.librecms.ui;
+package org.librecms.ui.contentsections;
 
 import java.util.Collections;
 import java.util.SortedSet;
diff --git a/ccm-cms/src/main/java/org/librecms/ui/FolderTreeNode.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/FolderTreeNode.java
similarity index 97%
rename from ccm-cms/src/main/java/org/librecms/ui/FolderTreeNode.java
rename to ccm-cms/src/main/java/org/librecms/ui/contentsections/FolderTreeNode.java
index 0c3c23df1..1e5d8d6ee 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/FolderTreeNode.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/FolderTreeNode.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.librecms.ui;
+package org.librecms.ui.contentsections;
 
 import java.util.List;
 
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/content-sections/content-sections.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/contentsections/contentsections.xhtml
similarity index 100%
rename from ccm-cms/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/content-sections/content-sections.xhtml
rename to ccm-cms/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/contentsections/contentsections.xhtml
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/access-denied.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/access-denied.xhtml
similarity index 100%
rename from ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/access-denied.xhtml
rename to ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/access-denied.xhtml
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/contentsection-not-found.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection-not-found.xhtml
similarity index 100%
rename from ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/contentsection-not-found.xhtml
rename to ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection-not-found.xhtml
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/contentsection.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection.xhtml
similarity index 100%
rename from ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/contentsection.xhtml
rename to ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection.xhtml
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/document-folder-tree-node.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/document-folder-tree-node.xhtml
similarity index 100%
rename from ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/document-folder-tree-node.xhtml
rename to ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/document-folder-tree-node.xhtml
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/document-folder-not-found.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder-not-found.xhtml
similarity index 100%
rename from ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/document-folder-not-found.xhtml
rename to ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder-not-found.xhtml
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/document-folder.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder.xhtml
similarity index 100%
rename from ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/document-folder.xhtml
rename to ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder.xhtml
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/testdata.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/testdata.xhtml
similarity index 100%
rename from ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/testdata.xhtml
rename to ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/testdata.xhtml