diff --git a/.gitignore b/.gitignore
index 847d12a540..4d7bbc7ac3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,15 +3,15 @@
 .nyc_output
 node_modules
 *.map
-/src/compile/internal-exports.ts
+/src/compiler/compile/internal-exports.ts
 /compiler.*js
 /index.*js
-/internal.*js
-/store.*js
-/easing.*js
-/motion.*js
-/transition.*js
-/animate.*js
+/internal
+/store
+/easing
+/motion
+/transition
+/animate
 /scratch/
 /coverage/
 /coverage.lcov/
@@ -29,5 +29,6 @@ _actual*.*
 /site/.sessions
 /site/static/svelte-app.json
 /site/static/contributors.jpg
+/site/static/workers
 /site/scripts/svelte-app
 /site/src/routes/_contributors.js
diff --git a/animate.d.ts b/animate.d.ts
deleted file mode 100644
index e0c5aebb0e..0000000000
--- a/animate.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './types/animate';
diff --git a/easing.d.ts b/easing.d.ts
deleted file mode 100644
index 9af6dd9ca7..0000000000
--- a/easing.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './types/easing';
diff --git a/index.d.ts b/index.d.ts
deleted file mode 100644
index a3d3b4a0d6..0000000000
--- a/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './types/index';
diff --git a/internal.d.ts b/internal.d.ts
deleted file mode 100644
index 135ffe7611..0000000000
--- a/internal.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './types/internal';
diff --git a/motion.d.ts b/motion.d.ts
deleted file mode 100644
index 4cc764a2c9..0000000000
--- a/motion.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './types/motion';
diff --git a/package.json b/package.json
index c39db34df5..6d4bfb134e 100644
--- a/package.json
+++ b/package.json
@@ -6,18 +6,19 @@
   "main": "index",
   "files": [
     "types",
-    "compiler.js",
+    "compiler.*",
     "register.js",
     "index.*",
-    "internal.*",
-    "store.*",
-    "animate.*",
-    "transition.*",
-    "easing.*",
-    "motion.*",
+    "internal",
+    "store",
+    "animate",
+    "transition",
+    "easing",
+    "motion",
     "svelte",
     "README.md"
   ],
+  "types": "types/runtime",
   "scripts": {
     "test": "mocha --opts mocha.opts",
     "test:unit": "mocha --require sucrase/register --recursive ./**/__test__.ts",
@@ -30,8 +31,9 @@
     "prepare": "npm run build && npm run tsd",
     "dev": "rollup -cw",
     "pretest": "npm run build",
-    "posttest": "agadoo internal.mjs",
-    "prepublishOnly": "export PUBLISH=true && npm test",
+    "posttest": "agadoo internal/index.mjs",
+    "prepublishOnly": "export PUBLISH=true && npm test && npm run create-stubs",
+    "create-stubs": "node scripts/create-stubs.js",
     "tsd": "tsc -p . --emitDeclarationOnly",
     "typecheck": "tsc -p . --noEmit"
   },
diff --git a/rollup.config.js b/rollup.config.js
index 9fd49f3e8f..8907ae4e6c 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -9,7 +9,7 @@ import pkg from './package.json';
 
 const is_publish = !!process.env.PUBLISH;
 
-const tsPlugin = is_publish
+const ts_plugin = is_publish
 	? typescript({
 		include: 'src/**',
 		typescript: require('typescript')
@@ -18,39 +18,61 @@ const tsPlugin = is_publish
 		transforms: ['typescript']
 	});
 
+const external = id => id.startsWith('svelte/');
+
 export default [
-	/* internal.[m]js */
+	/* runtime */
 	{
-		input: `src/internal/index.ts`,
+		input: `src/runtime/index.ts`,
 		output: [
 			{
-				file: `internal.mjs`,
+				file: `index.mjs`,
 				format: 'esm',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
+				paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '.')}`
 			},
 			{
-				file: `internal.js`,
+				file: `index.js`,
 				format: 'cjs',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
+				paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '.')}`
 			}
 		],
-		external: id => id.startsWith('svelte/'),
+		external,
+		plugins: [ts_plugin]
+	},
 
-		plugins: [
-			tsPlugin,
-			{
-				generateBundle(options, bundle) {
-					const mod = bundle['internal.mjs'];
-					if (mod) {
-						fs.writeFileSync('src/compile/internal-exports.ts', `// This file is automatically generated\nexport default new Set(${JSON.stringify(mod.exports)});`);
+	...fs.readdirSync('src/runtime')
+		.filter(dir => fs.statSync(`src/runtime/${dir}`).isDirectory())
+		.map(dir => ({
+			input: `src/runtime/${dir}/index.ts`,
+			output: [
+				{
+					file: `${dir}/index.mjs`,
+					format: 'esm',
+					paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '..')}`
+				},
+				{
+					file: `${dir}/index.js`,
+					format: 'cjs',
+					paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '..')}`
+				}
+			],
+			external,
+			plugins: [
+				ts_plugin,
+				dir === 'internal' && {
+					generateBundle(options, bundle) {
+						const mod = bundle['index.mjs'];
+						if (mod) {
+							fs.writeFileSync('src/compiler/compile/internal-exports.ts', `// This file is automatically generated\nexport default new Set(${JSON.stringify(mod.exports)});`);
+						}
 					}
 				}
-			}]
-	},
+			]
+		})),
 
 	/* compiler.js */
 	{
-		input: 'src/compiler.ts',
+		input: 'src/compiler/index.ts',
 		plugins: [
 			replace({
 				__VERSION__: pkg.version
@@ -60,7 +82,7 @@ export default [
 				include: ['node_modules/**']
 			}),
 			json(),
-			tsPlugin
+			ts_plugin
 		],
 		output: {
 			file: 'compiler.js',
@@ -71,47 +93,5 @@ export default [
 		external: is_publish
 			? []
 			: id => id === 'acorn' || id === 'magic-string' || id.startsWith('css-tree')
-	},
-
-	/* motion.mjs */
-	{
-		input: `src/motion/index.ts`,
-		output: [
-			{
-				file: `motion.mjs`,
-				format: 'esm',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
-			},
-			{
-				file: `motion.js`,
-				format: 'cjs',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
-			}
-		],
-		plugins: [
-			tsPlugin
-		],
-		external: id => id.startsWith('svelte/')
-	},
-
-	// everything else
-	...['index', 'easing', 'transition', 'animate', 'store'].map(name => ({
-		input: `src/${name}.ts`,
-		output: [
-			{
-				file: `${name}.mjs`,
-				format: 'esm',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
-			},
-			{
-				file: `${name}.js`,
-				format: 'cjs',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
-			}
-		],
-		plugins: [
-			tsPlugin
-		],
-		external: id => id.startsWith('svelte/')
-	}))
+	}
 ];
diff --git a/scripts/create-stubs.js b/scripts/create-stubs.js
new file mode 100644
index 0000000000..191b86cbfd
--- /dev/null
+++ b/scripts/create-stubs.js
@@ -0,0 +1,12 @@
+const fs = require('fs');
+
+fs.readdirSync('src/runtime')
+	.filter(dir => fs.statSync(`src/runtime/${dir}`).isDirectory())
+	.forEach(dir => {
+		fs.writeFileSync(`${dir}/package.json`, JSON.stringify({
+			main: './index.js',
+			module: './index.mjs'
+		}, null, '  '));
+
+		fs.writeFileSync(`${dir}/index.d.ts`, `export * from '../types/runtime/${dir}/index.d.ts';`);
+	});
\ No newline at end of file
diff --git a/site/content/docs/03-run-time.md b/site/content/docs/03-run-time.md
index 1beacc4169..6db20b5d14 100644
--- a/site/content/docs/03-run-time.md
+++ b/site/content/docs/03-run-time.md
@@ -618,13 +618,13 @@ Slides an element in and out.
 
 ```html
 <script>
-	import { fly } from 'svelte/transition';
+	import { slide } from 'svelte/transition';
 	import { quintOut } from 'svelte/easing';
 </script>
 
 {#if condition}
-	<div transition:fly="{{delay: 250, duration: 300, easing: quintOut }}">
-		flies in and out
+	<div transition:slide="{{delay: 250, duration: 300, easing: quintOut }}">
+		slides in and out
 	</div>
 {/if}
 ```
diff --git a/site/content/examples/06-lifecycle/02-update/App.svelte b/site/content/examples/06-lifecycle/02-update/App.svelte
index 373b6dcb6a..3eb2dceb52 100644
--- a/site/content/examples/06-lifecycle/02-update/App.svelte
+++ b/site/content/examples/06-lifecycle/02-update/App.svelte
@@ -1,5 +1,5 @@
 <script>
-	import Eliza from 'elizanode';
+	import Eliza from 'elizabot';
 	import { beforeUpdate, afterUpdate } from 'svelte';
 
 	let div;
diff --git a/site/content/tutorial/07-lifecycle/03-update/app-a/App.svelte b/site/content/tutorial/07-lifecycle/03-update/app-a/App.svelte
index 2081b6ab8c..75fce63ca2 100644
--- a/site/content/tutorial/07-lifecycle/03-update/app-a/App.svelte
+++ b/site/content/tutorial/07-lifecycle/03-update/app-a/App.svelte
@@ -1,5 +1,5 @@
 <script>
-	import Eliza from 'elizanode';
+	import Eliza from 'elizabot';
 	import { beforeUpdate, afterUpdate } from 'svelte';
 
 	let div;
diff --git a/site/content/tutorial/07-lifecycle/03-update/app-b/App.svelte b/site/content/tutorial/07-lifecycle/03-update/app-b/App.svelte
index 373b6dcb6a..3eb2dceb52 100644
--- a/site/content/tutorial/07-lifecycle/03-update/app-b/App.svelte
+++ b/site/content/tutorial/07-lifecycle/03-update/app-b/App.svelte
@@ -1,5 +1,5 @@
 <script>
-	import Eliza from 'elizanode';
+	import Eliza from 'elizabot';
 	import { beforeUpdate, afterUpdate } from 'svelte';
 
 	let div;
diff --git a/site/package-lock.json b/site/package-lock.json
index b61cee722e..0127c84d53 100644
--- a/site/package-lock.json
+++ b/site/package-lock.json
@@ -1362,13 +1362,15 @@
       }
     },
     "@sveltejs/svelte-repl": {
-      "version": "0.0.11",
-      "resolved": "https://registry.npmjs.org/@sveltejs/svelte-repl/-/svelte-repl-0.0.11.tgz",
-      "integrity": "sha512-F284f8qaUs1rp8akqWXcB6oovlaso7qmsUz1rqm80FwUKLffjYIWy2a1p6+Yo1kRy6Q+fW8kj21JLEqv7pjOwA==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@sveltejs/svelte-repl/-/svelte-repl-0.1.2.tgz",
+      "integrity": "sha512-OHIj01ly4+/WwNb0zGqLSQL7POSs2BPx47CzryVsbu0omVDe7olYTJnCYV4ePUENnlL5JzZihzvlvxmVGP6knw==",
       "dev": true,
       "requires": {
         "codemirror": "^5.45.0",
-        "sourcemap-codec": "^1.4.4"
+        "estree-walker": "^0.6.0",
+        "sourcemap-codec": "^1.4.4",
+        "yootils": "0.0.15"
       }
     },
     "@types/estree": {
@@ -1799,9 +1801,9 @@
       "dev": true
     },
     "codemirror": {
-      "version": "5.46.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.46.0.tgz",
-      "integrity": "sha512-3QpMge0vg4QEhHW3hBAtCipJEWjTJrqLLXdIaWptJOblf1vHFeXLNtFhPai/uX2lnFCehWNk4yOdaMR853Z02w==",
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.47.0.tgz",
+      "integrity": "sha512-kV49Fr+NGFHFc/Imsx6g180hSlkGhuHxTSDDmDHOuyln0MQYFLixDY4+bFkBVeCEiepYfDimAF/e++9jPJk4QA==",
       "dev": true
     },
     "collection-visit": {
diff --git a/site/package.json b/site/package.json
index d9de5a217e..ec429f54ab 100644
--- a/site/package.json
+++ b/site/package.json
@@ -3,9 +3,10 @@
   "version": "1.0.0",
   "description": "Docs and examples for Svelte",
   "scripts": {
-    "dev": "sapper dev",
+    "dev": "npm run copy-workers && sapper dev",
+    "copy-workers": "rm -rf static/workers && cp -r node_modules/@sveltejs/svelte-repl/workers static",
     "migrate": "node-pg-migrate -r dotenv/config",
-    "sapper": "sapper build --legacy",
+    "sapper": "npm run copy-workers && sapper build --legacy",
     "update_shimport": "cp node_modules/shimport/index.js __sapper__/build/client/shimport@0.0.14.js",
     "update": "node scripts/update_template.js && node scripts/get-contributors.js",
     "start": "node __sapper__/build",
@@ -38,7 +39,7 @@
     "@babel/runtime": "^7.4.4",
     "@sindresorhus/slugify": "^0.9.1",
     "@sveltejs/site-kit": "^1.0.4",
-    "@sveltejs/svelte-repl": "0.0.11",
+    "@sveltejs/svelte-repl": "^0.1.2",
     "degit": "^2.1.3",
     "dotenv": "^8.0.0",
     "eslint-plugin-svelte3": "^1.0.0",
diff --git a/site/src/components/Repl/ReplWidget.svelte b/site/src/components/Repl/ReplWidget.svelte
index 07a5814010..9d06fb7868 100644
--- a/site/src/components/Repl/ReplWidget.svelte
+++ b/site/src/components/Repl/ReplWidget.svelte
@@ -116,6 +116,7 @@
 		{#if process.browser}
 			<Repl
 				bind:this={repl}
+				workersUrl="workers"
 				fixed={mobile}
 				{svelteUrl}
 				{rollupUrl}
diff --git a/site/src/routes/examples/index.svelte b/site/src/routes/examples/index.svelte
index a5c816561b..9fd783f950 100644
--- a/site/src/routes/examples/index.svelte
+++ b/site/src/routes/examples/index.svelte
@@ -39,6 +39,10 @@
 	let isLoading = false;
 	const cache = {};
 
+	function showExampleCodeOnChange() {
+		offset = 1;
+	}
+
 	$: title = title_by_slug[active_slug] || '';
 	$: first_slug = sections[0].examples[0].slug;
 	$: mobile = width < 768; // note: same as per media query below
@@ -46,7 +50,7 @@
 	$: if (repl && active_slug) {
 		if (active_slug in cache) {
 			repl.set({ components: cache[active_slug] });
-			offset = 1;
+			showExampleCodeOnChange();
 		} else {
 			isLoading = true;
 			fetch(`examples/${active_slug}.json`)
@@ -59,7 +63,7 @@
 				.then(components => {
 					cache[active_slug] = components;
 					repl.set({components});
-					offset = 1;
+					showExampleCodeOnChange();
 					isLoading = false;
 				})
 				.catch(() => {
@@ -102,6 +106,7 @@
 		<div class="repl-container" class:loading={isLoading}>
 			<Repl
 				bind:this={repl}
+				workersUrl="workers"
 				{svelteUrl}
 				{rollupUrl}
 				orientation={replOrientation}
diff --git a/site/src/routes/repl/[id]/index.svelte b/site/src/routes/repl/[id]/index.svelte
index 4c5a22d6da..f2a3c02173 100644
--- a/site/src/routes/repl/[id]/index.svelte
+++ b/site/src/routes/repl/[id]/index.svelte
@@ -206,6 +206,7 @@
 		<div class="viewport" class:offset={checked}>
 			<Repl
 				bind:this={repl}
+				workersUrl="workers"
 				{svelteUrl}
 				{rollupUrl}
 				{relaxed}
diff --git a/site/src/routes/tutorial/[slug]/index.svelte b/site/src/routes/tutorial/[slug]/index.svelte
index 34c9d38f79..1f166d70bf 100644
--- a/site/src/routes/tutorial/[slug]/index.svelte
+++ b/site/src/routes/tutorial/[slug]/index.svelte
@@ -302,6 +302,7 @@
 		<div class="tutorial-repl">
 			<Repl
 				bind:this={repl}
+				workersUrl="workers"
 				{svelteUrl}
 				{rollupUrl}
 				orientation={mobile ? 'columns' : 'rows'}
diff --git a/site/src/server.js b/site/src/server.js
index 45f3e16dae..2adf3c5ad1 100644
--- a/site/src/server.js
+++ b/site/src/server.js
@@ -2,11 +2,12 @@ import sirv from 'sirv';
 import * as sapper from '@sapper/server';
 import { API } from './backend/auth';
 
-const { PORT=3000 } = process.env;
+const { PORT = 3000 } = process.env;
 
 API()
 	.use(
 		sirv('static', {
+			dev: process.env.NODE_ENV === 'development',
 			setHeaders(res) {
 				res.setHeader('Access-Control-Allow-Origin', '*');
 				res.hasHeader('Cache-Control') || res.setHeader('Cache-Control', 'max-age=600'); // 10min default
diff --git a/src/Stats.ts b/src/compiler/Stats.ts
similarity index 100%
rename from src/Stats.ts
rename to src/compiler/Stats.ts
diff --git a/src/compile/Component.ts b/src/compiler/compile/Component.ts
similarity index 100%
rename from src/compile/Component.ts
rename to src/compiler/compile/Component.ts
diff --git a/src/compile/create_module.ts b/src/compiler/compile/create_module.ts
similarity index 100%
rename from src/compile/create_module.ts
rename to src/compiler/compile/create_module.ts
diff --git a/src/compile/css/Selector.ts b/src/compiler/compile/css/Selector.ts
similarity index 100%
rename from src/compile/css/Selector.ts
rename to src/compiler/compile/css/Selector.ts
diff --git a/src/compile/css/Stylesheet.ts b/src/compiler/compile/css/Stylesheet.ts
similarity index 100%
rename from src/compile/css/Stylesheet.ts
rename to src/compiler/compile/css/Stylesheet.ts
diff --git a/src/compile/css/gather_possible_values.ts b/src/compiler/compile/css/gather_possible_values.ts
similarity index 100%
rename from src/compile/css/gather_possible_values.ts
rename to src/compiler/compile/css/gather_possible_values.ts
diff --git a/src/compile/index.ts b/src/compiler/compile/index.ts
similarity index 97%
rename from src/compile/index.ts
rename to src/compiler/compile/index.ts
index dac75f23e0..2ad091c971 100644
--- a/src/compile/index.ts
+++ b/src/compiler/compile/index.ts
@@ -1,4 +1,4 @@
-import { assign } from '../internal/index';
+import { assign } from '../../runtime/internal/index';
 import Stats from '../Stats';
 import parse from '../parse/index';
 import render_dom from './render-dom/index';
diff --git a/src/compile/nodes/Action.ts b/src/compiler/compile/nodes/Action.ts
similarity index 100%
rename from src/compile/nodes/Action.ts
rename to src/compiler/compile/nodes/Action.ts
diff --git a/src/compile/nodes/Animation.ts b/src/compiler/compile/nodes/Animation.ts
similarity index 100%
rename from src/compile/nodes/Animation.ts
rename to src/compiler/compile/nodes/Animation.ts
diff --git a/src/compile/nodes/Attribute.ts b/src/compiler/compile/nodes/Attribute.ts
similarity index 100%
rename from src/compile/nodes/Attribute.ts
rename to src/compiler/compile/nodes/Attribute.ts
diff --git a/src/compile/nodes/AwaitBlock.ts b/src/compiler/compile/nodes/AwaitBlock.ts
similarity index 100%
rename from src/compile/nodes/AwaitBlock.ts
rename to src/compiler/compile/nodes/AwaitBlock.ts
diff --git a/src/compile/nodes/Binding.ts b/src/compiler/compile/nodes/Binding.ts
similarity index 100%
rename from src/compile/nodes/Binding.ts
rename to src/compiler/compile/nodes/Binding.ts
diff --git a/src/compile/nodes/Body.ts b/src/compiler/compile/nodes/Body.ts
similarity index 100%
rename from src/compile/nodes/Body.ts
rename to src/compiler/compile/nodes/Body.ts
diff --git a/src/compile/nodes/CatchBlock.ts b/src/compiler/compile/nodes/CatchBlock.ts
similarity index 100%
rename from src/compile/nodes/CatchBlock.ts
rename to src/compiler/compile/nodes/CatchBlock.ts
diff --git a/src/compile/nodes/Class.ts b/src/compiler/compile/nodes/Class.ts
similarity index 100%
rename from src/compile/nodes/Class.ts
rename to src/compiler/compile/nodes/Class.ts
diff --git a/src/compile/nodes/Comment.ts b/src/compiler/compile/nodes/Comment.ts
similarity index 100%
rename from src/compile/nodes/Comment.ts
rename to src/compiler/compile/nodes/Comment.ts
diff --git a/src/compile/nodes/DebugTag.ts b/src/compiler/compile/nodes/DebugTag.ts
similarity index 100%
rename from src/compile/nodes/DebugTag.ts
rename to src/compiler/compile/nodes/DebugTag.ts
diff --git a/src/compile/nodes/EachBlock.ts b/src/compiler/compile/nodes/EachBlock.ts
similarity index 100%
rename from src/compile/nodes/EachBlock.ts
rename to src/compiler/compile/nodes/EachBlock.ts
diff --git a/src/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
similarity index 100%
rename from src/compile/nodes/Element.ts
rename to src/compiler/compile/nodes/Element.ts
diff --git a/src/compile/nodes/ElseBlock.ts b/src/compiler/compile/nodes/ElseBlock.ts
similarity index 100%
rename from src/compile/nodes/ElseBlock.ts
rename to src/compiler/compile/nodes/ElseBlock.ts
diff --git a/src/compile/nodes/EventHandler.ts b/src/compiler/compile/nodes/EventHandler.ts
similarity index 100%
rename from src/compile/nodes/EventHandler.ts
rename to src/compiler/compile/nodes/EventHandler.ts
diff --git a/src/compile/nodes/Fragment.ts b/src/compiler/compile/nodes/Fragment.ts
similarity index 100%
rename from src/compile/nodes/Fragment.ts
rename to src/compiler/compile/nodes/Fragment.ts
diff --git a/src/compile/nodes/Head.ts b/src/compiler/compile/nodes/Head.ts
similarity index 100%
rename from src/compile/nodes/Head.ts
rename to src/compiler/compile/nodes/Head.ts
diff --git a/src/compile/nodes/IfBlock.ts b/src/compiler/compile/nodes/IfBlock.ts
similarity index 100%
rename from src/compile/nodes/IfBlock.ts
rename to src/compiler/compile/nodes/IfBlock.ts
diff --git a/src/compile/nodes/InlineComponent.ts b/src/compiler/compile/nodes/InlineComponent.ts
similarity index 100%
rename from src/compile/nodes/InlineComponent.ts
rename to src/compiler/compile/nodes/InlineComponent.ts
diff --git a/src/compile/nodes/Let.ts b/src/compiler/compile/nodes/Let.ts
similarity index 100%
rename from src/compile/nodes/Let.ts
rename to src/compiler/compile/nodes/Let.ts
diff --git a/src/compile/nodes/MustacheTag.ts b/src/compiler/compile/nodes/MustacheTag.ts
similarity index 100%
rename from src/compile/nodes/MustacheTag.ts
rename to src/compiler/compile/nodes/MustacheTag.ts
diff --git a/src/compile/nodes/Options.ts b/src/compiler/compile/nodes/Options.ts
similarity index 100%
rename from src/compile/nodes/Options.ts
rename to src/compiler/compile/nodes/Options.ts
diff --git a/src/compile/nodes/PendingBlock.ts b/src/compiler/compile/nodes/PendingBlock.ts
similarity index 100%
rename from src/compile/nodes/PendingBlock.ts
rename to src/compiler/compile/nodes/PendingBlock.ts
diff --git a/src/compile/nodes/RawMustacheTag.ts b/src/compiler/compile/nodes/RawMustacheTag.ts
similarity index 100%
rename from src/compile/nodes/RawMustacheTag.ts
rename to src/compiler/compile/nodes/RawMustacheTag.ts
diff --git a/src/compile/nodes/Slot.ts b/src/compiler/compile/nodes/Slot.ts
similarity index 100%
rename from src/compile/nodes/Slot.ts
rename to src/compiler/compile/nodes/Slot.ts
diff --git a/src/compile/nodes/Text.ts b/src/compiler/compile/nodes/Text.ts
similarity index 100%
rename from src/compile/nodes/Text.ts
rename to src/compiler/compile/nodes/Text.ts
diff --git a/src/compile/nodes/ThenBlock.ts b/src/compiler/compile/nodes/ThenBlock.ts
similarity index 100%
rename from src/compile/nodes/ThenBlock.ts
rename to src/compiler/compile/nodes/ThenBlock.ts
diff --git a/src/compile/nodes/Title.ts b/src/compiler/compile/nodes/Title.ts
similarity index 100%
rename from src/compile/nodes/Title.ts
rename to src/compiler/compile/nodes/Title.ts
diff --git a/src/compile/nodes/Transition.ts b/src/compiler/compile/nodes/Transition.ts
similarity index 100%
rename from src/compile/nodes/Transition.ts
rename to src/compiler/compile/nodes/Transition.ts
diff --git a/src/compile/nodes/Window.ts b/src/compiler/compile/nodes/Window.ts
similarity index 100%
rename from src/compile/nodes/Window.ts
rename to src/compiler/compile/nodes/Window.ts
diff --git a/src/compile/nodes/interfaces.ts b/src/compiler/compile/nodes/interfaces.ts
similarity index 100%
rename from src/compile/nodes/interfaces.ts
rename to src/compiler/compile/nodes/interfaces.ts
diff --git a/src/compile/nodes/shared/AbstractBlock.ts b/src/compiler/compile/nodes/shared/AbstractBlock.ts
similarity index 93%
rename from src/compile/nodes/shared/AbstractBlock.ts
rename to src/compiler/compile/nodes/shared/AbstractBlock.ts
index e1104e4928..931dd4d82d 100644
--- a/src/compile/nodes/shared/AbstractBlock.ts
+++ b/src/compiler/compile/nodes/shared/AbstractBlock.ts
@@ -1,5 +1,5 @@
 import Block from '../../render-dom/Block';
-import Component from './../../Component';
+import Component from '../../Component';
 import Node from './Node';
 import { INode } from '../interfaces';
 
diff --git a/src/compile/nodes/shared/Expression.ts b/src/compiler/compile/nodes/shared/Expression.ts
similarity index 100%
rename from src/compile/nodes/shared/Expression.ts
rename to src/compiler/compile/nodes/shared/Expression.ts
diff --git a/src/compile/nodes/shared/Node.ts b/src/compiler/compile/nodes/shared/Node.ts
similarity index 95%
rename from src/compile/nodes/shared/Node.ts
rename to src/compiler/compile/nodes/shared/Node.ts
index f27e4ceb62..8fa0ec0c97 100644
--- a/src/compile/nodes/shared/Node.ts
+++ b/src/compiler/compile/nodes/shared/Node.ts
@@ -1,5 +1,5 @@
-import Attribute from './../Attribute';
-import Component from './../../Component';
+import Attribute from '../Attribute';
+import Component from '../../Component';
 import { INode } from '../interfaces';
 import Text from '../Text';
 
diff --git a/src/compile/nodes/shared/Tag.ts b/src/compiler/compile/nodes/shared/Tag.ts
similarity index 100%
rename from src/compile/nodes/shared/Tag.ts
rename to src/compiler/compile/nodes/shared/Tag.ts
diff --git a/src/compile/nodes/shared/TemplateScope.ts b/src/compiler/compile/nodes/shared/TemplateScope.ts
similarity index 100%
rename from src/compile/nodes/shared/TemplateScope.ts
rename to src/compiler/compile/nodes/shared/TemplateScope.ts
diff --git a/src/compile/nodes/shared/map_children.ts b/src/compiler/compile/nodes/shared/map_children.ts
similarity index 100%
rename from src/compile/nodes/shared/map_children.ts
rename to src/compiler/compile/nodes/shared/map_children.ts
diff --git a/src/compile/render-dom/Block.ts b/src/compiler/compile/render-dom/Block.ts
similarity index 100%
rename from src/compile/render-dom/Block.ts
rename to src/compiler/compile/render-dom/Block.ts
diff --git a/src/compile/render-dom/Renderer.ts b/src/compiler/compile/render-dom/Renderer.ts
similarity index 100%
rename from src/compile/render-dom/Renderer.ts
rename to src/compiler/compile/render-dom/Renderer.ts
diff --git a/src/compile/render-dom/index.ts b/src/compiler/compile/render-dom/index.ts
similarity index 100%
rename from src/compile/render-dom/index.ts
rename to src/compiler/compile/render-dom/index.ts
diff --git a/src/compile/render-dom/wrappers/AwaitBlock.ts b/src/compiler/compile/render-dom/wrappers/AwaitBlock.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/AwaitBlock.ts
rename to src/compiler/compile/render-dom/wrappers/AwaitBlock.ts
diff --git a/src/compile/render-dom/wrappers/Body.ts b/src/compiler/compile/render-dom/wrappers/Body.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/Body.ts
rename to src/compiler/compile/render-dom/wrappers/Body.ts
diff --git a/src/compile/render-dom/wrappers/DebugTag.ts b/src/compiler/compile/render-dom/wrappers/DebugTag.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/DebugTag.ts
rename to src/compiler/compile/render-dom/wrappers/DebugTag.ts
diff --git a/src/compile/render-dom/wrappers/EachBlock.ts b/src/compiler/compile/render-dom/wrappers/EachBlock.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/EachBlock.ts
rename to src/compiler/compile/render-dom/wrappers/EachBlock.ts
diff --git a/src/compile/render-dom/wrappers/Element/Attribute.ts b/src/compiler/compile/render-dom/wrappers/Element/Attribute.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/Element/Attribute.ts
rename to src/compiler/compile/render-dom/wrappers/Element/Attribute.ts
diff --git a/src/compile/render-dom/wrappers/Element/Binding.ts b/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
similarity index 99%
rename from src/compile/render-dom/wrappers/Element/Binding.ts
rename to src/compiler/compile/render-dom/wrappers/Element/Binding.ts
index b88479ad52..70123fa10c 100644
--- a/src/compile/render-dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
@@ -1,5 +1,5 @@
 import Binding from '../../../nodes/Binding';
-import ElementWrapper from '.';
+import ElementWrapper from '../Element';
 import { dimensions } from '../../../../utils/patterns';
 import get_object from '../../../utils/get_object';
 import Block from '../../Block';
diff --git a/src/compile/render-dom/wrappers/Element/StyleAttribute.ts b/src/compiler/compile/render-dom/wrappers/Element/StyleAttribute.ts
similarity index 98%
rename from src/compile/render-dom/wrappers/Element/StyleAttribute.ts
rename to src/compiler/compile/render-dom/wrappers/Element/StyleAttribute.ts
index 64de2921b3..f51ef33546 100644
--- a/src/compile/render-dom/wrappers/Element/StyleAttribute.ts
+++ b/src/compiler/compile/render-dom/wrappers/Element/StyleAttribute.ts
@@ -1,7 +1,7 @@
 import Attribute from '../../../nodes/Attribute';
 import Block from '../../Block';
 import AttributeWrapper from './Attribute';
-import ElementWrapper from '.';
+import ElementWrapper from '../Element';
 import { stringify } from '../../../utils/stringify';
 import add_to_set from '../../../utils/add_to_set';
 import Expression from '../../../nodes/shared/Expression';
diff --git a/src/compile/render-dom/wrappers/Element/fix_attribute_casing.ts b/src/compiler/compile/render-dom/wrappers/Element/fix_attribute_casing.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/Element/fix_attribute_casing.ts
rename to src/compiler/compile/render-dom/wrappers/Element/fix_attribute_casing.ts
diff --git a/src/compile/render-dom/wrappers/Element/index.ts b/src/compiler/compile/render-dom/wrappers/Element/index.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/Element/index.ts
rename to src/compiler/compile/render-dom/wrappers/Element/index.ts
diff --git a/src/compile/render-dom/wrappers/Fragment.ts b/src/compiler/compile/render-dom/wrappers/Fragment.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/Fragment.ts
rename to src/compiler/compile/render-dom/wrappers/Fragment.ts
diff --git a/src/compile/render-dom/wrappers/Head.ts b/src/compiler/compile/render-dom/wrappers/Head.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/Head.ts
rename to src/compiler/compile/render-dom/wrappers/Head.ts
diff --git a/src/compile/render-dom/wrappers/IfBlock.ts b/src/compiler/compile/render-dom/wrappers/IfBlock.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/IfBlock.ts
rename to src/compiler/compile/render-dom/wrappers/IfBlock.ts
diff --git a/src/compile/render-dom/wrappers/InlineComponent/index.ts b/src/compiler/compile/render-dom/wrappers/InlineComponent/index.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/InlineComponent/index.ts
rename to src/compiler/compile/render-dom/wrappers/InlineComponent/index.ts
diff --git a/src/compile/render-dom/wrappers/MustacheTag.ts b/src/compiler/compile/render-dom/wrappers/MustacheTag.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/MustacheTag.ts
rename to src/compiler/compile/render-dom/wrappers/MustacheTag.ts
diff --git a/src/compile/render-dom/wrappers/RawMustacheTag.ts b/src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/RawMustacheTag.ts
rename to src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts
diff --git a/src/compile/render-dom/wrappers/Slot.ts b/src/compiler/compile/render-dom/wrappers/Slot.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/Slot.ts
rename to src/compiler/compile/render-dom/wrappers/Slot.ts
diff --git a/src/compile/render-dom/wrappers/Text.ts b/src/compiler/compile/render-dom/wrappers/Text.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/Text.ts
rename to src/compiler/compile/render-dom/wrappers/Text.ts
diff --git a/src/compile/render-dom/wrappers/Title.ts b/src/compiler/compile/render-dom/wrappers/Title.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/Title.ts
rename to src/compiler/compile/render-dom/wrappers/Title.ts
diff --git a/src/compile/render-dom/wrappers/Window.ts b/src/compiler/compile/render-dom/wrappers/Window.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/Window.ts
rename to src/compiler/compile/render-dom/wrappers/Window.ts
diff --git a/src/compile/render-dom/wrappers/shared/Tag.ts b/src/compiler/compile/render-dom/wrappers/shared/Tag.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/shared/Tag.ts
rename to src/compiler/compile/render-dom/wrappers/shared/Tag.ts
diff --git a/src/compile/render-dom/wrappers/shared/Wrapper.ts b/src/compiler/compile/render-dom/wrappers/shared/Wrapper.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/shared/Wrapper.ts
rename to src/compiler/compile/render-dom/wrappers/shared/Wrapper.ts
diff --git a/src/compile/render-dom/wrappers/shared/add_actions.ts b/src/compiler/compile/render-dom/wrappers/shared/add_actions.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/shared/add_actions.ts
rename to src/compiler/compile/render-dom/wrappers/shared/add_actions.ts
diff --git a/src/compile/render-dom/wrappers/shared/add_event_handlers.ts b/src/compiler/compile/render-dom/wrappers/shared/add_event_handlers.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/shared/add_event_handlers.ts
rename to src/compiler/compile/render-dom/wrappers/shared/add_event_handlers.ts
diff --git a/src/compile/render-dom/wrappers/shared/create_debugging_comment.ts b/src/compiler/compile/render-dom/wrappers/shared/create_debugging_comment.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/shared/create_debugging_comment.ts
rename to src/compiler/compile/render-dom/wrappers/shared/create_debugging_comment.ts
diff --git a/src/compile/render-dom/wrappers/shared/get_context_merger.ts b/src/compiler/compile/render-dom/wrappers/shared/get_context_merger.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/shared/get_context_merger.ts
rename to src/compiler/compile/render-dom/wrappers/shared/get_context_merger.ts
diff --git a/src/compile/render-ssr/Renderer.ts b/src/compiler/compile/render-ssr/Renderer.ts
similarity index 100%
rename from src/compile/render-ssr/Renderer.ts
rename to src/compiler/compile/render-ssr/Renderer.ts
diff --git a/src/compile/render-ssr/handlers/AwaitBlock.ts b/src/compiler/compile/render-ssr/handlers/AwaitBlock.ts
similarity index 100%
rename from src/compile/render-ssr/handlers/AwaitBlock.ts
rename to src/compiler/compile/render-ssr/handlers/AwaitBlock.ts
diff --git a/src/compile/render-ssr/handlers/Comment.ts b/src/compiler/compile/render-ssr/handlers/Comment.ts
similarity index 100%
rename from src/compile/render-ssr/handlers/Comment.ts
rename to src/compiler/compile/render-ssr/handlers/Comment.ts
diff --git a/src/compile/render-ssr/handlers/DebugTag.ts b/src/compiler/compile/render-ssr/handlers/DebugTag.ts
similarity index 100%
rename from src/compile/render-ssr/handlers/DebugTag.ts
rename to src/compiler/compile/render-ssr/handlers/DebugTag.ts
diff --git a/src/compile/render-ssr/handlers/EachBlock.ts b/src/compiler/compile/render-ssr/handlers/EachBlock.ts
similarity index 100%
rename from src/compile/render-ssr/handlers/EachBlock.ts
rename to src/compiler/compile/render-ssr/handlers/EachBlock.ts
diff --git a/src/compile/render-ssr/handlers/Element.ts b/src/compiler/compile/render-ssr/handlers/Element.ts
similarity index 100%
rename from src/compile/render-ssr/handlers/Element.ts
rename to src/compiler/compile/render-ssr/handlers/Element.ts
diff --git a/src/compile/render-ssr/handlers/Head.ts b/src/compiler/compile/render-ssr/handlers/Head.ts
similarity index 100%
rename from src/compile/render-ssr/handlers/Head.ts
rename to src/compiler/compile/render-ssr/handlers/Head.ts
diff --git a/src/compile/render-ssr/handlers/HtmlTag.ts b/src/compiler/compile/render-ssr/handlers/HtmlTag.ts
similarity index 100%
rename from src/compile/render-ssr/handlers/HtmlTag.ts
rename to src/compiler/compile/render-ssr/handlers/HtmlTag.ts
diff --git a/src/compile/render-ssr/handlers/IfBlock.ts b/src/compiler/compile/render-ssr/handlers/IfBlock.ts
similarity index 100%
rename from src/compile/render-ssr/handlers/IfBlock.ts
rename to src/compiler/compile/render-ssr/handlers/IfBlock.ts
diff --git a/src/compile/render-ssr/handlers/InlineComponent.ts b/src/compiler/compile/render-ssr/handlers/InlineComponent.ts
similarity index 100%
rename from src/compile/render-ssr/handlers/InlineComponent.ts
rename to src/compiler/compile/render-ssr/handlers/InlineComponent.ts
diff --git a/src/compile/render-ssr/handlers/Slot.ts b/src/compiler/compile/render-ssr/handlers/Slot.ts
similarity index 100%
rename from src/compile/render-ssr/handlers/Slot.ts
rename to src/compiler/compile/render-ssr/handlers/Slot.ts
diff --git a/src/compile/render-ssr/handlers/Tag.ts b/src/compiler/compile/render-ssr/handlers/Tag.ts
similarity index 100%
rename from src/compile/render-ssr/handlers/Tag.ts
rename to src/compiler/compile/render-ssr/handlers/Tag.ts
diff --git a/src/compile/render-ssr/handlers/Text.ts b/src/compiler/compile/render-ssr/handlers/Text.ts
similarity index 100%
rename from src/compile/render-ssr/handlers/Text.ts
rename to src/compiler/compile/render-ssr/handlers/Text.ts
diff --git a/src/compile/render-ssr/handlers/Title.ts b/src/compiler/compile/render-ssr/handlers/Title.ts
similarity index 100%
rename from src/compile/render-ssr/handlers/Title.ts
rename to src/compiler/compile/render-ssr/handlers/Title.ts
diff --git a/src/compile/render-ssr/handlers/shared/get_slot_scope.ts b/src/compiler/compile/render-ssr/handlers/shared/get_slot_scope.ts
similarity index 100%
rename from src/compile/render-ssr/handlers/shared/get_slot_scope.ts
rename to src/compiler/compile/render-ssr/handlers/shared/get_slot_scope.ts
diff --git a/src/compile/render-ssr/index.ts b/src/compiler/compile/render-ssr/index.ts
similarity index 100%
rename from src/compile/render-ssr/index.ts
rename to src/compiler/compile/render-ssr/index.ts
diff --git a/src/compile/utils/CodeBuilder.ts b/src/compiler/compile/utils/CodeBuilder.ts
similarity index 100%
rename from src/compile/utils/CodeBuilder.ts
rename to src/compiler/compile/utils/CodeBuilder.ts
diff --git a/src/compile/utils/__test__.ts b/src/compiler/compile/utils/__test__.ts
similarity index 100%
rename from src/compile/utils/__test__.ts
rename to src/compiler/compile/utils/__test__.ts
diff --git a/src/compile/utils/add_to_set.ts b/src/compiler/compile/utils/add_to_set.ts
similarity index 100%
rename from src/compile/utils/add_to_set.ts
rename to src/compiler/compile/utils/add_to_set.ts
diff --git a/src/compile/utils/deindent.ts b/src/compiler/compile/utils/deindent.ts
similarity index 100%
rename from src/compile/utils/deindent.ts
rename to src/compiler/compile/utils/deindent.ts
diff --git a/src/compile/utils/flatten_reference.ts b/src/compiler/compile/utils/flatten_reference.ts
similarity index 100%
rename from src/compile/utils/flatten_reference.ts
rename to src/compiler/compile/utils/flatten_reference.ts
diff --git a/src/compile/utils/get_object.ts b/src/compiler/compile/utils/get_object.ts
similarity index 100%
rename from src/compile/utils/get_object.ts
rename to src/compiler/compile/utils/get_object.ts
diff --git a/src/compile/utils/get_slot_data.ts b/src/compiler/compile/utils/get_slot_data.ts
similarity index 100%
rename from src/compile/utils/get_slot_data.ts
rename to src/compiler/compile/utils/get_slot_data.ts
diff --git a/src/compile/utils/scope.ts b/src/compiler/compile/utils/scope.ts
similarity index 100%
rename from src/compile/utils/scope.ts
rename to src/compiler/compile/utils/scope.ts
diff --git a/src/compile/utils/snip.ts b/src/compiler/compile/utils/snip.ts
similarity index 100%
rename from src/compile/utils/snip.ts
rename to src/compiler/compile/utils/snip.ts
diff --git a/src/compile/utils/stringify.ts b/src/compiler/compile/utils/stringify.ts
similarity index 100%
rename from src/compile/utils/stringify.ts
rename to src/compiler/compile/utils/stringify.ts
diff --git a/src/compile/utils/stringify_attribute.ts b/src/compiler/compile/utils/stringify_attribute.ts
similarity index 100%
rename from src/compile/utils/stringify_attribute.ts
rename to src/compiler/compile/utils/stringify_attribute.ts
diff --git a/src/compile/utils/stringify_props.ts b/src/compiler/compile/utils/stringify_props.ts
similarity index 100%
rename from src/compile/utils/stringify_props.ts
rename to src/compiler/compile/utils/stringify_props.ts
diff --git a/src/compile/utils/tail.ts b/src/compiler/compile/utils/tail.ts
similarity index 100%
rename from src/compile/utils/tail.ts
rename to src/compiler/compile/utils/tail.ts
diff --git a/src/compile/utils/unwrap_parens.ts b/src/compiler/compile/utils/unwrap_parens.ts
similarity index 100%
rename from src/compile/utils/unwrap_parens.ts
rename to src/compiler/compile/utils/unwrap_parens.ts
diff --git a/src/config.ts b/src/compiler/config.ts
similarity index 100%
rename from src/config.ts
rename to src/compiler/config.ts
diff --git a/src/compiler.ts b/src/compiler/index.ts
similarity index 100%
rename from src/compiler.ts
rename to src/compiler/index.ts
diff --git a/src/interfaces.ts b/src/compiler/interfaces.ts
similarity index 100%
rename from src/interfaces.ts
rename to src/compiler/interfaces.ts
diff --git a/src/parse/acorn.ts b/src/compiler/parse/acorn.ts
similarity index 100%
rename from src/parse/acorn.ts
rename to src/compiler/parse/acorn.ts
diff --git a/src/parse/index.ts b/src/compiler/parse/index.ts
similarity index 100%
rename from src/parse/index.ts
rename to src/compiler/parse/index.ts
diff --git a/src/parse/read/context.ts b/src/compiler/parse/read/context.ts
similarity index 100%
rename from src/parse/read/context.ts
rename to src/compiler/parse/read/context.ts
diff --git a/src/parse/read/expression.ts b/src/compiler/parse/read/expression.ts
similarity index 100%
rename from src/parse/read/expression.ts
rename to src/compiler/parse/read/expression.ts
diff --git a/src/parse/read/script.ts b/src/compiler/parse/read/script.ts
similarity index 100%
rename from src/parse/read/script.ts
rename to src/compiler/parse/read/script.ts
diff --git a/src/parse/read/style.ts b/src/compiler/parse/read/style.ts
similarity index 100%
rename from src/parse/read/style.ts
rename to src/compiler/parse/read/style.ts
diff --git a/src/parse/state/fragment.ts b/src/compiler/parse/state/fragment.ts
similarity index 100%
rename from src/parse/state/fragment.ts
rename to src/compiler/parse/state/fragment.ts
diff --git a/src/parse/state/mustache.ts b/src/compiler/parse/state/mustache.ts
similarity index 100%
rename from src/parse/state/mustache.ts
rename to src/compiler/parse/state/mustache.ts
diff --git a/src/parse/state/tag.ts b/src/compiler/parse/state/tag.ts
similarity index 100%
rename from src/parse/state/tag.ts
rename to src/compiler/parse/state/tag.ts
diff --git a/src/parse/state/text.ts b/src/compiler/parse/state/text.ts
similarity index 100%
rename from src/parse/state/text.ts
rename to src/compiler/parse/state/text.ts
diff --git a/src/parse/utils/entities.ts b/src/compiler/parse/utils/entities.ts
similarity index 100%
rename from src/parse/utils/entities.ts
rename to src/compiler/parse/utils/entities.ts
diff --git a/src/parse/utils/html.ts b/src/compiler/parse/utils/html.ts
similarity index 100%
rename from src/parse/utils/html.ts
rename to src/compiler/parse/utils/html.ts
diff --git a/src/preprocess/index.ts b/src/compiler/preprocess/index.ts
similarity index 100%
rename from src/preprocess/index.ts
rename to src/compiler/preprocess/index.ts
diff --git a/src/utils/error.ts b/src/compiler/utils/error.ts
similarity index 94%
rename from src/utils/error.ts
rename to src/compiler/utils/error.ts
index f89cc3d721..a34d3fe112 100644
--- a/src/utils/error.ts
+++ b/src/compiler/utils/error.ts
@@ -1,5 +1,5 @@
 import { locate } from 'locate-character';
-import get_code_frame from '../utils/get_code_frame';
+import get_code_frame from './get_code_frame';
 
 class CompileError extends Error {
 	code: string;
diff --git a/src/utils/full_char_code_at.ts b/src/compiler/utils/full_char_code_at.ts
similarity index 100%
rename from src/utils/full_char_code_at.ts
rename to src/compiler/utils/full_char_code_at.ts
diff --git a/src/utils/fuzzymatch.ts b/src/compiler/utils/fuzzymatch.ts
similarity index 100%
rename from src/utils/fuzzymatch.ts
rename to src/compiler/utils/fuzzymatch.ts
diff --git a/src/utils/get_code_frame.ts b/src/compiler/utils/get_code_frame.ts
similarity index 100%
rename from src/utils/get_code_frame.ts
rename to src/compiler/utils/get_code_frame.ts
diff --git a/src/utils/indentation.ts b/src/compiler/utils/indentation.ts
similarity index 100%
rename from src/utils/indentation.ts
rename to src/compiler/utils/indentation.ts
diff --git a/src/utils/list.ts b/src/compiler/utils/list.ts
similarity index 100%
rename from src/utils/list.ts
rename to src/compiler/utils/list.ts
diff --git a/src/utils/names.ts b/src/compiler/utils/names.ts
similarity index 100%
rename from src/utils/names.ts
rename to src/compiler/utils/names.ts
diff --git a/src/utils/namespaces.ts b/src/compiler/utils/namespaces.ts
similarity index 100%
rename from src/utils/namespaces.ts
rename to src/compiler/utils/namespaces.ts
diff --git a/src/utils/nodes_match.ts b/src/compiler/utils/nodes_match.ts
similarity index 100%
rename from src/utils/nodes_match.ts
rename to src/compiler/utils/nodes_match.ts
diff --git a/src/utils/patterns.ts b/src/compiler/utils/patterns.ts
similarity index 100%
rename from src/utils/patterns.ts
rename to src/compiler/utils/patterns.ts
diff --git a/src/utils/repeat.ts b/src/compiler/utils/repeat.ts
similarity index 100%
rename from src/utils/repeat.ts
rename to src/compiler/utils/repeat.ts
diff --git a/src/utils/trim.ts b/src/compiler/utils/trim.ts
similarity index 100%
rename from src/utils/trim.ts
rename to src/compiler/utils/trim.ts
diff --git a/src/animate.ts b/src/runtime/animate/index.ts
similarity index 56%
rename from src/animate.ts
rename to src/runtime/animate/index.ts
index cf64cd060a..f5500020cc 100644
--- a/src/animate.ts
+++ b/src/runtime/animate/index.ts
@@ -1,7 +1,22 @@
 import { cubicOut } from 'svelte/easing';
 import { is_function } from 'svelte/internal';
 
-export function flip(node, animation, params) {
+// todo: same as Transition, should it be shared?
+export interface AnimationConfig {
+	delay?: number,
+	duration?: number,
+	easing?: (t: number) => number,
+	css?: (t: number, u: number) => string,
+	tick?: (t: number, u: number) => void
+}
+
+interface FlipParams {
+	delay: number;
+	duration: number | ((len: number) => number);
+	easing: (t: number) => number,
+}
+
+export function flip(node: Element, animation: { from: DOMRect, to: DOMRect }, params: FlipParams): AnimationConfig {
 	const style = getComputedStyle(node);
 	const transform = style.transform === 'none' ? '' : style.transform;
 
diff --git a/src/easing.ts b/src/runtime/easing/index.ts
similarity index 69%
rename from src/easing.ts
rename to src/runtime/easing/index.ts
index 7a762394c2..c23019b320 100644
--- a/src/easing.ts
+++ b/src/runtime/easing/index.ts
@@ -5,23 +5,23 @@ Distributed under MIT License https://github.com/mattdesl/eases/blob/master/LICE
 
 export { identity as linear } from 'svelte/internal';
 
-export function backInOut(t) {
+export function backInOut(t: number) {
 	const s = 1.70158 * 1.525;
 	if ((t *= 2) < 1) return 0.5 * (t * t * ((s + 1) * t - s));
 	return 0.5 * ((t -= 2) * t * ((s + 1) * t + s) + 2);
 }
 
-export function backIn(t) {
+export function backIn(t: number) {
 	const s = 1.70158;
 	return t * t * ((s + 1) * t - s);
 }
 
-export function backOut(t) {
+export function backOut(t: number) {
 	const s = 1.70158;
 	return --t * t * ((s + 1) * t + s) + 1;
 }
 
-export function bounceOut(t) {
+export function bounceOut(t: number) {
 	const a = 4.0 / 11.0;
 	const b = 8.0 / 11.0;
 	const c = 9.0 / 10.0;
@@ -41,43 +41,43 @@ export function bounceOut(t) {
 				: 10.8 * t * t - 20.52 * t + 10.72;
 }
 
-export function bounceInOut(t) {
+export function bounceInOut(t: number) {
 	return t < 0.5
 		? 0.5 * (1.0 - bounceOut(1.0 - t * 2.0))
 		: 0.5 * bounceOut(t * 2.0 - 1.0) + 0.5;
 }
 
-export function bounceIn(t) {
+export function bounceIn(t: number) {
 	return 1.0 - bounceOut(1.0 - t);
 }
 
-export function circInOut(t) {
+export function circInOut(t: number) {
 	if ((t *= 2) < 1) return -0.5 * (Math.sqrt(1 - t * t) - 1);
 	return 0.5 * (Math.sqrt(1 - (t -= 2) * t) + 1);
 }
 
-export function circIn(t) {
+export function circIn(t: number) {
 	return 1.0 - Math.sqrt(1.0 - t * t);
 }
 
-export function circOut(t) {
+export function circOut(t: number) {
 	return Math.sqrt(1 - --t * t);
 }
 
-export function cubicInOut(t) {
+export function cubicInOut(t: number) {
 	return t < 0.5 ? 4.0 * t * t * t : 0.5 * Math.pow(2.0 * t - 2.0, 3.0) + 1.0;
 }
 
-export function cubicIn(t) {
+export function cubicIn(t: number) {
 	return t * t * t;
 }
 
-export function cubicOut(t) {
+export function cubicOut(t: number) {
 	const f = t - 1.0;
 	return f * f * f + 1.0;
 }
 
-export function elasticInOut(t) {
+export function elasticInOut(t: number) {
 	return t < 0.5
 		? 0.5 *
 				Math.sin(((+13.0 * Math.PI) / 2) * 2.0 * t) *
@@ -88,17 +88,17 @@ export function elasticInOut(t) {
 				1.0;
 }
 
-export function elasticIn(t) {
+export function elasticIn(t: number) {
 	return Math.sin((13.0 * t * Math.PI) / 2) * Math.pow(2.0, 10.0 * (t - 1.0));
 }
 
-export function elasticOut(t) {
+export function elasticOut(t: number) {
 	return (
 		Math.sin((-13.0 * (t + 1.0) * Math.PI) / 2) * Math.pow(2.0, -10.0 * t) + 1.0
 	);
 }
 
-export function expoInOut(t) {
+export function expoInOut(t: number) {
 	return t === 0.0 || t === 1.0
 		? t
 		: t < 0.5
@@ -106,66 +106,66 @@ export function expoInOut(t) {
 			: -0.5 * Math.pow(2.0, 10.0 - t * 20.0) + 1.0;
 }
 
-export function expoIn(t) {
+export function expoIn(t: number) {
 	return t === 0.0 ? t : Math.pow(2.0, 10.0 * (t - 1.0));
 }
 
-export function expoOut(t) {
+export function expoOut(t: number) {
 	return t === 1.0 ? t : 1.0 - Math.pow(2.0, -10.0 * t);
 }
 
-export function quadInOut(t) {
+export function quadInOut(t: number) {
 	t /= 0.5;
 	if (t < 1) return 0.5 * t * t;
 	t--;
 	return -0.5 * (t * (t - 2) - 1);
 }
 
-export function quadIn(t) {
+export function quadIn(t: number) {
 	return t * t;
 }
 
-export function quadOut(t) {
+export function quadOut(t: number) {
 	return -t * (t - 2.0);
 }
 
-export function quartInOut(t) {
+export function quartInOut(t: number) {
 	return t < 0.5
 		? +8.0 * Math.pow(t, 4.0)
 		: -8.0 * Math.pow(t - 1.0, 4.0) + 1.0;
 }
 
-export function quartIn(t) {
+export function quartIn(t: number) {
 	return Math.pow(t, 4.0);
 }
 
-export function quartOut(t) {
+export function quartOut(t: number) {
 	return Math.pow(t - 1.0, 3.0) * (1.0 - t) + 1.0;
 }
 
-export function quintInOut(t) {
+export function quintInOut(t: number) {
 	if ((t *= 2) < 1) return 0.5 * t * t * t * t * t;
 	return 0.5 * ((t -= 2) * t * t * t * t + 2);
 }
 
-export function quintIn(t) {
+export function quintIn(t: number) {
 	return t * t * t * t * t;
 }
 
-export function quintOut(t) {
+export function quintOut(t: number) {
 	return --t * t * t * t * t + 1;
 }
 
-export function sineInOut(t) {
+export function sineInOut(t: number) {
 	return -0.5 * (Math.cos(Math.PI * t) - 1);
 }
 
-export function sineIn(t) {
+export function sineIn(t: number) {
 	const v = Math.cos(t * Math.PI * 0.5);
 	if (Math.abs(v) < 1e-14) return 1;
 	else return 1 - v;
 }
 
-export function sineOut(t) {
+export function sineOut(t: number) {
 	return Math.sin((t * Math.PI) / 2);
 }
diff --git a/src/index.ts b/src/runtime/index.ts
similarity index 100%
rename from src/index.ts
rename to src/runtime/index.ts
diff --git a/src/internal/Component.ts b/src/runtime/internal/Component.ts
similarity index 100%
rename from src/internal/Component.ts
rename to src/runtime/internal/Component.ts
diff --git a/src/internal/animations.ts b/src/runtime/internal/animations.ts
similarity index 73%
rename from src/internal/animations.ts
rename to src/runtime/internal/animations.ts
index 8d52b3ca7a..5a055ba6d2 100644
--- a/src/internal/animations.ts
+++ b/src/runtime/internal/animations.ts
@@ -1,18 +1,28 @@
 import { identity as linear, noop, now } from './utils';
 import { loop } from './loop';
 import { create_rule, delete_rule } from './style_manager';
+import { AnimationConfig } from '../animate';
 
-export function create_animation(node, from, fn, params) {
+
+//todo: documentation says it is DOMRect, but in IE it would be ClientRect
+type PositionRect = DOMRect|ClientRect;
+
+type AnimationFn = (node: Element, { from, to }: { from: PositionRect, to: PositionRect }, params: any) => AnimationConfig;
+
+export function create_animation(node: Element & ElementCSSInlineStyle, from: PositionRect, fn: AnimationFn, params) {
 	if (!from) return noop;
 
 	const to = node.getBoundingClientRect();
 	if (from.left === to.left && from.right === to.right && from.top === to.top && from.bottom === to.bottom) return noop;
 
+
 	const {
 		delay = 0,
 		duration = 300,
 		easing = linear,
+		// @ts-ignore todo: should this be separated from destructuring? Or start/end added to public api and documentation?
 		start: start_time = now() + delay,
+		// @ts-ignore todo:
 		end = start_time + duration,
 		tick = noop,
 		css
@@ -67,7 +77,7 @@ export function create_animation(node, from, fn, params) {
 	return stop;
 }
 
-export function fix_position(node) {
+export function fix_position(node: Element & ElementCSSInlineStyle) {
 	const style = getComputedStyle(node);
 
 	if (style.position !== 'absolute' && style.position !== 'fixed') {
diff --git a/src/internal/await-block.ts b/src/runtime/internal/await-block.ts
similarity index 100%
rename from src/internal/await-block.ts
rename to src/runtime/internal/await-block.ts
diff --git a/src/internal/dom.ts b/src/runtime/internal/dom.ts
similarity index 95%
rename from src/internal/dom.ts
rename to src/runtime/internal/dom.ts
index 293040ce20..edf394e4da 100644
--- a/src/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -53,8 +53,8 @@ export function object_without_properties<T,K extends keyof T>(obj:T, exclude: K
 	return target;
 }
 
-export function svg_element(name:string):SVGElement {
-	return document.createElementNS('http://www.w3.org/2000/svg', name);
+export function svg_element<K extends keyof SVGElementTagNameMap>(name:K):SVGElement {
+	return document.createElementNS<K>('http://www.w3.org/2000/svg', name);
 }
 
 export function text(data:string) {
@@ -95,7 +95,7 @@ export function attr(node: Element, attribute: string, value?: string) {
 	else node.setAttribute(attribute, value);
 }
 
-export function set_attributes(node: HTMLElement, attributes: { [x: string]: string; }) {
+export function set_attributes(node: Element & ElementCSSInlineStyle, attributes: { [x: string]: string; }) {
 	for (const key in attributes) {
 		if (key === 'style') {
 			node.style.cssText = attributes[key];
diff --git a/src/internal/index.ts b/src/runtime/internal/index.ts
similarity index 100%
rename from src/internal/index.ts
rename to src/runtime/internal/index.ts
diff --git a/src/internal/keyed-each.ts b/src/runtime/internal/keyed-each.ts
similarity index 100%
rename from src/internal/keyed-each.ts
rename to src/runtime/internal/keyed-each.ts
diff --git a/src/internal/lifecycle.ts b/src/runtime/internal/lifecycle.ts
similarity index 100%
rename from src/internal/lifecycle.ts
rename to src/runtime/internal/lifecycle.ts
diff --git a/src/internal/loop.ts b/src/runtime/internal/loop.ts
similarity index 83%
rename from src/internal/loop.ts
rename to src/runtime/internal/loop.ts
index 73f118c234..c41d72ed74 100644
--- a/src/internal/loop.ts
+++ b/src/runtime/internal/loop.ts
@@ -1,6 +1,6 @@
 import { now, raf } from './utils';
 
-export interface Task { abort(): void; promise: Promise<undefined> }
+export interface Task { abort(): void; promise: Promise<void> }
 
 const tasks = new Set();
 let running = false;
@@ -32,7 +32,7 @@ export function loop(fn: (number)=>void): Task {
 	}
 
 	return {
-		promise: new Promise<undefined>(fulfil => {
+		promise: new Promise<void>(fulfil => {
 			tasks.add(task = [fn, fulfil]);
 		}),
 		abort() {
diff --git a/src/internal/scheduler.ts b/src/runtime/internal/scheduler.ts
similarity index 100%
rename from src/internal/scheduler.ts
rename to src/runtime/internal/scheduler.ts
diff --git a/src/internal/spread.ts b/src/runtime/internal/spread.ts
similarity index 100%
rename from src/internal/spread.ts
rename to src/runtime/internal/spread.ts
diff --git a/src/internal/ssr.ts b/src/runtime/internal/ssr.ts
similarity index 96%
rename from src/internal/ssr.ts
rename to src/runtime/internal/ssr.ts
index aaa391b4dc..c80b4d9f45 100644
--- a/src/internal/ssr.ts
+++ b/src/runtime/internal/ssr.ts
@@ -1,5 +1,6 @@
 import { set_current_component, current_component } from './lifecycle';
 import { run_all, blank_object } from './utils';
+import { Readable } from 'svelte/store';
 
 export const invalid_attribute_name_character = /[\s'">/=\u{FDD0}-\u{FDEF}\u{FFFE}\u{FFFF}\u{1FFFE}\u{1FFFF}\u{2FFFE}\u{2FFFF}\u{3FFFE}\u{3FFFF}\u{4FFFE}\u{4FFFF}\u{5FFFE}\u{5FFFF}\u{6FFFE}\u{6FFFF}\u{7FFFE}\u{7FFFF}\u{8FFFE}\u{8FFFF}\u{9FFFE}\u{9FFFF}\u{AFFFE}\u{AFFFF}\u{BFFFE}\u{BFFFF}\u{CFFFE}\u{CFFFF}\u{DFFFE}\u{DFFFF}\u{EFFFE}\u{EFFFF}\u{FFFFE}\u{FFFFF}\u{10FFFE}\u{10FFFF}]/u;
 // https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
@@ -113,7 +114,7 @@ export function create_ssr_component(fn) {
 	};
 }
 
-export function get_store_value(store) {
+export function get_store_value<T>(store: Readable<T>): T | undefined {
 	let value;
 	store.subscribe(_ => value = _)();
 	return value;
diff --git a/src/internal/style_manager.ts b/src/runtime/internal/style_manager.ts
similarity index 82%
rename from src/internal/style_manager.ts
rename to src/runtime/internal/style_manager.ts
index 9ef1b12d1c..2721200627 100644
--- a/src/internal/style_manager.ts
+++ b/src/runtime/internal/style_manager.ts
@@ -6,7 +6,7 @@ let active = 0;
 let current_rules = {};
 
 // https://github.com/darkskyapp/string-hash/blob/master/index.js
-function hash(str) {
+function hash(str: string) {
 	let hash = 5381;
 	let i = str.length;
 
@@ -14,7 +14,7 @@ function hash(str) {
 	return hash >>> 0;
 }
 
-export function create_rule(node, a, b, duration, delay, ease, fn, uid = 0) {
+export function create_rule(node: Element & ElementCSSInlineStyle, a: number, b: number, duration: number, delay: number, ease: (t: number) => number, fn: (t: number, u: number) => string, uid: number = 0) {
 	const step = 16.666 / duration;
 	let keyframes = '{\n';
 
@@ -44,7 +44,7 @@ export function create_rule(node, a, b, duration, delay, ease, fn, uid = 0) {
 	return name;
 }
 
-export function delete_rule(node, name?) {
+export function delete_rule(node: Element & ElementCSSInlineStyle, name?: string) {
 	node.style.animation = (node.style.animation || '')
 		.split(', ')
 		.filter(name
diff --git a/src/internal/transitions.ts b/src/runtime/internal/transitions.ts
similarity index 87%
rename from src/internal/transitions.ts
rename to src/runtime/internal/transitions.ts
index 04942e3d16..f3e8414e5d 100644
--- a/src/internal/transitions.ts
+++ b/src/runtime/internal/transitions.ts
@@ -1,10 +1,11 @@
-import { identity as linear, noop, now, run_all } from './utils';
+import { identity as linear, is_function, noop, now, run_all } from './utils';
 import { loop } from './loop';
 import { create_rule, delete_rule } from './style_manager';
 import { custom_event } from './dom';
 import { add_render_callback } from './scheduler';
+import { TransitionConfig } from '../transition';
 
-let promise;
+let promise: Promise<void>|null;
 
 function wait() {
 	if (!promise) {
@@ -17,7 +18,7 @@ function wait() {
 	return promise;
 }
 
-function dispatch(node, direction, kind) {
+function dispatch(node: Element, direction: boolean, kind: 'start' | 'end') {
 	node.dispatchEvent(custom_event(`${direction ? 'intro' : 'outro'}${kind}`));
 }
 
@@ -39,8 +40,9 @@ export function check_outros() {
 export function on_outro(callback) {
 	outros.callbacks.push(callback);
 }
+type TransitionFn = (node: Element, params: any) => TransitionConfig;
 
-export function create_in_transition(node, fn, params) {
+export function create_in_transition(node: Element & ElementCSSInlineStyle, fn: TransitionFn, params: any) {
 	let config = fn(node, params);
 	let running = false;
 	let animation_name;
@@ -95,7 +97,7 @@ export function create_in_transition(node, fn, params) {
 
 			delete_rule(node);
 
-			if (typeof config === 'function') {
+			if (is_function(config)) {
 				config = config();
 				wait().then(go);
 			} else {
@@ -116,7 +118,7 @@ export function create_in_transition(node, fn, params) {
 	};
 }
 
-export function create_out_transition(node, fn, params) {
+export function create_out_transition(node: Element & ElementCSSInlineStyle, fn: TransitionFn, params: any) {
 	let config = fn(node, params);
 	let running = true;
 	let animation_name;
@@ -163,8 +165,9 @@ export function create_out_transition(node, fn, params) {
 		});
 	}
 
-	if (typeof config === 'function') {
+	if (is_function(config)) {
 		wait().then(() => {
+			// @ts-ignore
 			config = config();
 			go();
 		});
@@ -186,7 +189,7 @@ export function create_out_transition(node, fn, params) {
 	};
 }
 
-export function create_bidirectional_transition(node, fn, params, intro) {
+export function create_bidirectional_transition(node: Element & ElementCSSInlineStyle, fn: TransitionFn, params: any, intro: boolean) {
 	let config = fn(node, params);
 
 	let t = intro ? 0 : 1;
@@ -295,8 +298,9 @@ export function create_bidirectional_transition(node, fn, params, intro) {
 
 	return {
 		run(b) {
-			if (typeof config === 'function') {
+			if (is_function(config)) {
 				wait().then(() => {
+					// @ts-ignore
 					config = config();
 					go(b);
 				});
diff --git a/src/internal/utils.ts b/src/runtime/internal/utils.ts
similarity index 87%
rename from src/internal/utils.ts
rename to src/runtime/internal/utils.ts
index c562cd02b6..7997a25b1d 100644
--- a/src/internal/utils.ts
+++ b/src/runtime/internal/utils.ts
@@ -2,13 +2,14 @@ export function noop() {}
 
 export const identity = x => x;
 
-export function assign(tar, src) {
+export function assign<T, S>(tar:T, src:S): T & S {
+	// @ts-ignore
 	for (const k in src) tar[k] = src[k];
-	return tar;
+	return tar as T & S;
 }
 
-export function is_promise(value) {
-	return value && typeof value.then === 'function';
+export function is_promise<T = any>(value: any): value is PromiseLike<T> {
+	return value && typeof value === 'object' && typeof value.then === 'function';
 }
 
 export function add_location(element, file, line, column, char) {
@@ -29,7 +30,7 @@ export function run_all(fns) {
 	fns.forEach(run);
 }
 
-export function is_function(thing) {
+export function is_function(thing: any): thing is Function {
 	return typeof thing === 'function';
 }
 
diff --git a/src/motion/index.ts b/src/runtime/motion/index.ts
similarity index 100%
rename from src/motion/index.ts
rename to src/runtime/motion/index.ts
diff --git a/src/motion/spring.ts b/src/runtime/motion/spring.ts
similarity index 79%
rename from src/motion/spring.ts
rename to src/runtime/motion/spring.ts
index 3977c08f79..f99e8db41f 100644
--- a/src/motion/spring.ts
+++ b/src/runtime/motion/spring.ts
@@ -2,9 +2,18 @@ import { Readable, writable } from 'svelte/store';
 import { loop, now, Task } from 'svelte/internal';
 import { is_date } from './utils';
 
-function tick_spring(ctx, last_value, current_value, target_value) {
+interface TickContext<T> {
+	inv_mass: number;
+	dt: number;
+	opts: Spring<T>;
+	settled: boolean
+}
+
+function tick_spring<T>(ctx: TickContext<T>, last_value: T, current_value: T, target_value: T):T {
 	if (typeof current_value === 'number' || is_date(current_value)) {
+		// @ts-ignore
 		const delta = target_value - current_value;
+		// @ts-ignore
 		const velocity = (current_value - last_value) / (ctx.dt||1/60); // guard div by 0
 		const spring = ctx.opts.stiffness * delta;
 		const damper = ctx.opts.damping * velocity;
@@ -15,16 +24,20 @@ function tick_spring(ctx, last_value, current_value, target_value) {
 			return target_value; // settled
 		} else {
 			ctx.settled = false; // signal loop to keep ticking
+			// @ts-ignore
 			return is_date(current_value) ?
 				new Date(current_value.getTime() + d) : current_value + d;
 		}
 	} else if (Array.isArray(current_value)) {
+		// @ts-ignore
 		return current_value.map((_, i) =>
 			tick_spring(ctx, last_value[i], current_value[i], target_value[i]));
 	} else if (typeof current_value === 'object') {
 		const next_value = {};
 		for (const k in current_value)
+			// @ts-ignore
 			next_value[k] = tick_spring(ctx, last_value[k], current_value[k], target_value[k]);
+		// @ts-ignore
 		return next_value;
 	} else {
 		throw new Error(`Cannot spring ${typeof current_value} values`);
@@ -37,17 +50,22 @@ interface SpringOpts {
 	precision?: number,
 }
 
-type SpringUpdateOpts = { hard?: any; soft?: string | number | boolean; };
+interface SpringUpdateOpts {
+	hard?: any;
+	soft?: string | number | boolean;
+}
+
+type Updater<T> = (target_value: T, value: T) => T;
 
-interface Spring<T=any> extends Readable<T>{
-	set: (new_value: T, opts?: SpringUpdateOpts) => (Promise<T> | Promise<T>);
+interface Spring<T> extends Readable<T>{
+	set: (new_value: T, opts?: SpringUpdateOpts) => Promise<void>;
+	update: (fn: Updater<T>, opts?: SpringUpdateOpts) => Promise<void>;
 	precision: number;
-	update: (fn, opts: SpringUpdateOpts) => Promise<T>;
 	damping: number;
 	stiffness: number
 }
 
-export function spring<T=any>(value: T, opts: SpringOpts = {}) {
+export function spring<T=any>(value: T, opts: SpringOpts = {}): Spring<T> {
 	const store = writable(value);
 	const { stiffness = 0.15, damping = 0.8, precision = 0.01 } = opts;
 
@@ -61,7 +79,7 @@ export function spring<T=any>(value: T, opts: SpringOpts = {}) {
 	let inv_mass_recovery_rate = 0;
 	let cancel_task = false;
 
-	function set(new_value: any, opts: SpringUpdateOpts={}) {
+	function set(new_value: T, opts: SpringUpdateOpts={}): Promise<void> {
 		target_value = new_value;
 		const token = current_token = {};
 
@@ -91,7 +109,7 @@ export function spring<T=any>(value: T, opts: SpringOpts = {}) {
 
 				inv_mass = Math.min(inv_mass + inv_mass_recovery_rate, 1);
 
-				const ctx = {
+				const ctx: TickContext<T> = {
 					inv_mass,
 					opts: spring,
 					settled: true, // tick_spring may signal false
@@ -116,14 +134,14 @@ export function spring<T=any>(value: T, opts: SpringOpts = {}) {
 		});
 	}
 
-	const spring: Spring = {
+	const spring = {
 		set,
 		update: (fn, opts:SpringUpdateOpts) => set(fn(target_value, value), opts),
 		subscribe: store.subscribe,
 		stiffness,
 		damping,
 		precision
-	};
+	} as Spring<T>;
 
 	return spring;
 }
diff --git a/src/motion/tweened.ts b/src/runtime/motion/tweened.ts
similarity index 72%
rename from src/motion/tweened.ts
rename to src/runtime/motion/tweened.ts
index 3b2d0ef5a2..ea3f2cdd86 100644
--- a/src/motion/tweened.ts
+++ b/src/runtime/motion/tweened.ts
@@ -1,6 +1,6 @@
-import { writable } from 'svelte/store'; // eslint-disable-line import/no-unresolved
-import { assign, loop, now } from 'svelte/internal'; // eslint-disable-line import/no-unresolved
-import { linear } from 'svelte/easing'; // eslint-disable-line import/no-unresolved
+import { Readable, writable } from 'svelte/store';
+import { assign, loop, now, Task } from 'svelte/internal';
+import { linear } from 'svelte/easing';
 import { is_date } from './utils';
 
 function get_interpolator(a, b) {
@@ -54,13 +54,28 @@ function get_interpolator(a, b) {
 	throw new Error(`Cannot interpolate ${type} values`);
 }
 
-export function tweened(value, defaults = {}) {
+interface Options<T> {
+	delay?: number;
+	duration?: number | ((from: T, to: T) => number)
+	easing?: (t: number) => number;
+	interpolate?: (a: T, b: T) => (t: number) => T
+}
+
+type Updater<T> = (target_value: T, value: T) => T;
+
+interface Tweened<T> extends Readable<T> {
+	set(value: T, opts: Options<T>): Promise<void>;
+
+	update(updater: Updater<T>, opts: Options<T>): Promise<void>;
+}
+
+export function tweened<T>(value: T, defaults: Options<T> = {}):Tweened<T> {
 	const store = writable(value);
 
-	let task;
+	let task: Task;
 	let target_value = value;
 
-	function set(new_value, opts) {
+	function set(new_value: T, opts: Options<T>) {
 		target_value = new_value;
 
 		let previous_task = task;
@@ -97,6 +112,7 @@ export function tweened(value, defaults = {}) {
 				return false;
 			}
 
+			// @ts-ignore
 			store.set(value = fn(easing(elapsed / duration)));
 			return true;
 		});
@@ -106,7 +122,7 @@ export function tweened(value, defaults = {}) {
 
 	return {
 		set,
-		update: (fn, opts) => set(fn(target_value, value), opts),
+		update: (fn, opts:Options<T>) => set(fn(target_value, value), opts),
 		subscribe: store.subscribe
 	};
 }
diff --git a/src/motion/utils.ts b/src/runtime/motion/utils.ts
similarity index 57%
rename from src/motion/utils.ts
rename to src/runtime/motion/utils.ts
index f8bfcce14c..2eab8baa2f 100644
--- a/src/motion/utils.ts
+++ b/src/runtime/motion/utils.ts
@@ -1,3 +1,3 @@
-export function is_date(obj: any) {
+export function is_date(obj: any): obj is Date {
 	return Object.prototype.toString.call(obj) === '[object Date]';
 }
diff --git a/src/store.ts b/src/runtime/store/index.ts
similarity index 100%
rename from src/store.ts
rename to src/runtime/store/index.ts
diff --git a/src/transition.ts b/src/runtime/transition/index.ts
similarity index 67%
rename from src/transition.ts
rename to src/runtime/transition/index.ts
index 20619ee131..b3f4f21288 100644
--- a/src/transition.ts
+++ b/src/runtime/transition/index.ts
@@ -1,10 +1,23 @@
 import { cubicOut, cubicInOut } from 'svelte/easing';
 import { assign, is_function } from 'svelte/internal';
 
-export function fade(node, {
+export interface TransitionConfig {
+	delay?: number,
+	duration?: number,
+	easing?: (t: number) => number,
+	css?: (t: number, u: number) => string,
+	tick?: (t: number, u: number) => void
+}
+
+interface FadeParams {
+	delay: number;
+	duration: number;
+}
+
+export function fade(node: Element, {
 	delay = 0,
 	duration = 400
-}) {
+}: FadeParams): TransitionConfig {
 	const o = +getComputedStyle(node).opacity;
 
 	return {
@@ -14,14 +27,23 @@ export function fade(node, {
 	};
 }
 
-export function fly(node, {
+interface FlyParams {
+	delay: number;
+	duration: number;
+	easing: (t: number)=>number,
+	x: number;
+	y: number;
+	opacity: number;
+}
+
+export function fly(node: Element, {
 	delay = 0,
 	duration = 400,
 	easing = cubicOut,
 	x = 0,
 	y = 0,
 	opacity = 0
-}) {
+}: FlyParams): TransitionConfig {
 	const style = getComputedStyle(node);
 	const target_opacity = +style.opacity;
 	const transform = style.transform === 'none' ? '' : style.transform;
@@ -38,11 +60,17 @@ export function fly(node, {
 	};
 }
 
-export function slide(node, {
+interface SlideParams {
+	delay: number;
+	duration: number;
+	easing: (t: number)=>number,
+}
+
+export function slide(node: Element, {
 	delay = 0,
 	duration = 400,
 	easing = cubicOut
-}) {
+}: SlideParams): TransitionConfig {
 	const style = getComputedStyle(node);
 	const opacity = +style.opacity;
 	const height = parseFloat(style.height);
@@ -70,13 +98,21 @@ export function slide(node, {
 	};
 }
 
-export function scale(node, {
+interface ScaleParams {
+	delay: number;
+	duration: number;
+	easing: (t: number)=>number,
+	start: number;
+	opacity: number;
+}
+
+export function scale(node: Element, {
 	delay = 0,
 	duration = 400,
 	easing = cubicOut,
 	start = 0,
 	opacity = 0
-}) {
+}: ScaleParams): TransitionConfig {
 	const style = getComputedStyle(node);
 	const target_opacity = +style.opacity;
 	const transform = style.transform === 'none' ? '' : style.transform;
@@ -95,12 +131,19 @@ export function scale(node, {
 	};
 }
 
-export function draw(node, {
+interface DrawParams {
+	delay: number;
+	speed: number;
+	duration: number | ((len: number) => number);
+	easing: (t: number) => number,
+}
+
+export function draw(node: SVGElement & { getTotalLength(): number }, {
 	delay = 0,
 	speed,
 	duration,
 	easing = cubicInOut
-}) {
+}: DrawParams): TransitionConfig {
 	const len = node.getTotalLength();
 
 	if (duration === undefined) {
@@ -121,11 +164,21 @@ export function draw(node, {
 	};
 }
 
-export function crossfade({ fallback, ...defaults }) {
-	const to_receive = new Map();
-	const to_send = new Map();
+interface CrossfadeParams {
+	delay: number;
+	duration: number | ((len: number) => number);
+	easing: (t: number) => number,
+}
+
+type ClientRectMap = Map<any, { rect: ClientRect }>;
+
+export function crossfade({ fallback, ...defaults }: CrossfadeParams & {
+	fallback: (node: Element, params: CrossfadeParams, intro: boolean)=> TransitionConfig
+}) {
+	const to_receive: ClientRectMap = new Map();
+	const to_send: ClientRectMap = new Map();
 
-	function crossfade(from, node, params) {
+	function crossfade(from: ClientRect, node: Element, params: CrossfadeParams):TransitionConfig {
 		const {
 			delay = 0,
 			duration = d => Math.sqrt(d) * 30,
@@ -152,8 +205,8 @@ export function crossfade({ fallback, ...defaults }) {
 		};
 	}
 
-	function transition(items, counterparts, intro) {
-		return (node, params) => {
+	function transition(items: ClientRectMap, counterparts: ClientRectMap, intro: boolean) {
+		return (node: Element, params: CrossfadeParams & { key: any }) => {
 			items.set(params.key, {
 				rect: node.getBoundingClientRect()
 			});
diff --git a/store.d.ts b/store.d.ts
deleted file mode 100644
index 6d345dce57..0000000000
--- a/store.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './types/store';
diff --git a/test/custom-elements/index.js b/test/custom-elements/index.js
index 5ac0b73bbf..9255d33c0e 100644
--- a/test/custom-elements/index.js
+++ b/test/custom-elements/index.js
@@ -58,7 +58,7 @@ describe('custom-elements', function() {
 
 		const solo = /\.solo$/.test(dir);
 		const skip = /\.skip$/.test(dir);
-		const internal = path.resolve('internal.mjs');
+		const internal = path.resolve('internal/index.mjs');
 		const index = path.resolve('index.mjs');
 		const warnings = [];
 
@@ -71,7 +71,7 @@ describe('custom-elements', function() {
 				plugins: [
 					{
 						resolveId(importee) {
-							if (importee === 'svelte/internal') {
+							if (importee === 'svelte/internal' || importee === './internal') {
 								return internal;
 							}
 
diff --git a/test/runtime/index.js b/test/runtime/index.js
index fd5ffdef04..77879edc1f 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.js
@@ -3,7 +3,7 @@ import * as path from "path";
 import * as fs from "fs";
 import { rollup } from 'rollup';
 import * as virtual from 'rollup-plugin-virtual';
-import { clear_loops, set_now, set_raf } from "../../internal.js";
+import { clear_loops, set_now, set_raf } from "../../internal";
 
 import {
 	showOutput,
@@ -20,7 +20,7 @@ let compileOptions = null;
 let compile = null;
 
 const sveltePath = process.cwd().split('\\').join('/');
-const internal = `${sveltePath}/internal.js`;
+const internal = `${sveltePath}/internal`;
 
 describe("runtime", () => {
 	before(() => {
@@ -223,7 +223,7 @@ describe("runtime", () => {
 				{
 					resolveId: (importee, importer) => {
 						if (importee.startsWith('svelte/')) {
-							return importee.replace('svelte', process.cwd()) + '.mjs';
+							return importee.replace('svelte', process.cwd()) + '/index.mjs';
 						}
 					}
 				}
diff --git a/test/runtime/samples/prop-subscribable/_config.js b/test/runtime/samples/prop-subscribable/_config.js
index 69f8104fab..84cde8c9af 100644
--- a/test/runtime/samples/prop-subscribable/_config.js
+++ b/test/runtime/samples/prop-subscribable/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {
diff --git a/test/runtime/samples/store-assignment-updates-reactive/_config.js b/test/runtime/samples/store-assignment-updates-reactive/_config.js
index a7439bde5c..e81b3bb180 100644
--- a/test/runtime/samples/store-assignment-updates-reactive/_config.js
+++ b/test/runtime/samples/store-assignment-updates-reactive/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 const c = writable(0);
 
diff --git a/test/runtime/samples/store-assignment-updates-reactive/main.svelte b/test/runtime/samples/store-assignment-updates-reactive/main.svelte
index 18ec3bd7a7..9975ea87b8 100644
--- a/test/runtime/samples/store-assignment-updates-reactive/main.svelte
+++ b/test/runtime/samples/store-assignment-updates-reactive/main.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { writable } from '../../../../store.js';
+	import { writable } from '../../../../store';
 
 	const a = writable();
 	const b = writable();
diff --git a/test/runtime/samples/store-assignment-updates/_config.js b/test/runtime/samples/store-assignment-updates/_config.js
index 27f0ce274b..1b36d92863 100644
--- a/test/runtime/samples/store-assignment-updates/_config.js
+++ b/test/runtime/samples/store-assignment-updates/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {
diff --git a/test/runtime/samples/store-auto-subscribe-implicit/_config.js b/test/runtime/samples/store-auto-subscribe-implicit/_config.js
index b8203f2a68..eca1f314ff 100644
--- a/test/runtime/samples/store-auto-subscribe-implicit/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-implicit/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {
diff --git a/test/runtime/samples/store-auto-subscribe-in-each/_config.js b/test/runtime/samples/store-auto-subscribe-in-each/_config.js
index 969f9a9b74..a49dbab85c 100644
--- a/test/runtime/samples/store-auto-subscribe-in-each/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-in-each/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	skip: true,
diff --git a/test/runtime/samples/store-auto-subscribe-in-reactive-declaration/_config.js b/test/runtime/samples/store-auto-subscribe-in-reactive-declaration/_config.js
index b2a5a8dba7..2240425d91 100644
--- a/test/runtime/samples/store-auto-subscribe-in-reactive-declaration/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-in-reactive-declaration/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {
diff --git a/test/runtime/samples/store-auto-subscribe-in-script/_config.js b/test/runtime/samples/store-auto-subscribe-in-script/_config.js
index a7a8ef8d27..cfd4475240 100644
--- a/test/runtime/samples/store-auto-subscribe-in-script/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-in-script/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 const count = writable(0);
 
diff --git a/test/runtime/samples/store-auto-subscribe/_config.js b/test/runtime/samples/store-auto-subscribe/_config.js
index b8203f2a68..eca1f314ff 100644
--- a/test/runtime/samples/store-auto-subscribe/_config.js
+++ b/test/runtime/samples/store-auto-subscribe/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {
diff --git a/test/runtime/samples/store-contextual/_config.js b/test/runtime/samples/store-contextual/_config.js
index c759ede650..e06332a233 100644
--- a/test/runtime/samples/store-contextual/_config.js
+++ b/test/runtime/samples/store-contextual/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 const todos = [
 	writable({ done: false, text: 'write docs' }),
diff --git a/test/runtime/samples/store-imported-module-b/foo.js b/test/runtime/samples/store-imported-module-b/foo.js
index 340c3e6bd8..5d15213c3a 100644
--- a/test/runtime/samples/store-imported-module-b/foo.js
+++ b/test/runtime/samples/store-imported-module-b/foo.js
@@ -1,3 +1,3 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default writable(42);
\ No newline at end of file
diff --git a/test/runtime/samples/store-imported-module/foo.js b/test/runtime/samples/store-imported-module/foo.js
index 340c3e6bd8..5d15213c3a 100644
--- a/test/runtime/samples/store-imported-module/foo.js
+++ b/test/runtime/samples/store-imported-module/foo.js
@@ -1,3 +1,3 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default writable(42);
\ No newline at end of file
diff --git a/test/runtime/samples/store-imported/foo.js b/test/runtime/samples/store-imported/foo.js
index 340c3e6bd8..5d15213c3a 100644
--- a/test/runtime/samples/store-imported/foo.js
+++ b/test/runtime/samples/store-imported/foo.js
@@ -1,3 +1,3 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default writable(42);
\ No newline at end of file
diff --git a/test/runtime/samples/store-increment-updates-reactive/main.svelte b/test/runtime/samples/store-increment-updates-reactive/main.svelte
index ceec177f7a..63d4b68dc1 100644
--- a/test/runtime/samples/store-increment-updates-reactive/main.svelte
+++ b/test/runtime/samples/store-increment-updates-reactive/main.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { writable } from '../../../../store.js';
+	import { writable } from '../../../../store';
 
 	const foo = writable(0);
 
diff --git a/test/runtime/samples/store-prevent-user-declarations/_config.js b/test/runtime/samples/store-prevent-user-declarations/_config.js
index 312348eba4..ec099380e8 100644
--- a/test/runtime/samples/store-prevent-user-declarations/_config.js
+++ b/test/runtime/samples/store-prevent-user-declarations/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {
diff --git a/transition.d.ts b/transition.d.ts
deleted file mode 100644
index 58f51d94d5..0000000000
--- a/transition.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './types/transition';
diff --git a/tsconfig.json b/tsconfig.json
index 6c4e786f6d..9ac29a84fe 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,9 +2,8 @@
 	"compilerOptions": {
 		"target": "es2015",
 		"module": "es6",
-		"declarationDir": "./types",
-		"outDir": "./types",
 		"declaration": true,
+		"declarationDir": "types",
 		"noImplicitThis": true,
 		"noEmitOnError": true,
 		"lib": [
@@ -17,10 +16,10 @@
 		"moduleResolution": "node",
 		"baseUrl": ".",
 		"paths": {
-			"svelte/internal": ["./src/internal"],
-			"svelte/easing": ["./src/easing"],
-			"svelte/motion": ["./src/motion"],
-			"svelte/store": ["./src/store"]
+			"svelte/internal": ["./src/runtime/internal/index"],
+			"svelte/easing": ["./src/runtime/easing/index"],
+			"svelte/motion": ["./src/runtime/motion/index"],
+			"svelte/store": ["./src/runtime/store/index"]
 		},
 		"typeRoots": [
 			"node_modules/@types"
@@ -28,8 +27,5 @@
 	},
 	"include": [
 		"src/**/*"
-	],
-	"exclude": [
-		"types"
 	]
 }