diff --git a/packages/notification/favicon.ico b/packages/notification/assets/favicon.ico
similarity index 100%
rename from packages/notification/favicon.ico
rename to packages/notification/assets/favicon.ico
diff --git a/packages/notification/index.html b/packages/notification/assets/index.html
similarity index 100%
rename from packages/notification/index.html
rename to packages/notification/assets/index.html
diff --git a/packages/notification/i18next-scanner.config.js b/packages/notification/i18next-scanner.config.js
index 6c112e37f5c104b78cb42d2fc021fd1adbb9cc47..8c277798414be902846c6eb4f0e95a19750cda39 100644
--- a/packages/notification/i18next-scanner.config.js
+++ b/packages/notification/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/notification/package.json b/packages/notification/package.json
index da74c6d1d93de4031b44f1ba6e0bfd94890dc8c6..e12745db8fd4fcb004b2e28093d2faf5d662a93f 100644
--- a/packages/notification/package.json
+++ b/packages/notification/package.json
@@ -1,6 +1,7 @@
 {
   "name": "vpu-notification",
   "version": "1.0.0",
+  "main": "src/index.js",
   "devDependencies": {
     "node-sass": "^4.12.0",
     "rollup": "^1.11.3",
diff --git a/packages/notification/rollup.config.js b/packages/notification/rollup.config.js
index 9db64d44ecc3219916b717ff10c9b5e8d8d6f687..d03df8d342f26e69618f1ea38be22e07328dd188 100644
--- a/packages/notification/rollup.config.js
+++ b/packages/notification/rollup.config.js
@@ -11,7 +11,7 @@ const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : '
 console.log("build: " + build);
 
 export default {
-    input: 'index.js',
+    input: 'src/demo.js',
     output: {
         file: 'dist/bundle.js',
         format: 'esm'
@@ -31,8 +31,8 @@ export default {
         (build !== 'local') ? 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/notification/index.js b/packages/notification/src/demo.js
similarity index 53%
rename from packages/notification/index.js
rename to packages/notification/src/demo.js
index acd0529d1e873071c8cd9a60b000a05e8fdc8e18..7a384f1c9dc4ec8ad8586d3be0fec1cc5bfe58c2 100644
--- a/packages/notification/index.js
+++ b/packages/notification/src/demo.js
@@ -1,2 +1 @@
-import './vpu-notification';
 import './vpu-notification-demo';
diff --git a/packages/notification/i18n.js b/packages/notification/src/i18n.js
similarity index 100%
rename from packages/notification/i18n.js
rename to packages/notification/src/i18n.js
diff --git a/packages/notification/i18n/de/translation.json b/packages/notification/src/i18n/de/translation.json
similarity index 100%
rename from packages/notification/i18n/de/translation.json
rename to packages/notification/src/i18n/de/translation.json
diff --git a/packages/notification/i18n/en/translation.json b/packages/notification/src/i18n/en/translation.json
similarity index 100%
rename from packages/notification/i18n/en/translation.json
rename to packages/notification/src/i18n/en/translation.json
diff --git a/packages/notification/src/index.js b/packages/notification/src/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..21fda800a80fa59ca83fbe19f66f676a002ba4d9
--- /dev/null
+++ b/packages/notification/src/index.js
@@ -0,0 +1 @@
+import './vpu-notification';
diff --git a/packages/notification/notification.js b/packages/notification/src/notification.js
similarity index 100%
rename from packages/notification/notification.js
rename to packages/notification/src/notification.js
diff --git a/packages/notification/utils.js b/packages/notification/src/utils.js
similarity index 100%
rename from packages/notification/utils.js
rename to packages/notification/src/utils.js
diff --git a/packages/notification/vpu-notification-demo.js b/packages/notification/src/vpu-notification-demo.js
similarity index 98%
rename from packages/notification/vpu-notification-demo.js
rename to packages/notification/src/vpu-notification-demo.js
index f9536106bc0ebd68d0469708c60305d41e9e0484..d2b595ac2723b131bd6dd774caa5896ff463518b 100644
--- a/packages/notification/vpu-notification-demo.js
+++ b/packages/notification/src/vpu-notification-demo.js
@@ -1,6 +1,7 @@
 import {i18n} from './i18n';
 import notification from './notification';
 import {html, LitElement} from 'lit-element';
+import './vpu-notification';
 
 class NotificationDemo extends LitElement {
     constructor() {
diff --git a/packages/notification/vpu-notification.js b/packages/notification/src/vpu-notification.js
similarity index 100%
rename from packages/notification/vpu-notification.js
rename to packages/notification/src/vpu-notification.js