diff --git a/.gitignore b/.gitignore
index 923dd5901e..590bd1d88e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 .nyc_output
 node_modules
 *.map
-/src/compiler/compile/internal-exports.ts
+/src/compiler/compile/internal_exports.ts
 /compiler.d.ts
 /compiler.*js
 /index.*js
diff --git a/rollup.config.js b/rollup.config.js
index fb329534a2..8c3068dcbd 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -66,7 +66,7 @@ export default [
 						if (dir === 'internal') {
 							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)});`);
+								fs.writeFileSync('src/compiler/compile/internal_exports.ts', `// This file is automatically generated\nexport default new Set(${JSON.stringify(mod.exports)});`);
 							}
 						}
 
diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index c4924697f8..f6a8785e5f 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -10,7 +10,7 @@ import { create_scopes, extract_names, Scope, extract_identifiers } from './util
 import Stylesheet from './css/Stylesheet';
 import { test } from '../config';
 import Fragment from './nodes/Fragment';
-import internal_exports from './internal-exports';
+import internal_exports from './internal_exports';
 import { Node, Ast, CompileOptions, Var, Warning } from '../interfaces';
 import error from '../utils/error';
 import get_code_frame from '../utils/get_code_frame';
diff --git a/src/compiler/compile/index.ts b/src/compiler/compile/index.ts
index 30787f8d88..98004ba5da 100644
--- a/src/compiler/compile/index.ts
+++ b/src/compiler/compile/index.ts
@@ -1,8 +1,8 @@
 import { assign } from '../../runtime/internal/utils';
 import Stats from '../Stats';
 import parse from '../parse/index';
-import render_dom from './render-dom/index';
-import render_ssr from './render-ssr/index';
+import render_dom from './render_dom/index';
+import render_ssr from './render_ssr/index';
 import { CompileOptions, Warning } from '../interfaces';
 import Component from './Component';
 import fuzzymatch from '../utils/fuzzymatch';
diff --git a/src/compiler/compile/nodes/EventHandler.ts b/src/compiler/compile/nodes/EventHandler.ts
index dab60858d5..20e662a22b 100644
--- a/src/compiler/compile/nodes/EventHandler.ts
+++ b/src/compiler/compile/nodes/EventHandler.ts
@@ -2,7 +2,7 @@ import Node from './shared/Node';
 import Expression from './shared/Expression';
 import Component from '../Component';
 import deindent from '../utils/deindent';
-import Block from '../render-dom/Block';
+import Block from '../render_dom/Block';
 
 export default class EventHandler extends Node {
 	type: 'EventHandler';
diff --git a/src/compiler/compile/nodes/Fragment.ts b/src/compiler/compile/nodes/Fragment.ts
index 6025b036a6..9a0399305c 100644
--- a/src/compiler/compile/nodes/Fragment.ts
+++ b/src/compiler/compile/nodes/Fragment.ts
@@ -1,7 +1,7 @@
 import Node from './shared/Node';
 import Component from '../Component';
 import map_children from './shared/map_children';
-import Block from '../render-dom/Block';
+import Block from '../render_dom/Block';
 import TemplateScope from './shared/TemplateScope';
 import { INode } from './interfaces';
 
diff --git a/src/compiler/compile/nodes/shared/AbstractBlock.ts b/src/compiler/compile/nodes/shared/AbstractBlock.ts
index 931dd4d82d..940ae07d88 100644
--- a/src/compiler/compile/nodes/shared/AbstractBlock.ts
+++ b/src/compiler/compile/nodes/shared/AbstractBlock.ts
@@ -1,4 +1,4 @@
-import Block from '../../render-dom/Block';
+import Block from '../../render_dom/Block';
 import Component from '../../Component';
 import Node from './Node';
 import { INode } from '../interfaces';
diff --git a/src/compiler/compile/nodes/shared/Expression.ts b/src/compiler/compile/nodes/shared/Expression.ts
index 004ae716b9..8a5d0af284 100644
--- a/src/compiler/compile/nodes/shared/Expression.ts
+++ b/src/compiler/compile/nodes/shared/Expression.ts
@@ -6,12 +6,12 @@ import { create_scopes, Scope, extract_names } from '../../utils/scope';
 import { Node } from '../../../interfaces';
 import { globals , sanitize } from '../../../utils/names';
 import deindent from '../../utils/deindent';
-import Wrapper from '../../render-dom/wrappers/shared/Wrapper';
+import Wrapper from '../../render_dom/wrappers/shared/Wrapper';
 
 import TemplateScope from './TemplateScope';
 import get_object from '../../utils/get_object';
 import { nodes_match } from '../../../utils/nodes_match';
-import Block from '../../render-dom/Block';
+import Block from '../../render_dom/Block';
 import { INode } from '../interfaces';
 
 const binary_operators: Record<string, number> = {
diff --git a/src/compiler/compile/render-dom/Block.ts b/src/compiler/compile/render_dom/Block.ts
similarity index 100%
rename from src/compiler/compile/render-dom/Block.ts
rename to src/compiler/compile/render_dom/Block.ts
diff --git a/src/compiler/compile/render-dom/Renderer.ts b/src/compiler/compile/render_dom/Renderer.ts
similarity index 100%
rename from src/compiler/compile/render-dom/Renderer.ts
rename to src/compiler/compile/render_dom/Renderer.ts
diff --git a/src/compiler/compile/render-dom/index.ts b/src/compiler/compile/render_dom/index.ts
similarity index 100%
rename from src/compiler/compile/render-dom/index.ts
rename to src/compiler/compile/render_dom/index.ts
diff --git a/src/compiler/compile/render-dom/wrappers/AwaitBlock.ts b/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/AwaitBlock.ts
rename to src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Body.ts b/src/compiler/compile/render_dom/wrappers/Body.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Body.ts
rename to src/compiler/compile/render_dom/wrappers/Body.ts
diff --git a/src/compiler/compile/render-dom/wrappers/DebugTag.ts b/src/compiler/compile/render_dom/wrappers/DebugTag.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/DebugTag.ts
rename to src/compiler/compile/render_dom/wrappers/DebugTag.ts
diff --git a/src/compiler/compile/render-dom/wrappers/EachBlock.ts b/src/compiler/compile/render_dom/wrappers/EachBlock.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/EachBlock.ts
rename to src/compiler/compile/render_dom/wrappers/EachBlock.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Element/Attribute.ts b/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Element/Attribute.ts
rename to src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Element/Binding.ts b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Element/Binding.ts
rename to src/compiler/compile/render_dom/wrappers/Element/Binding.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Element/StyleAttribute.ts b/src/compiler/compile/render_dom/wrappers/Element/StyleAttribute.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Element/StyleAttribute.ts
rename to src/compiler/compile/render_dom/wrappers/Element/StyleAttribute.ts
diff --git a/src/compiler/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/compiler/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/compiler/compile/render-dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Element/index.ts
rename to src/compiler/compile/render_dom/wrappers/Element/index.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Fragment.ts b/src/compiler/compile/render_dom/wrappers/Fragment.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Fragment.ts
rename to src/compiler/compile/render_dom/wrappers/Fragment.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Head.ts b/src/compiler/compile/render_dom/wrappers/Head.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Head.ts
rename to src/compiler/compile/render_dom/wrappers/Head.ts
diff --git a/src/compiler/compile/render-dom/wrappers/IfBlock.ts b/src/compiler/compile/render_dom/wrappers/IfBlock.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/IfBlock.ts
rename to src/compiler/compile/render_dom/wrappers/IfBlock.ts
diff --git a/src/compiler/compile/render-dom/wrappers/InlineComponent/index.ts b/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/InlineComponent/index.ts
rename to src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
diff --git a/src/compiler/compile/render-dom/wrappers/MustacheTag.ts b/src/compiler/compile/render_dom/wrappers/MustacheTag.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/MustacheTag.ts
rename to src/compiler/compile/render_dom/wrappers/MustacheTag.ts
diff --git a/src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts b/src/compiler/compile/render_dom/wrappers/RawMustacheTag.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts
rename to src/compiler/compile/render_dom/wrappers/RawMustacheTag.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Slot.ts b/src/compiler/compile/render_dom/wrappers/Slot.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Slot.ts
rename to src/compiler/compile/render_dom/wrappers/Slot.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Text.ts b/src/compiler/compile/render_dom/wrappers/Text.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Text.ts
rename to src/compiler/compile/render_dom/wrappers/Text.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Title.ts b/src/compiler/compile/render_dom/wrappers/Title.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Title.ts
rename to src/compiler/compile/render_dom/wrappers/Title.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Window.ts b/src/compiler/compile/render_dom/wrappers/Window.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Window.ts
rename to src/compiler/compile/render_dom/wrappers/Window.ts
diff --git a/src/compiler/compile/render-dom/wrappers/shared/Tag.ts b/src/compiler/compile/render_dom/wrappers/shared/Tag.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/shared/Tag.ts
rename to src/compiler/compile/render_dom/wrappers/shared/Tag.ts
diff --git a/src/compiler/compile/render-dom/wrappers/shared/Wrapper.ts b/src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/shared/Wrapper.ts
rename to src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts
diff --git a/src/compiler/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/compiler/compile/render-dom/wrappers/shared/add_actions.ts
rename to src/compiler/compile/render_dom/wrappers/shared/add_actions.ts
diff --git a/src/compiler/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/compiler/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/compiler/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/compiler/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/compiler/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/compiler/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/compiler/compile/render-ssr/Renderer.ts b/src/compiler/compile/render_ssr/Renderer.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/Renderer.ts
rename to src/compiler/compile/render_ssr/Renderer.ts
diff --git a/src/compiler/compile/render-ssr/handlers/AwaitBlock.ts b/src/compiler/compile/render_ssr/handlers/AwaitBlock.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/AwaitBlock.ts
rename to src/compiler/compile/render_ssr/handlers/AwaitBlock.ts
diff --git a/src/compiler/compile/render-ssr/handlers/Comment.ts b/src/compiler/compile/render_ssr/handlers/Comment.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/Comment.ts
rename to src/compiler/compile/render_ssr/handlers/Comment.ts
diff --git a/src/compiler/compile/render-ssr/handlers/DebugTag.ts b/src/compiler/compile/render_ssr/handlers/DebugTag.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/DebugTag.ts
rename to src/compiler/compile/render_ssr/handlers/DebugTag.ts
diff --git a/src/compiler/compile/render-ssr/handlers/EachBlock.ts b/src/compiler/compile/render_ssr/handlers/EachBlock.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/EachBlock.ts
rename to src/compiler/compile/render_ssr/handlers/EachBlock.ts
diff --git a/src/compiler/compile/render-ssr/handlers/Element.ts b/src/compiler/compile/render_ssr/handlers/Element.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/Element.ts
rename to src/compiler/compile/render_ssr/handlers/Element.ts
diff --git a/src/compiler/compile/render-ssr/handlers/Head.ts b/src/compiler/compile/render_ssr/handlers/Head.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/Head.ts
rename to src/compiler/compile/render_ssr/handlers/Head.ts
diff --git a/src/compiler/compile/render-ssr/handlers/HtmlTag.ts b/src/compiler/compile/render_ssr/handlers/HtmlTag.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/HtmlTag.ts
rename to src/compiler/compile/render_ssr/handlers/HtmlTag.ts
diff --git a/src/compiler/compile/render-ssr/handlers/IfBlock.ts b/src/compiler/compile/render_ssr/handlers/IfBlock.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/IfBlock.ts
rename to src/compiler/compile/render_ssr/handlers/IfBlock.ts
diff --git a/src/compiler/compile/render-ssr/handlers/InlineComponent.ts b/src/compiler/compile/render_ssr/handlers/InlineComponent.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/InlineComponent.ts
rename to src/compiler/compile/render_ssr/handlers/InlineComponent.ts
diff --git a/src/compiler/compile/render-ssr/handlers/Slot.ts b/src/compiler/compile/render_ssr/handlers/Slot.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/Slot.ts
rename to src/compiler/compile/render_ssr/handlers/Slot.ts
diff --git a/src/compiler/compile/render-ssr/handlers/Tag.ts b/src/compiler/compile/render_ssr/handlers/Tag.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/Tag.ts
rename to src/compiler/compile/render_ssr/handlers/Tag.ts
diff --git a/src/compiler/compile/render-ssr/handlers/Text.ts b/src/compiler/compile/render_ssr/handlers/Text.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/Text.ts
rename to src/compiler/compile/render_ssr/handlers/Text.ts
diff --git a/src/compiler/compile/render-ssr/handlers/Title.ts b/src/compiler/compile/render_ssr/handlers/Title.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/Title.ts
rename to src/compiler/compile/render_ssr/handlers/Title.ts
diff --git a/src/compiler/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/compiler/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/compiler/compile/render-ssr/index.ts b/src/compiler/compile/render_ssr/index.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/index.ts
rename to src/compiler/compile/render_ssr/index.ts
diff --git a/src/runtime/internal/await-block.ts b/src/runtime/internal/await_block.ts
similarity index 96%
rename from src/runtime/internal/await-block.ts
rename to src/runtime/internal/await_block.ts
index a3313497ff..a8cce36c3f 100644
--- a/src/runtime/internal/await-block.ts
+++ b/src/runtime/internal/await_block.ts
@@ -1,6 +1,6 @@
 import { assign, is_promise } from './utils';
 import { check_outros, group_outros, transition_in, transition_out } from './transitions';
-import { flush } from '../internal/scheduler';
+import { flush } from './scheduler';
 
 export function handle_promise(promise, info) {
 	const token = info.token = {};
diff --git a/src/runtime/internal/index.ts b/src/runtime/internal/index.ts
index 54f871ad11..0d0a6fd90f 100644
--- a/src/runtime/internal/index.ts
+++ b/src/runtime/internal/index.ts
@@ -1,9 +1,9 @@
 export * from './animations';
-export * from './await-block';
+export * from './await_block';
 export * from './dom';
 export * from './environment';
 export * from './globals';
-export * from './keyed-each';
+export * from './keyed_each';
 export * from './lifecycle';
 export * from './loop';
 export * from './scheduler';
diff --git a/src/runtime/internal/keyed-each.ts b/src/runtime/internal/keyed_each.ts
similarity index 100%
rename from src/runtime/internal/keyed-each.ts
rename to src/runtime/internal/keyed_each.ts