diff --git a/fling/pom.xml b/fling/pom.xml
index c9bc449..bc353d6 100644
--- a/fling/pom.xml
+++ b/fling/pom.xml
@@ -172,8 +172,7 @@
             </Sling-Bundle-Resources>
             <Sling-Initial-Content>
               apps/fling;path:=/apps/fling;overwrite:=true;uninstall:=true,
-              content;path:=/content;overwrite:=true;uninstall:=true,
-              etc;path:=/etc;overwrite:=true;uninstall:=true
+              content;path:=/content;overwrite:=true;uninstall:=true
             </Sling-Initial-Content>
             <Sling-Model-Packages>
               org.apache.sling.samples.fling.page
@@ -193,7 +192,7 @@
         <artifactId>apache-rat-plugin</artifactId>
         <configuration>
           <excludes combine.children="append">
-            <exclude>**/etc/messaging/form/comment.txt</exclude>
+            <exclude>**/apps/fling/messaging/form/comment.txt</exclude>
           </excludes>
         </configuration>
       </plugin>
diff --git a/fling/src/main/resources/etc/i18n/org.apache.sling.samples.fling.json b/fling/src/main/resources/apps/fling/i18n/org.apache.sling.samples.fling.json
similarity index 100%
rename from fling/src/main/resources/etc/i18n/org.apache.sling.samples.fling.json
rename to fling/src/main/resources/apps/fling/i18n/org.apache.sling.samples.fling.json
diff --git a/fling/src/main/resources/etc/messaging/form/comment.txt b/fling/src/main/resources/apps/fling/messaging/form/comment.txt
similarity index 100%
rename from fling/src/main/resources/etc/messaging/form/comment.txt
rename to fling/src/main/resources/apps/fling/messaging/form/comment.txt