diff --git a/.eslintignore b/.eslintignore
index a84efdafe3..effb19af45 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,5 @@
 src/shared
 shared.js
-test/test.js
\ No newline at end of file
+test/test.js
+**/_actual.js
+**/expected.js
\ No newline at end of file
diff --git a/test/js/README.md b/test/js/README.md
new file mode 100644
index 0000000000..c43905123e
--- /dev/null
+++ b/test/js/README.md
@@ -0,0 +1 @@
+Use these tests sparingly, as they will need to be updated frequently as the code generation changes.
\ No newline at end of file
diff --git a/test/js/index.js b/test/js/index.js
new file mode 100644
index 0000000000..cf8ab54bbd
--- /dev/null
+++ b/test/js/index.js
@@ -0,0 +1,28 @@
+import assert from 'assert';
+import * as fs from 'fs';
+import * as path from 'path';
+import { svelte } from '../helpers.js';
+
+describe( 'js', () => {
+	fs.readdirSync( 'test/js/samples' ).forEach( dir => {
+		if ( dir[0] === '.' ) return;
+
+		// add .solo to a sample directory name to only run that test
+		const solo = /\.solo/.test( dir );
+
+		if ( solo && process.env.CI ) {
+			throw new Error( 'Forgot to remove `solo: true` from test' );
+		}
+
+		( solo ? it.only : it )( dir, () => {
+			dir = path.resolve( 'test/js/samples', dir );
+			const input = fs.readFileSync( `${dir}/input.html`, 'utf-8' ).replace( /\s+$/, '' );
+
+			const actual = svelte.compile( input ).code;
+			fs.writeFileSync( `${dir}/_actual.js`, actual );
+			const expected = fs.readFileSync( `${dir}/expected.js`, 'utf-8' );
+
+			assert.equal( actual.trim(), expected.trim() );
+		});
+	});
+});
diff --git a/test/js/samples/event-handlers-custom/expected.js b/test/js/samples/event-handlers-custom/expected.js
new file mode 100644
index 0000000000..71e633d752
--- /dev/null
+++ b/test/js/samples/event-handlers-custom/expected.js
@@ -0,0 +1,205 @@
+var template = (function () {
+	return {
+		methods: {
+			foo ( bar ) {
+				console.log( bar );
+			}
+		},
+
+		events: {
+			foo ( node, callback ) {
+				// code goes here
+			}
+		}
+	};
+}());
+
+function render_main_fragment ( root, component ) {
+	var button = createElement( 'button' );
+	
+	var foo_handler = template.events.foo.call( component, button, function ( event ) {
+		var root = component.get();
+		
+		component.foo( root.bar );
+	}.bind( button ) );
+	
+	appendNode( createText( "foo" ), button );
+
+	return {
+		mount: function ( target, anchor ) {
+			insertNode( button, target, anchor );
+		},
+		
+		update: noop,
+		
+		teardown: function ( detach ) {
+			foo_handler.teardown();
+			
+			if ( detach ) {
+				detachNode( button );
+			}
+		}
+	};
+}
+
+function SvelteComponent ( options ) {
+	options = options || {};
+	this._state = options.data || {};
+	
+	this._observers = {
+		pre: Object.create( null ),
+		post: Object.create( null )
+	};
+	
+	this._handlers = Object.create( null );
+	
+	this._root = options._root;
+	this._yield = options._yield;
+	
+	this._torndown = false;
+	
+	this._fragment = render_main_fragment( this._state, this );
+	if ( options.target ) this._fragment.mount( options.target, null );
+}
+
+assign( SvelteComponent.prototype, template.methods, {
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	_flush: _flush
+});
+
+SvelteComponent.prototype._set = function _set ( newState ) {
+	var oldState = this._state;
+	this._state = assign( {}, oldState, newState );
+	
+	dispatchObservers( this, this._observers.pre, newState, oldState );
+	if ( this._fragment ) this._fragment.update( newState, this._state );
+	dispatchObservers( this, this._observers.post, newState, oldState );
+};
+
+SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
+	this.fire( 'destroy' );
+
+	this._fragment.teardown( detach !== false );
+	this._fragment = null;
+
+	this._state = {};
+	this._torndown = true;
+};
+
+function createElement( name ) {
+	return document.createElement( name );
+}
+
+function detachNode( node ) {
+	node.parentNode.removeChild( node );
+}
+
+function insertNode( node, target, anchor ) {
+	target.insertBefore( node, anchor );
+}
+
+function createText( data ) {
+	return document.createTextNode( data );
+}
+
+function appendNode( node, target ) {
+	target.appendChild( node );
+}
+
+function assign( target ) {
+	for ( var i = 1; i < arguments.length; i += 1 ) {
+		var source = arguments[i];
+		for ( var k in source ) target[k] = source[k];
+	}
+
+	return target;
+}
+
+function dispatchObservers( component, group, newState, oldState ) {
+	for ( var key in group ) {
+		if ( !( key in newState ) ) continue;
+
+		var newValue = newState[ key ];
+		var oldValue = oldState[ key ];
+
+		if ( newValue === oldValue && typeof newValue !== 'object' ) continue;
+
+		var callbacks = group[ key ];
+		if ( !callbacks ) continue;
+
+		for ( var i = 0; i < callbacks.length; i += 1 ) {
+			var callback = callbacks[i];
+			if ( callback.__calling ) continue;
+
+			callback.__calling = true;
+			callback.call( component, newValue, oldValue );
+			callback.__calling = false;
+		}
+	}
+}
+
+function get( key ) {
+	return key ? this._state[ key ] : this._state;
+}
+
+function fire( eventName, data ) {
+	var handlers = eventName in this._handlers && this._handlers[ eventName ].slice();
+	if ( !handlers ) return;
+
+	for ( var i = 0; i < handlers.length; i += 1 ) {
+		handlers[i].call( this, data );
+	}
+}
+
+function observe( key, callback, options ) {
+	var group = ( options && options.defer ) ? this._observers.pre : this._observers.post;
+
+	( group[ key ] || ( group[ key ] = [] ) ).push( callback );
+
+	if ( !options || options.init !== false ) {
+		callback.__calling = true;
+		callback.call( this, this._state[ key ] );
+		callback.__calling = false;
+	}
+
+	return {
+		cancel: function () {
+			var index = group[ key ].indexOf( callback );
+			if ( ~index ) group[ key ].splice( index, 1 );
+		}
+	};
+}
+
+function on( eventName, handler ) {
+	if ( eventName === 'teardown' ) return this.on( 'destroy', handler );
+
+	var handlers = this._handlers[ eventName ] || ( this._handlers[ eventName ] = [] );
+	handlers.push( handler );
+
+	return {
+		cancel: function () {
+			var index = handlers.indexOf( handler );
+			if ( ~index ) handlers.splice( index, 1 );
+		}
+	};
+}
+
+function set( newState ) {
+	this._set( newState );
+	( this._root || this )._flush();
+}
+
+function _flush() {
+	if ( !this._renderHooks ) return;
+
+	while ( this._renderHooks.length ) {
+		var hook = this._renderHooks.pop();
+		hook.fn.call( hook.context );
+	}
+}
+
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/event-handlers-custom/input.html b/test/js/samples/event-handlers-custom/input.html
new file mode 100644
index 0000000000..77c530fcf6
--- /dev/null
+++ b/test/js/samples/event-handlers-custom/input.html
@@ -0,0 +1,17 @@
+<button on:foo='foo( bar )'>foo</button>
+
+<script>
+	export default {
+		methods: {
+			foo ( bar ) {
+				console.log( bar );
+			}
+		},
+
+		events: {
+			foo ( node, callback ) {
+				// code goes here
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/generator/index.js b/test/runtime/index.js
similarity index 94%
rename from test/generator/index.js
rename to test/runtime/index.js
index 6ca442623b..0d74c6db45 100644
--- a/test/generator/index.js
+++ b/test/runtime/index.js
@@ -38,7 +38,7 @@ describe( 'generate', () => {
 	function runTest ( dir, shared ) {
 		if ( dir[0] === '.' ) return;
 
-		const config = loadConfig( `./generator/samples/${dir}/_config.js` );
+		const config = loadConfig( `./runtime/samples/${dir}/_config.js` );
 
 		if ( config.solo && process.env.CI ) {
 			throw new Error( 'Forgot to remove `solo: true` from test' );
@@ -53,7 +53,7 @@ describe( 'generate', () => {
 			compileOptions.dev = config.dev;
 
 			try {
-				const source = fs.readFileSync( `test/generator/samples/${dir}/main.html`, 'utf-8' );
+				const source = fs.readFileSync( `test/runtime/samples/${dir}/main.html`, 'utf-8' );
 				compiled = svelte.compile( source, compileOptions );
 			} catch ( err ) {
 				if ( config.compileError ) {
@@ -160,13 +160,13 @@ describe( 'generate', () => {
 	}
 
 	describe( 'inline helpers', () => {
-		fs.readdirSync( 'test/generator/samples' ).forEach( dir => {
+		fs.readdirSync( 'test/runtime/samples' ).forEach( dir => {
 			runTest( dir, null );
 		});
 	});
 
 	describe( 'shared helpers', () => {
-		fs.readdirSync( 'test/generator/samples' ).forEach( dir => {
+		fs.readdirSync( 'test/runtime/samples' ).forEach( dir => {
 			runTest( dir, path.resolve( 'shared.js' ) );
 		});
 	});
diff --git a/test/generator/samples/attribute-dynamic-multiple/_config.js b/test/runtime/samples/attribute-dynamic-multiple/_config.js
similarity index 100%
rename from test/generator/samples/attribute-dynamic-multiple/_config.js
rename to test/runtime/samples/attribute-dynamic-multiple/_config.js
diff --git a/test/generator/samples/attribute-dynamic-multiple/main.html b/test/runtime/samples/attribute-dynamic-multiple/main.html
similarity index 100%
rename from test/generator/samples/attribute-dynamic-multiple/main.html
rename to test/runtime/samples/attribute-dynamic-multiple/main.html
diff --git a/test/generator/samples/attribute-dynamic-reserved/_config.js b/test/runtime/samples/attribute-dynamic-reserved/_config.js
similarity index 100%
rename from test/generator/samples/attribute-dynamic-reserved/_config.js
rename to test/runtime/samples/attribute-dynamic-reserved/_config.js
diff --git a/test/generator/samples/attribute-dynamic-reserved/main.html b/test/runtime/samples/attribute-dynamic-reserved/main.html
similarity index 100%
rename from test/generator/samples/attribute-dynamic-reserved/main.html
rename to test/runtime/samples/attribute-dynamic-reserved/main.html
diff --git a/test/generator/samples/attribute-dynamic-shorthand/_config.js b/test/runtime/samples/attribute-dynamic-shorthand/_config.js
similarity index 100%
rename from test/generator/samples/attribute-dynamic-shorthand/_config.js
rename to test/runtime/samples/attribute-dynamic-shorthand/_config.js
diff --git a/test/generator/samples/attribute-dynamic-shorthand/main.html b/test/runtime/samples/attribute-dynamic-shorthand/main.html
similarity index 100%
rename from test/generator/samples/attribute-dynamic-shorthand/main.html
rename to test/runtime/samples/attribute-dynamic-shorthand/main.html
diff --git a/test/generator/samples/attribute-dynamic/_config.js b/test/runtime/samples/attribute-dynamic/_config.js
similarity index 100%
rename from test/generator/samples/attribute-dynamic/_config.js
rename to test/runtime/samples/attribute-dynamic/_config.js
diff --git a/test/generator/samples/attribute-dynamic/main.html b/test/runtime/samples/attribute-dynamic/main.html
similarity index 100%
rename from test/generator/samples/attribute-dynamic/main.html
rename to test/runtime/samples/attribute-dynamic/main.html
diff --git a/test/generator/samples/attribute-empty-svg/_config.js b/test/runtime/samples/attribute-empty-svg/_config.js
similarity index 100%
rename from test/generator/samples/attribute-empty-svg/_config.js
rename to test/runtime/samples/attribute-empty-svg/_config.js
diff --git a/test/generator/samples/attribute-empty-svg/main.html b/test/runtime/samples/attribute-empty-svg/main.html
similarity index 100%
rename from test/generator/samples/attribute-empty-svg/main.html
rename to test/runtime/samples/attribute-empty-svg/main.html
diff --git a/test/generator/samples/attribute-empty/_config.js b/test/runtime/samples/attribute-empty/_config.js
similarity index 100%
rename from test/generator/samples/attribute-empty/_config.js
rename to test/runtime/samples/attribute-empty/_config.js
diff --git a/test/generator/samples/attribute-empty/main.html b/test/runtime/samples/attribute-empty/main.html
similarity index 100%
rename from test/generator/samples/attribute-empty/main.html
rename to test/runtime/samples/attribute-empty/main.html
diff --git a/test/generator/samples/attribute-partial-number/Component.html b/test/runtime/samples/attribute-partial-number/Component.html
similarity index 100%
rename from test/generator/samples/attribute-partial-number/Component.html
rename to test/runtime/samples/attribute-partial-number/Component.html
diff --git a/test/generator/samples/attribute-partial-number/_config.js b/test/runtime/samples/attribute-partial-number/_config.js
similarity index 100%
rename from test/generator/samples/attribute-partial-number/_config.js
rename to test/runtime/samples/attribute-partial-number/_config.js
diff --git a/test/generator/samples/attribute-partial-number/main.html b/test/runtime/samples/attribute-partial-number/main.html
similarity index 100%
rename from test/generator/samples/attribute-partial-number/main.html
rename to test/runtime/samples/attribute-partial-number/main.html
diff --git a/test/generator/samples/attribute-prefer-expression/_config.js b/test/runtime/samples/attribute-prefer-expression/_config.js
similarity index 100%
rename from test/generator/samples/attribute-prefer-expression/_config.js
rename to test/runtime/samples/attribute-prefer-expression/_config.js
diff --git a/test/generator/samples/attribute-prefer-expression/main.html b/test/runtime/samples/attribute-prefer-expression/main.html
similarity index 100%
rename from test/generator/samples/attribute-prefer-expression/main.html
rename to test/runtime/samples/attribute-prefer-expression/main.html
diff --git a/test/generator/samples/attribute-static-boolean/_config.js b/test/runtime/samples/attribute-static-boolean/_config.js
similarity index 100%
rename from test/generator/samples/attribute-static-boolean/_config.js
rename to test/runtime/samples/attribute-static-boolean/_config.js
diff --git a/test/generator/samples/attribute-static-boolean/main.html b/test/runtime/samples/attribute-static-boolean/main.html
similarity index 100%
rename from test/generator/samples/attribute-static-boolean/main.html
rename to test/runtime/samples/attribute-static-boolean/main.html
diff --git a/test/generator/samples/attribute-static/_config.js b/test/runtime/samples/attribute-static/_config.js
similarity index 100%
rename from test/generator/samples/attribute-static/_config.js
rename to test/runtime/samples/attribute-static/_config.js
diff --git a/test/generator/samples/attribute-static/main.html b/test/runtime/samples/attribute-static/main.html
similarity index 100%
rename from test/generator/samples/attribute-static/main.html
rename to test/runtime/samples/attribute-static/main.html
diff --git a/test/generator/samples/autofocus/_config.js b/test/runtime/samples/autofocus/_config.js
similarity index 100%
rename from test/generator/samples/autofocus/_config.js
rename to test/runtime/samples/autofocus/_config.js
diff --git a/test/generator/samples/autofocus/main.html b/test/runtime/samples/autofocus/main.html
similarity index 100%
rename from test/generator/samples/autofocus/main.html
rename to test/runtime/samples/autofocus/main.html
diff --git a/test/generator/samples/binding-input-checkbox-deep-contextual/_config.js b/test/runtime/samples/binding-input-checkbox-deep-contextual/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-checkbox-deep-contextual/_config.js
rename to test/runtime/samples/binding-input-checkbox-deep-contextual/_config.js
diff --git a/test/generator/samples/binding-input-checkbox-deep-contextual/main.html b/test/runtime/samples/binding-input-checkbox-deep-contextual/main.html
similarity index 100%
rename from test/generator/samples/binding-input-checkbox-deep-contextual/main.html
rename to test/runtime/samples/binding-input-checkbox-deep-contextual/main.html
diff --git a/test/generator/samples/binding-input-checkbox-group/_config.js b/test/runtime/samples/binding-input-checkbox-group/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-checkbox-group/_config.js
rename to test/runtime/samples/binding-input-checkbox-group/_config.js
diff --git a/test/generator/samples/binding-input-checkbox-group/main.html b/test/runtime/samples/binding-input-checkbox-group/main.html
similarity index 100%
rename from test/generator/samples/binding-input-checkbox-group/main.html
rename to test/runtime/samples/binding-input-checkbox-group/main.html
diff --git a/test/generator/samples/binding-input-checkbox/_config.js b/test/runtime/samples/binding-input-checkbox/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-checkbox/_config.js
rename to test/runtime/samples/binding-input-checkbox/_config.js
diff --git a/test/generator/samples/binding-input-checkbox/main.html b/test/runtime/samples/binding-input-checkbox/main.html
similarity index 100%
rename from test/generator/samples/binding-input-checkbox/main.html
rename to test/runtime/samples/binding-input-checkbox/main.html
diff --git a/test/generator/samples/binding-input-number/_config.js b/test/runtime/samples/binding-input-number/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-number/_config.js
rename to test/runtime/samples/binding-input-number/_config.js
diff --git a/test/generator/samples/binding-input-number/main.html b/test/runtime/samples/binding-input-number/main.html
similarity index 100%
rename from test/generator/samples/binding-input-number/main.html
rename to test/runtime/samples/binding-input-number/main.html
diff --git a/test/generator/samples/binding-input-radio-group/_config.js b/test/runtime/samples/binding-input-radio-group/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-radio-group/_config.js
rename to test/runtime/samples/binding-input-radio-group/_config.js
diff --git a/test/generator/samples/binding-input-radio-group/main.html b/test/runtime/samples/binding-input-radio-group/main.html
similarity index 100%
rename from test/generator/samples/binding-input-radio-group/main.html
rename to test/runtime/samples/binding-input-radio-group/main.html
diff --git a/test/generator/samples/binding-input-range/_config.js b/test/runtime/samples/binding-input-range/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-range/_config.js
rename to test/runtime/samples/binding-input-range/_config.js
diff --git a/test/generator/samples/binding-input-range/main.html b/test/runtime/samples/binding-input-range/main.html
similarity index 100%
rename from test/generator/samples/binding-input-range/main.html
rename to test/runtime/samples/binding-input-range/main.html
diff --git a/test/generator/samples/binding-input-text-contextual/_config.js b/test/runtime/samples/binding-input-text-contextual/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-text-contextual/_config.js
rename to test/runtime/samples/binding-input-text-contextual/_config.js
diff --git a/test/generator/samples/binding-input-text-contextual/main.html b/test/runtime/samples/binding-input-text-contextual/main.html
similarity index 100%
rename from test/generator/samples/binding-input-text-contextual/main.html
rename to test/runtime/samples/binding-input-text-contextual/main.html
diff --git a/test/generator/samples/binding-input-text-deep-contextual/_config.js b/test/runtime/samples/binding-input-text-deep-contextual/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-text-deep-contextual/_config.js
rename to test/runtime/samples/binding-input-text-deep-contextual/_config.js
diff --git a/test/generator/samples/binding-input-text-deep-contextual/main.html b/test/runtime/samples/binding-input-text-deep-contextual/main.html
similarity index 100%
rename from test/generator/samples/binding-input-text-deep-contextual/main.html
rename to test/runtime/samples/binding-input-text-deep-contextual/main.html
diff --git a/test/generator/samples/binding-input-text-deep/_config.js b/test/runtime/samples/binding-input-text-deep/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-text-deep/_config.js
rename to test/runtime/samples/binding-input-text-deep/_config.js
diff --git a/test/generator/samples/binding-input-text-deep/main.html b/test/runtime/samples/binding-input-text-deep/main.html
similarity index 100%
rename from test/generator/samples/binding-input-text-deep/main.html
rename to test/runtime/samples/binding-input-text-deep/main.html
diff --git a/test/generator/samples/binding-input-text/_config.js b/test/runtime/samples/binding-input-text/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-text/_config.js
rename to test/runtime/samples/binding-input-text/_config.js
diff --git a/test/generator/samples/binding-input-text/main.html b/test/runtime/samples/binding-input-text/main.html
similarity index 100%
rename from test/generator/samples/binding-input-text/main.html
rename to test/runtime/samples/binding-input-text/main.html
diff --git a/test/generator/samples/binding-select-initial-value/_config.js b/test/runtime/samples/binding-select-initial-value/_config.js
similarity index 100%
rename from test/generator/samples/binding-select-initial-value/_config.js
rename to test/runtime/samples/binding-select-initial-value/_config.js
diff --git a/test/generator/samples/binding-select-initial-value/main.html b/test/runtime/samples/binding-select-initial-value/main.html
similarity index 100%
rename from test/generator/samples/binding-select-initial-value/main.html
rename to test/runtime/samples/binding-select-initial-value/main.html
diff --git a/test/generator/samples/binding-select-multiple/_config.js b/test/runtime/samples/binding-select-multiple/_config.js
similarity index 100%
rename from test/generator/samples/binding-select-multiple/_config.js
rename to test/runtime/samples/binding-select-multiple/_config.js
diff --git a/test/generator/samples/binding-select-multiple/main.html b/test/runtime/samples/binding-select-multiple/main.html
similarity index 100%
rename from test/generator/samples/binding-select-multiple/main.html
rename to test/runtime/samples/binding-select-multiple/main.html
diff --git a/test/generator/samples/binding-select/_config.js b/test/runtime/samples/binding-select/_config.js
similarity index 100%
rename from test/generator/samples/binding-select/_config.js
rename to test/runtime/samples/binding-select/_config.js
diff --git a/test/generator/samples/binding-select/main.html b/test/runtime/samples/binding-select/main.html
similarity index 100%
rename from test/generator/samples/binding-select/main.html
rename to test/runtime/samples/binding-select/main.html
diff --git a/test/generator/samples/binding-textarea/_config.js b/test/runtime/samples/binding-textarea/_config.js
similarity index 100%
rename from test/generator/samples/binding-textarea/_config.js
rename to test/runtime/samples/binding-textarea/_config.js
diff --git a/test/generator/samples/binding-textarea/main.html b/test/runtime/samples/binding-textarea/main.html
similarity index 100%
rename from test/generator/samples/binding-textarea/main.html
rename to test/runtime/samples/binding-textarea/main.html
diff --git a/test/generator/samples/component-binding-conditional-b/Bar.html b/test/runtime/samples/component-binding-conditional-b/Bar.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional-b/Bar.html
rename to test/runtime/samples/component-binding-conditional-b/Bar.html
diff --git a/test/generator/samples/component-binding-conditional-b/Baz.html b/test/runtime/samples/component-binding-conditional-b/Baz.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional-b/Baz.html
rename to test/runtime/samples/component-binding-conditional-b/Baz.html
diff --git a/test/generator/samples/component-binding-conditional-b/Foo.html b/test/runtime/samples/component-binding-conditional-b/Foo.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional-b/Foo.html
rename to test/runtime/samples/component-binding-conditional-b/Foo.html
diff --git a/test/generator/samples/component-binding-conditional-b/_config.js b/test/runtime/samples/component-binding-conditional-b/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-conditional-b/_config.js
rename to test/runtime/samples/component-binding-conditional-b/_config.js
diff --git a/test/generator/samples/component-binding-conditional-b/main.html b/test/runtime/samples/component-binding-conditional-b/main.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional-b/main.html
rename to test/runtime/samples/component-binding-conditional-b/main.html
diff --git a/test/generator/samples/component-binding-conditional/Bar.html b/test/runtime/samples/component-binding-conditional/Bar.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional/Bar.html
rename to test/runtime/samples/component-binding-conditional/Bar.html
diff --git a/test/generator/samples/component-binding-conditional/Baz.html b/test/runtime/samples/component-binding-conditional/Baz.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional/Baz.html
rename to test/runtime/samples/component-binding-conditional/Baz.html
diff --git a/test/generator/samples/component-binding-conditional/Foo.html b/test/runtime/samples/component-binding-conditional/Foo.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional/Foo.html
rename to test/runtime/samples/component-binding-conditional/Foo.html
diff --git a/test/generator/samples/component-binding-conditional/_config.js b/test/runtime/samples/component-binding-conditional/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-conditional/_config.js
rename to test/runtime/samples/component-binding-conditional/_config.js
diff --git a/test/generator/samples/component-binding-conditional/main.html b/test/runtime/samples/component-binding-conditional/main.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional/main.html
rename to test/runtime/samples/component-binding-conditional/main.html
diff --git a/test/generator/samples/component-binding-deep-b/ComponentSelector.html b/test/runtime/samples/component-binding-deep-b/ComponentSelector.html
similarity index 100%
rename from test/generator/samples/component-binding-deep-b/ComponentSelector.html
rename to test/runtime/samples/component-binding-deep-b/ComponentSelector.html
diff --git a/test/generator/samples/component-binding-deep-b/Editor.html b/test/runtime/samples/component-binding-deep-b/Editor.html
similarity index 100%
rename from test/generator/samples/component-binding-deep-b/Editor.html
rename to test/runtime/samples/component-binding-deep-b/Editor.html
diff --git a/test/generator/samples/component-binding-deep-b/_config.js b/test/runtime/samples/component-binding-deep-b/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-deep-b/_config.js
rename to test/runtime/samples/component-binding-deep-b/_config.js
diff --git a/test/generator/samples/component-binding-deep-b/main.html b/test/runtime/samples/component-binding-deep-b/main.html
similarity index 100%
rename from test/generator/samples/component-binding-deep-b/main.html
rename to test/runtime/samples/component-binding-deep-b/main.html
diff --git a/test/generator/samples/component-binding-deep/Widget.html b/test/runtime/samples/component-binding-deep/Widget.html
similarity index 100%
rename from test/generator/samples/component-binding-deep/Widget.html
rename to test/runtime/samples/component-binding-deep/Widget.html
diff --git a/test/generator/samples/component-binding-deep/_config.js b/test/runtime/samples/component-binding-deep/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-deep/_config.js
rename to test/runtime/samples/component-binding-deep/_config.js
diff --git a/test/generator/samples/component-binding-deep/main.html b/test/runtime/samples/component-binding-deep/main.html
similarity index 100%
rename from test/generator/samples/component-binding-deep/main.html
rename to test/runtime/samples/component-binding-deep/main.html
diff --git a/test/generator/samples/component-binding-each-nested/Widget.html b/test/runtime/samples/component-binding-each-nested/Widget.html
similarity index 100%
rename from test/generator/samples/component-binding-each-nested/Widget.html
rename to test/runtime/samples/component-binding-each-nested/Widget.html
diff --git a/test/generator/samples/component-binding-each-nested/_config.js b/test/runtime/samples/component-binding-each-nested/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-each-nested/_config.js
rename to test/runtime/samples/component-binding-each-nested/_config.js
diff --git a/test/generator/samples/component-binding-each-nested/main.html b/test/runtime/samples/component-binding-each-nested/main.html
similarity index 100%
rename from test/generator/samples/component-binding-each-nested/main.html
rename to test/runtime/samples/component-binding-each-nested/main.html
diff --git a/test/generator/samples/component-binding-each-object/Widget.html b/test/runtime/samples/component-binding-each-object/Widget.html
similarity index 100%
rename from test/generator/samples/component-binding-each-object/Widget.html
rename to test/runtime/samples/component-binding-each-object/Widget.html
diff --git a/test/generator/samples/component-binding-each-object/_config.js b/test/runtime/samples/component-binding-each-object/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-each-object/_config.js
rename to test/runtime/samples/component-binding-each-object/_config.js
diff --git a/test/generator/samples/component-binding-each-object/main.html b/test/runtime/samples/component-binding-each-object/main.html
similarity index 100%
rename from test/generator/samples/component-binding-each-object/main.html
rename to test/runtime/samples/component-binding-each-object/main.html
diff --git a/test/generator/samples/component-binding-each/Widget.html b/test/runtime/samples/component-binding-each/Widget.html
similarity index 100%
rename from test/generator/samples/component-binding-each/Widget.html
rename to test/runtime/samples/component-binding-each/Widget.html
diff --git a/test/generator/samples/component-binding-each/_config.js b/test/runtime/samples/component-binding-each/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-each/_config.js
rename to test/runtime/samples/component-binding-each/_config.js
diff --git a/test/generator/samples/component-binding-each/main.html b/test/runtime/samples/component-binding-each/main.html
similarity index 100%
rename from test/generator/samples/component-binding-each/main.html
rename to test/runtime/samples/component-binding-each/main.html
diff --git a/test/generator/samples/component-binding-infinite-loop/A.html b/test/runtime/samples/component-binding-infinite-loop/A.html
similarity index 100%
rename from test/generator/samples/component-binding-infinite-loop/A.html
rename to test/runtime/samples/component-binding-infinite-loop/A.html
diff --git a/test/generator/samples/component-binding-infinite-loop/B.html b/test/runtime/samples/component-binding-infinite-loop/B.html
similarity index 100%
rename from test/generator/samples/component-binding-infinite-loop/B.html
rename to test/runtime/samples/component-binding-infinite-loop/B.html
diff --git a/test/generator/samples/component-binding-infinite-loop/C.html b/test/runtime/samples/component-binding-infinite-loop/C.html
similarity index 100%
rename from test/generator/samples/component-binding-infinite-loop/C.html
rename to test/runtime/samples/component-binding-infinite-loop/C.html
diff --git a/test/generator/samples/component-binding-infinite-loop/_config.js b/test/runtime/samples/component-binding-infinite-loop/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-infinite-loop/_config.js
rename to test/runtime/samples/component-binding-infinite-loop/_config.js
diff --git a/test/generator/samples/component-binding-infinite-loop/main.html b/test/runtime/samples/component-binding-infinite-loop/main.html
similarity index 100%
rename from test/generator/samples/component-binding-infinite-loop/main.html
rename to test/runtime/samples/component-binding-infinite-loop/main.html
diff --git a/test/generator/samples/component-binding-nested/Bar.html b/test/runtime/samples/component-binding-nested/Bar.html
similarity index 100%
rename from test/generator/samples/component-binding-nested/Bar.html
rename to test/runtime/samples/component-binding-nested/Bar.html
diff --git a/test/generator/samples/component-binding-nested/Baz.html b/test/runtime/samples/component-binding-nested/Baz.html
similarity index 100%
rename from test/generator/samples/component-binding-nested/Baz.html
rename to test/runtime/samples/component-binding-nested/Baz.html
diff --git a/test/generator/samples/component-binding-nested/Foo.html b/test/runtime/samples/component-binding-nested/Foo.html
similarity index 100%
rename from test/generator/samples/component-binding-nested/Foo.html
rename to test/runtime/samples/component-binding-nested/Foo.html
diff --git a/test/generator/samples/component-binding-nested/_config.js b/test/runtime/samples/component-binding-nested/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-nested/_config.js
rename to test/runtime/samples/component-binding-nested/_config.js
diff --git a/test/generator/samples/component-binding-nested/main.html b/test/runtime/samples/component-binding-nested/main.html
similarity index 100%
rename from test/generator/samples/component-binding-nested/main.html
rename to test/runtime/samples/component-binding-nested/main.html
diff --git a/test/generator/samples/component-binding-parent-supercedes-child/Counter.html b/test/runtime/samples/component-binding-parent-supercedes-child/Counter.html
similarity index 100%
rename from test/generator/samples/component-binding-parent-supercedes-child/Counter.html
rename to test/runtime/samples/component-binding-parent-supercedes-child/Counter.html
diff --git a/test/generator/samples/component-binding-parent-supercedes-child/_config.js b/test/runtime/samples/component-binding-parent-supercedes-child/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-parent-supercedes-child/_config.js
rename to test/runtime/samples/component-binding-parent-supercedes-child/_config.js
diff --git a/test/generator/samples/component-binding-parent-supercedes-child/main.html b/test/runtime/samples/component-binding-parent-supercedes-child/main.html
similarity index 100%
rename from test/generator/samples/component-binding-parent-supercedes-child/main.html
rename to test/runtime/samples/component-binding-parent-supercedes-child/main.html
diff --git a/test/generator/samples/component-binding/Counter.html b/test/runtime/samples/component-binding/Counter.html
similarity index 100%
rename from test/generator/samples/component-binding/Counter.html
rename to test/runtime/samples/component-binding/Counter.html
diff --git a/test/generator/samples/component-binding/_config.js b/test/runtime/samples/component-binding/_config.js
similarity index 100%
rename from test/generator/samples/component-binding/_config.js
rename to test/runtime/samples/component-binding/_config.js
diff --git a/test/generator/samples/component-binding/main.html b/test/runtime/samples/component-binding/main.html
similarity index 100%
rename from test/generator/samples/component-binding/main.html
rename to test/runtime/samples/component-binding/main.html
diff --git a/test/generator/samples/component-data-dynamic-late/Widget.html b/test/runtime/samples/component-data-dynamic-late/Widget.html
similarity index 100%
rename from test/generator/samples/component-data-dynamic-late/Widget.html
rename to test/runtime/samples/component-data-dynamic-late/Widget.html
diff --git a/test/generator/samples/component-data-dynamic-late/_config.js b/test/runtime/samples/component-data-dynamic-late/_config.js
similarity index 100%
rename from test/generator/samples/component-data-dynamic-late/_config.js
rename to test/runtime/samples/component-data-dynamic-late/_config.js
diff --git a/test/generator/samples/component-data-dynamic-late/main.html b/test/runtime/samples/component-data-dynamic-late/main.html
similarity index 100%
rename from test/generator/samples/component-data-dynamic-late/main.html
rename to test/runtime/samples/component-data-dynamic-late/main.html
diff --git a/test/generator/samples/component-data-dynamic-shorthand/Widget.html b/test/runtime/samples/component-data-dynamic-shorthand/Widget.html
similarity index 100%
rename from test/generator/samples/component-data-dynamic-shorthand/Widget.html
rename to test/runtime/samples/component-data-dynamic-shorthand/Widget.html
diff --git a/test/generator/samples/component-data-dynamic-shorthand/_config.js b/test/runtime/samples/component-data-dynamic-shorthand/_config.js
similarity index 100%
rename from test/generator/samples/component-data-dynamic-shorthand/_config.js
rename to test/runtime/samples/component-data-dynamic-shorthand/_config.js
diff --git a/test/generator/samples/component-data-dynamic-shorthand/main.html b/test/runtime/samples/component-data-dynamic-shorthand/main.html
similarity index 100%
rename from test/generator/samples/component-data-dynamic-shorthand/main.html
rename to test/runtime/samples/component-data-dynamic-shorthand/main.html
diff --git a/test/generator/samples/component-data-dynamic/Widget.html b/test/runtime/samples/component-data-dynamic/Widget.html
similarity index 100%
rename from test/generator/samples/component-data-dynamic/Widget.html
rename to test/runtime/samples/component-data-dynamic/Widget.html
diff --git a/test/generator/samples/component-data-dynamic/_config.js b/test/runtime/samples/component-data-dynamic/_config.js
similarity index 100%
rename from test/generator/samples/component-data-dynamic/_config.js
rename to test/runtime/samples/component-data-dynamic/_config.js
diff --git a/test/generator/samples/component-data-dynamic/main.html b/test/runtime/samples/component-data-dynamic/main.html
similarity index 100%
rename from test/generator/samples/component-data-dynamic/main.html
rename to test/runtime/samples/component-data-dynamic/main.html
diff --git a/test/generator/samples/component-data-empty/Widget.html b/test/runtime/samples/component-data-empty/Widget.html
similarity index 100%
rename from test/generator/samples/component-data-empty/Widget.html
rename to test/runtime/samples/component-data-empty/Widget.html
diff --git a/test/generator/samples/component-data-empty/_config.js b/test/runtime/samples/component-data-empty/_config.js
similarity index 100%
rename from test/generator/samples/component-data-empty/_config.js
rename to test/runtime/samples/component-data-empty/_config.js
diff --git a/test/generator/samples/component-data-empty/main.html b/test/runtime/samples/component-data-empty/main.html
similarity index 100%
rename from test/generator/samples/component-data-empty/main.html
rename to test/runtime/samples/component-data-empty/main.html
diff --git a/test/generator/samples/component-data-static-boolean/Foo.html b/test/runtime/samples/component-data-static-boolean/Foo.html
similarity index 100%
rename from test/generator/samples/component-data-static-boolean/Foo.html
rename to test/runtime/samples/component-data-static-boolean/Foo.html
diff --git a/test/generator/samples/component-data-static-boolean/_config.js b/test/runtime/samples/component-data-static-boolean/_config.js
similarity index 100%
rename from test/generator/samples/component-data-static-boolean/_config.js
rename to test/runtime/samples/component-data-static-boolean/_config.js
diff --git a/test/generator/samples/component-data-static-boolean/main.html b/test/runtime/samples/component-data-static-boolean/main.html
similarity index 100%
rename from test/generator/samples/component-data-static-boolean/main.html
rename to test/runtime/samples/component-data-static-boolean/main.html
diff --git a/test/generator/samples/component-data-static/Widget.html b/test/runtime/samples/component-data-static/Widget.html
similarity index 100%
rename from test/generator/samples/component-data-static/Widget.html
rename to test/runtime/samples/component-data-static/Widget.html
diff --git a/test/generator/samples/component-data-static/_config.js b/test/runtime/samples/component-data-static/_config.js
similarity index 100%
rename from test/generator/samples/component-data-static/_config.js
rename to test/runtime/samples/component-data-static/_config.js
diff --git a/test/generator/samples/component-data-static/main.html b/test/runtime/samples/component-data-static/main.html
similarity index 100%
rename from test/generator/samples/component-data-static/main.html
rename to test/runtime/samples/component-data-static/main.html
diff --git a/test/generator/samples/component-events-data/Widget.html b/test/runtime/samples/component-events-data/Widget.html
similarity index 100%
rename from test/generator/samples/component-events-data/Widget.html
rename to test/runtime/samples/component-events-data/Widget.html
diff --git a/test/generator/samples/component-events-data/_config.js b/test/runtime/samples/component-events-data/_config.js
similarity index 100%
rename from test/generator/samples/component-events-data/_config.js
rename to test/runtime/samples/component-events-data/_config.js
diff --git a/test/generator/samples/component-events-data/main.html b/test/runtime/samples/component-events-data/main.html
similarity index 100%
rename from test/generator/samples/component-events-data/main.html
rename to test/runtime/samples/component-events-data/main.html
diff --git a/test/generator/samples/component-events-each/Widget.html b/test/runtime/samples/component-events-each/Widget.html
similarity index 100%
rename from test/generator/samples/component-events-each/Widget.html
rename to test/runtime/samples/component-events-each/Widget.html
diff --git a/test/generator/samples/component-events-each/_config.js b/test/runtime/samples/component-events-each/_config.js
similarity index 100%
rename from test/generator/samples/component-events-each/_config.js
rename to test/runtime/samples/component-events-each/_config.js
diff --git a/test/generator/samples/component-events-each/main.html b/test/runtime/samples/component-events-each/main.html
similarity index 100%
rename from test/generator/samples/component-events-each/main.html
rename to test/runtime/samples/component-events-each/main.html
diff --git a/test/generator/samples/component-events/Widget.html b/test/runtime/samples/component-events/Widget.html
similarity index 100%
rename from test/generator/samples/component-events/Widget.html
rename to test/runtime/samples/component-events/Widget.html
diff --git a/test/generator/samples/component-events/_config.js b/test/runtime/samples/component-events/_config.js
similarity index 100%
rename from test/generator/samples/component-events/_config.js
rename to test/runtime/samples/component-events/_config.js
diff --git a/test/generator/samples/component-events/main.html b/test/runtime/samples/component-events/main.html
similarity index 100%
rename from test/generator/samples/component-events/main.html
rename to test/runtime/samples/component-events/main.html
diff --git a/test/generator/samples/component-not-void/Link.html b/test/runtime/samples/component-not-void/Link.html
similarity index 100%
rename from test/generator/samples/component-not-void/Link.html
rename to test/runtime/samples/component-not-void/Link.html
diff --git a/test/generator/samples/component-not-void/_config.js b/test/runtime/samples/component-not-void/_config.js
similarity index 100%
rename from test/generator/samples/component-not-void/_config.js
rename to test/runtime/samples/component-not-void/_config.js
diff --git a/test/generator/samples/component-not-void/main.html b/test/runtime/samples/component-not-void/main.html
similarity index 100%
rename from test/generator/samples/component-not-void/main.html
rename to test/runtime/samples/component-not-void/main.html
diff --git a/test/generator/samples/component-ref/Widget.html b/test/runtime/samples/component-ref/Widget.html
similarity index 100%
rename from test/generator/samples/component-ref/Widget.html
rename to test/runtime/samples/component-ref/Widget.html
diff --git a/test/generator/samples/component-ref/_config.js b/test/runtime/samples/component-ref/_config.js
similarity index 100%
rename from test/generator/samples/component-ref/_config.js
rename to test/runtime/samples/component-ref/_config.js
diff --git a/test/generator/samples/component-ref/main.html b/test/runtime/samples/component-ref/main.html
similarity index 100%
rename from test/generator/samples/component-ref/main.html
rename to test/runtime/samples/component-ref/main.html
diff --git a/test/generator/samples/component-yield-if/Widget.html b/test/runtime/samples/component-yield-if/Widget.html
similarity index 100%
rename from test/generator/samples/component-yield-if/Widget.html
rename to test/runtime/samples/component-yield-if/Widget.html
diff --git a/test/generator/samples/component-yield-if/_config.js b/test/runtime/samples/component-yield-if/_config.js
similarity index 100%
rename from test/generator/samples/component-yield-if/_config.js
rename to test/runtime/samples/component-yield-if/_config.js
diff --git a/test/generator/samples/component-yield-if/main.html b/test/runtime/samples/component-yield-if/main.html
similarity index 100%
rename from test/generator/samples/component-yield-if/main.html
rename to test/runtime/samples/component-yield-if/main.html
diff --git a/test/generator/samples/component-yield-multiple-in-each/Widget.html b/test/runtime/samples/component-yield-multiple-in-each/Widget.html
similarity index 100%
rename from test/generator/samples/component-yield-multiple-in-each/Widget.html
rename to test/runtime/samples/component-yield-multiple-in-each/Widget.html
diff --git a/test/generator/samples/component-yield-multiple-in-each/_config.js b/test/runtime/samples/component-yield-multiple-in-each/_config.js
similarity index 100%
rename from test/generator/samples/component-yield-multiple-in-each/_config.js
rename to test/runtime/samples/component-yield-multiple-in-each/_config.js
diff --git a/test/generator/samples/component-yield-multiple-in-each/main.html b/test/runtime/samples/component-yield-multiple-in-each/main.html
similarity index 100%
rename from test/generator/samples/component-yield-multiple-in-each/main.html
rename to test/runtime/samples/component-yield-multiple-in-each/main.html
diff --git a/test/generator/samples/component-yield-multiple-in-if/Widget.html b/test/runtime/samples/component-yield-multiple-in-if/Widget.html
similarity index 100%
rename from test/generator/samples/component-yield-multiple-in-if/Widget.html
rename to test/runtime/samples/component-yield-multiple-in-if/Widget.html
diff --git a/test/generator/samples/component-yield-multiple-in-if/_config.js b/test/runtime/samples/component-yield-multiple-in-if/_config.js
similarity index 100%
rename from test/generator/samples/component-yield-multiple-in-if/_config.js
rename to test/runtime/samples/component-yield-multiple-in-if/_config.js
diff --git a/test/generator/samples/component-yield-multiple-in-if/main.html b/test/runtime/samples/component-yield-multiple-in-if/main.html
similarity index 100%
rename from test/generator/samples/component-yield-multiple-in-if/main.html
rename to test/runtime/samples/component-yield-multiple-in-if/main.html
diff --git a/test/generator/samples/component-yield-parent/Widget.html b/test/runtime/samples/component-yield-parent/Widget.html
similarity index 100%
rename from test/generator/samples/component-yield-parent/Widget.html
rename to test/runtime/samples/component-yield-parent/Widget.html
diff --git a/test/generator/samples/component-yield-parent/_config.js b/test/runtime/samples/component-yield-parent/_config.js
similarity index 100%
rename from test/generator/samples/component-yield-parent/_config.js
rename to test/runtime/samples/component-yield-parent/_config.js
diff --git a/test/generator/samples/component-yield-parent/main.html b/test/runtime/samples/component-yield-parent/main.html
similarity index 100%
rename from test/generator/samples/component-yield-parent/main.html
rename to test/runtime/samples/component-yield-parent/main.html
diff --git a/test/generator/samples/component-yield/_config.js b/test/runtime/samples/component-yield/_config.js
similarity index 100%
rename from test/generator/samples/component-yield/_config.js
rename to test/runtime/samples/component-yield/_config.js
diff --git a/test/generator/samples/component-yield/main.html b/test/runtime/samples/component-yield/main.html
similarity index 100%
rename from test/generator/samples/component-yield/main.html
rename to test/runtime/samples/component-yield/main.html
diff --git a/test/generator/samples/component/Widget.html b/test/runtime/samples/component/Widget.html
similarity index 100%
rename from test/generator/samples/component/Widget.html
rename to test/runtime/samples/component/Widget.html
diff --git a/test/generator/samples/component/_config.js b/test/runtime/samples/component/_config.js
similarity index 100%
rename from test/generator/samples/component/_config.js
rename to test/runtime/samples/component/_config.js
diff --git a/test/generator/samples/component/main.html b/test/runtime/samples/component/main.html
similarity index 100%
rename from test/generator/samples/component/main.html
rename to test/runtime/samples/component/main.html
diff --git a/test/generator/samples/computed-function/_config.js b/test/runtime/samples/computed-function/_config.js
similarity index 100%
rename from test/generator/samples/computed-function/_config.js
rename to test/runtime/samples/computed-function/_config.js
diff --git a/test/generator/samples/computed-function/main.html b/test/runtime/samples/computed-function/main.html
similarity index 100%
rename from test/generator/samples/computed-function/main.html
rename to test/runtime/samples/computed-function/main.html
diff --git a/test/generator/samples/computed-values-default/_config.js b/test/runtime/samples/computed-values-default/_config.js
similarity index 100%
rename from test/generator/samples/computed-values-default/_config.js
rename to test/runtime/samples/computed-values-default/_config.js
diff --git a/test/generator/samples/computed-values-default/main.html b/test/runtime/samples/computed-values-default/main.html
similarity index 100%
rename from test/generator/samples/computed-values-default/main.html
rename to test/runtime/samples/computed-values-default/main.html
diff --git a/test/generator/samples/computed-values-function-dependency/_config.js b/test/runtime/samples/computed-values-function-dependency/_config.js
similarity index 100%
rename from test/generator/samples/computed-values-function-dependency/_config.js
rename to test/runtime/samples/computed-values-function-dependency/_config.js
diff --git a/test/generator/samples/computed-values-function-dependency/main.html b/test/runtime/samples/computed-values-function-dependency/main.html
similarity index 100%
rename from test/generator/samples/computed-values-function-dependency/main.html
rename to test/runtime/samples/computed-values-function-dependency/main.html
diff --git a/test/generator/samples/computed-values/_config.js b/test/runtime/samples/computed-values/_config.js
similarity index 100%
rename from test/generator/samples/computed-values/_config.js
rename to test/runtime/samples/computed-values/_config.js
diff --git a/test/generator/samples/computed-values/main.html b/test/runtime/samples/computed-values/main.html
similarity index 100%
rename from test/generator/samples/computed-values/main.html
rename to test/runtime/samples/computed-values/main.html
diff --git a/test/generator/samples/css-comments/_config.js b/test/runtime/samples/css-comments/_config.js
similarity index 100%
rename from test/generator/samples/css-comments/_config.js
rename to test/runtime/samples/css-comments/_config.js
diff --git a/test/generator/samples/css-comments/main.html b/test/runtime/samples/css-comments/main.html
similarity index 100%
rename from test/generator/samples/css-comments/main.html
rename to test/runtime/samples/css-comments/main.html
diff --git a/test/generator/samples/css-false/Widget.html b/test/runtime/samples/css-false/Widget.html
similarity index 100%
rename from test/generator/samples/css-false/Widget.html
rename to test/runtime/samples/css-false/Widget.html
diff --git a/test/generator/samples/css-false/_config.js b/test/runtime/samples/css-false/_config.js
similarity index 100%
rename from test/generator/samples/css-false/_config.js
rename to test/runtime/samples/css-false/_config.js
diff --git a/test/generator/samples/css-false/main.html b/test/runtime/samples/css-false/main.html
similarity index 100%
rename from test/generator/samples/css-false/main.html
rename to test/runtime/samples/css-false/main.html
diff --git a/test/generator/samples/css-space-in-attribute/Widget.html b/test/runtime/samples/css-space-in-attribute/Widget.html
similarity index 100%
rename from test/generator/samples/css-space-in-attribute/Widget.html
rename to test/runtime/samples/css-space-in-attribute/Widget.html
diff --git a/test/generator/samples/css-space-in-attribute/_config.js b/test/runtime/samples/css-space-in-attribute/_config.js
similarity index 100%
rename from test/generator/samples/css-space-in-attribute/_config.js
rename to test/runtime/samples/css-space-in-attribute/_config.js
diff --git a/test/generator/samples/css-space-in-attribute/main.html b/test/runtime/samples/css-space-in-attribute/main.html
similarity index 100%
rename from test/generator/samples/css-space-in-attribute/main.html
rename to test/runtime/samples/css-space-in-attribute/main.html
diff --git a/test/generator/samples/css/Widget.html b/test/runtime/samples/css/Widget.html
similarity index 100%
rename from test/generator/samples/css/Widget.html
rename to test/runtime/samples/css/Widget.html
diff --git a/test/generator/samples/css/_config.js b/test/runtime/samples/css/_config.js
similarity index 100%
rename from test/generator/samples/css/_config.js
rename to test/runtime/samples/css/_config.js
diff --git a/test/generator/samples/css/main.html b/test/runtime/samples/css/main.html
similarity index 100%
rename from test/generator/samples/css/main.html
rename to test/runtime/samples/css/main.html
diff --git a/test/generator/samples/custom-method/_config.js b/test/runtime/samples/custom-method/_config.js
similarity index 100%
rename from test/generator/samples/custom-method/_config.js
rename to test/runtime/samples/custom-method/_config.js
diff --git a/test/generator/samples/custom-method/main.html b/test/runtime/samples/custom-method/main.html
similarity index 100%
rename from test/generator/samples/custom-method/main.html
rename to test/runtime/samples/custom-method/main.html
diff --git a/test/generator/samples/deconflict-builtins/_config.js b/test/runtime/samples/deconflict-builtins/_config.js
similarity index 100%
rename from test/generator/samples/deconflict-builtins/_config.js
rename to test/runtime/samples/deconflict-builtins/_config.js
diff --git a/test/generator/samples/deconflict-builtins/get.js b/test/runtime/samples/deconflict-builtins/get.js
similarity index 100%
rename from test/generator/samples/deconflict-builtins/get.js
rename to test/runtime/samples/deconflict-builtins/get.js
diff --git a/test/generator/samples/deconflict-builtins/main.html b/test/runtime/samples/deconflict-builtins/main.html
similarity index 100%
rename from test/generator/samples/deconflict-builtins/main.html
rename to test/runtime/samples/deconflict-builtins/main.html
diff --git a/test/generator/samples/deconflict-contexts/_config.js b/test/runtime/samples/deconflict-contexts/_config.js
similarity index 100%
rename from test/generator/samples/deconflict-contexts/_config.js
rename to test/runtime/samples/deconflict-contexts/_config.js
diff --git a/test/generator/samples/deconflict-contexts/main.html b/test/runtime/samples/deconflict-contexts/main.html
similarity index 100%
rename from test/generator/samples/deconflict-contexts/main.html
rename to test/runtime/samples/deconflict-contexts/main.html
diff --git a/test/generator/samples/deconflict-non-helpers/_config.js b/test/runtime/samples/deconflict-non-helpers/_config.js
similarity index 100%
rename from test/generator/samples/deconflict-non-helpers/_config.js
rename to test/runtime/samples/deconflict-non-helpers/_config.js
diff --git a/test/generator/samples/deconflict-non-helpers/main.html b/test/runtime/samples/deconflict-non-helpers/main.html
similarity index 100%
rename from test/generator/samples/deconflict-non-helpers/main.html
rename to test/runtime/samples/deconflict-non-helpers/main.html
diff --git a/test/generator/samples/deconflict-non-helpers/module.js b/test/runtime/samples/deconflict-non-helpers/module.js
similarity index 100%
rename from test/generator/samples/deconflict-non-helpers/module.js
rename to test/runtime/samples/deconflict-non-helpers/module.js
diff --git a/test/generator/samples/deconflict-template-1/_config.js b/test/runtime/samples/deconflict-template-1/_config.js
similarity index 100%
rename from test/generator/samples/deconflict-template-1/_config.js
rename to test/runtime/samples/deconflict-template-1/_config.js
diff --git a/test/generator/samples/deconflict-template-1/main.html b/test/runtime/samples/deconflict-template-1/main.html
similarity index 100%
rename from test/generator/samples/deconflict-template-1/main.html
rename to test/runtime/samples/deconflict-template-1/main.html
diff --git a/test/generator/samples/deconflict-template-1/module.js b/test/runtime/samples/deconflict-template-1/module.js
similarity index 100%
rename from test/generator/samples/deconflict-template-1/module.js
rename to test/runtime/samples/deconflict-template-1/module.js
diff --git a/test/generator/samples/deconflict-template-2/_config.js b/test/runtime/samples/deconflict-template-2/_config.js
similarity index 100%
rename from test/generator/samples/deconflict-template-2/_config.js
rename to test/runtime/samples/deconflict-template-2/_config.js
diff --git a/test/generator/samples/deconflict-template-2/main.html b/test/runtime/samples/deconflict-template-2/main.html
similarity index 100%
rename from test/generator/samples/deconflict-template-2/main.html
rename to test/runtime/samples/deconflict-template-2/main.html
diff --git a/test/generator/samples/default-data-function/_config.js b/test/runtime/samples/default-data-function/_config.js
similarity index 100%
rename from test/generator/samples/default-data-function/_config.js
rename to test/runtime/samples/default-data-function/_config.js
diff --git a/test/generator/samples/default-data-function/main.html b/test/runtime/samples/default-data-function/main.html
similarity index 100%
rename from test/generator/samples/default-data-function/main.html
rename to test/runtime/samples/default-data-function/main.html
diff --git a/test/generator/samples/default-data-override/_config.js b/test/runtime/samples/default-data-override/_config.js
similarity index 100%
rename from test/generator/samples/default-data-override/_config.js
rename to test/runtime/samples/default-data-override/_config.js
diff --git a/test/generator/samples/default-data-override/main.html b/test/runtime/samples/default-data-override/main.html
similarity index 100%
rename from test/generator/samples/default-data-override/main.html
rename to test/runtime/samples/default-data-override/main.html
diff --git a/test/generator/samples/default-data/_config.js b/test/runtime/samples/default-data/_config.js
similarity index 100%
rename from test/generator/samples/default-data/_config.js
rename to test/runtime/samples/default-data/_config.js
diff --git a/test/generator/samples/default-data/main.html b/test/runtime/samples/default-data/main.html
similarity index 100%
rename from test/generator/samples/default-data/main.html
rename to test/runtime/samples/default-data/main.html
diff --git a/test/generator/samples/destructuring/_config.js b/test/runtime/samples/destructuring/_config.js
similarity index 100%
rename from test/generator/samples/destructuring/_config.js
rename to test/runtime/samples/destructuring/_config.js
diff --git a/test/generator/samples/destructuring/main.html b/test/runtime/samples/destructuring/main.html
similarity index 100%
rename from test/generator/samples/destructuring/main.html
rename to test/runtime/samples/destructuring/main.html
diff --git a/test/generator/samples/dev-warning-bad-observe-arguments/_config.js b/test/runtime/samples/dev-warning-bad-observe-arguments/_config.js
similarity index 100%
rename from test/generator/samples/dev-warning-bad-observe-arguments/_config.js
rename to test/runtime/samples/dev-warning-bad-observe-arguments/_config.js
diff --git a/test/generator/samples/dev-warning-bad-observe-arguments/main.html b/test/runtime/samples/dev-warning-bad-observe-arguments/main.html
similarity index 100%
rename from test/generator/samples/dev-warning-bad-observe-arguments/main.html
rename to test/runtime/samples/dev-warning-bad-observe-arguments/main.html
diff --git a/test/generator/samples/dev-warning-destroy-not-teardown/_config.js b/test/runtime/samples/dev-warning-destroy-not-teardown/_config.js
similarity index 100%
rename from test/generator/samples/dev-warning-destroy-not-teardown/_config.js
rename to test/runtime/samples/dev-warning-destroy-not-teardown/_config.js
diff --git a/test/generator/samples/dev-warning-destroy-not-teardown/main.html b/test/runtime/samples/dev-warning-destroy-not-teardown/main.html
similarity index 100%
rename from test/generator/samples/dev-warning-destroy-not-teardown/main.html
rename to test/runtime/samples/dev-warning-destroy-not-teardown/main.html
diff --git a/test/generator/samples/dev-warning-missing-data-binding/_config.js b/test/runtime/samples/dev-warning-missing-data-binding/_config.js
similarity index 100%
rename from test/generator/samples/dev-warning-missing-data-binding/_config.js
rename to test/runtime/samples/dev-warning-missing-data-binding/_config.js
diff --git a/test/generator/samples/dev-warning-missing-data-binding/main.html b/test/runtime/samples/dev-warning-missing-data-binding/main.html
similarity index 100%
rename from test/generator/samples/dev-warning-missing-data-binding/main.html
rename to test/runtime/samples/dev-warning-missing-data-binding/main.html
diff --git a/test/generator/samples/dev-warning-missing-data/_config.js b/test/runtime/samples/dev-warning-missing-data/_config.js
similarity index 100%
rename from test/generator/samples/dev-warning-missing-data/_config.js
rename to test/runtime/samples/dev-warning-missing-data/_config.js
diff --git a/test/generator/samples/dev-warning-missing-data/main.html b/test/runtime/samples/dev-warning-missing-data/main.html
similarity index 100%
rename from test/generator/samples/dev-warning-missing-data/main.html
rename to test/runtime/samples/dev-warning-missing-data/main.html
diff --git a/test/generator/samples/each-block-containing-if/_config.js b/test/runtime/samples/each-block-containing-if/_config.js
similarity index 100%
rename from test/generator/samples/each-block-containing-if/_config.js
rename to test/runtime/samples/each-block-containing-if/_config.js
diff --git a/test/generator/samples/each-block-containing-if/main.html b/test/runtime/samples/each-block-containing-if/main.html
similarity index 100%
rename from test/generator/samples/each-block-containing-if/main.html
rename to test/runtime/samples/each-block-containing-if/main.html
diff --git a/test/generator/samples/each-block-else/_config.js b/test/runtime/samples/each-block-else/_config.js
similarity index 100%
rename from test/generator/samples/each-block-else/_config.js
rename to test/runtime/samples/each-block-else/_config.js
diff --git a/test/generator/samples/each-block-else/main.html b/test/runtime/samples/each-block-else/main.html
similarity index 100%
rename from test/generator/samples/each-block-else/main.html
rename to test/runtime/samples/each-block-else/main.html
diff --git a/test/generator/samples/each-block-indexed/_config.js b/test/runtime/samples/each-block-indexed/_config.js
similarity index 100%
rename from test/generator/samples/each-block-indexed/_config.js
rename to test/runtime/samples/each-block-indexed/_config.js
diff --git a/test/generator/samples/each-block-indexed/main.html b/test/runtime/samples/each-block-indexed/main.html
similarity index 100%
rename from test/generator/samples/each-block-indexed/main.html
rename to test/runtime/samples/each-block-indexed/main.html
diff --git a/test/generator/samples/each-block-keyed/_config.js b/test/runtime/samples/each-block-keyed/_config.js
similarity index 100%
rename from test/generator/samples/each-block-keyed/_config.js
rename to test/runtime/samples/each-block-keyed/_config.js
diff --git a/test/generator/samples/each-block-keyed/main.html b/test/runtime/samples/each-block-keyed/main.html
similarity index 100%
rename from test/generator/samples/each-block-keyed/main.html
rename to test/runtime/samples/each-block-keyed/main.html
diff --git a/test/generator/samples/each-block-random-permute/_config.js b/test/runtime/samples/each-block-random-permute/_config.js
similarity index 100%
rename from test/generator/samples/each-block-random-permute/_config.js
rename to test/runtime/samples/each-block-random-permute/_config.js
diff --git a/test/generator/samples/each-block-random-permute/main.html b/test/runtime/samples/each-block-random-permute/main.html
similarity index 100%
rename from test/generator/samples/each-block-random-permute/main.html
rename to test/runtime/samples/each-block-random-permute/main.html
diff --git a/test/generator/samples/each-block-text-node/_config.js b/test/runtime/samples/each-block-text-node/_config.js
similarity index 100%
rename from test/generator/samples/each-block-text-node/_config.js
rename to test/runtime/samples/each-block-text-node/_config.js
diff --git a/test/generator/samples/each-block-text-node/main.html b/test/runtime/samples/each-block-text-node/main.html
similarity index 100%
rename from test/generator/samples/each-block-text-node/main.html
rename to test/runtime/samples/each-block-text-node/main.html
diff --git a/test/generator/samples/each-block/_config.js b/test/runtime/samples/each-block/_config.js
similarity index 100%
rename from test/generator/samples/each-block/_config.js
rename to test/runtime/samples/each-block/_config.js
diff --git a/test/generator/samples/each-block/main.html b/test/runtime/samples/each-block/main.html
similarity index 100%
rename from test/generator/samples/each-block/main.html
rename to test/runtime/samples/each-block/main.html
diff --git a/test/generator/samples/each-blocks-expression/_config.js b/test/runtime/samples/each-blocks-expression/_config.js
similarity index 100%
rename from test/generator/samples/each-blocks-expression/_config.js
rename to test/runtime/samples/each-blocks-expression/_config.js
diff --git a/test/generator/samples/each-blocks-expression/main.html b/test/runtime/samples/each-blocks-expression/main.html
similarity index 100%
rename from test/generator/samples/each-blocks-expression/main.html
rename to test/runtime/samples/each-blocks-expression/main.html
diff --git a/test/generator/samples/each-blocks-nested-b/_config.js b/test/runtime/samples/each-blocks-nested-b/_config.js
similarity index 100%
rename from test/generator/samples/each-blocks-nested-b/_config.js
rename to test/runtime/samples/each-blocks-nested-b/_config.js
diff --git a/test/generator/samples/each-blocks-nested-b/main.html b/test/runtime/samples/each-blocks-nested-b/main.html
similarity index 100%
rename from test/generator/samples/each-blocks-nested-b/main.html
rename to test/runtime/samples/each-blocks-nested-b/main.html
diff --git a/test/generator/samples/each-blocks-nested/_config.js b/test/runtime/samples/each-blocks-nested/_config.js
similarity index 100%
rename from test/generator/samples/each-blocks-nested/_config.js
rename to test/runtime/samples/each-blocks-nested/_config.js
diff --git a/test/generator/samples/each-blocks-nested/main.html b/test/runtime/samples/each-blocks-nested/main.html
similarity index 100%
rename from test/generator/samples/each-blocks-nested/main.html
rename to test/runtime/samples/each-blocks-nested/main.html
diff --git a/test/generator/samples/event-handler-custom-context/_config.js b/test/runtime/samples/event-handler-custom-context/_config.js
similarity index 100%
rename from test/generator/samples/event-handler-custom-context/_config.js
rename to test/runtime/samples/event-handler-custom-context/_config.js
diff --git a/test/generator/samples/event-handler-custom-context/main.html b/test/runtime/samples/event-handler-custom-context/main.html
similarity index 100%
rename from test/generator/samples/event-handler-custom-context/main.html
rename to test/runtime/samples/event-handler-custom-context/main.html
diff --git a/test/generator/samples/event-handler-custom-node-context/_config.js b/test/runtime/samples/event-handler-custom-node-context/_config.js
similarity index 100%
rename from test/generator/samples/event-handler-custom-node-context/_config.js
rename to test/runtime/samples/event-handler-custom-node-context/_config.js
diff --git a/test/generator/samples/event-handler-custom-node-context/main.html b/test/runtime/samples/event-handler-custom-node-context/main.html
similarity index 100%
rename from test/generator/samples/event-handler-custom-node-context/main.html
rename to test/runtime/samples/event-handler-custom-node-context/main.html
diff --git a/test/generator/samples/event-handler-custom/_config.js b/test/runtime/samples/event-handler-custom/_config.js
similarity index 100%
rename from test/generator/samples/event-handler-custom/_config.js
rename to test/runtime/samples/event-handler-custom/_config.js
diff --git a/test/generator/samples/event-handler-custom/main.html b/test/runtime/samples/event-handler-custom/main.html
similarity index 100%
rename from test/generator/samples/event-handler-custom/main.html
rename to test/runtime/samples/event-handler-custom/main.html
diff --git a/test/generator/samples/event-handler-event-methods/_config.js b/test/runtime/samples/event-handler-event-methods/_config.js
similarity index 100%
rename from test/generator/samples/event-handler-event-methods/_config.js
rename to test/runtime/samples/event-handler-event-methods/_config.js
diff --git a/test/generator/samples/event-handler-event-methods/main.html b/test/runtime/samples/event-handler-event-methods/main.html
similarity index 100%
rename from test/generator/samples/event-handler-event-methods/main.html
rename to test/runtime/samples/event-handler-event-methods/main.html
diff --git a/test/generator/samples/event-handler-removal/_config.js b/test/runtime/samples/event-handler-removal/_config.js
similarity index 100%
rename from test/generator/samples/event-handler-removal/_config.js
rename to test/runtime/samples/event-handler-removal/_config.js
diff --git a/test/generator/samples/event-handler-removal/main.html b/test/runtime/samples/event-handler-removal/main.html
similarity index 100%
rename from test/generator/samples/event-handler-removal/main.html
rename to test/runtime/samples/event-handler-removal/main.html
diff --git a/test/generator/samples/event-handler-this-methods/_config.js b/test/runtime/samples/event-handler-this-methods/_config.js
similarity index 100%
rename from test/generator/samples/event-handler-this-methods/_config.js
rename to test/runtime/samples/event-handler-this-methods/_config.js
diff --git a/test/generator/samples/event-handler-this-methods/main.html b/test/runtime/samples/event-handler-this-methods/main.html
similarity index 100%
rename from test/generator/samples/event-handler-this-methods/main.html
rename to test/runtime/samples/event-handler-this-methods/main.html
diff --git a/test/generator/samples/event-handler/_config.js b/test/runtime/samples/event-handler/_config.js
similarity index 100%
rename from test/generator/samples/event-handler/_config.js
rename to test/runtime/samples/event-handler/_config.js
diff --git a/test/generator/samples/event-handler/main.html b/test/runtime/samples/event-handler/main.html
similarity index 100%
rename from test/generator/samples/event-handler/main.html
rename to test/runtime/samples/event-handler/main.html
diff --git a/test/generator/samples/events-custom/_config.js b/test/runtime/samples/events-custom/_config.js
similarity index 100%
rename from test/generator/samples/events-custom/_config.js
rename to test/runtime/samples/events-custom/_config.js
diff --git a/test/generator/samples/events-custom/main.html b/test/runtime/samples/events-custom/main.html
similarity index 100%
rename from test/generator/samples/events-custom/main.html
rename to test/runtime/samples/events-custom/main.html
diff --git a/test/generator/samples/events-lifecycle/_config.js b/test/runtime/samples/events-lifecycle/_config.js
similarity index 100%
rename from test/generator/samples/events-lifecycle/_config.js
rename to test/runtime/samples/events-lifecycle/_config.js
diff --git a/test/generator/samples/events-lifecycle/main.html b/test/runtime/samples/events-lifecycle/main.html
similarity index 100%
rename from test/generator/samples/events-lifecycle/main.html
rename to test/runtime/samples/events-lifecycle/main.html
diff --git a/test/generator/samples/function-in-expression/_config.js b/test/runtime/samples/function-in-expression/_config.js
similarity index 100%
rename from test/generator/samples/function-in-expression/_config.js
rename to test/runtime/samples/function-in-expression/_config.js
diff --git a/test/generator/samples/function-in-expression/main.html b/test/runtime/samples/function-in-expression/main.html
similarity index 100%
rename from test/generator/samples/function-in-expression/main.html
rename to test/runtime/samples/function-in-expression/main.html
diff --git a/test/generator/samples/get-state/_config.js b/test/runtime/samples/get-state/_config.js
similarity index 100%
rename from test/generator/samples/get-state/_config.js
rename to test/runtime/samples/get-state/_config.js
diff --git a/test/generator/samples/get-state/main.html b/test/runtime/samples/get-state/main.html
similarity index 100%
rename from test/generator/samples/get-state/main.html
rename to test/runtime/samples/get-state/main.html
diff --git a/test/generator/samples/globals-accessible-directly/_config.js b/test/runtime/samples/globals-accessible-directly/_config.js
similarity index 100%
rename from test/generator/samples/globals-accessible-directly/_config.js
rename to test/runtime/samples/globals-accessible-directly/_config.js
diff --git a/test/generator/samples/globals-accessible-directly/main.html b/test/runtime/samples/globals-accessible-directly/main.html
similarity index 100%
rename from test/generator/samples/globals-accessible-directly/main.html
rename to test/runtime/samples/globals-accessible-directly/main.html
diff --git a/test/generator/samples/globals-not-dereferenced/_config.js b/test/runtime/samples/globals-not-dereferenced/_config.js
similarity index 100%
rename from test/generator/samples/globals-not-dereferenced/_config.js
rename to test/runtime/samples/globals-not-dereferenced/_config.js
diff --git a/test/generator/samples/globals-not-dereferenced/main.html b/test/runtime/samples/globals-not-dereferenced/main.html
similarity index 100%
rename from test/generator/samples/globals-not-dereferenced/main.html
rename to test/runtime/samples/globals-not-dereferenced/main.html
diff --git a/test/generator/samples/globals-shadowed-by-data/_config.js b/test/runtime/samples/globals-shadowed-by-data/_config.js
similarity index 100%
rename from test/generator/samples/globals-shadowed-by-data/_config.js
rename to test/runtime/samples/globals-shadowed-by-data/_config.js
diff --git a/test/generator/samples/globals-shadowed-by-data/main.html b/test/runtime/samples/globals-shadowed-by-data/main.html
similarity index 100%
rename from test/generator/samples/globals-shadowed-by-data/main.html
rename to test/runtime/samples/globals-shadowed-by-data/main.html
diff --git a/test/generator/samples/globals-shadowed-by-helpers/_config.js b/test/runtime/samples/globals-shadowed-by-helpers/_config.js
similarity index 100%
rename from test/generator/samples/globals-shadowed-by-helpers/_config.js
rename to test/runtime/samples/globals-shadowed-by-helpers/_config.js
diff --git a/test/generator/samples/globals-shadowed-by-helpers/main.html b/test/runtime/samples/globals-shadowed-by-helpers/main.html
similarity index 100%
rename from test/generator/samples/globals-shadowed-by-helpers/main.html
rename to test/runtime/samples/globals-shadowed-by-helpers/main.html
diff --git a/test/generator/samples/hello-world/_config.js b/test/runtime/samples/hello-world/_config.js
similarity index 100%
rename from test/generator/samples/hello-world/_config.js
rename to test/runtime/samples/hello-world/_config.js
diff --git a/test/generator/samples/hello-world/main.html b/test/runtime/samples/hello-world/main.html
similarity index 100%
rename from test/generator/samples/hello-world/main.html
rename to test/runtime/samples/hello-world/main.html
diff --git a/test/generator/samples/helpers/_config.js b/test/runtime/samples/helpers/_config.js
similarity index 100%
rename from test/generator/samples/helpers/_config.js
rename to test/runtime/samples/helpers/_config.js
diff --git a/test/generator/samples/helpers/main.html b/test/runtime/samples/helpers/main.html
similarity index 100%
rename from test/generator/samples/helpers/main.html
rename to test/runtime/samples/helpers/main.html
diff --git a/test/generator/samples/if-block-else/_config.js b/test/runtime/samples/if-block-else/_config.js
similarity index 100%
rename from test/generator/samples/if-block-else/_config.js
rename to test/runtime/samples/if-block-else/_config.js
diff --git a/test/generator/samples/if-block-else/main.html b/test/runtime/samples/if-block-else/main.html
similarity index 100%
rename from test/generator/samples/if-block-else/main.html
rename to test/runtime/samples/if-block-else/main.html
diff --git a/test/generator/samples/if-block-elseif-text/_config.js b/test/runtime/samples/if-block-elseif-text/_config.js
similarity index 100%
rename from test/generator/samples/if-block-elseif-text/_config.js
rename to test/runtime/samples/if-block-elseif-text/_config.js
diff --git a/test/generator/samples/if-block-elseif-text/main.html b/test/runtime/samples/if-block-elseif-text/main.html
similarity index 100%
rename from test/generator/samples/if-block-elseif-text/main.html
rename to test/runtime/samples/if-block-elseif-text/main.html
diff --git a/test/generator/samples/if-block-elseif/_config.js b/test/runtime/samples/if-block-elseif/_config.js
similarity index 100%
rename from test/generator/samples/if-block-elseif/_config.js
rename to test/runtime/samples/if-block-elseif/_config.js
diff --git a/test/generator/samples/if-block-elseif/main.html b/test/runtime/samples/if-block-elseif/main.html
similarity index 100%
rename from test/generator/samples/if-block-elseif/main.html
rename to test/runtime/samples/if-block-elseif/main.html
diff --git a/test/generator/samples/if-block-expression/_config.js b/test/runtime/samples/if-block-expression/_config.js
similarity index 100%
rename from test/generator/samples/if-block-expression/_config.js
rename to test/runtime/samples/if-block-expression/_config.js
diff --git a/test/generator/samples/if-block-expression/main.html b/test/runtime/samples/if-block-expression/main.html
similarity index 100%
rename from test/generator/samples/if-block-expression/main.html
rename to test/runtime/samples/if-block-expression/main.html
diff --git a/test/generator/samples/if-block-widget/Widget.html b/test/runtime/samples/if-block-widget/Widget.html
similarity index 100%
rename from test/generator/samples/if-block-widget/Widget.html
rename to test/runtime/samples/if-block-widget/Widget.html
diff --git a/test/generator/samples/if-block-widget/_config.js b/test/runtime/samples/if-block-widget/_config.js
similarity index 100%
rename from test/generator/samples/if-block-widget/_config.js
rename to test/runtime/samples/if-block-widget/_config.js
diff --git a/test/generator/samples/if-block-widget/main.html b/test/runtime/samples/if-block-widget/main.html
similarity index 100%
rename from test/generator/samples/if-block-widget/main.html
rename to test/runtime/samples/if-block-widget/main.html
diff --git a/test/generator/samples/if-block/_config.js b/test/runtime/samples/if-block/_config.js
similarity index 100%
rename from test/generator/samples/if-block/_config.js
rename to test/runtime/samples/if-block/_config.js
diff --git a/test/generator/samples/if-block/main.html b/test/runtime/samples/if-block/main.html
similarity index 100%
rename from test/generator/samples/if-block/main.html
rename to test/runtime/samples/if-block/main.html
diff --git a/test/generator/samples/imported-renamed-components/ComponentOne.html b/test/runtime/samples/imported-renamed-components/ComponentOne.html
similarity index 100%
rename from test/generator/samples/imported-renamed-components/ComponentOne.html
rename to test/runtime/samples/imported-renamed-components/ComponentOne.html
diff --git a/test/generator/samples/imported-renamed-components/ComponentTwo.html b/test/runtime/samples/imported-renamed-components/ComponentTwo.html
similarity index 100%
rename from test/generator/samples/imported-renamed-components/ComponentTwo.html
rename to test/runtime/samples/imported-renamed-components/ComponentTwo.html
diff --git a/test/generator/samples/imported-renamed-components/_config.js b/test/runtime/samples/imported-renamed-components/_config.js
similarity index 100%
rename from test/generator/samples/imported-renamed-components/_config.js
rename to test/runtime/samples/imported-renamed-components/_config.js
diff --git a/test/generator/samples/imported-renamed-components/main.html b/test/runtime/samples/imported-renamed-components/main.html
similarity index 100%
rename from test/generator/samples/imported-renamed-components/main.html
rename to test/runtime/samples/imported-renamed-components/main.html
diff --git a/test/generator/samples/inline-expressions/_config.js b/test/runtime/samples/inline-expressions/_config.js
similarity index 100%
rename from test/generator/samples/inline-expressions/_config.js
rename to test/runtime/samples/inline-expressions/_config.js
diff --git a/test/generator/samples/inline-expressions/main.html b/test/runtime/samples/inline-expressions/main.html
similarity index 100%
rename from test/generator/samples/inline-expressions/main.html
rename to test/runtime/samples/inline-expressions/main.html
diff --git a/test/generator/samples/input-list/_config.js b/test/runtime/samples/input-list/_config.js
similarity index 100%
rename from test/generator/samples/input-list/_config.js
rename to test/runtime/samples/input-list/_config.js
diff --git a/test/generator/samples/input-list/main.html b/test/runtime/samples/input-list/main.html
similarity index 100%
rename from test/generator/samples/input-list/main.html
rename to test/runtime/samples/input-list/main.html
diff --git a/test/generator/samples/lifecycle-events/_config.js b/test/runtime/samples/lifecycle-events/_config.js
similarity index 100%
rename from test/generator/samples/lifecycle-events/_config.js
rename to test/runtime/samples/lifecycle-events/_config.js
diff --git a/test/generator/samples/lifecycle-events/main.html b/test/runtime/samples/lifecycle-events/main.html
similarity index 100%
rename from test/generator/samples/lifecycle-events/main.html
rename to test/runtime/samples/lifecycle-events/main.html
diff --git a/test/generator/samples/names-deconflicted-nested/_config.js b/test/runtime/samples/names-deconflicted-nested/_config.js
similarity index 100%
rename from test/generator/samples/names-deconflicted-nested/_config.js
rename to test/runtime/samples/names-deconflicted-nested/_config.js
diff --git a/test/generator/samples/names-deconflicted-nested/main.html b/test/runtime/samples/names-deconflicted-nested/main.html
similarity index 100%
rename from test/generator/samples/names-deconflicted-nested/main.html
rename to test/runtime/samples/names-deconflicted-nested/main.html
diff --git a/test/generator/samples/names-deconflicted/Widget.html b/test/runtime/samples/names-deconflicted/Widget.html
similarity index 100%
rename from test/generator/samples/names-deconflicted/Widget.html
rename to test/runtime/samples/names-deconflicted/Widget.html
diff --git a/test/generator/samples/names-deconflicted/_config.js b/test/runtime/samples/names-deconflicted/_config.js
similarity index 100%
rename from test/generator/samples/names-deconflicted/_config.js
rename to test/runtime/samples/names-deconflicted/_config.js
diff --git a/test/generator/samples/names-deconflicted/main.html b/test/runtime/samples/names-deconflicted/main.html
similarity index 100%
rename from test/generator/samples/names-deconflicted/main.html
rename to test/runtime/samples/names-deconflicted/main.html
diff --git a/test/generator/samples/nbsp/_config.js b/test/runtime/samples/nbsp/_config.js
similarity index 100%
rename from test/generator/samples/nbsp/_config.js
rename to test/runtime/samples/nbsp/_config.js
diff --git a/test/generator/samples/nbsp/main.html b/test/runtime/samples/nbsp/main.html
similarity index 100%
rename from test/generator/samples/nbsp/main.html
rename to test/runtime/samples/nbsp/main.html
diff --git a/test/generator/samples/observe-component-ignores-irrelevant-changes/Foo.html b/test/runtime/samples/observe-component-ignores-irrelevant-changes/Foo.html
similarity index 100%
rename from test/generator/samples/observe-component-ignores-irrelevant-changes/Foo.html
rename to test/runtime/samples/observe-component-ignores-irrelevant-changes/Foo.html
diff --git a/test/generator/samples/observe-component-ignores-irrelevant-changes/_config.js b/test/runtime/samples/observe-component-ignores-irrelevant-changes/_config.js
similarity index 100%
rename from test/generator/samples/observe-component-ignores-irrelevant-changes/_config.js
rename to test/runtime/samples/observe-component-ignores-irrelevant-changes/_config.js
diff --git a/test/generator/samples/observe-component-ignores-irrelevant-changes/main.html b/test/runtime/samples/observe-component-ignores-irrelevant-changes/main.html
similarity index 100%
rename from test/generator/samples/observe-component-ignores-irrelevant-changes/main.html
rename to test/runtime/samples/observe-component-ignores-irrelevant-changes/main.html
diff --git a/test/generator/samples/observe-prevents-loop/_config.js b/test/runtime/samples/observe-prevents-loop/_config.js
similarity index 100%
rename from test/generator/samples/observe-prevents-loop/_config.js
rename to test/runtime/samples/observe-prevents-loop/_config.js
diff --git a/test/generator/samples/observe-prevents-loop/main.html b/test/runtime/samples/observe-prevents-loop/main.html
similarity index 100%
rename from test/generator/samples/observe-prevents-loop/main.html
rename to test/runtime/samples/observe-prevents-loop/main.html
diff --git a/test/generator/samples/onrender-chain/Item.html b/test/runtime/samples/onrender-chain/Item.html
similarity index 100%
rename from test/generator/samples/onrender-chain/Item.html
rename to test/runtime/samples/onrender-chain/Item.html
diff --git a/test/generator/samples/onrender-chain/List.html b/test/runtime/samples/onrender-chain/List.html
similarity index 100%
rename from test/generator/samples/onrender-chain/List.html
rename to test/runtime/samples/onrender-chain/List.html
diff --git a/test/generator/samples/onrender-chain/_config.js b/test/runtime/samples/onrender-chain/_config.js
similarity index 100%
rename from test/generator/samples/onrender-chain/_config.js
rename to test/runtime/samples/onrender-chain/_config.js
diff --git a/test/generator/samples/onrender-chain/main.html b/test/runtime/samples/onrender-chain/main.html
similarity index 100%
rename from test/generator/samples/onrender-chain/main.html
rename to test/runtime/samples/onrender-chain/main.html
diff --git a/test/generator/samples/onrender-fires-when-ready-nested/ParentWidget.html b/test/runtime/samples/onrender-fires-when-ready-nested/ParentWidget.html
similarity index 100%
rename from test/generator/samples/onrender-fires-when-ready-nested/ParentWidget.html
rename to test/runtime/samples/onrender-fires-when-ready-nested/ParentWidget.html
diff --git a/test/generator/samples/onrender-fires-when-ready-nested/Widget.html b/test/runtime/samples/onrender-fires-when-ready-nested/Widget.html
similarity index 100%
rename from test/generator/samples/onrender-fires-when-ready-nested/Widget.html
rename to test/runtime/samples/onrender-fires-when-ready-nested/Widget.html
diff --git a/test/generator/samples/onrender-fires-when-ready-nested/_config.js b/test/runtime/samples/onrender-fires-when-ready-nested/_config.js
similarity index 100%
rename from test/generator/samples/onrender-fires-when-ready-nested/_config.js
rename to test/runtime/samples/onrender-fires-when-ready-nested/_config.js
diff --git a/test/generator/samples/onrender-fires-when-ready-nested/main.html b/test/runtime/samples/onrender-fires-when-ready-nested/main.html
similarity index 100%
rename from test/generator/samples/onrender-fires-when-ready-nested/main.html
rename to test/runtime/samples/onrender-fires-when-ready-nested/main.html
diff --git a/test/generator/samples/onrender-fires-when-ready/Widget.html b/test/runtime/samples/onrender-fires-when-ready/Widget.html
similarity index 100%
rename from test/generator/samples/onrender-fires-when-ready/Widget.html
rename to test/runtime/samples/onrender-fires-when-ready/Widget.html
diff --git a/test/generator/samples/onrender-fires-when-ready/_config.js b/test/runtime/samples/onrender-fires-when-ready/_config.js
similarity index 100%
rename from test/generator/samples/onrender-fires-when-ready/_config.js
rename to test/runtime/samples/onrender-fires-when-ready/_config.js
diff --git a/test/generator/samples/onrender-fires-when-ready/main.html b/test/runtime/samples/onrender-fires-when-ready/main.html
similarity index 100%
rename from test/generator/samples/onrender-fires-when-ready/main.html
rename to test/runtime/samples/onrender-fires-when-ready/main.html
diff --git a/test/generator/samples/pass-no-options/_config.js b/test/runtime/samples/pass-no-options/_config.js
similarity index 100%
rename from test/generator/samples/pass-no-options/_config.js
rename to test/runtime/samples/pass-no-options/_config.js
diff --git a/test/generator/samples/pass-no-options/main.html b/test/runtime/samples/pass-no-options/main.html
similarity index 100%
rename from test/generator/samples/pass-no-options/main.html
rename to test/runtime/samples/pass-no-options/main.html
diff --git a/test/generator/samples/raw-mustaches-preserved/_config.js b/test/runtime/samples/raw-mustaches-preserved/_config.js
similarity index 100%
rename from test/generator/samples/raw-mustaches-preserved/_config.js
rename to test/runtime/samples/raw-mustaches-preserved/_config.js
diff --git a/test/generator/samples/raw-mustaches-preserved/main.html b/test/runtime/samples/raw-mustaches-preserved/main.html
similarity index 100%
rename from test/generator/samples/raw-mustaches-preserved/main.html
rename to test/runtime/samples/raw-mustaches-preserved/main.html
diff --git a/test/generator/samples/raw-mustaches/_config.js b/test/runtime/samples/raw-mustaches/_config.js
similarity index 100%
rename from test/generator/samples/raw-mustaches/_config.js
rename to test/runtime/samples/raw-mustaches/_config.js
diff --git a/test/generator/samples/raw-mustaches/main.html b/test/runtime/samples/raw-mustaches/main.html
similarity index 100%
rename from test/generator/samples/raw-mustaches/main.html
rename to test/runtime/samples/raw-mustaches/main.html
diff --git a/test/generator/samples/refs-unset/_config.js b/test/runtime/samples/refs-unset/_config.js
similarity index 100%
rename from test/generator/samples/refs-unset/_config.js
rename to test/runtime/samples/refs-unset/_config.js
diff --git a/test/generator/samples/refs-unset/main.html b/test/runtime/samples/refs-unset/main.html
similarity index 100%
rename from test/generator/samples/refs-unset/main.html
rename to test/runtime/samples/refs-unset/main.html
diff --git a/test/generator/samples/refs/_config.js b/test/runtime/samples/refs/_config.js
similarity index 100%
rename from test/generator/samples/refs/_config.js
rename to test/runtime/samples/refs/_config.js
diff --git a/test/generator/samples/refs/main.html b/test/runtime/samples/refs/main.html
similarity index 100%
rename from test/generator/samples/refs/main.html
rename to test/runtime/samples/refs/main.html
diff --git a/test/generator/samples/select-one-way-bind/_config.js b/test/runtime/samples/select-one-way-bind/_config.js
similarity index 100%
rename from test/generator/samples/select-one-way-bind/_config.js
rename to test/runtime/samples/select-one-way-bind/_config.js
diff --git a/test/generator/samples/select-one-way-bind/main.html b/test/runtime/samples/select-one-way-bind/main.html
similarity index 100%
rename from test/generator/samples/select-one-way-bind/main.html
rename to test/runtime/samples/select-one-way-bind/main.html
diff --git a/test/generator/samples/select/_config.js b/test/runtime/samples/select/_config.js
similarity index 100%
rename from test/generator/samples/select/_config.js
rename to test/runtime/samples/select/_config.js
diff --git a/test/generator/samples/select/main.html b/test/runtime/samples/select/main.html
similarity index 100%
rename from test/generator/samples/select/main.html
rename to test/runtime/samples/select/main.html
diff --git a/test/generator/samples/self-reference-tree/_config.js b/test/runtime/samples/self-reference-tree/_config.js
similarity index 100%
rename from test/generator/samples/self-reference-tree/_config.js
rename to test/runtime/samples/self-reference-tree/_config.js
diff --git a/test/generator/samples/self-reference-tree/main.html b/test/runtime/samples/self-reference-tree/main.html
similarity index 100%
rename from test/generator/samples/self-reference-tree/main.html
rename to test/runtime/samples/self-reference-tree/main.html
diff --git a/test/generator/samples/self-reference/_config.js b/test/runtime/samples/self-reference/_config.js
similarity index 100%
rename from test/generator/samples/self-reference/_config.js
rename to test/runtime/samples/self-reference/_config.js
diff --git a/test/generator/samples/self-reference/main.html b/test/runtime/samples/self-reference/main.html
similarity index 100%
rename from test/generator/samples/self-reference/main.html
rename to test/runtime/samples/self-reference/main.html
diff --git a/test/generator/samples/set-in-observe-dedupes-renders/Widget.html b/test/runtime/samples/set-in-observe-dedupes-renders/Widget.html
similarity index 100%
rename from test/generator/samples/set-in-observe-dedupes-renders/Widget.html
rename to test/runtime/samples/set-in-observe-dedupes-renders/Widget.html
diff --git a/test/generator/samples/set-in-observe-dedupes-renders/_config.js b/test/runtime/samples/set-in-observe-dedupes-renders/_config.js
similarity index 100%
rename from test/generator/samples/set-in-observe-dedupes-renders/_config.js
rename to test/runtime/samples/set-in-observe-dedupes-renders/_config.js
diff --git a/test/generator/samples/set-in-observe-dedupes-renders/main.html b/test/runtime/samples/set-in-observe-dedupes-renders/main.html
similarity index 100%
rename from test/generator/samples/set-in-observe-dedupes-renders/main.html
rename to test/runtime/samples/set-in-observe-dedupes-renders/main.html
diff --git a/test/generator/samples/set-in-observe/_config.js b/test/runtime/samples/set-in-observe/_config.js
similarity index 100%
rename from test/generator/samples/set-in-observe/_config.js
rename to test/runtime/samples/set-in-observe/_config.js
diff --git a/test/generator/samples/set-in-observe/main.html b/test/runtime/samples/set-in-observe/main.html
similarity index 100%
rename from test/generator/samples/set-in-observe/main.html
rename to test/runtime/samples/set-in-observe/main.html
diff --git a/test/generator/samples/set-in-onrender/_config.js b/test/runtime/samples/set-in-onrender/_config.js
similarity index 100%
rename from test/generator/samples/set-in-onrender/_config.js
rename to test/runtime/samples/set-in-onrender/_config.js
diff --git a/test/generator/samples/set-in-onrender/main.html b/test/runtime/samples/set-in-onrender/main.html
similarity index 100%
rename from test/generator/samples/set-in-onrender/main.html
rename to test/runtime/samples/set-in-onrender/main.html
diff --git a/test/generator/samples/set-prevents-loop/Foo.html b/test/runtime/samples/set-prevents-loop/Foo.html
similarity index 100%
rename from test/generator/samples/set-prevents-loop/Foo.html
rename to test/runtime/samples/set-prevents-loop/Foo.html
diff --git a/test/generator/samples/set-prevents-loop/_config.js b/test/runtime/samples/set-prevents-loop/_config.js
similarity index 100%
rename from test/generator/samples/set-prevents-loop/_config.js
rename to test/runtime/samples/set-prevents-loop/_config.js
diff --git a/test/generator/samples/set-prevents-loop/main.html b/test/runtime/samples/set-prevents-loop/main.html
similarity index 100%
rename from test/generator/samples/set-prevents-loop/main.html
rename to test/runtime/samples/set-prevents-loop/main.html
diff --git a/test/generator/samples/single-static-element/_config.js b/test/runtime/samples/single-static-element/_config.js
similarity index 100%
rename from test/generator/samples/single-static-element/_config.js
rename to test/runtime/samples/single-static-element/_config.js
diff --git a/test/generator/samples/single-static-element/main.html b/test/runtime/samples/single-static-element/main.html
similarity index 100%
rename from test/generator/samples/single-static-element/main.html
rename to test/runtime/samples/single-static-element/main.html
diff --git a/test/generator/samples/single-text-node/_config.js b/test/runtime/samples/single-text-node/_config.js
similarity index 100%
rename from test/generator/samples/single-text-node/_config.js
rename to test/runtime/samples/single-text-node/_config.js
diff --git a/test/generator/samples/single-text-node/main.html b/test/runtime/samples/single-text-node/main.html
similarity index 100%
rename from test/generator/samples/single-text-node/main.html
rename to test/runtime/samples/single-text-node/main.html
diff --git a/test/generator/samples/svg-attributes/_config.js b/test/runtime/samples/svg-attributes/_config.js
similarity index 100%
rename from test/generator/samples/svg-attributes/_config.js
rename to test/runtime/samples/svg-attributes/_config.js
diff --git a/test/generator/samples/svg-attributes/main.html b/test/runtime/samples/svg-attributes/main.html
similarity index 100%
rename from test/generator/samples/svg-attributes/main.html
rename to test/runtime/samples/svg-attributes/main.html
diff --git a/test/generator/samples/svg-child-component-declared-namespace-shorthand/Rect.html b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html
similarity index 100%
rename from test/generator/samples/svg-child-component-declared-namespace-shorthand/Rect.html
rename to test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html
diff --git a/test/generator/samples/svg-child-component-declared-namespace-shorthand/_config.js b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/_config.js
similarity index 100%
rename from test/generator/samples/svg-child-component-declared-namespace-shorthand/_config.js
rename to test/runtime/samples/svg-child-component-declared-namespace-shorthand/_config.js
diff --git a/test/generator/samples/svg-child-component-declared-namespace-shorthand/main.html b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/main.html
similarity index 100%
rename from test/generator/samples/svg-child-component-declared-namespace-shorthand/main.html
rename to test/runtime/samples/svg-child-component-declared-namespace-shorthand/main.html
diff --git a/test/generator/samples/svg-child-component-declared-namespace/Rect.html b/test/runtime/samples/svg-child-component-declared-namespace/Rect.html
similarity index 100%
rename from test/generator/samples/svg-child-component-declared-namespace/Rect.html
rename to test/runtime/samples/svg-child-component-declared-namespace/Rect.html
diff --git a/test/generator/samples/svg-child-component-declared-namespace/_config.js b/test/runtime/samples/svg-child-component-declared-namespace/_config.js
similarity index 100%
rename from test/generator/samples/svg-child-component-declared-namespace/_config.js
rename to test/runtime/samples/svg-child-component-declared-namespace/_config.js
diff --git a/test/generator/samples/svg-child-component-declared-namespace/main.html b/test/runtime/samples/svg-child-component-declared-namespace/main.html
similarity index 100%
rename from test/generator/samples/svg-child-component-declared-namespace/main.html
rename to test/runtime/samples/svg-child-component-declared-namespace/main.html
diff --git a/test/generator/samples/svg-class/_config.js b/test/runtime/samples/svg-class/_config.js
similarity index 100%
rename from test/generator/samples/svg-class/_config.js
rename to test/runtime/samples/svg-class/_config.js
diff --git a/test/generator/samples/svg-class/main.html b/test/runtime/samples/svg-class/main.html
similarity index 100%
rename from test/generator/samples/svg-class/main.html
rename to test/runtime/samples/svg-class/main.html
diff --git a/test/generator/samples/svg-each-block-namespace/_config.js b/test/runtime/samples/svg-each-block-namespace/_config.js
similarity index 100%
rename from test/generator/samples/svg-each-block-namespace/_config.js
rename to test/runtime/samples/svg-each-block-namespace/_config.js
diff --git a/test/generator/samples/svg-each-block-namespace/main.html b/test/runtime/samples/svg-each-block-namespace/main.html
similarity index 100%
rename from test/generator/samples/svg-each-block-namespace/main.html
rename to test/runtime/samples/svg-each-block-namespace/main.html
diff --git a/test/generator/samples/svg-multiple/_config.js b/test/runtime/samples/svg-multiple/_config.js
similarity index 100%
rename from test/generator/samples/svg-multiple/_config.js
rename to test/runtime/samples/svg-multiple/_config.js
diff --git a/test/generator/samples/svg-multiple/main.html b/test/runtime/samples/svg-multiple/main.html
similarity index 100%
rename from test/generator/samples/svg-multiple/main.html
rename to test/runtime/samples/svg-multiple/main.html
diff --git a/test/generator/samples/svg-no-whitespace/_config.js b/test/runtime/samples/svg-no-whitespace/_config.js
similarity index 100%
rename from test/generator/samples/svg-no-whitespace/_config.js
rename to test/runtime/samples/svg-no-whitespace/_config.js
diff --git a/test/generator/samples/svg-no-whitespace/main.html b/test/runtime/samples/svg-no-whitespace/main.html
similarity index 100%
rename from test/generator/samples/svg-no-whitespace/main.html
rename to test/runtime/samples/svg-no-whitespace/main.html
diff --git a/test/generator/samples/svg-xlink/_config.js b/test/runtime/samples/svg-xlink/_config.js
similarity index 100%
rename from test/generator/samples/svg-xlink/_config.js
rename to test/runtime/samples/svg-xlink/_config.js
diff --git a/test/generator/samples/svg-xlink/main.html b/test/runtime/samples/svg-xlink/main.html
similarity index 100%
rename from test/generator/samples/svg-xlink/main.html
rename to test/runtime/samples/svg-xlink/main.html
diff --git a/test/generator/samples/svg-xmlns/_config.js b/test/runtime/samples/svg-xmlns/_config.js
similarity index 100%
rename from test/generator/samples/svg-xmlns/_config.js
rename to test/runtime/samples/svg-xmlns/_config.js
diff --git a/test/generator/samples/svg-xmlns/main.html b/test/runtime/samples/svg-xmlns/main.html
similarity index 100%
rename from test/generator/samples/svg-xmlns/main.html
rename to test/runtime/samples/svg-xmlns/main.html
diff --git a/test/generator/samples/svg/_config.js b/test/runtime/samples/svg/_config.js
similarity index 100%
rename from test/generator/samples/svg/_config.js
rename to test/runtime/samples/svg/_config.js
diff --git a/test/generator/samples/svg/main.html b/test/runtime/samples/svg/main.html
similarity index 100%
rename from test/generator/samples/svg/main.html
rename to test/runtime/samples/svg/main.html
diff --git a/test/generator/samples/window-binding-resize/_config.js b/test/runtime/samples/window-binding-resize/_config.js
similarity index 100%
rename from test/generator/samples/window-binding-resize/_config.js
rename to test/runtime/samples/window-binding-resize/_config.js
diff --git a/test/generator/samples/window-binding-resize/main.html b/test/runtime/samples/window-binding-resize/main.html
similarity index 100%
rename from test/generator/samples/window-binding-resize/main.html
rename to test/runtime/samples/window-binding-resize/main.html
diff --git a/test/generator/samples/window-event/_config.js b/test/runtime/samples/window-event/_config.js
similarity index 100%
rename from test/generator/samples/window-event/_config.js
rename to test/runtime/samples/window-event/_config.js
diff --git a/test/generator/samples/window-event/main.html b/test/runtime/samples/window-event/main.html
similarity index 100%
rename from test/generator/samples/window-event/main.html
rename to test/runtime/samples/window-event/main.html
diff --git a/test/server-side-rendering/index.js b/test/server-side-rendering/index.js
index 8fa6f74e0a..d9ac917e54 100644
--- a/test/server-side-rendering/index.js
+++ b/test/server-side-rendering/index.js
@@ -81,10 +81,10 @@ describe( 'ssr', () => {
 	});
 
 	// duplicate client-side tests, as far as possible
-	fs.readdirSync( 'test/generator/samples' ).forEach( dir => {
+	fs.readdirSync( 'test/runtime/samples' ).forEach( dir => {
 		if ( dir[0] === '.' ) return;
 
-		const config = loadConfig( `./generator/samples/${dir}/_config.js` );
+		const config = loadConfig( `./runtime/samples/${dir}/_config.js` );
 
 		if ( config.solo && process.env.CI ) {
 			throw new Error( 'Forgot to remove `solo: true` from test' );
@@ -96,7 +96,7 @@ describe( 'ssr', () => {
 			let compiled;
 
 			try {
-				const source = fs.readFileSync( `test/generator/samples/${dir}/main.html`, 'utf-8' );
+				const source = fs.readFileSync( `test/runtime/samples/${dir}/main.html`, 'utf-8' );
 				compiled = svelte.compile( source, { generate: 'ssr' });
 			} catch ( err ) {
 				if ( config.compileError ) {
@@ -107,7 +107,7 @@ describe( 'ssr', () => {
 				}
 			}
 
-			const component = require( `../generator/samples/${dir}/main.html` );
+			const component = require( `../runtime/samples/${dir}/main.html` );
 			let html;
 
 			try {