diff --git a/demo/static/tests/core/qweb_vdom.test.ts b/demo/static/tests/core/qweb_vdom.test.ts
index 7c87a8cc..3861eccf 100644
--- a/demo/static/tests/core/qweb_vdom.test.ts
+++ b/demo/static/tests/core/qweb_vdom.test.ts
@@ -1,6 +1,6 @@
-import sdAttributes from "../../../../src/snabbdom/src/modules/attributes";
-import sdListeners from "../../../../src/snabbdom/src/modules/eventlisteners";
-import { init } from "../../../../src/snabbdom/src/snabbdom";
+import sdAttributes from "../../../../libs/snabbdom/src/modules/attributes";
+import sdListeners from "../../../../libs/snabbdom/src/modules/eventlisteners";
+import { init } from "../../../../libs/snabbdom/src/snabbdom";
 import { EvalContext, QWeb } from "../../../../src/qweb_vdom";
 import { normalize } from "../helpers";
 //------------------------------------------------------------------------------
diff --git a/src/snabbdom/.gitignore b/libs/snabbdom/.gitignore
similarity index 100%
rename from src/snabbdom/.gitignore
rename to libs/snabbdom/.gitignore
diff --git a/src/snabbdom/.npmignore b/libs/snabbdom/.npmignore
similarity index 100%
rename from src/snabbdom/.npmignore
rename to libs/snabbdom/.npmignore
diff --git a/src/snabbdom/.travis.yml b/libs/snabbdom/.travis.yml
similarity index 100%
rename from src/snabbdom/.travis.yml
rename to libs/snabbdom/.travis.yml
diff --git a/src/snabbdom/LICENSE b/libs/snabbdom/LICENSE
similarity index 100%
rename from src/snabbdom/LICENSE
rename to libs/snabbdom/LICENSE
diff --git a/src/snabbdom/README.md b/libs/snabbdom/README.md
similarity index 100%
rename from src/snabbdom/README.md
rename to libs/snabbdom/README.md
diff --git a/src/snabbdom/browserstack-karma.js b/libs/snabbdom/browserstack-karma.js
similarity index 100%
rename from src/snabbdom/browserstack-karma.js
rename to libs/snabbdom/browserstack-karma.js
diff --git a/src/snabbdom/dist/h.js b/libs/snabbdom/dist/h.js
similarity index 100%
rename from src/snabbdom/dist/h.js
rename to libs/snabbdom/dist/h.js
diff --git a/src/snabbdom/dist/h.min.js b/libs/snabbdom/dist/h.min.js
similarity index 100%
rename from src/snabbdom/dist/h.min.js
rename to libs/snabbdom/dist/h.min.js
diff --git a/src/snabbdom/dist/h.min.js.map b/libs/snabbdom/dist/h.min.js.map
similarity index 100%
rename from src/snabbdom/dist/h.min.js.map
rename to libs/snabbdom/dist/h.min.js.map
diff --git a/src/snabbdom/dist/snabbdom-attributes.js b/libs/snabbdom/dist/snabbdom-attributes.js
similarity index 100%
rename from src/snabbdom/dist/snabbdom-attributes.js
rename to libs/snabbdom/dist/snabbdom-attributes.js
diff --git a/src/snabbdom/dist/snabbdom-attributes.min.js b/libs/snabbdom/dist/snabbdom-attributes.min.js
similarity index 100%
rename from src/snabbdom/dist/snabbdom-attributes.min.js
rename to libs/snabbdom/dist/snabbdom-attributes.min.js
diff --git a/src/snabbdom/dist/snabbdom-attributes.min.js.map b/libs/snabbdom/dist/snabbdom-attributes.min.js.map
similarity index 100%
rename from src/snabbdom/dist/snabbdom-attributes.min.js.map
rename to libs/snabbdom/dist/snabbdom-attributes.min.js.map
diff --git a/src/snabbdom/dist/snabbdom-class.js b/libs/snabbdom/dist/snabbdom-class.js
similarity index 100%
rename from src/snabbdom/dist/snabbdom-class.js
rename to libs/snabbdom/dist/snabbdom-class.js
diff --git a/src/snabbdom/dist/snabbdom-class.min.js b/libs/snabbdom/dist/snabbdom-class.min.js
similarity index 100%
rename from src/snabbdom/dist/snabbdom-class.min.js
rename to libs/snabbdom/dist/snabbdom-class.min.js
diff --git a/src/snabbdom/dist/snabbdom-class.min.js.map b/libs/snabbdom/dist/snabbdom-class.min.js.map
similarity index 100%
rename from src/snabbdom/dist/snabbdom-class.min.js.map
rename to libs/snabbdom/dist/snabbdom-class.min.js.map
diff --git a/src/snabbdom/dist/snabbdom-dataset.js b/libs/snabbdom/dist/snabbdom-dataset.js
similarity index 100%
rename from src/snabbdom/dist/snabbdom-dataset.js
rename to libs/snabbdom/dist/snabbdom-dataset.js
diff --git a/src/snabbdom/dist/snabbdom-eventlisteners.js b/libs/snabbdom/dist/snabbdom-eventlisteners.js
similarity index 100%
rename from src/snabbdom/dist/snabbdom-eventlisteners.js
rename to libs/snabbdom/dist/snabbdom-eventlisteners.js
diff --git a/src/snabbdom/dist/snabbdom-eventlisteners.min.js b/libs/snabbdom/dist/snabbdom-eventlisteners.min.js
similarity index 100%
rename from src/snabbdom/dist/snabbdom-eventlisteners.min.js
rename to libs/snabbdom/dist/snabbdom-eventlisteners.min.js
diff --git a/src/snabbdom/dist/snabbdom-eventlisteners.min.js.map b/libs/snabbdom/dist/snabbdom-eventlisteners.min.js.map
similarity index 100%
rename from src/snabbdom/dist/snabbdom-eventlisteners.min.js.map
rename to libs/snabbdom/dist/snabbdom-eventlisteners.min.js.map
diff --git a/src/snabbdom/dist/snabbdom-patch.js b/libs/snabbdom/dist/snabbdom-patch.js
similarity index 100%
rename from src/snabbdom/dist/snabbdom-patch.js
rename to libs/snabbdom/dist/snabbdom-patch.js
diff --git a/src/snabbdom/dist/snabbdom-patch.min.js b/libs/snabbdom/dist/snabbdom-patch.min.js
similarity index 100%
rename from src/snabbdom/dist/snabbdom-patch.min.js
rename to libs/snabbdom/dist/snabbdom-patch.min.js
diff --git a/src/snabbdom/dist/snabbdom-patch.min.js.map b/libs/snabbdom/dist/snabbdom-patch.min.js.map
similarity index 100%
rename from src/snabbdom/dist/snabbdom-patch.min.js.map
rename to libs/snabbdom/dist/snabbdom-patch.min.js.map
diff --git a/src/snabbdom/dist/snabbdom-props.js b/libs/snabbdom/dist/snabbdom-props.js
similarity index 100%
rename from src/snabbdom/dist/snabbdom-props.js
rename to libs/snabbdom/dist/snabbdom-props.js
diff --git a/src/snabbdom/dist/snabbdom-props.min.js b/libs/snabbdom/dist/snabbdom-props.min.js
similarity index 100%
rename from src/snabbdom/dist/snabbdom-props.min.js
rename to libs/snabbdom/dist/snabbdom-props.min.js
diff --git a/src/snabbdom/dist/snabbdom-props.min.js.map b/libs/snabbdom/dist/snabbdom-props.min.js.map
similarity index 100%
rename from src/snabbdom/dist/snabbdom-props.min.js.map
rename to libs/snabbdom/dist/snabbdom-props.min.js.map
diff --git a/src/snabbdom/dist/snabbdom-style.js b/libs/snabbdom/dist/snabbdom-style.js
similarity index 100%
rename from src/snabbdom/dist/snabbdom-style.js
rename to libs/snabbdom/dist/snabbdom-style.js
diff --git a/src/snabbdom/dist/snabbdom-style.min.js b/libs/snabbdom/dist/snabbdom-style.min.js
similarity index 100%
rename from src/snabbdom/dist/snabbdom-style.min.js
rename to libs/snabbdom/dist/snabbdom-style.min.js
diff --git a/src/snabbdom/dist/snabbdom-style.min.js.map b/libs/snabbdom/dist/snabbdom-style.min.js.map
similarity index 100%
rename from src/snabbdom/dist/snabbdom-style.min.js.map
rename to libs/snabbdom/dist/snabbdom-style.min.js.map
diff --git a/src/snabbdom/dist/snabbdom.js b/libs/snabbdom/dist/snabbdom.js
similarity index 100%
rename from src/snabbdom/dist/snabbdom.js
rename to libs/snabbdom/dist/snabbdom.js
diff --git a/src/snabbdom/dist/snabbdom.min.js b/libs/snabbdom/dist/snabbdom.min.js
similarity index 100%
rename from src/snabbdom/dist/snabbdom.min.js
rename to libs/snabbdom/dist/snabbdom.min.js
diff --git a/src/snabbdom/dist/snabbdom.min.js.map b/libs/snabbdom/dist/snabbdom.min.js.map
similarity index 100%
rename from src/snabbdom/dist/snabbdom.min.js.map
rename to libs/snabbdom/dist/snabbdom.min.js.map
diff --git a/src/snabbdom/dist/tovnode.js b/libs/snabbdom/dist/tovnode.js
similarity index 100%
rename from src/snabbdom/dist/tovnode.js
rename to libs/snabbdom/dist/tovnode.js
diff --git a/src/snabbdom/dist/tovnode.min.js b/libs/snabbdom/dist/tovnode.min.js
similarity index 100%
rename from src/snabbdom/dist/tovnode.min.js
rename to libs/snabbdom/dist/tovnode.min.js
diff --git a/src/snabbdom/dist/tovnode.min.js.map b/libs/snabbdom/dist/tovnode.min.js.map
similarity index 100%
rename from src/snabbdom/dist/tovnode.min.js.map
rename to libs/snabbdom/dist/tovnode.min.js.map
diff --git a/src/snabbdom/examples/carousel-svg/README.md b/libs/snabbdom/examples/carousel-svg/README.md
similarity index 100%
rename from src/snabbdom/examples/carousel-svg/README.md
rename to libs/snabbdom/examples/carousel-svg/README.md
diff --git a/src/snabbdom/examples/carousel-svg/build.js b/libs/snabbdom/examples/carousel-svg/build.js
similarity index 100%
rename from src/snabbdom/examples/carousel-svg/build.js
rename to libs/snabbdom/examples/carousel-svg/build.js
diff --git a/src/snabbdom/examples/carousel-svg/index.html b/libs/snabbdom/examples/carousel-svg/index.html
similarity index 100%
rename from src/snabbdom/examples/carousel-svg/index.html
rename to libs/snabbdom/examples/carousel-svg/index.html
diff --git a/src/snabbdom/examples/carousel-svg/script.js b/libs/snabbdom/examples/carousel-svg/script.js
similarity index 100%
rename from src/snabbdom/examples/carousel-svg/script.js
rename to libs/snabbdom/examples/carousel-svg/script.js
diff --git a/src/snabbdom/examples/hero/build.js b/libs/snabbdom/examples/hero/build.js
similarity index 100%
rename from src/snabbdom/examples/hero/build.js
rename to libs/snabbdom/examples/hero/build.js
diff --git a/src/snabbdom/examples/hero/index.html b/libs/snabbdom/examples/hero/index.html
similarity index 100%
rename from src/snabbdom/examples/hero/index.html
rename to libs/snabbdom/examples/hero/index.html
diff --git a/src/snabbdom/examples/hero/script.js b/libs/snabbdom/examples/hero/script.js
similarity index 100%
rename from src/snabbdom/examples/hero/script.js
rename to libs/snabbdom/examples/hero/script.js
diff --git a/src/snabbdom/examples/reorder-animation/build.js b/libs/snabbdom/examples/reorder-animation/build.js
similarity index 100%
rename from src/snabbdom/examples/reorder-animation/build.js
rename to libs/snabbdom/examples/reorder-animation/build.js
diff --git a/src/snabbdom/examples/reorder-animation/index.html b/libs/snabbdom/examples/reorder-animation/index.html
similarity index 100%
rename from src/snabbdom/examples/reorder-animation/index.html
rename to libs/snabbdom/examples/reorder-animation/index.html
diff --git a/src/snabbdom/examples/reorder-animation/script.js b/libs/snabbdom/examples/reorder-animation/script.js
similarity index 100%
rename from src/snabbdom/examples/reorder-animation/script.js
rename to libs/snabbdom/examples/reorder-animation/script.js
diff --git a/src/snabbdom/examples/svg/build.js b/libs/snabbdom/examples/svg/build.js
similarity index 100%
rename from src/snabbdom/examples/svg/build.js
rename to libs/snabbdom/examples/svg/build.js
diff --git a/src/snabbdom/examples/svg/index.html b/libs/snabbdom/examples/svg/index.html
similarity index 100%
rename from src/snabbdom/examples/svg/index.html
rename to libs/snabbdom/examples/svg/index.html
diff --git a/src/snabbdom/examples/svg/script.js b/libs/snabbdom/examples/svg/script.js
similarity index 100%
rename from src/snabbdom/examples/svg/script.js
rename to libs/snabbdom/examples/svg/script.js
diff --git a/src/snabbdom/gulpfile.js b/libs/snabbdom/gulpfile.js
similarity index 100%
rename from src/snabbdom/gulpfile.js
rename to libs/snabbdom/gulpfile.js
diff --git a/src/snabbdom/karma.conf.js b/libs/snabbdom/karma.conf.js
similarity index 100%
rename from src/snabbdom/karma.conf.js
rename to libs/snabbdom/karma.conf.js
diff --git a/src/snabbdom/package.json b/libs/snabbdom/package.json
similarity index 100%
rename from src/snabbdom/package.json
rename to libs/snabbdom/package.json
diff --git a/src/snabbdom/perf/benchmarks.js b/libs/snabbdom/perf/benchmarks.js
similarity index 100%
rename from src/snabbdom/perf/benchmarks.js
rename to libs/snabbdom/perf/benchmarks.js
diff --git a/src/snabbdom/perf/index.html b/libs/snabbdom/perf/index.html
similarity index 100%
rename from src/snabbdom/perf/index.html
rename to libs/snabbdom/perf/index.html
diff --git a/src/snabbdom/src/h.ts b/libs/snabbdom/src/h.ts
similarity index 100%
rename from src/snabbdom/src/h.ts
rename to libs/snabbdom/src/h.ts
diff --git a/src/snabbdom/src/helpers/attachto.ts b/libs/snabbdom/src/helpers/attachto.ts
similarity index 100%
rename from src/snabbdom/src/helpers/attachto.ts
rename to libs/snabbdom/src/helpers/attachto.ts
diff --git a/src/snabbdom/src/hooks.ts b/libs/snabbdom/src/hooks.ts
similarity index 100%
rename from src/snabbdom/src/hooks.ts
rename to libs/snabbdom/src/hooks.ts
diff --git a/src/snabbdom/src/htmldomapi.ts b/libs/snabbdom/src/htmldomapi.ts
similarity index 100%
rename from src/snabbdom/src/htmldomapi.ts
rename to libs/snabbdom/src/htmldomapi.ts
diff --git a/src/snabbdom/src/is.ts b/libs/snabbdom/src/is.ts
similarity index 100%
rename from src/snabbdom/src/is.ts
rename to libs/snabbdom/src/is.ts
diff --git a/src/snabbdom/src/modules/attributes.ts b/libs/snabbdom/src/modules/attributes.ts
similarity index 100%
rename from src/snabbdom/src/modules/attributes.ts
rename to libs/snabbdom/src/modules/attributes.ts
diff --git a/src/snabbdom/src/modules/class.ts b/libs/snabbdom/src/modules/class.ts
similarity index 100%
rename from src/snabbdom/src/modules/class.ts
rename to libs/snabbdom/src/modules/class.ts
diff --git a/src/snabbdom/src/modules/dataset.ts b/libs/snabbdom/src/modules/dataset.ts
similarity index 100%
rename from src/snabbdom/src/modules/dataset.ts
rename to libs/snabbdom/src/modules/dataset.ts
diff --git a/src/snabbdom/src/modules/eventlisteners.ts b/libs/snabbdom/src/modules/eventlisteners.ts
similarity index 100%
rename from src/snabbdom/src/modules/eventlisteners.ts
rename to libs/snabbdom/src/modules/eventlisteners.ts
diff --git a/src/snabbdom/src/modules/hero.ts b/libs/snabbdom/src/modules/hero.ts
similarity index 100%
rename from src/snabbdom/src/modules/hero.ts
rename to libs/snabbdom/src/modules/hero.ts
diff --git a/src/snabbdom/src/modules/module.ts b/libs/snabbdom/src/modules/module.ts
similarity index 100%
rename from src/snabbdom/src/modules/module.ts
rename to libs/snabbdom/src/modules/module.ts
diff --git a/src/snabbdom/src/modules/props.ts b/libs/snabbdom/src/modules/props.ts
similarity index 100%
rename from src/snabbdom/src/modules/props.ts
rename to libs/snabbdom/src/modules/props.ts
diff --git a/src/snabbdom/src/modules/style.ts b/libs/snabbdom/src/modules/style.ts
similarity index 100%
rename from src/snabbdom/src/modules/style.ts
rename to libs/snabbdom/src/modules/style.ts
diff --git a/src/snabbdom/src/snabbdom.bundle.ts b/libs/snabbdom/src/snabbdom.bundle.ts
similarity index 100%
rename from src/snabbdom/src/snabbdom.bundle.ts
rename to libs/snabbdom/src/snabbdom.bundle.ts
diff --git a/src/snabbdom/src/snabbdom.ts b/libs/snabbdom/src/snabbdom.ts
similarity index 100%
rename from src/snabbdom/src/snabbdom.ts
rename to libs/snabbdom/src/snabbdom.ts
diff --git a/src/snabbdom/src/thunk.ts b/libs/snabbdom/src/thunk.ts
similarity index 100%
rename from src/snabbdom/src/thunk.ts
rename to libs/snabbdom/src/thunk.ts
diff --git a/src/snabbdom/src/tovnode.ts b/libs/snabbdom/src/tovnode.ts
similarity index 100%
rename from src/snabbdom/src/tovnode.ts
rename to libs/snabbdom/src/tovnode.ts
diff --git a/src/snabbdom/src/vnode.ts b/libs/snabbdom/src/vnode.ts
similarity index 100%
rename from src/snabbdom/src/vnode.ts
rename to libs/snabbdom/src/vnode.ts
diff --git a/src/snabbdom/test/attachto.js b/libs/snabbdom/test/attachto.js
similarity index 100%
rename from src/snabbdom/test/attachto.js
rename to libs/snabbdom/test/attachto.js
diff --git a/src/snabbdom/test/attributes.js b/libs/snabbdom/test/attributes.js
similarity index 100%
rename from src/snabbdom/test/attributes.js
rename to libs/snabbdom/test/attributes.js
diff --git a/src/snabbdom/test/core.js b/libs/snabbdom/test/core.js
similarity index 100%
rename from src/snabbdom/test/core.js
rename to libs/snabbdom/test/core.js
diff --git a/src/snabbdom/test/dataset.js b/libs/snabbdom/test/dataset.js
similarity index 100%
rename from src/snabbdom/test/dataset.js
rename to libs/snabbdom/test/dataset.js
diff --git a/src/snabbdom/test/eventlisteners.js b/libs/snabbdom/test/eventlisteners.js
similarity index 100%
rename from src/snabbdom/test/eventlisteners.js
rename to libs/snabbdom/test/eventlisteners.js
diff --git a/src/snabbdom/test/htmldomapi.js b/libs/snabbdom/test/htmldomapi.js
similarity index 100%
rename from src/snabbdom/test/htmldomapi.js
rename to libs/snabbdom/test/htmldomapi.js
diff --git a/src/snabbdom/test/style.js b/libs/snabbdom/test/style.js
similarity index 100%
rename from src/snabbdom/test/style.js
rename to libs/snabbdom/test/style.js
diff --git a/src/snabbdom/test/thunk.js b/libs/snabbdom/test/thunk.js
similarity index 100%
rename from src/snabbdom/test/thunk.js
rename to libs/snabbdom/test/thunk.js
diff --git a/src/snabbdom/testem.json b/libs/snabbdom/testem.json
similarity index 100%
rename from src/snabbdom/testem.json
rename to libs/snabbdom/testem.json
diff --git a/src/snabbdom/tsconfig.json b/libs/snabbdom/tsconfig.json
similarity index 100%
rename from src/snabbdom/tsconfig.json
rename to libs/snabbdom/tsconfig.json
diff --git a/package.json b/package.json
index e31407af..d739e40d 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "serve": "live-server --entry-file=index.html dist/app/",
     "predev": "npm run build",
     "dev": "npm-run-all --parallel \"build:* -- --watch\" serve",
-    "prepackage:core": "tsc --allowjs --lib es2017,dom --target esnext --outDir dist/core demo/static/src/ts/core/*",
+    "prepackage:core": "tsc --allowjs --lib es2017,dom --target esnext --outDir dist/core src/*",
     "package:core": "rollup -c",
     "postpackage:core": "uglifyjs dist/core.js -o dist/core.min.js --compress --mangle"
   },
diff --git a/rollup.config.js b/rollup.config.js
index 15a4121f..fd6c523c 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -2,7 +2,7 @@ import { version } from "./package.json";
 
 // rollup.config.js
 export default {
-  input: "dist/core/src/ts/core/index.js",
+  input: "dist/core/src/index.js",
   output: {
     file: "dist/core.js",
     format: "iife",
diff --git a/src/component.ts b/src/component.ts
index 9fad491b..0c088de5 100644
--- a/src/component.ts
+++ b/src/component.ts
@@ -1,8 +1,8 @@
-import h from "./snabbdom/src/h";
-import sdAttrs from "./snabbdom/src/modules/attributes";
-import sdListeners from "./snabbdom/src/modules/eventlisteners";
-import { init } from "./snabbdom/src/snabbdom";
-import { VNode } from "./snabbdom/src/vnode";
+import h from "../libs/snabbdom/src/h";
+import sdAttrs from "../libs/snabbdom/src/modules/attributes";
+import sdListeners from "../libs/snabbdom/src/modules/eventlisteners";
+import { init } from "../libs/snabbdom/src/snabbdom";
+import { VNode } from "../libs/snabbdom/src/vnode";
 import { EventBus } from "./event_bus";
 import { QWeb } from "./qweb_vdom";
 import { idGenerator } from "./utils";
diff --git a/src/qweb_vdom.ts b/src/qweb_vdom.ts
index 8545df72..c87cbe45 100644
--- a/src/qweb_vdom.ts
+++ b/src/qweb_vdom.ts
@@ -1,5 +1,5 @@
-import h from "./snabbdom/src/h";
-import { VNode } from "./snabbdom/src/vnode";
+import h from "../libs/snabbdom/src/h";
+import { VNode } from "../libs/snabbdom/src/vnode";
 
 //------------------------------------------------------------------------------
 // Types