diff --git a/README.md b/README.md
index 43efb92..a3bb7c8 100644
--- a/README.md
+++ b/README.md
@@ -215,7 +215,7 @@ The `@DemoSource` annotation also supports a `condition` attribute to control th
 
 
 ```java
-@DemoSource(value = "/src/test/resources/META-INF/resources/frontend/example.css", condition = "vaadin ge 24")
+@DemoSource(value = "/src/test/resources/META-INF/frontend/example.css", condition = "vaadin ge 24")
 public class MyDemo extends Div {
  ...
 }
diff --git a/base/pom.xml b/base/pom.xml
index fb538d9..c113763 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -187,8 +187,8 @@
             <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
               <excludes>
                 <exclude>**/AppShellConfiguratorImpl.class</exclude>
-                <exclude>**/main/resources/META-INF/resources/frontend/prism.js</exclude>
-                <exclude>**/main/resources/META-INF/resources/frontend/prism.css</exclude>
+                <exclude>**/main/resources/META-INF/frontend/prism.js</exclude>
+                <exclude>**/main/resources/META-INF/frontend/prism.css</exclude>
                 <exclude>**/test/resources/**</exclude>
                 <exclude>**/main/dev-bundle/**</exclude>
               </excludes>
diff --git a/base/src/main/java/com/flowingcode/vaadin/addons/demo/TabbedDemo.java b/base/src/main/java/com/flowingcode/vaadin/addons/demo/TabbedDemo.java
index 0cab2b8..28e01c4 100644
--- a/base/src/main/java/com/flowingcode/vaadin/addons/demo/TabbedDemo.java
+++ b/base/src/main/java/com/flowingcode/vaadin/addons/demo/TabbedDemo.java
@@ -65,7 +65,7 @@
  * toggling the source code visibility, orientation, and theme.
  * </p>
  */
-@StyleSheet("context://frontend/styles/commons-demo/shared-styles.css")
+@StyleSheet("context://styles/commons-demo/shared-styles.css")
 @SuppressWarnings("serial")
 @CssImport(value = "./styles/commons-demo/vaadin-select-overlay.css", themeFor = "vaadin-select")
 public class TabbedDemo extends VerticalLayout implements RouterLayout {
diff --git a/base/src/main/resources/META-INF/resources/frontend/code-viewer.ts b/base/src/main/resources/META-INF/frontend/code-viewer.ts
similarity index 100%
rename from base/src/main/resources/META-INF/resources/frontend/code-viewer.ts
rename to base/src/main/resources/META-INF/frontend/code-viewer.ts
diff --git a/base/src/main/resources/META-INF/resources/frontend/commons-demo-iconset.ts b/base/src/main/resources/META-INF/frontend/commons-demo-iconset.ts
similarity index 100%
rename from base/src/main/resources/META-INF/resources/frontend/commons-demo-iconset.ts
rename to base/src/main/resources/META-INF/frontend/commons-demo-iconset.ts
diff --git a/base/src/main/resources/META-INF/resources/frontend/prism.js b/base/src/main/resources/META-INF/frontend/prism.js
similarity index 100%
rename from base/src/main/resources/META-INF/resources/frontend/prism.js
rename to base/src/main/resources/META-INF/frontend/prism.js
diff --git a/base/src/main/resources/META-INF/resources/frontend/source-code-viewer-buttons.ts b/base/src/main/resources/META-INF/frontend/source-code-viewer-buttons.ts
similarity index 100%
rename from base/src/main/resources/META-INF/resources/frontend/source-code-viewer-buttons.ts
rename to base/src/main/resources/META-INF/frontend/source-code-viewer-buttons.ts
diff --git a/base/src/main/resources/META-INF/resources/frontend/styles/commons-demo/vaadin-select-overlay.css b/base/src/main/resources/META-INF/frontend/styles/commons-demo/vaadin-select-overlay.css
similarity index 100%
rename from base/src/main/resources/META-INF/resources/frontend/styles/commons-demo/vaadin-select-overlay.css
rename to base/src/main/resources/META-INF/frontend/styles/commons-demo/vaadin-select-overlay.css
diff --git a/base/src/main/resources/META-INF/resources/frontend/styles/commons-demo/shared-styles.css b/base/src/main/resources/META-INF/resources/styles/commons-demo/shared-styles.css
similarity index 100%
rename from base/src/main/resources/META-INF/resources/frontend/styles/commons-demo/shared-styles.css
rename to base/src/main/resources/META-INF/resources/styles/commons-demo/shared-styles.css
diff --git a/base/src/test/java/com/flowingcode/vaadin/addons/demo/MultiSourceDemo.java b/base/src/test/java/com/flowingcode/vaadin/addons/demo/MultiSourceDemo.java
index 80c6d3b..28e7a47 100644
--- a/base/src/test/java/com/flowingcode/vaadin/addons/demo/MultiSourceDemo.java
+++ b/base/src/test/java/com/flowingcode/vaadin/addons/demo/MultiSourceDemo.java
@@ -28,15 +28,15 @@
 @PageTitle("Demo with multiple sources")
 // show-source @DemoSource
 // show-source @DemoSource(clazz = AdditionalSources.class)
-// show-source @DemoSource("/src/test/resources/META-INF/resources/frontend/multi-source-demo.css")
-// show-source @DemoSource(value="/src/test/resources/META-INF/resources/frontend/condition-true.css", condition = "vaadin ge 14")
-// show-source @DemoSource(value="/src/test/resources/META-INF/resources/frontend/condition-false.css", condition = "vaadin eq 0")
+// show-source @DemoSource("/src/test/resources/META-INF/resources/multi-source-demo.css")
+// show-source @DemoSource(value="/src/test/resources/META-INF/resources/condition-true.css", condition = "vaadin ge 14")
+// show-source @DemoSource(value="/src/test/resources/META-INF/resources/condition-false.css", condition = "vaadin eq 0")
 @DemoSource
 @DemoSource(clazz = AdditionalSources.class)
-@DemoSource("/src/test/resources/META-INF/resources/frontend/multi-source-demo.css")
-@DemoSource(value="/src/test/resources/META-INF/resources/frontend/condition-true.css", condition = "vaadin ge 14")
-@DemoSource(value="/src/test/resources/META-INF/resources/frontend/condition-false.css", condition = "vaadin eq 0")
-@StyleSheet("context://frontend/multi-source-demo.css")
+@DemoSource("/src/test/resources/META-INF/resources/multi-source-demo.css")
+@DemoSource(value="/src/test/resources/META-INF/resources/condition-true.css", condition = "vaadin ge 14")
+@DemoSource(value="/src/test/resources/META-INF/resources/condition-false.css", condition = "vaadin eq 0")
+@StyleSheet("context://multi-source-demo.css")
 public class MultiSourceDemo extends Div {
   public MultiSourceDemo() {
 
diff --git a/base/src/test/java/com/flowingcode/vaadin/addons/demo/SampleDemoHighlight.java b/base/src/test/java/com/flowingcode/vaadin/addons/demo/SampleDemoHighlight.java
index 2f25f55..a9c43d9 100644
--- a/base/src/test/java/com/flowingcode/vaadin/addons/demo/SampleDemoHighlight.java
+++ b/base/src/test/java/com/flowingcode/vaadin/addons/demo/SampleDemoHighlight.java
@@ -31,8 +31,8 @@
 @Route(value = "demo/highlight", layout = Demo.class)
 @PageTitle("Highlight")
 @DemoSource
-@DemoSource("/src/test/resources/META-INF/resources/frontend/highlight-demo.css")
-@StyleSheet("context://frontend/highlight-demo.css")
+@DemoSource("/src/test/resources/META-INF/resources/highlight-demo.css")
+@StyleSheet("context://highlight-demo.css")
 public class SampleDemoHighlight extends Div {
 
   public SampleDemoHighlight() {
diff --git a/base/src/test/resources/META-INF/resources/frontend/condition-false.css b/base/src/test/resources/META-INF/resources/condition-false.css
similarity index 100%
rename from base/src/test/resources/META-INF/resources/frontend/condition-false.css
rename to base/src/test/resources/META-INF/resources/condition-false.css
diff --git a/base/src/test/resources/META-INF/resources/frontend/condition-true.css b/base/src/test/resources/META-INF/resources/condition-true.css
similarity index 100%
rename from base/src/test/resources/META-INF/resources/frontend/condition-true.css
rename to base/src/test/resources/META-INF/resources/condition-true.css
diff --git a/base/src/test/resources/META-INF/resources/frontend/highlight-demo.css b/base/src/test/resources/META-INF/resources/highlight-demo.css
similarity index 100%
rename from base/src/test/resources/META-INF/resources/frontend/highlight-demo.css
rename to base/src/test/resources/META-INF/resources/highlight-demo.css
diff --git a/base/src/test/resources/META-INF/resources/frontend/multi-source-demo.css b/base/src/test/resources/META-INF/resources/multi-source-demo.css
similarity index 100%
rename from base/src/test/resources/META-INF/resources/frontend/multi-source-demo.css
rename to base/src/test/resources/META-INF/resources/multi-source-demo.css