diff --git a/packages/auth/favicon.ico b/packages/auth/assets/favicon.ico
similarity index 100%
rename from packages/auth/favicon.ico
rename to packages/auth/assets/favicon.ico
diff --git a/packages/auth/index.html b/packages/auth/assets/index.html
similarity index 100%
rename from packages/auth/index.html
rename to packages/auth/assets/index.html
diff --git a/packages/auth/i18next-scanner.config.js b/packages/auth/i18next-scanner.config.js
index 6c112e37f5c104b78cb42d2fc021fd1adbb9cc47..8c277798414be902846c6eb4f0e95a19750cda39 100644
--- a/packages/auth/i18next-scanner.config.js
+++ b/packages/auth/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/auth/package.json b/packages/auth/package.json
index ac76792eb903b6bbdbdb35309bef88e2064d4c62..3d21219561327eb7a4f6d141ba630e721c11b755 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,7 @@
 {
   "name": "vpu-auth",
   "version": "1.0.0",
+  "main": "src/index.js",
   "devDependencies": {
     "node-sass": "^4.12.0",
     "rollup": "^1.11.3",
diff --git a/packages/auth/rollup.config.js b/packages/auth/rollup.config.js
index 0211dac6f5bc95abd2d758c1048a2c0502fb08a4..d03df8d342f26e69618f1ea38be22e07328dd188 100644
--- a/packages/auth/rollup.config.js
+++ b/packages/auth/rollup.config.js
@@ -11,7 +11,7 @@ const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : '
 console.log("build: " + build);
 
 export default {
-    input: 'demo.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/auth/demo.js b/packages/auth/src/demo.js
similarity index 59%
rename from packages/auth/demo.js
rename to packages/auth/src/demo.js
index ba7b31555dc6cda3f1d7ccba5a41772123596ce0..a6c2fa313b87a40e571179a0794b7a363e2d849d 100644
--- a/packages/auth/demo.js
+++ b/packages/auth/src/demo.js
@@ -1,2 +1 @@
-import './index';
 import './vpu-auth-demo';
diff --git a/packages/auth/i18n.js b/packages/auth/src/i18n.js
similarity index 100%
rename from packages/auth/i18n.js
rename to packages/auth/src/i18n.js
diff --git a/packages/auth/i18n/de/translation.json b/packages/auth/src/i18n/de/translation.json
similarity index 100%
rename from packages/auth/i18n/de/translation.json
rename to packages/auth/src/i18n/de/translation.json
diff --git a/packages/auth/i18n/en/translation.json b/packages/auth/src/i18n/en/translation.json
similarity index 100%
rename from packages/auth/i18n/en/translation.json
rename to packages/auth/src/i18n/en/translation.json
diff --git a/packages/auth/index.js b/packages/auth/src/index.js
similarity index 100%
rename from packages/auth/index.js
rename to packages/auth/src/index.js
diff --git a/packages/auth/utils.js b/packages/auth/src/utils.js
similarity index 100%
rename from packages/auth/utils.js
rename to packages/auth/src/utils.js
diff --git a/packages/auth/vars.js b/packages/auth/src/vars.js
similarity index 100%
rename from packages/auth/vars.js
rename to packages/auth/src/vars.js
diff --git a/packages/auth/vpu-auth-demo.js b/packages/auth/src/vpu-auth-demo.js
similarity index 98%
rename from packages/auth/vpu-auth-demo.js
rename to packages/auth/src/vpu-auth-demo.js
index e04852edd07d3b2ef83eb8a77f006f92c6ab7da0..0688c783113e737855164d5f12eb3656a4cf3f46 100644
--- a/packages/auth/vpu-auth-demo.js
+++ b/packages/auth/src/vpu-auth-demo.js
@@ -1,6 +1,7 @@
 import utils from './utils.js';
 import {i18n} from './i18n.js';
 import {html, LitElement} from 'lit-element';
+import './vpu-auth';
 
 class AuthDemo extends LitElement {
     constructor() {
diff --git a/packages/auth/vpu-auth.js b/packages/auth/src/vpu-auth.js
similarity index 100%
rename from packages/auth/vpu-auth.js
rename to packages/auth/src/vpu-auth.js