diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml
index 18365150..12230b21 100644
--- a/complete-cloud/pom.xml
+++ b/complete-cloud/pom.xml
@@ -58,10 +58,6 @@
                             <groupId>de.valtech.aecu</groupId>
                             <artifactId>aecu.ui.apps</artifactId>
                         </embedded>
-                        <embedded>
-                            <groupId>de.valtech.aecu</groupId>
-                            <artifactId>aecu.ui.content</artifactId>
-                        </embedded>
                     </embeddeds>
                 </configuration>
             </plugin>
@@ -89,12 +85,6 @@
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
-        <dependency>
-            <groupId>de.valtech.aecu</groupId>
-            <artifactId>aecu.ui.content</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
-        </dependency>
         <dependency>
             <groupId>de.valtech.aecu</groupId>
             <artifactId>aecu.core</artifactId>
diff --git a/complete/pom.xml b/complete/pom.xml
index 3850523e..681cc6c0 100644
--- a/complete/pom.xml
+++ b/complete/pom.xml
@@ -44,11 +44,6 @@
                             <artifactId>aecu.ui.apps</artifactId>
                             <filter>true</filter>
                         </subPackage>
-                        <subPackage>
-                            <groupId>de.valtech.aecu</groupId>
-                            <artifactId>aecu.ui.content</artifactId>
-                            <filter>true</filter>
-                        </subPackage>
                         <subPackage>
                             <groupId>de.valtech.aecu</groupId>
                             <artifactId>aecu.oak.index</artifactId>
@@ -94,12 +89,6 @@
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
-        <dependency>
-            <groupId>de.valtech.aecu</groupId>
-            <artifactId>aecu.ui.content</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
-        </dependency>
         <dependency>
             <groupId>de.valtech.aecu</groupId>
             <artifactId>aecu.oak.index</artifactId>
diff --git a/pom.xml b/pom.xml
index 7e82844f..dd1d35b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,9 +13,7 @@
         <module>api</module>
         <module>core</module>
         <module>cloud.startup.hook</module>
-        <module>ui.apps.structure</module>
         <module>ui.apps</module>
-        <module>ui.content</module>
         <module>oak.index</module>
         <module>complete</module>
         <module>complete-cloud</module>
diff --git a/ui.apps.structure/.gitignore b/ui.apps.structure/.gitignore
deleted file mode 100644
index b83d2226..00000000
--- a/ui.apps.structure/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/
diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml
deleted file mode 100644
index 8d313d01..00000000
--- a/ui.apps.structure/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>de.valtech.aecu</groupId>
-        <artifactId>aecu</artifactId>
-        <version>6.5.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>aecu.ui.apps.structure</artifactId>
-    <packaging>content-package</packaging>
-    <name>AECU - Repository Structure Package</name>
-    <description>
-        Empty package that defines the structure of the Adobe Experience Manager repository the Code packages in this project deploy into.
-        Any roots in the Code packages of this project should have their parent enumerated in the Filters list below.
-    </description>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.jackrabbit</groupId>
-                <artifactId>filevault-package-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <properties>
-                        <cloudManagerTarget>none</cloudManagerTarget>
-                    </properties>
-                    <filters>
-                        <filter><root>/apps</root></filter>
-                        <filter><root>/apps/sling</root></filter>
-                        <filter><root>/apps/cq</root></filter>
-                        <filter><root>/apps/dam</root></filter>
-                        <filter><root>/apps/wcm</root></filter>
-                        <filter><root>/apps/msm</root></filter>
-                        <filter><root>/apps/settings</root></filter>
-                        <filter><root>/home/users</root></filter>
-                        <filter><root>/home/users/system</root></filter>
-                        <filter><root>/var/workflow/models</root></filter>
-                        <filter><root>/var/workflow/models/dam</root></filter>
-                        <filter><root>/conf</root></filter>
-                        <filter><root>/conf/global</root></filter>
-                        <filter><root>/conf/global/settings</root></filter>
-                    </filters>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index 79a98773..eedb4060 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -29,7 +29,7 @@
                     <validatorsSettings>
                         <jackrabbit-filter>
                             <options>
-                                <validRoots>/apps,/apps/valtech,/apps/cq/core/content/nav/tools,/apps/settings/granite/operations/hc</validRoots>
+                                <validRoots>/apps,/apps/valtech,/apps/cq/core/content/nav/tools,/apps/settings/granite/operations/hc,/apps/settings/granite/operations/maintenance/granite_weekly</validRoots>
                             </options>
                         </jackrabbit-filter>
                     </validatorsSettings>
diff --git a/ui.apps/src/main/content/META-INF/vault/filter.xml b/ui.apps/src/main/content/META-INF/vault/filter.xml
index 335e5cf3..94b4cc95 100644
--- a/ui.apps/src/main/content/META-INF/vault/filter.xml
+++ b/ui.apps/src/main/content/META-INF/vault/filter.xml
@@ -3,4 +3,5 @@
     <filter root="/apps/valtech/aecu"/>
     <filter root="/apps/cq/core/content/nav/tools/aecu"/>
     <filter root="/apps/settings/granite/operations/hc/aecu"/>
+    <filter root="/apps/settings/granite/operations/maintenance/granite_weekly/aecu_history_purge"/>
 </workspaceFilter>
diff --git a/ui.content/src/main/content/jcr_root/conf/global/settings/granite/operations/maintenance/.content.xml b/ui.apps/src/main/content/jcr_root/apps/settings/granite/operations/maintenance/.content.xml
similarity index 100%
rename from ui.content/src/main/content/jcr_root/conf/global/settings/granite/operations/maintenance/.content.xml
rename to ui.apps/src/main/content/jcr_root/apps/settings/granite/operations/maintenance/.content.xml
diff --git a/ui.content/src/main/content/jcr_root/conf/global/settings/granite/operations/maintenance/granite_weekly/.content.xml b/ui.apps/src/main/content/jcr_root/apps/settings/granite/operations/maintenance/granite_weekly/.content.xml
similarity index 100%
rename from ui.content/src/main/content/jcr_root/conf/global/settings/granite/operations/maintenance/granite_weekly/.content.xml
rename to ui.apps/src/main/content/jcr_root/apps/settings/granite/operations/maintenance/granite_weekly/.content.xml
diff --git a/ui.content/src/main/content/jcr_root/conf/global/settings/granite/operations/maintenance/granite_weekly/aecu_history_purge/.content.xml b/ui.apps/src/main/content/jcr_root/apps/settings/granite/operations/maintenance/granite_weekly/aecu_history_purge/.content.xml
similarity index 100%
rename from ui.content/src/main/content/jcr_root/conf/global/settings/granite/operations/maintenance/granite_weekly/aecu_history_purge/.content.xml
rename to ui.apps/src/main/content/jcr_root/apps/settings/granite/operations/maintenance/granite_weekly/aecu_history_purge/.content.xml
diff --git a/ui.content/pom.xml b/ui.content/pom.xml
deleted file mode 100644
index 9e2e63cf..00000000
--- a/ui.content/pom.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>de.valtech.aecu</groupId>
-        <artifactId>aecu</artifactId>
-        <version>6.5.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>aecu.ui.content</artifactId>
-    <packaging>content-package</packaging>
-    <name>AECU - UI content</name>
-    <description>UI content package for AECU</description>
-
-    <build>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.jackrabbit</groupId>
-                <artifactId>filevault-package-maven-plugin</artifactId>
-                <configuration>
-                    <packageType>content</packageType>
-                    <allowIndexDefinitions>true</allowIndexDefinitions>
-                    <filterSource>src/main/content/META-INF/vault/filter.xml</filterSource>
-                    <group>Valtech</group>
-                    <properties>
-                        <cloudManagerTarget>none</cloudManagerTarget>
-                    </properties>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.day.jcr.vault</groupId>
-                <artifactId>content-package-maven-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.sling</groupId>
-                <artifactId>htl-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-
-        <profile>
-            <id>autoInstallPackage</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>com.day.jcr.vault</groupId>
-                            <artifactId>content-package-maven-plugin</artifactId>
-                            <executions>
-                                <execution>
-                                    <id>install-package</id>
-                                    <goals>
-                                        <goal>install</goal>
-                                    </goals>
-                                    <configuration>
-                                        <targetURL>http://${aem.host}:${aem.port}/crx/packmgr/service.jsp</targetURL>
-                                    </configuration>
-                                </execution>
-                            </executions>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-
-        <profile>
-            <id>autoInstallPackagePublish</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>com.day.jcr.vault</groupId>
-                            <artifactId>content-package-maven-plugin</artifactId>
-                            <executions>
-                                <execution>
-                                    <id>install-package-publish</id>
-                                    <goals>
-                                        <goal>install</goal>
-                                    </goals>
-                                    <configuration>
-                                        <targetURL>http://${aem.publish.host}:${aem.publish.port}/crx/packmgr/service.jsp
-                                        </targetURL>
-                                    </configuration>
-                                </execution>
-                            </executions>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-
-        <profile>
-            <id>autoInstallPackageCloud</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>com.day.jcr.vault</groupId>
-                            <artifactId>content-package-maven-plugin</artifactId>
-                            <executions>
-                                <execution>
-                                    <id>install-package</id>
-                                    <goals>
-                                        <goal>install</goal>
-                                    </goals>
-                                    <configuration>
-                                        <targetURL>http://${aem.host}:${aem.port}/crx/packmgr/service.jsp</targetURL>
-                                    </configuration>
-                                </execution>
-                            </executions>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-
-        <profile>
-            <id>autoInstallPackagePublishCloud</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>com.day.jcr.vault</groupId>
-                            <artifactId>content-package-maven-plugin</artifactId>
-                            <executions>
-                                <execution>
-                                    <id>install-package-publish</id>
-                                    <goals>
-                                        <goal>install</goal>
-                                    </goals>
-                                    <configuration>
-                                        <targetURL>http://${aem.publish.host}:${aem.publish.port}/crx/packmgr/service.jsp
-                                        </targetURL>
-                                    </configuration>
-                                </execution>
-                            </executions>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-
-    </profiles>
-
-</project>
diff --git a/ui.content/src/main/.gitignore b/ui.content/src/main/.gitignore
deleted file mode 100644
index cb6eb2cc..00000000
--- a/ui.content/src/main/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/resources/
diff --git a/ui.content/src/main/content/META-INF/vault/definition/.content.xml b/ui.content/src/main/content/META-INF/vault/definition/.content.xml
deleted file mode 100644
index 2edc22d8..00000000
--- a/ui.content/src/main/content/META-INF/vault/definition/.content.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2012 Adobe Systems Incorporated
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<jcr:root xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="vlt:PackageDefinition">
-    <thumbnail.png/>
-</jcr:root>
\ No newline at end of file
diff --git a/ui.content/src/main/content/META-INF/vault/definition/screenshots/.content.xml b/ui.content/src/main/content/META-INF/vault/definition/screenshots/.content.xml
deleted file mode 100644
index 5e25fbe6..00000000
--- a/ui.content/src/main/content/META-INF/vault/definition/screenshots/.content.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="nt:unstructured">
-</jcr:root>
diff --git a/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot1/file b/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot1/file
deleted file mode 100644
index 41208624..00000000
Binary files a/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot1/file and /dev/null differ
diff --git a/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot1/file.dir/.content.xml b/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot1/file.dir/.content.xml
deleted file mode 100644
index 5cd4d52e..00000000
--- a/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot1/file.dir/.content.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="nt:file">
-    <jcr:content
-        jcr:lastModifiedBy="admin"
-        jcr:mimeType="image/png"
-        jcr:primaryType="nt:resource"/>
-</jcr:root>
diff --git a/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot2/file b/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot2/file
deleted file mode 100644
index b7eecd2e..00000000
Binary files a/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot2/file and /dev/null differ
diff --git a/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot2/file.dir/.content.xml b/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot2/file.dir/.content.xml
deleted file mode 100644
index 5cd4d52e..00000000
--- a/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot2/file.dir/.content.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="nt:file">
-    <jcr:content
-        jcr:lastModifiedBy="admin"
-        jcr:mimeType="image/png"
-        jcr:primaryType="nt:resource"/>
-</jcr:root>
diff --git a/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot3/file b/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot3/file
deleted file mode 100644
index 9b3fac40..00000000
Binary files a/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot3/file and /dev/null differ
diff --git a/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot3/file.dir/.content.xml b/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot3/file.dir/.content.xml
deleted file mode 100644
index 5cd4d52e..00000000
--- a/ui.content/src/main/content/META-INF/vault/definition/screenshots/screenshot3/file.dir/.content.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="nt:file">
-    <jcr:content
-        jcr:lastModifiedBy="admin"
-        jcr:mimeType="image/png"
-        jcr:primaryType="nt:resource"/>
-</jcr:root>
diff --git a/ui.content/src/main/content/META-INF/vault/definition/thumbnail.png b/ui.content/src/main/content/META-INF/vault/definition/thumbnail.png
deleted file mode 100644
index c4548ee8..00000000
Binary files a/ui.content/src/main/content/META-INF/vault/definition/thumbnail.png and /dev/null differ
diff --git a/ui.content/src/main/content/META-INF/vault/filter.xml b/ui.content/src/main/content/META-INF/vault/filter.xml
deleted file mode 100644
index 18a9978d..00000000
--- a/ui.content/src/main/content/META-INF/vault/filter.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<workspaceFilter version="1.0">
-    <filter root="/conf/global/settings/granite/operations/maintenance/granite_weekly">
-      <include pattern="/conf/global/settings/granite/operations/maintenance/granite_weekly" />
-      <include pattern="/conf/global/settings/granite/operations/maintenance/granite_weekly/aecu_history_purge(/.*)?" />
-    </filter>
-    <filter root="/etc/groovyconsole/scripts/aecu" type="cleanup"/><!--removes the old location-->
-</workspaceFilter>
diff --git a/ui.content/src/main/content/jcr_root/conf/global/settings/.content.xml b/ui.content/src/main/content/jcr_root/conf/global/settings/.content.xml
deleted file mode 100755
index 457768dc..00000000
--- a/ui.content/src/main/content/jcr_root/conf/global/settings/.content.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-          jcr:primaryType="sling:Folder"
-          jcr:mixinTypes="rep:AccessControllable"
-          >
-</jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/global/settings/granite/.content.xml b/ui.content/src/main/content/jcr_root/conf/global/settings/granite/.content.xml
deleted file mode 100755
index d575b897..00000000
--- a/ui.content/src/main/content/jcr_root/conf/global/settings/granite/.content.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-          jcr:primaryType="nt:folder">
-</jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/global/settings/granite/operations/.content.xml b/ui.content/src/main/content/jcr_root/conf/global/settings/granite/operations/.content.xml
deleted file mode 100755
index d575b897..00000000
--- a/ui.content/src/main/content/jcr_root/conf/global/settings/granite/operations/.content.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-          jcr:primaryType="nt:folder">
-</jcr:root>