diff --git a/packages/knowledge-base-web-page-element-view/favicon.ico b/packages/knowledge-base-web-page-element-view/assets/favicon.ico
similarity index 100%
rename from packages/knowledge-base-web-page-element-view/favicon.ico
rename to packages/knowledge-base-web-page-element-view/assets/favicon.ico
diff --git a/packages/knowledge-base-web-page-element-view/index.html b/packages/knowledge-base-web-page-element-view/assets/index.html
similarity index 100%
rename from packages/knowledge-base-web-page-element-view/index.html
rename to packages/knowledge-base-web-page-element-view/assets/index.html
diff --git a/packages/knowledge-base-web-page-element-view/i18next-scanner.config.js b/packages/knowledge-base-web-page-element-view/i18next-scanner.config.js
index 6c112e37f5c104b78cb42d2fc021fd1adbb9cc47..8c277798414be902846c6eb4f0e95a19750cda39 100644
--- a/packages/knowledge-base-web-page-element-view/i18next-scanner.config.js
+++ b/packages/knowledge-base-web-page-element-view/i18next-scanner.config.js
@@ -1,12 +1,15 @@
 module.exports = {
     input: [
-        '*.js',
+        'src/*.js',
     ],
     output: './',
     options: {
         debug: false,
         removeUnusedKeys: true,
-        sort: true,
         lngs: ['en','de'],
+        resource: {
+            loadPath: 'src/i18n/{{lng}}/{{ns}}.json',
+            savePath: 'src/i18n/{{lng}}/{{ns}}.json'
+        },
     },
 }
diff --git a/packages/knowledge-base-web-page-element-view/index.js b/packages/knowledge-base-web-page-element-view/index.js
deleted file mode 100644
index aef8e752b219f80e8bf48c79ec2899e24fe4d462..0000000000000000000000000000000000000000
--- a/packages/knowledge-base-web-page-element-view/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import 'vpu-auth';
-import './vpu-kb-wpe-view';
-import './vpu-kb-wpe-view-demo';
diff --git a/packages/knowledge-base-web-page-element-view/rollup.config.js b/packages/knowledge-base-web-page-element-view/rollup.config.js
index f1885b564e9fc52095097256b69c8fce02c714e2..d133faf418bdca41fe07d8e5c37ad93a5cff4092 100644
--- a/packages/knowledge-base-web-page-element-view/rollup.config.js
+++ b/packages/knowledge-base-web-page-element-view/rollup.config.js
@@ -12,7 +12,7 @@ const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : '
 console.log("build: " + build);
 
 export default {
-    input: (build != 'test') ? 'index.js' : 'test/**/*.js',
+    input: (build != 'test') ? 'src/demo.js' : 'test/**/*.js',
     output: {
         file: 'dist/bundle.js',
         format: 'esm'
@@ -33,8 +33,8 @@ export default {
         (build !== 'local' && build !== 'test') ? terser() : false,
         copy({
             targets: [
-                'index.html',
-                'favicon.ico',
+                'assets/index.html',
+                'assets/favicon.ico',
                 'node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js',
                 'node_modules/@webcomponents/webcomponentsjs/bundles',
             ],
diff --git a/packages/knowledge-base-web-page-element-view/vpu-kb-wpe-view-demo.js b/packages/knowledge-base-web-page-element-view/src/demo.js
similarity index 98%
rename from packages/knowledge-base-web-page-element-view/vpu-kb-wpe-view-demo.js
rename to packages/knowledge-base-web-page-element-view/src/demo.js
index b141225718b03985d86bcd8b70940437a8320cc0..f0cd2d5c627578b67961161c91a2f2c60b5b33c6 100644
--- a/packages/knowledge-base-web-page-element-view/vpu-kb-wpe-view-demo.js
+++ b/packages/knowledge-base-web-page-element-view/src/demo.js
@@ -1,3 +1,5 @@
+import 'vpu-auth';
+import './vpu-kb-wpe-view.js';
 import utils from './utils.js';
 import {i18n} from './i18n';
 import {html, LitElement} from 'lit-element';
diff --git a/packages/knowledge-base-web-page-element-view/i18n.js b/packages/knowledge-base-web-page-element-view/src/i18n.js
similarity index 100%
rename from packages/knowledge-base-web-page-element-view/i18n.js
rename to packages/knowledge-base-web-page-element-view/src/i18n.js
diff --git a/packages/knowledge-base-web-page-element-view/i18n/de/translation.json b/packages/knowledge-base-web-page-element-view/src/i18n/de/translation.json
similarity index 100%
rename from packages/knowledge-base-web-page-element-view/i18n/de/translation.json
rename to packages/knowledge-base-web-page-element-view/src/i18n/de/translation.json
diff --git a/packages/knowledge-base-web-page-element-view/i18n/en/translation.json b/packages/knowledge-base-web-page-element-view/src/i18n/en/translation.json
similarity index 100%
rename from packages/knowledge-base-web-page-element-view/i18n/en/translation.json
rename to packages/knowledge-base-web-page-element-view/src/i18n/en/translation.json
diff --git a/packages/knowledge-base-web-page-element-view/src/index.js b/packages/knowledge-base-web-page-element-view/src/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..ec83d2159f55dc214de837be709f1afea0d02627
--- /dev/null
+++ b/packages/knowledge-base-web-page-element-view/src/index.js
@@ -0,0 +1 @@
+import './vpu-kb-wpe-view';
diff --git a/packages/knowledge-base-web-page-element-view/utils.js b/packages/knowledge-base-web-page-element-view/src/utils.js
similarity index 100%
rename from packages/knowledge-base-web-page-element-view/utils.js
rename to packages/knowledge-base-web-page-element-view/src/utils.js
diff --git a/packages/knowledge-base-web-page-element-view/vars.js b/packages/knowledge-base-web-page-element-view/src/vars.js
similarity index 100%
rename from packages/knowledge-base-web-page-element-view/vars.js
rename to packages/knowledge-base-web-page-element-view/src/vars.js
diff --git a/packages/knowledge-base-web-page-element-view/vpu-kb-wpe-view.js b/packages/knowledge-base-web-page-element-view/src/vpu-kb-wpe-view.js
similarity index 100%
rename from packages/knowledge-base-web-page-element-view/vpu-kb-wpe-view.js
rename to packages/knowledge-base-web-page-element-view/src/vpu-kb-wpe-view.js
diff --git a/packages/knowledge-base-web-page-element-view/test/unit.js b/packages/knowledge-base-web-page-element-view/test/unit.js
index 4510f133a1ec1723c60a9baa5e11b720cfebf162..24c23287c29d187f898a66099b33b7f03c6f735d 100644
--- a/packages/knowledge-base-web-page-element-view/test/unit.js
+++ b/packages/knowledge-base-web-page-element-view/test/unit.js
@@ -1,4 +1,5 @@
-import '../vpu-kb-wpe-view';
+import '../src/vpu-kb-wpe-view';
+import '../src/demo';
 
 describe('vpu-knowledge-base-web-page-element-view basics', () => {
   let node;
@@ -17,3 +18,21 @@ describe('vpu-knowledge-base-web-page-element-view basics', () => {
       expect(node).to.have.property('shadowRoot');
   });
 });
+
+describe('vpu-knowledge-base-web-page-element-view demo', () => {
+  let node;
+
+  beforeEach(async () => {
+    node = document.createElement('vpu-knowledge-base-web-page-element-view-demo');
+    document.body.appendChild(node);
+    await node.updateComplete;
+  });
+
+  afterEach(() => {
+    node.remove();
+  });
+
+  it('should render', () => {
+      expect(node).to.have.property('shadowRoot');
+  });
+});