diff --git a/Alloy/alloy.js b/Alloy/alloy.js
index 1dd6c929f..ca46d3748 100755
--- a/Alloy/alloy.js
+++ b/Alloy/alloy.js
@@ -4,18 +4,19 @@
  * See LICENSE for more information on licensing.
  */
 var program = require('commander'),
-	logger = require('./logger'),
 	os = require('os'),
-	U = require('./utils'),
 	colors = require('colors'),
 	_ = require('lodash'),
-	pkginfo = require('pkginfo')(module, 'version'),
 	path = require('path'),
-	fs = require('fs'),
-	CONST = require('./common/constants');
+	fs = require('fs');
 
-// patch to remove the warning in node >=0.8
-path.existsSync = fs.existsSync || path.existsSync;
+const {
+	logger,
+	platforms,
+	utils: U
+} = require('alloy-utils');
+
+require('pkginfo')(module, 'version');
 
 // avoid io issues on Windows in nodejs 0.10.X: https://github.com/joyent/node/issues/3584
 if (process.env.ALLOY_TESTS && /^win/i.test(os.platform())) {
@@ -98,8 +99,8 @@ if (program.args.length === 0) {
 	process.exit(0);
 }
 
-if (program.platform && !_.includes(CONST.PLATFORM_FOLDERS_ALLOY, program.platform)) {
-	U.die('Invalid platform "' + program.platform + '" specified, must be [' + CONST.PLATFORM_FOLDERS_ALLOY.join(',') + ']');
+if (program.platform && !_.includes(platforms.constants.PLATFORM_FOLDERS_ALLOY, program.platform)) {
+	U.die('Invalid platform "' + program.platform + '" specified, must be [' + platforms.constants.PLATFORM_FOLDERS_ALLOY.join(',') + ']');
 }
 
 // Validate the given command
@@ -134,7 +135,7 @@ function getCommands() {
 	try {
 		var commandsPath = path.join(__dirname, 'commands');
 		return _.filter(fs.readdirSync(commandsPath), function(file) {
-			return path.existsSync(path.join(commandsPath, file, 'index.js'));
+			return fs.existsSync(path.join(commandsPath, file, 'index.js'));
 		});
 	} catch (e) {
 		U.die('Error getting command list', e);
diff --git a/Alloy/builtins/string.js b/Alloy/builtins/string.js
index 0bbde84e9..b69127b44 100755
--- a/Alloy/builtins/string.js
+++ b/Alloy/builtins/string.js
@@ -64,10 +64,7 @@ exports.lcfirst = function (text) {
  * @param {String} amount Amount to format.
  * @return {String} Amount formatted as a currency value.
  */
-exports.formatCurrency = !(OS_MOBILEWEB) ? String.formatCurrency : function (amount) {
-	var num = isNaN(amount) || amount === '' || amount === null ? 0.00 : amount;
-	return '$' + parseFloat(num).toFixed(2);
-};
+exports.formatCurrency = String.formatCurrency;
 
 
 /**
diff --git a/Alloy/commands/compile/BuildLog.js b/Alloy/commands/compile/BuildLog.js
deleted file mode 100644
index 6210ead2e..000000000
--- a/Alloy/commands/compile/BuildLog.js
+++ /dev/null
@@ -1,59 +0,0 @@
-var fs = require('fs-extra'),
-	chmodr = require('chmodr'),
-	path = require('path'),
-	CONST = require('../../common/constants'),
-	logger = require('../../logger');
-
-var dir, file, projectPath;
-
-function BuildLog(_projectPath) {
-	// make/reference singleton instance
-	if (BuildLog.instance) {
-		return BuildLog.instance;
-	}
-	BuildLog.instance = this;
-
-	// set "private" variables
-	projectPath = _projectPath;
-	dir = path.join(projectPath, CONST.DIR.BUILD);
-	file = path.join(dir, 'build.json');
-
-	// expose data object
-	this.isNew = true;
-	this.data = {};
-
-	// make sure the alloy build folder exists
-	if (!fs.existsSync(dir)) {
-		fs.mkdirpSync(dir);
-		chmodr.sync(dir, 0755);
-	}
-
-	// load it up
-	this.read();
-}
-
-BuildLog.prototype.read = function() {
-	if (!fs.existsSync(file)) {
-		this.isNew = true;
-		this.data = {};
-	} else {
-		this.isNew = false;
-		try {
-			this.data = JSON.parse(fs.readFileSync(file, 'utf8'));
-		} catch (e) {
-			logger.warn('Build log at "' + path.relative(projectPath, file) +
-				'" is corrupt, creating a new one...');
-			this.data = {};
-		}
-	}
-};
-
-BuildLog.prototype.write = function() {
-	try {
-		fs.writeFileSync(file, JSON.stringify(this.data));
-	} catch (e) {
-		logger.warn('Unable to write build log to "' + path.relative(projectPath, file) + '"');
-	}
-};
-
-module.exports = BuildLog;
diff --git a/Alloy/commands/compile/CompilerMakeFile.js b/Alloy/commands/compile/CompilerMakeFile.js
index c2fd9f8d7..43ff67e51 100755
--- a/Alloy/commands/compile/CompilerMakeFile.js
+++ b/Alloy/commands/compile/CompilerMakeFile.js
@@ -1,5 +1,6 @@
-var logger = require('../../logger'),
-	colors = require('colors');
+var colors = require('colors');
+
+const { logger } = require('alloy-utils');
 
 function CompilerMakeFile() {
 	var handlers = {};
diff --git a/Alloy/commands/compile/Orphanage.js b/Alloy/commands/compile/Orphanage.js
index 0db007e83..9ed68a54e 100644
--- a/Alloy/commands/compile/Orphanage.js
+++ b/Alloy/commands/compile/Orphanage.js
@@ -6,12 +6,15 @@
 var fs = require('fs-extra'),
 	walkSync = require('walk-sync'),
 	path = require('path'),
-	platforms = require('../../../platforms/index'),
-	logger = require('../../logger'),
-	CONST = require('../../common/constants'),
-	U = require('../../utils'),
 	_ = require('lodash');
 
+const {
+	constants: CONST,
+	logger,
+	platforms,
+	utils: U
+} = require('alloy-utils');
+
 var ALLOY_ROOT = path.join(__dirname, '..', '..');
 
 var dirs, platform, titaniumFolder, theme, adapters;
diff --git a/Alloy/commands/compile/ast/builtins-plugin.js b/Alloy/commands/compile/ast/builtins-plugin.js
deleted file mode 100644
index de5fc4ab1..000000000
--- a/Alloy/commands/compile/ast/builtins-plugin.js
+++ /dev/null
@@ -1,91 +0,0 @@
-var path = require('path'),
-	fs = require('fs'),
-	_ = require('lodash'),
-	logger = require('../../../logger'),
-	U = require('../../../utils');
-
-var EXCLUDE = ['backbone', 'CFG', 'underscore'];
-var BUILTINS_PATH = path.join(__dirname, '..', '..', '..', 'builtins');
-var loaded = [];
-
-function appendExtension(file, extension) {
-	extension = '.' + extension;
-	file = U.trim(file);
-
-	var len = extension.length;
-	if (file.substring(file.length - extension.length) !== extension) {
-		return file + extension;
-	} else {
-		return file;
-	}
-}
-
-function loadBuiltin(source, name, dest) {
-	if (!path.existsSync(source)) {
-		return;
-	}
-
-	logger.debug('  - [' + name + '] --> "' + dest + '"');
-	U.copyFileSync(source, dest);
-	loaded = _.union(loaded, [name]);
-}
-
-function loadMomentLanguages(config) {
-	// retrieve the languages of the project
-	var i18nPath = path.join(config.dir.project, 'i18n');
-	if (fs.existsSync(i18nPath)) {
-		var languages = _.filter(fs.readdirSync(i18nPath), function(file) {
-			return fs.statSync(path.join(i18nPath, file)).isDirectory();
-		});
-
-		// filter the momentjs translation files that match one of these languages
-		var availableI18nPath = path.join(BUILTINS_PATH, 'moment', 'lang');
-		var fileNames = _.filter(fs.readdirSync(availableI18nPath), function(file) {
-			return _.indexOf(languages, file.substr(0, 2)) !== -1;
-		});
-
-		// import these files
-		_.each(fileNames, function(file) {
-			var source = path.join(BUILTINS_PATH, 'moment', 'lang', file);
-			var dest = path.join(config.dir.resources, 'alloy', 'moment', 'lang', file);
-			loadBuiltin(source, file, dest);
-		});
-	}
-}
-
-module.exports = function (_ref) {
-	var types = _ref.types;
-	var rx = /^(\/?alloy)\/(.+)$/;
-
-	return {
-		visitor: {
-			CallExpression: function(p) {
-				var theString = p.node.arguments[0],
-					match;
-				if (p.node.callee.name === 'require' &&         // Is this a require call?
-					theString && types.isStringLiteral(theString) && // Is the 1st param a literal string?
-					(match = theString.value.match(rx)) !== null &&  // Is it an alloy module?
-					!_.includes(EXCLUDE, match[2]) &&                // Make sure it's not excluded.
-					!_.includes(loaded, match[2])                    // Make sure we didn't find it already
-				) {
-					// Make sure it hasn't already been copied to Resources
-					var name = appendExtension(match[2], 'js');
-					if (fs.existsSync(path.join(this.opts.dir.resources, match[1], name))) {
-						return;
-					}
-
-					// make sure the builtin exists
-					var source = path.join(BUILTINS_PATH, name);
-					var dest = path.join(this.opts.dir.resources, 'alloy', name);
-					loadBuiltin(source, name, dest);
-
-					if ('moment.js' === name) {
-						// if momentjs is required in the project, also load the
-						// localizations which may be used
-						loadMomentLanguages(this.opts);
-					}
-				}
-			}
-		}
-	};
-};
diff --git a/Alloy/commands/compile/ast/controller.js b/Alloy/commands/compile/ast/controller.js
deleted file mode 100644
index 82af33902..000000000
--- a/Alloy/commands/compile/ast/controller.js
+++ /dev/null
@@ -1,96 +0,0 @@
-var U = require('../../../utils'),
-	babylon = require('@babel/parser'),
-	types = require('@babel/types'),
-	generate = require('@babel/generator').default,
-	{ default: traverse, Hub, NodePath } = require('@babel/traverse');
-
-var isBaseControllerExportExpression = types.buildMatchMemberExpression('exports.baseController');
-
-const GENCODE_OPTIONS = {
-	retainLines: true
-};
-
-exports.processController = function(code, file) {
-	var baseController = '',
-		moduleCodes = '',
-		newCode = '',
-		exportSpecifiers = [];
-
-	try {
-		var ast = babylon.parse(code, { sourceFilename: file, sourceType: 'unambiguous' });
-
-		const hub = new Hub();
-		hub.buildError = function (node, message, Error) {
-			const loc = node && node.loc;
-			const err = new Error(message);
-
-			if (loc) {
-				err.loc = loc.start;
-			}
-
-			return err;
-		};
-		const path = NodePath.get({
-			hub: hub,
-			parent: ast,
-			container: ast,
-			key: 'program'
-		}).setContext();
-		traverse(ast, {
-			enter: function(path) {
-				if (types.isAssignmentExpression(path.node) && isBaseControllerExportExpression(path.node.left)) {
-					// what's equivalent of print_to_string()? I replaced with simple value property assuming it's a string literal
-					baseController = '\'' + path.node.right.value + '\'';
-				}
-			},
-
-			ImportDeclaration: function(path) {
-				moduleCodes += generate(path.node, GENCODE_OPTIONS).code;
-				path.remove();
-			},
-
-			ExportNamedDeclaration: function(path) {
-				var node = path.node;
-				var specifiers = node.specifiers;
-				if (specifiers && specifiers.length !== 0) {
-					specifiers.forEach(function (specifier) {
-						if (specifier.local && specifier.local.name) {
-							exportSpecifiers.push(specifier.local.name);
-						}
-					});
-				}
-				moduleCodes += generate(node, GENCODE_OPTIONS).code;
-				path.remove();
-			}
-		}, path.scope);
-
-		if (exportSpecifiers.length > 0) {
-			traverse(ast, {
-				enter: function(path) {
-					var node = path.node,
-						name;
-					if (node.type === 'VariableDeclaration') {
-						name = node.declarations[0].id.name;
-					} else if (node.type === 'FunctionDeclaration' || node.type === 'ClassDeclaration') {
-						name = node.id.name;
-					}
-
-					if (exportSpecifiers.indexOf(name) !== -1) {
-						moduleCodes += generate(node, GENCODE_OPTIONS).code;
-						path.remove();
-					}
-				}
-			});
-		}
-
-		newCode = generate(ast, GENCODE_OPTIONS).code;
-	} catch (e) {
-		U.dieWithCodeFrame('Error generating AST for "' + file + '". Unexpected token at line ' + e.loc.line + ' column ' + e.loc.column, e.loc, code);
-	}
-
-	return {
-		es6mods: moduleCodes,
-		base: baseController,
-		code: newCode
-	};
-};
diff --git a/Alloy/commands/compile/ast/optimizer-plugin.js b/Alloy/commands/compile/ast/optimizer-plugin.js
deleted file mode 100644
index 34d6248c4..000000000
--- a/Alloy/commands/compile/ast/optimizer-plugin.js
+++ /dev/null
@@ -1,71 +0,0 @@
-var CONST = require('../../../common/constants'),
-	_ = require('lodash'),
-	path = require('path'),
-	fs = require('fs');
-
-// Walk tree transformer changing (Ti|Titanium).Platform.(osname|name)
-// into static strings where possible. This will allow the following
-// compression step to reduce the code further.
-module.exports = function (_ref) {
-	var types = _ref.types;
-
-	var isTiPlatform = types.buildMatchMemberExpression('Ti.Platform');
-	var isTitaniumPlatform = types.buildMatchMemberExpression('Titanium.Platform');
-
-	return {
-		pre: function(state) {
-			var config = this.opts || {};
-			config.deploytype = config.deploytype || 'development';
-
-			// create list of platform and deploy type defines
-			var defines = {};
-			_.each(CONST.DEPLOY_TYPES, function(d) {
-				defines[d.key] = config.deploytype === d.value;
-			});
-			_.each(CONST.DIST_TYPES, function(d) {
-				defines[d.key] = _.includes(d.value, config.target);
-			});
-			_.each(CONST.PLATFORMS, function(p) {
-				defines['OS_' + p.toUpperCase()] = config.platform === p;
-			});
-			this.defines = defines;
-
-			// make sure the platform require includes
-			var platformString = config.platform.toLowerCase();
-			var platformPath = path.join(__dirname, '..', '..', '..', '..', 'platforms', platformString, 'index');
-			if (!fs.existsSync(platformPath + '.js')) {
-				this.platform = {name: undefined, osname: undefined };
-			} else {
-				// create, transform, and validate the platform object
-				this.platform = require(platformPath);
-				if (!_.isString(this.platform.name)) { this.platform.name = undefined; }
-				if (!_.isString(this.platform.osname)) { this.platform.osname = undefined; }
-			}
-		},
-		visitor: {
-			MemberExpression: function(path, state) {
-				// console.log(JSON.stringify(path.node));
-				var name = '';
-				if (types.isStringLiteral(path.node.property)) {
-					name = path.node.property.value;
-				} else if (types.isIdentifier(path.node.property)) {
-					name = path.node.property.name;
-				} else {
-					return;
-				}
-
-				if ((name === 'name' || name === 'osname') && this.platform[name]) {
-					if (isTiPlatform(path.node.object) || isTitaniumPlatform(path.node.object)) {
-						path.replaceWith(types.stringLiteral(this.platform[name]));
-					}
-				}
-			},
-			Identifier: function(path) {
-				if (this.defines.hasOwnProperty(path.node.name) &&
-					(path.parent.type !== 'VariableDeclarator' || path.node.name !== path.parent.id.name)) {
-					path.replaceWith(types.booleanLiteral(this.defines[path.node.name]));
-				}
-			}
-		}
-	};
-};
diff --git a/Alloy/commands/compile/compilerUtils.js b/Alloy/commands/compile/compilerUtils.js
deleted file mode 100755
index cf5e757a0..000000000
--- a/Alloy/commands/compile/compilerUtils.js
+++ /dev/null
@@ -1,1033 +0,0 @@
-var U = require('../../utils'),
-	colors = require('colors'),
-	path = require('path'),
-	os = require('os'),
-	fs = require('fs-extra'),
-	walkSync = require('walk-sync'),
-	chmodr = require('chmodr'),
-	jsonlint = require('jsonlint'),
-	logger = require('../../logger'),
-	astController = require('./ast/controller'),
-	_ = require('lodash'),
-	styler = require('./styler'),
-	XMLSerializer = require('xmldom').XMLSerializer,
-	CONST = require('../../common/constants');
-
-///////////////////////////////////////
-////////// private variables //////////
-///////////////////////////////////////
-var alloyRoot = path.join(__dirname, '..', '..'),
-	platformsDir = path.join(alloyRoot, '..', 'platforms'),
-	alloyUniqueIdPrefix = '__alloyId',
-	alloyUniqueIdCounter = 0,
-	JSON_NULL = JSON.parse('null'),
-	compilerConfig;
-
-///////////////////////////////
-////////// constants //////////
-///////////////////////////////
-var RESERVED_ATTRIBUTES = [
-		'platform',
-		'formFactor',
-		'if',
-		CONST.BIND_COLLECTION,
-		CONST.BIND_WHERE,
-		CONST.AUTOSTYLE_PROPERTY,
-		'ns',
-		'method',
-		'module'
-	],
-	RESERVED_ATTRIBUTES_REQ_INC = [
-		'platform',
-		'type',
-		'src',
-		'formFactor',
-		'if',
-		CONST.BIND_COLLECTION,
-		CONST.BIND_WHERE,
-		CONST.AUTOSTYLE_PROPERTY,
-		'ns',
-		'method',
-		'module'
-	],
-	RESERVED_EVENT_REGEX =  new RegExp(`^(?:(${CONST.PLATFORMS.join('|')}):)?on([A-Z].+)`);
-
-// load CONDITION_MAP with platforms
-exports.CONDITION_MAP = {
-	handheld: {
-		runtime: '!Alloy.isTablet'
-	},
-	tablet: {
-		runtime: 'Alloy.isTablet'
-	}
-};
-_.each(CONST.PLATFORMS, function(p) {
-	exports.CONDITION_MAP[p] = require(path.join(platformsDir, p, 'index'))['condition'];
-});
-
-exports.bindingsMap = {};
-exports.destroyCode = '';
-exports.postCode = '';
-exports.models = [];
-exports.dataFunctionNames = {};
-
-//////////////////////////////////////
-////////// public interface //////////
-//////////////////////////////////////
-exports.getCompilerConfig = function() {
-	return compilerConfig;
-};
-
-exports.generateVarName = function(id, name) {
-	if (_.includes(CONST.JS_RESERVED_ALL, id)) {
-		U.die([
-			'Invalid ID "' + id + '" for <' + name + '>.',
-			'Can\'t use reserved Javascript words as IDs.',
-			'Reserved words: [' + CONST.JS_RESERVED_ALL.sort().join(',') + ']'
-		]);
-	}
-	return '$.__views["' + id + '"]';
-};
-
-exports.generateUniqueId = function() {
-	return alloyUniqueIdPrefix + alloyUniqueIdCounter++;
-};
-
-exports.getNodeFullname = function(node) {
-	var name = node.nodeName,
-		ns = node.getAttribute('ns') || CONST.IMPLICIT_NAMESPACES[name] || CONST.NAMESPACE_DEFAULT,
-		fullname = ns + '.' + name;
-
-	return fullname;
-};
-
-exports.isNodeForCurrentPlatform = function(node) {
-	var isForCurrentPlatform =  !node.hasAttribute('platform') || !compilerConfig || !compilerConfig.alloyConfig;
-	_.each(node.getAttribute('platform').split(','), function(p) {
-		// need to account for multiple platforms and negation, such as
-		// platform=ios,android   or   platform=!ios   or   platform="android,!mobileweb"
-		p = p.trim();
-		if (p === compilerConfig.alloyConfig.platform || (p.indexOf('!') === 0 && p.slice(1) !== compilerConfig.alloyConfig.platform)) {
-			isForCurrentPlatform = true;
-		}
-	});
-	return isForCurrentPlatform;
-};
-exports.getParserArgs = function(node, state, opts) {
-	state = state || {};
-	opts = opts || {};
-
-	var defaultId = opts.defaultId || undefined,
-		doSetId = opts.doSetId === false ? false : true,
-		name = node.nodeName,
-		ns = node.getAttribute('ns') || CONST.IMPLICIT_NAMESPACES[name] || CONST.NAMESPACE_DEFAULT,
-		fullname = (ns && ns.length) ? (ns + '.' + name) : name,
-		id = node.getAttribute('id') || defaultId || exports.generateUniqueId(),
-		platform = node.getAttribute('platform'),
-		formFactor = node.getAttribute('formFactor'),
-		tssIf = node.getAttribute('if'),
-		platformObj;
-
-	// make sure we're not reusing the default ID for the first top level element
-	if (id === exports.currentDefaultId &&
-		(node.parentNode && node.parentNode.nodeName !== 'Alloy') &&
-		!node.__idWarningHandled) {
-		logger.warn([
-			'<' + name + '> at line ' + node.lineNumber +
-			' is using this view\'s default ID "' + id + '". ' +
-			'Only a top-level element in a view should use the default ID'
-		]);
-		node.__idWarningHandled = true;
-	}
-
-	// handle binding arguments
-	var bindObj = {};
-	bindObj[CONST.BIND_COLLECTION] = node.getAttribute(CONST.BIND_COLLECTION);
-	bindObj[CONST.BIND_WHERE] = node.getAttribute(CONST.BIND_WHERE);
-	bindObj[CONST.BIND_TRANSFORM] = node.getAttribute(CONST.BIND_TRANSFORM);
-	bindObj[CONST.BIND_FUNCTION] = node.getAttribute(CONST.BIND_FUNCTION);
-
-	// cleanup namespaces and nodes
-	ns = ns.replace(/^Titanium\./, 'Ti.');
-	if (doSetId && !_.includes(CONST.MODEL_ELEMENTS, fullname)) {
-		node.setAttribute('id', id);
-	}
-
-	// process the platform attribute
-	if (platform) {
-		platformObj = {};
-		_.each((platform).split(','), function(p) {
-			var matches = U.trim(p).match(/^(\!{0,1})(.+)/);
-			if (matches !== null) {
-				var negate = matches[1];
-				var name = matches[2];
-				if (_.includes(CONST.PLATFORMS, name)) {
-					if (negate === '!') {
-						_.each(_.without(CONST.PLATFORMS, name), function(n) {
-							platformObj[n] = true;
-						});
-					} else {
-						platformObj[name] = true;
-					}
-					return;
-				}
-			}
-			U.die('Invalid platform type found: ' + p);
-		});
-	}
-
-	// get create arguments and events from attributes
-	var createArgs = {},
-		events = [];
-	var attrs = _.includes(['Alloy.Require'], fullname) ?
-		RESERVED_ATTRIBUTES_REQ_INC :
-		RESERVED_ATTRIBUTES;
-
-	// determine whether to autoStyle this component
-	// 1. autoStyle attribute
-	// 2. autoStyle from <Alloy>
-	// 3. autoStyle from config.json
-	var autoStyle = (function() {
-		var prop = CONST.AUTOSTYLE_PROPERTY;
-		if (node.hasAttribute(prop)) {
-			return node.getAttribute(prop) === 'true';
-		} else {
-			return exports[prop];
-		}
-	})();
-
-	// TODO: Add the apiName until TIMOB-12553 is resolved
-	if (autoStyle) {
-		createArgs[CONST.APINAME_PROPERTY] = fullname;
-	}
-
-	_.each(node.attributes, function(attr) {
-		var attrName = attr.nodeName;
-		if (_.includes(attrs, attrName)) { return; }
-		var matches = attrName.match(RESERVED_EVENT_REGEX);
-		if (matches !== null && exports.isNodeForCurrentPlatform(node) && !_.includes(CONST.SPECIAL_PROPERTY_NAMES, attrName)) {
-			if (matches[1] && compilerConfig.alloyConfig.platform !== matches[1]) {
-				return;
-			}
-			events.push({
-				name: U.lcfirst(matches[2]),
-				value: node.getAttribute(attrName)
-			});
-		} else {
-			var theValue = node.getAttribute(attrName);
-
-			// find platform specific attributes
-			var attributeParts = attrName.split(':');
-			if ( attributeParts.length === 2 && _.includes(CONST.PLATFORMS, attributeParts[0])) {
-				// if this attribute is for this platform, create it without namespace.
-				if ( attributeParts[0] === compilerConfig.alloyConfig.platform ) {
-					attrName = attributeParts[1];
-				} else {
-					return;
-				}
-			}	
-
-			if (/(^|\+)\s*(?:(?:Ti|Titanium|Alloy.Globals|Alloy.CFG|\$.args)\.|L\(.+\)\s*$)/.test(theValue)) {
-				var match = theValue.match(/^\s*L\([^'"]+\)\s*$/);
-				if (match !== null) {
-					theValue = theValue.replace(/\(/g, '("').replace(/\)/g, '")');
-				}
-				theValue = styler.STYLE_EXPR_PREFIX + theValue;
-			}
-
-			if (attrName === 'class') {
-				if (autoStyle) {
-					createArgs[CONST.CLASS_PROPERTY] = theValue.split(/\s+/) || [];
-				}
-			} else {
-				if (theValue === 'true') {
-					theValue = true;
-				} else if (theValue === 'false') {
-					theValue = false;
-				} else {
-					var n = parseInt(theValue);
-					if (!isNaN(n) && String(n) === theValue.trim()) {
-						theValue = n;
-					} else {
-						n = parseFloat(theValue);
-						if (!isNaN(n) && String(n) === theValue.trim()) {
-							theValue = n;
-						}
-					}
-				}
-				_.set(createArgs, attrName, theValue );
-			}
-		}
-	});
-
-	if (autoStyle && !createArgs[CONST.CLASS_PROPERTY]) {
-		createArgs[CONST.CLASS_PROPERTY] = [];
-	}
-
-	return _.extend({
-		ns: ns,
-		name: name,
-		id: id,
-		fullname: fullname,
-		formFactor: node.getAttribute('formFactor'),
-		symbol: exports.generateVarName(id, name),
-		classes: node.getAttribute('class').split(' ') || [],
-		tssIf: node.getAttribute('if').split(',') || [],
-		parent: state.parent || {},
-		platform: platformObj,
-		createArgs: createArgs,
-		events: events
-	}, bindObj);
-};
-
-exports.generateNodeExtended = function(node, state, newState) {
-	return exports.generateNode(node, _.extend(_.clone(state), newState));
-};
-
-exports.generateNode = function(node, state, defaultId, isTopLevel, isModelOrCollection) {
-	if (node.nodeType != 1) return '';
-	if (!exports.isNodeForCurrentPlatform(node)) {
-		return '';
-	}
-
-	var args = exports.getParserArgs(node, state, { defaultId: defaultId }),
-		codeTemplate = 'if (<%= condition %>) {\n<%= content %>}\n',
-		code = {
-			content: '',
-			pre: ''
-		};
-
-	// Check for platform specific considerations
-	var conditionType = compilerConfig && compilerConfig.alloyConfig && compilerConfig.alloyConfig.platform ? 'compile' : 'runtime';
-	if (args.platform) {
-		var conditionArray = [];
-		_.each(args.platform, function(v, k) {
-			conditionArray.push(exports.CONDITION_MAP[k][conditionType]);
-		});
-
-		code.condition = '(' + conditionArray.join(' || ') + ')';
-	}
-
-	//Add form factor condition, if application form-factor specific runtime check
-	if (args.formFactor && exports.CONDITION_MAP[args.formFactor]) {
-		var check = exports.CONDITION_MAP[args.formFactor].runtime;
-		code.condition = (code.condition) ? code.condition += ' && ' + check : check;
-	}
-
-	// ALOY-871: add the if condition check
-	args.tssIf = _.compact(args.tssIf);
-	if (args.tssIf.length > 0) {
-		if (code.condition) {
-			code.condition += (' && (' + args.tssIf.join(' || ') + ')');
-		} else {
-			code.condition = args.tssIf.join(' || ');
-		}
-	}
-
-	// pass relevant conditional information in state
-	if (code.condition) {
-		if (state.condition) {
-			state.condition += '&&' + code.condition;
-		} else {
-			state.condition = code.condition;
-		}
-	}
-
-	// Determine which parser to use for this node
-	var parsersDir = path.join(alloyRoot, 'commands', 'compile', 'parsers');
-	var parserRequire = 'default';
-	if (_.includes(fs.readdirSync(parsersDir), args.fullname + '.js')) {
-		parserRequire = args.fullname + '.js';
-	}
-
-	// Execute the appropriate tag parser and append code
-	var isLocal = state.local;
-	// [ALOY-787] keeping track of widget id
-	var widgetId = state.widgetId;
-	state = require('./parsers/' + parserRequire).parse(node, state) || { parent: {} };
-	code.content += state.code;
-	state.widgetId = widgetId;
-
-	// Use local variable if given
-	if (isLocal && state.parent) { args.symbol = state.parent.symbol || args.symbol; }
-
-	// Use manually given args.symbol if present
-	if (state.args) { args.symbol = state.args.symbol || args.symbol; }
-
-	// add to list of top level views, if its top level
-	if (isTopLevel) {
-		if (state.isProxyProperty) {
-			delete state.isProxyProperty;
-			code.content += state.parent.symbol + ' && $.addProxyProperty("' + state.propertyName +
-				'", ' + state.parent.symbol + ');\n';
-		} else {
-			code.content += args.symbol + ' && $.addTopLevelView(' + args.symbol + ');\n';
-		}
-	}
-
-	// handle any model/collection code
-	if (state.modelCode) {
-		code.pre += state.modelCode;
-		delete state.modelCode;
-	}
-
-	// handle any events from markup
-	if (args.events && args.events.length > 0 &&
-		!_.includes(CONST.SKIP_EVENT_HANDLING, args.fullname) &&
-		!state.isViewTemplate) {
-		// determine which function name to use for event handling:
-		// * addEventListener() for Titanium proxies
-		// * on() for everything else (controllers, models, collections)
-		var eventFunc = /^Alloy\.(?:Collection|Model|Require|Widget)/.test(args.fullname) ?
-			'on' : 'addEventListener';
-
-		_.each(args.events, function(ev) {
-			var eventObj = {
-					obj: isModelOrCollection ? state.args.symbol : args.symbol,
-					ev: ev.name,
-					cb: ev.value,
-					escapedCb: ev.value.replace(/'/g, "\\'"),
-					func: eventFunc
-				},
-				postCode;
-
-			if (_.includes(['Alloy.Widget', 'Alloy.Require'], args.fullname)) {
-				eventObj.obj = state.controller;
-			}
-
-			// create templates for immediate and deferred event handler creation
-			var theDefer = _.template("__defers['<%= obj %>!<%= ev %>!<%= escapedCb %>']")(eventObj);
-			var theEvent;
-			if (eventFunc === 'addEventListener') {
-				theEvent = _.template("$.addListener(<%= obj %>,'<%= ev %>',<%= cb %>)")(eventObj);
-			} else {
-				theEvent = _.template("<%= obj %>.<%= func %>('<%= ev %>',<%= cb %>)")(eventObj);
-			}
-			var deferTemplate = theDefer + ' && ' + theEvent + ';';
-			var immediateTemplate;
-			if (/[\.\[]/.test(eventObj.cb)) {
-				immediateTemplate = 'try{' + theEvent + ';}catch(e){' + theDefer + '=true;}';
-			} else {
-				immediateTemplate = '<%= cb %>?' + theEvent + ':' + theDefer + '=true;';
-			}
-
-			// add the generated code to the view code and post-controller code respectively
-			code.content += _.template(immediateTemplate)(eventObj);
-			postCode = _.template(deferTemplate)(eventObj);
-			exports.postCode += state.condition ? _.template(codeTemplate)({
-				condition: state.condition,
-				content: postCode
-			}) : postCode;
-		});
-	}
-
-	// Continue parsing if necessary
-	if (state.parent) {
-		var states = _.isArray(state.parent) ? state.parent : [state.parent];
-		_.each(states, function(p) {
-			var parent = p.node;
-			if (!parent) { return; }
-			for (var i = 0, l = parent.childNodes.length; i < l; i++) {
-				var newState = _.defaults({ parent: p }, state);
-				if (node.hasAttribute('formFactor') || state.parentFormFactor) {
-					// propagate the form factor down through the hierarchy
-					newState.parentFormFactor = (node.getAttribute('formFactor') || state.parentFormFactor);
-				}
-				code.content += exports.generateNode(parent.childNodes.item(i), newState);
-			}
-		});
-	}
-
-	if (!isModelOrCollection) {
-		return code.condition ? _.template(codeTemplate)(code) : code.content;
-	} else {
-		return {
-			content: code.condition ? _.template(codeTemplate)(code) : code.content,
-			pre: code.condition ? _.template(codeTemplate)({content:code.pre}) : code.pre
-		};
-	}
-};
-
-exports.expandRequireNode = function(requireNode, doRecursive) {
-	var cloneNode = requireNode.cloneNode(true);
-
-	function getViewRequirePath(node) {
-		var regex = new RegExp('\\.' + CONST.FILE_EXT.VIEW + '$'),
-			src = node.getAttribute('src'),
-			fullname = exports.getNodeFullname(node),
-			name = node.getAttribute('name') || CONST.NAME_WIDGET_DEFAULT,
-			type = fullname === 'Alloy.Widget' ? 'widget' : node.getAttribute('type') || CONST.REQUIRE_TYPE_DEFAULT,
-			fullpaths = [];
-
-		var platform;
-		if (compilerConfig && compilerConfig.alloyConfig && compilerConfig.alloyConfig.platform) {
-			platform = compilerConfig.alloyConfig.platform;
-		}
-
-		// Must be a view, with a valid src, in a <Require> element
-		if (!src) {
-			return null;
-		} else if (fullname === 'Alloy.Require' && type === 'view') {
-			if (platform) { fullpaths.push(path.join(compilerConfig.dir.views, platform, src)); }
-			fullpaths.push(path.join(compilerConfig.dir.views, src));
-		} else if (fullname === 'Alloy.Widget' ||
-			(fullname === 'Alloy.Require' && type === 'widget')) {
-			U.getWidgetDirectories(compilerConfig.dir.home).forEach(function(wDir) {
-				if (wDir.manifest.id === src) {
-					if (platform) {
-						fullpaths.push(path.join(wDir.dir, CONST.DIR.VIEW, platform, name));
-					}
-					fullpaths.push(path.join(wDir.dir, CONST.DIR.VIEW, name));
-				}
-			});
-		} else {
-			return null;
-		}
-
-		// check the extensions on the paths to check
-		var found = false;
-		var fullpath;
-		for (var i = 0; i < fullpaths.length; i++) {
-			fullpath = fullpaths[i];
-			fullpath += regex.test(fullpath) ? '' :  '.' + CONST.FILE_EXT.VIEW;
-			if (fs.existsSync(fullpath)) {
-				found = true;
-				break;
-			}
-		}
-
-		// abort if there's no view to be found
-		if (!found) {
-			U.die([
-				type + ' "' + src + '" ' + (type === 'widget' ? 'view "' + name + '" ' : '') +
-					'does not exist.',
-				'The following paths were inspected:'
-			].concat(fullpaths));
-		}
-
-		return fullpath;
-	}
-
-	//create function, it expects 2 values.
-	function insertAfter(newElement, targetElement) {
-		//target is what you want it to go after. Look for this elements parent.
-		var parent = targetElement.parentNode;
-
-		//if the parents lastchild is the targetElement...
-		if (parent.lastchild == targetElement) {
-			//add the newElement after the target element.
-			parent.appendChild(newElement);
-		} else {
-			// else the target has siblings, insert the new element between the target and it's next sibling.
-			parent.insertBefore(newElement, targetElement.nextSibling);
-		}
-	}
-
-	function processRequire(node, isFirst) {
-		// make sure we have a valid required view and get its path
-		var fullpath = getViewRequirePath(node);
-		if (fullpath === null) {
-			return;
-		}
-
-		// re-assemble XML with required elements
-		if (isFirst) {
-			cloneNode = U.XML.getAlloyFromFile(fullpath);
-		} else {
-			var newDocRoot = U.XML.getAlloyFromFile(fullpath);
-			_.each(U.XML.getElementsFromNodes(newDocRoot.childNodes), function(n) {
-				insertAfter(n, node);
-			});
-
-			node.parentNode.removeChild(node);
-		}
-	}
-
-	// Expand the <Require>, recursively if specified
-	if (getViewRequirePath(cloneNode) !== null) {
-		processRequire(cloneNode, true);
-		while (doRecursive) {
-			var reqs = cloneNode.getElementsByTagName('Require');
-			var widgets = cloneNode.getElementsByTagName('Widget');
-			var all = [];
-
-			// condense node lists into a single array
-			_.each(reqs, function(req) {
-				all.push(req);
-			});
-			_.each(widgets, function(widget) {
-				all.push(widget);
-			});
-
-			// find all the valid widgets/requires
-			var viewRequires = _.filter(reqs, function(req) {
-				return getViewRequirePath(req) !== null;
-			});
-
-			if (viewRequires.length === 0) {
-				break;
-			}
-
-			// TODO: https://jira.appcelerator.org/browse/ALOY-256
-			//_.each(viewRequires, processRequire);
-			processRequire(viewRequires[0]);
-		}
-	}
-
-	return cloneNode;
-};
-
-exports.inspectRequireNode = function(node) {
-	var newNode = exports.expandRequireNode(node, true);
-	var children = U.XML.getElementsFromNodes(newNode.childNodes);
-	var names = [];
-
-	_.each(children, function(c) {
-		var args = exports.getParserArgs(c);
-
-		// skip model elements when inspecting nodes for <Require>
-		if (_.includes(CONST.MODEL_ELEMENTS, args.fullname)) {
-			newNode.removeChild(c);
-			return;
-		}
-
-		names.push(args.fullname);
-	});
-
-	return {
-		children: U.XML.getElementsFromNodes(newNode.childNodes),
-		length: names.length,
-		names: names
-	};
-};
-
-exports.copyWidgetResources = function(resources, resourceDir, widgetId, opts) {
-
-	opts = opts || {};
-	var platform;
-	if (compilerConfig && compilerConfig.alloyConfig && compilerConfig.alloyConfig.platform) {
-		platform = compilerConfig.alloyConfig.platform;
-	}
-
-	_.each(resources, function(dir) {
-		if (!path.existsSync(dir)) { return; }
-		logger.trace('WIDGET_SRC=' + path.relative(compilerConfig.dir.project, dir));
-		var files = walkSync(dir);
-		_.each(files, function(file) {
-			file = path.normalize(file);
-			var source = path.join(dir, file);
-
-			// make sure the file exists and that it is not filtered
-			if (!fs.existsSync(source) ||
-				(opts.filter && opts.filter.test(file)) ||
-				(opts.exceptions && _.includes(opts.exceptions, file))) {
-				return;
-			}
-
-			if (fs.statSync(source).isFile()) {
-				var dirname = path.dirname(file);
-				var parts = dirname.split(/[\/\\]/);
-				if (opts.titaniumFolder && parts[0] === opts.titaniumFolder) {
-					dirname = parts.slice(1).join('/');
-				}
-
-				var destDir = path.join(resourceDir, dirname, widgetId);
-				var dest = path.join(destDir, path.basename(file));
-				if (!path.existsSync(destDir)) {
-					fs.mkdirpSync(destDir);
-					chmodr.sync(destDir, 0755);
-				}
-
-				logger.trace('Copying ' + file.yellow + ' --> ' +
-					path.relative(compilerConfig.dir.project, dest).yellow + '...');
-				U.copyFileSync(source, dest);
-			}
-		});
-
-		// [ALOY-1002] Remove ios folder copied from widget
-		var iosDir = path.join(resourceDir, 'ios');
-		if (fs.existsSync(iosDir)) {
-			fs.removeSync(iosDir);
-		}
-		logger.trace(' ');
-	});
-
-	if (opts.theme) {
-		// if this widget has been themed, copy its theme assets atop the stock ones
-		var widgetThemeDir = path.join(compilerConfig.dir.project, 'app', 'themes', opts.theme, 'widgets', widgetId);
-		if (fs.existsSync(widgetThemeDir)) {
-			logger.trace('Processing themed widgets');
-			var widgetAssetSourceDir = path.join(widgetThemeDir, 'assets');
-			var widgetAssetTargetDir = path.join(resourceDir, widgetId);
-			if (fs.existsSync(widgetAssetSourceDir)) {
-				fs.copySync(widgetAssetSourceDir, widgetAssetTargetDir, {preserveTimestamps: true});
-			}
-			// platform-specific assets from the widget must override those of the theme
-			if (platform && path.existsSync(path.join(resources[0], platform))) {
-				fs.copySync(path.join(resources[0], platform), widgetAssetTargetDir, {preserveTimestamps: true});
-			}
-			// however platform-specific theme assets must override the platform assets from the widget
-			if (platform && path.existsSync(path.join(widgetAssetSourceDir, platform))) {
-				logger.trace('Processing platform-specific theme assets for the ' + widgetId + ' widget');
-				widgetAssetSourceDir = path.join(widgetAssetSourceDir, platform);
-				fs.copySync(widgetAssetSourceDir, widgetAssetTargetDir, {preserveTimestamps: true});
-			}
-
-			// [ALOY-1002] Remove platform-specific folders copied from theme
-			if (fs.existsSync(widgetAssetTargetDir)) {
-				var files = walkSync(widgetAssetTargetDir);
-				_.each(files, function(file) {
-					var source = path.join(widgetAssetTargetDir, file);
-					if (path.existsSync(source) && fs.statSync(source).isDirectory()) {
-						fs.removeSync(source);
-					}
-				});
-			}
-		}
-	}
-};
-
-exports.mergeI18N = function mergeI18N(src, dest, opts) {
-	var serializer = new XMLSerializer();
-	opts || (opts = {});
-
-	(function walk(src, dest) {
-		if (!fs.existsSync(src)) return;
-
-		fs.readdirSync(src).forEach(function (name) {
-			var srcFile = path.join(src, name);
-			var destFile = path.join(dest, name);
-
-			if (!fs.existsSync(srcFile)) return;
-
-			if (fs.statSync(srcFile).isDirectory()) {
-				fs.existsSync(destFile) || fs.mkdirpSync(destFile);
-				chmodr.sync(destFile, 0755);
-				return walk(srcFile, destFile);
-			}
-
-			if (!fs.existsSync(destFile)) {
-				logger.debug('Writing ' + destFile.yellow);
-				return U.copyFileSync(srcFile, destFile);
-			}
-
-			if (!/\.xml$/.test(srcFile)) {
-				return;
-			}
-
-			// merge!
-			var existing = {};
-			var destXml = U.XML.parseFromFile(destFile);
-			var destDoc = destXml.documentElement;
-			var srcXml = U.XML.parseFromFile(srcFile);
-			var srcDoc = srcXml.documentElement;
-
-			if (!destDoc) {
-				U.die('Error processing "' + destFile + '"');
-			}
-
-			if (!srcDoc) {
-				U.die('Error processing "' + srcFile + '"');
-			}
-
-			_.each(destDoc.getElementsByTagName('string'), function (node) {
-				var name = node.getAttribute('name');
-				existing[name] = node;
-			});
-
-			_.each(srcDoc.getElementsByTagName('string'), function (node) {
-				var name = node.getAttribute('name');
-				if (!existing.hasOwnProperty(name)) {
-					destDoc.appendChild(destXml.createTextNode('\t'));
-					destDoc.appendChild(node);
-					destDoc.appendChild(destXml.createTextNode('\n'));
-				} else if (opts.override) {
-					destDoc.replaceChild(node, existing[name]);
-				}
-			});
-
-			logger.debug('Merging ' + srcFile.yellow + ' --> ' + destFile.yellow);
-			fs.writeFileSync(destFile, serializer.serializeToString(destXml), 'utf8');
-		});
-	}(src, dest));
-};
-
-function updateImplicitNamspaces(platform) {
-	switch (platform) {
-		case 'android':
-			break;
-		case 'ios':
-			break;
-		case 'mobileweb':
-			CONST.IMPLICIT_NAMESPACES.NavigationGroup = 'Ti.UI.MobileWeb';
-			break;
-	}
-}
-
-exports.createCompileConfig = function(inputPath, outputPath, alloyConfig, buildLog) {
-	var dirs = ['assets', 'config', 'controllers', 'lib', 'migrations', 'models', 'styles', 'themes', 'vendor', 'views', 'widgets'];
-	var libDirs = ['builtins', 'template'];
-	var resources = path.resolve(path.join(outputPath, 'Resources'));
-
-	var obj = {
-		alloyConfig: alloyConfig,
-		dir: {
-			home: path.resolve(inputPath),
-			project: path.resolve(outputPath),
-			resources: resources,
-			resourcesAlloy: path.join(resources, 'alloy')
-		},
-		buildLog: buildLog
-	};
-
-	// create list of dirs
-	_.each(dirs, function(dir) {
-		obj.dir[dir] = path.resolve(path.join(inputPath, dir));
-	});
-	_.each(libDirs, function(dir) {
-		obj.dir[dir] = path.resolve(path.join(alloyRoot, dir));
-	});
-
-	// ensure the generated directories exist
-	U.ensureDir(obj.dir.resources);
-
-	// process and normalize the config.json file
-	var configs = _.defaults(generateConfig(obj), {
-		// sets the theme
-		theme: undefined,
-
-		// are we going to generate sourcemaps?
-		sourcemap: true,
-
-		// are we enabling dynamic styling for all generated components?
-		autoStyle: false,
-
-		// the list of widget dependencies
-		dependencies: {},
-
-		// TODO: Include no adapters by default
-		adapters: CONST.ADAPTERS
-	});
-
-	// normalize adapters
-	if (!configs.adapters) {
-		configs.adapters = [];
-	} else if (!_.isArray(configs.adapters)) {
-		configs.adapters = [configs.adapters];
-	}
-
-	logger.debug(JSON.stringify(configs, null, '  ').split(os.EOL));
-
-	// update implicit namespaces, if possible
-	updateImplicitNamspaces(alloyConfig.platform);
-
-	// keep a copy of the config for this module
-	compilerConfig = _.extend(obj, configs);
-
-	return obj;
-};
-
-function generateConfig(obj) {
-	var buildLog = obj.buildLog;
-	var o = {};
-	var alloyConfig = obj.alloyConfig;
-	var platform = require('../../../platforms/' + alloyConfig.platform + '/index').titaniumFolder;
-	//var defaultCfg = 'module.exports=' + JSON.stringify(o) + ';';
-
-	// get the app and resources locations
-	var appCfg = path.join(obj.dir.home, 'config.' + CONST.FILE_EXT.CONFIG);
-	var resourcesBase = (function() {
-		var base = obj.dir.resources;
-		if (platform) { base = path.join(base, platform); }
-		return path.join(base, 'alloy');
-	})();
-	var resourcesCfg = path.join(resourcesBase, 'CFG.js');
-
-	// parse config.json, if it exists
-	if (path.existsSync(appCfg)) {
-		o = exports.parseConfig(appCfg, alloyConfig, o);
-
-		if (o.theme) {
-			var themeCfg = path.join(obj.dir.home, 'themes', o.theme, 'config.' + CONST.FILE_EXT.CONFIG);
-
-			// parse theme config.json, if it exists
-			if (path.existsSync(themeCfg)) {
-				o = exports.parseConfig(themeCfg, alloyConfig, o);
-			}
-		}
-	}
-
-	// only regenerate the CFG.js when necessary
-	var hash = U.createHashFromString(JSON.stringify(o));
-	if (buildLog.data.cfgHash && buildLog.data.cfgHash === hash && fs.existsSync(path.join(obj.dir.resources, 'alloy', 'CFG.js'))) {
-		// use cached CFG.js file
-		logger.info(' [config.json] config.json unchanged, using cached config.json...');
-	} else {
-		// cached CFG.js is out of sync with config.json, regenerate and save
-		logger.info(' [config.json] regenerating CFG.js from config.json...');
-		buildLog.data.cfgHash = hash;
-		// write out the config runtime module
-		fs.mkdirpSync(resourcesBase);
-		chmodr.sync(resourcesBase, 0755);
-
-		//logger.debug('Writing "Resources/' + (platform ? platform + '/' : '') + 'alloy/CFG.js"...');
-		var output = 'module.exports=' + JSON.stringify(o) + ';';
-		fs.writeFileSync(resourcesCfg, output);
-
-		// TODO: deal with TIMOB-14884
-		var baseFolder = path.join(obj.dir.resources, 'alloy');
-		if (!fs.existsSync(baseFolder)) {
-			fs.mkdirpSync(baseFolder);
-			chmodr.sync(baseFolder, 0755);
-		}
-		fs.writeFileSync(path.join(baseFolder, 'CFG.js'), output);
-	}
-
-	return o;
-}
-
-exports.parseConfig = function(file, alloyConfig, o) {
-	var j, distType;
-	try {
-		j = jsonlint.parse(fs.readFileSync(file, 'utf8'));
-	} catch (e) {
-		U.die('Error processing "config.' + CONST.FILE_EXT.CONFIG + '"', e);
-	}
-
-	_.each(j, function(v, k) {
-		if (!/^(?:env\:|os\:|dist\:)/.test(k) && k !== 'global') {
-			logger.debug(k + ' = ' + JSON.stringify(v));
-			o[k] = v;
-		}
-	});
-
-	if (alloyConfig) {
-		o = _.extend(o, j['global']);
-		o = _.extend(o, j['env:' + alloyConfig.deploytype]);
-		o = _.extend(o, j['os:' + alloyConfig.platform]);
-		o = _.extend(o, j['env:' + alloyConfig.deploytype + ' os:' + alloyConfig.platform]);
-		o = _.extend(o, j['os:' + alloyConfig.platform + ' env:' + alloyConfig.deploytype]);
-
-		if (alloyConfig.deploytype === 'production' && alloyConfig.target) {
-			distType = _.find(CONST.DIST_TYPES, function (obj) { return obj.value.indexOf(alloyConfig.target) !== -1; });
-			if (distType) {
-				distType = distType.key.toLowerCase().replace('_', ':');
-				o = _.extend(o, j[distType]);
-				o = _.extend(o, j['os:' + alloyConfig.platform + ' ' + distType]);
-			}
-		}
-		if (alloyConfig.theme) {
-			o.theme = alloyConfig.theme;
-		}
-	}
-
-	return o;
-};
-
-exports.loadController = function(file) {
-	var code = {
-			parentControllerName: '',
-			controller: '',
-			pre: '',
-			es6mods: ''
-		},
-		contents;
-
-	// Read the controller file
-	try {
-		if (!path.existsSync(file)) {
-			return code;
-		}
-		contents = fs.readFileSync(file, 'utf8');
-	} catch (e) {
-		U.die('Error reading controller file "' + file + '".', e);
-	}
-
-	// get the base controller for this controller, also process import/export statements
-	var controller = astController.processController(contents, file);
-	code.controller = controller.code;
-	code.parentControllerName = controller.base;
-	code.es6mods = controller.es6mods;
-
-	return code;
-};
-
-exports.validateNodeName = function(node, names) {
-	var fullname = exports.getNodeFullname(node);
-	var ret = null;
-	if (!_.isArray(names)) { names = [names]; }
-
-	// Is the node name in the given list of valid names?
-	ret = _.find(names, function(name) { return name === fullname; });
-	if (ret) { return ret; }
-
-	// Is it an Alloy.Require?
-	if (fullname === 'Alloy.Require' || fullname === 'Alloy.Widget') {
-		var inspect = exports.inspectRequireNode(node);
-		ret = _.find(inspect.children, function(n) {
-			return _.includes(names, exports.getNodeFullname(n));
-		});
-		if (ret) {
-			return exports.getNodeFullname(ret);
-		}
-	}
-
-	return null;
-};
-
-exports.generateCollectionBindingTemplate = function(args) {
-	var code = '';
-	var COLLECTION_BINDING_EVENTS = CONST.COLLECTION_BINDING_EVENTS_092;
-	
-	// Check if not 0.9.2 and if it's a supported version as we'll default to 0.9.2 if the version is not supported
-	if (compilerConfig.backbone !== '0.9.2' && CONST.SUPPORTED_BACKBONE_VERSIONS.includes(compilerConfig.backbone)) {
-		COLLECTION_BINDING_EVENTS = CONST.COLLECTION_BINDING_EVENTS;
-	}
-
-	// Determine the collection variable to use
-	var obj = { name: args[CONST.BIND_COLLECTION] };
-	var col = _.template((exports.currentManifest ? CONST.WIDGET_OBJECT : 'Alloy') + ".Collections['<%= name %>'] || <%= name %>")(obj);
-	var colVar = exports.generateUniqueId();
-
-	// Create the code for the filter and transform functions
-	var where = args[CONST.BIND_WHERE];
-	var transform = args[CONST.BIND_TRANSFORM];
-	var whereCode = where ? where + '(' + colVar + ')' : colVar + '.models';
-	var transformCode = transform ? transform + '(<%= localModel %>)' : '_.isFunction(<%= localModel %>.transform)?<%= localModel %>.transform():<%= localModel %>.toJSON()';
-	var handlerFunc = args[CONST.BIND_FUNCTION] || exports.generateUniqueId();
-	if (args.parentFormFactor) {
-		if (!exports.dataFunctionNames[handlerFunc]) {
-			exports.dataFunctionNames[handlerFunc] = [];
-		}
-		exports.dataFunctionNames[handlerFunc].push(args.parentFormFactor);
-		// append the form factor for the code below
-		handlerFunc += U.ucfirst(args.parentFormFactor);
-	}
-	// construct code template
-	code += 'var ' + colVar + '=' + col + ';';
-	code += 'function ' + handlerFunc + '(e) {';
-	code += '   if (e && e.fromAdapter) { return; }';
-	code += '   var opts = ' + handlerFunc + '.opts || {};';
-	code += '	var models = ' + whereCode + ';';
-	code += '	var len = models.length;';
-	code += '<%= pre %>';
-	code += '	for (var i = 0; i < len; i++) {';
-	code += '		var <%= localModel %> = models[i];';
-	if (!args.isDataBoundMap) {
-		code += '		<%= localModel %>.' + CONST.BIND_TRANSFORM_VAR + ' = ' + transformCode + ';';
-	} else {
-		// because (ti.map).annotations[] doesn't accept an array of anonymous objects
-		// we convert them to actual Annotations before pushing them to the array
-		code += "		<%= annotationArray %>.push(require('ti.map').createAnnotation(" + transformCode + '));';
-	}
-	code += '<%= items %>';
-	code += '	}';
-	code += '<%= post %>';
-	code += '};';
-	code += colVar + ".on('" + COLLECTION_BINDING_EVENTS + "'," + handlerFunc + ');';
-
-	exports.destroyCode += colVar + ' && ' + ((args.parentFormFactor) ? 'Alloy.is' + U.ucfirst(args.parentFormFactor) + ' && ' : '' ) +
-		colVar + ".off('" + COLLECTION_BINDING_EVENTS + "'," + handlerFunc + ');';
-
-	return code;
-};
diff --git a/Alloy/commands/compile/index.js b/Alloy/commands/compile/index.js
index 1a742621e..934f9616a 100755
--- a/Alloy/commands/compile/index.js
+++ b/Alloy/commands/compile/index.js
@@ -5,24 +5,29 @@ var ejs = require('ejs'),
 	chmodr = require('chmodr'),
 	vm = require('vm'),
 	babel = require('@babel/core'),
-	async = require('async'),
 
 	// alloy requires
 	_ = require('lodash'),
-	logger = require('../../logger'),
-	U = require('../../utils'),
-	tiapp = require('../../tiapp'),
-	CONST = require('../../common/constants'),
-	platforms = require('../../../platforms/index'),
 
 	// alloy compiler requires
-	CU = require('./compilerUtils'),
-	styler = require('./styler'),
-	sourceMapper = require('./sourceMapper'),
 	CompilerMakeFile = require('./CompilerMakeFile'),
-	BuildLog = require('./BuildLog'),
 	Orphanage = require('./Orphanage');
 
+const {
+	BuildLog,
+	configureBabelPlugins,
+	createCompileConfig,
+	createCompiler,
+	sourceMapper,
+	utils: CU
+} = require('alloy-compiler');
+const {
+	constants: CONST,
+	logger,
+	platforms,
+	utils: U
+} = require('alloy-utils');
+
 var alloyRoot = path.join(__dirname, '..', '..'),
 	viewRegex = new RegExp('\\.' + CONST.FILE_EXT.VIEW + '$'),
 	controllerRegex = new RegExp('\\.' + CONST.FILE_EXT.CONTROLLER + '$'),
@@ -34,7 +39,8 @@ var alloyRoot = path.join(__dirname, '..', '..'),
 	buildLog,
 	theme,
 	platformTheme,
-	widgetIds = [];
+	widgetIds = [],
+	compiler;
 
 var times = {
 	first: null,
@@ -61,10 +67,6 @@ module.exports = function(args, program) {
 
 	// Initialize modules used throughout the compile process
 	buildLog = new BuildLog(paths.project);
-	tiapp.init(path.join(paths.project, 'tiapp.xml'));
-
-	// validate the current Titanium SDK version, exit on failure
-	tiapp.validateSdkVersion();
 
 	// construct compiler config from command line config parameters
 	// and print the configuration data
@@ -102,7 +104,7 @@ module.exports = function(args, program) {
 		]);
 	}
 	titaniumFolder = platforms[buildPlatform].titaniumFolder;
-	otherPlatforms = _.without(CONST.PLATFORM_FOLDERS, titaniumFolder);
+	otherPlatforms = _.without(platforms.constants.PLATFORM_FOLDERS, titaniumFolder);
 
 	// check the platform and i18n to see if it was generated by us last time
 	var destI18NDir = path.join(paths.project, 'i18n');
@@ -159,8 +161,12 @@ module.exports = function(args, program) {
 
 	// create compile config from paths and various alloy config files
 	logger.debug('----- CONFIG.JSON -----');
-	// NOTE: the following line creates the Resources/alloy/CFG.js and Resources/<platform-name>/alloy/CFG.js
-	compileConfig = CU.createCompileConfig(paths.app, paths.project, alloyConfig, buildLog);
+	compileConfig = createCompileConfig({
+		projectDir: paths.project,
+		buildLog,
+		alloyConfig,
+		logLevel: logger.TRACE
+	});
 	theme = compileConfig.theme;
 	platformTheme = buildLog.data[buildPlatform] ? buildLog.data[buildPlatform]['theme'] : '';
 
@@ -233,22 +239,20 @@ module.exports = function(args, program) {
 	if (restrictionPath === null) {
 		// Generate alloy.js from template
 		var libAlloyJsDest = path.join(paths.resources, titaniumFolder, 'alloy.js');
-		var pkginfo = require('pkginfo')(module, 'version');
 		logger.trace('Generating ' + path.relative(titaniumFolder, libAlloyJsDest).yellow);
 		fs.writeFileSync(
 			libAlloyJsDest,
 			ejs.render(
 				fs.readFileSync(path.join(alloyRoot, 'template', 'lib', 'alloy.js'), 'utf8'),
-				{ version: module.exports.version }
+				{ version: program.version() }
 			)
 		);
 	}
 
-	// NOTE: copies `common/constants.js` from Alloy into `<project-dir>/Resources/<platform>/alloy`
-	updateFilesWithBuildLog(
-		path.join(alloyRoot, 'common'),
-		path.join(paths.resources, titaniumFolder, 'alloy'),
-		{ rootDir: paths.project, restrictionPath: restrictionPath }
+	// NOTE: copies `alloy-utils/lib/constants.js` into `<project-dir>/Resources/<platform>/alloy`
+	U.copyFileSync(
+		path.join(path.dirname(require.resolve('alloy-utils')), 'constants.js'),
+		path.join(paths.resources, titaniumFolder, 'alloy', 'constants.js')
 	);
 
 	// create runtime folder structure for alloy
@@ -404,9 +408,7 @@ module.exports = function(args, program) {
 
 	logger.info('----- MVC GENERATION -----');
 
-	// create the global style, if it exists
-	styler.setPlatform(buildPlatform);
-	styler.loadGlobalStyles(paths.app, theme ? {theme:theme} : {});
+	compiler = createCompiler({ compileConfig });
 
 	// Create collection of all widget and app paths
 	var widgetDirs = U.getWidgetDirectories(paths.app);
@@ -420,7 +422,7 @@ module.exports = function(args, program) {
 
 	// Create a regex for determining which platform-specific
 	// folders should be used in the compile process
-	var filteredPlatforms = _.reject(CONST.PLATFORM_FOLDERS_ALLOY, function(p) {
+	var filteredPlatforms = _.reject(platforms.constants.PLATFORM_FOLDERS_ALLOY, function(p) {
 		return p === buildPlatform;
 	});
 	filteredPlatforms = _.map(filteredPlatforms, function(p) { return p + '[\\\\\\/]'; });
@@ -480,13 +482,6 @@ module.exports = function(args, program) {
 
 	generateAppJs(paths, compileConfig, restrictionPath, compilerMakeFile);
 
-	// ALOY-905: workaround TiSDK < 3.2.0 iOS device build bug where it can't reference app.js
-	// in platform-specific folders, so we just copy the platform-specific one to
-	// the Resources folder.
-	if (buildPlatform === 'ios' && tiapp.version.lt('3.2.0')) {
-		U.copyFileSync(path.join(paths.resources, titaniumFolder, 'app.js'), path.join(paths.resources, 'app.js'));
-	}
-
 	// optimize code
 	logger.info('----- OPTIMIZING -----');
 
@@ -585,342 +580,54 @@ function matchesRestriction(files, fileRestriction) {
 }
 
 function parseAlloyComponent(view, dir, manifest, noView, fileRestriction) {
-	var parseType = noView ? 'controller' : 'view';
-	fileRestriction = fileRestriction || null;
+	const parseType = noView ? 'controller' : 'view';
+	if (!view) {
+		U.die('Undefined ' + parseType + ' passed to parseAlloyComponent()');
+	}
+	if (!dir) {
+		U.die('Failed to parse ' + parseType + ' "' + view + '", no directory given');
+	}
 
-	// validate parameters
-	if (!view) { U.die('Undefined ' + parseType + ' passed to parseAlloyComponent()'); }
-	if (!dir) { U.die('Failed to parse ' + parseType + ' "' + view + '", no directory given'); }
-
-	var dirRegex = new RegExp('^(?:' + CONST.PLATFORM_FOLDERS_ALLOY.join('|') + ')[\\\\\\/]*');
-	var basename = path.basename(view, '.' + CONST.FILE_EXT[parseType.toUpperCase()]),
-		dirname = path.dirname(view).replace(dirRegex, ''),
-		viewName = basename,
-		template = {
-			viewCode: '',
-			modelVariable: CONST.BIND_MODEL_VAR,
-			parentVariable: CONST.PARENT_SYMBOL_VAR,
-			itemTemplateVariable: CONST.ITEM_TEMPLATE_VAR,
-			controllerPath: (dirname ? path.join(dirname, viewName) : viewName).replace(/\\/g, '/'),
-			preCode: '',
-			postCode: '',
-			Widget: !manifest ? '' : 'var ' + CONST.WIDGET_OBJECT +
-				" = new (require('/alloy/widget'))('" + manifest.id + "');this.__widgetId='" +
-				manifest.id + "';",
-			WPATH: !manifest ? '' : _.template(fs.readFileSync(path.join(alloyRoot, 'template', 'wpath.js'), 'utf8'))({ WIDGETID: manifest.id }),
-			__MAPMARKER_CONTROLLER_CODE__: '',
-			ES6Mod: ''
-		},
-		widgetDir = dirname ? path.join(CONST.DIR.COMPONENT, dirname) : CONST.DIR.COMPONENT,
-		widgetStyleDir = dirname ? path.join(CONST.DIR.RUNTIME_STYLE, dirname) :
-			CONST.DIR.RUNTIME_STYLE,
-		state = { parent: {}, styles: [] },
-		files = {};
-
-	// reset the bindings map
-	styler.bindingsMap = {};
-	CU.destroyCode = '';
-	CU.postCode = '';
-	CU[CONST.AUTOSTYLE_PROPERTY] = compileConfig[CONST.AUTOSTYLE_PROPERTY];
-	CU.currentManifest = manifest;
-	CU.currentDefaultId = viewName;
-
-	// create a list of file paths
-	var searchPaths = noView ? ['CONTROLLER'] : ['VIEW', 'STYLE', 'CONTROLLER'];
-	_.each(searchPaths, function(fileType) {
-		// get the path values for the file
-		var fileTypeRoot = path.join(dir, CONST.DIR[fileType]);
-		var filename = viewName + '.' + CONST.FILE_EXT[fileType];
-		var filepath = dirname ? path.join(dirname, filename) : filename;
-
-		// check for platform-specific versions of the file
-		var baseFile = path.join(fileTypeRoot, filepath);
-		if (buildPlatform) {
-			var platformSpecificFile = path.join(fileTypeRoot, buildPlatform, filepath);
-			if (fs.existsSync(platformSpecificFile)) {
-				if (fileType === 'STYLE') {
-					files[fileType] = [
-						{ file:baseFile },
-						{ file:platformSpecificFile, platform:true }
-					];
-				} else {
-					files[fileType] = platformSpecificFile;
-				}
-				return;
-			}
-		}
-		files[fileType] = baseFile;
-	});
+	const meta = compiler.factory
+		.createCompiler('component')
+		.resolveComponentMeta(path.join(dir, `${parseType}s`, view));
+	const { componentName: viewName, subPath: dirname, files } = meta;
+	const { componentOutputPath, styleOutputPath } = resolveOutputPaths(viewName, dirname, manifest, files);
 
+	fileRestriction = fileRestriction || null;
 	if (fileRestriction !== null && !matchesRestriction(files, fileRestriction)) {
 		logger.info('  Not matching the file restriction, skipping');
 		return;
 	}
 
-	_.each(['COMPONENT', 'RUNTIME_STYLE'], function(fileType) {
-		files[fileType] = path.join(compileConfig.dir.resources, 'alloy', CONST.DIR[fileType]);
-		if (dirname) { files[fileType] = path.join(files[fileType], dirname); }
-		files[fileType] = path.join(files[fileType], viewName + '.js');
+	// generate component file
+	const { code, map } = compiler.compileComponent({
+		file: parseType === 'controller' ? files.CONTROLLER : files.VIEW
 	});
+	let finalCode = code;
+	const relativeOutfile = path.relative(compileConfig.dir.project, componentOutputPath);
+	if (compileConfig.sourcemap !== false) {
+		const mapDir = path.join(compileConfig.dir.project, CONST.DIR.MAP);
+		const sourceMapOutputPath = `${path.join(mapDir, relativeOutfile)}.${CONST.FILE_EXT.MAP}`;
+		fs.outputFileSync(sourceMapOutputPath, map.toString());
+		finalCode += `\n//# sourceMappingURL=file://${sourceMapOutputPath}`;
+	}
+	fs.outputFileSync(componentOutputPath, finalCode);
+	logger.info(`  created:    "${relativeOutfile}"`);
+
+	// generate runtime style file
+	const styleFiles = Array.isArray(files.STYLE) ? files.STYLE : [ { file: files.STYLE } ];
+	const { code: styleCode } = compiler.compileStyle(styleFiles[0]);
+	fs.outputFileSync(styleOutputPath, styleCode);
+	const relativeStylePath = path.relative(compileConfig.dir.project, styleOutputPath);
+	logger.info(`  created:    "${relativeStylePath}"`);
 
-	// we are processing a view, not just a controller
-	if (!noView) {
-		// validate view
-		if (!fs.existsSync(files.VIEW)) {
-			logger.warn('No ' + CONST.FILE_EXT.VIEW + ' view file found for view ' + files.VIEW);
+	if (manifest) {
+		// merge widget i18n and copy resources (but only once for every widget)
+		if (widgetIds.includes(manifest.id)) {
 			return;
 		}
-
-		// load global style, if present
-		state.styles = styler.globalStyle || [];
-
-		// Load the style and update the state
-		if (files.STYLE) {
-			var theStyles = _.isArray(files.STYLE) ? files.STYLE : [{file:files.STYLE}];
-			_.each(theStyles, function(style) {
-				if (fs.existsSync(style.file)) {
-					logger.info('  style:      "' +
-						path.relative(path.join(dir, CONST.DIR.STYLE), style.file) + '"');
-					state.styles = styler.loadAndSortStyle(style.file, {
-						existingStyle: state.styles,
-						platform: style.platform
-					});
-				}
-			});
-		}
-
-		if (theme) {
-			// if a theme is applied, override TSS definitions with those defined in the theme
-			var themeStylesDir, theStyle, themeStylesFile, psThemeStylesFile;
-			if (!manifest) {
-				// theming a "normal" controller
-				themeStylesDir = path.join(compileConfig.dir.themes, theme, 'styles');
-				theStyle = dirname ? path.join(dirname, viewName + '.tss') : viewName + '.tss';
-				themeStylesFile = path.join(themeStylesDir, theStyle);
-				psThemeStylesFile = path.join(themeStylesDir, buildPlatform, theStyle);
-			} else {
-				// theming a widget
-				themeStylesDir = path.join(compileConfig.dir.themes, theme, 'widgets', manifest.id, 'styles');
-				theStyle = dirname ? path.join(dirname, viewName + '.tss') : viewName + '.tss';
-				themeStylesFile = path.join(themeStylesDir, theStyle);
-				psThemeStylesFile = path.join(themeStylesDir, buildPlatform, theStyle);
-			}
-
-			if (fs.existsSync(themeStylesFile)) {
-				// load theme-specific styles, overriding default definitions
-				logger.info('  theme:      "' + path.join(theme.toUpperCase(), theStyle) + '"');
-				state.styles = styler.loadAndSortStyle(themeStylesFile, {
-					existingStyle: state.styles,
-					theme: true
-				});
-			}
-			if (fs.existsSync(psThemeStylesFile)) {
-				// load theme- and platform-specific styles, overriding default definitions
-				logger.info('  theme:      "' +
-					path.join(theme.toUpperCase(), buildPlatform, theStyle) + '"');
-				state.styles = styler.loadAndSortStyle(psThemeStylesFile, {
-					existingStyle: state.styles,
-					platform: true,
-					theme: true
-				});
-			}
-		}
-
-		// Load view from file into an XML document root node
-		var docRoot;
-		try {
-			logger.info('  view:       "' +
-				path.relative(path.join(dir, CONST.DIR.VIEW), files.VIEW) + '"');
-			docRoot = U.XML.getAlloyFromFile(files.VIEW);
-		} catch (e) {
-			U.die([
-				e.stack,
-				'Error parsing XML for view "' + view + '"'
-			]);
-		}
-
-		// see if autoStyle is enabled for the view
-		if (docRoot.hasAttribute(CONST.AUTOSTYLE_PROPERTY)) {
-			CU[CONST.AUTOSTYLE_PROPERTY] =
-				docRoot.getAttribute(CONST.AUTOSTYLE_PROPERTY) === 'true';
-		}
-
-		// see if module attribute has been set on the docRoot (<Alloy>) tag for the view
-		if (docRoot.hasAttribute(CONST.DOCROOT_MODULE_PROPERTY)) {
-			CU[CONST.DOCROOT_MODULE_PROPERTY] = docRoot.getAttribute(CONST.DOCROOT_MODULE_PROPERTY);
-		} else {
-			CU[CONST.DOCROOT_MODULE_PROPERTY] = null;
-		}
-
-		// see if baseController attribute has been set on the docRoot (<Alloy>) tag for the view
-		if (docRoot.hasAttribute(CONST.DOCROOT_BASECONTROLLER_PROPERTY)) {
-			CU[CONST.DOCROOT_BASECONTROLLER_PROPERTY] = '"' + docRoot.getAttribute(CONST.DOCROOT_BASECONTROLLER_PROPERTY) + '"';
-		} else {
-			CU[CONST.DOCROOT_BASECONTROLLER_PROPERTY] = null;
-		}
-
-		// make sure we have a Window, TabGroup, or SplitWindow
-		var rootChildren = U.XML.getElementsFromNodes(docRoot.childNodes);
-		if (viewName === 'index' && !dirname) {
-			var valid = [
-				'Ti.UI.Window',
-				'Ti.UI.iOS.SplitWindow',
-				'Ti.UI.TabGroup',
-				'Ti.UI.iOS.NavigationWindow',
-				'Ti.UI.NavigationWindow'
-			].concat(CONST.MODEL_ELEMENTS);
-			_.each(rootChildren, function(node) {
-				var found = true;
-				var args = CU.getParserArgs(node, {}, { doSetId: false });
-
-				if (args.fullname === 'Alloy.Require') {
-					var inspect = CU.inspectRequireNode(node);
-					for (var j = 0; j < inspect.names.length; j++) {
-						if (!_.includes(valid, inspect.names[j])) {
-							found = false;
-							break;
-						}
-					}
-				} else {
-					found = _.includes(valid, args.fullname);
-				}
-
-				if (!found) {
-					U.die([
-						'Compile failed. index.xml must have a top-level container element.',
-						'Valid elements: [' + valid.join(',') + ']'
-					]);
-				}
-			});
-		}
-
-		// process any model/collection nodes
-		_.each(rootChildren, function(node, i) {
-			var fullname = CU.getNodeFullname(node);
-			var isModelElement = _.includes(CONST.MODEL_ELEMENTS, fullname);
-
-			if (isModelElement) {
-				var vCode = CU.generateNode(node, state, undefined, false, true);
-				template.viewCode += vCode.content;
-				template.preCode += vCode.pre;
-
-				// remove the model/collection nodes when done
-				docRoot.removeChild(node);
-			}
-		});
-
-		// rebuild the children list since model elements have been removed
-		rootChildren = U.XML.getElementsFromNodes(docRoot.childNodes);
-
-		// process the UI nodes
-		_.each(rootChildren, function(node, i) {
-			// should we use the default id?
-			var defaultId = CU.isNodeForCurrentPlatform(node) ? viewName : undefined;
-
-			// generate the code for this node
-			var fullname = CU.getNodeFullname(node);
-			template.viewCode += CU.generateNode(node, {
-				parent:{},
-				styles:state.styles,
-				widgetId: manifest ? manifest.id : undefined,
-				parentFormFactor: node.hasAttribute('formFactor') ? node.getAttribute('formFactor') : undefined
-			}, defaultId, true);
-		});
-	}
-
-	// process the controller code
-	if (fs.existsSync(files.CONTROLLER)) {
-		logger.info('  controller: "' +
-			path.relative(path.join(dir, CONST.DIR.CONTROLLER), files.CONTROLLER) + '"');
-	}
-	var cCode = CU.loadController(files.CONTROLLER);
-	template.parentController = (cCode.parentControllerName !== '') ?
-		cCode.parentControllerName : CU[CONST.DOCROOT_BASECONTROLLER_PROPERTY] || "'BaseController'";
-	template.__MAPMARKER_CONTROLLER_CODE__ += cCode.controller;
-	template.preCode += cCode.pre;
-	template.ES6Mod += cCode.es6mods;
-
-	// for each model variable in the bindings map...
-	_.each(styler.bindingsMap, function(mapping, modelVar) {
-
-		// open the model binding handler
-		var handlerVar = CU.generateUniqueId();
-		template.viewCode += 'var ' + handlerVar + ' = function() {';
-
-		_.each(mapping.models, function(modelVar) {
-			template.viewCode += modelVar + '.__transform = _.isFunction(' + modelVar + '.transform) ? ' + modelVar + '.transform() : ' + modelVar + '.toJSON();';
-		});
-
-		CU.destroyCode += modelVar + ' && ' + ((state.parentFormFactor) ? 'is' + U.ucfirst(state.parentFormFactor) : '' ) +
-			modelVar + ".off('" + CONST.MODEL_BINDING_EVENTS + "'," + handlerVar + ');';
-
-		// for each specific conditional within the bindings map....
-		_.each(_.groupBy(mapping.bindings, function(b) {return b.condition;}), function(bindings, condition) {
-			var bCode = '';
-
-			// for each binding belonging to this model/conditional pair...
-			_.each(bindings, function(binding) {
-				bCode += '$.' + binding.id + '.' + binding.prop + ' = ' + binding.val + ';';
-			});
-
-			// if this is a legit conditional, wrap the binding code in it
-			if (typeof condition !== 'undefined' && condition !== 'undefined') {
-				bCode = 'if(' + condition + '){' + bCode + '}';
-			}
-			template.viewCode += bCode;
-
-		});
-		template.viewCode += '};';
-		template.viewCode += modelVar + ".on('" + CONST.MODEL_BINDING_EVENTS + "'," +
-			handlerVar + ');';
-	});
-
-	// add destroy() function to view for cleaning up bindings
-	template.viewCode += 'exports.destroy = function () {' + CU.destroyCode + '};';
-
-	// add dataFunction of original name (if data-binding with form factor has been used)
-	if (!_.isEmpty(CU.dataFunctionNames)) {
-		_.each(Object.keys(CU.dataFunctionNames), function(funcName) {
-			template.viewCode += 'function ' + funcName + '() { ';
-			_.each(CU.dataFunctionNames[funcName], function(formFactor) {
-				template.viewCode += '	if(Alloy.is' + U.ucfirst(formFactor) + ') { ' + funcName + U.ucfirst(formFactor) + '(); } ';
-			});
-			template.viewCode += '}';
-		});
-	}
-
-	// add any postCode after the controller code
-	template.postCode += CU.postCode;
-
-	// create generated controller module code for this view/controller or widget
-	var controllerCode = template.__MAPMARKER_CONTROLLER_CODE__;
-	delete template.__MAPMARKER_CONTROLLER_CODE__;
-	var code = _.template(fs.readFileSync(path.join(compileConfig.dir.template, 'component.js'), 'utf8'))(template);
-
-	// prep the controller paths based on whether it's an app
-	// controller or widget controller
-	var targetFilepath = path.join(compileConfig.dir.resources, titaniumFolder,
-		path.relative(compileConfig.dir.resources, files.COMPONENT));
-	var runtimeStylePath = path.join(compileConfig.dir.resources, titaniumFolder,
-		path.relative(compileConfig.dir.resources, files.RUNTIME_STYLE));
-	if (manifest) {
-		fs.mkdirpSync(
-			path.join(compileConfig.dir.resources, titaniumFolder, 'alloy', CONST.DIR.WIDGET,
-				manifest.id, widgetDir)
-		);
-		chmodr.sync(path.join(compileConfig.dir.resources, titaniumFolder, 'alloy', CONST.DIR.WIDGET,
-			manifest.id, widgetDir), 0755);
-		fs.mkdirpSync(
-			path.join(compileConfig.dir.resources, titaniumFolder, 'alloy', CONST.DIR.WIDGET,
-				manifest.id, widgetStyleDir)
-		);
-		chmodr.sync(path.join(compileConfig.dir.resources, titaniumFolder, 'alloy', CONST.DIR.WIDGET,
-			manifest.id, widgetStyleDir), 0755);
-
-		// [ALOY-967] merge "i18n" dir in widget folder
 		CU.mergeI18N(path.join(dir, 'i18n'), path.join(compileConfig.dir.project, 'i18n'), { override: false });
-		widgetIds.push(manifest.id);
-
 		CU.copyWidgetResources(
 			[path.join(dir, CONST.DIR.ASSETS), path.join(dir, CONST.DIR.LIB)],
 			path.join(compileConfig.dir.resources, titaniumFolder),
@@ -932,95 +639,43 @@ function parseAlloyComponent(view, dir, manifest, noView, fileRestriction) {
 				theme: theme
 			}
 		);
-		targetFilepath = path.join(
+		widgetIds.push(manifest.id);
+	}
+}
+
+/**
+ * Resolve the output paths based on whether it's an app controller or widget
+ * controller.
+ *
+ * @param {*} view
+ * @param {*} dirname
+ * @param {*} manifest
+ * @param {*} files
+ */
+function resolveOutputPaths(viewName, dirname, manifest, files) {
+	var componentOutputPath = path.join(compileConfig.dir.resources, titaniumFolder,
+		path.relative(compileConfig.dir.resources, files.COMPONENT));
+	var styleOutputPath = path.join(compileConfig.dir.resources, titaniumFolder,
+		path.relative(compileConfig.dir.resources, files.RUNTIME_STYLE));
+	if (manifest) {
+		const widgetDir = dirname ? path.join(CONST.DIR.COMPONENT, dirname) : CONST.DIR.COMPONENT;
+		const widgetStyleDir = dirname
+			? path.join(CONST.DIR.RUNTIME_STYLE, dirname)
+			: CONST.DIR.RUNTIME_STYLE;
+		componentOutputPath = path.join(
 			compileConfig.dir.resources, titaniumFolder, 'alloy', CONST.DIR.WIDGET, manifest.id,
 			widgetDir, viewName + '.js'
 		);
-		runtimeStylePath = path.join(
+		styleOutputPath = path.join(
 			compileConfig.dir.resources, titaniumFolder, 'alloy', CONST.DIR.WIDGET, manifest.id,
 			widgetStyleDir, viewName + '.js'
 		);
 	}
 
-	// generate the code and source map for the current controller
-	sourceMapper.generateCodeAndSourceMap({
-		target: {
-			filename: path.relative(compileConfig.dir.project, files.COMPONENT),
-			filepath: targetFilepath,
-			templateContent: code
-		},
-		data: {
-			__MAPMARKER_CONTROLLER_CODE__: {
-				filename: path.relative(compileConfig.dir.project, files.CONTROLLER),
-				fileContent: controllerCode
-			}
-		}
-	}, compileConfig);
-
-	// initiate runtime style module creation
-	var relativeStylePath = path.relative(compileConfig.dir.project, runtimeStylePath);
-	logger.info('  created:     "' + relativeStylePath + '"');
-
-	// skip optimize process, as the file is an alloy component
-	restrictionSkipOptimize = (fileRestriction !== null);
-
-	// pre-process runtime controllers to save runtime performance
-	var STYLE_PLACEHOLDER = '__STYLE_PLACEHOLDER__';
-	var STYLE_REGEX = new RegExp('[\'"]' + STYLE_PLACEHOLDER + '[\'"]');
-	var processedStyles = [];
-	_.each(state.styles, function(s) {
-		var o = {};
-
-		// make sure this style entry applies to the current platform
-		if (s && s.queries && s.queries.platform &&
-			!_.includes(s.queries.platform, buildPlatform)) {
-			return;
-		}
-
-		// get the runtime processed version of the JSON-safe style
-		var processed = '{' + styler.processStyle(s.style, state) + '}';
-
-		// create a temporary style object, sans style key
-		_.each(s, function(v, k) {
-			if (k === 'queries') {
-				var queriesObj = {};
-
-				// optimize style conditionals for runtime
-				_.each(s[k], function(query, queryKey) {
-					if (queryKey === 'platform') {
-						// do nothing, we don't need the platform key anymore
-					} else if (queryKey === 'formFactor') {
-						queriesObj[queryKey] = 'is' + U.ucfirst(query);
-					} else if (queryKey === 'if') {
-						queriesObj[queryKey] =  query;
-					} else {
-						logger.warn('Unknown device query "' + queryKey + '"');
-					}
-				});
-
-				// add the queries object, if not empty
-				if (!_.isEmpty(queriesObj)) {
-					o[k] = queriesObj;
-				}
-			} else if (k !== 'style') {
-				o[k] = v;
-			}
-		});
-
-		// Create a full processed style string by inserting the processed style
-		// into the JSON stringifed temporary style object
-		o.style = STYLE_PLACEHOLDER;
-		processedStyles.push(JSON.stringify(o).replace(STYLE_REGEX, processed));
-	});
-
-	// write out the pre-processed styles to runtime module files
-	var styleCode = 'module.exports = [' + processedStyles.join(',') + '];';
-	if (manifest) {
-		styleCode += _.template(fs.readFileSync(path.join(alloyRoot, 'template', 'wpath.js'), 'utf8'))({ WIDGETID: manifest.id });
-	}
-	fs.mkdirpSync(path.dirname(runtimeStylePath));
-	chmodr.sync(path.dirname(runtimeStylePath), 0755);
-	fs.writeFileSync(runtimeStylePath, styleCode);
+	return {
+		componentOutputPath,
+		styleOutputPath
+	};
 }
 
 function findModelMigrations(name, inDir) {
@@ -1111,7 +766,7 @@ function processModels(dirs) {
 function updateFilesWithBuildLog(src, dst, opts) {
 	// filter on retrictionPath
 	if (opts.restrictionPath === null || _.find(opts.restrictionPath, function(f) {return f.indexOf(src) === 0;})) {
-		var updatedFiles = U.updateFiles(src, dst, _.extend({ isNew: buildLog.isNew }, opts));
+		var updatedFiles = CU.updateFiles(src, dst, _.extend({ isNew: buildLog.isNew }, opts));
 
 		if (typeof updatedFiles == 'object' && updatedFiles.length > 0 && opts.restrictionPath !== null) {
 			fileRestrictionUpdatedFiles = _.union(fileRestrictionUpdatedFiles, updatedFiles);
@@ -1161,13 +816,11 @@ function optimizeCompiledCode(alloyConfig, paths) {
 		});
 	}
 
+	// TODO: Remove once @titanium-sdk/babel-preset-app is in place
 	while ((files = _.difference(getJsFiles(), lastFiles)).length > 0) {
 		_.each(files, function(file) {
 			var options = _.extend(_.clone(sourceMapper.OPTIONS_OUTPUT), {
-					plugins: [
-						[require('./ast/builtins-plugin'), compileConfig],
-						[require('./ast/optimizer-plugin'), compileConfig.alloyConfig],
-					]
+					plugins: configureBabelPlugins(compileConfig)
 				}),
 				fullpath = path.join(compileConfig.dir.resources, file);
 
@@ -1176,7 +829,7 @@ function optimizeCompiledCode(alloyConfig, paths) {
 				var result = babel.transformFileSync(fullpath, options);
 				fs.writeFileSync(fullpath, result.code);
 			} catch (e) {
-				U.die('Error transforming JS file', e);
+				U.die(`Error transforming JS file ${fullpath}`, e);
 			}
 		});
 		lastFiles = _.union(lastFiles, files);
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.Actions.js b/Alloy/commands/compile/parsers/Alloy.Abstract.Actions.js
deleted file mode 100644
index 8f926d0a1..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.Actions.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		itemArrayDefinition: {
-			parents: [
-				'Ti.UI.iOS.PreviewContext'
-			],
-			children: [
-				'ALL'
-			],
-			property: 'actions'
-		}
-	});
-	return require('./Alloy.Abstract._ItemArray').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.BarItemType.js b/Alloy/commands/compile/parsers/Alloy.Abstract.BarItemType.js
deleted file mode 100644
index c7d2b0c6a..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.BarItemType.js
+++ /dev/null
@@ -1,46 +0,0 @@
-var U = require('../../../utils'),
-	styler = require('../styler');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	if (!state.itemsArray) {
-		U.die('Invalid use of <Label>. Must be the child of <Labels>.');
-	}
-
-	// grab BarItemType attributes from node
-	var obj = {};
-	var title = (U.XML.getNodeText(node) || node.getAttribute('title') || '');
-	var image = node.getAttribute('image');
-	var enabled = node.getAttribute('enabled') !== 'false'; // defaults to true
-	var width = node.getAttribute('width');
-
-	// [ALOY-1052] Alloy: Support use of L in XML proxy elements
-	if (U.isLocaleAlias(title)) {
-		title = styler.STYLE_EXPR_PREFIX + title;
-	}
-
-	// assign valid values to the object
-	if (title) { obj.title = title; }
-	if (image) { obj.image = image; }
-	if (!enabled) { obj.enabled = false; }
-	if (width) { obj.width = width; }
-
-	state.local = true;
-	state.extraStyle = obj;
-	var itemState = require('./default_abstract').parse(node, state);
-	delete state.local;
-	delete state.extraStyle;
-
-	var code = itemState.code;
-	if (!state.isCollectionBound || !state.model) {
-		code += state.itemsArray + '.push(' + itemState.parent.symbol + ');';
-	}
-
-	return {
-		parent: {},
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.BarItemTypes.js b/Alloy/commands/compile/parsers/Alloy.Abstract.BarItemTypes.js
deleted file mode 100644
index 9739c8ee1..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.BarItemTypes.js
+++ /dev/null
@@ -1,21 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		itemArrayDefinition: {
-			parents: [
-				'Ti.UI.ButtonBar',
-				'Ti.UI.iOS.TabbedBar',
-				'Ti.UI.TabbedBar'
-			],
-			children: [
-				'Alloy.Abstract.BarItemType'
-			],
-			translations: [
-				{ from: 'Ti.UI.Label', to: 'Alloy.Abstract.BarItemType' }
-			],
-			property: 'labels'
-		}
-	});
-	return require('./Alloy.Abstract._ItemArray').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.ButtonName.js b/Alloy/commands/compile/parsers/Alloy.Abstract.ButtonName.js
deleted file mode 100644
index 576851cfd..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.ButtonName.js
+++ /dev/null
@@ -1,27 +0,0 @@
-var U = require('../../../utils'),
-	CU = require('../compilerUtils');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	if (!state.itemsArray) {
-		U.die('Invalid use of <ButtonName>. Must be the child of <ButtonNames>.');
-	}
-
-	var nodeText = U.trim(U.XML.getNodeText(node) || '');
-	var returnCode = '';
-
-	if (U.isLocaleAlias(nodeText)) {
-		returnCode = '.push(' + nodeText + ');';
-	} else {
-		returnCode = '.push("' + nodeText.replace(/"/g, '\\"') + '");';
-	}
-
-	return {
-		parent: {},
-		styles: state.styles,
-		code: state.itemsArray + returnCode
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.ButtonNames.js b/Alloy/commands/compile/parsers/Alloy.Abstract.ButtonNames.js
deleted file mode 100644
index 6b4d9719c..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.ButtonNames.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		itemArrayDefinition: {
-			parents: [
-				'Ti.UI.AlertDialog',
-				'Ti.UI.OptionDialog'
-			],
-			children: [
-				'Alloy.Abstract.ButtonName'
-			],
-			property: 'buttonNames'
-		}
-	});
-	return require('./Alloy.Abstract._ItemArray').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.ContentView.js b/Alloy/commands/compile/parsers/Alloy.Abstract.ContentView.js
deleted file mode 100644
index 736e7baad..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.ContentView.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		proxyPropertyDefinition: {
-			parents: [
-				'Ti.UI.iPad.Popover'
-			]
-		}
-	});
-	return require('./Alloy.Abstract._ProxyProperty').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.CoverFlowImageType.js b/Alloy/commands/compile/parsers/Alloy.Abstract.CoverFlowImageType.js
deleted file mode 100644
index 87ba40b7b..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.CoverFlowImageType.js
+++ /dev/null
@@ -1,36 +0,0 @@
-var U = require('../../../utils');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	if (!state.itemsArray) {
-		U.die('A CoverFlowImageType element must the child of a CoverFlowImageTypes element');
-	}
-
-	var obj = {};
-	var image = U.XML.getNodeText(node) || node.getAttribute('image');
-	var height = node.getAttribute('height');
-	var width = node.getAttribute('width');
-
-	if (image) { obj.image = image; }
-	if (height) { obj.height = height; }
-	if (width) { obj.width = width; }
-
-	state.local = true;
-	state.extraStyle = obj;
-	var itemState = require('./default_abstract').parse(node, state);
-	delete state.local;
-	delete state.extraStyle;
-
-	var code = itemState.code;
-	if (!state.model) {
-		code += state.itemsArray + '.push(' + itemState.parent.symbol + ');';
-	}
-
-	return {
-		parent: {},
-		code: code
-	};
-}
\ No newline at end of file
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.CoverFlowImageTypes.js b/Alloy/commands/compile/parsers/Alloy.Abstract.CoverFlowImageTypes.js
deleted file mode 100644
index 22b75de9c..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.CoverFlowImageTypes.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	state = _.extend(state, {
-		itemArrayDefinition: {
-			parents: [
-				'Ti.UI.iOS.CoverFlowView'
-			],
-			children: [
-				'Alloy.Abstract.CoverFlowImageType'
-			],
-			translations: [
-				{ from: 'Ti.UI.Image', to: 'Alloy.Abstract.CoverFlowImageType' }
-			],
-			property: 'images'
-		}
-	});
-	return require('./Alloy.Abstract._ItemArray').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.FixedSpace.js b/Alloy/commands/compile/parsers/Alloy.Abstract.FixedSpace.js
deleted file mode 100644
index 64e612373..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.FixedSpace.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	tiapp = require('../../../tiapp'),
-	iOSProxy;
-
-var MIN_VERSION = '5.4.0';
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	// width is a valid property for a FIXED_SPACE button, add in if specified
-	var width = (args.createArgs.width) ? ", width:'" + args.createArgs.width + "'" : '';
-
-	if (tiapp.version.gte(tiapp.getSdkVersion(), MIN_VERSION)) {
-		iOSProxy = 'iOS';
-	} else {
-		iOSProxy = 'iPhone';
-	}
-
-	return {
-		parent: {
-			node: node,
-			symbol: args.symbol
-		},
-		styles: state.styles,
-		code: args.symbol + ' = Ti.UI.createButton({systemButton: Ti.UI.' + iOSProxy + '.SystemButton.FIXED_SPACE' + width + '});'
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.FlexSpace.js b/Alloy/commands/compile/parsers/Alloy.Abstract.FlexSpace.js
deleted file mode 100644
index 123449c39..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.FlexSpace.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	tiapp = require('../../../tiapp'),
-	iOSProxy;
-
-var MIN_VERSION = '5.4.0';
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-
-	if (tiapp.version.gte(tiapp.getSdkVersion(), MIN_VERSION)) {
-		iOSProxy = 'iOS';
-	} else {
-		iOSProxy = 'iPhone';
-	}
-
-	return {
-		parent: {
-			node: node,
-			symbol: args.symbol
-		},
-		styles: state.styles,
-		code: args.symbol + ' = Ti.UI.createButton({systemButton: Ti.UI.' + iOSProxy + '.SystemButton.FLEXIBLE_SPACE});'
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.Item.js b/Alloy/commands/compile/parsers/Alloy.Abstract.Item.js
deleted file mode 100644
index 736b29643..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.Item.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var U = require('../../../utils');
-
-var LOCALE_REGEX = /^\s*(?:L|Ti\.Locale\.getString|Titanium\.Locale\.getString)\(.+\)\s*$/;
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	if (!state.itemsArray) {
-		U.die('Invalid use of <Item>. Must be the child of <Items>.');
-	}
-
-	var string = U.trim(U.XML.getNodeText(node) || '');
-	if (!LOCALE_REGEX.test(string)) {
-		string = '"' + string.replace(/"/g, '\\"') + '"';
-	}
-
-	return {
-		parent: {},
-		styles: state.styles,
-		code: state.itemsArray + '.push(' + string + ');'
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.ItemTemplate.js b/Alloy/commands/compile/parsers/Alloy.Abstract.ItemTemplate.js
deleted file mode 100644
index 5a7c00617..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.ItemTemplate.js
+++ /dev/null
@@ -1,109 +0,0 @@
-var CU = require('../compilerUtils'),
-	U = require('../../../utils'),
-	styler = require('../styler'),
-	CONST = require('../../../common/constants'),
-	_ = require('lodash');
-
-var NAME_ERROR = 'Alloy.Abstract.ItemTemplate must have a "name" attribute';
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var code = '';
-
-	// make sure we have a name
-	var name = node.getAttribute('name');
-	if (!name) {
-		U.dieWithNode(node, NAME_ERROR);
-	}
-	node.removeAttribute('name');
-
-	// make symbol a local variable if necessary
-	if (state.local) {
-		args.symbol = CU.generateUniqueId();
-	}
-
-	// apply usual style properties
-	var argsObject = {
-		properties: styler.generateStyleParams(
-			state.styles,
-			args.classes,
-			args.id,
-			CU.getNodeFullname(node),
-			_.defaults(state.extraStyle || {}, args.createArgs || {}),
-			state
-		)
-	};
-
-	// add in any events on the ItemTemplate
-	if (args.events && args.events.length > 0) {
-		argsObject.events = '{' + _.reduce(args.events, function(memo, o) {
-			return memo + o.name + ':' + o.value + ',';
-		}, '') + '}';
-	}
-
-	// process children and add them to childTemplates
-	var children = U.XML.getElementsFromNodes(node.childNodes);
-	var childTemplates;
-	if (children.length > 0) {
-		childTemplates = CU.generateUniqueId();
-		code += 'var ' + childTemplates + '=[];';
-
-		_.each(children, function(child) {
-			if (child.nodeName === 'Require') {
-				U.dieWithNode(child, [
-					'<ItemTemplate> cannot contain <Require> elements.',
-					'ListView currently only supports Titanium API elements and Widgets:',
-					'  examples: <Label>, <Button>, <ImageView>, etc...',
-					'Please reference the ListView guide at docs.appcelerator.com for more details.'
-				]);
-			}
-
-			// lets be naughty and pretend this is not a Widget
-			// to generate a valid template
-			if (child.nodeName === 'Widget') {
-				let src = child.getAttribute('src'),
-					ns = src.split('.'),
-					name = ns.pop();
-
-				child.removeAttribute('src');
-				child.setAttribute('ns', ns.join('.'));
-				child.nodeName = name;
-			}
-
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				local: true,
-				isViewTemplate: true,
-				post: function(node, state, args) {
-					let symbol = (state.item && state.item.symbol) || args.symbol;
-					return childTemplates + '.push(' + symbol + ');';
-				}
-			});
-		});
-
-		argsObject.childTemplates = childTemplates;
-	}
-
-	// Generate runtime code
-	code += (state.local ? 'var ' : '') + args.symbol + ' = {';
-	code += _.reduce(argsObject, function(memo, v, k) {
-		return memo + k + ':' + v + ',';
-	}, '');
-	code += '};';
-
-	code += (state.templateObject || CONST.ITEM_TEMPLATE_VAR);
-	code +=	'["' + name + '"]=' + args.symbol + ';';
-
-	// Update the parsing state
-	return {
-		parent: {},
-		local: state.local || false,
-		model: state.model || undefined,
-		condition: state.condition || undefined,
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.Items.js b/Alloy/commands/compile/parsers/Alloy.Abstract.Items.js
deleted file mode 100644
index cc516bc4e..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.Items.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		itemArrayDefinition: {
-			parents: [
-				'Ti.UI.Toolbar',
-				'Ti.UI.iOS.MenuPopup'
-			],
-			children: [
-				'ALL'
-			],
-			property: 'items'
-		}
-	});
-	return require('./Alloy.Abstract._ItemArray').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.Option.js b/Alloy/commands/compile/parsers/Alloy.Abstract.Option.js
deleted file mode 100644
index 086138093..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.Option.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var U = require('../../../utils'),
-	_ = require('lodash');
-
-var LOCALE_REGEX = /^\s*(?:L|Ti\.Locale\.getString|Titanium\.Locale\.getString)\(.+\)\s*$/;
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	if (!state.itemsArray) {
-		U.die('Invalid use of <Option>. Must be the child of <Options>.');
-	}
-
-	var string = U.trim(U.XML.getNodeText(node) || '');
-	if (!LOCALE_REGEX.test(string)) {
-		string = '"' + string.replace(/"/g, '\\"') + '"';
-	}
-
-	const codePush = `${state.itemsArray}.push(${string})`;
-	const attrName = _.findKey(state.extraOptions, (varName, name) => args.createArgs[name] !== undefined);
-	const attrVarName = state.extraOptions[attrName];
-
-	let code = codePush;
-
-	if (attrName) {
-		if (args.createArgs[attrName]) {
-			code = `${attrVarName} = ${codePush} - 1`;
-		} else {
-			code = `${attrVarName} = undefined; ${codePush}`;
-		}
-	}
-
-	return {
-		parent: {},
-		styles: state.styles,
-		code: `${code};`
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.Options.js b/Alloy/commands/compile/parsers/Alloy.Abstract.Options.js
deleted file mode 100644
index bfb75b1b8..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.Options.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		itemArrayDefinition: {
-			parents: [
-				'Ti.UI.OptionDialog'
-			],
-			children: [
-				'Alloy.Abstract.Option'
-			],
-			property: 'options'
-		}
-	});
-	return require('./Alloy.Abstract._ItemArray').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.Preview.js b/Alloy/commands/compile/parsers/Alloy.Abstract.Preview.js
deleted file mode 100644
index ba9114f31..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract.Preview.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		proxyPropertyDefinition: {
-			parents: [
-				'Ti.UI.iOS.PreviewContext'
-			],
-			property: 'preview',
-			skipAssignParent: true
-		}
-	});
-	return require('./Alloy.Abstract._ProxyProperty').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract._BackboneClass.js b/Alloy/commands/compile/parsers/Alloy.Abstract._BackboneClass.js
deleted file mode 100644
index 7af390e92..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract._BackboneClass.js
+++ /dev/null
@@ -1,93 +0,0 @@
-var path = require('path'),
-	walkSync = require('walk-sync'),
-	CU = require('../compilerUtils'),
-	U = require('../../../utils'),
-	CONST = require('../../../common/constants'),
-	_ = require('lodash'),
-	logger = require('../../../logger');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var code = '';
-	var nodeName = node.nodeName;
-	var isSingleton = node.getAttribute('instance') !== 'true';
-	var id = node.getAttribute('id');
-	var src = node.getAttribute('src');
-	var backboneVar;
-	var manifest = CU.currentManifest;
-	var root = manifest ? CONST.WIDGET_OBJECT : 'Alloy';
-
-	// Make sure the parent is <Alloy>
-	if (!node.parentNode || node.parentNode.nodeName !== 'Alloy') {
-		U.dieWithNode(node, 'All <' + nodeName + '> elements must be a direct child of <Alloy>');
-	}
-
-	// only perform compile time checks on nodes in non-widget markup
-	if (!manifest) {
-		// Make sure there's models to be used as the "src" of the Backbone class
-		var modelsPath = path.join(CU.getCompilerConfig().dir.home, CONST.DIR.MODEL);
-		var validModels;
-		if (!path.existsSync(modelsPath) || !(validModels = walkSync(modelsPath)).length) {
-			U.dieWithNode(node, [
-				'You must have a valid model in your app/' + CONST.DIR.MODEL + ' folder to create a <' + nodeName + '>',
-				'Once you have a valid model, assign it like this for a singleton:',
-				'  <' + nodeName + ' src="yourModelName"/>',
-				'Or like this for an instance:',
-				'  <' + nodeName + ' src="yourModelName" instance="true" id="someId"/>'
-			]);
-		}
-
-		// Make sure we have a valid model src
-		var validModelsPrint = '[' + _.map(validModels, function(s) { return s.replace(/\.js$/, ''); }).join(',') + ']';
-		if (!src) {
-			U.dieWithNode(node, [
-				'All ' + U.lcfirst(nodeName) + 's must have a "src" attribute which identifies its base model',
-				'"src" should be the name of a model in your app/' + CONST.DIR.MODEL + ' folder',
-				'Valid models: ' + validModelsPrint
-			]);
-		} else {
-			var modelPath = path.join(modelsPath, src + '.' + CONST.FILE_EXT.MODEL);
-			if (!path.existsSync(modelPath)) {
-				U.dieWithNode(node, [
-					'"src" attribute\'s model "' + src + '" does not exist in app/' + CONST.DIR.MODEL,
-					'Valid models: ' + validModelsPrint
-				]);
-			}
-		}
-	}
-	var createCall = root + '.create' + nodeName + '(\'' + src + '\')';
-
-	// create code based on whether the collection is a singleton or instance
-	if (isSingleton) {
-		if (id) {
-			logger.warn([
-				'Warning with <' + nodeName + '> at line ' + node.lineNumber,
-				'id="' + id + '" will be ignored, as only ' + nodeName + ' instances can have ids, not singletons',
-				'To create an instance of the ' + nodeName + ', add instance="true"',
-				'This instance will be accessible in your controller as $.' + id,
-				'Example: ',
-				'  <' + nodeName + ' src="' + src + '" id="' + id + '" instance="true"/>'
-			]);
-		}
-
-		code += root + '.' + nodeName + 's.instance(\'' + src + '\');';
-		backboneVar = root + '.' + nodeName + 's.' + src;
-
-		// code += backboneVar + ' || (' + backboneVar + ' = ' + createCall + ');';
-	} else {
-		id = id || args.id;
-		backboneVar = '$.' + id;
-		code += backboneVar + ' = ' + createCall + ';';
-	}
-
-	return {
-		code: '',
-		modelCode: code, // modelCode will add this before the UI code
-		args: {
-			symbol: backboneVar
-		}
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract._ItemArray.js b/Alloy/commands/compile/parsers/Alloy.Abstract._ItemArray.js
deleted file mode 100644
index 9471a5467..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract._ItemArray.js
+++ /dev/null
@@ -1,125 +0,0 @@
-var _ = require('lodash'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants');
-
-function fixDefinition(def) {
-	def = def || {};
-	def = _.defaults(def, {
-		parents: [],
-		children: [],
-		translations: [],
-		property: 'items'
-	});
-	return def;
-}
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var def = fixDefinition(state.itemArrayDefinition);
-
-	// Ensure that this _ItemArray has an appropriate parent
-	if (!state.itemsArray) {
-		U.die([
-			'Invalid use of <' + node.nodeName + '> at line ' + node.lineNumber,
-			'Must be the child one of the following: [' + def.parents.join(',') + ']'
-		]);
-	}
-
-	var children = U.XML.getElementsFromNodes(node.childNodes);
-	var isCollectionBound = args[CONST.BIND_COLLECTION] ? true : false;
-	var code = children.length ? 'var ' + state.itemsArray + ' = [];' : '';
-
-	if (node.parentNode.nodeName === 'MenuPopup') {
-		def.children[0] = 'Alloy.Abstract.Item';
-	}
-
-	// Run the translations and/or validations
-	_.each(children, function(child) {
-		var childArgs = CU.getParserArgs(child, state);
-		_.each(def.translations, function(t) {
-			if (childArgs.fullname === t.from) {
-				var match = t.to.match(/^(.+)\.(.+)$/);
-				child.nodeName = match[2];
-				child.setAttribute('ns', match[1]);
-				_.extend(childArgs, {
-					fullname: t.to,
-					name: match[2],
-					ns: match[1]
-				});
-			}
-		});
-
-		// This ItemArray processes all types
-		if (def.children[0] === 'ALL') {
-			if (!isCollectionBound) {
-				code += CU.generateNodeExtended(child, state, {
-					parent: {},
-					post: function(node, s, args) {
-						return state.itemsArray + '.push(' + s.parent.symbol + ');';
-					}
-				});
-			}
-
-		// Make sure the children match the parent
-		} else if (!_.includes(def.children, childArgs.fullname)) {
-			U.die('Invalid child of <' + node.nodeName + '> on line ' + child.lineNumber + ': ' + childArgs.fullname);
-		}
-	});
-
-	if (isCollectionBound) {
-		var localModel = CU.generateUniqueId();
-		var itemCode = '';
-		var itemsVar = CU.generateUniqueId();
-
-		_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-			itemCode += CU.generateNodeExtended(child, state, {
-				parent: {},
-				local: true,
-				model: localModel,
-				post: function(node, state, args) {
-					return itemsVar + '.push(' + state.parent.symbol + ');\n';
-				}
-			});
-		});
-
-		if (state.parentFormFactor || node.hasAttribute('formFactor')) {
-			// if this node or a parent has set the formFactor attribute
-			// we need to pass it to the data binding generator
-			args.parentFormFactor = (state.parentFormFactor || node.getAttribute('formFactor'));
-		}
-		code += _.template(CU.generateCollectionBindingTemplate(args))({
-			localModel: localModel,
-			pre: 'var ' + itemsVar + '=[];',
-			items: itemCode,
-			post: '<%= itemContainer %>.' + def.property + '=' + itemsVar + ';'
-		});
-
-		return {
-			parent: {},
-			code: code
-		};
-	}
-
-	// return an empty state if we already processed
-	if (def.children[0] === 'ALL') {
-		if (state.property === 'leftNavButtons' || state.property === 'rightNavButtons' || state.property === 'toolbar') {
-			code += ((state.parent && state.parent.symbol ? state.parent.symbol : CONST.PARENT_SYMBOL_VAR) + '.' + state.property + ' = ' + state.itemsArray + ';');
-		}
-		return {
-			parent: {},
-			code: code
-		};
-
-	// return the current modified state if we need to continue processing
-	} else {
-		return _.extend(state, {
-			isCollectionBound: isCollectionBound,
-			parent: { node: node },
-			code: code
-		});
-	}
-}
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract._ItemContainer.js b/Alloy/commands/compile/parsers/Alloy.Abstract._ItemContainer.js
deleted file mode 100644
index 4958074b0..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract._ItemContainer.js
+++ /dev/null
@@ -1,123 +0,0 @@
-var _ = require('lodash'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	styler = require('../styler'),
-	logger = require('../../../logger');
-
-function fixDefinition(def) {
-	def = def || {};
-	def = _.defaults(def, {
-		children: [],
-		translations: [],
-		doRemoveNode: def.doRemoveNode || typeof(def.doRemoveNode) === 'undefined',
-		processOthers: def.processOthers || function() {},
-		inViewHierarchy: def.inViewHierarchy || typeof(def.inViewHierarchy) === 'undefined'
-	});
-	return def;
-}
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var def = fixDefinition(state.itemContainerDefinition),
-		config = CU.getCompilerConfig(),
-		isAndroid = config && config.alloyConfig && config.alloyConfig.platform === 'android',
-		androidView = null,
-		extras = [],
-		code = '';
-
-	_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-		var childArgs = CU.getParserArgs(child, state);
-
-		// do translations
-		_.each(def.translations, function(t) {
-			if (childArgs.fullname === t.from) {
-				var match = t.to.match(/^(.+)\.(.+)$/);
-				child.nodeName = match[2];
-				child.setAttribute('ns', match[1]);
-			}
-		});
-
-		// process item arrays if present
-		var theNode = CU.validateNodeName(child, _.map(def.children, 'name'));
-		if (_.find(def.children, function(c) { return c.name === theNode; })) {
-			var childState = {
-				parent: {},
-				itemsArray: CU.generateUniqueId()
-			};
-
-			code += CU.generateNodeExtended(child, state, childState);
-			var prop = _.find(def.children, function(c) { return c.name === theNode; }).property;
-			extras.push([prop, childState.itemsArray]);
-
-			// Only add the extraOptions if they are defined on the child nodes
-			_.each(U.XML.getElementsFromNodes(child.childNodes), (node) => {
-				_.each(state.extraOptions, (varName, name) => {
-					const attr = _.find(node.attributes, ['nodeName', name]);
-					if (attr !== undefined) {
-						extras.push([name, varName]);
-					}
-				});
-			});
-
-
-			// get rid of the node when we're done so we can pass the current state
-			// back to generateNode() and then process any additional views that
-			// need to be added to the view hierarchy
-			if (def.doRemoveNode) {
-				node.removeChild(child);
-			}
-
-		// process potential androidView if defined
-		} else if (def.androidView) {
-			if (androidView === null) {
-				if (isAndroid) {
-					androidView = CU.generateNodeExtended(child, state, {
-						parent: {},
-						post: function(node, state, args) {
-							extras.push(['androidView', state.parent.symbol]);
-						}
-					});
-					code += androidView;
-				} else if (child.getAttribute('platform') !== 'android') {
-					var currentPlatform =  child.getAttribute('platform');
-					var warningLog = [
-						'Additional views in <' + node.nodeName + '> (line ' + node.lineNumber + ') are only supported on Android',
-					];
-					if (!currentPlatform) {
-						warningLog.push('To get rid of this warning, add platform="android" to your child elements');
-					} else {
-						warningLog.push('To get rid of this warning, remove any other platforms from your child elements');
-					}
-					logger.warn(warningLog);
-				}
-			} else {
-				U.die(theNode + ' can only have one androidView');
-			}
-		}
-	});
-
-	if (extras.length) {
-		state.extraStyle = styler.createVariableStyle(extras);
-	}
-	if (!def.inViewHierarchy) {
-		state.parent = {};
-	}
-
-	var outState = require('./default').parse(node, state);
-	if (outState.parent) {
-		code = _.template(code)({
-			itemContainer: outState.parent.symbol
-		});
-	}
-	code += outState.code;
-
-	// Update the parsing state
-	return _.extend(outState, {
-		parent: {},
-		code: code
-	});
-
-}
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract._ProxyProperty.js b/Alloy/commands/compile/parsers/Alloy.Abstract._ProxyProperty.js
deleted file mode 100644
index ce4c6812b..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Abstract._ProxyProperty.js
+++ /dev/null
@@ -1,82 +0,0 @@
-var _ = require('lodash'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants'),
-	logger = require('../../../logger'),
-	util = require('util');
-
-function fixDefinition(def) {
-	def = def || {};
-	def = _.defaults(def, {
-		parents: [],
-		children: []
-	});
-	return def;
-}
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var def = fixDefinition(state.proxyPropertyDefinition),
-		proxyPropertyName = U.lcfirst(node.nodeName),
-		code = '',
-		proxy;
-
-	// validate parent
-	if (def.parents.length > 0 && state.parent && state.parent.node) {
-		if (!CU.validateNodeName(state.parent.node, def.parents)) {
-			U.dieWithNode(node, 'Parent element must one of the following: [' + def.parents.join(',') + ']');
-		}
-	}
-
-	// standard proxy property handling
-	if (node.hasChildNodes()) {
-
-		// process children
-		_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-			var childArgs = CU.getParserArgs(child, state);
-
-			// validate children
-			if (def.children.length > 0) {
-				if (!CU.validateNodeName(child, def.children)) {
-					U.dieWithNode(node, 'Child element must one of the following: [' + def.children.join(',') + ']');
-				}
-			}
-
-			// generate proxy property
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, state, args) {
-					proxy = state.parent.symbol;
-				}
-			});
-		});
-
-	// explicitly create nav buttons from proxy property element
-	} else if (_.includes(['LeftNavButton', 'RightNavButton'], node.nodeName)) {
-		node.nodeName = 'Button';
-		var exState = _.extend(_.clone(state), { parent: {} });
-		var buttonState = require('./Ti.UI.Button').parse(node, exState);
-		code += buttonState.code;
-		proxy = buttonState.parent.symbol;
-
-	// fail if there's no children and its not nav buttons
-	} else {
-		U.dieWithNode(node, '<' + node.nodeName + '> requires a child element');
-	}
-
-	// assign proxy property to parent
-	if (!def.skipAssignParent) {
-		code += (state.parent && state.parent.symbol ? state.parent.symbol : CONST.PARENT_SYMBOL_VAR) +
-				'.' + proxyPropertyName + '=' + proxy + ';';
-	}
-
-	return {
-		parent: {
-			proxyProperty: proxy
-		},
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Alloy.Collection.js b/Alloy/commands/compile/parsers/Alloy.Collection.js
deleted file mode 100644
index f9a30c80d..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Collection.js
+++ /dev/null
@@ -1,3 +0,0 @@
-exports.parse = function(node, state) {
-	return require('./Alloy.Abstract._BackboneClass').parse(node, state);
-};
\ No newline at end of file
diff --git a/Alloy/commands/compile/parsers/Alloy.Model.js b/Alloy/commands/compile/parsers/Alloy.Model.js
deleted file mode 100644
index f9a30c80d..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Model.js
+++ /dev/null
@@ -1,3 +0,0 @@
-exports.parse = function(node, state) {
-	return require('./Alloy.Abstract._BackboneClass').parse(node, state);
-};
\ No newline at end of file
diff --git a/Alloy/commands/compile/parsers/Alloy.Module.js b/Alloy/commands/compile/parsers/Alloy.Module.js
deleted file mode 100644
index 97f01a985..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Module.js
+++ /dev/null
@@ -1,11 +0,0 @@
-exports.parse = function(node, state) {
-	// default handling for View-based modules except ti.map
-	if (node.getAttribute('module') !== 'ti.map' && node.getAttribute('ns') !== 'Alloy.Globals.Map') {
-		node.nodeName = 'View';
-		return require('./default').parse(node, state);
-	} else {
-		// handle map views specially
-		node.nodeName = 'View';
-		return require('./Ti.Map.View').parse(node, state);
-	}
-};
\ No newline at end of file
diff --git a/Alloy/commands/compile/parsers/Alloy.Require.js b/Alloy/commands/compile/parsers/Alloy.Require.js
deleted file mode 100755
index de35184df..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Require.js
+++ /dev/null
@@ -1,144 +0,0 @@
-var path = require('path'),
-	fs = require('fs'),
-	_ = require('lodash'),
-	CU = require('../compilerUtils'),
-	U = require('../../../utils'),
-	styler = require('../styler'),
-	CONST = require('../../../common/constants'),
-	moduleRoot = path.join(__dirname, '..', '..', '..', '..'),
-	TYPES = ['view', 'widget'];
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var code = '',
-		type = node.getAttribute('type') || CONST.REQUIRE_TYPE_DEFAULT,
-		src = node.getAttribute('src'),
-		name = node.getAttribute('name') || CONST.NAME_WIDGET_DEFAULT,
-		method;
-
-	// validate src
-	if (!src) {
-		U.die('<Require> elements must have a "src" attribute.');
-	}
-
-	// determine which Alloy method to use
-	var extraArgs = '';
-	var config = CU.getCompilerConfig();
-	var appPath = config.dir.home;
-	var paths = [];
-
-	var platform;
-	if (config && config.alloyConfig && config.alloyConfig.platform) {
-		platform = config.alloyConfig.platform;
-	}
-
-	switch (type) {
-		case 'view':
-			method = 'createController';
-			if (platform) { paths.push(path.join(appPath, CONST.DIR.VIEW, platform, src)); }
-			paths.push(path.join(appPath, CONST.DIR.VIEW, src));
-			break;
-		case 'widget':
-			method = 'createWidget';
-			extraArgs = "'" + name + "',";
-			U.getWidgetDirectories(appPath).forEach(function(wDir) {
-				if (wDir.manifest.id === src) {
-					if (platform) {
-						paths.push(path.join(wDir.dir, CONST.DIR.VIEW, platform, name));
-					}
-					paths.push(path.join(wDir.dir, CONST.DIR.VIEW, name));
-				}
-			});
-			break;
-		default:
-			U.die('Invalid <Require> type "' + type + '"');
-	}
-
-	// check the extensions on the paths to check
-	var regex = new RegExp('\\.' + CONST.FILE_EXT.VIEW + '$');
-	var found = false;
-	for (var i = 0; i < paths.length; i++) {
-		var fullpath = paths[i];
-		fullpath += regex.test(fullpath) ? '' :  '.' + CONST.FILE_EXT.VIEW;
-		if (fs.existsSync(fullpath)) {
-			found = true;
-			break;
-		}
-	}
-
-	// abort if there's no view to be found
-	if (!found) {
-		U.die([
-			type + ' "' + src + '" ' + (type === 'widget' ? 'view "' + name + '" ' : '') +
-				'does not exist.',
-			'The following paths were inspected:'
-		].concat(paths));
-	}
-
-	// Remove <Require>-specific attributes from createArgs
-	delete args.createArgs.type;
-	delete args.createArgs.src;
-	delete args.createArgs.name;
-
-	// make symbol a local variable if necessary, used for binding
-	if (state.local) {
-		args.symbol = CU.generateUniqueId();
-	}
-
-	// process the children, if any
-	var children = U.XML.getElementsFromNodes(node.childNodes),
-		xChildren = [];
-	_.each(children, function(child) {
-		if (!CU.isNodeForCurrentPlatform(child)) { return; }
-		var childArgs = CU.getParserArgs(child);
-		code += CU.generateNodeExtended(child, state, {
-			parent: {},
-			post: function(node, state, args) {
-				if (state.parent.symbol) {
-					xChildren.push(state.parent.symbol);
-				}
-			}
-		});
-	});
-
-	// add extra createArgs if present
-	var xArgs = {};
-
-	if (xChildren.length) { xArgs.children = '__ALLOY_EXPR__--[' + xChildren.join(',') + ']'; }
-	if (state.model) { xArgs[CONST.BIND_MODEL_VAR] = '__ALLOY_EXPR__--' + state.model; }
-	if (state.parent && state.parent.symbol) {
-		xArgs[CONST.PARENT_SYMBOL_VAR] = '__ALLOY_EXPR__--' + state.parent.symbol;
-	} else if (CU.currentDefaultId !== 'index') {
-		xArgs[CONST.PARENT_SYMBOL_VAR] = '__ALLOY_EXPR__--' + CONST.PARENT_SYMBOL_VAR;
-	}
-	if (state.templateObject) {
-		xArgs[CONST.ITEM_TEMPLATE_VAR] = '__ALLOY_EXPR__--' + state.templateObject;
-	}
-	args.createArgs = _.extend(args.createArgs || {}, xArgs);
-
-	// Generate runtime code
-	code += (state.local ? 'var ' : '') + args.symbol + ' = Alloy.' + method + "('" + src +
-		"'," + extraArgs + styler.generateStyleParams(
-			state.styles,
-			args.classes,
-			args.id,
-			type === 'widget' ? 'Alloy.Widget' : 'Alloy.Require',
-			args.createArgs,
-			state
-		) + ');\n';
-	if (args.parent.symbol && !state.templateObject && !state.androidMenu) {
-		code += args.symbol + '.setParent(' + args.parent.symbol + ');\n';
-	}
-
-	return {
-		parent: {
-			symbol: args.symbol + '.getViewEx({recurse:true})'
-		},
-		controller: args.symbol,
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Alloy.Widget.js b/Alloy/commands/compile/parsers/Alloy.Widget.js
deleted file mode 100644
index 145b55571..000000000
--- a/Alloy/commands/compile/parsers/Alloy.Widget.js
+++ /dev/null
@@ -1,10 +0,0 @@
-exports.parse = function(node, state) {
-
-	if (!node.getAttribute('src') && state.widgetId) {
-		node.setAttribute('src', state.widgetId);
-	}
-
-	node.nodeName = 'Require';
-	node.setAttribute('type', 'widget');
-	return require('./Alloy.Require').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/README.md b/Alloy/commands/compile/parsers/README.md
deleted file mode 100644
index e11b3668c..000000000
--- a/Alloy/commands/compile/parsers/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Parsers for UI components
-
-* default.js - Most tags are processed via the default.js parser. In fact, in most cases, the other parsers pre-process tags before invoking the default.js parser. This parser ultimately calls CU.generateNodeExtended() to create the actual code output to the app.
-* _ProxyProperty* - parsers for properties of proxy objects, such as left/right nav buttons on iOS NavigationWindows.
-* Alloy.Abstract.* - parsers for Alloy-specific tags that don't correspond to a Ti.UI.* object, such as &lt;FixedSpace> which generates a Ti.UI.Button with a specific subset of properties.
-
-The rest of the parsers should be fairly obvious based on their names.
-
-If you need to create a new parser, your best bet is to find a parser that's closest to what you need to use as a basis. There is no "template" from which you can create new parsers. Parsers should be minimalistic, doing only the required pre-processing before calling default.js.
diff --git a/Alloy/commands/compile/parsers/Ti.Android.ActionBar.js b/Alloy/commands/compile/parsers/Ti.Android.ActionBar.js
deleted file mode 100644
index 99220ef9e..000000000
--- a/Alloy/commands/compile/parsers/Ti.Android.ActionBar.js
+++ /dev/null
@@ -1,73 +0,0 @@
-var _ = require('lodash'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants'),
-	logger = require('../../../logger');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var eventObject = 'e',
-		code = '',
-		xmlStyles = {},
-		actionBarProperties = ['title', 'subtitle', CONST.BACKGROUND_IMAGE, CONST.DISPLAY_HOME_AS_UP, CONST.HOME_BUTTON_ENABLED, 'icon', 'logo', CONST.NAVIGATION_MODE, CONST.ON_HOME_ICON_ITEM_SELECTED];
-
-	// if this isn't android, generate no code, but show a warning
-	var config = CU.getCompilerConfig(),
-		platform = config && config.alloyConfig ? config.alloyConfig.platform : undefined;
-	if (platform !== 'android') {
-		if (node.getAttribute('platform') !== 'android') {
-			logger.warn([
-				'<Activity> is only available in Android',
-				'To get rid of this warning, add platform="android" to your <Activity> element'
-			]);
-		}
-		return {
-			parent: {},
-			styles: state.styles,
-			code: ''
-		};
-	}
-
-	var activityTssStyles = _.filter(state.styles, function(elem) {
-		// generates a sorted array of styles filtered to include only elements
-		// associated with the activity (by ID, class, or API name)
-		return elem.key === node.getAttribute('id') || elem.key === node.getAttribute('class') || elem.key === node.nodeName;
-	});
-	// create an object holding all the actionBar-related properties set in the XML
-	_.each(actionBarProperties, function(prop) {
-		if (node.hasAttribute(prop)) {
-			xmlStyles[prop] = node.getAttribute(prop);
-		}
-	});
-	// to respect proper style hierarchy, take the last element in the array (which will be the highest priority)
-	var activityTssKey = _.isArray(activityTssStyles) ? activityTssStyles.length - 1 : 0;
-	if (activityTssStyles[activityTssKey] && activityTssStyles[activityTssKey].style) {
-		_.defaults(xmlStyles, activityTssStyles[activityTssKey].style);
-	}
-	// generate the template code
-	if ((_.filter(_.values(xmlStyles), function(val) { return val !== undefined; })).length > 0) {
-		if (xmlStyles.title)  { code += state.parent.symbol + '.activity.actionBar.title = "' + xmlStyles.title + '";'; }
-		if (xmlStyles.subtitle)  { code += state.parent.symbol + '.activity.actionBar.subtitle = "' + xmlStyles.subtitle + '";'; }
-		if (xmlStyles.backgroundImage)  { code += state.parent.symbol + '.activity.actionBar.backgroundImage = "' + xmlStyles.backgroundImage + '";'; }
-		if (xmlStyles.displayHomeAsUp)  { code += state.parent.symbol + '.activity.actionBar.displayHomeAsUp = ' + xmlStyles.displayHomeAsUp + ';'; }
-		if (xmlStyles.homeButtonEnabled)  { code += state.parent.symbol + '.activity.actionBar.homeButtonEnabled = ' + xmlStyles.homeButtonEnabled + ';'; }
-		if (xmlStyles.icon)  { code += state.parent.symbol + '.activity.actionBar.icon = "' + xmlStyles.icon + '";'; }
-		if (xmlStyles.logo)  { code += state.parent.symbol + '.activity.actionBar.logo = "' + xmlStyles.logo + '";'; }
-		if (xmlStyles.navigationMode)  { code += state.parent.symbol + '.activity.actionBar.navigationMode = ' + xmlStyles.navigationMode + ';'; }
-		if (xmlStyles.onHomeIconItemSelected)  { code += state.parent.symbol + '.activity.actionBar.onHomeIconItemSelected = ' + xmlStyles.onHomeIconItemSelected + ';'; }
-	}
-	// Update the parsing state, and process the template
-	return {
-		parent: {},
-		styles: state.styles,
-		code: U.evaluateTemplate('Ti.Android.ActionBar.js', {
-			parent: state.parent.symbol || CONST.PARENT_SYMBOL_VAR,
-			code: code,
-			eventObject: eventObject,
-			openFunc: CU.generateUniqueId()
-		})
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.Android.Menu.js b/Alloy/commands/compile/parsers/Ti.Android.Menu.js
deleted file mode 100644
index 4e588311a..000000000
--- a/Alloy/commands/compile/parsers/Ti.Android.Menu.js
+++ /dev/null
@@ -1,101 +0,0 @@
-var _ = require('lodash'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants'),
-	logger = require('../../../logger');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var eventObject = 'e',
-		code = '';
-
-	// if this isn't android, generate no code, but show a warning
-	var config = CU.getCompilerConfig(),
-		platform = config && config.alloyConfig ? config.alloyConfig.platform : undefined;
-	if (platform !== 'android') {
-		if (node.getAttribute('platform') !== 'android') {
-			logger.warn([
-				'<Menu> is only available in Android',
-				'To get rid of this warning, add platform="android" to your <Menu> element'
-			]);
-		}
-		return {
-			parent: {},
-			styles: state.styles,
-			code: ''
-		};
-	}
-
-	// Start the onCreateOptionsMenu() call
-	_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-		var childArgs = CU.getParserArgs(child, state);
-		var theNode = CU.validateNodeName(child, 'Ti.Android.MenuItem');
-
-		// Make sure we are dealing with MenuItems
-		if (!theNode) {
-			U.die([
-				'Invalid child type under <Menu>: ' + childArgs.fullname,
-				'<Menu> must have only <MenuItem> elements as children'
-			]);
-		}
-
-		// generate code for the MenuItem
-		code += CU.generateNodeExtended(child, state, {
-			androidMenu: true,
-			parent: {
-				node: node,
-				symbol: eventObject + '.menu'
-			}
-		});
-	});
-
-	// ALOY-784, support Activity properties as attributes of <Menu>
-	var menuTssStyles = _.filter(state.styles, function(elem) {
-		// generates a sorted array of styles filtered to include only elements
-		// associated with the menu (by ID, class, or API name)
-		return elem.key === node.getAttribute('id') || elem.key === node.getAttribute('class') || elem.key === node.nodeName;
-	});
-	var xmlStyles = {
-		title: node.getAttribute('title') ? node.getAttribute('title') : undefined,
-		subtitle: node.getAttribute('subtitle') ? node.getAttribute('subtitle') : undefined,
-		backgroundImage: node.getAttribute('backgroundImage') ? node.getAttribute('backgroundImage') : undefined,
-		displayHomeAsUp: node.getAttribute('displayHomeAsUp') ? node.getAttribute('displayHomeAsUp') : undefined,
-		icon: node.getAttribute('icon') ? node.getAttribute('icon') : undefined,
-		logo: node.getAttribute('logo') ? node.getAttribute('logo') : undefined,
-		navigationMode: node.getAttribute('navigationMode') ? node.getAttribute('navigationMode') : undefined,
-		onHomeIconItemSelected: node.getAttribute('onHomeIconItemSelected') ? node.getAttribute('onHomeIconItemSelected') : undefined
-	};
-	// to respect proper style hierarchy, take the last element in the array (which will be the highest priority)
-	var menuTssKey = _.isArray(menuTssStyles) ? menuTssStyles.length - 1 : 0;
-	if (menuTssStyles[menuTssKey] && menuTssStyles[menuTssKey].style) {
-		_.defaults(xmlStyles, menuTssStyles[menuTssKey].style);
-	}
-	if ((_.filter(_.values(xmlStyles), function(val) { return val !== undefined; })).length > 0) {
-		// TODO: once Android 2.x support is deprecated, remove the if(actionBar) test from the following
-		// to speed up execution of the resulting code
-		code += 'if(' + state.parent.symbol + '.activity.actionBar) {\n';
-		if (xmlStyles.title)  { code += state.parent.symbol + '.activity.actionBar.title = "' + xmlStyles.title + '";'; }
-		if (xmlStyles.subtitle)  { code += state.parent.symbol + '.activity.actionBar.subtitle = "' + xmlStyles.subtitle + '";'; }
-		if (xmlStyles.backgroundImage)  { code += state.parent.symbol + '.activity.actionBar.backgroundImage = "' + xmlStyles.backgroundImage + '";'; }
-		if (xmlStyles.displayHomeAsUp)  { code += state.parent.symbol + '.activity.actionBar.displayHomeAsUp = ' + xmlStyles.displayHomeAsUp + ';'; }
-		if (xmlStyles.icon)  { code += state.parent.symbol + '.activity.actionBar.icon = "' + xmlStyles.icon + '";'; }
-		if (xmlStyles.logo)  { code += state.parent.symbol + '.activity.actionBar.logo = "' + xmlStyles.logo + '";'; }
-		if (xmlStyles.navigationMode)  { code += state.parent.symbol + '.activity.actionBar.navigationMode = ' + xmlStyles.navigationMode + ';'; }
-		if (xmlStyles.onHomeIconItemSelected)  { code += state.parent.symbol + '.activity.actionBar.onHomeIconItemSelected = ' + xmlStyles.onHomeIconItemSelected + ';'; }
-		code += '}\n';
-	}
-	// Update the parsing state
-	return {
-		parent: {},
-		styles: state.styles,
-		code: U.evaluateTemplate('Ti.Android.Menu.js', {
-			parent: state.parent.symbol || CONST.PARENT_SYMBOL_VAR,
-			code: code,
-			eventObject: eventObject,
-			openFunc: CU.generateUniqueId()
-		})
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.Android.MenuItem.js b/Alloy/commands/compile/parsers/Ti.Android.MenuItem.js
deleted file mode 100644
index 97f6a6398..000000000
--- a/Alloy/commands/compile/parsers/Ti.Android.MenuItem.js
+++ /dev/null
@@ -1,56 +0,0 @@
-var CU = require('../compilerUtils'),
-	U = require('../../../utils'),
-	CONST = require('../../../common/constants'),
-	styler = require('../styler'),
-	_ = require('lodash');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var code = '',
-		actionView,
-		createArgs = args.createArgs || {},
-		id,
-		newCode;
-
-	_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-		// process children, of which only ActionView is supported
-		var childArgs = CU.getParserArgs(child, state);
-		var parts = CU.getNodeFullname(child).split('.');
-		if (parts[0] === '_ProxyProperty') {
-			actionView = require('./_ProxyProperty.' + parts[1]).parse(node, state);
-		}
-	});
-	if (actionView) {
-		// add the code to the parent
-		code += actionView.code;
-
-		// expose UI id
-		id = actionView.parent && actionView.parent.symbol;
-		newCode = id ? ('$.' + id.split('.').pop() + '=' + id + ';') : '';
-		code += newCode;
-	}
-
-	var styleObjectCode = styler.generateStyleParams(
-		state.styles,
-		args.classes,
-		args.id,
-		CU.getNodeFullname(node),
-		_.defaults(state.extraStyle || {}, createArgs)
-	);
-
-	return {
-		parent: {},
-		styles: state.styles,
-		code: code + U.evaluateTemplate('Ti.Android.MenuItem.js', {
-			item: args.symbol,
-			parent: state.parent.symbol || CONST.PARENT_SYMBOL_VAR,
-			style: CU.generateUniqueId(),
-			styleCode: styleObjectCode,
-			argsId: args.id,
-			actionView: (actionView && actionView.parent) ? actionView.parent.symbol : false
-		})
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.Map.Annotation.js b/Alloy/commands/compile/parsers/Ti.Map.Annotation.js
deleted file mode 100755
index 423cad263..000000000
--- a/Alloy/commands/compile/parsers/Ti.Map.Annotation.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var styler = require('../styler'),
-	CU = require('../compilerUtils'),
-	_ = require('lodash');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var extraStyle = [];
-	_.each(['latitude', 'longitude'], function(attr) {
-		var geo = node.getAttribute(attr);
-		if (geo) {
-			extraStyle.push([attr, parseFloat(geo)]);
-			node.removeAttribute(attr);
-		}
-	});
-
-	var code = require('./default').parse(node, {
-		parent: {},
-		styles: state.styles,
-		extraStyle: styler.createVariableStyle(extraStyle)
-	}).code;
-
-	return {
-		parent: {
-			node: node,
-			symbol: args.symbol
-		},
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.Map.View.js b/Alloy/commands/compile/parsers/Ti.Map.View.js
deleted file mode 100755
index 5771858a3..000000000
--- a/Alloy/commands/compile/parsers/Ti.Map.View.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var children = U.XML.getElementsFromNodes(node.childNodes),
-		arrayName = CU.generateUniqueId(),
-		code = 'var ' + arrayName + ' = [];\n',
-		itemCode = '',
-		isCollectionBound = args[CONST.BIND_COLLECTION] ? true : false,
-		localModel, controllerSymbol;
-
-	if (isCollectionBound) {
-		_.each(CONST.BIND_PROPERTIES, function(p) {
-			node.removeAttribute(p);
-		});
-	}
-
-	// iterate through all children
-	for (var i = 0, l = children.length; i < l; i++) {
-		var child = children[i],
-			childArgs = CU.getParserArgs(child);
-
-		// Process the Map's Annotations
-		if (childArgs.fullname === 'Ti.Map.Annotation' ||
-			childArgs.fullname === 'Alloy.Require') {
-			// ensure <Require> is actually a single <Annotation>
-			if (childArgs.fullname === 'Alloy.Require') {
-				var inspect = CU.inspectRequireNode(child);
-				if (inspect.length !== 1 || inspect.names[0] !== 'Ti.Map.Annotation') {
-					// The <Require> is not an Annotation, process later
-					continue;
-				}
-			}
-			// generate code for the Annotation
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, state, args) {
-					return arrayName + '.push(' + state.parent.symbol + ');\n';
-				}
-			});
-
-			// When we are done processing the Annotation, remove it from the
-			// markup. That way we can just pass back the current Map state as
-			// the returned state and it can continue to process any other children
-			// without special handling
-			node.removeChild(child);
-		}
-	}
-
-	// Create the initial Map code
-	state.extraStyle = styler.createVariableStyle('annotations', arrayName);
-	var mapState = require('./default').parse(node, state);
-	code += mapState.code;
-
-	if (isCollectionBound) {
-		_.each(CONST.BIND_PROPERTIES, function(p) {
-			node.removeAttribute(p);
-		});
-		localModel = localModel || CU.generateUniqueId();
-
-		if (state.parentFormFactor || node.hasAttribute('formFactor')) {
-			// if this node or a parent has set the formFactor attribute
-			// we need to pass it to the data binding generator
-			args.parentFormFactor = (state.parentFormFactor || node.getAttribute('formFactor'));
-		}
-		// set a custom property for special handling of Annotations in CU.generateCollectionBindingTemplate()
-		args.isDataBoundMap = true;
-		code += _.template(CU.generateCollectionBindingTemplate(args))({
-			localModel: localModel,
-			pre: '',
-			items: itemCode,
-			annotationArray: arrayName,
-			post: args.symbol + '.annotations=' + arrayName + ';'
-		});
-	}
-
-	// Update the parsing state
-	return _.extend(mapState, {code:code});
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.AlertDialog.js b/Alloy/commands/compile/parsers/Ti.UI.AlertDialog.js
deleted file mode 100644
index cf6cb4273..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.AlertDialog.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	state = _.extend(state, {
-		itemContainerDefinition: {
-			children: [
-				{ name:'Alloy.Abstract.ButtonNames', property:'buttonNames' }
-			],
-			androidView: true,
-			inViewHierarchy: false
-		}
-	});
-	return require('./Alloy.Abstract._ItemContainer').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Android.CardView.js b/Alloy/commands/compile/parsers/Ti.UI.Android.CardView.js
deleted file mode 100644
index 228e532cd..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Android.CardView.js
+++ /dev/null
@@ -1,3 +0,0 @@
-exports.parse = function(node, state) {
-	return require('./default').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Android.DrawerLayout.CenterView.js b/Alloy/commands/compile/parsers/Ti.UI.Android.DrawerLayout.CenterView.js
deleted file mode 100644
index e1406320e..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Android.DrawerLayout.CenterView.js
+++ /dev/null
@@ -1,3 +0,0 @@
-exports.parse = function(node, state) {
-	return require('./Ti.UI.Android.DrawerLayout._ProxyProperty').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Android.DrawerLayout.LeftView.js b/Alloy/commands/compile/parsers/Ti.UI.Android.DrawerLayout.LeftView.js
deleted file mode 100644
index e1406320e..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Android.DrawerLayout.LeftView.js
+++ /dev/null
@@ -1,3 +0,0 @@
-exports.parse = function(node, state) {
-	return require('./Ti.UI.Android.DrawerLayout._ProxyProperty').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Android.DrawerLayout.RightView.js b/Alloy/commands/compile/parsers/Ti.UI.Android.DrawerLayout.RightView.js
deleted file mode 100644
index e1406320e..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Android.DrawerLayout.RightView.js
+++ /dev/null
@@ -1,3 +0,0 @@
-exports.parse = function(node, state) {
-	return require('./Ti.UI.Android.DrawerLayout._ProxyProperty').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Android.DrawerLayout._ProxyProperty.js b/Alloy/commands/compile/parsers/Ti.UI.Android.DrawerLayout._ProxyProperty.js
deleted file mode 100644
index f396a59e7..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Android.DrawerLayout._ProxyProperty.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	console.log(' Ti.UI.Android.DrawerLayout');
-	_.extend(state, {
-		proxyPropertyDefinition: {
-			parents: [
-				'Ti.UI.Android.DrawerLayout'
-			]
-		}
-	});
-	return require('./Alloy.Abstract._ProxyProperty').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.AndroidView.js b/Alloy/commands/compile/parsers/Ti.UI.AndroidView.js
deleted file mode 100644
index 41337b5bc..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.AndroidView.js
+++ /dev/null
@@ -1,5 +0,0 @@
-exports.parse = function(node, state) {
-	// AndroidView is simply an instance of Ti.UI.View
-	node.nodeName = 'View';
-	return require('./default').parse(node, state);
-};
\ No newline at end of file
diff --git a/Alloy/commands/compile/parsers/Ti.UI.AttributedString.js b/Alloy/commands/compile/parsers/Ti.UI.AttributedString.js
deleted file mode 100644
index 63674756c..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.AttributedString.js
+++ /dev/null
@@ -1,44 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	tiapp = require('../../../tiapp');
-
-var MIN_VERSION = '3.6.0';
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	if (tiapp.version.lt(tiapp.getSdkVersion(), MIN_VERSION)) {
-		U.die('Ti.UI.AttributedString (line ' + node.lineNumber + ') requires Titanium 3.6.0+');
-	}
-
-	// Get label text from node text, if present
-	var nodeText = U.XML.getNodeText(node);
-	if (nodeText) {
-		if (U.isLocaleAlias(nodeText)) {
-			state.extraStyle = {'text': styler.STYLE_EXPR_PREFIX + nodeText};
-		} else {
-			state.extraStyle = styler.createVariableStyle('text', U.possibleMultilineString(U.trim(nodeText.replace(/'/g, "\\'"))));
-		}
-
-		if (nodeText.match(/\{([^}]+)\}/) !== null) {
-			state.extraStyle = nodeText;
-		}
-	}
-
-	var nodeState = require('./default').parse(node, state);
-	delete state.extraStyle;
-
-	var code = nodeState.code;
-
-	return {
-		parent: {
-			node: node,
-			symbol: args.symbol
-		},
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Button.js b/Alloy/commands/compile/parsers/Ti.UI.Button.js
deleted file mode 100755
index 5c1c4c76c..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Button.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	CU = require('../compilerUtils'),
-	U = require('../../../utils'),
-	tiapp = require('../../../tiapp'),
-	iOSProxy;
-
-var MIN_VERSION = '5.4.0';
-
-var systemButtons = [
-	'ACTION', 'ACTIVITY', 'ADD', 'BOOKMARKS', 'CAMERA', 'CANCEL', 'COMPOSE', 'CONTACT_ADD',
-	'DISCLOSURE', 'DONE', 'EDIT', 'FAST_FORWARD', 'FIXED_SPACE', 'FLEXIBLE_SPACE', 'INFO_DARK',
-	'INFO_LIGHT', 'ORGANIZE', 'PAUSE', 'PLAY', 'REFRESH', 'REPLY', 'REWIND', 'SAVE', 'SPINNER',
-	'STOP', 'TRASH'
-];
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	// Get button title from node text, if present
-	var nodeText = U.XML.getNodeText(node);
-	if (nodeText) {
-		state.extraStyle = styler.createVariableStyle('title', U.possibleMultilineString(U.trim(nodeText.replace(/'/g, "\\'"))));
-	}
-
-	if (tiapp.version.gte(tiapp.getSdkVersion(), MIN_VERSION)) {
-		iOSProxy = 'iOS';
-	} else {
-		iOSProxy = 'iPhone';
-	}
-
-	var systemButton = node.getAttribute('systemButton');
-	if (_.includes(systemButtons, systemButton)) {
-		node.setAttribute('systemButton', 'Ti.UI.' + iOSProxy + '.SystemButton.' + systemButton);
-	}
-
-	// Generate runtime code using default
-	return require('./default').parse(node, state);
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.ButtonBar.js b/Alloy/commands/compile/parsers/Ti.UI.ButtonBar.js
deleted file mode 100644
index 8d1121868..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.ButtonBar.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	state = _.extend(state, {
-		itemContainerDefinition: {
-			children: [
-				{ name:'Alloy.Abstract.BarItemTypes', property:'labels' }
-			],
-			translations: [
-				{ from: 'Alloy.Abstract.Labels', to: 'Alloy.Abstract.BarItemTypes' }
-			]
-		}
-	});
-	return require('./Alloy.Abstract._ItemContainer').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.DashboardView.js b/Alloy/commands/compile/parsers/Ti.UI.DashboardView.js
deleted file mode 100644
index e9ec40cbd..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.DashboardView.js
+++ /dev/null
@@ -1,87 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants');
-
-var VALID = [
-	'Ti.UI.DashboardItem'
-];
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var children = U.XML.getElementsFromNodes(node.childNodes),
-		arrayName = CU.generateUniqueId(),
-		isCollectionBound = args[CONST.BIND_COLLECTION] ? true : false,
-		code = 'var ' + arrayName + '=[];\n';
-
-	// iterate through all children
-	if (!isCollectionBound) {
-		_.each(U.XML.getElementsFromNodes(node.childNodes), function(child, index) {
-			if (CU.validateNodeName(child, VALID)) {
-				// generate code for the DashboardItem
-				code += CU.generateNodeExtended(child, state, {
-					parent: {},
-					post: function(node, state, args) {
-						return arrayName + '.push(' + state.parent.symbol + ');\n';
-					}
-				});
-
-				// When we are done processing the DashboardItem, remove it from the
-				// markup. That way we can just pass back the current DashboardView state as
-				// the returned state and it can continue to process any other children
-				// without special handling
-				node.removeChild(child);
-			}
-		});
-	}
-
-	// Create the initial DashboardView code
-	if (isCollectionBound) {
-		_.each(CONST.BIND_PROPERTIES, function(p) {
-			node.removeAttribute(p);
-		});
-	}
-	state.extraStyle = styler.createVariableStyle('data', arrayName);
-	var dashState = require('./default').parse(node, state);
-	code += dashState.code;
-
-	if (isCollectionBound) {
-		var localModel = CU.generateUniqueId();
-		var itemCode = '';
-		var localArray = 'data';
-
-		_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-			// generate the repeated element
-			itemCode += CU.generateNode(child, {
-				parent: {},
-				local: true,
-				model: localModel,
-				post: function(node, state, args) {
-					return localArray + '.push(' + state.parent.symbol + ');\n';
-				}
-			});
-
-			// remove it from the XML
-			node.removeChild(child);
-		});
-
-		if (state.parentFormFactor || node.hasAttribute('formFactor')) {
-			// if this node or a parent has set the formFactor attribute
-			// we need to pass it to the data binding generator
-			args.parentFormFactor = (state.parentFormFactor || node.getAttribute('formFactor'));
-		}
-		code += _.template(CU.generateCollectionBindingTemplate(args))({
-			localModel: localModel,
-			pre: 'var ' + localArray + '=[];',
-			items: itemCode,
-			post: dashState.parent.symbol + '.data=' + localArray + ';'
-		});
-	}
-
-	// Update the parsing state
-	return _.extend(dashState, {code:code});
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.ImageView.js b/Alloy/commands/compile/parsers/Ti.UI.ImageView.js
deleted file mode 100644
index 4746ef272..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.ImageView.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	// Get image property from the
-	if (node.hasAttribute('image')) {
-		var attr = node.getAttribute('image');
-		node.setAttribute('image', attr.trim());
-	}
-	// Generate runtime code using default
-	return require('./default').parse(node, state);
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Label.js b/Alloy/commands/compile/parsers/Ti.UI.Label.js
deleted file mode 100755
index efcc1ce24..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Label.js
+++ /dev/null
@@ -1,56 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	CU = require('../compilerUtils'),
-	U = require('../../../utils');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var attributedStringsymbol,
-		attributedStringObj = {},
-		code = '';
-
-	_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-		if (CU.validateNodeName(child, 'Ti.UI.AttributedString')) {
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, state, args) {
-					attributedStringsymbol = state.parent.symbol;
-				}
-			});
-
-			node.removeChild(child);
-		}
-	});
-
-	if (attributedStringsymbol) {
-		attributedStringObj = styler.createVariableStyle('attributedString', attributedStringsymbol);
-	}
-
-	// Get label text from node text, if present
-	var nodeText = U.XML.getNodeText(node),
-		textObj = {};
-	if (nodeText && nodeText.trim() !== '') {
-		if (U.isLocaleAlias(nodeText)) {
-			textObj = {'text': styler.STYLE_EXPR_PREFIX + nodeText};
-		} else {
-			textObj = styler.createVariableStyle('text', U.possibleMultilineString(U.trim(nodeText.replace(/'/g, "\\'"))));
-		}
-
-		if (nodeText.match(/\{([^}]+)\}/) !== null) {
-			textObj['text'] = nodeText;
-		}
-	}
-
-	state.extraStyle = _.extend(attributedStringObj, textObj);
-
-	var nodeState = require('./default').parse(node, state);
-	code += nodeState.code;
-
-	// Generate runtime code using default
-	return _.extend(nodeState, {
-		code: code
-	});
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.ListItem.js b/Alloy/commands/compile/parsers/Ti.UI.ListItem.js
deleted file mode 100644
index 1c16e75fd..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.ListItem.js
+++ /dev/null
@@ -1,42 +0,0 @@
-var CU = require('../compilerUtils'),
-	U = require('../../../utils'),
-	styler = require('../styler'),
-	CONST = require('../../../common/constants'),
-	_ = require('lodash');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var code = '';
-
-	// make symbol a local variable if necessary
-	if (state.local) {
-		args.symbol = CU.generateUniqueId();
-	}
-
-	// Generate runtime code
-	code += (state.local ? 'var ' : '') + args.symbol + ' = ';
-	code += styler.generateStyleParams(
-		state.styles,
-		args.classes,
-		args.id,
-		CU.getNodeFullname(node),
-		_.defaults(state.extraStyle || {}, args.createArgs || {}),
-		_.extend(state, { isListItem: true })
-	) + ';';
-
-	// Update the parsing state
-	return {
-		parent: {
-			node: node,
-			symbol: args.symbol
-		},
-		local: state.local || false,
-		model: state.model || undefined,
-		condition: state.condition || undefined,
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.ListSection.js b/Alloy/commands/compile/parsers/Ti.UI.ListSection.js
deleted file mode 100644
index 9d50a89ca..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.ListSection.js
+++ /dev/null
@@ -1,173 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants');
-
-var PROXY_PROPERTIES = [
-	'_ProxyProperty._Lists.HeaderView',
-	'_ProxyProperty._Lists.FooterView'
-];
-var VALID = [
-	'Ti.UI.ListItem'
-];
-var ALL_VALID = _.union(PROXY_PROPERTIES, VALID);
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var code = '',
-		itemCode = '',
-		itemsVar = CU.generateUniqueId(),
-		isDataBound = args[CONST.BIND_COLLECTION] ? true : false,
-		proxyProperties = {},
-		extras = [],
-		itemsArray, localModel;
-
-	// process each child
-	_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-		var fullname = CU.getNodeFullname(child),
-			theNode = CU.validateNodeName(child, ALL_VALID),
-			isProxyProperty = false,
-			isControllerNode = false,
-			hasUiNodes = false,
-			controllerSymbol;
-
-		// validate the child element and determine if it's part of
-		// the table data or a proxy property assigment
-		if (!theNode) {
-			U.dieWithNode(child, 'Ti.UI.TableView child elements must be one of the following: [' + ALL_VALID.join(',') + ']');
-		} else if (!CU.isNodeForCurrentPlatform(child)) {
-			return;
-		} else if (_.includes(CONST.CONTROLLER_NODES, fullname)) {
-			isControllerNode = true;
-		} else if (_.includes(PROXY_PROPERTIES, theNode)) {
-			isProxyProperty = true;
-		}
-
-		// manually handle controller node proxy properties
-		if (isControllerNode) {
-
-			// set up any proxy properties at the top-level of the controller
-			var inspect = CU.inspectRequireNode(child);
-			_.each(_.uniq(inspect.names), function(name) {
-				if (_.includes(PROXY_PROPERTIES, name)) {
-					var prop = U.proxyPropertyNameFromFullname(name);
-					proxyProperties[prop] = '<%= controllerSymbol %>.getProxyPropertyEx("' + prop +
-						'", {recurse:true})';
-				} else {
-					hasUiNodes = true;
-				}
-			});
-		}
-
-		// generate code for proxy property assignments
-		if (isProxyProperty) {
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, state, args) {
-					proxyProperties[U.proxyPropertyNameFromFullname(theNode)] = state.parent.symbol;
-				}
-			});
-
-		// process all ListItems
-		} else if (theNode === 'Ti.UI.ListItem') {
-
-			// set up data bound items
-			if (isDataBound) {
-				localModel = localModel || CU.generateUniqueId();
-				itemCode += CU.generateNodeExtended(child, state, {
-					parent: {},
-					local: true,
-					model: localModel,
-					post: function(node, state, args) {
-						controllerSymbol = state.controller;
-						return itemsVar + '.push(' + state.parent.symbol + ');';
-					}
-				});
-
-			// generate static items
-			} else {
-				if (!itemsArray) {
-					itemsArray = CU.generateUniqueId();
-					code += 'var ' + itemsArray + '=[];';
-				}
-				code += CU.generateNodeExtended(child, state, {
-					parent: {},
-					post: function(node, state, args) {
-						controllerSymbol = state.controller;
-						return itemsArray + '.push(' + state.parent.symbol + ');';
-					}
-				});
-			}
-
-		// if there's no UI nodes inside, just generate it
-		} else if (!hasUiNodes && isControllerNode) {
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, state, args) {
-					controllerSymbol = state.controller;
-				}
-			});
-		}
-
-		// fill in poxy property templates, if present
-		if (isControllerNode) {
-			_.each(proxyProperties, function(v, k) {
-				proxyProperties[k] = _.template(v)({
-					controllerSymbol: controllerSymbol
-				});
-			});
-		}
-	});
-
-	// create the ListView itself
-	if (isDataBound) {
-		_.each(CONST.BIND_PROPERTIES, function(p) {
-			node.removeAttribute(p);
-		});
-	}
-
-	// add all creation time properties to the state
-	_.each(proxyProperties, function(v, k) {
-		extras.push([k, v]);
-	});
-	if (extras.length) { state.extraStyle = styler.createVariableStyle(extras); }
-
-	// create the section
-	var sectionState = require('./default').parse(node, state);
-	code += sectionState.code;
-
-	// add items to the ListView
-	if (itemsArray) {
-		code += sectionState.parent.symbol + '.items=' + itemsArray + ';';
-	}
-
-	// finally, fill in any model-view binding code, if present
-	if (isDataBound) {
-		localModel = localModel || CU.generateUniqueId();
-		var sps = sectionState.parent.symbol;
-
-		if (state.parentFormFactor || node.hasAttribute('formFactor')) {
-			// if this node or a parent has set the formFactor attribute
-			// we need to pass it to the data binding generator
-			args.parentFormFactor = (state.parentFormFactor || node.getAttribute('formFactor'));
-		}
-		code += _.template(CU.generateCollectionBindingTemplate(args))({
-			localModel: localModel,
-			pre: 'var ' + itemsVar + '=[];',
-			items: itemCode,
-			post: 'opts.animation ? ' +
-				sps + '.setItems(' + itemsVar + ', opts.animation) : ' +
-				sps + '.setItems(' + itemsVar + ');'
-		});
-	}
-
-	return {
-		parent: {},
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.ListView.js b/Alloy/commands/compile/parsers/Ti.UI.ListView.js
deleted file mode 100644
index 5c2905e88..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.ListView.js
+++ /dev/null
@@ -1,168 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants');
-
-var PROXY_PROPERTIES = [
-	'_ProxyProperty._Lists.HeaderView',
-	'_ProxyProperty._Lists.FooterView',
-	'_ProxyProperty._Lists.PullView',
-	'_ProxyProperty._Lists.SearchView'
-];
-var SEARCH_PROPERTIES = [
-	'Ti.UI.SearchBar',
-	'Ti.UI.Android.SearchView'
-];
-var REFRESH_PROPERTY = 'Ti.UI.RefreshControl';
-var VALID = [
-	'Ti.UI.ListSection',
-	'Alloy.Abstract.Templates',
-	'Ti.UI.iOS.PreviewContext'
-];
-var ALL_VALID = _.union(PROXY_PROPERTIES, SEARCH_PROPERTIES, [REFRESH_PROPERTY], VALID);
-var ORDER = {
-	'Ti.UI.ListSection': 2,
-	'Alloy.Abstract.Templates': 1
-};
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var isDataBound = args[CONST.BIND_COLLECTION] ? true : false,
-		code = '',
-		proxyProperties = {},
-		sectionArray, templateObject;
-
-	if (isDataBound) {
-		U.dieWithNode(node, "'dataCollection' attribute should be set on <ListSection>.");
-	}
-
-	// sort the children of the ListView
-	var children = _.sortBy(U.XML.getElementsFromNodes(node.childNodes), function(n) {
-		return ORDER[CU.validateNodeName(n, ALL_VALID)] || -1;
-	});
-
-	// process each child
-	_.each(children, function(child) {
-		var fullname = CU.getNodeFullname(child),
-			theNode = CU.validateNodeName(child, ALL_VALID),
-			isSearchBar = false,
-			isRefreshControl = false,
-			isProxyProperty = false,
-			isControllerNode = false,
-			hasUiNodes = false,
-			parentSymbol, controllerSymbol;
-
-		if (!theNode) {
-			U.dieWithNode(child, 'Ti.UI.ListView child elements must be one of the following: [' +
-				ALL_VALID.join(',') + ']');
-		} else if (!CU.isNodeForCurrentPlatform(child)) {
-			return;
-		} else if (_.includes(CONST.CONTROLLER_NODES, fullname)) {
-			isControllerNode = true;
-		} else if (REFRESH_PROPERTY === theNode) {
-			isRefreshControl = true;
-		} else if (_.includes(SEARCH_PROPERTIES, theNode)) {
-			isSearchBar = true;
-		} else if (_.includes(PROXY_PROPERTIES, theNode)) {
-			isProxyProperty = true;
-		}
-
-		// generate the node
-		if (theNode !== 'Alloy.Abstract.Templates') {
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, state, args) {
-					parentSymbol = state.parent.symbol;
-					controllerSymbol = state.controller;
-				}
-			});
-		}
-
-		// manually handle controller node proxy properties
-		if (isControllerNode) {
-
-			// set up any proxy properties at the top-level of the controller
-			var inspect = CU.inspectRequireNode(child);
-			_.each(_.uniq(inspect.names), function(name) {
-				if (_.includes(PROXY_PROPERTIES, name)) {
-					var propertyName = U.proxyPropertyNameFromFullname(name);
-					proxyProperties[propertyName] = controllerSymbol + '.getProxyPropertyEx("' + propertyName + '", {recurse:true})';
-				} else {
-					hasUiNodes = true;
-				}
-			});
-		}
-
-		// generate code for proxy property assignments
-		if (isProxyProperty) {
-			proxyProperties[U.proxyPropertyNameFromFullname(fullname)] = parentSymbol;
-
-		// generate code for search bar
-		} else if (isSearchBar) {
-			proxyProperties.searchView = parentSymbol;
-
-		// generate code for refreshControl
-		} else if (isRefreshControl) {
-			proxyProperties.refreshControl = parentSymbol;
-
-		// generate code for ListSection
-		} else if (theNode === 'Ti.UI.ListSection') {
-			if (!sectionArray) {
-				sectionArray = CU.generateUniqueId();
-				code += 'var ' + sectionArray + '=[];';
-			}
-			code += sectionArray + '.push(' + parentSymbol + ');';
-
-		// handle ItemTemplates
-		} else if (theNode === 'Alloy.Abstract.Templates') {
-			var templateNodes = U.XML.getElementsFromNodes(child.childNodes);
-			_.each(templateNodes, function(template) {
-				var fullname = CU.validateNodeName(template, 'Alloy.Abstract.ItemTemplate');
-				if (!fullname) {
-					U.dieWithNode(template, 'Child element must be one of the following: [Alloy.Abstract.ItemTemplate]');
-				} else if (fullname === 'Alloy.Abstract.ItemTemplate') {
-					if (!templateObject) {
-						templateObject = CU.generateUniqueId();
-						code += 'var ' + templateObject + '={};';
-					}
-					code += CU.generateNodeExtended(template, state, {
-						parent: {},
-						local: true,
-						templateObject: templateObject
-					});
-				}
-			});
-			node.removeChild(child);
-		}
-	});
-
-	// add all creation time properties to the state
-	var extras = [];
-	if (sectionArray) { extras.push(['sections', sectionArray]); }
-	if (templateObject) { extras.push(['templates', templateObject]); }
-	_.each(proxyProperties, function(v, k) {
-		extras.push([k, v]);
-	});
-	// ALOY-1033: manually handle the case where the <SearchBar> is outside
-	// the <ListView> and linked to the list via the searchView attribute
-	if (node.hasAttribute('searchView')) {
-		var attr = node.getAttribute('searchView');
-		extras.push(['searchView', '$.__views.' + attr]);
-		node.removeAttribute('searchView');
-	}
-	if (extras.length) { state.extraStyle = styler.createVariableStyle(extras); }
-
-	// create the ListView itself
-	var listState = require('./default').parse(node, state);
-	code += listState.code;
-
-	return {
-		parent: {},
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.MobileWeb.NavigationGroup.js b/Alloy/commands/compile/parsers/Ti.UI.MobileWeb.NavigationGroup.js
deleted file mode 100644
index 423df05d6..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.MobileWeb.NavigationGroup.js
+++ /dev/null
@@ -1,3 +0,0 @@
-exports.parse = function(node, state) {
-	return require('./Ti.UI.iPhone.NavigationGroup').parse(node, state);
-};
\ No newline at end of file
diff --git a/Alloy/commands/compile/parsers/Ti.UI.NavigationWindow.js b/Alloy/commands/compile/parsers/Ti.UI.NavigationWindow.js
deleted file mode 100644
index e95e0212f..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.NavigationWindow.js
+++ /dev/null
@@ -1,61 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	tiapp = require('../../../tiapp');
-
-const MIN_VERSION_FOR_IOS = '3.1.3';
-const MIN_VERSION = '8.0.0';
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	const tiappSdkVersion = tiapp.getSdkVersion();
-	if (tiapp.version.lt(tiappSdkVersion, MIN_VERSION_FOR_IOS)) {
-		U.die(`Ti.UI.iOS.NavigationWindow (line ${node.lineNumber}) requires Titanium ${MIN_VERSION_FOR_IOS}+`);
-	}
-
-	if (tiapp.version.lt(tiappSdkVersion, MIN_VERSION)) {
-		node.setAttribute('ns', 'Ti.UI.iOS');
-	}
-
-	var children = U.XML.getElementsFromNodes(node.childNodes),
-		err = ['NavigationWindow must have only one child element, which must be a Window'],
-		code = '';
-
-	// NavigationWindow must have 1 window as a child
-	if (children.length !== 1) {
-		U.die(err);
-	}
-
-	var child = children[0],
-		childArgs = CU.getParserArgs(child),
-		theNode = CU.validateNodeName(child, 'Ti.UI.Window'),
-		windowSymbol;
-
-	// generate the code for the Window first
-	if (theNode) {
-		code += CU.generateNodeExtended(child, state, {
-			parent: {},
-			post: function(node, state, args) {
-				windowSymbol = state.parent.symbol;
-			}
-		});
-	} else {
-		err.unshift('Invalid NavigationWindow child "' + childArgs.fullname + '"');
-		U.die(err);
-	}
-
-	// create NavigationWindow with window
-	state.extraStyle = styler.createVariableStyle('window', windowSymbol);
-	code += require('./default').parse(node, state).code;
-
-	// Update the parsing state
-	return {
-		parent: {},
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.OptionDialog.js b/Alloy/commands/compile/parsers/Ti.UI.OptionDialog.js
deleted file mode 100644
index fe28df136..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.OptionDialog.js
+++ /dev/null
@@ -1,32 +0,0 @@
-var _ = require('lodash'),
-	CU = require('../compilerUtils');
-
-exports.parse = function(node, state) {
-	state = _.extend(state, {
-		itemContainerDefinition: {
-			children: [
-				{ name:'Alloy.Abstract.ButtonNames', property:'buttonNames' },
-				{ name:'Alloy.Abstract.Options', property:'options' }
-			],
-			androidView: true,
-			inViewHierarchy: false
-		},
-		extraOptions: {
-			cancel: CU.generateUniqueId(),
-			destructive: CU.generateUniqueId()
-		}
-	});
-
-	const newState = require('./Alloy.Abstract._ItemContainer').parse(node, state);
-
-	const newCode = _.map(state.extraOptions, (varName, name) => {
-		const attr = _.find(node.attributes, ['nodeName', name]);
-		if (attr === undefined) {
-			return;
-		}
-		return `var ${varName} = ${attr && attr.nodeValue}`;
-	}).join(';');
-
-	newState.code = `${newCode};${newState.code}`;
-	return newState;
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Picker.js b/Alloy/commands/compile/parsers/Ti.UI.Picker.js
deleted file mode 100644
index 81195f42c..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Picker.js
+++ /dev/null
@@ -1,137 +0,0 @@
-var _ = require('lodash'),
-	U = require('../../../utils'),
-	logger = require('../../../logger'),
-	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants'),
-	styler = require('../styler');
-
-var ROWS = [
-	'Ti.UI.Row',
-	'Ti.UI.PickerRow',
-];
-var COLUMNS = [
-	'Ti.UI.Column',
-	'Ti.UI.PickerColumn',
-];
-var VALID = _.union(ROWS, COLUMNS);
-var DATETIMETYPES = [
-	'Ti.UI.PICKER_TYPE_DATE',
-	'Ti.UI.PICKER_TYPE_TIME',
-	'Ti.UI.PICKER_TYPE_DATE_AND_TIME',
-	'Ti.UI.PICKER_TYPE_COUNT_DOWN_TIMER',
-	'Titanium.UI.PICKER_TYPE_DATE',
-	'Titanium.UI.PICKER_TYPE_TIME',
-	'Titanium.UI.PICKER_TYPE_DATE_AND_TIME',
-	'Titanium.UI.PICKER_TYPE_COUNT_DOWN_TIMER'
-];
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-
-// TODO: Improve effeciency https://jira.appcelerator.org/browse/ALOY-265
-function parse(node, state, args) {
-	var children = U.XML.getElementsFromNodes(node.childNodes),
-		errBase = 'All <Picker> children must be either columns or rows. ',
-		code = '', arrayName,
-		extras = [];
-
-	// ALOY-263, support date/time type pickers
-	if (node.hasAttribute('type') && _.includes(DATETIMETYPES, node.getAttribute('type'))) {
-		// We have a date or time type picker so cast the string values to date objects
-		var d;
-		if (node.hasAttribute('value')) {
-			d = U.createDate(node.getAttribute('value'));
-			if (U.isValidDate(d, 'value')) {
-				extras.push(['value', 'new Date("' + d.toString() + '")']);
-			}
-		}
-		if (node.hasAttribute('minDate')) {
-			d = U.createDate(node.getAttribute('minDate'));
-			if (U.isValidDate(d, 'minDate')) {
-				extras.push(['minDate', 'new Date("' + d.toString() + '")']);
-			}
-		}
-		if (node.hasAttribute('maxDate')) {
-			d = U.createDate(node.getAttribute('maxDate'));
-			if (U.isValidDate(d, 'maxDate')) {
-				extras.push(['maxDate', 'new Date("' + d.toString() + '")']);
-			}
-		}
-		// Then, handle a couple of boolean date/time related attributes
-		attr = node.getAttribute('format24');
-		extras.push(['format24', attr === 'true']);
-		attr = node.getAttribute('calendarViewShown');
-		extras.push(['calendarViewShown', attr === 'true']);
-		// Finally, add all the new attributes/properties
-		if (extras.length) { state.extraStyle = styler.createVariableStyle(extras); }
-	}
-
-	// Create the initial Picker code
-	code += require('./default').parse(node, state).code;
-
-	// iterate through all children
-	var foundColumn = false;
-	var foundRow = false;
-	for (var i = 0, l = children.length; i < l; i++) {
-		var child = children[i],
-			err = errBase + ' Invalid child at position ' + i,
-			theNode = CU.validateNodeName(child, VALID),
-			isControllerNode = _.includes(CONST.CONTROLLER_NODES, CU.getNodeFullname(child));
-
-		// make sure it's a valid node
-		if (!theNode) {
-			U.dieWithNode(child, 'Ti.UI.Picker child elements must be one of the following: [' + VALID.join(',') + ']');
-
-		// handle columns
-		} else if (_.includes(COLUMNS, theNode)) {
-			foundColumn = true;
-			if (foundRow) {
-				U.die([
-					err,
-					'You can\'t mix columns an rows as children of <Picker>'
-				]);
-			}
-			!isControllerNode && (child.nodeName = 'PickerColumn');
-
-		// handle rows
-		} else if (_.includes(ROWS, theNode)) {
-			foundRow = true;
-			if (foundColumn) {
-				U.die([
-					err,
-					'You can\'t mix columns an rows as children of <Picker>'
-				]);
-			}
-			!isControllerNode && (child.nodeName = 'PickerRow');
-		}
-
-		// create an array to hold the row/column, if necessary
-		if (!arrayName) {
-			arrayName = CU.generateUniqueId();
-			code += 'var ' + arrayName + '=[];';
-		}
-
-		// generate the code for each column/row and add it to the array
-		code += CU.generateNodeExtended(child, state, {
-			parent: {},
-			post: function(node, state, a) {
-				return arrayName + '.push(' + state.parent.symbol + ');\n';
-			}
-		});
-	}
-
-	// add the array of columns/rows to the Picker, if necessary
-	if (arrayName) {
-		code += args.symbol + '.add(' + arrayName + ');\n';
-	}
-
-	// Update the parsing state
-	return {
-		parent: {},
-		styles: state.styles,
-		isViewTemplate: state.isViewTemplate,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.PickerColumn.js b/Alloy/commands/compile/parsers/Ti.UI.PickerColumn.js
deleted file mode 100644
index 55ae11024..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.PickerColumn.js
+++ /dev/null
@@ -1,87 +0,0 @@
-var _ = require('lodash'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants');
-
-var ROWS = [
-	'Ti.UI.Row',
-	'Ti.UI.PickerRow'
-];
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var isDataBound = args[CONST.BIND_COLLECTION] ? true : false,
-		localModel,
-		rowCode = '';
-
-	// generate the code for the table itself
-	if (isDataBound) {
-		_.each(CONST.BIND_PROPERTIES, function(p) {
-			node.removeAttribute(p);
-		});
-	}
-	var code = require('./default').parse(node, state).code;
-
-	// iterate through all children
-	_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-		var theNode = CU.validateNodeName(child, ROWS),
-			isControllerNode = _.includes(CONST.CONTROLLER_NODES, CU.getNodeFullname(child));
-
-		// make sure it's a valid node
-		if (!theNode) {
-			U.dieWithNode(child, 'Ti.UI.PickerColumn child elements must be one of the following: [' + ROWS.join(',') + ']');
-
-		// handle rows
-		} else if (_.includes(ROWS, theNode) && !isControllerNode) {
-			child.nodeName = 'PickerRow';
-		}
-
-		// generate data binding code
-		if (isDataBound) {
-			localModel = localModel || CU.generateUniqueId();
-			rowCode += CU.generateNodeExtended(child, state, {
-				parent: {},
-				model: localModel,
-				post: function(node, state, args) {
-					return 'rows.push(' + state.parent.symbol + ');\n';
-				}
-			});
-		// standard row processing
-		} else {
-
-			// generate the code for each row and add it to the array
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, state, a) {
-					return args.symbol + '.addRow(' + state.parent.symbol + ');\n';
-				}
-			});
-		}
-	});
-
-	// finally, fill in any model-view binding code, if present
-	if (isDataBound) {
-		localModel = localModel || CU.generateUniqueId();
-		if (state.parentFormFactor || node.hasAttribute('formFactor')) {
-			// if this node or a parent has set the formFactor attribute
-			// we need to pass it to the data binding generator
-			args.parentFormFactor = (state.parentFormFactor || node.getAttribute('formFactor'));
-		}
-		code += _.template(CU.generateCollectionBindingTemplate(args))({
-			localModel: localModel,
-			pre: 'var rows=[];\n_.each(' + args.symbol + '.getRows(), function(r) { ' + args.symbol + '.removeRow(r);});\n',
-			items: rowCode,
-			post: '_.each(rows, function(row) { ' + args.symbol + '.addRow(row); });'
-		});
-	}
-
-	// Update the parsing state
-	return {
-		parent: {},
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.ScrollView.js b/Alloy/commands/compile/parsers/Ti.UI.ScrollView.js
deleted file mode 100644
index 18861785c..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.ScrollView.js
+++ /dev/null
@@ -1,40 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var children = U.XML.getElementsFromNodes(node.childNodes),
-		code = '',
-		extras = [],
-		proxyProperties = {};
-
-	_.each(children, function(child, key) {
-		if (child.nodeName === 'RefreshControl') {
-			code += CU.generateNodeExtended(child, state, {
-				parent: { },
-				post: function(node, state, args) {
-					proxyProperties.refreshControl = state.parent.symbol;
-				}
-			});
-			child.nodeType = null;
-		}
-	});
-
-	// add all proxy properties at creation time
-	_.each(proxyProperties, function(v, k) {
-		extras.push([k, v]);
-	});
-
-	// if we got any extras, add them to the state
-	if (extras.length) { state.extraStyle = styler.createVariableStyle(extras); }
-
-	scrollViewState = require('./default').parse(node, state);
-	scrollViewState.code = code + scrollViewState.code;
-
-	return scrollViewState;
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.ScrollableView.js b/Alloy/commands/compile/parsers/Ti.UI.ScrollableView.js
deleted file mode 100755
index 0bddea7b4..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.ScrollableView.js
+++ /dev/null
@@ -1,76 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var children = U.XML.getElementsFromNodes(node.childNodes),
-		arrayName = CU.generateUniqueId(),
-		isCollectionBound = args[CONST.BIND_COLLECTION] ? true : false,
-		code = 'var ' + arrayName + '=[];\n';
-
-	if (!isCollectionBound) {
-		// iterate through all children
-		for (var i = 0, l = children.length; i < l; i++) {
-			var child = children[i];
-
-			// generate the code for the subview
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, state, args) {
-					return (state && state.parent && state.parent.symbol) ? arrayName + '.push(' + state.parent.symbol + ');\n' : '';
-				}
-			});
-		}
-	}
-
-	// create the ScrollableView itself
-	if (isCollectionBound) {
-		_.each(CONST.BIND_PROPERTIES, function(p) {
-			node.removeAttribute(p);
-		});
-	}
-	state.extraStyle = styler.createVariableStyle('views', arrayName);
-	var scrollState = require('./default').parse(node, state);
-	code += scrollState.code;
-
-	if (isCollectionBound) {
-		var localModel = CU.generateUniqueId();
-		var itemCode = '';
-
-		_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-			itemCode += CU.generateNodeExtended(child, state, {
-				parent: {},
-				local: true,
-				model: localModel,
-				post: function(node, state, args) {
-					return 'views.push(' + state.parent.symbol + ');\n';
-				}
-			});
-		});
-
-		if (state.parentFormFactor || node.hasAttribute('formFactor')) {
-			// if this node or a parent has set the formFactor attribute
-			// we need to pass it to the data binding generator
-			args.parentFormFactor = (state.parentFormFactor || node.getAttribute('formFactor'));
-		}
-		code += _.template(CU.generateCollectionBindingTemplate(args))({
-			localModel: localModel,
-			pre: 'var views=[];',
-			items: itemCode,
-			post: scrollState.parent.symbol + '.views=views;'
-		});
-	}
-
-	// Update the parsing state
-	return {
-		parent: {},
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Switch.js b/Alloy/commands/compile/parsers/Ti.UI.Switch.js
deleted file mode 100644
index 3899a8b6c..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Switch.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var styler = require('../styler'),
-	CU = require('../compilerUtils'),
-	U = require('../../../utils');
-
-// regex for ALOY-895
-var BINDING_REGEX = /^\s*\{\s*([^\s]+)\s*\}\s*$/;
-
-var platform = CU.getCompilerConfig().alloyConfig.platform;
-var REQUIRES_VALUE = platform === 'ios';
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	if (node.hasAttribute('value')) {
-		var value = node.getAttribute('value');
-		if (!value.match(BINDING_REGEX)) {
-			// coerce value attribute to boolean if the switch is not bound to a collection
-			state.extraStyle = styler.createVariableStyle('value', value === 'true');
-		}
-	} else if (REQUIRES_VALUE) {
-		// Workaround for https://jira.appcelerator.org/browse/TIMOB-9007
-		state.extraStyle = styler.createVariableStyle('value', false);
-	}
-
-	// Generate runtime code using default
-	return require('./default').parse(node, state);
-}
\ No newline at end of file
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Tab.js b/Alloy/commands/compile/parsers/Ti.UI.Tab.js
deleted file mode 100755
index 91303d893..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Tab.js
+++ /dev/null
@@ -1,48 +0,0 @@
-var _ = require('lodash')._,
-	styler = require('../styler'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var children = U.XML.getElementsFromNodes(node.childNodes),
-		err = ['Tab must have only one child element, which must be a Window'],
-		code = '';
-
-	// Tab must have 1 window as a child
-	if (children.length !== 1) {
-		U.die(err);
-	}
-
-	var child = children[0],
-		childArgs = CU.getParserArgs(child),
-		theNode = CU.validateNodeName(child, ['Ti.UI.Window', 'Ti.UI.NavigationWindow', 'Ti.UI.iOS.SplitWindow', 'Ti.UI.iOS.NavigationWindow']),
-		windowSymbol;
-
-	// generate the code for the Window first
-	if (theNode) {
-		code += CU.generateNodeExtended(child, state, {
-			parent: {},
-			post: function(node, state, args) {
-				windowSymbol = state.parent.symbol;
-			}
-		});
-	} else {
-		err.unshift('Invalid Tab child "' + childArgs.fullname + '"');
-		U.die(err);
-	}
-
-	// create tab with window
-	state.extraStyle = styler.createVariableStyle('window', windowSymbol);
-	code += require('./default').parse(node, state).code;
-
-	// Update the parsing state
-	return {
-		parent: {},
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.TabGroup.js b/Alloy/commands/compile/parsers/Ti.UI.TabGroup.js
deleted file mode 100755
index c8a6141b0..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.TabGroup.js
+++ /dev/null
@@ -1,91 +0,0 @@
-var _ = require('lodash'),
-	U = require('../../../utils'),
-	tiapp = require('../../../tiapp'),
-	CU = require('../compilerUtils'),
-	styler = require('../styler');
-
-// does the current TiSDK for the platform properly support the "tabs" property
-var platform = CU.getCompilerConfig().alloyConfig.platform;
-var SUPPORTS_TABS = platform === 'ios' ||
-	(platform !== 'blackberry' && tiapp.version.gte('3.1.0'));
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var code = '',
-		tabArray, groupState, menuDefer, actionBarDefer;
-
-	if (!SUPPORTS_TABS) {
-		groupState = require('./default').parse(node, state);
-		code += groupState.code;
-	}
-
-	_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-		var theNode = CU.validateNodeName(child, ['Ti.UI.Tab', 'Ti.Android.Menu', 'Ti.Android.ActionBar']);
-		if (theNode) {
-			var ext = { parent: {} };
-			if (theNode === 'Ti.UI.Tab') {
-				// create the tab array
-				if (SUPPORTS_TABS && !tabArray) {
-					tabArray = CU.generateUniqueId();
-					code += 'var ' + tabArray + '=[];';
-				}
-
-				// render the code for adding the tab to the array
-				ext.post = function(node, state, args) {
-					if (SUPPORTS_TABS) {
-						return tabArray + '.push(' + state.parent.symbol + ');';
-					} else {
-						return groupState.parent.symbol + '.addTab(' + state.parent.symbol + ');';
-					}
-				};
-
-				// generate the tab code
-				code += CU.generateNodeExtended(child, state, ext);
-			} else if (theNode === 'Ti.Android.ActionBar') {
-				// don't create the actionbar until after the tabgroup
-				ext.parent.symbol = args.symbol;
-				actionBarDefer = [ child, _.clone(state), { parent: { symbol: args.symbol } } ];
-			} else if (theNode === 'Ti.Android.Menu') {
-				ext.parent.symbol = args.symbol;
-
-				// don't create the menu until after the tabgroup
-				menuDefer = [ child, _.clone(state), { parent: { symbol: args.symbol } } ];
-			}
-		} else {
-			U.die([
-				'Invalid <TabGroup> child type: ' + CU.getNodeFullname(child),
-				'All <TabGroup> children must be <Tab> or <Menu> or <ActionBar>'
-			]);
-		}
-	});
-
-	if (SUPPORTS_TABS) {
-		// attach all created tabs in one shot as the "tabs" property
-		var extras = [];
-		if (tabArray) { extras.push(['tabs', tabArray]); }
-		if (extras.length) { state.extraStyle = styler.createVariableStyle(extras); }
-
-		// Create the TabGroup itself
-		groupState = require('./default').parse(node, state);
-		code += groupState.code;
-	}
-
-	// create the actionbar, if necessary
-	if (actionBarDefer) {
-		code += CU.generateNodeExtended.apply(this, actionBarDefer);
-	}
-	// create the menu last, if necessary
-	if (menuDefer) {
-		code += CU.generateNodeExtended.apply(this, menuDefer);
-	}
-
-	// Update the parsing state
-	return {
-		parent: {},
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.TabbedBar.js b/Alloy/commands/compile/parsers/Ti.UI.TabbedBar.js
deleted file mode 100644
index e7527ff1e..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.TabbedBar.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const tiapp = require('../../../tiapp');
-const CU = require('../compilerUtils');
-const U = require('../../../utils');
-const MIN_VERSION = '8.0.0';
-
-exports.parse = function(node, state) {
-	const tiappSdkVersion = tiapp.getSdkVersion();
-	if (tiapp.version.lt(tiappSdkVersion, MIN_VERSION)) {
-		const platform = CU.getCompilerConfig().alloyConfig.platform;
-		if (platform !== 'ios') {
-			U.die(`Ti.UI.TabbedBar for ${platform} requires Titanium ${MIN_VERSION}+`);
-		}
-		node.setAttribute('ns', 'Ti.UI.iOS');
-	}
-	return require('./Ti.UI.ButtonBar').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.TableView.js b/Alloy/commands/compile/parsers/Ti.UI.TableView.js
deleted file mode 100644
index 16ea54684..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.TableView.js
+++ /dev/null
@@ -1,226 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants'),
-	logger = require('../../../logger');
-
-var PROXY_PROPERTIES = [
-	'_ProxyProperty._Lists.HeaderView',
-	'_ProxyProperty._Lists.FooterView',
-	'_ProxyProperty._Lists.HeaderPullView',
-	'_ProxyProperty._Lists.Search'
-];
-var SEARCH_PROPERTIES = [
-	'Ti.UI.SearchBar',
-	'Ti.UI.Android.SearchView'
-];
-var REFRESH_PROPERTY = 'Ti.UI.RefreshControl';
-var VALID = [
-	'Ti.UI.TableViewRow',
-	'Ti.UI.TableViewSection',
-	'Ti.UI.iOS.PreviewContext'
-];
-var ALL_VALID = _.union(PROXY_PROPERTIES, SEARCH_PROPERTIES, [REFRESH_PROPERTY], VALID);
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var children = U.XML.getElementsFromNodes(node.childNodes),
-		code = '',
-		itemCode = '',
-		isDataBound = args[CONST.BIND_COLLECTION] ? true : false,
-		extras = [],
-		proxyProperties = {},
-		localModel, arrayName, controllerSymbol;
-
-	if (state.parentFormFactor || node.hasAttribute('formFactor')) {
-		// if this node or a parent has set the formFactor attribute
-		// we need to pass it to the data binding generator
-		args.parentFormFactor = (state.parentFormFactor || node.getAttribute('formFactor'));
-	}
-
-	// iterate through all children of the TableView
-	_.each(children, function(child) {
-		var config = CU.getCompilerConfig(),
-			platform = config && config.alloyConfig ? config.alloyConfig.platform : undefined;
-		if (child.nodeName === 'SearchView' && platform !== 'android') {
-			if (child.getAttribute('platform') !== 'android') {
-				logger.warn([
-					'<SearchView> is only available in Android',
-					'To get rid of this warning, add platform="android" to your <SearchView> element'
-				]);
-			}
-			return;
-		}
-		if (child.nodeName === 'SearchView' && !child.hasAttribute('ns')) {
-			child.setAttribute('ns', 'Ti.UI.Android');
-		}
-		var fullname = CU.getNodeFullname(child),
-			theNode = CU.validateNodeName(child, ALL_VALID),
-			isSearchBar = false,
-			isRefreshControl = false,
-			isProxyProperty = false,
-			isControllerNode = false,
-			hasUiNodes = false;
-
-		// validate the child element and determine if it's part of
-		// the table data, a searchbar, or a proxy property assigment
-		if (!theNode) {
-			U.dieWithNode(child, 'Ti.UI.TableView child elements must be one of the following: [' + ALL_VALID.join(',') + ']');
-		} else if (!CU.isNodeForCurrentPlatform(child)) {
-			return;
-		} else if (_.includes(CONST.CONTROLLER_NODES, fullname)) {
-			isControllerNode = true;
-		} else if (REFRESH_PROPERTY === theNode) {
-			isRefreshControl = true;
-		} else if (_.includes(SEARCH_PROPERTIES, theNode)) {
-			isSearchBar = true;
-		} else if (_.includes(PROXY_PROPERTIES, theNode)) {
-			isProxyProperty = true;
-		}
-
-		// manually handle controller node proxy properties
-		if (isControllerNode) {
-
-			// set up any proxy properties at the top-level of the controller
-			var inspect = CU.inspectRequireNode(child);
-			_.each(_.uniq(inspect.names), function(name) {
-				if (_.includes(PROXY_PROPERTIES, name)) {
-					var propertyName = U.proxyPropertyNameFromFullname(name);
-					proxyProperties[propertyName] = '<%= controllerSymbol %>.getProxyPropertyEx("' +
-						propertyName + '", {recurse:true})';
-				} else {
-					hasUiNodes = true;
-				}
-			});
-		}
-
-		// generate code for proxy property assignments
-		if (isProxyProperty) {
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, _state, _args) {
-					if (_args.formFactor) {
-						state.styles.push({
-							isId: true,
-							key: args.id,
-							queries: { formFactor: _args.formFactor },
-							style: styler.createVariableStyle(_state.propertyName, _state.parent.symbol)
-						});
-					} else {
-						proxyProperties[U.proxyPropertyNameFromFullname(fullname)] = _state.parent.symbol;
-					}
-				}
-			});
-
-		// generate code for search bar
-		} else if (isSearchBar) {
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, state, args) {
-					proxyProperties.search = state.parent.symbol;
-				}
-			});
-
-		// generate code for refreshControl
-		} else if (isRefreshControl) {
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, state, args) {
-					proxyProperties.refreshControl = state.parent.symbol;
-				}
-			});
-
-		// are there UI elements yet to process?
-		} else if (hasUiNodes || !isControllerNode) {
-
-			// generate data binding code
-			if (isDataBound) {
-				localModel = localModel || CU.generateUniqueId();
-				itemCode += CU.generateNodeExtended(child, state, {
-					parent: {},
-					local: true,
-					model: localModel,
-					post: function(node, state, args) {
-						controllerSymbol = state.controller;
-						return 'rows.push(' + state.parent.symbol + ');\n';
-					}
-				});
-
-			// standard row/section processing
-			} else {
-				if (!arrayName) {
-					arrayName = CU.generateUniqueId();
-					code += 'var ' + arrayName + '=[];';
-				}
-				code += CU.generateNodeExtended(child, state, {
-					parent: {},
-					post: function(node, state, args) {
-						controllerSymbol = state.controller;
-						return arrayName + '.push(' + state.parent.symbol + ');';
-					}
-				});
-			}
-
-		// if there's no UI nodes inside, just generate it
-		} else if (!hasUiNodes && isControllerNode) {
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, state, args) {
-					controllerSymbol = state.controller;
-				}
-			});
-		}
-
-		// fill in proxy property templates, if present
-		if (isControllerNode) {
-			_.each(proxyProperties, function(v, k) {
-				proxyProperties[k] = _.template(v)({
-					controllerSymbol: controllerSymbol
-				});
-			});
-		}
-
-	});
-
-	// add data at creation time
-	if (arrayName) { extras.push(['data', arrayName]); }
-
-	// add all proxy properties at creation time
-	_.each(proxyProperties, function(v, k) {
-		extras.push([k, v]);
-	});
-
-	// if we got any extras, add them to the state
-	if (extras.length) { state.extraStyle = styler.createVariableStyle(extras); }
-
-	// generate the code for the table itself
-	if (isDataBound) {
-		_.each(CONST.BIND_PROPERTIES, function(p) {
-			node.removeAttribute(p);
-		});
-	}
-	var tableState = require('./default').parse(node, state);
-	code += tableState.code;
-
-	// finally, fill in any model-view binding code, if present
-	if (isDataBound) {
-		localModel = localModel || CU.generateUniqueId();
-		code += _.template(CU.generateCollectionBindingTemplate(args))({
-			localModel: localModel,
-			pre: 'var rows=[];',
-			items: itemCode,
-			post: tableState.parent.symbol + '.setData(rows);'
-		});
-	}
-
-	// Update the parsing state
-	return {
-		parent: {},
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.TableViewSection.js b/Alloy/commands/compile/parsers/Ti.UI.TableViewSection.js
deleted file mode 100644
index d2e85cf28..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.TableViewSection.js
+++ /dev/null
@@ -1,118 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants');
-
-var PROXY_PROPERTIES = [
-	'_ProxyProperty._Lists.HeaderView',
-	'_ProxyProperty._Lists.FooterView'
-];
-var VALID = [
-	'Ti.UI.TableViewRow'
-];
-var ALL_VALID = _.union(PROXY_PROPERTIES, VALID);
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var code = '',
-		rowCode = '',
-		extras = [],
-		proxyProperties = {};
-
-	// iterate through all children of the TableView
-	_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-		var fullname = CU.getNodeFullname(child),
-			theNode = CU.validateNodeName(child, ALL_VALID),
-			isProxyProperty = false,
-			isControllerNode = false,
-			hasUiNodes = false,
-			parentSymbol, controllerSymbol;
-
-		// validate the child element and determine if it's part of
-		// the table data or a proxy property assigment
-		if (!theNode) {
-			U.dieWithNode(child, 'Ti.UI.TableView child elements must be one of the following: [' + ALL_VALID.join(',') + ']');
-		} else if (!CU.isNodeForCurrentPlatform(child)) {
-			return;
-		} else if (_.includes(CONST.CONTROLLER_NODES, fullname)) {
-			isControllerNode = true;
-		} else if (_.includes(PROXY_PROPERTIES, theNode)) {
-			isProxyProperty = true;
-		}
-
-		// manually handle controller node proxy properties
-		if (isControllerNode) {
-
-			// generate the controller node
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, state, args) {
-					parentSymbol = state.parent.symbol;
-					controllerSymbol = state.controller;
-				}
-			});
-
-			// set up any proxy properties at the top-level of the controller
-			var inspect = CU.inspectRequireNode(child);
-			_.each(_.uniq(inspect.names), function(name) {
-				if (_.includes(PROXY_PROPERTIES, name)) {
-					var prop = U.proxyPropertyNameFromFullname(name);
-					proxyProperties[prop] = controllerSymbol + '.getProxyPropertyEx("' + prop + '", {recurse:true})';
-				} else {
-					hasUiNodes = true;
-				}
-			});
-
-			if (hasUiNodes) {
-				rowCode += '<%= sectionSymbol %>.add(' + parentSymbol + ');';
-			}
-		}
-
-		// generate code for proxy property assignments
-		if (isProxyProperty) {
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, state, args) {
-					proxyProperties[U.proxyPropertyNameFromFullname(theNode)] = state.parent.symbol;
-				}
-			});
-
-		// generate code for the static row
-		} else if (!isControllerNode) {
-			rowCode += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, state, args) {
-					return '<%= sectionSymbol %>.add(' + state.parent.symbol + ');';
-				}
-			});
-		}
-	});
-
-	// add all creation time properties to the state
-	_.each(proxyProperties, function(v, k) {
-		extras.push([k, v]);
-	});
-	if (extras.length) { state.extraStyle = styler.createVariableStyle(extras); }
-
-	// generate the code for the section itself
-	var tableState = require('./default').parse(node, state);
-	code += tableState.code;
-
-	// add the rows to the section
-	if (rowCode) {
-		code += _.template(rowCode)({
-			sectionSymbol: tableState.parent.symbol
-		});
-	}
-
-	// Update the parsing state
-	return {
-		parent: {},
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.TextArea.js b/Alloy/commands/compile/parsers/Ti.UI.TextArea.js
deleted file mode 100644
index c0b328e20..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.TextArea.js
+++ /dev/null
@@ -1,141 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	CU = require('../compilerUtils'),
-	U = require('../../../utils'),
-	CONST = require('../../../common/constants');
-
-var KEYBOARD_TYPES = [
-	'DEFAULT', 'ASCII', 'NUMBERS_PUNCTUATION', 'URL', 'EMAIL', 'DECIMAL_PAD', 'NAMEPHONE_PAD',
-	'NUMBER_PAD', 'PHONE_PAD'
-];
-var RETURN_KEY_TYPES = [
-	'DEFAULT', 'DONE', 'EMERGENCY_CALL', 'GO', 'GOOGLE', 'JOIN', 'NEXT', 'ROUTE',
-	'SEARCH', 'SEND', 'YAHOO'
-];
-var AUTOCAPITALIZATION_TYPES = [
-	'ALL', 'NONE', 'SENTENCES', 'WORDS'
-];
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var code = '',
-		postCode = '',
-		extras = [],
-		proxyProperties = {};
-
-	// iterate through all children of the TextArea
-	_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-		var fullname = CU.getNodeFullname(child),
-			isProxyProperty = false,
-			isControllerNode = false,
-			isAttributedString = false,
-			hasUiNodes = false,
-			controllerSymbol,
-			parentSymbol;
-
-		// validate the child element and determine if it's part of
-		// the textarea or a proxy property assigment
-		if (!CU.isNodeForCurrentPlatform(child)) {
-			return;
-		} else if (_.includes(CONST.CONTROLLER_NODES, fullname)) {
-			isControllerNode = true;
-		} else if (fullname.split('.')[0] === '_ProxyProperty') {
-			isProxyProperty = true;
-		} else if (CU.validateNodeName(child, 'Ti.UI.AttributedString')) {
-			isAttributedString = true;
-		}
-
-		// generate the node
-		code += CU.generateNodeExtended(child, state, {
-			parent: {},
-			post: function(node, state, args) {
-				controllerSymbol = state.controller;
-				parentSymbol = state.parent ? state.parent.symbol : null;
-			}
-		});
-
-		// manually handle controller node proxy properties
-		if (isControllerNode) {
-
-			// set up any proxy properties at the top-level of the controller
-			var inspect = CU.inspectRequireNode(child);
-			_.each(_.uniq(inspect.names), function(name) {
-				if (name.split('.')[0] === '_ProxyProperty') {
-					var prop = U.proxyPropertyNameFromFullname(name);
-					proxyProperties[prop] = controllerSymbol + '.getProxyPropertyEx("' + prop + '", {recurse:true})';
-				} else {
-					hasUiNodes = true;
-				}
-			});
-		}
-
-		// generate code for proxy property assignments
-		if (isProxyProperty) {
-			proxyProperties[U.proxyPropertyNameFromFullname(fullname)] = parentSymbol;
-
-		// generate code for the attribtuedString
-		} else if (isAttributedString) {
-			proxyProperties.attributedString = parentSymbol;
-			node.removeChild(child);
-
-		// generate code for the child components
-		} else if (hasUiNodes || !isControllerNode) {
-			postCode += '<%= parentSymbol %>.add(' + parentSymbol + ');';
-		}
-
-	});
-
-	// support shortcuts for keyboard type, return key type, and autocapitalization
-	var keyboardType = node.getAttribute('keyboardType');
-	if (_.includes(KEYBOARD_TYPES, keyboardType.toUpperCase())) {
-		node.setAttribute('keyboardType', 'Ti.UI.KEYBOARD_' + keyboardType.toUpperCase());
-	}
-	var returnKey = node.getAttribute('returnKeyType');
-	if (_.includes(RETURN_KEY_TYPES, returnKey.toUpperCase())) {
-		node.setAttribute('returnKeyType', 'Ti.UI.RETURNKEY_' + returnKey.toUpperCase());
-	}
-	var autocapitalization = node.getAttribute('keyboardType');
-	if (_.includes(AUTOCAPITALIZATION_TYPES, autocapitalization.toUpperCase())) {
-		node.setAttribute('autocapitalization', 'Ti.UI.TEXT_AUTOCAPITALIZATION_' + autocapitalization.toUpperCase());
-	}
-
-	// add all creation time properties to the state
-	if (node.hasAttribute('clearOnEdit')) {
-		var attr = node.getAttribute('clearOnEdit');
-		extras.push(['clearOnEdit', attr === 'true']);
-	}
-	_.each(proxyProperties, function(v, k) {
-		extras.push([k, v]);
-	});
-	if (extras.length) { state.extraStyle = styler.createVariableStyle(extras); }
-
-	const nodeText = U.XML.getNodeText(node);
-	if (nodeText && nodeText.trim() !== '') {
-		state.extraStyle = state.extraStyle || {};
-		if (U.isLocaleAlias(nodeText)) {
-			state.extraStyle['value'] = styler.STYLE_EXPR_PREFIX + nodeText;
-		} else {
-			_.extend(state.extraStyle, styler.createVariableStyle('value', U.possibleMultilineString(U.trim(nodeText.replace(/'/g, "\\'")))));
-		}
-	}
-
-	// generate the code for the textarea itself
-	var nodeState = require('./default').parse(node, state);
-	code += nodeState.code;
-
-	// add the rows to the section
-	if (nodeState.parent && postCode) {
-		code += _.template(postCode)({
-			parentSymbol: nodeState.parent.symbol
-		});
-	}
-
-	// Update the parsing state
-	return _.extend(state, {
-		parent: nodeState.parent,
-		code: code
-	});
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.TextField.js b/Alloy/commands/compile/parsers/Ti.UI.TextField.js
deleted file mode 100644
index b586a3482..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.TextField.js
+++ /dev/null
@@ -1,155 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants');
-
-var KEYBOARD_TYPES = [
-	'DEFAULT', 'ASCII', 'NUMBERS_PUNCTUATION', 'URL', 'EMAIL', 'DECIMAL_PAD', 'NAMEPHONE_PAD',
-	'NUMBER_PAD', 'PHONE_PAD'
-];
-var RETURN_KEY_TYPES = [
-	'DEFAULT', 'DONE', 'EMERGENCY_CALL', 'GO', 'GOOGLE', 'JOIN', 'NEXT', 'ROUTE',
-	'SEARCH', 'SEND', 'YAHOO'
-];
-var AUTOCAPITALIZATION_TYPES = [
-	'ALL', 'NONE', 'SENTENCES', 'WORDS'
-];
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var code = '',
-		postCode = '',
-		extras = [],
-		proxyProperties = {};
-
-	// iterate through all children of the TextField
-	_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-		var fullname = CU.getNodeFullname(child),
-			isProxyProperty = false,
-			isControllerNode = false,
-			isAttributedString = false,
-			isAttributedHintText = false,
-			hasUiNodes = false,
-			controllerSymbol,
-			parentSymbol;
-
-		if (child.nodeName === 'AttributedHintText') {
-			child.nodeName = 'AttributedString';
-			isAttributedHintText = true;
-		}
-
-		// validate the child element and determine if it's part of
-		// the textfield or a proxy property assigment
-		if (!CU.isNodeForCurrentPlatform(child)) {
-			return;
-		} else if (_.includes(CONST.CONTROLLER_NODES, fullname)) {
-			isControllerNode = true;
-		} else if (fullname.split('.')[0] === '_ProxyProperty') {
-			isProxyProperty = true;
-		} else if (CU.validateNodeName(child, 'Ti.UI.AttributedString')) {
-			if (!isAttributedHintText) {
-				isAttributedString = true;
-			}
-		}
-
-		// generate the node
-		code += CU.generateNodeExtended(child, state, {
-			parent: {},
-			post: function(node, state, args) {
-				controllerSymbol = state.controller;
-				parentSymbol = state.parent ? state.parent.symbol : state.item.symbol;
-			}
-		});
-
-		// manually handle controller node proxy properties
-		if (isControllerNode) {
-
-			// set up any proxy properties at the top-level of the controller
-			var inspect = CU.inspectRequireNode(child);
-			_.each(_.uniq(inspect.names), function(name) {
-				if (name.split('.')[0] === '_ProxyProperty') {
-					var prop = U.proxyPropertyNameFromFullname(name);
-					proxyProperties[prop] = controllerSymbol + '.getProxyPropertyEx("' + prop + '", {recurse:true})';
-				} else {
-					hasUiNodes = true;
-				}
-			});
-		}
-
-		// generate code for proxy property assignments
-		if (isProxyProperty) {
-			proxyProperties[U.proxyPropertyNameFromFullname(fullname)] = parentSymbol;
-
-		// generate code for the attribtuedString
-		} else if (isAttributedString) {
-			proxyProperties.attributedString = parentSymbol;
-			node.removeChild(child);
-
-		// generate code for the attribtuedHintText
-		} else if (isAttributedHintText) {
-			proxyProperties.attributedHintText = parentSymbol;
-			node.removeChild(child);
-
-		// generate code for the child components
-		} else if (hasUiNodes || !isControllerNode) {
-			postCode += '<%= parentSymbol %>.add(' + parentSymbol + ');';
-		}
-
-	});
-
-	// support shortcuts for keyboard type, return key type, and autocapitalization
-	var keyboardType = node.getAttribute('keyboardType');
-	if (_.includes(KEYBOARD_TYPES, keyboardType.toUpperCase())) {
-		node.setAttribute('keyboardType', 'Ti.UI.KEYBOARD_' + keyboardType.toUpperCase());
-	}
-	var returnKey = node.getAttribute('returnKeyType');
-	if (_.includes(RETURN_KEY_TYPES, returnKey.toUpperCase())) {
-		node.setAttribute('returnKeyType', 'Ti.UI.RETURNKEY_' + returnKey.toUpperCase());
-	}
-	var autocapitalization = node.getAttribute('keyboardType');
-	if (_.includes(AUTOCAPITALIZATION_TYPES, autocapitalization.toUpperCase())) {
-		node.setAttribute('autocapitalization', 'Ti.UI.TEXT_AUTOCAPITALIZATION_' + autocapitalization.toUpperCase());
-	}
-
-
-	// add all creation time properties to the state
-	if (node.hasAttribute('clearOnEdit')) {
-		var attr = node.getAttribute('clearOnEdit');
-		extras.push(['clearOnEdit', attr === 'true']);
-	}
-	_.each(proxyProperties, function(v, k) {
-		extras.push([k, v]);
-	});
-	if (extras.length) { state.extraStyle = styler.createVariableStyle(extras); }
-
-	const nodeText = U.XML.getNodeText(node);
-	if (nodeText && nodeText.trim() !== '') {
-		state.extraStyle = state.extraStyle || {};
-		if (U.isLocaleAlias(nodeText)) {
-			state.extraStyle['value'] = styler.STYLE_EXPR_PREFIX + nodeText;
-		} else {
-			_.extend(state.extraStyle, styler.createVariableStyle('value', U.possibleMultilineString(U.trim(nodeText.replace(/'/g, "\\'")))));
-		}
-	}
-
-	// generate the code for the textfield itself
-	var nodeState = require('./default').parse(node, state);
-	code += nodeState.code;
-
-	// add the rows to the section
-	if (nodeState.parent && postCode) {
-		code += _.template(postCode)({
-			parentSymbol: nodeState.parent.symbol
-		});
-	}
-
-	// Update the parsing state
-	return _.extend(state, {
-		parent: nodeState.parent,
-		code: code
-	});
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Toolbar.js b/Alloy/commands/compile/parsers/Ti.UI.Toolbar.js
deleted file mode 100644
index 3295bd3f2..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Toolbar.js
+++ /dev/null
@@ -1,73 +0,0 @@
-var _ = require('lodash'),
-	tiapp = require('../../../tiapp'),
-	U = require('../../../utils'),
-	CONST = require('../../../common/constants'),
-	CU = require('../compilerUtils');
-
-exports.parse = function(node, state) {
-	var platform = CU.getCompilerConfig().alloyConfig.platform;
-	if (tiapp.version.lt(tiapp.getSdkVersion(), '6.2.0')) {
-		if (platform !== 'ios') {
-			U.die('Ti.UI.Toolbar requires Titanium 6.2.0+');
-		}
-		node.setAttribute('ns', 'Ti.UI.iOS');
-	}
-
-	var eventObject = 'e',
-		code = '',
-		xmlStyles = {};
-	// Properties inherited from ActionBar when Toolbar is passed to the Activity
-	var inheritedProperties = [CONST.BACKGROUND_IMAGE, CONST.DISPLAY_HOME_AS_UP, CONST.HOME_BUTTON_ENABLED, CONST.NAVIGATION_MODE, CONST.ON_HOME_ICON_ITEM_SELECTED];
-
-	state = _.extend(state, {
-		itemContainerDefinition: {
-			children: [
-				{ name: 'Alloy.Abstract.Items', property: 'items' }
-			]
-		}
-	});
-
-	var tempRes = require('./Alloy.Abstract._ItemContainer').parse(node, state);
-
-	// Only if the Ti.UI.Toolbar is passed as an ActionBar to the activity
-	if (state.parent && state.parent.node && state.parent.node.getAttribute('customToolbar') === node.getAttribute('id')) {
-
-		var activityTssStyles = _.filter(state.styles, function(elem) {
-			// Generates a sorted array of styles filtered to include only elements
-			// associated with the activity (by ID, class, or API name)
-			return elem.key === node.getAttribute('id') || elem.key === node.getAttribute('class') || elem.key === node.nodeName;
-		});
-		// Create an object holding all the actionBar-related properties set in the XML
-		_.each(inheritedProperties, function(prop) {
-			if (node.hasAttribute(prop)) {
-				xmlStyles[prop] = node.getAttribute(prop);
-			}
-		});
-		// To respect proper style hierarchy, take the last element in the array (which will be the highest priority)
-		var activityTssKey = _.isArray(activityTssStyles) ? activityTssStyles.length - 1 : 0;
-		if (activityTssStyles[activityTssKey] && activityTssStyles[activityTssKey].style) {
-			_.defaults(xmlStyles, activityTssStyles[activityTssKey].style);
-		}
-		// Generate the template code
-		if ((_.filter(_.values(xmlStyles), function(val) { return val !== undefined; })).length > 0) {
-			code += state.parent.symbol + '.activity.setSupportActionBar($.__views.' + node.getAttribute('id') + ');';
-			if (xmlStyles.backgroundImage)  { code += state.parent.symbol + '.activity.actionBar.backgroundImage = "' + xmlStyles.backgroundImage + '";'; }
-			if (xmlStyles.displayHomeAsUp)  { code += state.parent.symbol + '.activity.actionBar.displayHomeAsUp = ' + xmlStyles.displayHomeAsUp + ';'; }
-			if (xmlStyles.homeButtonEnabled)  { code += state.parent.symbol + '.activity.actionBar.homeButtonEnabled = ' + xmlStyles.homeButtonEnabled + ';'; }
-			if (xmlStyles.navigationMode)  { code += state.parent.symbol + '.activity.actionBar.navigationMode = ' + xmlStyles.navigationMode + ';'; }
-			if (xmlStyles.onHomeIconItemSelected)  { code += state.parent.symbol + '.activity.actionBar.onHomeIconItemSelected = ' + xmlStyles.onHomeIconItemSelected + ';'; }
-		}
-
-		tempRes.code += U.evaluateTemplate('Ti.Android.ActionBar.js', {
-			parent: state.parent.symbol || CONST.PARENT_SYMBOL_VAR,
-			code: code,
-			eventObject: eventObject,
-			openFunc: CU.generateUniqueId()
-		});
-	}
-	return {
-		parent: {},
-		styles: tempRes.styles,
-		code: tempRes.code
-	};
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.WebView.js b/Alloy/commands/compile/parsers/Ti.UI.WebView.js
deleted file mode 100644
index 0303de4ef..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.WebView.js
+++ /dev/null
@@ -1,13 +0,0 @@
-const styler = require('../styler');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	const linkHandler = node.getAttribute('onlink');
-	if (linkHandler) {
-		node.setAttribute('onlink', `${styler.STYLE_EXPR_PREFIX}${linkHandler}`);
-	}
-	return require('./default').parse(node, state, args);
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Window.LeftNavButton.js b/Alloy/commands/compile/parsers/Ti.UI.Window.LeftNavButton.js
deleted file mode 100644
index a8ac13e28..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Window.LeftNavButton.js
+++ /dev/null
@@ -1,3 +0,0 @@
-exports.parse = function(node, state) {
-	return require('./Ti.UI.Window._ProxyProperty').parse(node, state);
-};
\ No newline at end of file
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Window.LeftNavButtons.js b/Alloy/commands/compile/parsers/Ti.UI.Window.LeftNavButtons.js
deleted file mode 100644
index e286b6640..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Window.LeftNavButtons.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		itemsArray: 'leftNavButtons',
-		property: 'leftNavButtons',
-		itemArrayDefinition: {
-			parents: [
-				'Ti.UI.Window'
-			],
-			children: [
-				'ALL'
-			]
-		}
-	});
-	return require('./Alloy.Abstract._ItemArray').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Window.RightNavButton.js b/Alloy/commands/compile/parsers/Ti.UI.Window.RightNavButton.js
deleted file mode 100644
index a8ac13e28..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Window.RightNavButton.js
+++ /dev/null
@@ -1,3 +0,0 @@
-exports.parse = function(node, state) {
-	return require('./Ti.UI.Window._ProxyProperty').parse(node, state);
-};
\ No newline at end of file
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Window.RightNavButtons.js b/Alloy/commands/compile/parsers/Ti.UI.Window.RightNavButtons.js
deleted file mode 100644
index 3876c0013..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Window.RightNavButtons.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		itemsArray: 'rightNavButtons',
-		property: 'rightNavButtons',
-		itemArrayDefinition: {
-			parents: [
-				'Ti.UI.Window'
-			],
-			children: [
-				'ALL'
-			]
-		}
-	});
-	return require('./Alloy.Abstract._ItemArray').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Window.TitleControl.js b/Alloy/commands/compile/parsers/Ti.UI.Window.TitleControl.js
deleted file mode 100644
index a8ac13e28..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Window.TitleControl.js
+++ /dev/null
@@ -1,3 +0,0 @@
-exports.parse = function(node, state) {
-	return require('./Ti.UI.Window._ProxyProperty').parse(node, state);
-};
\ No newline at end of file
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Window.WindowToolbar.js b/Alloy/commands/compile/parsers/Ti.UI.Window.WindowToolbar.js
deleted file mode 100644
index cec5546dd..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Window.WindowToolbar.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		itemsArray: 'windowToolbar',
-		property: 'toolbar',
-		itemArrayDefinition: {
-			parents: [
-				'Ti.UI.Window'
-			],
-			children: [
-				'ALL'
-			]
-		}
-	});
-	return require('./Alloy.Abstract._ItemArray').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Window._ProxyProperty.js b/Alloy/commands/compile/parsers/Ti.UI.Window._ProxyProperty.js
deleted file mode 100644
index a3c685c23..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Window._ProxyProperty.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		proxyPropertyDefinition: {
-			parents: [
-				'Ti.UI.Window',
-				'Ti.UI.iPad.Popover'
-			]
-		}
-	});
-	return require('./Alloy.Abstract._ProxyProperty').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Windows.AppBarButton.js b/Alloy/commands/compile/parsers/Ti.UI.Windows.AppBarButton.js
deleted file mode 100755
index 793c6d9ec..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Windows.AppBarButton.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var systemIcon = node.getAttribute('icon');
-	if (systemIcon.indexOf('.SystemIcon.') === -1) {
-		node.setAttribute('icon', 'Ti.UI.Windows.SystemIcon.' + systemIcon);
-	}
-
-	// Generate runtime code using default
-	return require('./default').parse(node, state);
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Windows.AppBarSeparator.js b/Alloy/commands/compile/parsers/Ti.UI.Windows.AppBarSeparator.js
deleted file mode 100755
index 9b8526036..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Windows.AppBarSeparator.js
+++ /dev/null
@@ -1,8 +0,0 @@
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	// Generate runtime code using default
-	return require('./default').parse(node, state);
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Windows.AppBarToggleButton.js b/Alloy/commands/compile/parsers/Ti.UI.Windows.AppBarToggleButton.js
deleted file mode 100755
index 8e20ba46c..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Windows.AppBarToggleButton.js
+++ /dev/null
@@ -1,3 +0,0 @@
-exports.parse = function(node, state) {
-	return require('./Ti.UI.Windows.AppBarButton').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.Windows.CommandBar.js b/Alloy/commands/compile/parsers/Ti.UI.Windows.CommandBar.js
deleted file mode 100755
index f11074160..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.Windows.CommandBar.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	state = _.extend(state, {
-		itemContainerDefinition: {
-			children: [
-				{ name:'Alloy.Abstract.Items', property:'items' }
-			]
-		}
-	});
-	return require('./Alloy.Abstract._ItemContainer').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.iOS.CoverFlowView.js b/Alloy/commands/compile/parsers/Ti.UI.iOS.CoverFlowView.js
deleted file mode 100644
index 6c6a6aea3..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.iOS.CoverFlowView.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	state = _.extend(state, {
-		itemContainerDefinition: {
-			children: [
-				{ name:'Alloy.Abstract.CoverFlowImageTypes', property:'images' }
-			],
-			translations: [
-				{ from: 'Alloy.Abstract.Images', to: 'Alloy.Abstract.CoverFlowImageTypes' }
-			]
-		}
-	});
-	return require('./Alloy.Abstract._ItemContainer').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.iOS.MenuPopup.js b/Alloy/commands/compile/parsers/Ti.UI.iOS.MenuPopup.js
deleted file mode 100644
index 9c0b06e46..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.iOS.MenuPopup.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	state = _.extend(state, {
-		itemContainerDefinition: {
-			children: [
-				{ name:'Alloy.Abstract.Items', property:'items' }
-			],
-			androidView: false,
-			inViewHierarchy: false
-		}
-	});
-	return require('./Alloy.Abstract._ItemContainer').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.iOS.PreviewAction.js b/Alloy/commands/compile/parsers/Ti.UI.iOS.PreviewAction.js
deleted file mode 100644
index b11bb97d4..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.iOS.PreviewAction.js
+++ /dev/null
@@ -1,12 +0,0 @@
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var actionStyle = node.getAttribute('style');
-	if (actionStyle && actionStyle.indexOf('.UI.iOS.') === -1) {
-		node.setAttribute('style', 'Ti.UI.iOS.PREVIEW_ACTION_STYLE_' + actionStyle.toUpperCase());
-	}
-
-	return require('./default').parse(node, state);
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.iOS.PreviewActionGroup.js b/Alloy/commands/compile/parsers/Ti.UI.iOS.PreviewActionGroup.js
deleted file mode 100644
index c9328013c..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.iOS.PreviewActionGroup.js
+++ /dev/null
@@ -1,46 +0,0 @@
-var _ = require('lodash'),
-	CU = require('../compilerUtils'),
-	styler = require('../styler'),
-	U = require('../../../utils');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var code = '',
-		groupState,
-		children = [],
-		actionStyle = node.getAttribute('style');
-
-	if (actionStyle && actionStyle.indexOf('.UI.iOS.') === -1) {
-		node.setAttribute('style', 'Ti.UI.iOS.PREVIEW_ACTION_STYLE_' + actionStyle.toUpperCase());
-	}
-
-	_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-		var childArgs = CU.getParserArgs(child, state);
-
-		code += CU.generateNodeExtended(child, state, {
-			parent: {},
-			post: function(node, state, args) {
-				children.push(state.parent.symbol);
-
-			}
-		});
-	});
-
-	if (children) {
-		state.extraStyle = styler.createVariableStyle([
-			['actions', '[' + children.join(',') + ']']
-		]);
-	}
-
-	groupState = require('./default').parse(node, state);
-	code += groupState.code;
-
-	return {
-		parent: {},
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.iOS.PreviewContext.js b/Alloy/commands/compile/parsers/Ti.UI.iOS.PreviewContext.js
deleted file mode 100644
index c45b7ffd4..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.iOS.PreviewContext.js
+++ /dev/null
@@ -1,61 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	CU = require('../compilerUtils'),
-	U = require('../../../utils');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var code = '',
-		parentViewId,
-		preview,
-		actions,
-		previewContextState,
-		extraStyle = [];
-
-	_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-
-		if (child.nodeName === 'Actions') {
-			state.itemsArray = CU.generateUniqueId();
-			actions = state.itemsArray;
-		}
-
-		code += CU.generateNodeExtended(child, state, {
-			parent: {},
-			post: function(node, state, args) {
-				if (child.nodeName === 'Preview') {
-					preview = state.parent.proxyProperty;
-				}
-			}
-		});
-
-	});
-
-	if (args.parent.symbol) {
-		parentViewId = args.parent.symbol;
-		delete args.parent.symbol;
-	}
-
-	preview && extraStyle.push(['preview', preview]);
-	actions && extraStyle.push(['actions', actions]);
-	if (extraStyle.length) {
-		state.extraStyle = styler.createVariableStyle(extraStyle);
-	}
-
-	previewContextState = require('./default').parse(node, state);
-	code += previewContextState.code;
-
-	if (parentViewId) {
-		code += parentViewId + '.previewContext = ' + previewContextState.parent.symbol + ';';
-	} else {
-		node.parentNode.previewContext = previewContextState.parent.symbol;
-	}
-
-	return {
-		parent: {},
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.iOS.SplitWindow.js b/Alloy/commands/compile/parsers/Ti.UI.iOS.SplitWindow.js
deleted file mode 100755
index 3feae0b64..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.iOS.SplitWindow.js
+++ /dev/null
@@ -1,66 +0,0 @@
-var _ = require('lodash'),
-	styler = require('../styler'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils');
-
-var VALID = ['Ti.UI.Window', 'Ti.UI.TabGroup', 'Ti.UI.iOS.NavigationWindow', 'Ti.UI.NavigationWindow'];
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var children = U.XML.getElementsFromNodes(node.childNodes),
-		subParents = [],
-		code = '',
-		err = [
-			'Ti.UI.iOS.SplitWindow (line ' + node.lineNumber + ') ',
-			'Ti.UI.iOS.SplitWindow must have exactly 2 children of one of the following types:',
-			'  [' + VALID.join(',') + ']',
-			'The first child is the master, the second is the child.'
-		];
-
-	// SplitWindow must have 2 windows as children
-	if (children.length !== 2) {
-		err[0] += ' has ' + children.length + ' child elements';
-		U.die(err);
-	}
-
-	_.each(children, function(child) {
-		var theNode = CU.validateNodeName(child, VALID);
-		var childArgs = CU.getParserArgs(child);
-		if (theNode) {
-			var subParentSymbol;
-			code += CU.generateNodeExtended(child, state, {
-				parent: {},
-				post: function(node, state, args) {
-					subParentSymbol = state.parent.symbol;
-					subParents.push(subParentSymbol);
-				}
-			});
-
-			// TODO: workaround for TIMOB-13068
-			if (theNode === 'Ti.UI.TabGroup') {
-				code += subParentSymbol + '.open();';
-			}
-		} else {
-			err[0] += ' invalid child type "' + childArgs.fullname + '"';
-			U.die(err);
-		}
-	});
-
-	// The first window is the master, the second window is the detail
-	state.extraStyle = styler.createVariableStyle([
-		['masterView', subParents[0]],
-		['detailView', subParents[1]]
-	]);
-	var splitState = require('./default').parse(node, state);
-	code += splitState.code;
-
-	// Update the parsing state
-	return {
-		parent: {},
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/Ti.UI.iPad.Popover.ContentView.js b/Alloy/commands/compile/parsers/Ti.UI.iPad.Popover.ContentView.js
deleted file mode 100644
index 7781a056c..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.iPad.Popover.ContentView.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var U = require('../../../utils');
-
-exports.parse = function(node, state) {
-	var height = state.parent.node.getAttribute('height') || null;
-	var width = state.parent.node.getAttribute('width') || null;
-	if (height || width) {
-		// apply height/width attributes set on <Popover> to the <ContentView> within
-		var contentwin = U.XML.getElementsFromNodes(node.childNodes)[0];
-		if (height && !contentwin.hasAttribute('height')) {contentwin.setAttribute('height', height);}
-		if (width && !contentwin.hasAttribute('width')) {contentwin.setAttribute('width', width);}
-	}
-	return require('./Ti.UI.iPad.Popover._ProxyProperty').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.iPad.Popover._ProxyProperty.js b/Alloy/commands/compile/parsers/Ti.UI.iPad.Popover._ProxyProperty.js
deleted file mode 100644
index 736e7baad..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.iPad.Popover._ProxyProperty.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		proxyPropertyDefinition: {
-			parents: [
-				'Ti.UI.iPad.Popover'
-			]
-		}
-	});
-	return require('./Alloy.Abstract._ProxyProperty').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.iPhone.NavigationGroup.js b/Alloy/commands/compile/parsers/Ti.UI.iPhone.NavigationGroup.js
deleted file mode 100755
index e63c3de07..000000000
--- a/Alloy/commands/compile/parsers/Ti.UI.iPhone.NavigationGroup.js
+++ /dev/null
@@ -1,58 +0,0 @@
-var styler = require('../styler'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	tiapp = require('../../../tiapp'),
-	logger = require('../../../logger');
-
-var DEPRECATED_VERSION = '3.1.3';
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	if (tiapp.version.gte(tiapp.getSdkVersion(), DEPRECATED_VERSION)) {
-		logger.warn([
-			'Ti.UI.iPhone.NavigationGroup (line ' + node.lineNumber + ') is deprecated as of Titanium ' + DEPRECATED_VERSION,
-			'Use Ti.UI.NavigationWindow instead'
-		]);
-	}
-
-	var children = U.XML.getElementsFromNodes(node.childNodes),
-		err = ['NavigationGroup must have only one child element, which must be a Window'],
-		code = '';
-
-	// NavigationGroup must have 1 window as a child
-	if (children.length !== 1) {
-		U.die(err);
-	}
-
-	var child = children[0],
-		childArgs = CU.getParserArgs(child),
-		theNode = CU.validateNodeName(child, 'Ti.UI.Window'),
-		windowSymbol;
-
-	// generate the code for the Window first
-	if (theNode) {
-		code += CU.generateNodeExtended(child, state, {
-			parent: {},
-			post: function(node, state, args) {
-				windowSymbol = state.parent.symbol;
-			}
-		});
-	} else {
-		err.unshift('Invalid NavigationGroup child "' + childArgs.fullname + '"');
-		U.die(err);
-	}
-
-	// create navgroup with window
-	state.extraStyle = styler.createVariableStyle('window', windowSymbol);
-	code += require('./default').parse(node, state).code;
-
-	// Update the parsing state
-	return {
-		parent: {},
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/parsers/_ProxyProperty.ActionView.js b/Alloy/commands/compile/parsers/_ProxyProperty.ActionView.js
deleted file mode 100644
index a0f103a6b..000000000
--- a/Alloy/commands/compile/parsers/_ProxyProperty.ActionView.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		proxyPropertyDefinition: {
-			parents: [
-				'Ti.Android.Menu'
-			]
-		}
-	});
-	return require('./_ProxyProperty').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/_ProxyProperty.KeyboardToolbar.js b/Alloy/commands/compile/parsers/_ProxyProperty.KeyboardToolbar.js
deleted file mode 100644
index 6cceb5be1..000000000
--- a/Alloy/commands/compile/parsers/_ProxyProperty.KeyboardToolbar.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		proxyPropertyDefinition: {
-			parents: [
-				'Ti.UI.TextField',
-				'Ti.UI.TextArea'
-			]
-		}
-	});
-	return require('./_ProxyProperty').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/_ProxyProperty.LeftButton.js b/Alloy/commands/compile/parsers/_ProxyProperty.LeftButton.js
deleted file mode 100644
index f39c35803..000000000
--- a/Alloy/commands/compile/parsers/_ProxyProperty.LeftButton.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		proxyPropertyDefinition: {
-			parents: [
-				'Ti.UI.TextField',
-				'Ti.Map.Annotation'
-			]
-		}
-	});
-	return require('./_ProxyProperty').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/_ProxyProperty.RightButton.js b/Alloy/commands/compile/parsers/_ProxyProperty.RightButton.js
deleted file mode 100644
index f39c35803..000000000
--- a/Alloy/commands/compile/parsers/_ProxyProperty.RightButton.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		proxyPropertyDefinition: {
-			parents: [
-				'Ti.UI.TextField',
-				'Ti.Map.Annotation'
-			]
-		}
-	});
-	return require('./_ProxyProperty').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/_ProxyProperty._Lists.js b/Alloy/commands/compile/parsers/_ProxyProperty._Lists.js
deleted file mode 100644
index 41c5b8bda..000000000
--- a/Alloy/commands/compile/parsers/_ProxyProperty._Lists.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var _ = require('lodash');
-
-exports.parse = function(node, state) {
-	_.extend(state, {
-		proxyPropertyDefinition: {
-			parents: [
-				'Ti.UI.TableView',
-				'Ti.UI.TableViewSection',
-				'Ti.UI.ListView',
-				'Ti.UI.ListSection'
-			]
-		}
-	});
-	return require('./_ProxyProperty').parse(node, state);
-};
diff --git a/Alloy/commands/compile/parsers/_ProxyProperty.js b/Alloy/commands/compile/parsers/_ProxyProperty.js
deleted file mode 100644
index d758c0460..000000000
--- a/Alloy/commands/compile/parsers/_ProxyProperty.js
+++ /dev/null
@@ -1,68 +0,0 @@
-var _ = require('lodash'),
-	U = require('../../../utils'),
-	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants');
-
-function fixDefinition(def) {
-	def = def || {};
-	def = _.defaults(def, {
-		parents: [],
-		children: []
-	});
-	return def;
-}
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var def = fixDefinition(state.proxyPropertyDefinition),
-		code = '',
-		proxy;
-
-	// validate parent
-	if (def.parents.length > 0 && state.parent && state.parent.node) {
-		if (!CU.validateNodeName(state.parent.node, def.parents)) {
-			U.dieWithNode(node, 'Parent element must one of the following: [' + def.parents.join(',') + ']');
-		}
-	}
-
-	// process children
-	_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-		var childArgs = CU.getParserArgs(child, state);
-
-		// validate children
-		if (def.children.length > 0) {
-			if (!CU.validateNodeName(child, def.children)) {
-				U.dieWithNode(node, 'Child element must one of the following: [' + def.children.join(',') + ']');
-			}
-		}
-
-		// generate proxy property
-		code += CU.generateNodeExtended(child, state, {
-			parent: {},
-			post: function(node, state, args) {
-				proxy = state.parent ? state.parent.symbol : state.item.symbol;
-			}
-		});
-	});
-
-	var ret = {
-		isProxyProperty: true,
-		propertyName: U.lcfirst(args.fullname.match(/\.([^\.]+)$/)[1] || ''),
-		code: code
-	};
-
-	var nextObj = {
-		symbol: proxy
-	};
-
-	if (state.isViewTemplate) {
-		ret = _.extend(ret, { item: nextObj });
-	} else {
-		ret = _.extend(ret, { parent: nextObj });
-	}
-
-	return ret;
-}
diff --git a/Alloy/commands/compile/parsers/base.js b/Alloy/commands/compile/parsers/base.js
deleted file mode 100755
index add9ff05f..000000000
--- a/Alloy/commands/compile/parsers/base.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var CU = require('../compilerUtils');
-
-exports.parse = function(node, state, parser) {
-	var args = CU.getParserArgs(node, state),
-		code = '';
-
-	if (state.pre) {
-		code += state.pre(node, state, args) || '';
-		delete state.pre;
-	}
-	var newState = parser(node, state, args);
-	code += newState.code;
-	if (state.post) {
-		code += state.post(node, newState, args) || '';
-		delete state.post;
-	}
-	newState.code = code;
-
-	return newState;
-};
\ No newline at end of file
diff --git a/Alloy/commands/compile/parsers/default.js b/Alloy/commands/compile/parsers/default.js
deleted file mode 100755
index 731c5377a..000000000
--- a/Alloy/commands/compile/parsers/default.js
+++ /dev/null
@@ -1,201 +0,0 @@
-var CU = require('../compilerUtils'),
-	U = require('../../../utils'),
-	styler = require('../styler'),
-	CONST = require('../../../common/constants'),
-	_ = require('lodash'),
-	tiapp = require('../../../tiapp'),
-	platform = CU.getCompilerConfig().alloyConfig.platform;
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var fullname = CU.getNodeFullname(node),
-		parts = fullname.split('.'),
-		extras = [];
-
-	if (node.previewContext) {
-		extras.push(['previewContext', node.previewContext]);
-	}
-
-	if (CU[CONST.DOCROOT_MODULE_PROPERTY] && !node.hasAttribute('module')) {
-		node.setAttribute('module', CU[CONST.DOCROOT_MODULE_PROPERTY]);
-	}
-	// is this just a proxy property?
-	if (parts[0] === '_ProxyProperty') {
-		return require('./_ProxyProperty.' + parts[1]).parse(node, state);
-	}
-
-	// special handling for touchEnabled per ALOY-911
-	if (node.hasAttribute('touchEnabled')) {
-		var attr = node.getAttribute('touchEnabled');
-		extras.push(['touchEnabled', attr === 'true']);
-	}
-
-	if (extras.length) {
-		state.extraStyle = state.extraStyle || {};
-		state.extraStyle = _.extend(state.extraStyle, styler.createVariableStyle(extras));
-	}
-
-	// start assembling a basic view creation
-	var createFunc = 'create' + node.nodeName,
-		isCollectionBound = args[CONST.BIND_COLLECTION] ? true : false,
-		code = '';
-	if (node.nodeName === 'Annotation' && ( (platform == 'ios' && tiapp.version.gte('3.2.0')) || platform == 'android' && tiapp.version.gte('3.1.0'))) {
-		// ALOY-800: on iOS & Android, using the external ti.map module, set the
-		// namespace so that the ti.map module's createAnnotation() method is used
-		args.ns = 'require("ti.map")';
-	}
-
-	// make symbol a local variable if necessary
-	if (state.local) {
-		args.symbol = CU.generateUniqueId();
-	}
-
-	// Generate runtime code
-	if (state.isViewTemplate) {
-		var bindId = node.getAttribute('bindId');
-		code += (state.local ? 'var ' : '') + args.symbol + '={';
-		code += "type:'" + fullname + "',";
-		if (bindId) {
-			code += "bindId:'" + bindId + "',";
-		}
-
-		// apply usual style properties
-		var argsObject = {
-			properties: styler.generateStyleParams(
-				state.styles,
-				args.classes,
-				args.id,
-				fullname,
-				_.defaults(state.extraStyle || {}, args.createArgs || {}),
-				state
-			)
-		};
-
-		// add in any events on the ItemTemplate
-		if (args.events && args.events.length > 0) {
-			argsObject.events = '{' + _.reduce(args.events, function(memo, o) {
-				return memo + o.name + ':' + o.value + ',';
-			}, '') + '}';
-		}
-
-		var children = U.XML.getElementsFromNodes(node.childNodes);
-		var childTemplates;
-		if (children.length > 0) {
-			childTemplates = CU.generateUniqueId();
-
-			code += 'childTemplates: (function() {';
-			code += 'var ' + childTemplates + '=[];';
-
-			_.each(children, function(child) {
-				code += CU.generateNodeExtended(child, state, {
-					parent: {},
-					local: true,
-					isViewTemplate: true,
-					post: function(node, state, args) {
-						return childTemplates + '.push(' + state.item.symbol + ');';
-					}
-				});
-			});
-
-			code += 'return ' + childTemplates + ';';
-			code += '})(),';
-		}
-
-		// add the additional arguments to the code
-		code += _.reduce(argsObject, function(memo, v, k) {
-			return memo + k + ':' + v + ',';
-		}, '');
-
-		code += '};';
-	} else {
-		var module = node.getAttribute('module');
-		if (module) {
-			createFunc = node.getAttribute('method') || createFunc;
-			code += (state.local ? 'var ' : '') + args.symbol + ' = ' + '(require("' + module + '").' + createFunc + ' || ' + args.ns + '.' + createFunc + ')(\n';
-			code += styler.generateStyleParams(
-				state.styles,
-				args.classes,
-				args.id,
-				fullname,
-				_.defaults(state.extraStyle || {}, args.createArgs || {}),
-				state
-			) + '\n';
-			code += ');\n';
-
-
-			delete args.createArgs['module'];
-			delete args.createArgs['method'];
-		} else {
-			code += (state.local ? 'var ' : '') + args.symbol + ' = ' + args.ns + '.' + createFunc + '(\n';
-			code += styler.generateStyleParams(
-				state.styles,
-				args.classes,
-				args.id,
-				fullname,
-				_.defaults(state.extraStyle || {}, args.createArgs || {}),
-				state
-			) + '\n';
-			code += ');\n';
-		}
-
-		if (args.parent.symbol) {
-			code += args.parent.symbol + '.add(' + args.symbol + ');\n';
-		}
-
-		if (isCollectionBound && CU.isNodeForCurrentPlatform(node)) {
-			var localModel = CU.generateUniqueId();
-			var itemCode = '';
-
-			_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-				itemCode += CU.generateNodeExtended(child, state, {
-					parent: {
-						node: node,
-						symbol: args.symbol
-					},
-					local: true,
-					model: localModel
-				});
-			});
-
-			var pre = 'var children = ' + args.symbol + '.children;' +
-				'for (var d = children.length-1; d >= 0; d--) {' +
-				'	' + args.symbol + '.remove(children[d]);' +
-				'}';
-
-			if (state.parentFormFactor || node.hasAttribute('formFactor')) {
-				// if this node or a parent has set the formFactor attribute
-				// we need to pass it to the data binding generator
-				args.parentFormFactor = (state.parentFormFactor || node.getAttribute('formFactor'));
-			}
-			code += _.template(CU.generateCollectionBindingTemplate(args))({
-				localModel: localModel,
-				pre: pre,
-				items: itemCode,
-				post: ''
-			});
-		}
-	}
-
-	// Update the parsing state
-	var ret = {
-		isViewTemplate: state.isViewTemplate || false,
-		local: state.local || false,
-		model: state.model || undefined,
-		condition: state.condition || undefined,
-		styles: state.styles,
-		code: code
-	};
-	var nextObj = {
-		node: node,
-		symbol: args.symbol
-	};
-
-	if (state.isViewTemplate) {
-		return _.extend(ret, { item: nextObj });
-	} else {
-		return _.extend(ret, { parent: isCollectionBound ? {} : nextObj });
-	}
-}
diff --git a/Alloy/commands/compile/parsers/default_abstract.js b/Alloy/commands/compile/parsers/default_abstract.js
deleted file mode 100644
index e50b4869d..000000000
--- a/Alloy/commands/compile/parsers/default_abstract.js
+++ /dev/null
@@ -1,42 +0,0 @@
-var CU = require('../compilerUtils'),
-	U = require('../../../utils'),
-	styler = require('../styler'),
-	CONST = require('../../../common/constants'),
-	_ = require('lodash');
-
-exports.parse = function(node, state) {
-	return require('./base').parse(node, state, parse);
-};
-
-function parse(node, state, args) {
-	var code = '';
-
-	// make symbol a local variable if necessary
-	if (state.local) {
-		args.symbol = CU.generateUniqueId();
-	}
-
-	// Generate runtime code
-	code += (state.local ? 'var ' : '') + args.symbol + ' = ';
-	code += styler.generateStyleParams(
-		state.styles,
-		args.classes,
-		args.id,
-		CU.getNodeFullname(node),
-		_.defaults(state.extraStyle || {}, args.createArgs || {}),
-		state
-	) + ';\n';
-
-	// Update the parsing state
-	return {
-		parent: {
-			node: node,
-			symbol: args.symbol
-		},
-		local: state.local || false,
-		model: state.model || undefined,
-		condition: state.condition || undefined,
-		styles: state.styles,
-		code: code
-	};
-}
diff --git a/Alloy/commands/compile/sourceMapper.js b/Alloy/commands/compile/sourceMapper.js
deleted file mode 100644
index 5aa195c44..000000000
--- a/Alloy/commands/compile/sourceMapper.js
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
-	Sets options and wraps some functionality around the source mapping functions
-	provided by the UglifyJS library
-*/
-var SM = require('source-map'),
-	fs = require('fs-extra'),
-	chmodr = require('chmodr'),
-	path = require('path'),
-	U = require('../../utils'),
-	CONST = require('../../common/constants'),
-	babylon = require('@babel/parser'),
-	babel = require('@babel/core'),
-	logger = require('../../logger'),
-	_ = require('lodash');
-
-var lineSplitter = /(?:\r\n|\r|\n)/;
-
-// Try to match this in our babel.transformFromAst calls?
-exports.OPTIONS_OUTPUT = {
-	ast: false,
-	// do NOT minify Alloy code because Titanium will do it!
-	minified: false,
-	compact: false,
-	comments: true,
-	babelrc: false,
-	passPerPreset: false,
-	retainLines: true
-};
-
-function mapLine(mapper, theMap, genMap, line) {
-	mapper.addMapping({
-		original: {
-			line: theMap.count++,
-			column: 0
-		},
-		generated: {
-			line: genMap.count++,
-			column: 0
-		},
-		source: theMap.filename
-	});
-	genMap.code += line + '\n';
-}
-
-function getTextFromGenerator(content, template) {
-	if (typeof content !== 'undefined' && content !== null) {
-		return content;
-	} else {
-		if (template && fs.existsSync(template)) {
-			return fs.readFileSync(template, 'utf8');
-		} else {
-			return '';
-		}
-	}
-}
-
-exports.generateCodeAndSourceMap = function(generator, compileConfig) {
-	var target = generator.target;
-	var data = generator.data;
-	var outfile = target.filepath;
-	var relativeOutfile = path.relative(compileConfig.dir.project, outfile);
-	var markers = _.map(data, function(v, k) { return k; });
-	var mapper = new SM.SourceMapGenerator({
-		file: `${compileConfig.dir.project}/${relativeOutfile}`,
-		sourceRoot: compileConfig.dir.project
-	});
-	// the line counter and code string for the generated file
-	var genMap = {
-		count: 1,
-		code: ''
-	};
-	// The line counter and reported source name for the input template
-	var templateMap = {
-		count: 1,
-		filename: target.template || 'template.js'
-	};
-
-	// ensure target.templateContent will have a value so we can embed in sourcesContent
-	target.templateContent = getTextFromGenerator(target.templateContent, target.template);
-	target.lines = target.templateContent.split(lineSplitter);
-	_.each(markers, function(m) {
-		var marker = data[m];
-		// set the line counter for each "data" object we place into the generated code at certain point in template
-		// already has a filename, fileContent property
-		marker.count = 1;
-		// ensure marker.fileContent will have a value so we can embed in sourcesContent
-		marker.fileContent = getTextFromGenerator(marker.fileContent, marker.filepath);
-		marker.lines = marker.fileContent.split(lineSplitter);
-	});
-
-	// generate the source map and composite code
-	_.each(target.lines, function(line) {
-		var trimmed = U.trim(line);
-		if (_.includes(markers, trimmed)) {
-			templateMap.count++; // skip this line in the template count now or else we'll be off by one from here on out
-			_.each(data[trimmed].lines, function(line) {
-				mapLine(mapper, data[trimmed], genMap, line);
-			});
-		} else {
-			mapLine(mapper, templateMap, genMap, line);
-		}
-	});
-
-	// parse composite code into an AST
-	var ast;
-	try {
-		ast = babylon.parse(genMap.code, {
-			sourceFilename: outfile,
-			sourceType: 'unambiguous',
-			allowReturnOutsideFunction: true
-		});
-	} catch (e) {
-		let filename;
-		if (data.__MAPMARKER_CONTROLLER_CODE__) {
-			filename = data.__MAPMARKER_CONTROLLER_CODE__.filename;
-		} else if (data.__MAPMARKER_ALLOY_JS__) {
-			filename = data.__MAPMARKER_ALLOY_JS__.filename;
-		}
-
-		U.dieWithCodeFrame(`Error parsing code in ${filename}. ${e.message}`, e.loc, genMap.code);
-	}
-
-	// create source map and generated code
-	var options = _.extend(_.clone(exports.OPTIONS_OUTPUT), {
-		plugins: [
-			[require('./ast/builtins-plugin'), compileConfig],
-			[require('./ast/optimizer-plugin'), compileConfig.alloyConfig]
-		]
-	});
-	if (compileConfig.sourcemap) {
-		// Tell babel to retain the lines so they stay correct (columns go wacky, but OH WELL)
-		// we produce our own source maps and we want the lines to stay as we mapped them
-		options.retainLines = true;
-	}
-	var outputResult = babel.transformFromAstSync(ast, genMap.code, options);
-
-	// produce the source map and embed the original source (so the template source can be passed along)
-	const sourceMap = mapper.toJSON();
-	sourceMap.sourcesContent = [ target.templateContent, data[markers[0]].fileContent ];
-
-	// append pointer to the source map to the generated code
-	outputResult.code += `\n//# sourceMappingURL=file://${compileConfig.dir.project}/${CONST.DIR.MAP}/${relativeOutfile}.${CONST.FILE_EXT.MAP}`;
-
-	// write the generated controller code
-	fs.mkdirpSync(path.dirname(outfile));
-	chmodr.sync(path.dirname(outfile), 0755);
-	fs.writeFileSync(outfile, outputResult.code.toString());
-	logger.info('  created:    "' + relativeOutfile + '"');
-
-	// write source map for the generated file
-	if (compileConfig.sourcemap !== false) {
-		var mapDir = path.join(compileConfig.dir.project, CONST.DIR.MAP);
-		outfile = path.join(mapDir, relativeOutfile) + '.' + CONST.FILE_EXT.MAP;
-		relativeOutfile = path.relative(compileConfig.dir.project, outfile);
-		fs.mkdirpSync(path.dirname(outfile));
-		chmodr.sync(path.dirname(outfile), 0755);
-		fs.writeFileSync(outfile, JSON.stringify(sourceMap));
-	}
-};
-
-exports.generateSourceMap = function(generator, compileConfig) {
-	var target = generator.target;
-	var data = generator.data;
-	var origFile = generator.origFile;
-	var markers = _.map(data, function(v, k) { return k; });
-	var mapper = new SM.SourceMapGenerator({
-		file: `${compileConfig.dir.project}/${target.filename}`,
-		sourceRoot: compileConfig.dir.project
-	});
-	var genMap = {
-		count: 1,
-		code: ''
-	};
-	// passed in to mapLine so "sources" points at original src file
-	var theMap = {
-		count: 1, // used to track line numbers for source mapping
-		filename: origFile.filename // relative path to src file from project root
-	};
-
-	// initialize the rest of the generator properties
-	target.count = 1;
-	// gets text from original src file since template content is empty
-	// ensure target.templateContent will have a value so we can embed in sourcesContent if we want to
-	target.templateContent = getTextFromGenerator(null, origFile.filepath);
-	target.lines = target.templateContent.split(lineSplitter);
-	_.each(markers, function(m) {
-		var marker = data[m];
-		marker.count = 1;
-		// ensure marker.fileContent will have a value so we can embed in sourcesContent if we want to
-		marker.fileContent = getTextFromGenerator(marker.fileContent, marker.filename);
-		marker.lines = marker.fileContent.split(lineSplitter);
-	});
-
-	// generate the source map and composite code
-	// (should simply map every line from src -> dest)
-	_.each(target.lines, function(line) {
-		var trimmed = U.trim(line);
-		if (_.includes(markers, trimmed)) {
-			theMap.count++; // skip this line number in the input file now or else we'll be off by one from here on out
-			_.each(data[trimmed].lines, function(line) {
-				mapLine(mapper, data[trimmed], genMap, line);
-			});
-		} else {
-			mapLine(mapper, theMap, genMap, line);
-		}
-	});
-
-	// parse composite code into an AST
-	// TODO: Remove? This is a sanity check, I suppose, but is it necessary?
-	// Our classic build should blow up on bad JS files
-	var ast;
-	try {
-		ast = babylon.parse(genMap.code, {
-			sourceFilename: genMap.file,
-			sourceType: 'unambiguous',
-			allowReturnOutsideFunction: true,
-		});
-	} catch (e) {
-		const filename = path.relative(compileConfig.dir.project, generator.target.template);
-
-		U.dieWithCodeFrame(`Error parsing code in ${filename}. ${e.message}`, e.loc, genMap.code);
-	}
-
-	// TODO: We do not run the babel plugins (optimizer/builtins) here. Is that ok?
-	// TODO: embed sourcesContent into source map? Shouldn't need to since this is supposed to be a straight copy
-
-	// write source map for the generated file
-	var relativeOutfile = path.relative(compileConfig.dir.project, target.filepath);
-	var mapDir = path.join(compileConfig.dir.project, CONST.DIR.MAP);
-	var outfile = path.join(mapDir, relativeOutfile) + '.' + CONST.FILE_EXT.MAP;
-	fs.mkdirpSync(path.dirname(outfile));
-	chmodr.sync(path.dirname(outfile), 0755);
-	fs.writeFileSync(outfile, JSON.stringify(mapper.toJSON()));
-	logger.debug('  map:        "' + outfile + '"');
-};
diff --git a/Alloy/commands/compile/styler.js b/Alloy/commands/compile/styler.js
deleted file mode 100644
index f20c6bd62..000000000
--- a/Alloy/commands/compile/styler.js
+++ /dev/null
@@ -1,721 +0,0 @@
-var fs = require('fs'),
-	path = require('path'),
-	_ = require('lodash'),
-	U = require('../../utils'),
-	CU = require('./compilerUtils'),
-	optimizer = require('./optimizer'),
-	grammar = require('../../grammar/tss'),
-	logger = require('../../logger'),
-	BuildLog = require('./BuildLog'),
-	CONST = require('../../common/constants'),
-	deepExtend = require('node.extend');
-
-// constants
-var GLOBAL_STYLE_CACHE = 'global_style_cache.json';
-var STYLE_ALLOY_TYPE = '__ALLOY_TYPE__';
-var STYLE_EXPR_PREFIX = exports.STYLE_EXPR_PREFIX = '__ALLOY_EXPR__--';
-var STYLE_REGEX = /^\s*([\#\.]{0,1})([^\[]+)(?:\[([^\]]+)\])*\s*$/;
-var EXPR_REGEX = new RegExp('^' + STYLE_EXPR_PREFIX + '(.+)');
-var BINDING_SPLIT_REGEX = /(\{[^:}]+\}(?!\}))/;
-var BINDING_REFERENCE_REGEX = /^\{([^:}]+)\}$/;
-var VALUES = {
-	ID:     100000,
-	CLASS:   10000,
-	API:      1000,
-	TSSIF:     500,
-	PLATFORM:  100,
-	FORMFACTOR: 10,
-	SUM:         1,
-	THEME:       0.9,
-	ORDER:       0.0001
-};
-var DATEFIELDS = [
-	'minDate', 'value', 'maxDate'
-];
-var KEYBOARD_TYPES = [
-	'DEFAULT', 'ASCII', 'NUMBERS_PUNCTUATION', 'URL', 'EMAIL', 'DECIMAL_PAD', 'NAMEPHONE_PAD',
-	'NUMBER_PAD', 'PHONE_PAD'
-];
-var RETURN_KEY_TYPES = [
-	'DEFAULT', 'DONE', 'EMERGENCY_CALL', 'GO', 'GOOGLE', 'JOIN', 'NEXT', 'ROUTE',
-	'SEARCH', 'SEND', 'YAHOO'
-];
-var AUTOCAPITALIZATION_TYPES = [
-	'ALL', 'NONE', 'SENTENCES', 'WORDS'
-];
-var KEYBOARD_PROPERTIES = ['keyboardType', 'returnKeyType', 'autocapitalization'];
-
-// private variables
-var styleOrderCounter = 1;
-var platform;
-
-exports.setPlatform = function(p) {
-	platform = p;
-};
-
-/*
- * @property {Array} globalStyle
- * The global style array, which contains an merged, ordered list of all
- * applicable global styles. This will serve as the base for all controller-
- * specific styles.
- *
- */
-exports.globalStyle = [];
-
-/*
- * @property {Object} bindingsMap
- * Holds the collection of models/collections data-bound to UI component
- * properties in the Alloy app. This map is used to create the most effecient
- * set of event listeners possible for dynamically updating the UI based on
- * changes to the data model/collections.
- *
- */
-exports.bindingsMap = {};
-
-/*
- * @method loadGlobalStyles
- * Loads all global styles (app.tss) in a project and sorts them appropriately.
- * The order of sorting is as follows:
- *
- * 1. global
- * 2. global theme
- * 3. global platform-specific
- * 4. global theme platform-specific
- *
- * This function updates the global style array that will be used as a base for
- * all controller styling. This is executed before any other styling is
- * performed during the compile phase. If the style is loaded from the cache,
- * it returns true, otherwise it returns false.
- *
- * @param {String} Full path to the "app" folder of the target project
- * @param {String} The mobile platform for which to load styles
- * @param {Object} [opts] Additional options
- *
- * @returns {Boolean} true if cache was used, false if not
- */
-exports.loadGlobalStyles = function(appPath, opts) {
-	// reset the global style array
-	exports.globalStyle = [];
-
-	// validate/set arguments
-	opts = opts || {};
-	var ret = false;
-	var theme = opts.theme;
-	var apptss = CONST.GLOBAL_STYLE;
-	var stylesDir = path.join(appPath, CONST.DIR.STYLE);
-	var themesDir;
-	if (theme) {
-		themesDir = path.join(appPath, 'themes', theme, CONST.DIR.STYLE);
-	}
-	var buildlog = BuildLog();
-	var cacheFile = path.join(appPath, '..', CONST.DIR.BUILD, GLOBAL_STYLE_CACHE);
-
-	// create array of global styles to load based on arguments
-	var loadArray = [];
-	loadArray.push({
-		path: path.join(stylesDir, apptss),
-		msg: apptss
-	});
-	if (theme) {
-		loadArray.push({
-			path: path.join(themesDir, apptss),
-			msg: apptss + '(theme:' + theme + ')',
-			obj: { theme: true }
-		});
-	}
-	loadArray.push({
-		path: path.join(stylesDir, platform, apptss),
-		msg: apptss + '(platform:' + platform + ')',
-		obj: { platform: true }
-	});
-	if (theme) {
-		loadArray.push({
-			path: path.join(themesDir, platform, apptss),
-			msg: apptss + '(theme:' + theme + ' platform:' + platform + ')',
-			obj: { platform: true, theme: true }
-		});
-	}
-
-	// get rid of entries that don't exist
-	var len = loadArray.length;
-	for (var i = len - 1; i >= 0; i--) {
-		if (!path.existsSync(loadArray[i].path)) {
-			loadArray.splice(i, 1);
-		}
-	}
-
-	// create hash of existing global styles
-	var hash = U.createHash(_.map(loadArray, 'path'));
-
-	// see if we can use the cached global style
-	if (buildlog.data.globalStyleCacheHash === hash && fs.existsSync(cacheFile)) {
-		// load global style object from cache
-		logger.info('[global style] loading from cache...');
-		exports.globalStyle = JSON.parse(fs.readFileSync(cacheFile, 'utf8'));
-		ret = true;
-
-		// increment the style order counter with the number of rules in the global style
-		styleOrderCounter += exports.globalStyle.length;
-	} else {
-		// add new hash to the buildlog
-		buildlog.data.globalStyleCacheHash = hash;
-
-		// create the new global style object
-		_.each(loadArray, function(g) {
-			if (path.existsSync(g.path)) {
-				logger.info('[' + g.msg + '] global style processing...');
-				exports.globalStyle = exports.loadAndSortStyle(g.path, _.extend(
-					{ existingStyle: exports.globalStyle },
-					g.obj || {}
-				));
-			}
-		});
-
-		// write global style object to cache
-		logger.info('[global style] writing to cache...');
-		fs.writeFileSync(cacheFile, JSON.stringify(exports.globalStyle));
-
-		// simply increment the style order counter
-		styleOrderCounter++;
-	}
-
-	return ret;
-};
-
-/*
- * @method sortStyles
- * Given a parsed style from loadStyle(), sort all the style entries into an
- * ordered array. This is the final operations to prepare a style for usage with
- * a Titanium UI component in Alloy.
- *
- * @param {Object} Parsed style object from a loadStyle() call
- * @param {Object} [opts] Options for this function
- */
-exports.sortStyles = function(style, opts) {
-	var sortedStyles = [];
-	opts = opts || {};
-
-	if (_.isObject(style) && !_.isEmpty(style)) {
-		for (var key in style) {
-			var obj = {};
-			var priority = styleOrderCounter++ * VALUES.ORDER;
-			var match = key.match(STYLE_REGEX);
-			if (match === null) {
-				U.die('Invalid style specifier "' + key + '"');
-			}
-			var newKey = match[2];
-
-			// skip any invalid style entries
-			if (newKey === 'undefined' && !match[1]) { continue; }
-
-			// get the style key type
-			switch (match[1]) {
-				case '#':
-					obj.isId = true;
-					priority += VALUES.ID;
-					break;
-				case '.':
-					obj.isClass = true;
-					priority += VALUES.CLASS;
-					break;
-				default:
-					if (match[2]) {
-						obj.isApi = true;
-						priority += VALUES.API;
-					}
-					break;
-			}
-
-			if (match[3]) {
-				obj.queries = {};
-				_.each(match[3].replace(/\s*,\s*/g, ',').split(/\s+/), function(query) {
-					var parts = query.split('=');
-					var q = U.trim(parts[0]);
-					var v = U.trim(parts[1]);
-					if (q === 'platform') {
-						priority += VALUES.PLATFORM + VALUES.SUM;
-						v = v.split(',');
-					} else if (q === 'formFactor') {
-						priority += VALUES.FORMFACTOR + VALUES.SUM;
-					} else if (q === 'if') {
-						priority += VALUES.TSSIF + VALUES.SUM;
-					} else {
-						priority += VALUES.SUM;
-					}
-					obj.queries[q] = v;
-				});
-			}
-
-			_.extend(obj, {
-				priority: priority + (opts.platform ? VALUES.PLATFORM : 0) + (opts.theme ? VALUES.THEME : 0),
-				key: newKey,
-				style: style[key]
-			});
-			sortedStyles.push(obj);
-		}
-	}
-
-	var theArray = opts.existingStyle ? opts.existingStyle.concat(sortedStyles) : sortedStyles;
-	return _.sortBy(theArray, 'priority');
-};
-
-exports.loadStyle = function(tssFile) {
-	if (path.existsSync(tssFile)) {
-		// read the style file
-		var contents;
-		var originalContents;
-		var addedBraces;
-		try {
-			contents = fs.readFileSync(tssFile, 'utf8');
-			// Store the originalContents in case we hit a parse error,
-			// this allows us to show the correct contents of the .tss file
-			originalContents = contents;
-		} catch (e) {
-			U.die('Failed to read style file "' + tssFile + '"', e);
-		}
-
-		// skip if the file is empty
-		if (/^\s*$/gi.test(contents)) {
-			return {};
-		}
-
-		// Add enclosing curly braces, if necessary
-		if (!/^\s*\{[\s\S]+\}\s*$/gi.test(contents)) {
-			contents = '{\n' + contents + '\n}';
-			addedBraces = true;
-		}
-		// [ALOY-793] double-escape '\' in tss
-		contents = contents.replace(/(\s)(\\+)(\s)/g, '$1$2$2$3');
-
-		// Process tss file then convert to JSON
-		var json;
-		try {
-			json = grammar.parse(contents);
-			optimizer.optimizeStyle(json);
-		} catch (e) {
-			// If we added braces to the contents then the actual line number
-			// on the original contents is one less than the error reports
-			if (addedBraces) {
-				e.line--;
-			}
-			U.dieWithCodeFrame(
-				'Error processing style "' + tssFile + '"',
-				{ line: e.line, column: e.column },
-				originalContents,
-				/Expected bare word\, comment\, end of line\, string or whitespace but ".+?" found\./.test(e.message)
-					? 'Do you have an extra comma in your style definition?'
-					: ''
-			);
-		}
-		return json;
-	}
-	return {};
-};
-
-exports.loadAndSortStyle = function(tssFile, opts) {
-	return exports.sortStyles(exports.loadStyle(tssFile), opts);
-};
-
-exports.createVariableStyle = function(keyValuePairs, value) {
-	var style = {};
-
-	if (!_.isArray(keyValuePairs)) {
-		keyValuePairs = [[keyValuePairs, value]];
-	}
-	_.each(keyValuePairs, function(pair) {
-		var k = pair[0];
-		var v = pair[1];
-		style[k] = { value:v };
-		style[k][STYLE_ALLOY_TYPE] = 'var';
-	});
-	return style;
-};
-
-exports.processStyle = function(_style, _state) {
-	var theState = _state || {};
-	var regex = EXPR_REGEX;
-	var code = '';
-
-	function processStyle(style, opts) {
-		opts = opts || {};
-		style = opts.fromArray ? {0:style} : style;
-		var groups = {}, sn, value;
-
-		// need to add "properties" and bindIds for ListItems
-		if (theState && theState.isListItem && opts.firstOrder && !opts.fromArray) {
-			for (sn in style) {
-				value = style[sn];
-				var prefixes = sn.split(':');
-				if (prefixes.length > 1) {
-					var bindId = prefixes[0];
-					groups[bindId] = groups[bindId] || {};
-					groups[bindId][prefixes.slice(1).join(':')] = value;
-				} else {
-					// allow template to be specified
-					if (sn === 'template') {
-						groups.template = value;
-					} else {
-						groups.properties = groups.properties || {};
-						groups.properties[sn] = value;
-					}
-				}
-			}
-			style = groups;
-		}
-
-		for (sn in style) {
-			value = style[sn];
-			var prefix = opts.fromArray ? '' : sn + ':';
-
-			if (_.isString(value)) {
-				var matches = value.match(regex);
-				if (matches !== null) {
-					code += prefix + matches[1] + ','; // matched a JS expression
-				} else {
-					if (typeof style.type !== 'undefined' && typeof style.type.indexOf === 'function' && (style.type).indexOf('UI.PICKER') !== -1 && value !== 'picker') {
-						if (DATEFIELDS.indexOf(sn) !== -1) {
-							// ALOY-263, support date/time style pickers
-							var d = U.createDate(value);
-
-							if (U.isValidDate(d, sn)) {
-								code += prefix + 'new Date("' + d.toString() + '"),';
-							}
-						} else {
-							code += prefix + '"' + value
-								.replace(/"/g, '\\"')
-								.replace(/\n/g, '\\n')
-								.replace(/\r/g, '\\r')
-								.replace(/\u2028/g, '\\u2028')
-								.replace(/\u2029/g, '\\u2029') +  '",'; // just a string
-						}
-					} else {
-						if (KEYBOARD_PROPERTIES.indexOf(sn) === -1) {
-							code += prefix + '"' + value
-								.replace(/"/g, '\\"')
-								.replace(/\n/g, '\\n')
-								.replace(/\r/g, '\\r')
-								.replace(/\u2028/g, '\\u2028')
-								.replace(/\u2029/g, '\\u2029') +  '",'; // just a string
-						} else {
-							// keyboard type shortcuts for TextField, TextArea
-							// support shortcuts for keyboard type, return key type, and autocapitalization
-							if (sn === KEYBOARD_PROPERTIES[0] && _.includes(KEYBOARD_TYPES, value.toUpperCase())) {
-								code += prefix + 'Ti.UI.KEYBOARD_' + value.toUpperCase() + ',';
-							}
-							if (sn === KEYBOARD_PROPERTIES[1] && _.includes(RETURN_KEY_TYPES, value.toUpperCase())) {
-								code += prefix + 'Ti.UI.RETURNKEY_' + value.toUpperCase() + ',';
-							}
-							if (sn === KEYBOARD_PROPERTIES[2] && _.includes(AUTOCAPITALIZATION_TYPES, value.toUpperCase())) {
-								code += prefix + 'Ti.UI.TEXT_AUTOCAPITALIZATION_' + value.toUpperCase() + ',';
-							}
-						}
-					}
-				}
-			} else if (_.isArray(value)) {
-				code += prefix + '[';
-				_.each(value, function(v) {
-					processStyle(v, {fromArray:true});
-				});
-				code += '],';
-			} else if (_.isObject(value)) {
-				if (value[STYLE_ALLOY_TYPE] === 'var') {
-					code += prefix + value.value + ','; // dynamic variable value
-				} else {
-					// recursively process objects
-					code += prefix + '{';
-					processStyle(value);
-					code += '},';
-				}
-			} else {
-				code += prefix + JSON.stringify(value) + ','; // catch all, just stringify the value
-			}
-		}
-	}
-	processStyle(_style, {firstOrder:true});
-
-	return code;
-};
-
-exports.generateStyleParams = function(styles, classes, id, apiName, extraStyle, theState) {
-	var styleCollection = [],
-		lastObj = {},
-		elementName = apiName.split('.').pop();
-
-	// don't add an id to the generated style if we are in a local state
-	if (theState && theState.local) {
-		delete extraStyle.id;
-	}
-
-	// process all style items, in order
-	_.each(styles, function(style) {
-		if ((style.isId && style.key === id) ||
-			(style.isClass && _.includes(classes, style.key)) ||
-			(style.isApi && elementName === style.key)) {
-
-			// manage potential runtime conditions for the style
-			var conditionals = {
-				platform: [],
-				formFactor: ''
-			};
-
-			if (style.queries) {
-				// handle platform device query
-				// - Make compile time comparison if possible
-				// - Add runtime conditional if platform is not known
-				var q = style.queries;
-				if (q.platform) {
-					if (platform) {
-						var isForCurrentPlatform = false;
-						_.each(q.platform.toString().split(','), function(p) {
-							// need to account for multiple platforms and negation, such as platform=ios or
-							// platform=ios,android   or   platform=!ios   or   platform="android,!mobileweb"
-							if (p === platform || (p.indexOf('!') === 0 && p.substr(1) !== platform)) {
-								isForCurrentPlatform = true;
-							}
-						});
-						if (!isForCurrentPlatform) {
-							return;
-						}
-					} else {
-						_.each(q.platform, function(p) {
-							conditionals.platform.push(CU.CONDITION_MAP[p]['runtime']);
-						});
-					}
-				}
-
-				// handle formFactor device query
-				if (q.formFactor === 'tablet') {
-					conditionals.formFactor = 'Alloy.isTablet';
-				} else if (q.formFactor === 'handheld') {
-					conditionals.formFactor = 'Alloy.isHandheld';
-				}
-
-				// assemble runtime query
-				var pcond = conditionals.platform.length > 0 ? '(' + conditionals.platform.join(' || ') + ')' : '';
-				var joinString = (pcond && conditionals.formFactor) ? ' && ' : '';
-				var conditional = pcond + joinString + conditionals.formFactor;
-				if (q.if) {
-					// ALOY-871: handle custom TSS queries with if conditional
-					var ffcond = conditionals.formFactor.length > 0 ? '(' + conditionals.formFactor + ')' : '';
-					var ffJoinString = (ffcond) ? ' && ' : '';
-					conditional = pcond + joinString + ffcond + ffJoinString + '(' + q.if.split(',').join(' || ') + ')';
-				}
-
-				// push styles if we need to insert a conditional
-				if (conditional) {
-					if (lastObj) {
-						styleCollection.push({style:lastObj});
-						styleCollection.push({style:style.style, condition:conditional});
-						lastObj = {};
-					}
-				} else if (!q.if) {
-					lastObj = deepExtend(true, lastObj, style.style);
-				}
-			} else {
-				// remove old style
-				_.each(style.style, function(val, key) {
-					if (_.isArray(val) && lastObj.hasOwnProperty(key)) {
-						delete lastObj[key];
-					}
-				});
-				lastObj = deepExtend(true, lastObj, style.style);
-			}
-		}
-	});
-
-	// add in any final styles
-	// ALOY-1363: deep merge necessary to properly merge children
-	lastObj = deepExtend(true, lastObj, extraStyle || {});
-	if (!_.isEmpty(lastObj)) { styleCollection.push({style:lastObj}); }
-
-	// substitutions for binding
-	_.each(styleCollection, function(style) {
-		_.each(style.style, function(v, k) {
-
-			if (!_.isString(v)) {
-				return;
-			}
-
-			var bindingStrParts = v.split(BINDING_SPLIT_REGEX);
-
-			if (bindingStrParts.length <= 1) {
-				return;
-			}
-
-			var collectionModelVar = theState && theState.model ? theState.model : CONST.BIND_MODEL_VAR;
-
-			var bindsModels = [];
-			var bindsCollection = false;
-
-			var bindingExpParts = [];
-
-			bindingStrParts.forEach(function(part, i) {
-
-				// empty string
-				if (part === '') {
-					return;
-				}
-
-				var partMatch = part.match(BINDING_REFERENCE_REGEX);
-
-				// regular string
-				if (!partMatch) {
-
-					// escape single quote: ALOY-1478
-					bindingExpParts.push("'" + part.replace(/'/g, "\\'") + "'");
-
-					return;
-				}
-
-				var reference = partMatch[1].trim(); // trim: ALOY-716
-				var referencePath = toPath(reference);
-
-				var attribute, modelVar;
-
-				// collection binding
-				if (referencePath.length === 1) {
-					bindsCollection = true;
-				} else if (referencePath[0] === '$') {
-					// instance model binding
-					attribute = referencePath.splice(2, referencePath.length);
-				} else if (collectionModelVar !== CONST.BIND_MODEL_VAR) {
-					// collection binding (deep)
-					bindsCollection = true;
-				} else {
-					// default to global model binding
-					attribute = referencePath.splice(1, referencePath.length);
-					referencePath.unshift('Alloy', 'Models');
-				}
-
-				// model binding
-				if (attribute !== undefined) {
-					modelVar = fromPath(referencePath);
-					reference = fromPath(referencePath.concat(CONST.BIND_TRANSFORM_VAR, attribute));
-					if (!_.includes(bindsModels, modelVar)) {
-						bindsModels.push(modelVar);
-					}
-				} else {
-					// collection binding
-					reference = collectionModelVar + '.' + CONST.BIND_TRANSFORM_VAR + (reference[0] === '[' ? '' : '.') + reference;
-				}
-
-				bindingExpParts.push(reference);
-
-			});
-
-			if (!bindsCollection && bindsModels.length === 0) {
-				return;
-			}
-
-			if (bindsCollection && bindsModels.length > 0) {
-				U.die('Attempt to mix model (' + bindsModels.join(', ') + ') and collection (' + collectionModelVar + ') binding in: ' + v);
-			}
-
-			var bindingExp = bindingExpParts.join(' + ');
-
-			if (bindsCollection) {
-				style.style[k] = STYLE_EXPR_PREFIX + bindingExp;
-			}
-
-			if (bindsModels.length > 0) {
-
-				bindsModels.forEach(function(modelVar) {
-
-					// ensure that the bindings for this model have been initialized
-					if (!exports.bindingsMap[modelVar]) {
-						exports.bindingsMap[modelVar] = {
-							models: bindsModels,
-							bindings: []
-						};
-					} else {
-						// ensure that mix use of models contains all
-						exports.bindingsMap[modelVar].models = _.union(exports.bindingsMap[modelVar].models, bindsModels);
-					}
-
-					// create the binding object
-					var bindingObj = {
-						id: id,
-						prop: k,
-						val: bindingExp
-					};
-
-					// make sure bindings are wrapped in any conditionals
-					// relevant to the curent style
-					if (theState.condition) {
-						bindingObj.condition = theState.condition;
-					}
-
-					// add this property to the global bindings map for the
-					// current controller component
-					exports.bindingsMap[modelVar].bindings.push(bindingObj);
-				});
-
-				// since this property is data bound, don't include it in
-				// the style statically
-				delete style.style[k];
-			}
-		});
-	});
-
-	// Let's assemble the fastest factory method object possible based on
-	// what we know about the style we just sorted and assembled
-	var code = '';
-	if (styleCollection.length === 0) {
-		code += '{}';
-	} else if (styleCollection.length === 1) {
-		if (styleCollection[0].condition) {
-			// check the condition and return the object
-			code += styleCollection[0].condition + ' ? {' + exports.processStyle(styleCollection[0].style, theState) + '} : {}';
-		} else {
-			// just return the object
-			code += '{';
-			code += exports.processStyle(styleCollection[0].style, theState);
-			code += '}';
-		}
-	} else if (styleCollection.length > 1) {
-		// construct self-executing function to merge styles based on runtime conditionals
-		code += '(function (){\n';
-		code += 'var o = {};\n';
-
-		for (var i = 0, l = styleCollection.length; i < l; i++) {
-			var tmpStyle = exports.processStyle(styleCollection[i].style, theState);
-			if (!_.isEmpty(tmpStyle)) {
-				if (styleCollection[i].condition) {
-					code += 'if (' + styleCollection[i].condition + ') ';
-				}
-				code += 'Alloy.deepExtend(true, o, {';
-				code += tmpStyle;
-				code += '});\n';
-			}
-		}
-		code += 'return o;\n';
-		code += '})()';
-	}
-
-	return code;
-};
-
-function getCacheFilePath(appPath, hash) {
-	return path.join(appPath, '..', CONST.DIR.BUILD, 'global_style_cache_' + hash + '.json');
-}
-
-// source: https://github.com/lodash/lodash/blob/3.8.1-npm-packages/lodash._topath/index.js
-function toPath(value) {
-	var result = [];
-	value.replace(/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\n\\]|\\.)*?)\2)\]/g, function(match, number, quote, string) {
-		result.push(quote ? string.replace(/\\(\\)?/g, '$1') : (number || match));
-	});
-	return result;
-}
-
-function fromPath(path) {
-	var result = path[0];
-
-	if (path.length > 1) {
-		result += '[' + path.slice(1).map(function(string) {
-			return "'" + string.replace(/'/g, "\\'") + "'";
-		}).join('][') + ']';
-	}
-
-	return result;
-}
diff --git a/Alloy/commands/copy/index.js b/Alloy/commands/copy/index.js
index a5a211d76..155317926 100644
--- a/Alloy/commands/copy/index.js
+++ b/Alloy/commands/copy/index.js
@@ -1,9 +1,11 @@
 var path = require('path'),
-	colors = require('colors'),
-	fs = require('fs-extra'),
-	U = require('../../utils'),
-	CONST = require('../../common/constants'),
-	logger = require('../../logger');
+	fs = require('fs-extra');
+
+const {
+	constants: CONST,
+	logger,
+	utils: U
+} = require('alloy-utils');
 
 function copy(source, destination, callback) {
 	// make sure the target folder exists
diff --git a/Alloy/commands/debugger/index.js b/Alloy/commands/debugger/index.js
index 1eb73f244..bd890a5c2 100644
--- a/Alloy/commands/debugger/index.js
+++ b/Alloy/commands/debugger/index.js
@@ -1,8 +1,9 @@
 var fs = require('fs'),
 	path = require('path'),
-	U = require('../../utils'),
 	SM = require('source-map');
 
+const {	utils: U } = require('alloy-utils');
+
 var FUNCTIONS = {
 	generated: 'generatedPositionFor',
 	original: 'originalPositionFor'
diff --git a/Alloy/commands/extract-i18n/i18nHandler.js b/Alloy/commands/extract-i18n/i18nHandler.js
index 9611924b3..5cd5bac2e 100644
--- a/Alloy/commands/extract-i18n/i18nHandler.js
+++ b/Alloy/commands/extract-i18n/i18nHandler.js
@@ -1,12 +1,15 @@
-var U = require('../../utils'),
-	logger = require('../../logger'),
-	path = require('path'),
+var path = require('path'),
 	_ = require('lodash'),
 	XMLSerializer = require('xmldom').XMLSerializer,
 	fs = require('fs-extra'),
 	chmodr = require('chmodr'),
 	os = require('os');
 
+const {
+	logger,
+	utils: U
+} = require('alloy-utils');
+
 var FILE_TEMPLATE = '<?xml version="1.0" encoding="UTF-8"?>' + os.EOL + '<resources>' +
 	os.EOL + '</resources>';
 
diff --git a/Alloy/commands/extract-i18n/index.js b/Alloy/commands/extract-i18n/index.js
index fa805ef20..e7f2f3642 100644
--- a/Alloy/commands/extract-i18n/index.js
+++ b/Alloy/commands/extract-i18n/index.js
@@ -5,12 +5,15 @@
 var fs = require('fs'),
 	walkSync = require('walk-sync'),
 	path = require('path'),
-	CONST = require('../../common/constants'),
-	U = require('../../utils'),
 	_ = require('lodash'),
-	logger = require('../../logger'),
 	i18nHandler = require('./i18nHandler');
 
+const {
+	constants: CONST,
+	logger,
+	utils: U
+} = require('alloy-utils');
+
 var searchString = '(?:L|Ti.Locale.getString|Titanium.Locale.getString)' +
 	"\\(\\s*[\"']([a-zA-Z]\\w*?)[\"']\\s*[\\),]";
 var searchRegex = new RegExp(searchString, 'g');
diff --git a/Alloy/commands/generate/generateUtils.js b/Alloy/commands/generate/generateUtils.js
index 80892f709..f76b1cde6 100755
--- a/Alloy/commands/generate/generateUtils.js
+++ b/Alloy/commands/generate/generateUtils.js
@@ -3,10 +3,13 @@ var path = require('path'),
 	fs = require('fs-extra'),
 	xml2tss = require('xml2tss'),
 	alloyRoot = path.join(__dirname, '..', '..'),
-	_ = require('lodash'),
-	U = require(basePath + 'utils'),
-	CONST = require(basePath + 'common/constants'),
-	logger = require(basePath + 'logger');
+	_ = require('lodash');
+
+const {
+	constants: CONST,
+	logger,
+	utils: U
+} = require('alloy-utils');
 
 function pad(x) {
 	if (x < 10) {
diff --git a/Alloy/commands/generate/index.js b/Alloy/commands/generate/index.js
index 71be04758..93ab4a555 100755
--- a/Alloy/commands/generate/index.js
+++ b/Alloy/commands/generate/index.js
@@ -4,10 +4,12 @@
 
 	Actual component generators are defined in the targets folder
 */
-var path = require('path'),
-	_ = require('lodash'),
-	U = require('../../utils'),
-	CONST = require('../../common/constants');
+var _ = require('lodash');
+
+const {
+	constants: CONST,
+	utils: U
+} = require('alloy-utils');
 
 function generate(args, program) {
 	args = args || [];
diff --git a/Alloy/commands/generate/targets/controller.js b/Alloy/commands/generate/targets/controller.js
index 4b29f827a..926c5d052 100755
--- a/Alloy/commands/generate/targets/controller.js
+++ b/Alloy/commands/generate/targets/controller.js
@@ -1,5 +1,6 @@
-var GU = require('../generateUtils'),
-	logger = require('../../../logger');
+const { logger} = require('alloy-utils');
+
+var GU = require('../generateUtils');
 
 module.exports = function(name, args, program) {
 	var type = 'CONTROLLER';
diff --git a/Alloy/commands/generate/targets/jmk.js b/Alloy/commands/generate/targets/jmk.js
index b63739e38..74972d9b3 100644
--- a/Alloy/commands/generate/targets/jmk.js
+++ b/Alloy/commands/generate/targets/jmk.js
@@ -1,16 +1,19 @@
 var path = require('path'),
 	fs = require('fs'),
-	logger = require('../../../logger'),
-	U = require('../../../utils'),
 	alloyRoot = path.join(__dirname, '..', '..', '..');
 
+const {
+	logger,
+	utils: U
+} = require('alloy-utils');
+
 module.exports = function(name, args, program) {
 	var filename = 'alloy.jmk';
 	var filepath = path.join(program.projectDir, 'app', filename);
 	var templatePath = path.join(alloyRoot, 'template', filename);
 
 	// only overwrite if using force option
-	if (path.existsSync(filepath) && !program.force) {
+	if (fs.existsSync(filepath) && !program.force) {
 		U.die('"alloy.jmk" file already exists. Use "-f,--force" to overwrite.');
 	}
 
diff --git a/Alloy/commands/generate/targets/migration.js b/Alloy/commands/generate/targets/migration.js
index 346e74aa6..d64e8305b 100755
--- a/Alloy/commands/generate/targets/migration.js
+++ b/Alloy/commands/generate/targets/migration.js
@@ -1,7 +1,10 @@
 var path = require('path'),
-	GU = require('../generateUtils'),
-	CONST = require('../../../common/constants'),
-	logger = require('../../../logger');
+	GU = require('../generateUtils');
+
+const {
+	constants: CONST,
+	logger
+} = require('alloy-utils');
 
 module.exports = function(name, args, program, template) {
 	var type = 'MIGRATION';
diff --git a/Alloy/commands/generate/targets/model.js b/Alloy/commands/generate/targets/model.js
index f404c1008..50fee0c87 100755
--- a/Alloy/commands/generate/targets/model.js
+++ b/Alloy/commands/generate/targets/model.js
@@ -1,9 +1,12 @@
 var path = require('path'),
 	fs = require('fs-extra'),
-	U = require('../../../utils'),
-	CONST = require('../../../common/constants'),
-	_ = require('lodash'),
-	logger = require('../../../logger');
+	_ = require('lodash');
+
+const {
+	constants: CONST,
+	logger,
+	utils: U
+} = require('alloy-utils');
 
 var ALLOY_ROOT = path.join(__dirname, '..', '..', '..'),
 	MODEL_TEMPLATE = path.join(ALLOY_ROOT, 'template', 'modelcode.js'),
diff --git a/Alloy/commands/generate/targets/style.js b/Alloy/commands/generate/targets/style.js
index 0bf79ad4f..6689b0262 100755
--- a/Alloy/commands/generate/targets/style.js
+++ b/Alloy/commands/generate/targets/style.js
@@ -3,10 +3,13 @@ var path = require('path'),
 	fs = require('fs-extra'),
 	walkSync = require('walk-sync'),
 	xml2tss = require('xml2tss'),
-	GU = require('../generateUtils'),
-	U = require(basePath + 'utils'),
-	CONST = require(basePath + 'common/constants'),
-	logger = require(basePath + 'logger');
+	GU = require('../generateUtils');
+
+const {
+	constants: CONST,
+	logger,
+	utils: U
+} = require('alloy-utils');
 
 // a recursive function to generate styles since xml2tss is async
 function generateStyles(targets) {
@@ -46,7 +49,7 @@ module.exports = function(name, args, program) {
 
 				// make sure the target folder exists
 				var fullDir = path.dirname(style_path);
-				if (!path.existsSync(fullDir)) {
+				if (!fs.existsSync(fullDir)) {
 					fs.mkdirpSync(fullDir);
 				}
 				targets.push({
diff --git a/Alloy/commands/generate/targets/view.js b/Alloy/commands/generate/targets/view.js
index de20e24c5..4b125b4e6 100755
--- a/Alloy/commands/generate/targets/view.js
+++ b/Alloy/commands/generate/targets/view.js
@@ -1,5 +1,6 @@
-var GU = require('../generateUtils'),
-	logger = require('../../../logger');
+const { logger} = require('alloy-utils');
+
+var GU = require('../generateUtils');
 
 module.exports = function(name, args, program) {
 	var info = GU.generate(name, 'VIEW', program);
diff --git a/Alloy/commands/generate/targets/widget.js b/Alloy/commands/generate/targets/widget.js
index 9756f55db..230f0f901 100755
--- a/Alloy/commands/generate/targets/widget.js
+++ b/Alloy/commands/generate/targets/widget.js
@@ -2,10 +2,13 @@ var path = require('path'),
 	fs = require('fs-extra'),
 	chmodr = require('chmodr'),
 	jsonlint = require('jsonlint'),
-	U = require('../../../utils'),
-	_ = require('lodash'),
-	CONST = require('../../../common/constants'),
-	logger = require('../../../logger');
+	_ = require('lodash');
+
+const {
+	constants: CONST,
+	logger,
+	utils: U
+} = require('alloy-utils');
 
 var VERSION_DEFAULT = '1.0';
 
@@ -16,7 +19,7 @@ module.exports = function(name, args, program) {
 	var paths = getPaths(thePaths.app, widgetId);
 
 	// don't overwrite an existing widget unless force is specified
-	if (path.existsSync(paths.widget) && !program.force) {
+	if (fs.existsSync(paths.widget) && !program.force) {
 		U.die('Widget already exists: ' + paths.widget);
 	}
 
@@ -48,7 +51,7 @@ module.exports = function(name, args, program) {
 	);
 
 	// Add this widget as a dependency to our project
-	var configReadPath = path.existsSync(paths.config) ? paths.config : paths.configTemplate;
+	var configReadPath = fs.existsSync(paths.config) ? paths.config : paths.configTemplate;
 	var content = fs.readFileSync(configReadPath, 'utf8');
 	try {
 		var json = jsonlint.parse(content);
diff --git a/Alloy/commands/info/index.js b/Alloy/commands/info/index.js
index c8733af1c..8bc96a434 100644
--- a/Alloy/commands/info/index.js
+++ b/Alloy/commands/info/index.js
@@ -2,10 +2,10 @@
 	The `alloy info` command is used by Studio to discover info about supported adapters,
 	sample applications, and application templates.
 */
-var path = require('path'),
-	U = require('../../utils'),
-	CONST = require('../../common/constants'),
-	alloyRoot = path.join(__dirname, '..', '..', '..');
+const {
+	constants: CONST,
+	utils: U
+} = require('alloy-utils');
 
 var info = {
 	// TODO: reorganize and dynamically list data for adapters
diff --git a/Alloy/commands/install/index.js b/Alloy/commands/install/index.js
index 94c5988e9..eb9795ec5 100644
--- a/Alloy/commands/install/index.js
+++ b/Alloy/commands/install/index.js
@@ -6,11 +6,14 @@
 	and is run by Studio after each compilation.
 */
 var path = require('path'),
-	logger = require('../../logger'),
-	U = require('../../utils'),
-	CONST = require('../../common/constants'),
 	alloyRoot = path.join(__dirname, '..', '..', '..');
 
+const {
+	constants: CONST,
+	logger,
+	utils: U
+} = require('alloy-utils');
+
 module.exports = function(args, program) {
 	var errMsg = 'Must be one of the following: [' + CONST.INSTALL_TYPES.join(',') + ']';
 	var type = args[0] || U.die(['`alloy install` must have a type', errMsg]);
diff --git a/Alloy/commands/move/index.js b/Alloy/commands/move/index.js
index 0326ce3bb..942dd4ff4 100644
--- a/Alloy/commands/move/index.js
+++ b/Alloy/commands/move/index.js
@@ -1,11 +1,13 @@
-var colors = require('colors'),
-	fs = require('fs-extra'),
+var fs = require('fs-extra'),
 	walkSync = require('walk-sync'),
 	path = require('path'),
-	_ = require('lodash'),
-	U = require('../../utils'),
-	CONST = require('../../common/constants'),
-	logger = require('../../logger');
+	_ = require('lodash');
+
+const {
+	constants: CONST,
+	logger,
+	utils: U
+} = require('alloy-utils');
 
 function move(source, destination, callback) {
 	// make sure the target folder exists
diff --git a/Alloy/commands/new/index.js b/Alloy/commands/new/index.js
index 7125a310f..590baf5d5 100755
--- a/Alloy/commands/new/index.js
+++ b/Alloy/commands/new/index.js
@@ -9,10 +9,14 @@
 var path = require('path'),
 	fs = require('fs-extra'),
 	chmodr = require('chmodr'),
-	_ = require('lodash'),
-	U = require('../../utils'),
-	CONST = require('../../common/constants'),
-	logger = require('../../logger');
+	_ = require('lodash');
+
+const {
+	constants: CONST,
+	logger,
+	platforms,
+	utils: U
+} = require('alloy-utils');
 
 var BASE_ERR = 'Project creation failed. ';
 var platformsDir = path.join(__dirname, '..', '..', '..', 'platforms');
@@ -36,7 +40,7 @@ module.exports = function(args, program) {
 	chmodr.sync(paths.app, 0755);
 
 	// copy platform-specific folders from Resources to app/assets
-	_.each(CONST.PLATFORM_FOLDERS, function(platform) {
+	_.each(platforms.constants.PLATFORM_FOLDERS, function(platform) {
 		var rPath = path.join(paths.resources, platform);
 		if (fs.existsSync(rPath)) {
 			var aPath = path.join(paths.app, CONST.DIR.ASSETS, platform);
@@ -81,7 +85,7 @@ module.exports = function(args, program) {
 		path.join(paths.template, 'gitignore.txt'),
 		path.join(paths.project, '.gitignore')
 	);
-	_.each(CONST.PLATFORM_FOLDERS, function(dir) {
+	_.each(platforms.constants.PLATFORM_FOLDERS, function(dir) {
 		var rDir = path.join(paths.resources, dir);
 		if (!fs.existsSync(rDir)) {
 			return;
@@ -95,7 +99,7 @@ module.exports = function(args, program) {
 
 	// copy in any Alloy-specific Resources files
 	// fs.copySync(paths.alloyResources,paths.assets,{preserveTimestamps:true});
-	_.each(CONST.PLATFORMS, function(p) {
+	_.each(platforms.constants.PLATFORM_FOLDERS, function(p) {
 		var pDir = path.join(platformsDir, p, 'project');
 		if (!fs.existsSync(pDir)) {
 			return;
diff --git a/Alloy/commands/remove/index.js b/Alloy/commands/remove/index.js
index 520e68dce..d7b87b8e1 100644
--- a/Alloy/commands/remove/index.js
+++ b/Alloy/commands/remove/index.js
@@ -1,11 +1,13 @@
-var colors = require('colors'),
-	fs = require('fs'),
+var fs = require('fs'),
 	walkSync = require('walk-sync'),
 	path = require('path'),
-	_ = require('lodash'),
-	U = require('../../utils'),
-	CONST = require('../../common/constants'),
-	logger = require('../../logger');
+	_ = require('lodash');
+
+const {
+	constants: CONST,
+	logger,
+	utils: U
+} = require('alloy-utils');
 
 function cleanup(args) {
 	args = args || {};
diff --git a/Alloy/commands/test/index.js b/Alloy/commands/test/index.js
index 06880b939..c61bb81be 100644
--- a/Alloy/commands/test/index.js
+++ b/Alloy/commands/test/index.js
@@ -3,9 +3,12 @@
 */
 var fs = require('fs'),
 	path = require('path'),
-	spawn = require('child_process').spawn,
-	U = require('../../utils'),
-	logger = require('../../logger');
+	spawn = require('child_process').spawn;
+
+const {
+	logger,
+	utils: U
+} = require('alloy-utils');
 
 var ALLOY_ROOT = path.join(__dirname, '../../..');
 var JAKE = path.join(ALLOY_ROOT, 'node_modules', '.bin', 'jake');
diff --git a/Alloy/common/constants.js b/Alloy/common/constants.js
deleted file mode 100755
index ef2976471..000000000
--- a/Alloy/common/constants.js
+++ /dev/null
@@ -1,272 +0,0 @@
-var isTitanium = typeof Titanium !== 'undefined';
-var _, generatePlatformArray;
-
-if (isTitanium) {
-	_ = require('/alloy/underscore')._;
-} else {
-	var platforms = require('../../platforms/index');
-	_ = require('../lib/alloy/underscore')._;
-
-	// iterate through supported platforms to create specific constants
-	generatePlatformArray = function(key) {
-		var ret = [];
-		_.each(_.keys(platforms), function(p) {
-			ret.push(platforms[p][key]);
-		});
-		return ret;
-	};
-
-	// generate compile time constants based on supported platforms
-	exports.PLATFORMS = generatePlatformArray('platform');
-	exports.PLATFORM_FOLDERS_ALLOY = generatePlatformArray('alloyFolder');
-	exports.PLATFORM_FOLDERS = generatePlatformArray('titaniumFolder');
-}
-
-// General default values
-exports.ALLOY_DIR = 'app';
-exports.ALLOY_RUNTIME_DIR = 'alloy';
-exports.RESOURCES_DIR = 'Resources';
-exports.NAME_DEFAULT = 'index';
-exports.NAME_WIDGET_DEFAULT = 'widget';
-exports.NPM_WIDGET_PREFIX = 'alloy-widget-';
-exports.NPM_WIDGET_KEYWORDS = ['appcelerator', 'titanium', 'alloy', 'widget'];
-exports.GLOBAL_STYLE = 'app.tss';
-exports.ROOT_NODE = 'Alloy';
-exports.NAMESPACE_DEFAULT = 'Ti.UI';
-exports.REQUIRE_TYPE_DEFAULT = 'view';
-exports.PLUGIN_NAME = 'ti.alloy';
-exports.EXPR_PREFIX = '#';
-exports.PLUGIN_FILE = 'plugin.py';
-exports.HOOK_FILE = 'alloy.js';
-exports.HOOK_FILE_CLEAN = 'deepclean.js';
-exports.MINIMUM_TI_SDK = '3.0.0';
-exports.ITEM_TEMPLATE_VAR = '__itemTemplate';
-exports.PARENT_SYMBOL_VAR = '__parentSymbol';
-exports.WIDGET_OBJECT = 'Widget';
-exports.SKIP_EVENT_HANDLING = ['Ti.UI.ListItem', 'Alloy.Abstract.ItemTemplate'];
-exports.ADAPTERS = ['localStorage', 'properties', 'sql'];
-exports.CONTROLLER_NODES = ['Alloy.Require', 'Alloy.Widget'];
-exports.DEFAULT_BACKBONE_VERSION = '0.9.2';
-exports.SUPPORTED_BACKBONE_VERSIONS = ['0.9.2', '1.1.2', '1.3.3', '1.4.0'];
-
-// property names
-exports.CLASS_PROPERTY = 'classes';
-exports.APINAME_PROPERTY = 'apiName';
-exports.AUTOSTYLE_PROPERTY = 'autoStyle';
-exports.DOCROOT_MODULE_PROPERTY = 'module';
-exports.DOCROOT_BASECONTROLLER_PROPERTY = 'baseController';
-
-// Constants related to model-view binding
-exports.BIND_PROPERTIES = ['dataCollection', 'dataFilter', 'dataTransform', 'dataFunction'];
-exports.BIND_COLLECTION = 'dataCollection';
-exports.BIND_WHERE = 'dataFilter';
-exports.BIND_TRANSFORM = 'dataTransform';
-exports.BIND_FUNCTION = 'dataFunction';
-exports.BIND_TRANSFORM_VAR = '__transform';
-exports.BIND_MODEL_VAR = '$model';
-exports.MODEL_ELEMENTS = ['Alloy.Collection', 'Alloy.Model'];
-exports.MODEL_BINDING_EVENTS = 'fetch change destroy';
-exports.COLLECTION_BINDING_EVENTS = 'fetch destroy change add remove reset sort';
-exports.COLLECTION_BINDING_EVENTS_092 = 'fetch destroy change add remove reset';
-
-// Constants for properties shared between ActionBar and Toolbar on Android
-exports.BACKGROUND_IMAGE = 'backgroundImage';
-exports.DISPLAY_HOME_AS_UP = 'displayHomeAsUp';
-exports.HOME_BUTTON_ENABLED = 'homeButtonEnabled';
-exports.NAVIGATION_MODE = 'navigationMode';
-exports.ON_HOME_ICON_ITEM_SELECTED = 'onHomeIconItemSelected';
-
-// Listings for supported platforms and commands
-exports.INSTALL_TYPES = ['plugin'];
-exports.GENERATE_TARGETS = ['controller', 'jmk', 'model', 'migration', 'view', 'widget', 'style'];
-exports.DEPLOY_TYPES = [
-	{ key: 'ENV_DEV', value: 'development' },
-	{ key: 'ENV_DEVELOPMENT', value: 'development' },
-	{ key: 'ENV_TEST', value: 'test' },
-	{ key: 'ENV_PROD', value: 'production' },
-	{ key: 'ENV_PRODUCTION', value: 'production' }
-];
-exports.DIST_TYPES = [
-	{ key: 'DIST_ADHOC', value: ['dist-adhoc'] },
-	{ key: 'DIST_STORE', value: ['dist-appstore', 'dist-playstore'] }
-];
-
-// mappings of file extensions and folders for each file type
-exports.FILE_EXT = {
-	VIEW: 'xml',
-	STYLE: 'tss',
-	MODEL: 'js',
-	MODELCODE: 'js',
-	MIGRATION: 'js',
-	CONTROLLER: 'js',
-	COMPONENT: 'js',
-	CONFIG: 'json',
-	JMK: 'jmk',
-	MAP: 'map'
-};
-exports.DIR = {
-	VIEW: 'views',
-	STYLE: 'styles',
-	RUNTIME_STYLE: 'styles',
-	CONTROLLER: 'controllers',
-	MODEL: 'models',
-	MODELCODE: 'models',
-	MIGRATION: 'migrations',
-	CONFIG: 'config',
-	ASSETS: 'assets',
-	WIDGET: 'widgets',
-	LIB: 'lib',
-	COMPONENT: 'controllers',
-	MAP: 'build/map',
-	VENDOR: 'vendor',
-	THEME: 'themes',
-	BUILD: 'build/alloy',
-	I18N: 'i18n',
-	PLATFORM: 'platform'
-};
-// folders/files to exclude when copying and processing files
-// RegEx format: must escape special chars - so use \.svn not .svn
-exports.EXCLUDED_FILES = [
-	'\\.svn', '\\.git'
-];
-
-// constants identifying JS reserved words
-exports.JS_RESERVED = [
-	'break', 'case', 'catch', 'continue', 'debugger', 'default', 'delete',
-	'do', 'else', 'finally', 'for', 'function', 'if', 'in', 'instanceof',
-	'new', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'var',
-	'void', 'while', 'with'
-];
-exports.JS_RESERVED_FUTURE = [
-	'class', 'enum', 'export', 'extends', 'import', 'super', 'implements',
-	'interface', 'let', 'package', 'private', 'protected', 'public',
-	'static', 'yield'
-];
-exports.JS_RESERVED_ALL = _.union(exports.JS_RESERVED, exports.JS_RESERVED_FUTURE);
-
-// constants for implicit namespaces in markup
-var NS_ALLOY = 'Alloy',
-	NS_ALLOY_ABSTRACT = 'Alloy.Abstract',
-	NS_TI_ANDROID = 'Ti.Android',
-	NS_TI_MAP = 'Ti.Map',
-	NS_TI_MEDIA = 'Ti.Media',
-	NS_TI_UI_IOS = 'Ti.UI.iOS',
-	NS_TI_UI_IPAD = 'Ti.UI.iPad',
-	NS_TI_UI_IPHONE = 'Ti.UI.iPhone',
-	NS_TI_UI_MOBILEWEB = 'Ti.UI.MobileWeb',
-	NS_TI_UI_WINDOWS = 'Ti.UI.Windows';
-
-exports.IMPLICIT_NAMESPACES = {
-	// Alloy
-	Collection: NS_ALLOY,
-	Model: NS_ALLOY,
-	Module: NS_ALLOY,
-	Require: NS_ALLOY,
-	Widget: NS_ALLOY,
-
-	// Alloy.Abstract
-	ButtonNames: NS_ALLOY_ABSTRACT,
-	ButtonName: NS_ALLOY_ABSTRACT,
-	BarItemTypes: NS_ALLOY_ABSTRACT,
-	BarItemType: NS_ALLOY_ABSTRACT,
-	CoverFlowImageTypes: NS_ALLOY_ABSTRACT,
-	CoverFlowImageType: NS_ALLOY_ABSTRACT,
-	FlexSpace: NS_ALLOY_ABSTRACT,
-	FixedSpace: NS_ALLOY_ABSTRACT,
-	Images: NS_ALLOY_ABSTRACT,
-	Item: NS_ALLOY_ABSTRACT,
-	Items: NS_ALLOY_ABSTRACT,
-	ItemTemplate: NS_ALLOY_ABSTRACT,
-	Labels: NS_ALLOY_ABSTRACT,
-	Option: NS_ALLOY_ABSTRACT,
-	Options: NS_ALLOY_ABSTRACT,
-	Templates: NS_ALLOY_ABSTRACT,
-	Preview: NS_ALLOY_ABSTRACT,
-	Actions: NS_ALLOY_ABSTRACT,
-
-	// Ti.Android
-	Menu: NS_TI_ANDROID,
-	MenuItem: NS_TI_ANDROID,
-	ActionBar: NS_TI_ANDROID,
-
-	// Ti.UI.Android
-	CardView: 'Ti.UI.Android',
-
-	// Ti.Map
-	Annotation: NS_TI_MAP,
-
-	// Ti.Media
-	VideoPlayer: NS_TI_MEDIA,
-	MusicPlayer: NS_TI_MEDIA,
-	AudioPlayer: NS_TI_MEDIA,
-
-	// Ti.UI.iOS
-	AdView: NS_TI_UI_IOS,
-	BlurView: NS_TI_UI_IOS,
-	CoverFlowView: NS_TI_UI_IOS,
-	DocumentViewer: NS_TI_UI_IOS,
-	LivePhotoView: NS_TI_UI_IOS,
-	SplitWindow: NS_TI_UI_IOS,
-	PreviewContext: NS_TI_UI_IOS,
-	PreviewAction: NS_TI_UI_IOS,
-	PreviewActionGroup: NS_TI_UI_IOS,
-	MenuPopup: NS_TI_UI_IOS,
-	Stepper: NS_TI_UI_IOS,
-
-	// Ti.UI.iPad
-	Popover: NS_TI_UI_IPAD,
-
-	// Ti.UI.iPhone
-	NavigationGroup: isTitanium && Ti.Platform.osname === 'mobileweb' ?
-		NS_TI_UI_MOBILEWEB : NS_TI_UI_IPHONE,
-	StatusBar: NS_TI_UI_IPHONE,
-
-	// Ti.UI.Windows
-	CommandBar: NS_TI_UI_WINDOWS,
-	AppBarButton: NS_TI_UI_WINDOWS,
-	AppBarToggleButton: NS_TI_UI_WINDOWS,
-	AppBarSeparator: NS_TI_UI_WINDOWS,
-
-	// Ti.UI.Window
-	LeftNavButton: 'Ti.UI.Window',
-	RightNavButton: 'Ti.UI.Window',
-	LeftNavButtons: 'Ti.UI.Window',
-	RightNavButtons: 'Ti.UI.Window',
-	TitleControl: 'Ti.UI.Window',
-	WindowToolbar: 'Ti.UI.Window',
-
-	// Ti.UI.iPad.Popover
-	ContentView: 'Ti.UI.iPad.Popover',
-
-	DrawerLayout: 'Ti.UI.Android',
-	LeftView: 'Ti.UI.Android.DrawerLayout',
-	CenterView: 'Ti.UI.Android.DrawerLayout',
-	RightView: 'Ti.UI.Android.DrawerLayout',
-
-	// Table and List proxy properties
-	FooterView: '_ProxyProperty._Lists',
-	HeaderView: '_ProxyProperty._Lists',
-	HeaderPullView: '_ProxyProperty._Lists',
-	PullView: '_ProxyProperty._Lists',
-	Search: '_ProxyProperty._Lists',
-	SearchView: '_ProxyProperty._Lists',
-
-	// misc proxy properties
-	RightButton: '_ProxyProperty',
-	LeftButton: '_ProxyProperty',
-	KeyboardToolbar: '_ProxyProperty',
-	ActionView: '_ProxyProperty'
-
-};
-
-// properties named with "on" that aren't used to signify event listeners
-exports.SPECIAL_PROPERTY_NAMES = [
-	'onHomeIconItemSelected',
-	'onTintColor',
-	'onCreateOptionsMenu',
-	'onPrepareOptionsMenu'
-];
-
-exports.COMMANDS = {
-	GENERATE: 'generate'
-};
diff --git a/Alloy/lib/alloy/sync/localStorage.js b/Alloy/lib/alloy/sync/localStorage.js
deleted file mode 100755
index 218a6adcd..000000000
--- a/Alloy/lib/alloy/sync/localStorage.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * HTML5 localStorage sync adapter
- */
-var _ = require('/alloy/underscore')._;
-
-function S4() {
-	return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
-}
-
-function guid() {
-	return (S4() + S4() + '-' + S4() + '-' + S4() + '-' + S4() + '-' + S4() + S4() + S4());
-}
-
-function InitAdapter() {
-	if (!OS_MOBILEWEB) {
-		throw 'localStorage persistence supported only with MobileWeb.';
-	}
-}
-
-function Sync(method, model, opts) {
-	var name = model.config.adapter.collection_name,
-		data = model.config.data,
-		resp = null;
-
-	function storeModel(data) {
-		localStorage.setItem(name, JSON.stringify(data));
-	}
-
-	switch (method) {
-
-		case 'create':
-			if (!model.id) {
-				model.id = guid();
-				model.set(model.idAttribute, model.id);
-			}
-			data[model.id] = model;
-			storeModel(data);
-			resp = model.toJSON();
-			break;
-
-		case 'read':
-			var store = localStorage.getItem(name);
-			var store_data = (store && JSON.parse(store)) || {};
-
-			var len = 0;
-			for (var key in store_data) {
-				var m = new model.config.Model(store_data[key]);
-				model.models.push(m);
-				len++;
-			}
-
-			model.length = len;
-			if (len === 1) {
-				resp = model.models[0];
-			} else {
-				resp = model.models;
-			}
-			break;
-
-		case 'update':
-			data[model.id] = model;
-			storeModel(data);
-			resp = model.toJSON();
-			break;
-
-		case 'delete':
-			delete data[model.id];
-			storeModel(data);
-			resp = model.toJSON();
-			break;
-	}
-
-	// process success/error handlers, if present
-	if (resp) {
-		if (_.isFunction(opts.success)) { opts.success(resp); }
-		if (method === 'read') { model.trigger('fetch'); }
-	} else {
-		if (_.isFunction(opts.error)) { opts.error(resp); }
-	}
-}
-
-module.exports.sync = Sync;
-
-module.exports.beforeModelCreate = function(config) {
-	config = config || {};
-
-	config.data = {}; // for localStorage or case where entire collection is needed to maintain store
-
-	InitAdapter();
-
-	return config;
-};
-
-module.exports.afterModelCreate = function(Model) {
-	Model = Model || {};
-
-	Model.prototype.config.Model = Model; // needed for fetch operations to initialize the collection from persistent store
-
-	return Model;
-};
diff --git a/Alloy/logger.js b/Alloy/logger.js
deleted file mode 100755
index a4d540269..000000000
--- a/Alloy/logger.js
+++ /dev/null
@@ -1,85 +0,0 @@
-var colors = require('colors'),
-	U = require('./utils');
-
-exports.TRACE = 4;
-exports.DEBUG = 3;
-exports.INFO = 2;
-exports.WARN = 1;
-exports.ERROR = 0;
-exports.NONE = -1;
-exports.logLevel = exports.TRACE;
-exports.stripColors = false;
-exports.showTimestamp = false;
-
-exports.trace = function(msg) {
-	if (exports.logLevel >= exports.TRACE) { printMessage(msg, 'trace', 'grey'); }
-};
-
-exports.debug = function(msg) {
-	if (exports.logLevel >= exports.DEBUG) { printMessage(msg, 'debug', 'cyan'); }
-};
-
-exports.info = function(msg) {
-	if (exports.logLevel >= exports.INFO) { printMessage(msg, 'info', 'white'); }
-};
-
-exports.warn = function(msg) {
-	if (exports.logLevel >= exports.WARN) { printMessage(msg, 'warn', 'yellow'); }
-};
-
-exports.error = function(msg) {
-	if (exports.logLevel >= exports.ERROR) { printMessage(msg, 'error', 'red'); }
-};
-
-// Private functions and members
-var levels = ['info', 'debug', 'error', 'warn', 'trace'];
-var has = function(array, item) {
-	var len = array.length;
-	for (var i = 0; i < len; i++) {
-		if (array[i] === item) {
-			return true;
-		}
-	}
-	return false;
-};
-var isArray = function(object) {
-	return Object.prototype.toString.call(object) === '[object Array]';
-};
-
-var formattedDate = function() {
-	var date = new Date();
-	var pad = function(val) {
-		val += '';
-		return val.length < 2 ? '0' + val : val;
-	};
-	return date.getFullYear() + '-' + pad(date.getMonth() + 1) + '-' + pad(date.getDate()) + ' ' +
-		pad(date.getHours()) + ':' + pad(date.getMinutes()) + ':' + pad(date.getSeconds());
-};
-
-var printMessage = function(msg, level, color) {
-	// Validate arguments
-	msg = msg || '';
-	level = level || 'info';
-	level = has(levels, level) ? level : 'info';
-	color = color || 'white';
-
-	// Have to wrap in a function to avoid "Illegal invocation" error on android
-	var logFunc = function(msg) {
-		(level === 'debug' || level === 'trace' ? console.log : console[level])(msg);
-	};
-
-	function printLine(line) {
-		if (isArray(line)) {
-			for (var i = 0; i < line.length; i++) {
-				printLine(line[i]);
-			}
-		} else {
-			var tag = (exports.showTimestamp ? formattedDate() + ' -- ' : '') + '[' +
-				level.toUpperCase() + '] ';
-			var str = tag.grey + (line || '')[color];
-			if (exports.stripColors) { str = U.stripColors(str); }
-			logFunc(str);
-		}
-	}
-	printLine(msg);
-};
diff --git a/Alloy/template/component.js b/Alloy/template/component.js
deleted file mode 100755
index f48a3a37b..000000000
--- a/Alloy/template/component.js
+++ /dev/null
@@ -1,58 +0,0 @@
-var Alloy = require('/alloy'),
-	Backbone = Alloy.Backbone,
-	_ = Alloy._;
-
-<%= ES6Mod %>
-<%= WPATH %>
-
-function __processArg(obj, key) {
-	var arg = null;
-	if (obj) {
-		arg = obj[key] || null;
-	}
-	return arg;
-}
-
-function Controller() {
-	<%= Widget %>
-	require('/alloy/controllers/' + <%= parentController %>).apply(this, Array.prototype.slice.call(arguments));
-	this.__controllerPath = '<%= controllerPath %>';
-	this.args = arguments[0] || {};
-
-	if (arguments[0]) {
-		var <%= parentVariable %> = __processArg(arguments[0], '<%= parentVariable %>');
-		var <%= modelVariable %> = __processArg(arguments[0], '<%= modelVariable %>');
-		var <%= itemTemplateVariable %> = __processArg(arguments[0], '<%= itemTemplateVariable %>');
-	}
-	var $ = this;
-	var exports = {};
-	var __defers = {};
-
-	// Generated code that must be executed before all UI and/or
-	// controller code. One example is all model and collection
-	// declarations from markup.
-	<%= preCode %>
-
-	// Generated UI code
-	<%= viewCode %>
-
-	// make all IDed elements in $.__views available right on the $ in a
-	// controller's internal code. Externally the IDed elements will
-	// be accessed with getView().
-	_.extend($, $.__views);
-
-	// Controller code directly from the developer's controller file
-	__MAPMARKER_CONTROLLER_CODE__
-
-	// Generated code that must be executed after all UI and
-	// controller code. One example deferred event handlers whose
-	// functions are not defined until after the controller code
-	// is executed.
-	<%= postCode %>
-
-	// Extend the $ instance with all functions and properties
-	// defined on the exports object.
-	_.extend($, exports);
-}
-
-module.exports = Controller;
diff --git a/Alloy/template/lib/alloy.js b/Alloy/template/lib/alloy.js
index 06dca71a3..3ae8ead36 100644
--- a/Alloy/template/lib/alloy.js
+++ b/Alloy/template/lib/alloy.js
@@ -32,8 +32,6 @@ exports._ = _;
 exports.Backbone = Backbone;
 
 var DEFAULT_WIDGET = 'widget';
-var TI_VERSION = Ti.version;
-var MW320_CHECK = OS_MOBILEWEB && TI_VERSION >= '3.2.0';
 var IDENTITY_TRANSFORM = OS_ANDROID ? (Ti.version >= '8.0.0' ? Ti.UI.createMatrix2D() : Ti.UI.create2DMatrix()) : undefined;
 var RESET = {
 	bottom: null,
@@ -319,8 +317,6 @@ exports.createStyle = function(controller, opts, defaults) {
 	styleFinal[CONST.CLASS_PROPERTY] = classes;
 	styleFinal[CONST.APINAME_PROPERTY] = apiName;
 
-	if (MW320_CHECK) { delete styleFinal[CONST.APINAME_PROPERTY]; }
-
 	return defaults ? _.defaults(styleFinal, defaults) : styleFinal;
 };
 
@@ -338,7 +334,6 @@ exports.addClass = function(controller, proxy, classes, opts) {
 	// make sure we actually have classes to add
 	if (!classes) {
 		if (opts) {
-			if (MW320_CHECK) { delete opts.apiName; }
 			proxy.applyProperties(opts);
 		}
 		return;
@@ -352,7 +347,6 @@ exports.addClass = function(controller, proxy, classes, opts) {
 		// make sure we actually added classes before processing styles
 		if (beforeLen === newClasses.length) {
 			if (opts) {
-				if (MW320_CHECK) { delete opts.apiName; }
 				proxy.applyProperties(opts);
 			}
 			return;
@@ -370,7 +364,6 @@ exports.removeClass = function(controller, proxy, classes, opts) {
 	// make sure there's classes to remove before processing
 	if (!beforeLen || !classes.length) {
 		if (opts) {
-			if (MW320_CHECK) { delete opts.apiName; }
 			proxy.applyProperties(opts);
 		}
 		return;
@@ -382,7 +375,6 @@ exports.removeClass = function(controller, proxy, classes, opts) {
 		// make sure there was actually a difference before processing
 		if (beforeLen === newClasses.length) {
 			if (opts) {
-				if (MW320_CHECK) { delete opts.apiName; }
 				proxy.applyProperties(opts);
 			}
 			return;
@@ -478,15 +470,6 @@ exports.isTablet = (function() {
 		var psc = Ti.Platform.Android.physicalSizeCategory;
 		return psc === Ti.Platform.Android.PHYSICAL_SIZE_CATEGORY_LARGE ||
 			psc === Ti.Platform.Android.PHYSICAL_SIZE_CATEGORY_XLARGE;
-	} else if (OS_MOBILEWEB) {
-		return Math.min(
-			Ti.Platform.displayCaps.platformHeight,
-			Ti.Platform.displayCaps.platformWidth
-		) >= 400;
-	// } else if (OS_BLACKBERRY) {
-	// 	// Tablets not currently supported by BB TiSDK
-	// 	// https://jira.appcelerator.org/browse/TIMOB-13225
-	// 	return false;
 	} else if (OS_WINDOWS) {
 		// per http://www.extremetech.com/computing/139768-windows-8-smartphones-and-windows-phone-8-tablets
 		// tablets should be >= 1024x768 and phones could be lower, though current phones are running at
diff --git a/Alloy/template/wpath.js b/Alloy/template/wpath.js
deleted file mode 100644
index 0eb4c656d..000000000
--- a/Alloy/template/wpath.js
+++ /dev/null
@@ -1,8 +0,0 @@
-function WPATH(s) {
-	var index = s.lastIndexOf('/');
-	var path = index === -1 ?
-		'<%= WIDGETID %>/' + s :
-		s.substring(0, index) + '/<%= WIDGETID %>/' + s.substring(index + 1);
-
-	return path.indexOf('/') !== 0 ? '/' + path : path;
-}
\ No newline at end of file
diff --git a/Alloy/tiapp.js b/Alloy/tiapp.js
deleted file mode 100644
index 8138eb4da..000000000
--- a/Alloy/tiapp.js
+++ /dev/null
@@ -1,208 +0,0 @@
-var fs = require('fs'),
-	path = require('path'),
-	XMLSerializer = require('xmldom').XMLSerializer,
-	pkg = require('../package'),
-	U = require('./utils'),
-	CONST = require('./common/constants'),
-	logger = require('./logger');
-
-var DEFAULT_TIAPP = path.join('.', 'tiapp.xml');
-
-var tiapp = {},
-	tiappFile, doc;
-
-// initialize the project folder
-tiapp.init = function(file) {
-	tiappFile = file || DEFAULT_TIAPP;
-	doc = tiapp.parse(tiappFile);
-};
-
-// Return an XML document object representing the tiapp.xml file
-tiapp.parse = function(file) {
-	file = file || tiappFile;
-	if (!fs.existsSync(file)) {
-		U.die('tiapp.xml file does not exist at "' + file + '"');
-	}
-	return U.XML.parseFromFile(file);
-};
-
-// Get the Titanium SDK version as a string
-// Get the Titanium SDK version as a string
-tiapp.getSdkVersion = function() {
-	var elems = doc.documentElement.getElementsByTagName('sdk-version');
-	if (elems && elems.length > 0) {
-		return U.XML.getNodeText(elems.item(elems.length - 1));
-	} else {
-		if (process.env.sdk) {
-			return process.env.sdk;
-		} else {
-			return getSdkSelectVersion();
-		}
-	}
-};
-function getSdkSelectVersion() {
-	var homeDir = process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME'],
-		file = path.join(homeDir, '.titanium', 'config.json');
-	if (!fs.existsSync(file)) {
-		U.die('Titanium configuration file does not exist at "' + file + '"');
-	}
-	var ticonfig = JSON.parse(fs.readFileSync(file, {encoding: 'utf8'}));
-	return ticonfig.sdk.selected;
-}
-
-// Get the value of a property from the tiapp.xml
-tiapp.getProperty = function(name) {
-	var props = doc.documentElement.getElementsByTagName('property');
-	for (var i = 0; i < props.length; i++) {
-		if (props.item(i).getAttribute('name') === name) {
-			return props.item(i);
-		}
-	}
-	return null;
-};
-
-// Add a module to the tiapp.xml
-tiapp.installModule = function(opts) {
-	install('module', opts);
-};
-
-// Add a plugin to the tiapp.xml
-tiapp.installPlugin = function(opts) {
-	install('plugin', opts);
-};
-
-// make sure the target TiSDK version meets the minimum for Alloy
-tiapp.validateSdkVersion = function() {
-	var tiVersion = tiapp.getSdkVersion();
-	if (tiVersion === null) {
-		logger.warn('Unable to determine Titanium SDK version from tiapp.xml.');
-		logger.warn('Your app may have unexpected behavior. Make sure your tiapp.xml is valid.');
-	} else if (tiapp.version.lt(tiVersion, CONST.MINIMUM_TI_SDK)) {
-		logger.error('Alloy ' + pkg.version + ' requires Titanium SDK ' +
-			CONST.MINIMUM_TI_SDK + ' or higher.');
-		logger.error('"' + tiVersion + '" was found in the "sdk-version" field of your tiapp.xml.');
-		logger.error('If you are building with the legacy titanium.py script and are specifying ');
-		logger.error('an SDK version as a CLI argument that is different than the one in your ');
-		logger.error('tiapp.xml, please change the version in your tiapp.xml file.');
-		process.exit(1);
-	}
-};
-
-// version comparison functions
-tiapp.version = {
-	compare: function(v1, v2) {
-		// use the tiapp.xml version if v2 is not specified
-		if (typeof v2 === 'undefined') {
-			v2 = v1;
-			v1 = tiapp.getSdkVersion();
-		}
-
-		var parts1 = (v1 || '').split('.'),
-			parts2 = (v2 || '').split('.');
-
-		for (var i = 0; i < 3; i++) {
-			var p1 = parseInt(parts1[i] || 0, 10),
-				p2 = parseInt(parts2[i] || 0, 10);
-			if (p1 > p2) {
-				return 1;
-			} else if (p1 < p2) {
-				return -1;
-			}
-		}
-
-		return 0;
-	},
-	eq: function(v1, v2) { return tiapp.version.compare(v1, v2) === 0; },
-	gt: function(v1, v2) { return tiapp.version.compare(v1, v2) === 1; },
-	gte: function(v1, v2) { return tiapp.version.compare(v1, v2) !== -1; },
-	lt: function(v1, v2) { return tiapp.version.compare(v1, v2) === -1; },
-	lte: function(v1, v2) { return tiapp.version.compare(v1, v2) !== 1; },
-	neq: function(v1, v2) { return tiapp.version.compare(v1, v2) !== 0; }
-};
-
-tiapp.getDeploymentTargets = function() {
-	var deployment = doc.documentElement.getElementsByTagName('deployment-targets'),
-		results = [];
-
-	if (deployment.length > 0) {
-		var targets = deployment.item(0).getElementsByTagName('target');
-		for (var i = 0, j = targets.length; i < j; i++) {
-			var target = targets.item(i);
-			if (U.XML.getNodeText(target) === 'true') {
-				var platform = target.getAttribute('device');
-				if (platform === 'iphone' || platform === 'ipad') {
-					platform = 'ios';
-				}
-
-				if (results.indexOf(platform) === -1) {
-					results.push(platform);
-				}
-			}
-		}
-	}
-	return results;
-};
-
-function install(type, opts) {
-	type = type || 'module';
-	opts = opts || {};
-
-	var err = 'Project creation failed. Unable to install ' + type + ' "' +
-		(opts.name || opts.id) + '"';
-
-	// read the tiapp.xml file
-	var collection = doc.documentElement.getElementsByTagName(type + 's');
-	var found = false;
-
-	// Determine if the module or plugin is already installed
-	if (collection.length > 0) {
-		var items = collection.item(0).getElementsByTagName(type);
-		if (items.length > 0) {
-			for (var c = 0; c < items.length; c++) {
-				var theItem = items.item(c);
-				var theItemText = U.XML.getNodeText(theItem);
-				if (theItemText == opts.id) {
-					found = true;
-					break;
-				}
-			}
-		}
-	}
-
-	// install module or plugin
-	if (!found) {
-		// create the node to be inserted
-		var node = doc.createElement(type);
-		var text = doc.createTextNode(opts.id);
-		if (opts.platform) {
-			node.setAttribute('platform', opts.platform);
-		}
-		if (opts.version) {
-			node.setAttribute('version', opts.version);
-		}
-		node.appendChild(text);
-
-		// add the node into tiapp.xml
-		var pna = null;
-		if (collection.length === 0) {
-			var pn = doc.createElement(type + 's');
-			doc.documentElement.appendChild(pn);
-			doc.documentElement.appendChild(doc.createTextNode('\n'));
-			pna = pn;
-		} else {
-			pna = collection.item(0);
-		}
-		pna.appendChild(node);
-		pna.appendChild(doc.createTextNode('\n'));
-
-		// serialize the xml and write to tiapp.xml
-		var serializer = new XMLSerializer();
-		var newxml = serializer.serializeToString(doc);
-		fs.writeFileSync(tiappFile, newxml, 'utf8');
-
-		logger.info('Installed "' + opts.id + '" ' + type + ' to ' + tiappFile);
-	}
-
-}
-
-module.exports = tiapp;
diff --git a/Alloy/utils.js b/Alloy/utils.js
deleted file mode 100755
index ebefe407e..000000000
--- a/Alloy/utils.js
+++ /dev/null
@@ -1,674 +0,0 @@
-// The island of misfit toys... for functions
-
-var path = require('path'),
-	fs = require('fs-extra'),
-	walkSync = require('walk-sync'),
-	chmodr = require('chmodr'),
-	colors = require('colors'),
-	crypto = require('crypto'),
-	util = require('util'),
-	jsonlint = require('jsonlint'),
-	resolve = require('resolve'),
-	paths = require('global-paths'),
-	logger = require('./logger'),
-	tiapp = require('./tiapp'),
-	XMLSerializer = require('xmldom').XMLSerializer,
-	DOMParser = require('xmldom').DOMParser,
-	_ = require('lodash'),
-	CONST = require('./common/constants'),
-	sourceMapper = require('./commands/compile/sourceMapper'),
-	codeFrameColumns = require('@babel/code-frame').codeFrameColumns;
-
-var NODE_ACS_REGEX = /^ti\.cloud\..+?\.js$/;
-
-exports.XML = {
-	getNodeText: function(node) {
-		if (!node) { return ''; }
-		var serializer = new XMLSerializer(),
-			str = '';
-		for (var c = 0; c < node.childNodes.length; c++) {
-			if (node.childNodes[c].nodeType === 3) {
-				str += serializer.serializeToString(node.childNodes[c]);
-			}
-		}
-		return str.replace(/\&amp;/g, '&');
-	},
-	getElementsFromNodes: function(nodeList) {
-		var elems = [];
-		if (nodeList && nodeList.length) {
-			for (var i = 0, l = nodeList.length; i < l; i++) {
-				var node = nodeList.item(i);
-				if (node.nodeType === 1) {
-					elems.push(node);
-				}
-			}
-		}
-		return elems;
-	},
-	parseFromString: function(string) {
-		var doc;
-
-		function extractLineData(errorString) {
-			var lineData = errorString.match(/@#\[line:(\d+),col:(\d+)\]/);
-			var errorInfo = {
-				line: null,
-				column: null
-			};
-			if (lineData) {
-				errorInfo.line = parseInt(lineData[1], 10);
-				errorInfo.column = parseInt(lineData[2], 10);
-			}
-			return errorInfo;
-		}
-		try {
-			var errorHandler = {};
-			errorHandler.error = errorHandler.fatalError = function(m) {
-				var errorInfo = extractLineData(m);
-				m = m.replace(/@#\[line:(\d+),col:(\d+)\]/, '').trim();
-				exports.dieWithCodeFrame(m, errorInfo, string);
-			};
-			errorHandler.warn = errorHandler.warning = function(m) {
-				// ALOY-840: die on unclosed XML tags
-				// xmldom hardcodes this as a warning with the string message 'unclosed xml attribute'
-				// even when it's a tag that's unclosed
-				if (m.indexOf('unclosed xml attribute') === -1) {
-					logger.warn((m || '').split(/[\r\n]/));
-				} else {
-					m = m.replace('unclosed xml attribute', 'Unclosed XML tag or attribute');
-					var errorInfo = extractLineData(m);
-					exports.dieWithCodeFrame('Unclosed XML tag or attribute', errorInfo, string);
-				}
-			};
-			doc = new DOMParser({errorHandler:errorHandler, locator:{}}).parseFromString(string);
-		} catch (e) {
-			exports.die('Error parsing XML file.', e);
-		}
-
-		return doc;
-	},
-	parseFromFile: function(filename) {
-		var xml = fs.readFileSync(filename, 'utf8');
-		return exports.XML.parseFromString(xml);
-	},
-	createEmptyNode: function(name, ns) {
-		var str = '<' + name + (ns ? ' ns="' + ns + '"' : '') + '></' + name + '>';
-		return exports.XML.parseFromString(str).documentElement;
-	},
-	getAlloyFromFile: function(filename) {
-		var doc = exports.XML.parseFromFile(filename);
-		var docRoot = doc.documentElement;
-
-		// Make sure the markup has a top-level <Alloy> tag
-		if (docRoot.nodeName !== CONST.ROOT_NODE) {
-			exports.die([
-				'Invalid view file "' + filename + '".',
-				'All view markup must have a top-level <Alloy> tag'
-			]);
-		}
-
-		return docRoot;
-	},
-	toString: function(node) {
-		return (new XMLSerializer()).serializeToString(node);
-	},
-	previousSiblingElement: function(node) {
-		if (!node || !node.previousSibling || node.previousSibling === null) {
-			return null;
-		} else if (node.previousSibling.nodeType === 1) {
-			return node.previousSibling;
-		} else {
-			return exports.XML.previousSiblingElement(node.previousSibling);
-		}
-	}
-};
-
-exports.readTemplate = function(name) {
-	return fs.readFileSync(path.join(__dirname, 'template', name), 'utf8');
-};
-
-exports.evaluateTemplate = function(name, o) {
-	return _.template(exports.readTemplate(name))(o);
-};
-
-exports.getAndValidateProjectPaths = function(argPath, opts) {
-	opts = opts || {};
-	var projectPath = path.resolve(argPath);
-
-	// See if we got the "app" path or the project path as an argument
-	projectPath = fs.existsSync(path.join(projectPath, '..', 'tiapp.xml')) ?
-		path.join(projectPath, '..') : projectPath;
-
-	// Assign paths objects
-	var paths = {
-		project: projectPath,
-		app: path.join(projectPath, 'app'),
-		indexBase: path.join(CONST.DIR.CONTROLLER, CONST.NAME_DEFAULT + '.' + CONST.FILE_EXT.CONTROLLER)
-	};
-	paths.index = path.join(paths.app, paths.indexBase);
-	paths.assets = path.join(paths.app, 'assets');
-	paths.resources = path.join(paths.project, 'Resources');
-	paths.resourcesAlloy = path.join(paths.resources, 'alloy');
-
-	// validate project and "app" paths
-	if (!fs.existsSync(paths.project)) {
-		exports.die('Titanium project path does not exist at "' + paths.project + '".');
-	} else if (!fs.existsSync(path.join(paths.project, 'tiapp.xml'))) {
-		exports.die('Invalid Titanium project path (no tiapp.xml) at "' + paths.project + '"');
-	} else if (!fs.existsSync(paths.app)) {
-		exports.die('Alloy "app" directory does not exist at "' + paths.app + '"');
-	} else if (!fs.existsSync(paths.index) && (opts.command !== CONST.COMMANDS.GENERATE)) {
-		exports.die('Alloy "app" directory has no "' + paths.indexBase + '" file at "' + paths.index + '".');
-	}
-
-	// TODO: https://jira.appcelerator.org/browse/TIMOB-14683
-	// Resources/app.js must be present, even if not used
-	var appjs = path.join(paths.resources, 'app.js');
-	if (!fs.existsSync(appjs)) {
-		fs.mkdirpSync(paths.resources);
-		chmodr.sync(paths.resources, 0755);
-		fs.writeFileSync(appjs, '');
-	}
-
-	return paths;
-};
-
-exports.createErrorOutput = function(msg, e) {
-	var errs = [msg || 'An unknown error occurred'];
-	var posArray = [];
-
-	if (e) {
-		var line = e.line || e.lineNumber;
-		if (e.message) { errs.push(e.message.split('\n')); }
-		if (line)  { posArray.push('line ' + line); }
-		if (e.col) { posArray.push('column ' + e.col); }
-		if (e.pos) { posArray.push('position ' + e.pos); }
-		if (posArray.length) { errs.push(posArray.join(', ')); }
-
-		// add the stack trace if we don't get anything good
-		if (errs.length < 2) { errs.unshift(e.stack); }
-	} else {
-		errs.unshift(e.stack);
-	}
-
-	return errs;
-};
-
-exports.updateFiles = function(srcDir, dstDir, opts) {
-	opts = opts || {};
-	opts.rootDir = opts.rootDir || dstDir;
-	var copiedFiles = [];
-
-	if (!fs.existsSync(srcDir)) {
-		return;
-	}
-	logger.trace('SRC_DIR=' + srcDir);
-
-	if (!fs.existsSync(dstDir)) {
-		fs.mkdirpSync(dstDir);
-		chmodr.sync(dstDir, 0755);
-	}
-
-	// don't process XML/controller files inside .svn folders (ALOY-839)
-	var excludeRegex = new RegExp('(?:^|[\\/\\\\])(?:' + CONST.EXCLUDED_FILES.join('|') + ')(?:$|[\\/\\\\])');
-	var ordered = [];
-	_.each(walkSync(srcDir), function(file) {
-		file = path.normalize(file);
-		var src = path.join(srcDir, file);
-		var dst = path.join(dstDir, file);
-
-		if (excludeRegex.test(src)) {
-			return;
-		}
-
-		// make sure the file exists and that it is not filtered
-		if (!fs.existsSync(src) ||
-			(opts.filter && opts.filter.test(file)) ||
-			(opts.exceptions && _.includes(opts.exceptions, file)) ||
-			(opts.restrictionPath && !_.includes(opts.restrictionPath, src)) ) {
-			return;
-		}
-
-		// if this is the current platform-specific folder, adjust the dst path
-		var parts = file.split(/[\/\\]/);
-		if (opts.titaniumFolder && parts[0] === opts.titaniumFolder) {
-			if (opts.type && opts.type !== 'ASSETS' && parts[0] === 'iphone') {
-				// don't copy files in lib/iphone or vendor/iphone
-				return;
-			}
-			dst = path.join(dstDir, parts.slice(1).join('/'));
-			ordered.push({ src:src, dst:dst });
-		} else if (opts.titaniumFolder && opts.titaniumFolder === 'iphone' && opts.type && opts.type !== 'ASSETS' && parts[0] === 'ios') {
-			// copy files in lib/ios and vendor/ios
-			dst = path.join(dstDir, parts.slice(1).join('/'));
-			ordered.push({ src:src, dst:dst });
-		} else {
-			ordered.unshift({ src:src, dst:dst });
-		}
-	});
-
-	_.each(ordered, function(o) {
-		var src = o.src;
-		var dst = o.dst;
-		var srcStat = fs.statSync(src);
-		if (fs.existsSync(dst)) {
-			var dstStat = fs.statSync(dst);
-
-			if (!dstStat.isDirectory()) {
-				// copy file in if it is a JS file or if its mtime is
-				// greater than the one in Resources
-				if (path.extname(src) === '.js' || opts.themeChanged || opts.isNew ||
-					srcStat.mtime.getTime() > dstStat.mtime.getTime()) {
-					logger.trace('Copying ' +
-						path.join('SRC_DIR', path.relative(srcDir, src)).yellow + ' --> ' +
-						path.relative(opts.rootDir, dst).yellow);
-					exports.copyFileSync(src, dst);
-					copiedFiles.push(path.relative(path.join(opts.rootDir, 'Resources'), dst));
-				}
-			}
-		} else {
-			if (srcStat.isDirectory()) {
-				logger.trace('Creating directory ' + path.relative(opts.rootDir, dst).yellow);
-				fs.mkdirpSync(dst);
-				chmodr.sync(dst, 0755);
-			} else {
-				logger.trace('Copying ' + path.join('SRC_DIR', path.relative(srcDir, src)).yellow +
-					' --> ' + path.relative(opts.rootDir, dst).yellow);
-				exports.copyFileSync(src, dst);
-				copiedFiles.push(path.relative(path.join(opts.rootDir, 'Resources'), dst));
-			}
-		}
-		if (!srcStat.isDirectory() && opts.createSourceMap && path.extname(src) === '.js') {
-			var target = {
-					filename: path.relative(opts.compileConfig.dir.project, dst),
-					filepath: dst,
-					template: src
-				},
-				data = {
-					'__MAPMARKER_NONCONTROLLER__': {
-						filename: src,
-						filepath: path.dirname(src),
-					}
-				};
-			sourceMapper.generateSourceMap({
-				target: target,
-				data: data,
-				origFile: {
-					filename: path.relative(opts.compileConfig.dir.project, src),
-					filepath: src
-				}
-			}, opts.compileConfig);
-		}
-	});
-	logger.trace('');
-
-	return copiedFiles;
-};
-
-exports.getWidgetDirectories = function(appDir) {
-	var configPath = path.join(appDir, 'config.json');
-	var appWidgets = [];
-	if (fs.existsSync(configPath)) {
-		try {
-			var content = fs.readFileSync(configPath, 'utf8');
-			var config = jsonlint.parse(content);
-			appWidgets = config.dependencies;
-
-			if (config.global && config.global.theme) {
-				var themePath = path.join(appDir, 'themes', config.global.theme, 'config.json');
-				if (fs.existsSync(themePath)) {
-					var themeContent = fs.readFileSync(themePath, 'utf8');
-					var themeConfig = jsonlint.parse(themeContent);
-					if (themeConfig.dependencies) {
-						appWidgets = _.extend(appWidgets, themeConfig.dependencies);
-					}
-				}
-			}
-		} catch (e) {
-			exports.die('Error parsing "config.json"', e);
-		}
-	}
-
-	var dirs = [];
-	var collections = [];
-	var widgetPaths = [];
-	widgetPaths.push(path.join(__dirname, '..', 'widgets'));
-	widgetPaths.push(path.join(appDir, 'widgets'));
-
-	_.each(widgetPaths, function(widgetPath) {
-		if (fs.existsSync(widgetPath)) {
-			var wFiles = fs.readdirSync(widgetPath);
-			for (var i = 0; i < wFiles.length; i++) {
-				var wDir = path.join(widgetPath, wFiles[i]);
-				if (fs.statSync(wDir).isDirectory() &&
-					_.indexOf(fs.readdirSync(wDir), 'widget.json') !== -1) {
-					var collection = parseManifestAsCollection(path.join(wDir, 'widget.json'));
-					collections[collection.manifest.id] = collection;
-				}
-			}
-		}
-	});
-
-	function parseManifestAsCollection(wFile) {
-		var wDir = path.dirname(wFile);
-		var manifest;
-		try {
-			manifest = jsonlint.parse(fs.readFileSync(wFile, 'utf8'));
-		} catch (e) {
-			exports.die('Error parsing "' + wFile + '"', e);
-		}
-
-		return {
-			dir: wDir,
-			manifest: manifest
-		};
-	}
-
-	function findWidgetAsNodeModule(id) {
-		var wFile;
-		try {
-			wFile = resolve.sync(path.join(CONST.NPM_WIDGET_PREFIX + id, 'widget'), { basedir: path.join(appDir, '..'), extensions: [ '.json' ], paths: paths() });
-		} catch (err) {
-			return;
-		}
-
-		var collection = parseManifestAsCollection(wFile);
-		if (collection.manifest.id !== id) {
-			return logger.warn('Expected "' + wFile + '" to have id "' + id + '" instead of "' + collection.manifest.id + '"');
-		}
-
-		var pFile = path.join(path.dirname(wFile), 'package.json');
-		var pkg;
-		try {
-			pkg = jsonlint.parse(fs.readFileSync(pFile, 'utf8'));
-		} catch (e) {
-			exports.die('Error parsing "' + pFile + '"', e);
-		}
-
-		var missingKeywords = _.difference(CONST.NPM_WIDGET_KEYWORDS, pkg.keywords || []);
-		if (missingKeywords.length > 0) {
-			return logger.warn('Expected "' + pFile + '" to have missing keywords "' + missingKeywords.join('", "') + '"');
-		}
-
-		return collection;
-	}
-
-	function walkWidgetDependencies(id) {
-		var collection = collections[id];
-
-		if (!collection) {
-			collection = findWidgetAsNodeModule(id);
-
-			if (!collection) {
-				notFound.push(id);
-				return;
-			}
-		}
-
-		dirs.push(collection);
-		for (var dependency in collection.manifest.dependencies) {
-			walkWidgetDependencies(dependency);
-		}
-	}
-
-	// walk the dependencies, tracking any missing widgets
-	var notFound = [];
-	for (var id in appWidgets) {
-		walkWidgetDependencies(id);
-	}
-
-	// if there are missing widgets, abort and tell the developer which ones
-	if (!!notFound.length) { // eslint-disable-line no-extra-boolean-cast
-		exports.die([
-			'config.json references non-existent widgets: ' + JSON.stringify(notFound),
-			'If you are not using these widgets, remove them from your config.json dependencies.',
-			'If you are using them, add them to your project\'s widget folder or as NPM package.'
-		]);
-	}
-
-	return dirs;
-};
-
-exports.properCase = function(n) {
-	return n.charAt(0).toUpperCase() + n.substring(1);
-};
-
-exports.ucfirst = function (text) {
-	if (!text)
-		return text;
-	return text[0].toUpperCase() + text.substr(1);
-};
-
-exports.lcfirst = function (text) {
-	if (!text)
-		return text;
-	return text[0].toLowerCase() + text.substr(1);
-};
-
-exports.trim = function(line) {
-	return String(line).replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-};
-
-/**
- * Converts a raw text value (from XML) into a JS string. If the value is
- * multline, we will concatenate the lines together to avoid broken JS srting syntax.
- * @param  {String} string The raw (or slightly modified/trimmed) XML content
- * @return {String}        JS source string, possibly multiple concatenations to handle multiple lines
- */
-exports.possibleMultilineString = function(string) {
-	var parts = string.split(/\r?\n/);
-	return "'" + parts.join("\\n' + '") + "'";
-};
-
-exports.rmdirContents = function(dir, exceptions) {
-	var files;
-	try {
-		files = fs.readdirSync(dir);
-	} catch (e) {
-		return;
-	}
-
-	for (var i = 0, l = files.length; i < l; i++) {
-		var currFile = path.join(dir, files[i]);
-		var stat = fs.lstatSync(currFile);
-
-		// process the exceptions
-		var result = _.find(exceptions, function(exception) {
-			if (exception instanceof RegExp) {
-				return exception.test(files[i]);
-			} else {
-				return files[i] === exception;
-			}
-		});
-
-		// skip any exceptions
-		if (result) {
-			continue;
-		// use wrench to delete directories
-		} else if (stat.isDirectory()) {
-			fs.removeSync(currFile);
-		// unlink any files or links
-		} else {
-			fs.unlinkSync(currFile);
-		}
-	}
-};
-
-exports.resolveAppHome = function() {
-	var indexView = path.join(CONST.DIR.VIEW, CONST.NAME_DEFAULT + '.' + CONST.FILE_EXT.VIEW);
-	var paths = [ path.join('.', 'app'), path.join('.') ];
-
-	// Do we have an Alloy project? Find views/index.xml.
-	for (var i = 0; i < paths.length; i++) {
-		paths[i] = path.resolve(paths[i]);
-		var testPath = path.join(paths[i], indexView);
-		if (fs.existsSync(testPath)) {
-			return paths[i];
-		}
-	}
-
-	// Report error, show the paths searched.
-	var errs = [ 'No valid Alloy project found at the following paths (no "views/index.xml"):' ];
-	errs.push(paths);
-	exports.die(errs);
-};
-
-exports.copyFileSync = function(srcFile, destFile) {
-	fs.copySync(srcFile, destFile, { overwrite: true });
-};
-
-exports.ensureDir = function(p) {
-	if (!fs.existsSync(p)) {
-		fs.mkdirpSync(p);
-		chmodr.sync(p, 0755);
-	}
-};
-
-exports.die = function(msg, e) {
-	if (e) {
-		logger.error(exports.createErrorOutput(msg, e));
-	} else {
-		logger.error(msg);
-	}
-	process.exit(1);
-};
-
-exports.dieWithCodeFrame = function(errorMessage, lineInfo, fileContents, hint) {
-	var frame = codeFrameColumns(fileContents, {
-		start: lineInfo
-	}, {
-		highlightCode: true
-	});
-	logger.error(errorMessage);
-	// Convert the code frame from a string to an Array so that the logger logs
-	// each line individually to keep the code frame intact
-	logger.error(frame.split('\n'));
-	if (hint) {
-		logger.info(hint);
-	}
-	process.exit(1);
-};
-
-exports.dieWithNode = function(node, msg) {
-	msg = _.isArray(msg) ? msg : [msg];
-	msg.unshift('Error with <' + node.nodeName + '> at line ' + node.lineNumber);
-	exports.die(msg);
-};
-
-exports.changeTime = function(file) {
-	if (!fs.existsSync(file)) { return -1; }
-	var stat = fs.statSync(file);
-	return Math.max(stat.mtime.getTime(), stat.ctime.getTime());
-};
-
-exports.stripColors = function(str) {
-	return str.replace(/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]/g, '');
-};
-
-exports.installPlugin = function(alloyPath, projectPath) {
-	var id = 'ti.alloy';
-	var plugins = {
-		plugin: {
-			file: CONST.PLUGIN_FILE,
-			src: path.join(alloyPath, 'Alloy', 'plugin'),
-			dest: path.join(projectPath, 'plugins', id)
-		},
-		hook: {
-			file: CONST.HOOK_FILE,
-			src: path.join(alloyPath, 'hooks'),
-			dest: path.join(projectPath, 'plugins', id, 'hooks')
-		},
-		cleanhook: {
-			file: CONST.HOOK_FILE_CLEAN,
-			src: path.join(alloyPath, 'hooks'),
-			dest: path.join(projectPath, 'plugins', id, 'hooks')
-		}
-	};
-
-	_.each(plugins, function(o, type) {
-		var srcFile = path.join(o.src, o.file);
-		var destFile = path.join(o.dest, o.file);
-
-		// skip if the src and dest are the same file
-		if (fs.existsSync(destFile) &&
-			fs.readFileSync(srcFile, 'utf8') === fs.readFileSync(destFile, 'utf8')) {
-			return;
-		}
-		exports.ensureDir(o.dest);
-		exports.copyFileSync(srcFile, destFile);
-
-		logger.info('Deployed ti.alloy ' + type + ' to ' + destFile);
-	});
-
-	// add the plugin to tiapp.xml, if necessary
-	tiapp.init(path.join(projectPath, 'tiapp.xml'));
-	tiapp.installPlugin({
-		id: 'ti.alloy',
-		version: '1.0'
-	});
-};
-
-exports.normalizeReturns = function(s) {
-	return s.replace(/\r\n/g, '\n');
-};
-
-exports.createHash = function(files) {
-	if (_.isString(files)) {
-		files = [files];
-	} else if (!_.isArray(files)) {
-		throw new TypeError('bad argument');
-	}
-
-	var source = '';
-	_.each(files, function(f) {
-		source += util.format('%s\n%s\n', f, fs.existsSync(f) ? fs.readFileSync(f, 'utf8') : '');
-	});
-
-	return crypto.createHash('md5').update(source).digest('hex');
-};
-
-exports.createHashFromString = function(string) {
-	if (!_.isString(string)) {
-		throw new TypeError('bad argument');
-	}
-	return crypto.createHash('md5').update(string).digest('hex');
-};
-
-exports.proxyPropertyNameFromFullname = function(fullname) {
-	var nameParts = fullname.split('.');
-	return exports.lcfirst(nameParts[nameParts.length - 1]);
-};
-
-/*
-Two date-related functions for ALOY-263
-	- used by compile/parsers/Ti.UI.Picker.js and compile/styler.js
-*/
-exports.isValidDate = function(d, dateField) {
-	// not using _.isDate() because it accepts some invalid date strings
-	if (!require('moment')(d).isValid()) {
-		exports.die('Invalid date string. ' + dateField + " must be a string that can be parsed by MomentJS's `moment()` constructor.");
-	} else {
-		return true;
-	}
-};
-exports.createDate = function(val) {
-	return require('moment')(val).toDate();
-};
-
-exports.isLocaleAlias = function(string) {
-	return /^\s*L\((['\"])(.+)\1\)\s*$/.test(string);
-};
-
-exports.getDeploymentTargets = function(projDir) {
-	var tiappPath = path.join(projDir, 'tiapp.xml'),
-		tiappDoc,
-		targets;
-
-	if (fs.existsSync(tiappPath)) {
-		tiapp.init(tiappPath);
-		targets = tiapp.getDeploymentTargets().join(',');
-	} else {
-		targets = CONST.PLATFORMS.join(',');
-	}
-
-	return targets;
-};
diff --git a/jakelib/app.jake b/jakelib/app.jake
index b57d0a05f..d921be54e 100755
--- a/jakelib/app.jake
+++ b/jakelib/app.jake
@@ -2,10 +2,13 @@ var fs = require('fs-extra'),
 	chmodr = require('chmodr'),
 	path = require('path'),
 	os = require('os'),
-	U = require('../Alloy/utils'),
-	_ = require('lodash'),
-	CONST = require('../Alloy/common/constants'),
-	logger = require('../Alloy/logger');
+	_ = require('lodash');
+
+const {
+	constants: CONST,
+	logger,
+	utils: U
+} = require('alloy-utils');
 
 // Fix node warning
 path.existsSync = fs.existsSync || path.existsSync;
diff --git a/package-lock.json b/package-lock.json
index 7c37dfe75..e6b950623 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,39 +5,35 @@
   "requires": true,
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-      "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+      "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
       "requires": {
-        "@babel/highlight": "^7.0.0"
+        "@babel/highlight": "^7.8.3"
       }
     },
     "@babel/core": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.5.tgz",
-      "integrity": "sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==",
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.4.4",
-        "@babel/helpers": "^7.4.4",
-        "@babel/parser": "^7.4.5",
-        "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.4.5",
-        "@babel/types": "^7.4.4",
-        "convert-source-map": "^1.1.0",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.3.tgz",
+      "integrity": "sha512-4XFkf8AwyrEG7Ziu3L2L0Cv+WyY47Tcsp70JFmpftbAA1K7YL/sgE9jh9HyNj08Y/U50ItUchpN0w6HxAoX1rA==",
+      "requires": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.8.3",
+        "@babel/helpers": "^7.8.3",
+        "@babel/parser": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3",
+        "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.1",
         "json5": "^2.1.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.13",
         "resolve": "^1.3.2",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
       },
       "dependencies": {
-        "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
-        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -46,22 +42,16 @@
       }
     },
     "@babel/generator": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz",
-      "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.3.tgz",
+      "integrity": "sha512-WjoPk8hRpDRqqzRpvaR8/gDUPkrnOOeuT2m8cNICJtZH6mwaCo3v0OKMI7Y6SM1pBtyijnLtAL0HDi41pf41ug==",
       "requires": {
-        "@babel/types": "^7.4.4",
+        "@babel/types": "^7.8.3",
         "jsesc": "^2.5.1",
-        "lodash": "^4.17.11",
-        "source-map": "^0.5.0",
-        "trim-right": "^1.0.1"
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0"
       },
       "dependencies": {
-        "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
-        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -70,98 +60,60 @@
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
-      "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz",
+      "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==",
       "requires": {
-        "@babel/helper-get-function-arity": "^7.0.0",
-        "@babel/template": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-get-function-arity": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
-      "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
+      "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
-      "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
+      "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
       "requires": {
-        "@babel/types": "^7.4.4"
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helpers": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.4.tgz",
-      "integrity": "sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.3.tgz",
+      "integrity": "sha512-LmU3q9Pah/XyZU89QvBgGt+BCsTPoQa+73RxAQh8fb8qkDyIfeQnmgs+hvzhTCKTzqOyk7JTkS3MS1S8Mq5yrQ==",
       "requires": {
-        "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.4.4",
-        "@babel/types": "^7.4.4"
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/highlight": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
-      "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
+      "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
       "requires": {
         "chalk": "^2.0.0",
         "esutils": "^2.0.2",
         "js-tokens": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-        },
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "@babel/parser": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz",
-      "integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew=="
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.3.tgz",
+      "integrity": "sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ=="
     },
     "@babel/polyfill": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.4.tgz",
-      "integrity": "sha512-WlthFLfhQQhh+A2Gn5NSFl0Huxz36x86Jn+E9OW7ibK8edKPq+KLy4apM1yDpQ8kJOVi1OVjpP4vSDLdrI04dg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.8.3.tgz",
+      "integrity": "sha512-0QEgn2zkCzqGIkSWWAEmvxD7e00Nm9asTtQvi7HdlYvMhjy/J38V/1Y9ode0zEJeIuxAI0uftiAzqc7nVeWUGg==",
       "dev": true,
       "requires": {
         "core-js": "^2.6.5",
@@ -169,80 +121,66 @@
       }
     },
     "@babel/template": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
-      "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz",
+      "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==",
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.4.4",
-        "@babel/types": "^7.4.4"
+        "@babel/code-frame": "^7.8.3",
+        "@babel/parser": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/traverse": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz",
-      "integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==",
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.4.4",
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.4.4",
-        "@babel/parser": "^7.4.5",
-        "@babel/types": "^7.4.4",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.3.tgz",
+      "integrity": "sha512-we+a2lti+eEImHmEXp7bM9cTxGzxPmBiVJlLVD+FuuQMeeO7RaDbutbgeheDkw+Xe3mCfJHnGOWLswT74m2IPg==",
+      "requires": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.8.3",
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/helper-split-export-declaration": "^7.8.3",
+        "@babel/parser": "^7.8.3",
+        "@babel/types": "^7.8.3",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
-        "lodash": "^4.17.11"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
-        }
+        "lodash": "^4.17.13"
       }
     },
     "@babel/types": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
-      "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz",
+      "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==",
       "requires": {
         "esutils": "^2.0.2",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.13",
         "to-fast-properties": "^2.0.0"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
-        }
       }
     },
     "@octokit/endpoint": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.1.4.tgz",
-      "integrity": "sha512-DypS8gbbcc9rlOCDW0wV9a+B18+ylduj6PpxeE+qa3IK1h5b0eW4CKj5pxxXWOZUYhEKwgOnh3+Q+Y/hx/bOPw==",
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.1.tgz",
+      "integrity": "sha512-nBFhRUb5YzVTCX/iAK1MgQ4uWo89Gu0TH00qQHoYRCsE12dWcG1OiLd7v2EIo2+tpUKPMOQ62QFy9hy9Vg2ULg==",
       "dev": true,
       "requires": {
-        "deepmerge": "3.2.0",
+        "@octokit/types": "^2.0.0",
         "is-plain-object": "^3.0.0",
-        "universal-user-agent": "^2.1.0",
-        "url-template": "^2.0.8"
+        "universal-user-agent": "^4.0.0"
       }
     },
     "@octokit/request": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-4.1.0.tgz",
-      "integrity": "sha512-RvpQAba4i+BNH0z8i0gPRc1ShlHidj4puQjI/Tno6s+Q3/Mzb0XRSHJiOhpeFrZ22V7Mwjq1E7QS27P5CgpWYA==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.3.1.tgz",
+      "integrity": "sha512-5/X0AL1ZgoU32fAepTfEoggFinO3rxsMLtzhlUX+RctLrusn/CApJuGFCd0v7GMFhF+8UiCsTTfsu7Fh1HnEJg==",
       "dev": true,
       "requires": {
-        "@octokit/endpoint": "^5.1.0",
+        "@octokit/endpoint": "^5.5.0",
         "@octokit/request-error": "^1.0.1",
+        "@octokit/types": "^2.0.0",
         "deprecation": "^2.0.0",
         "is-plain-object": "^3.0.0",
         "node-fetch": "^2.3.0",
         "once": "^1.4.0",
-        "universal-user-agent": "^2.1.0"
+        "universal-user-agent": "^4.0.0"
       },
       "dependencies": {
         "node-fetch": {
@@ -254,25 +192,26 @@
       }
     },
     "@octokit/request-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.0.2.tgz",
-      "integrity": "sha512-T9swMS/Vc4QlfWrvyeSyp/GjhXtYaBzCcibjGywV4k4D2qVrQKfEMPy8OxMDEj7zkIIdpHwqdpVbKCvnUPqkXw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.0.tgz",
+      "integrity": "sha512-DNBhROBYjjV/I9n7A8kVkmQNkqFAMem90dSxqvPq57e2hBr7mNTX98y3R2zDpqMQHVRpBDjsvsfIGgBzy+4PAg==",
       "dev": true,
       "requires": {
+        "@octokit/types": "^2.0.0",
         "deprecation": "^2.0.0",
         "once": "^1.4.0"
       }
     },
     "@octokit/rest": {
-      "version": "16.27.3",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.27.3.tgz",
-      "integrity": "sha512-WWH/SHF4kus6FG+EAfX7/JYH70EjgFYa4AAd2Lf1hgmgzodhrsoxpXPSZliZ5BdJruZPMP7ZYaPoTrYCCKYzmQ==",
+      "version": "16.37.0",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.37.0.tgz",
+      "integrity": "sha512-qLPK9FOCK4iVpn6ghknNuv/gDDxXQG6+JBQvoCwWjQESyis9uemakjzN36nvvp8SCny7JuzHI2RV8ChbV5mYdQ==",
       "dev": true,
       "requires": {
-        "@octokit/request": "^4.0.1",
+        "@octokit/request": "^5.2.0",
         "@octokit/request-error": "^1.0.2",
         "atob-lite": "^2.0.0",
-        "before-after-hook": "^1.4.0",
+        "before-after-hook": "^2.0.0",
         "btoa-lite": "^1.0.0",
         "deprecation": "^2.0.0",
         "lodash.get": "^4.4.2",
@@ -280,8 +219,16 @@
         "lodash.uniq": "^4.5.0",
         "octokit-pagination-methods": "^1.1.0",
         "once": "^1.4.0",
-        "universal-user-agent": "^2.0.0",
-        "url-template": "^2.0.8"
+        "universal-user-agent": "^4.0.0"
+      }
+    },
+    "@octokit/types": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.1.0.tgz",
+      "integrity": "sha512-n1GUYFgKm5glcy0E+U5jnqAFY2p04rnK4A0YhuM70C7Vm9Vyx+xYwd/WOTEr8nUJcbPSR/XL+/26+rirY6jJQA==",
+      "dev": true,
+      "requires": {
+        "@types/node": ">= 8"
       }
     },
     "@seadub/danger-plugin-dependencies": {
@@ -298,19 +245,19 @@
       }
     },
     "@seadub/danger-plugin-eslint": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@seadub/danger-plugin-eslint/-/danger-plugin-eslint-1.0.0.tgz",
-      "integrity": "sha512-ND9iIV9EFiDWK0lSDZXjmKDnKFpeiEC/vuSPL1N52LDflRyax97OB9HhPFNpQBsCeCBUzrlEjj2IsbgGPkswDw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@seadub/danger-plugin-eslint/-/danger-plugin-eslint-1.0.1.tgz",
+      "integrity": "sha512-wpcUzsnwqLEg2PN4bMvmGfG/JFKWYcbPOXx+wKJ8Il31UBodosWMK9O2bGuh8JCsnje1iJ+X6dYzQm6eGdI5sg==",
       "dev": true
     },
     "@seadub/danger-plugin-junit": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@seadub/danger-plugin-junit/-/danger-plugin-junit-0.1.1.tgz",
-      "integrity": "sha512-p6Nj6fAvk7vAEddec+JzDTzhv/xAGnj24lUHx0Ws50S7HQEomTFwi+0xtkAxOXICLMsFck7U5qMWHnxgAID5tw==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@seadub/danger-plugin-junit/-/danger-plugin-junit-0.1.2.tgz",
+      "integrity": "sha512-AnH6kRip//vJWwz7n6pxD+0qG5JbJ5eJgbfdFBI6UBi7NJOvvyi2t039fuh63qQx/fQ7F3VljhfpEj57M2QTJg==",
       "dev": true,
       "requires": {
         "fs-extra": "^7.0.1",
-        "glob": "^7.1.3",
+        "glob": "^7.1.4",
         "xmldom": "^0.1.27"
       },
       "dependencies": {
@@ -324,32 +271,29 @@
             "jsonfile": "^4.0.0",
             "universalify": "^0.1.0"
           }
-        },
-        "glob": {
-          "version": "7.1.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
         }
       }
     },
+    "@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
+    },
+    "@types/node": {
+      "version": "13.1.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.8.tgz",
+      "integrity": "sha512-6XzyyNM9EKQW4HKuzbo/CkOIjn/evtCmsU+MUM1xDfJ+3/rNjBttM1NgN7AOQvN6tP1Sl1D1PIKMreTArnxM9A==",
+      "dev": true
+    },
     "JSV": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
       "integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c="
     },
     "acorn": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",
-      "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==",
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+      "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
       "dev": true
     },
     "acorn-jsx": {
@@ -396,28 +340,172 @@
       "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
       "dev": true
     },
+    "alloy-compiler": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/alloy-compiler/-/alloy-compiler-0.2.2.tgz",
+      "integrity": "sha512-6xA6Dthr2UCStflW8PM7a5OdzRhmtgnWtQ+Ro57AR0iaR9CgMNLkoZC+uRFAOQ5f4Z5FJxqcE10K6RaVAAyuOA==",
+      "requires": {
+        "@babel/generator": "^7.8.3",
+        "@babel/parser": "^7.8.3",
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3",
+        "alloy-utils": "^0.2.2",
+        "chmodr": "^1.2.0",
+        "fs-extra": "^9.0.0",
+        "jsonlint": "^1.6.3",
+        "lodash": "^4.17.15",
+        "node.extend": "^2.0.2",
+        "walk-sync": "^2.0.2",
+        "xmldom": "^0.3.0"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
+          "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
+          "requires": {
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^1.0.0"
+          }
+        },
+        "jsonfile": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
+          "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^1.0.0"
+          }
+        },
+        "jsonlint": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz",
+          "integrity": "sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==",
+          "requires": {
+            "JSV": "^4.0.x",
+            "nomnom": "^1.5.x"
+          }
+        },
+        "matcher-collection": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-2.0.1.tgz",
+          "integrity": "sha512-daE62nS2ZQsDg9raM0IlZzLmI2u+7ZapXBwdoeBUKAYERPDDIc0qNqA8E0Rp2D+gspKR7BgIFP52GeujaGXWeQ==",
+          "requires": {
+            "@types/minimatch": "^3.0.3",
+            "minimatch": "^3.0.2"
+          }
+        },
+        "universalify": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
+          "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="
+        },
+        "walk-sync": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-2.1.0.tgz",
+          "integrity": "sha512-KpH9Xw64LNSx7/UI+3guRZvJWlDxVA4+KKb/4puRoVrG8GkvZRxnF3vhxdjgpoKJGL2TVg1OrtkXIE/VuGPLHQ==",
+          "requires": {
+            "@types/minimatch": "^3.0.3",
+            "ensure-posix-path": "^1.1.0",
+            "matcher-collection": "^2.0.0"
+          }
+        },
+        "xmldom": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.3.0.tgz",
+          "integrity": "sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="
+        }
+      }
+    },
+    "alloy-utils": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/alloy-utils/-/alloy-utils-0.2.2.tgz",
+      "integrity": "sha512-SFZuFMle3V+DapdvuFiI3IX69RggISx+UWMMETwA6GraB7jskvqUgQ+fxKhOTuk8rwjl7h54A2eLx1nI9cZNsA==",
+      "requires": {
+        "@babel/code-frame": "^7.8.3",
+        "chmodr": "^1.2.0",
+        "colors": "^1.4.0",
+        "fs-extra": "^9.0.0",
+        "global-paths": "^1.0.0",
+        "jsonlint": "^1.6.3",
+        "lodash": "^4.17.15",
+        "moment": "^2.24.0",
+        "resolve": "^1.12.0",
+        "xmldom": "^0.3.0"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
+          "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
+          "requires": {
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^1.0.0"
+          }
+        },
+        "jsonfile": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
+          "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^1.0.0"
+          }
+        },
+        "jsonlint": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz",
+          "integrity": "sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==",
+          "requires": {
+            "JSV": "^4.0.x",
+            "nomnom": "^1.5.x"
+          }
+        },
+        "moment": {
+          "version": "2.25.3",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz",
+          "integrity": "sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg=="
+        },
+        "universalify": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
+          "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="
+        },
+        "xmldom": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.3.0.tgz",
+          "integrity": "sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="
+        }
+      }
+    },
     "ansi-escapes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz",
-      "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
       "dev": true
     },
     "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
       "dev": true
     },
     "ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
     },
     "argparse": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "requires": {
         "sprintf-js": "~1.0.2"
@@ -441,32 +529,11 @@
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true
     },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
-    },
     "array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
       "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
     },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true
-    },
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -474,13 +541,18 @@
       "dev": true
     },
     "async": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
-      "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
       "requires": {
-        "lodash": "^4.14.0"
+        "lodash": "^4.17.14"
       }
     },
+    "at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
+    },
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
@@ -502,6 +574,54 @@
         "chalk": "^1.1.3",
         "esutils": "^2.0.2",
         "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "js-tokens": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
       }
     },
     "balanced-match": {
@@ -571,15 +691,15 @@
       }
     },
     "before-after-hook": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-1.4.0.tgz",
-      "integrity": "sha512-l5r9ir56nda3qu14nAXIlyq1MmUSs0meCIaFAh8HwkFwP1F8eToOuS3ah2VAHHcY04jaYD7FpJC5JTXHYRbkzg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.0.tgz",
+      "integrity": "sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==",
       "dev": true
     },
     "brace-expansion": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -632,6 +752,12 @@
       "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=",
       "dev": true
     },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
@@ -679,16 +805,13 @@
       "dev": true
     },
     "chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true,
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "requires": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       }
     },
     "chardet": {
@@ -698,9 +821,9 @@
       "dev": true
     },
     "chmodr": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz",
-      "integrity": "sha1-BGYrky0PAuxm3qorDqQoEZaOPrk="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/chmodr/-/chmodr-1.2.0.tgz",
+      "integrity": "sha512-Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA=="
     },
     "circular-json": {
       "version": "0.3.3",
@@ -763,12 +886,6 @@
         "wrap-ansi": "^2.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -803,11 +920,11 @@
       }
     },
     "color-convert": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
-      "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "requires": {
-        "color-name": "^1.1.1"
+        "color-name": "1.1.3"
       }
     },
     "color-name": {
@@ -816,14 +933,14 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "colors": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="
     },
     "commander": {
-      "version": "2.12.2",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
-      "integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA=="
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
     },
     "component-emitter": {
       "version": "1.3.0",
@@ -837,20 +954,21 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "concat-stream": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
       "dev": true,
       "requires": {
+        "buffer-from": "^1.0.0",
         "inherits": "^2.0.3",
         "readable-stream": "^2.2.2",
         "typedarray": "^0.0.6"
       }
     },
     "convert-source-map": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
-      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
       "requires": {
         "safe-buffer": "~5.1.1"
       }
@@ -862,9 +980,9 @@
       "dev": true
     },
     "core-js": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz",
-      "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==",
+      "version": "2.6.11",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==",
       "dev": true
     },
     "core-util-is": {
@@ -874,12 +992,14 @@
       "dev": true
     },
     "cross-spawn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
       "dev": true,
       "requires": {
-        "lru-cache": "^4.0.1",
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
         "shebang-command": "^1.2.0",
         "which": "^1.2.9"
       }
@@ -926,52 +1046,11 @@
         "supports-hyperlinks": "^1.0.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "commander": {
-          "version": "2.20.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
         "node-fetch": {
           "version": "2.6.0",
           "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
           "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -987,13 +1066,6 @@
       "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
       "requires": {
         "ms": "^2.1.1"
-      },
-      "dependencies": {
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-        }
       }
     },
     "decamelize": {
@@ -1014,12 +1086,6 @@
       "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
       "dev": true
     },
-    "deepmerge": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.2.0.tgz",
-      "integrity": "sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow==",
-      "dev": true
-    },
     "define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -1067,37 +1133,22 @@
         }
       }
     },
-    "del": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-      "dev": true,
-      "requires": {
-        "globby": "^5.0.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "rimraf": "^2.2.8"
-      }
-    },
     "deprecation": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.0.0.tgz",
-      "integrity": "sha512-lbQN037mB3VfA2JFuguM5GCJ+zPinMeCrFe+AfSZ6eqrnJA/Fs+EYMnd6Nb2mn9lf2jO9xwEd9o9lic+D4vkcw==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
       "dev": true
     },
     "diff": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz",
-      "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
       "dev": true
     },
     "doctrine": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.2.tgz",
-      "integrity": "sha512-y0tm5Pq6ywp3qSTZ1vPgVdAnbDEoeoc5wlOHXoY1c4Wug/a7JvqHIl7BTvwodaHmejWkK/9dSb3sCYfyo/om8A==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2"
@@ -1127,23 +1178,23 @@
       }
     },
     "end-of-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
       "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
     },
     "ensure-posix-path": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz",
-      "integrity": "sha1-pls+QtC3HPxYXrd0+ZQ8jZuRsMI="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz",
+      "integrity": "sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw=="
     },
     "es6-promise": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
-      "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
       "dev": true
     },
     "es6-promisify": {
@@ -1161,9 +1212,9 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "eslint": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.14.0.tgz",
-      "integrity": "sha512-Ul6CSGRjKscEyg0X/EeNs7o2XdnbTEOD1OM8cTjmx85RPcBJQrEhZLevhuJZNAE/vS2iVl5Uhgiqf3h5uLMCJQ==",
+      "version": "4.19.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
+      "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
       "dev": true,
       "requires": {
         "ajv": "^5.3.0",
@@ -1172,10 +1223,10 @@
         "concat-stream": "^1.6.0",
         "cross-spawn": "^5.1.0",
         "debug": "^3.1.0",
-        "doctrine": "^2.0.2",
+        "doctrine": "^2.1.0",
         "eslint-scope": "^3.7.1",
         "eslint-visitor-keys": "^1.0.0",
-        "espree": "^3.5.2",
+        "espree": "^3.5.4",
         "esquery": "^1.0.0",
         "esutils": "^2.0.2",
         "file-entry-cache": "^2.0.0",
@@ -1197,55 +1248,35 @@
         "path-is-inside": "^1.0.2",
         "pluralize": "^7.0.0",
         "progress": "^2.0.0",
+        "regexpp": "^1.0.1",
         "require-uncached": "^1.0.3",
         "semver": "^5.3.0",
         "strip-ansi": "^4.0.0",
         "strip-json-comments": "~2.0.1",
-        "table": "^4.0.1",
+        "table": "4.0.2",
         "text-table": "~0.2.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.1.0",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^4.0.0"
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         },
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
         },
-        "globals": {
-          "version": "11.1.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.1.0.tgz",
-          "integrity": "sha512-uEuWt9mqTlPDwSqi+sHjD4nWU/1N+q0fiWI9T1mZpD2UENqX20CFD5T/ziLZvztPaBKl7ZylUi1q6Qfm7E2CiQ==",
-          "dev": true
-        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -1254,22 +1285,13 @@
           "requires": {
             "ansi-regex": "^3.0.0"
           }
-        },
-        "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^2.0.0"
-          }
         }
       }
     },
     "eslint-scope": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
-      "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
+      "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
@@ -1277,56 +1299,55 @@
       }
     },
     "eslint-visitor-keys": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
+      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
       "dev": true
     },
     "espree": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz",
-      "integrity": "sha512-sadKeYwaR/aJ3stC2CdvgXu1T16TdYN+qwCpcWbMnGJ8s0zNWemzrvb2GbD4OhmJ/fwpJjudThAlLobGbWZbCQ==",
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
       "dev": true,
       "requires": {
-        "acorn": "^5.2.1",
+        "acorn": "^5.5.0",
         "acorn-jsx": "^3.0.0"
       }
     },
     "esprima": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true
     },
     "esquery": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
-      "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
       "dev": true,
       "requires": {
         "estraverse": "^4.0.0"
       }
     },
     "esrecurse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
-      "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "dev": true,
       "requires": {
-        "estraverse": "^4.1.0",
-        "object-assign": "^4.0.1"
+        "estraverse": "^4.1.0"
       }
     },
     "estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true
     },
     "esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
     },
     "execa": {
       "version": "1.0.0",
@@ -1341,27 +1362,6 @@
         "p-finally": "^1.0.0",
         "signal-exit": "^3.0.0",
         "strip-eof": "^1.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
-          "dev": true
-        }
       }
     },
     "expand-brackets": {
@@ -1405,6 +1405,12 @@
           "requires": {
             "is-extendable": "^0.1.0"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
@@ -1454,9 +1460,9 @@
       }
     },
     "external-editor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz",
-      "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
       "dev": true,
       "requires": {
         "chardet": "^0.4.0",
@@ -1530,15 +1536,15 @@
       }
     },
     "fast-deep-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
       "dev": true
     },
     "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true
     },
     "fast-levenshtein": {
@@ -1617,14 +1623,14 @@
       }
     },
     "flat-cache": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
-      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
+      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
       "dev": true,
       "requires": {
         "circular-json": "^0.3.1",
-        "del": "^2.0.2",
         "graceful-fs": "^4.1.2",
+        "rimraf": "~2.6.2",
         "write": "^0.2.1"
       }
     },
@@ -1676,6 +1682,11 @@
       "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
       "dev": true
     },
+    "gensync": {
+      "version": "1.0.0-beta.1",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
+      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="
+    },
     "get-caller-file": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
@@ -1726,9 +1737,9 @@
       }
     },
     "glob": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
       "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
@@ -1788,24 +1799,10 @@
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
     },
-    "globby": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-      "dev": true,
-      "requires": {
-        "array-union": "^1.0.1",
-        "arrify": "^1.0.0",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      }
-    },
     "graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
     },
     "has": {
       "version": "1.0.3",
@@ -1822,6 +1819,14 @@
       "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        }
       }
     },
     "has-color": {
@@ -1830,10 +1835,9 @@
       "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8="
     },
     "has-flag": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-      "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-      "dev": true
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
     "has-value": {
       "version": "1.0.0",
@@ -1876,9 +1880,9 @@
       }
     },
     "homedir-polyfill": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
-      "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
       "requires": {
         "parse-passwd": "^1.0.0"
       }
@@ -1901,16 +1905,22 @@
           "requires": {
             "ms": "2.0.0"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
     "https-proxy-agent": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
-      "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
       "dev": true,
       "requires": {
-        "agent-base": "^4.1.0",
+        "agent-base": "^4.3.0",
         "debug": "^3.1.0"
       },
       "dependencies": {
@@ -1922,12 +1932,6 @@
           "requires": {
             "ms": "^2.1.1"
           }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
         }
       }
     },
@@ -1938,15 +1942,18 @@
       "dev": true
     },
     "iconv-lite": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
-      "dev": true
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
     },
     "ignore": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
-      "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
       "dev": true
     },
     "imurmurhash": {
@@ -1966,9 +1973,9 @@
       }
     },
     "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
     "ini": {
@@ -1998,32 +2005,6 @@
         "through": "^2.3.6"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.1.0",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^4.0.0"
-          }
-        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -2032,22 +2013,13 @@
           "requires": {
             "ansi-regex": "^3.0.0"
           }
-        },
-        "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^2.0.0"
-          }
         }
       }
     },
     "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
       "dev": true
     },
     "is": {
@@ -2152,30 +2124,6 @@
         }
       }
     },
-    "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-      "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
-      "dev": true,
-      "requires": {
-        "is-path-inside": "^1.0.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-      "dev": true,
-      "requires": {
-        "path-is-inside": "^1.0.1"
-      }
-    },
     "is-plain-object": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz",
@@ -2192,9 +2140,9 @@
       "dev": true
     },
     "is-resolvable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.1.tgz",
-      "integrity": "sha512-y5CXYbzvB3jTnWAZH1Nl7ykUWb6T3BcTs56HUruwBf8MhF56n1HWqhDWnVFo8GHrUPDgvUUNVhrc2U8W7iqz5g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
       "dev": true
     },
     "is-stream": {
@@ -2204,9 +2152,9 @@
       "dev": true
     },
     "is-windows": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz",
-      "integrity": "sha1-MQ23D3QtJZoWo2kgK1GvhCMzENk="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
     },
     "isarray": {
       "version": "1.0.0",
@@ -2226,9 +2174,9 @@
       "dev": true
     },
     "jake": {
-      "version": "8.0.15",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-8.0.15.tgz",
-      "integrity": "sha1-8Np9WOeQrBqPhubuDxk+XZIw6rs=",
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-8.1.1.tgz",
+      "integrity": "sha512-RJUWDas5xu4rP6CbCPqkVP9+vglMPThhZIj08EtjSiUBpwRtVjhShPKIpETyEhy/Z1hEk97qITxbZK+WXtSyzw==",
       "dev": true,
       "requires": {
         "async": "0.9.x",
@@ -2259,26 +2207,27 @@
             "ansi-styles": "~1.0.0",
             "has-color": "~0.1.0",
             "strip-ansi": "~0.1.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
+              "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
+              "dev": true
+            }
           }
-        },
-        "strip-ansi": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
-          "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
-          "dev": true
         }
       }
     },
     "js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-      "dev": true
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
-      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -2299,43 +2248,6 @@
         "chalk": "^2.3.0",
         "json-stringify-safe": "^5.0.1",
         "yargs": "^11.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "json-schema-traverse": {
@@ -2357,18 +2269,11 @@
       "dev": true
     },
     "json5": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
-      "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
+      "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
       "requires": {
         "minimist": "^1.2.0"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-        }
       }
     },
     "jsonfile": {
@@ -2410,20 +2315,6 @@
         "lodash.once": "^4.0.0",
         "ms": "^2.1.1",
         "semver": "^5.6.0"
-      },
-      "dependencies": {
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
-          "dev": true
-        }
       }
     },
     "jwa": {
@@ -2448,18 +2339,18 @@
       }
     },
     "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
     "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
       "dev": true,
       "requires": {
-        "invert-kv": "^1.0.0"
+        "invert-kv": "^2.0.0"
       }
     },
     "levn": {
@@ -2483,9 +2374,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
     },
     "lodash.find": {
       "version": "4.6.0",
@@ -2584,9 +2475,9 @@
       "dev": true
     },
     "lru-cache": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
       "requires": {
         "pseudomap": "^1.0.2",
@@ -2594,11 +2485,20 @@
       }
     },
     "macos-release": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.2.0.tgz",
-      "integrity": "sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz",
+      "integrity": "sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==",
       "dev": true
     },
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+      "dev": true,
+      "requires": {
+        "p-defer": "^1.0.0"
+      }
+    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -2615,20 +2515,22 @@
       }
     },
     "matcher-collection": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz",
-      "integrity": "sha512-nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.1.2.tgz",
+      "integrity": "sha512-YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g==",
       "requires": {
         "minimatch": "^3.0.2"
       }
     },
     "mem": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
       "dev": true,
       "requires": {
-        "mimic-fn": "^1.0.0"
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
       }
     },
     "memfs-or-file-map-to-github-branch": {
@@ -2659,9 +2561,9 @@
       }
     },
     "mimic-fn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
-      "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true
     },
     "minimatch": {
@@ -2673,15 +2575,14 @@
       }
     },
     "minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "dev": true
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
     "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "requires": {
         "for-in": "^1.0.2",
@@ -2721,6 +2622,14 @@
       "dev": true,
       "requires": {
         "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        }
       }
     },
     "moment": {
@@ -2729,10 +2638,9 @@
       "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="
     },
     "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "mute-stream": {
       "version": "0.0.7",
@@ -2757,14 +2665,6 @@
         "regex-not": "^1.0.0",
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "is-windows": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-          "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-          "dev": true
-        }
       }
     },
     "natural-compare": {
@@ -2826,12 +2726,14 @@
             "ansi-styles": "~1.0.0",
             "has-color": "~0.1.0",
             "strip-ansi": "~0.1.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
+              "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE="
+            }
           }
-        },
-        "strip-ansi": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
-          "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE="
         }
       }
     },
@@ -2943,54 +2845,39 @@
       "dev": true,
       "requires": {
         "mimic-fn": "^1.0.0"
+      },
+      "dependencies": {
+        "mimic-fn": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+          "dev": true
+        }
       }
     },
     "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
       "dev": true,
       "requires": {
         "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
+        "fast-levenshtein": "~2.0.6",
         "levn": "~0.3.0",
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
+        "word-wrap": "~1.2.3"
       }
     },
     "os-locale": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
       "dev": true,
       "requires": {
-        "execa": "^0.7.0",
-        "lcid": "^1.0.0",
-        "mem": "^1.1.0"
-      },
-      "dependencies": {
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true
-        }
+        "execa": "^1.0.0",
+        "lcid": "^2.0.0",
+        "mem": "^4.0.0"
       }
     },
     "os-name": {
@@ -3015,16 +2902,28 @@
       "integrity": "sha1-auIvresfhQ/7DPTCD/e4fl62UN8=",
       "dev": true
     },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+      "dev": true
+    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
       "dev": true
     },
+    "p-is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+      "dev": true
+    },
     "p-limit": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-      "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
+      "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
       "dev": true,
       "requires": {
         "p-try": "^2.0.0"
@@ -3132,30 +3031,9 @@
       "dev": true
     },
     "path-parse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
-    },
-    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
     },
     "pinpoint": {
       "version": "1.1.0",
@@ -3187,15 +3065,15 @@
       "dev": true
     },
     "process-nextick-args": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
     "progress": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
-      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true
     },
     "pseudomap": {
@@ -3215,30 +3093,30 @@
       }
     },
     "readable-stream": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
       "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
         "isarray": "~1.0.0",
-        "process-nextick-args": "~1.0.6",
+        "process-nextick-args": "~2.0.0",
         "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.0.3",
+        "string_decoder": "~1.1.1",
         "util-deprecate": "~1.0.1"
       }
     },
     "readline-sync": {
-      "version": "1.4.9",
-      "resolved": "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.9.tgz",
-      "integrity": "sha1-PtqOZfI80qF+YTAbHwADOWr17No=",
+      "version": "1.4.10",
+      "resolved": "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.10.tgz",
+      "integrity": "sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==",
       "dev": true
     },
     "regenerator-runtime": {
-      "version": "0.13.2",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
-      "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==",
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
+      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==",
       "dev": true
     },
     "regex-not": {
@@ -3251,6 +3129,12 @@
         "safe-regex": "^1.1.0"
       }
     },
+    "regexpp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
+      "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
+      "dev": true
+    },
     "repeat-element": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
@@ -3292,11 +3176,11 @@
       }
     },
     "resolve": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
-      "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz",
+      "integrity": "sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==",
       "requires": {
-        "path-parse": "^1.0.5"
+        "path-parse": "^1.0.6"
       }
     },
     "resolve-from": {
@@ -3328,18 +3212,18 @@
       "dev": true
     },
     "rfc6902": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rfc6902/-/rfc6902-3.0.2.tgz",
-      "integrity": "sha512-Ky6zSlAL5HVu28/BQ+R8vgrKxgTKYBygww9D+TSms7Mylg+mSFdFVtGpHr+XZ8TFiAWslsqaK6qHbrl7XvYjWA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/rfc6902/-/rfc6902-3.0.4.tgz",
+      "integrity": "sha512-OnzreaZXrwT5w2ikKXWr5QcuI7NZpL+J3hIkAwozjOnKVUL7fPsB8Vcmu8YBiiou1/r3V0Jc0T1uQDyfAPvLzA==",
       "dev": true
     },
     "rimraf": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
       "dev": true,
       "requires": {
-        "glob": "^7.0.5"
+        "glob": "^7.1.3"
       }
     },
     "run-async": {
@@ -3367,9 +3251,9 @@
       }
     },
     "safe-buffer": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -3380,15 +3264,21 @@
         "ret": "~0.1.10"
       }
     },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
     "sax": {
       "version": "0.5.8",
       "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
       "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE="
     },
     "semver": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
     },
     "set-blocking": {
       "version": "2.0.0",
@@ -3397,9 +3287,9 @@
       "dev": true
     },
     "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
@@ -3507,6 +3397,12 @@
             "is-extendable": "^0.1.0"
           }
         },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -3598,12 +3494,12 @@
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
     },
     "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
       "dev": true,
       "requires": {
-        "atob": "^2.1.1",
+        "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
         "resolve-url": "^0.2.1",
         "source-map-url": "^0.4.0",
@@ -3662,12 +3558,6 @@
         "strip-ansi": "^4.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -3680,21 +3570,29 @@
       }
     },
     "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
       "requires": {
         "safe-buffer": "~5.1.0"
       }
     },
     "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
       "dev": true,
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "^5.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        }
       }
     },
     "strip-eof": {
@@ -3710,10 +3608,12 @@
       "dev": true
     },
     "supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
     },
     "supports-hyperlinks": {
       "version": "1.0.1",
@@ -3725,22 +3625,11 @@
         "supports-color": "^5.0.0"
       },
       "dependencies": {
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          },
-          "dependencies": {
-            "has-flag": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-              "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-              "dev": true
-            }
-          }
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "dev": true
         }
       }
     },
@@ -3756,37 +3645,6 @@
         "lodash": "^4.17.4",
         "slice-ansi": "1.0.0",
         "string-width": "^2.1.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.1.0",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^4.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^2.0.0"
-          }
-        }
       }
     },
     "text-table": {
@@ -3857,11 +3715,6 @@
         "repeat-string": "^1.6.1"
       }
     },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
-    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -3883,68 +3736,30 @@
       "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
     },
     "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
+        "set-value": "^2.0.1"
       }
     },
     "universal-user-agent": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-2.1.0.tgz",
-      "integrity": "sha512-8itiX7G05Tu3mGDTdNY2fB4KJ8MgZLS54RdG6PkkfwMAavrXu1mV/lls/GABx9O3Rw4PnTtasxrvbMQoBYY92Q==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.0.tgz",
+      "integrity": "sha512-eM8knLpev67iBDizr/YtqkJsF3GK8gzDc6st/WKzrTuPtcsOKW/0IdL4cnMBsU69pOx0otavLWBDGTwg+dB0aA==",
       "dev": true,
       "requires": {
-        "os-name": "^3.0.0"
+        "os-name": "^3.1.0"
       }
     },
     "universalify": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc="
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
     },
     "unset-value": {
       "version": "1.0.0",
@@ -3998,12 +3813,6 @@
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "dev": true
     },
-    "url-template": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
-      "integrity": "sha1-/FZaPMy/93MMd19WQflVV5FDnyE=",
-      "dev": true
-    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -4023,18 +3832,18 @@
       "dev": true
     },
     "walk-sync": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz",
-      "integrity": "sha512-FMB5VqpLqOCcqrzA9okZFc0wq0Qbmdm396qJxvQZhDpyu0W95G9JCmp74tx7iyYnyOcBtUuKJsgIKAqjozvmmQ==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.4.tgz",
+      "integrity": "sha512-ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==",
       "requires": {
         "ensure-posix-path": "^1.0.0",
         "matcher-collection": "^1.0.0"
       }
     },
     "which": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "requires": {
         "isexe": "^2.0.0"
       }
@@ -4054,10 +3863,10 @@
         "execa": "^1.0.0"
       }
     },
-    "wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
       "dev": true
     },
     "wrap-ansi": {
@@ -4070,6 +3879,12 @@
         "strip-ansi": "^3.0.1"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -4089,6 +3904,15 @@
             "is-fullwidth-code-point": "^1.0.0",
             "strip-ansi": "^3.0.0"
           }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
         }
       }
     },
@@ -4124,14 +3948,14 @@
       }
     },
     "xmldom": {
-      "version": "0.1.27",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
-      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
+      "version": "0.1.31",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
+      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="
     },
     "xtend": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
       "dev": true
     },
     "y18n": {
@@ -4147,16 +3971,16 @@
       "dev": true
     },
     "yargs": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
-      "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
+      "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
       "dev": true,
       "requires": {
         "cliui": "^4.0.0",
         "decamelize": "^1.1.1",
         "find-up": "^2.1.0",
         "get-caller-file": "^1.0.1",
-        "os-locale": "^2.0.0",
+        "os-locale": "^3.1.0",
         "require-directory": "^2.1.1",
         "require-main-filename": "^1.0.1",
         "set-blocking": "^2.0.0",
diff --git a/package.json b/package.json
index c041b8783..19ce2c1db 100644
--- a/package.json
+++ b/package.json
@@ -33,9 +33,11 @@
     "@babel/core": "^7.4.5",
     "@babel/generator": "^7.4.4",
     "@babel/parser": "^7.4.5",
+    "@babel/template": "^7.4.4",
     "@babel/traverse": "^7.4.5",
     "@babel/types": "^7.4.4",
-    "@babel/template": "^7.4.4",
+    "alloy-compiler": "^0.2.2",
+    "alloy-utils": "^0.2.2",
     "async": "^2.4.0",
     "chmodr": "^1.0.2",
     "colors": "^1.1.2",
@@ -74,6 +76,7 @@
     "diff": "^3.4.0",
     "eslint": "^4.14.0",
     "jake": "^8.0.12",
-    "mkdirp": "^0.5.1"
+    "mkdirp": "^0.5.1",
+    "strip-ansi": "^6.0.0"
   }
 }
diff --git a/platforms/android/index.js b/platforms/android/index.js
deleted file mode 100644
index d4d037156..000000000
--- a/platforms/android/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = new (require('../base.js'))({
-	platform: 'android'
-});
\ No newline at end of file
diff --git a/platforms/base.js b/platforms/base.js
deleted file mode 100644
index c499fb1b8..000000000
--- a/platforms/base.js
+++ /dev/null
@@ -1,48 +0,0 @@
-var _ = require('lodash'),
-	U = require('../Alloy/utils');
-
-module.exports = function(def) {
-	if (!def.platform) {
-		U.die([
-			'platform undefined',
-			new Error().stack
-		]);
-	}
-
-	_.extend(this, _.defaults(def, {
-		alloyFolder: def.platform,
-		titaniumFolder: def.platform,
-		name: def.platform,
-		osname: def.platform,
-		condition: {}
-	}));
-
-	this.condition = {
-		compile: def.condition.compile || 'OS_' + this.platform.toUpperCase(),
-		runtime: def.condition.runtime || runtimeCondition(this.osname, this.name)
-	};
-};
-
-function runtimeCondition(osname, name) {
-	var output, map;
-	osname = osname || [];
-	name = name || [];
-
-	if (!osname && !name) {
-		return 'true';
-	} else if (_.isString(name)) {
-		return "Ti.Platform.name === '" + name + "'";
-	} else if (_.isString(osname)) {
-		return "Ti.Platform.osname === '" + osname + "'";
-	} else {
-		if (_.isArray(name)) {
-			map = _.map(name, function(n) { return "Ti.Platform.name === '" + n + "'"; });
-		}
-		if (_.isArray(osname) && (!map || osname.length < name.length)) {
-			map = _.map(osname, function(n) { return "Ti.Platform.osname === '" + n + "'"; });
-		}
-		if (!map) { return 'true'; }
-	}
-
-	return map.join('||');
-}
diff --git a/platforms/index.js b/platforms/index.js
index 131b1c9c8..0c25b90da 100644
--- a/platforms/index.js
+++ b/platforms/index.js
@@ -1,13 +1,4 @@
-var fs = require('fs'),
-	path = require('path'),
-	_ = require('lodash');
+const _ = require('lodash');
+const { platforms } = require('alloy-utils');
 
-module.exports = (function() {
-	var obj = {};
-	_.each(fs.readdirSync(__dirname), function(file) {
-		if (fs.existsSync(path.join(__dirname, file, 'index.js'))) {
-			obj[file] = require('./' + file + '/index');
-		}
-	});
-	return obj;
-})();
+module.exports = _.omit(platforms, ['constants']);
\ No newline at end of file
diff --git a/platforms/ios/index.js b/platforms/ios/index.js
deleted file mode 100644
index 9f38f5c08..000000000
--- a/platforms/ios/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = new (require('../base.js'))({
-	platform: 'ios',
-	titaniumFolder: 'iphone',
-	name: 'iPhone OS',
-	osname: ['ipad', 'iphone']
-});
\ No newline at end of file
diff --git a/platforms/mobileweb/index.js b/platforms/mobileweb/index.js
deleted file mode 100644
index c26408d70..000000000
--- a/platforms/mobileweb/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = new (require('../base.js'))({
-	platform: 'mobileweb'
-});
\ No newline at end of file
diff --git a/platforms/windows/index.js b/platforms/windows/index.js
deleted file mode 100644
index fdd7a4fee..000000000
--- a/platforms/windows/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = new (require('../base.js'))({
-	platform: 'windows',
-	alloyFolder: 'windows',
-	titaniumFolder: 'windows',
-	name: 'Windows Phone',
-	osname: ['windowsphone', 'windowsstore']
-});
diff --git a/samples/apps/advanced/complex_styling/config.json b/samples/apps/advanced/complex_styling/config.json
index 30843ef00..09d2d6dc8 100644
--- a/samples/apps/advanced/complex_styling/config.json
+++ b/samples/apps/advanced/complex_styling/config.json
@@ -11,8 +11,5 @@
     "os:android": {
         "theme":"android"
     },
-    "os:mobileweb":{
-        "theme":"mobileweb"
-    },
     "dependencies": {}
 }
\ No newline at end of file
diff --git a/samples/apps/advanced/complex_styling/styles/label.tss b/samples/apps/advanced/complex_styling/styles/label.tss
index eb12cf696..1036c0a91 100644
--- a/samples/apps/advanced/complex_styling/styles/label.tss
+++ b/samples/apps/advanced/complex_styling/styles/label.tss
@@ -5,7 +5,3 @@
 "#lbl3[platform=android]": {
 	color: 'green'
 }
-
-"#lbl3[platform=mobileweb]": {
-	color: 'purple'
-}
\ No newline at end of file
diff --git a/samples/apps/advanced/complex_styling/themes/mobileweb/styles/app.tss b/samples/apps/advanced/complex_styling/themes/mobileweb/styles/app.tss
deleted file mode 100644
index 71b38d235..000000000
--- a/samples/apps/advanced/complex_styling/themes/mobileweb/styles/app.tss
+++ /dev/null
@@ -1,11 +0,0 @@
-"Window": {
-	backgroundColor: 'white'
-}
-"Label": {
-	color: 'black',
-	width: Ti.UI.FILL,
-	height: Ti.UI.SIZE
-}
-"#lbl7": {
-	color: 'red'
-}
\ No newline at end of file
diff --git a/samples/apps/advanced/complex_styling/themes/mobileweb/styles/requiredlabel.tss b/samples/apps/advanced/complex_styling/themes/mobileweb/styles/requiredlabel.tss
deleted file mode 100644
index fbe7963ba..000000000
--- a/samples/apps/advanced/complex_styling/themes/mobileweb/styles/requiredlabel.tss
+++ /dev/null
@@ -1,4 +0,0 @@
-"#requiredLabel":{
-	color: 'blue',
-	text: "8. Required-in label, BLUE color set in MobileWeb theme TSS"
-}
\ No newline at end of file
diff --git a/samples/apps/advanced/complex_styling/views/index.xml b/samples/apps/advanced/complex_styling/views/index.xml
index 27004bb27..5c02c13bd 100644
--- a/samples/apps/advanced/complex_styling/views/index.xml
+++ b/samples/apps/advanced/complex_styling/views/index.xml
@@ -3,13 +3,12 @@
 		<ScrollView class="scroll" id="sv">
 			<Label class="lbl" id="lbl1" platform="android">1. Platform attribute in XML sets to green on Android from platform specific TSS ID style, font size</Label>
 			<Label class="lbl" id="lbl1" platform="ios">1. Platform attribute in XML sets to blue from generic TSS ID style, font size from index.tss</Label>
-			<Label class="lbl" id="lbl1" platform="mobileweb">1. Platform attribute in XML sets to blue from generic TSS ID style, font size from index.tss</Label>
 			<Label class="lbl" id="lbl2"></Label>
 			<Require src="label"/>
 			<Label class="lbl" id="lbl4" color="blue">4. Text alignment and font size set in index.tss, XML color attribute overrides TSS</Label>
 			<Require src="anotherlabel"/>
 			<Label class="lbl" id="lbl6">6. Bold, large, custom font, font properties mixed from various stylesheets</Label>
-			<Label class="lbl" id="lbl7">7. Theme controls color: iOS=blue, Android=green, MobileWeb=red, generic=black, font size from main index.tss</Label>
+			<Label class="lbl" id="lbl7">7. Theme controls color: iOS=blue, Android=green, generic=black, font size from main index.tss</Label>
 			<Require src="requiredlabel"/>
 			<Label class="lbl" id="lbl9" formFactor="handheld">9. Device query in XML and TSS to set text and color (green on handheld)</Label>
 			<Label class="lbl" id="lbl9" formFactor="tablet">9. Device query in XML and TSS to set text and color (purple on tablet)</Label>
diff --git a/samples/apps/advanced/complex_styling/views/label.xml b/samples/apps/advanced/complex_styling/views/label.xml
index cc102cefb..47d5b92b5 100644
--- a/samples/apps/advanced/complex_styling/views/label.xml
+++ b/samples/apps/advanced/complex_styling/views/label.xml
@@ -1,3 +1,3 @@
 <Alloy>
-	<Label id="lbl3">3. Required-in view, red color from associated TSS, green on Android and purple on MobileWeb from media query</Label>
+	<Label id="lbl3">3. Required-in view, red color from associated TSS, green on Android from media query</Label>
 </Alloy>
\ No newline at end of file
diff --git a/samples/apps/advanced/complex_styling/views/mobileweb/label.xml b/samples/apps/advanced/complex_styling/views/mobileweb/label.xml
deleted file mode 100644
index 03dc5dc45..000000000
--- a/samples/apps/advanced/complex_styling/views/mobileweb/label.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<Alloy>
-	<Label id="lbl3">3. Required-in from Mobileweb platform directory, with common TSS with a platform selector to set color (purple)</Label>
-</Alloy>
\ No newline at end of file
diff --git a/samples/apps/advanced/custom_tss_queries/styles/index.tss b/samples/apps/advanced/custom_tss_queries/styles/index.tss
index 585fb644b..cdec36e3c 100644
--- a/samples/apps/advanced/custom_tss_queries/styles/index.tss
+++ b/samples/apps/advanced/custom_tss_queries/styles/index.tss
@@ -37,9 +37,6 @@
 "#title2[platform=ios if=Alloy.Globals.someProperty]": {
 	text: "Platform: iOS, Alloy.Globals.someProperty==true"
 }
-"#title2[platform=mobileweb if=Alloy.Globals.someProperty]": {
-	text: "Platform: MobileWeb, Alloy.Globals.someProperty==true"
-}
 "#title2[platform=windows if=Alloy.Globals.someProperty]": {
 	text: "Platform: Windows, Alloy.Globals.someProperty==true"
 }
diff --git a/samples/apps/advanced/device_query/_generated/mobileweb/alloy/controllers/index.js b/samples/apps/advanced/device_query/_generated/mobileweb/alloy/controllers/index.js
index fde47edd7..4b342b4b3 100644
--- a/samples/apps/advanced/device_query/_generated/mobileweb/alloy/controllers/index.js
+++ b/samples/apps/advanced/device_query/_generated/mobileweb/alloy/controllers/index.js
@@ -41,10 +41,6 @@ function Controller() {
                 fontWeight: "bold"
             }
         });
-        Alloy.deepExtend(true, o, {
-            text: "Mobileweb",
-            id: "osLabel"
-        });
         return o;
     }());
     $.__views.win.add($.__views.osLabel);
diff --git a/samples/apps/advanced/device_query/specs/index.js b/samples/apps/advanced/device_query/specs/index.js
index 246917e8a..e1d583302 100644
--- a/samples/apps/advanced/device_query/specs/index.js
+++ b/samples/apps/advanced/device_query/specs/index.js
@@ -9,12 +9,7 @@ module.exports = function($) {
 			bgColor = '#0f0';
 		} else if (OS_IOS) {
 			bgColor = '#f00';
-		} else if (OS_MOBILEWEB) {
-			bgColor = '#00f';
 		}
-		// else if (OS_BLACKBERRY) {
-		// 	bgColor = '#0ff';
-		// }
 
 		validateUiComponent($, 'win', {
 			api: 'Ti.UI.Window',
@@ -34,10 +29,6 @@ module.exports = function($) {
 			color = '#000';
 		} else if (OS_IOS) {
 			text = Alloy.isTablet ? 'iPad' : 'iPhone';
-		} else if (OS_MOBILEWEB) {
-			text = 'Mobileweb';
-		// } else if (OS_BLACKBERRY) {
-		// 	text = 'Blackberry';
 		} else if (OS_WINDOWS) {
 			text = 'Windows';
 		}
@@ -50,7 +41,7 @@ module.exports = function($) {
 				width: Ti.UI.SIZE,
 				textAlign: 'center',
 				font: {
-					fontSize: (Alloy.isTablet ? 96 : 48) + (OS_MOBILEWEB ? 'px' : 0),
+					fontSize: Alloy.isTablet ? 96 : 48,
 					fontWeight: 'bold'
 				},
 				text: text,
diff --git a/samples/apps/advanced/device_query/styles/index.tss b/samples/apps/advanced/device_query/styles/index.tss
index eacbfd825..449c95a47 100755
--- a/samples/apps/advanced/device_query/styles/index.tss
+++ b/samples/apps/advanced/device_query/styles/index.tss
@@ -10,14 +10,6 @@
 	backgroundColor: "#0f0"
 }
 
-"#win[platform=mobileweb]": {
-	backgroundColor: "#00f"
-}
-
-"#win[platform=blackberry]": {
-	backgroundColor: "#0ff"
-}
-
 "Label": {
 	color: "#fff",
 	font: {
@@ -59,14 +51,6 @@
 	color: "#000"
 }
 
-"#osLabel[platform=mobileweb]": {
-	text: "Mobileweb"
-}
-
-"#osLabel[platform=blackberry]": {
-	text: "Blackberry"
-}
-
 "#osLabel[platform=windows]": {
 	text: "Windows"
 }
\ No newline at end of file
diff --git a/samples/apps/advanced/dynamic_styling/views/mobileweb/features/autoStyle.xml b/samples/apps/advanced/dynamic_styling/views/mobileweb/features/autoStyle.xml
deleted file mode 100644
index 9b222e8e3..000000000
--- a/samples/apps/advanced/dynamic_styling/views/mobileweb/features/autoStyle.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
-	Mobileweb has a separate view to account for https://jira.appcelerator.org/browse/TIMOB-14754
-
-	autoStyle is set to "false" here, but that is also the default behavior. All
-	controllers are assumed to have autoStyle set to false, unless autoStyle is
-	set to true in the config.json. autoStyle means that when a UI component is
-	created, the apiName, classes, and id will be used not only to create the
-	component at compile time, but also those values will be stored on the
-	created proxy itself for later use as properties.
-
-	To see exactly what is meant by "stored on the created proxy", check out the
-	console log when this controller opens. It will show if the id, classes, and
-	apiName are stored on each one of the ID'ed XML components below.
-
-	Here's the specific reasons why you should or should not use autoStyle on a
-	per-project (config.json), per-controller (<Alloy>), or per-component level.
-
-	pros: Keeps track of apiName, classes, and id for all components. This
-		  allows full use of the $.addClass() and $.removeClass() functions.
-		  Without using autoStyle, all components created from XML would appear
-		  to have no classes or apiName, despite having them listed as XML
-	      attributes.
-	cons: There is a small performance overhead with adding these properties to
-		  every component. This is why autoStyle is not enabled for all
-		  components by default. You should use autoStyle only on
-		  components/controllers that will actually leverage the ability to
-		  add/remove classes.
-
-	You can see how these properties are made use of in the "Add/Remove Classes"
-	section of this app.
--->
-<Alloy autoStyle="false">
-	<Window id="win">
-		<Require src="header" title="autoStyle"/>
-		<ScrollView id="scroll" class="container">
-			<View class='mainView'>
-				<Label id="label1" class="dark">test label</Label>
-
-				<!--
-					Notice that "label2" has autoStyle="true". This means that
-					unlike the other components that will be created from XML,
-					label2 will have both the classes and apiName name attached to
-					its created proxy object. You can view this in the console log.
-				-->
-				<Label id="label2" class="blue huge shadow"
-					autoStyle="true">test label</Label>
-
-				<Label id="theButton" class="blueButton"
-					onTouchstart="buttonDown" onTouchend="buttonUp">dummy button</Label>
-				<ImageView id="theImage" class="thumb" onClick="changeImage"/>
-			</View>
-		</ScrollView>
-	</Window>
-</Alloy>
\ No newline at end of file
diff --git a/samples/apps/advanced/form_factor/_generated/mobileweb/alloy/controllers/index.js b/samples/apps/advanced/form_factor/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 7c0fb4313..000000000
--- a/samples/apps/advanced/form_factor/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,121 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    if (!Alloy.isTablet) {
-        $.__views.main = Ti.UI.createView(function() {
-            var o = {};
-            Alloy.isHandheld && Alloy.deepExtend(true, o, {
-                backgroundColor: "blue"
-            });
-            Alloy.isTablet && Alloy.deepExtend(true, o, {
-                backgroundColor: "red"
-            });
-            Alloy.deepExtend(true, o, {
-                id: "main"
-            });
-            return o;
-        }());
-        $.__views.index.add($.__views.main);
-        $.__views.label = Ti.UI.createLabel({
-            width: Ti.UI.SIZE,
-            height: Ti.UI.SIZE,
-            color: "#fff",
-            text: "I'm a handheld!",
-            id: "label"
-        });
-        $.__views.main.add($.__views.label);
-    }
-    if (Alloy.isTablet) {
-        $.__views.main = Ti.UI.createView(function() {
-            var o = {};
-            Alloy.isHandheld && Alloy.deepExtend(true, o, {
-                backgroundColor: "blue"
-            });
-            Alloy.isTablet && Alloy.deepExtend(true, o, {
-                backgroundColor: "red"
-            });
-            Alloy.deepExtend(true, o, {
-                id: "main"
-            });
-            return o;
-        }());
-        $.__views.index.add($.__views.main);
-        $.__views.label = Ti.UI.createLabel({
-            width: Ti.UI.SIZE,
-            height: Ti.UI.SIZE,
-            color: "#fff",
-            text: "I'm a tablet!",
-            id: "label"
-        });
-        $.__views.main.add($.__views.label);
-    }
-    $.__views.container = Ti.UI.createView(function() {
-        var o = {};
-        Alloy.isHandheld && Alloy.deepExtend(true, o, {
-            backgroundColor: "blue"
-        });
-        Alloy.isTablet && Alloy.deepExtend(true, o, {
-            backgroundColor: "red"
-        });
-        Alloy.deepExtend(true, o, {
-            id: "container",
-            height: 50,
-            width: 200,
-            bottom: 10,
-            backgroundColor: "#cdcdcd"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.container);
-    if (Alloy.isTablet) {
-        $.__views.platformLabel = Ti.UI.createLabel({
-            width: Ti.UI.SIZE,
-            height: Ti.UI.SIZE,
-            color: "#fff",
-            text: "mobileweb tablet",
-            id: "platformLabel"
-        });
-        $.__views.container.add($.__views.platformLabel);
-    }
-    if (!Alloy.isTablet) {
-        $.__views.platformLabel = Ti.UI.createLabel({
-            width: Ti.UI.SIZE,
-            height: Ti.UI.SIZE,
-            color: "#fff",
-            text: "mobileweb handheld",
-            id: "platformLabel"
-        });
-        $.__views.container.add($.__views.platformLabel);
-    }
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    require("specs/index")($);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/samples/apps/advanced/form_factor/views/index.xml b/samples/apps/advanced/form_factor/views/index.xml
index f793e0cbc..dc93aa0ba 100644
--- a/samples/apps/advanced/form_factor/views/index.xml
+++ b/samples/apps/advanced/form_factor/views/index.xml
@@ -13,12 +13,6 @@
 			<Label id="platformLabel" platform="android" formFactor="handheld">android handheld</Label>
 			<Label id="platformLabel" platform="ios" formFactor="tablet">ipad</Label>
 			<Label id="platformLabel" platform="ios" formFactor="handheld">iphone</Label>
-			<Label id="platformLabel" platform="blackberry" formFactor="tablet">blackberry tablet</Label>
-			<Label id="platformLabel" platform="blackberry" formFactor="handheld">blackberry handheld</Label>
-			<Label id="platformLabel" platform="mobileweb" formFactor="tablet">mobileweb tablet</Label>
-			<Label id="platformLabel" platform="mobileweb" formFactor="handheld">mobileweb handheld</Label>
-			<Label id="platformLabel" platform="windows" formFactor="handheld">windows handheld</Label>
-			<Label id="platformLabel" platform="windows" formFactor="tablet">windows tablet</Label>
 		</View>
 	</Window>
 </Alloy>
\ No newline at end of file
diff --git a/samples/apps/advanced/inheritance/_generated/mobileweb/alloy/controllers/animatedDialog.js b/samples/apps/advanced/inheritance/_generated/mobileweb/alloy/controllers/animatedDialog.js
deleted file mode 100644
index a7a31b79a..000000000
--- a/samples/apps/advanced/inheritance/_generated/mobileweb/alloy/controllers/animatedDialog.js
+++ /dev/null
@@ -1,44 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/baseDialog").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "animatedDialog";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    exports.baseController = "baseDialog";
-    exports.openDialog = function(win) {
-        $.refWin = win;
-        $.cover.opacity = 0;
-        $.dialog.opacity = 0;
-        $.refWin.add($.cover);
-        $.refWin.add($.dialog);
-        $.cover.animate({
-            duration: 500,
-            opacity: .5
-        });
-        $.dialog.animate({
-            duration: 500,
-            opacity: 1
-        });
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/samples/apps/advanced/inheritance/_generated/mobileweb/alloy/controllers/baseDialog.js b/samples/apps/advanced/inheritance/_generated/mobileweb/alloy/controllers/baseDialog.js
deleted file mode 100644
index 5e1313fa4..000000000
--- a/samples/apps/advanced/inheritance/_generated/mobileweb/alloy/controllers/baseDialog.js
+++ /dev/null
@@ -1,88 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "baseDialog";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.cover = Ti.UI.createView({
-        backgroundColor: "#000",
-        opacity: .5,
-        height: Ti.UI.FILL,
-        width: Ti.UI.FILL,
-        id: "cover"
-    });
-    $.__views.cover && $.addTopLevelView($.__views.cover);
-    $.__views.dialog = Ti.UI.createView({
-        height: "100dp",
-        width: "66%",
-        backgroundColor: "#fff",
-        borderColor: "#000",
-        borderWidth: 2,
-        borderRadius: 4,
-        id: "dialog"
-    });
-    $.__views.dialog && $.addTopLevelView($.__views.dialog);
-    $.__views.message = Ti.UI.createLabel({
-        color: "#000",
-        left: 10,
-        right: 10,
-        top: 10,
-        height: Ti.UI.SIZE,
-        font: {
-            fontSize: "16dp"
-        },
-        textAlign: "center",
-        text: "You opened the dialog!",
-        id: "message"
-    });
-    $.__views.dialog.add($.__views.message);
-    $.__views.closeButton = Ti.UI.createButton({
-        bottom: 10,
-        title: "Close Dialog",
-        id: "closeButton"
-    });
-    $.__views.dialog.add($.__views.closeButton);
-    try {
-        $.addListener($.__views.closeButton, "click", exports.closeDialog);
-    } catch (e) {
-        __defers["$.__views.closeButton!click!exports.closeDialog"] = true;
-    }
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    $.message.text = args.message || "dialog";
-    exports.openDialog = function(win) {
-        $.refWin = win;
-        $.refWin.add($.cover);
-        $.refWin.add($.dialog);
-    };
-    exports.closeDialog = function() {
-        $.refWin.remove($.cover);
-        $.refWin.remove($.dialog);
-        $.refWin = $.cover = $.dialog = null;
-    };
-    require("specs/baseDialog")($, {
-        message: $.message.text
-    });
-    __defers["$.__views.closeButton!click!exports.closeDialog"] && $.addListener($.__views.closeButton, "click", exports.closeDialog);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/samples/apps/advanced/inheritance/_generated/mobileweb/alloy/controllers/index.js b/samples/apps/advanced/inheritance/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 5746b5470..000000000
--- a/samples/apps/advanced/inheritance/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,59 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function openDialog(e) {
-        alert("Mobileweb version not full implemented.\nSee TIMOB-13816 for details.");
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.container = Ti.UI.createView({
-        top: "40dp",
-        id: "container",
-        layout: "vertical"
-    });
-    $.__views.index.add($.__views.container);
-    $.__views.__alloyId0 = Ti.UI.createButton({
-        title: "baseDialog",
-        id: "__alloyId0"
-    });
-    $.__views.container.add($.__views.__alloyId0);
-    openDialog ? $.addListener($.__views.__alloyId0, "click", openDialog) : __defers["$.__views.__alloyId0!click!openDialog"] = true;
-    $.__views.__alloyId1 = Ti.UI.createButton({
-        title: "animatedDialog",
-        id: "__alloyId1"
-    });
-    $.__views.container.add($.__views.__alloyId1);
-    openDialog ? $.addListener($.__views.__alloyId1, "click", openDialog) : __defers["$.__views.__alloyId1!click!openDialog"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    require("specs/index")($);
-    __defers["$.__views.__alloyId0!click!openDialog"] && $.addListener($.__views.__alloyId0, "click", openDialog);
-    __defers["$.__views.__alloyId1!click!openDialog"] && $.addListener($.__views.__alloyId1, "click", openDialog);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/samples/apps/advanced/inheritance/controllers/index.js b/samples/apps/advanced/inheritance/controllers/index.js
index 7c2ebaa9e..20969a13a 100755
--- a/samples/apps/advanced/inheritance/controllers/index.js
+++ b/samples/apps/advanced/inheritance/controllers/index.js
@@ -1,11 +1,7 @@
 function openDialog(e) {
-	if (OS_MOBILEWEB) {
-		alert('Mobileweb version not full implemented.\nSee TIMOB-13816 for details.');
-	} else {
-		Alloy.createController(e.source.title, {
-			message: 'Opened ' + e.source.title
-		}).openDialog($.index);
-	}
+	Alloy.createController(e.source.title, {
+		message: 'Opened ' + e.source.title
+	}).openDialog($.index);
 }
 
 $.index.open();
diff --git a/samples/apps/advanced/inheritance/specs/baseDialog.js b/samples/apps/advanced/inheritance/specs/baseDialog.js
index bb4333eca..6d69900b1 100644
--- a/samples/apps/advanced/inheritance/specs/baseDialog.js
+++ b/samples/apps/advanced/inheritance/specs/baseDialog.js
@@ -41,7 +41,7 @@ module.exports = function($, opts) {
 				top: 10,
 				height: Ti.UI.SIZE,
 				font: {
-					fontSize: OS_MOBILEWEB ? '16px' : '16dp'
+					fontSize: '16dp'
 				},
 				textAlign: 'center',
 				text: opts.message,
diff --git a/samples/apps/advanced/master_detail/specs/row.js b/samples/apps/advanced/master_detail/specs/row.js
index c0ef6728d..f3342ea37 100644
--- a/samples/apps/advanced/master_detail/specs/row.js
+++ b/samples/apps/advanced/master_detail/specs/row.js
@@ -22,7 +22,7 @@ module.exports = function($, opts) {
 				top: '5dp',
 				left: '10dp',
 				font: {
-					fontSize: OS_MOBILEWEB ? '24px' : '24dp',
+					fontSize: '24dp',
 					fontWeight: 'bold'
 				},
 				id: 'name'
@@ -38,7 +38,7 @@ module.exports = function($, opts) {
 				bottom: '5dp',
 				left: '20dp',
 				font: {
-					fontSize: OS_MOBILEWEB ? '16px' : '16dp',
+					fontSize: '16dp',
 					fontWeight: 'normal'
 				},
 				id: 'nickname'
diff --git a/samples/apps/advanced/proxy_property_requires/widgets/com.foo.widget/views/section.xml b/samples/apps/advanced/proxy_property_requires/widgets/com.foo.widget/views/section.xml
index 89eea8930..75cb63eff 100644
--- a/samples/apps/advanced/proxy_property_requires/widgets/com.foo.widget/views/section.xml
+++ b/samples/apps/advanced/proxy_property_requires/widgets/com.foo.widget/views/section.xml
@@ -1,5 +1,5 @@
 <Alloy>
-	<TableViewSection platform="android,windows">
+	<TableViewSection platform="android">
 		<HeaderView>
 			<Label>Test</Label>
 		</HeaderView>
@@ -7,7 +7,7 @@
 		<TableViewRow title="android row"/>
 		<TableViewRow title="android row"/>
 	</TableViewSection>
-	<TableViewSection platform="ios,mobileweb" headerTitle="Test">
+	<TableViewSection platform="ios" headerTitle="Test">
 		<TableViewRow title="table row"/>
 		<TableViewRow title="table row"/>
 		<TableViewRow title="table row"/>
diff --git a/samples/apps/advanced/proxy_property_requires/widgets/com.foo.widget/widget.json b/samples/apps/advanced/proxy_property_requires/widgets/com.foo.widget/widget.json
index eb96acdb5..be278d91f 100755
--- a/samples/apps/advanced/proxy_property_requires/widgets/com.foo.widget/widget.json
+++ b/samples/apps/advanced/proxy_property_requires/widgets/com.foo.widget/widget.json
@@ -9,6 +9,6 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"2.1",
 	"tags":"",
-	"platforms":"android,ios,mobileweb,windows",
+	"platforms":"android,ios,windows",
 	"dependencies": {}
 }
\ No newline at end of file
diff --git a/samples/apps/advanced/require_children/widgets/alloy.container/widget.json b/samples/apps/advanced/require_children/widgets/alloy.container/widget.json
index 84c33b69f..cca74ca9a 100755
--- a/samples/apps/advanced/require_children/widgets/alloy.container/widget.json
+++ b/samples/apps/advanced/require_children/widgets/alloy.container/widget.json
@@ -4,6 +4,6 @@
 	"description" : "Alloy Container",
 	"author": "Tony Lukasavage",
 	"version": "1.0",
-	"platforms":"android,ios,mobileweb,blackberry,windows",
+	"platforms":"android,ios,windows",
 	"dependencies": {}
 }
\ No newline at end of file
diff --git a/samples/apps/advanced/themes/specs/dialog.js b/samples/apps/advanced/themes/specs/dialog.js
index 53ee562d5..62cddab3c 100644
--- a/samples/apps/advanced/themes/specs/dialog.js
+++ b/samples/apps/advanced/themes/specs/dialog.js
@@ -47,23 +47,6 @@ module.exports = function($, opts) {
 				backgroundImage: '/button_green.png'
 			}
 		};
-	} else if (OS_MOBILEWEB) {
-		styler = {
-			mainView: {
-				backgroundImage: '/bg_gray.png',
-				borderColor: '#1e99fd'
-			},
-			progressBack: {
-				backgroundColor: '#333'
-			},
-			progressFront: {
-				backgroundImage: '/title_blue.png'
-			},
-			button: {
-				backgroundImage: '/button_blue.png',
-				color: '#fff'
-			}
-		};
 	}
 
 	$.__styler = styler;
diff --git a/samples/apps/advanced/themes/specs/index.js b/samples/apps/advanced/themes/specs/index.js
index 98497bf1b..7c775d169 100644
--- a/samples/apps/advanced/themes/specs/index.js
+++ b/samples/apps/advanced/themes/specs/index.js
@@ -67,50 +67,6 @@ module.exports = function($) {
 				right: 15
 			}
 		};
-	} else if (OS_MOBILEWEB) {
-		styler = {
-			index: {
-				backgroundImage: '/bg_gray.png'
-			},
-			title: {
-				color: '#fff',
-				backgroundImage: '/title_blue.png',
-				font: {
-					fontSize: '24px',
-					fontWeight: 'bold'
-				}
-			},
-			container: {
-				backgroundGradient: {
-					type: 'linear',
-					startPoint: {
-						x: '0%',
-						y: '0%'
-					},
-					endPoint: {
-						x: '0%',
-						y: '100%'
-					},
-					colors: [ '#39abfb', '#0285ff' ]
-				}
-			},
-			label: {
-				color: '#fff',
-				font: {
-					fontSize: '140px',
-					fontWeight: 'bold'
-				}
-			},
-			slider: {
-				leftTrackImage: '/title_blue.png',
-				bottom: 100,
-				width: 250
-			},
-			testButton: {
-				color: '#fff',
-				backgroundImage: '/button_blue.png'
-			}
-		};
 	}
 
 	// add the styer as a hidden argument to the controller to
diff --git a/samples/apps/advanced/theming_widgets/widgets/starrating/widget.json b/samples/apps/advanced/theming_widgets/widgets/starrating/widget.json
index 4de25b5d7..0dc809499 100644
--- a/samples/apps/advanced/theming_widgets/widgets/starrating/widget.json
+++ b/samples/apps/advanced/theming_widgets/widgets/starrating/widget.json
@@ -9,5 +9,5 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"3.0",
 	"tags":"",
-	"platforms":"android,ios,mobileweb,windows"
+	"platforms":"android,ios,windows"
 }
\ No newline at end of file
diff --git a/samples/apps/basics/builtins/specs/index.js b/samples/apps/basics/builtins/specs/index.js
index 07ba56fee..490c0da15 100644
--- a/samples/apps/basics/builtins/specs/index.js
+++ b/samples/apps/basics/builtins/specs/index.js
@@ -27,7 +27,7 @@ module.exports = function($) {
 			style: {
 				color: '#eee',
 				font: {
-					fontSize: OS_MOBILEWEB ? '28px' : '28dp',
+					fontSize: '28dp',
 					fontWeight: 'bold'
 				},
 				text: 'Trimmable String',
diff --git a/samples/apps/basics/config_json/config.json b/samples/apps/basics/config_json/config.json
index dbfe8e8bb..87d24524d 100755
--- a/samples/apps/basics/config_json/config.json
+++ b/samples/apps/basics/config_json/config.json
@@ -1,9 +1,7 @@
 {
 	"global": { "someValue": "unknown" },
     "os:android": { "someValue": "Android" },
-    "os:blackberry": { "someValue": "Blackberry" },
     "os:ios": { "someValue": "iOS" },
-    "os:mobileweb": { "someValue": "Mobileweb" },
     "os:windows": { "someValue": "Windows" },
     "sourcemap": false,
     "adapters": []
diff --git a/samples/apps/basics/global_style/specs/item.js b/samples/apps/basics/global_style/specs/item.js
index 8f3dc4950..9c217424b 100644
--- a/samples/apps/basics/global_style/specs/item.js
+++ b/samples/apps/basics/global_style/specs/item.js
@@ -17,7 +17,7 @@ module.exports = function($) {
 			style: {
 				color: '#f00',
 				font: {
-					fontSize: OS_MOBILEWEB ? '24px' : 24,
+					fontSize: 24,
 					fontWeight: 'bold'
 				},
 				textAlign: 'center',
diff --git a/samples/apps/basics/simple/specs/index.js b/samples/apps/basics/simple/specs/index.js
index 3b8891c4e..7a17bf07f 100644
--- a/samples/apps/basics/simple/specs/index.js
+++ b/samples/apps/basics/simple/specs/index.js
@@ -19,7 +19,7 @@ module.exports = function($) {
 			style: {
 				color: '#000',
 				font: {
-					fontSize: OS_MOBILEWEB ? '18px' : '18dp',
+					fontSize: '18dp',
 					fontWeight: 'bold'
 				},
 				height: Ti.UI.SIZE,
diff --git a/samples/apps/models/binding_destroy/views/index.xml b/samples/apps/models/binding_destroy/views/index.xml
index 4d40012f3..ef2ef5eb4 100644
--- a/samples/apps/models/binding_destroy/views/index.xml
+++ b/samples/apps/models/binding_destroy/views/index.xml
@@ -13,13 +13,6 @@
 	</NavigationWindow>
 
 	<Window id="index" platform="!ios">
-		<!-- mobileweb -->
-		<NavigationGroup id="navgroup" platform="mobileweb">
-			<Window>
-				<Require src="main"/>
-			</Window>
-		</NavigationGroup>
-
 		<!-- just use window hierarchy on android -->
 		<Require src="main" platform="android"/>
 	</Window>
diff --git a/samples/apps/models/binding_tableview/controllers/tab_1.js b/samples/apps/models/binding_tableview/controllers/tab_1.js
index 132a27af9..65472f71b 100644
--- a/samples/apps/models/binding_tableview/controllers/tab_1.js
+++ b/samples/apps/models/binding_tableview/controllers/tab_1.js
@@ -13,7 +13,7 @@ function removeItem(e) {
 	common.removeItem(myModels, e.index);
 }
 
-if (OS_IOS || OS_MOBILEWEB) {
+if (OS_IOS) {
 	common.prepNavBar($.window, addItem);
 }
 
diff --git a/samples/apps/models/binding_tableview/controllers/tab_2.js b/samples/apps/models/binding_tableview/controllers/tab_2.js
index b87140be1..50e4faea6 100644
--- a/samples/apps/models/binding_tableview/controllers/tab_2.js
+++ b/samples/apps/models/binding_tableview/controllers/tab_2.js
@@ -13,7 +13,7 @@ function removeItem(e) {
 	common.removeItem(myModels, e.index);
 }
 
-if (OS_IOS || OS_MOBILEWEB) {
+if (OS_IOS) {
 	common.prepNavBar($.window, addItem);
 }
 
diff --git a/samples/apps/models/binding_tableview/controllers/tab_3.js b/samples/apps/models/binding_tableview/controllers/tab_3.js
index eab022e53..24e0da6ef 100644
--- a/samples/apps/models/binding_tableview/controllers/tab_3.js
+++ b/samples/apps/models/binding_tableview/controllers/tab_3.js
@@ -14,7 +14,7 @@ function removeItem(e) {
 	common.removeItem(myModels, e.index);
 }
 
-if (OS_IOS || OS_MOBILEWEB) {
+if (OS_IOS) {
 	common.prepNavBar($.window, addItem);
 }
 
diff --git a/samples/apps/models/binding_tableview/controllers/tab_4.js b/samples/apps/models/binding_tableview/controllers/tab_4.js
index eab022e53..24e0da6ef 100644
--- a/samples/apps/models/binding_tableview/controllers/tab_4.js
+++ b/samples/apps/models/binding_tableview/controllers/tab_4.js
@@ -14,7 +14,7 @@ function removeItem(e) {
 	common.removeItem(myModels, e.index);
 }
 
-if (OS_IOS || OS_MOBILEWEB) {
+if (OS_IOS) {
 	common.prepNavBar($.window, addItem);
 }
 
diff --git a/samples/apps/models/journal/views/index.xml b/samples/apps/models/journal/views/index.xml
index 588dee24e..3d4f1792d 100644
--- a/samples/apps/models/journal/views/index.xml
+++ b/samples/apps/models/journal/views/index.xml
@@ -1,5 +1,5 @@
 <Alloy>
 	<Window>
-		<Label>This app is only supported on Android, iOS, and Mobileweb</Label>
+		<Label>This app is only supported on Android and iOS</Label>
 	</Window>
 </Alloy>
\ No newline at end of file
diff --git a/samples/apps/ui/buttonbar/views/index.xml b/samples/apps/ui/buttonbar/views/index.xml
index 8b66279d0..0760e75df 100644
--- a/samples/apps/ui/buttonbar/views/index.xml
+++ b/samples/apps/ui/buttonbar/views/index.xml
@@ -23,6 +23,6 @@
 			 -->
 			<!-- <View opacity="0.25" backgroundColor="#a00" width="50%"/> -->
 		</ButtonBar>
-		<Label platform="android,mobileweb">Ti.UI.ButtonBar only supported on iOS</Label>
+		<Label platform="android">Ti.UI.ButtonBar only supported on iOS</Label>
 	</Window>
 </Alloy>
diff --git a/samples/apps/ui/map/README.md b/samples/apps/ui/map/README.md
index 75054fb3d..e15ffd449 100755
--- a/samples/apps/ui/map/README.md
+++ b/samples/apps/ui/map/README.md
@@ -3,12 +3,12 @@ Maps
 
 The built-in maps module has been replaced by the Ti.Maps add-on module. This extension module is provided with the rest of the Titanium APIs, but not included in projects by default. Typically, you must add this module in your tiapp.xml. However, Alloy makes this easy ... if you use the `<Module>` tag.
 
-In this example, we're going to show how we can use maps on iOS, Android, and MobileWeb.
+In this example, we're going to show how we can use maps on iOS and Android.
 
-You will need a reference to the Ti.Map object (the module or built-in object) throughout your app. The best way to do this is with the alloy.js file. In it, we'll add this line:
+You will need a reference to the Ti.Map object throughout your app. The best way to do this is with the alloy.js file. In it, we'll add this line:
 
 ```
-Alloy.Globals.Map = (OS_IOS || OS_ANDROID) ? require('ti.map') : Ti.Map;
+Alloy.Globals.Map = require('ti.map');
 ```
 
 That creates a reference to either the external module, or the built-in object, depending on your platform. Next, you will add the appropriate markup
@@ -16,7 +16,6 @@ That creates a reference to either the external module, or the built-in object,
 
 ```xml
 <Module id="map" module="ti.map" method="createView" platform="ios,android"/>
-<View ns="Ti.Map" id="map" platform="mobileweb/>
 ```
 
 If you look to the index.xml file, you'll see how we're defining annotations with the `<Annotation>` tag. Map and annotation attributes can be specified in the view, style sheet, or controller.
diff --git a/samples/apps/ui/map/views/index.xml b/samples/apps/ui/map/views/index.xml
index c2773a3ec..8b7fdc19d 100755
--- a/samples/apps/ui/map/views/index.xml
+++ b/samples/apps/ui/map/views/index.xml
@@ -1,6 +1,6 @@
 <Alloy>
 	<Window class='container'>
-    	<Module id="map" module="ti.map" method="createView" platform="ios,android">
+    <Module id="map" module="ti.map" method="createView" platform="ios,android">
 			<!-- annotation styled via tss file -->
 			<Annotation id="annotation1"/>
 
@@ -21,14 +21,5 @@
 			-->
 			<Require src="overlay" platform="ios"/>
 		</Module>
-    	<View id="map" ns="Ti.Map" method="createView" platform="mobileweb">
-    		<!--
-    			Mobileweb doesn't support the Ti.Map add-on module but uses the
-    			built-in Ti.Map object. For this, we need to add the ns="Ti.Map" attribute
-    		-->
-			<Annotation id="annotation1"/>
-			<Annotation title="Palo Alto" latitude="37.47" longitude="-122.12"/>
-			<Require src="annotationView" title="Sunnyvale" latitude="37.37" longitude="-122.03"/>
-		</View>
 	</Window>
 </Alloy>
diff --git a/samples/apps/ui/switch/views/index.xml b/samples/apps/ui/switch/views/index.xml
index 89ba6f731..adc2ca97f 100644
--- a/samples/apps/ui/switch/views/index.xml
+++ b/samples/apps/ui/switch/views/index.xml
@@ -4,7 +4,7 @@
 		<Switch/>
 
 		<!-- switch with some platform-specific styling -->
-		<Switch class="titles" platform="android,mobileweb"/>
+		<Switch class="titles" platform="android"/>
 
 		<!-- an android checkbox -->
 		<Switch class="checkbox" platform="android"/>
diff --git a/samples/apps/widgets/basic/widgets/com.foo.widget/widget.json b/samples/apps/widgets/basic/widgets/com.foo.widget/widget.json
index eb96acdb5..be278d91f 100755
--- a/samples/apps/widgets/basic/widgets/com.foo.widget/widget.json
+++ b/samples/apps/widgets/basic/widgets/com.foo.widget/widget.json
@@ -9,6 +9,6 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"2.1",
 	"tags":"",
-	"platforms":"android,ios,mobileweb,windows",
+	"platforms":"android,ios,windows",
 	"dependencies": {}
 }
\ No newline at end of file
diff --git a/samples/apps/widgets/complex/README.md b/samples/apps/widgets/complex/README.md
index 1d6ea19eb..eaf8cee37 100755
--- a/samples/apps/widgets/complex/README.md
+++ b/samples/apps/widgets/complex/README.md
@@ -1,8 +1,3 @@
 ## widget_complex
 
 This app is an example of a widget that makes use of another existing widget. It demonstrates how more complex UI components can be created from the smaller building-block widgets. In this case, we'll be using a animated loading widget to indicate activity in a new Google Book API search widget.
-
-## Known Issues
-
-* Mobileweb: Search field won't focus in desktop Google Chrome browser: [https://jira.appcelerator.org/browse/TIMOB-9717](https://jira.appcelerator.org/browse/TIMOB-9717)
-* Mobileweb: Search field doesn't stretch properly in Firefox: [https://jira.appcelerator.org/browse/TIMOB-8807](https://jira.appcelerator.org/browse/TIMOB-8807)
\ No newline at end of file
diff --git a/samples/apps/widgets/complex/widgets/com.appcelerator.loading/controllers/widget.js b/samples/apps/widgets/complex/widgets/com.appcelerator.loading/controllers/widget.js
index 8468d8a98..c1e2ce1b6 100755
--- a/samples/apps/widgets/complex/widgets/com.appcelerator.loading/controllers/widget.js
+++ b/samples/apps/widgets/complex/widgets/com.appcelerator.loading/controllers/widget.js
@@ -4,9 +4,6 @@ for (var k in args) {
 	$.loading[k] = args[k];
 }
 
-if (Ti.Platform.osname === 'mobileweb') {
-	$.loading.duration = 100;
-}
 $.loading.start();
 
 exports.setOpacity = function(opacity) {
diff --git a/samples/apps/widgets/complex/widgets/com.appcelerator.loading/widget.json b/samples/apps/widgets/complex/widgets/com.appcelerator.loading/widget.json
index 8b9debe9f..4aa876dfb 100755
--- a/samples/apps/widgets/complex/widgets/com.appcelerator.loading/widget.json
+++ b/samples/apps/widgets/complex/widgets/com.appcelerator.loading/widget.json
@@ -9,6 +9,6 @@
 	"min-alloy-version": "0.1.16",
 	"min-titanium-version":"2.0",
 	"tags":"utility,loading,progress",
-	"platforms":"android,ios,mobileweb,windows",
+	"platforms":"android,ios,windows",
 	"dependencies": {}
 }
\ No newline at end of file
diff --git a/samples/apps/widgets/complex/widgets/com.testing.searchForBooks/widget.json b/samples/apps/widgets/complex/widgets/com.testing.searchForBooks/widget.json
index b828a62a4..e39dec8bc 100755
--- a/samples/apps/widgets/complex/widgets/com.testing.searchForBooks/widget.json
+++ b/samples/apps/widgets/complex/widgets/com.testing.searchForBooks/widget.json
@@ -9,7 +9,7 @@
 	"min-alloy-version": "0.1.16",
 	"min-titanium-version":"2.0",
 	"tags":"utility,google,search",
-	"platforms":"android,ios,mobileweb,windows",
+	"platforms":"android,ios,windows",
 	"dependencies": {
 		"com.appcelerator.loading":"1.0"
 
diff --git a/samples/apps/widgets/models/widgets/alloy.datatable/widget.json b/samples/apps/widgets/models/widgets/alloy.datatable/widget.json
index e9f768485..de60d1280 100755
--- a/samples/apps/widgets/models/widgets/alloy.datatable/widget.json
+++ b/samples/apps/widgets/models/widgets/alloy.datatable/widget.json
@@ -9,6 +9,6 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"3.0",
 	"tags":"",
-	"platforms":"android,ios,mobileweb,windows",
+	"platforms":"android,ios,windows",
 	"dependencies": {}
 }
\ No newline at end of file
diff --git a/samples/apps/widgets/wpath/widgets/com.test.hellobutton/widget.json b/samples/apps/widgets/wpath/widgets/com.test.hellobutton/widget.json
index df5f59564..9692fe856 100644
--- a/samples/apps/widgets/wpath/widgets/com.test.hellobutton/widget.json
+++ b/samples/apps/widgets/wpath/widgets/com.test.hellobutton/widget.json
@@ -9,6 +9,6 @@
 	"min-alloy-version": "0.2.35",
 	"min-titanium-version":"2.1",
 	"tags":"",
-	"platforms":"android,ios,mobileweb,windows",
+	"platforms":"android,ios,windows",
 	"dependencies": {}
 }
\ No newline at end of file
diff --git a/samples/lib/testUtils.js b/samples/lib/testUtils.js
index c2c022dc8..141d2a037 100644
--- a/samples/lib/testUtils.js
+++ b/samples/lib/testUtils.js
@@ -3,9 +3,10 @@ var exec = require('child_process').exec,
 	os = require('os'),
 	path = require('path'),
 	_ = require('../../Alloy/lib/alloy/underscore')._,
-	babylon = require('@babel/parser'),
-	U = require('../../Alloy/utils'),
-	styler = require('../../Alloy/commands/compile/styler');
+	babylon = require('@babel/parser');
+
+const styler = require('alloy-compiler/lib/styler');
+const { utils: U } = require('alloy-utils');
 
 var alloyRoot = path.join(__dirname, '..', '..');
 var IS_WIN = /^win/i.test(os.platform());
diff --git a/test/apps/testing/ALOY-1000/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1000/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 65304981e..000000000
--- a/test/apps/testing/ALOY-1000/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,106 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick() {
-        model.set("title", "Atlas Shrugged");
-        model.set("author", "Ayn Rand");
-        model.set("genre", "Dystopia");
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    Alloy.Models.instance("book");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.theButton = Ti.UI.createButton({
-        top: 20,
-        title: "Click Me",
-        id: "theButton"
-    });
-    $.__views.index.add($.__views.theButton);
-    doClick ? $.__views.theButton.addEventListener("click", doClick) : __defers["$.__views.theButton!click!doClick"] = true;
-    $.__views.theView = Ti.UI.createView({
-        layout: "vertical",
-        id: "theView"
-    });
-    $.__views.index.add($.__views.theView);
-    $.__views.title = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        top: 10,
-        id: "title"
-    });
-    $.__views.theView.add($.__views.title);
-    doClick ? $.__views.title.addEventListener("click", doClick) : __defers["$.__views.title!click!doClick"] = true;
-    $.__views.author = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        top: 10,
-        id: "author"
-    });
-    $.__views.theView.add($.__views.author);
-    doClick ? $.__views.author.addEventListener("click", doClick) : __defers["$.__views.author!click!doClick"] = true;
-    $.__views.genre = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        top: 10,
-        id: "genre"
-    });
-    $.__views.theView.add($.__views.genre);
-    doClick ? $.__views.genre.addEventListener("click", doClick) : __defers["$.__views.genre!click!doClick"] = true;
-    var __alloyId2 = function() {
-        $.title.text = _.isFunction(Alloy.Models.book.transform) ? Alloy.Models.book.transform()["title"] : _.template("<%=book.title%>", {
-            book: Alloy.Models.book.toJSON()
-        });
-        $.author.text = _.isFunction(Alloy.Models.book.transform) ? Alloy.Models.book.transform()["author"] : _.template("<%=book.author%>", {
-            book: Alloy.Models.book.toJSON()
-        });
-        $.genre.text = _.isFunction(Alloy.Models.book.transform) ? Alloy.Models.book.transform()["genre"] : _.template("<%=book.genre%>", {
-            book: Alloy.Models.book.toJSON()
-        });
-    };
-    Alloy.Models.book.on("fetch change destroy", __alloyId2);
-    exports.destroy = function() {
-        Alloy.Models.book.off("fetch change destroy", __alloyId2);
-    };
-    _.extend($, $.__views);
-    var model = Alloy.Models.book;
-    $.index.open();
-    __defers["$.__views.theButton!click!doClick"] && $.__views.theButton.addEventListener("click", doClick);
-    __defers["$.__views.title!click!doClick"] && $.__views.title.addEventListener("click", doClick);
-    __defers["$.__views.author!click!doClick"] && $.__views.author.addEventListener("click", doClick);
-    __defers["$.__views.genre!click!doClick"] && $.__views.genre.addEventListener("click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1000/_generated/blackberry/alloy/models/Book.js b/test/apps/testing/ALOY-1000/_generated/blackberry/alloy/models/Book.js
deleted file mode 100644
index e2d14d0c7..000000000
--- a/test/apps/testing/ALOY-1000/_generated/blackberry/alloy/models/Book.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            title: "text",
-            author: "text",
-            genre: "text"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "book"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("book", exports.definition, []);
-
-collection = Alloy.C("book", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1000/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1000/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 56c064cc8..000000000
--- a/test/apps/testing/ALOY-1000/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,95 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick(e) {
-        model.set("title", "Atlas Shrugged");
-        model.set("author", "Ayn Rand");
-        model.set("genre", "Dystopia");
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    Alloy.Models.instance("book");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.theButton = Ti.UI.createButton({
-        top: 20,
-        title: "Click Me",
-        id: "theButton"
-    });
-    $.__views.index.add($.__views.theButton);
-    doClick ? $.addListener($.__views.theButton, "click", doClick) : __defers["$.__views.theButton!click!doClick"] = true;
-    $.__views.theView = Ti.UI.createView({
-        layout: "vertical",
-        id: "theView"
-    });
-    $.__views.index.add($.__views.theView);
-    $.__views.title = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        top: 10,
-        id: "title"
-    });
-    $.__views.theView.add($.__views.title);
-    doClick ? $.addListener($.__views.title, "click", doClick) : __defers["$.__views.title!click!doClick"] = true;
-    $.__views.author = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        top: 10,
-        id: "author"
-    });
-    $.__views.theView.add($.__views.author);
-    doClick ? $.addListener($.__views.author, "click", doClick) : __defers["$.__views.author!click!doClick"] = true;
-    $.__views.genre = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        top: 10,
-        id: "genre"
-    });
-    $.__views.theView.add($.__views.genre);
-    doClick ? $.addListener($.__views.genre, "click", doClick) : __defers["$.__views.genre!click!doClick"] = true;
-    var __alloyId2 = function() {
-        Alloy["Models"]["book"].__transform = _.isFunction(Alloy["Models"]["book"].transform) ? Alloy["Models"]["book"].transform() : Alloy["Models"]["book"].toJSON();
-        $.title.text = Alloy["Models"]["book"]["__transform"]["title"];
-        $.author.text = Alloy["Models"]["book"]["__transform"]["author"];
-        $.genre.text = Alloy["Models"]["book"]["__transform"]["genre"];
-    };
-    Alloy["Models"]["book"].on("fetch change destroy", __alloyId2);
-    exports.destroy = function() {
-        Alloy["Models"]["book"] && Alloy["Models"]["book"].off("fetch change destroy", __alloyId2);
-    };
-    _.extend($, $.__views);
-    var model = Alloy.Models.book;
-    $.index.open();
-    __defers["$.__views.theButton!click!doClick"] && $.addListener($.__views.theButton, "click", doClick);
-    __defers["$.__views.title!click!doClick"] && $.addListener($.__views.title, "click", doClick);
-    __defers["$.__views.author!click!doClick"] && $.addListener($.__views.author, "click", doClick);
-    __defers["$.__views.genre!click!doClick"] && $.addListener($.__views.genre, "click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1000/_generated/mobileweb/alloy/models/Book.js b/test/apps/testing/ALOY-1000/_generated/mobileweb/alloy/models/Book.js
deleted file mode 100644
index ca4c78a8e..000000000
--- a/test/apps/testing/ALOY-1000/_generated/mobileweb/alloy/models/Book.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            title: "text",
-            author: "text",
-            genre: "text"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "book"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("book", exports.definition, []);
-
-collection = Alloy.C("book", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 0d9db8802..000000000
--- a/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,64 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doFoo(num) {
-        alert("Your rating = " + num);
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index",
-        title: "Books"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.starwidget = Alloy.createWidget("starrating", "widget", {
-        id: "starwidget",
-        max: "5",
-        initialRating: "2.5",
-        top: "20",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.starwidget.setParent($.__views.index);
-    $.__views.table = Ti.UI.createTableView({
-        id: "table",
-        top: "50"
-    });
-    $.__views.index.add($.__views.table);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var rows = [];
-    var titles = [ "Lord of the Rings", "Harry Potter", "Eragon", "Wheel of Time", "Narnia" ];
-    for (var i = 0, j = titles.length; j > i; i++) rows.push(Alloy.createController("row", {
-        title: titles[i]
-    }).getView());
-    $.table.data = rows;
-    $.starwidget.init(doFoo);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/controllers/row.js b/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/controllers/row.js
deleted file mode 100644
index a69bd4dbe..000000000
--- a/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/controllers/row.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "row";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.row = Ti.UI.createTableViewRow({
-        color: "blue",
-        height: "50dp",
-        id: "row"
-    });
-    $.__views.row && $.addTopLevelView($.__views.row);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    $.row.title = args.title;
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/widgets/starrating/controllers/star.js b/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/widgets/starrating/controllers/star.js
deleted file mode 100644
index 9e1715ecd..000000000
--- a/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/widgets/starrating/controllers/star.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "star";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.star = Ti.UI.createImageView({
-        height: "32dp",
-        width: "10dp",
-        left: "8dp",
-        id: "star"
-    });
-    $.__views.star && $.addTopLevelView($.__views.star);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/widgets/starrating/controllers/widget.js b/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/widgets/starrating/controllers/widget.js
deleted file mode 100644
index 4dd528eaa..000000000
--- a/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/widgets/starrating/controllers/widget.js
+++ /dev/null
@@ -1,73 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.starrating = Ti.UI.createView({
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent",
-        id: "starrating"
-    });
-    $.__views.starrating && $.addTopLevelView($.__views.starrating);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {}, stars = [], rating = 0, max = 5;
-    var setRating = function(newRating) {
-        newRating > max && (newRating = max);
-        rating = newRating;
-        for (var i = 0, l = stars.length; l > i; i++) stars[i].image = WPATH(i >= rating ? "star_off.png" : rating > i && i + 1 > rating ? "star_half.png" : "star.png");
-    };
-    exports.setRating = setRating;
-    exports.getRating = function() {
-        return rating;
-    };
-    var createStars = function(num, cb) {
-        for (var i = 0; num > i; i++) {
-            var star = Alloy.createWidget("starrating", "star").getView();
-            !function() {
-                var index = i;
-                star.addEventListener("click", function() {
-                    setRating(index + 1);
-                    cb(index + 1);
-                });
-            }();
-            stars.push(star);
-            $.starrating.add(star);
-        }
-    };
-    exports.init = function(callback) {
-        var max = args.max || 5, initialRating = args.initialRating || 0, cb = callback || function() {};
-        createStars(max, cb);
-        setRating(initialRating);
-        _.extend($.starrating, args);
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/widgets/starrating/styles/star.js b/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/widgets/starrating/styles/star.js
deleted file mode 100644
index 10e857062..000000000
--- a/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/widgets/starrating/styles/star.js
+++ /dev/null
@@ -1,40 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "TableViewRow",
-    style: {
-        color: "black",
-        height: "50dp"
-    }
-}, {
-    isApi: true,
-    priority: 1000.9001999999999,
-    key: "TableViewRow",
-    style: {
-        color: "blue"
-    }
-}, {
-    isClass: true,
-    priority: 10000.0002,
-    key: "star",
-    style: {
-        height: "24dp",
-        width: "24dp",
-        left: "5dp"
-    }
-}, {
-    isClass: true,
-    priority: 10000.9003,
-    key: "star",
-    style: {
-        height: "32dp",
-        width: "10dp",
-        left: "8dp"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/widgets/starrating/styles/widget.js b/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/widgets/starrating/styles/widget.js
deleted file mode 100644
index 8538464e4..000000000
--- a/test/apps/testing/ALOY-1002/_generated/blackberry/alloy/widgets/starrating/styles/widget.js
+++ /dev/null
@@ -1,31 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "TableViewRow",
-    style: {
-        color: "black",
-        height: "50dp"
-    }
-}, {
-    isApi: true,
-    priority: 1000.9001999999999,
-    key: "TableViewRow",
-    style: {
-        color: "blue"
-    }
-}, {
-    isId: true,
-    priority: 100000.0004,
-    key: "starrating",
-    style: {
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 9f7df7337..000000000
--- a/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,58 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doFoo(num) {
-        alert("Your rating = " + num);
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index",
-        title: "Books"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.starwidget = Alloy.createWidget("starrating", "widget", {
-        id: "starwidget",
-        max: 5,
-        initialRating: 2.5,
-        top: 20,
-        __parentSymbol: $.__views.index
-    });
-    $.__views.starwidget.setParent($.__views.index);
-    $.__views.table = Ti.UI.createTableView({
-        id: "table",
-        top: 50
-    });
-    $.__views.index.add($.__views.table);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var rows = [];
-    var titles = [ "Lord of the Rings", "Harry Potter", "Eragon", "Wheel of Time", "Narnia" ];
-    for (var i = 0, j = titles.length; j > i; i++) rows.push(Alloy.createController("row", {
-        title: titles[i]
-    }).getView());
-    $.table.data = rows;
-    $.starwidget.init(doFoo);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/controllers/row.js b/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/controllers/row.js
deleted file mode 100644
index 1304b078a..000000000
--- a/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/controllers/row.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "row";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.row = Ti.UI.createTableViewRow({
-        color: "blue",
-        height: "50dp",
-        id: "row"
-    });
-    $.__views.row && $.addTopLevelView($.__views.row);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    $.row.title = args.title;
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/widgets/starrating/controllers/star.js b/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/widgets/starrating/controllers/star.js
deleted file mode 100644
index 671dea1b3..000000000
--- a/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/widgets/starrating/controllers/star.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "star";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.star = Ti.UI.createImageView({
-        height: "32dp",
-        width: "10dp",
-        left: "8dp",
-        id: "star"
-    });
-    $.__views.star && $.addTopLevelView($.__views.star);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/widgets/starrating/controllers/widget.js b/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/widgets/starrating/controllers/widget.js
deleted file mode 100644
index cb1bc629d..000000000
--- a/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/widgets/starrating/controllers/widget.js
+++ /dev/null
@@ -1,73 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.starrating = Ti.UI.createView({
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent",
-        id: "starrating"
-    });
-    $.__views.starrating && $.addTopLevelView($.__views.starrating);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {}, stars = [], rating = 0, max = 5;
-    var setRating = function(newRating) {
-        newRating > max && (newRating = max);
-        rating = newRating;
-        for (var i = 0, l = stars.length; l > i; i++) i >= rating ? stars[i].image = WPATH("star_off.png") : rating > i && i + 1 > rating ? stars[i].image = WPATH("star_half.png") : stars[i].image = WPATH("star.png");
-    };
-    exports.setRating = setRating;
-    exports.getRating = function() {
-        return rating;
-    };
-    var createStars = function(num, cb) {
-        for (var i = 0; num > i; i++) {
-            var star = Alloy.createWidget("starrating", "star").getView();
-            !function() {
-                var index = i;
-                star.addEventListener("click", function() {
-                    setRating(index + 1);
-                    cb(index + 1);
-                });
-            }();
-            stars.push(star);
-            $.starrating.add(star);
-        }
-    };
-    exports.init = function(callback) {
-        var max = args.max || 5, initialRating = args.initialRating || 0, cb = callback || function() {};
-        createStars(max, cb);
-        setRating(initialRating);
-        _.extend($.starrating, args);
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/widgets/starrating/styles/star.js b/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/widgets/starrating/styles/star.js
deleted file mode 100644
index fa23ea02c..000000000
--- a/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/widgets/starrating/styles/star.js
+++ /dev/null
@@ -1,40 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "TableViewRow",
-    style: {
-        color: "black",
-        height: "50dp"
-    }
-}, {
-    isApi: true,
-    priority: 1000.9001999999999,
-    key: "TableViewRow",
-    style: {
-        color: "blue"
-    }
-}, {
-    isClass: true,
-    priority: 10000.0003,
-    key: "star",
-    style: {
-        height: "24dp",
-        width: "24dp",
-        left: "5dp"
-    }
-}, {
-    isClass: true,
-    priority: 10000.9004,
-    key: "star",
-    style: {
-        height: "32dp",
-        width: "10dp",
-        left: "8dp"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/widgets/starrating/styles/widget.js b/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/widgets/starrating/styles/widget.js
deleted file mode 100644
index 377153ee8..000000000
--- a/test/apps/testing/ALOY-1002/_generated/mobileweb/alloy/widgets/starrating/styles/widget.js
+++ /dev/null
@@ -1,31 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "TableViewRow",
-    style: {
-        color: "black",
-        height: "50dp"
-    }
-}, {
-    isApi: true,
-    priority: 1000.9001999999999,
-    key: "TableViewRow",
-    style: {
-        color: "blue"
-    }
-}, {
-    isId: true,
-    priority: 100000.0005,
-    key: "starrating",
-    style: {
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1002/widgets/starrating/widget.json b/test/apps/testing/ALOY-1002/widgets/starrating/widget.json
index 2da1e2583..4a8fd06ee 100644
--- a/test/apps/testing/ALOY-1002/widgets/starrating/widget.json
+++ b/test/apps/testing/ALOY-1002/widgets/starrating/widget.json
@@ -9,5 +9,5 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"3.0",
 	"tags":"",
-	"platforms":"android,ios,mobileweb"
+	"platforms":"android,ios"
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1004/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1004/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index ce061808e..000000000
--- a/test/apps/testing/ALOY-1004/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,144 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        layout: "vertical",
-        backgroundColor: "white",
-        top: 20,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.title1 = Ti.UI.createLabel(function() {
-        var o = {};
-        _.extend(o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && _.extend(o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        _.extend(o, {
-            color: "blue"
-        });
-        Alloy.Globals.someProperty && _.extend(o, {
-            text: "Overriding platform with custom TSS"
-        });
-        _.extend(o, {
-            id: "title1"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title1);
-    $.__views.title2 = Ti.UI.createLabel(function() {
-        var o = {};
-        _.extend(o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && _.extend(o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        _.extend(o, {
-            color: "blue",
-            id: "title2"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title2);
-    $.__views.title3 = Ti.UI.createLabel(function() {
-        var o = {};
-        _.extend(o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && _.extend(o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        _.extend(o, {
-            color: "blue",
-            text: "You should see this for label 3",
-            id: "title3"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title3);
-    $.__views.title4 = Ti.UI.createLabel(function() {
-        var o = {};
-        _.extend(o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && _.extend(o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        _.extend(o, {
-            id: "title4"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title4);
-    if (Alloy.Globals.someProperty) {
-        $.__views.title5 = Ti.UI.createLabel(function() {
-            var o = {};
-            _.extend(o, {
-                top: 10,
-                text: "Default label text",
-                font: {
-                    fontSize: "14dp"
-                }
-            });
-            Alloy.Globals.someProperty && _.extend(o, {
-                text: "Custom TSS: Alloy.Globals.someProperty==true"
-            });
-            _.extend(o, {
-                color: "blue",
-                id: "title5"
-            });
-            return o;
-        }());
-        $.__views.index.add($.__views.title5);
-    }
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1004/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1004/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 55b696b36..000000000
--- a/test/apps/testing/ALOY-1004/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,138 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        layout: "vertical",
-        backgroundColor: "white",
-        top: 20,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.title1 = Ti.UI.createLabel(function() {
-        var o = {};
-        Alloy.deepExtend(true, o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && Alloy.deepExtend(true, o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        Alloy.deepExtend(true, o, {
-            color: "blue"
-        });
-        Alloy.Globals.someProperty && Alloy.deepExtend(true, o, {
-            text: "Overriding platform with custom TSS"
-        });
-        Alloy.deepExtend(true, o, {
-            id: "title1"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title1);
-    $.__views.title2 = Ti.UI.createLabel(function() {
-        var o = {};
-        Alloy.deepExtend(true, o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && Alloy.deepExtend(true, o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        Alloy.deepExtend(true, o, {
-            color: "blue",
-            id: "title2"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title2);
-    $.__views.title3 = Ti.UI.createLabel(function() {
-        var o = {};
-        Alloy.deepExtend(true, o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && Alloy.deepExtend(true, o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        Alloy.deepExtend(true, o, {
-            color: "blue",
-            text: "You should see this for label 3",
-            id: "title3"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title3);
-    $.__views.title4 = Ti.UI.createLabel(function() {
-        var o = {};
-        Alloy.deepExtend(true, o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && Alloy.deepExtend(true, o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        Alloy.deepExtend(true, o, {
-            id: "title4"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title4);
-    if (Alloy.Globals.someProperty) {
-        $.__views.title5 = Ti.UI.createLabel(function() {
-            var o = {};
-            Alloy.deepExtend(true, o, {
-                top: 10,
-                text: "Default label text",
-                font: {
-                    fontSize: "14dp"
-                }
-            });
-            Alloy.Globals.someProperty && Alloy.deepExtend(true, o, {
-                text: "Custom TSS: Alloy.Globals.someProperty==true"
-            });
-            Alloy.deepExtend(true, o, {
-                color: "blue",
-                id: "title5"
-            });
-            return o;
-        }());
-        $.__views.index.add($.__views.title5);
-    }
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1005/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1005/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 2e52c7684..000000000
--- a/test/apps/testing/ALOY-1005/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1005/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1005/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 93f85e200..000000000
--- a/test/apps/testing/ALOY-1005/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1009/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1009/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index f69a3466f..000000000
--- a/test/apps/testing/ALOY-1009/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        touchEnabled: false,
-        text: "Click to show OptionDialog",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    var __alloyId2 = [];
-    __alloyId2.push(L("hello_world"));
-    __alloyId2.push(Ti.Locale.getString("hello_world"));
-    __alloyId2.push(Titanium.Locale.getString("hello_world"));
-    __alloyId2.push("Hello, World!");
-    $.__views.options = Ti.UI.createOptionDialog({
-        options: __alloyId2,
-        id: "options"
-    });
-    $.__views.options && $.addTopLevelView($.__views.options);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.addEventListener("click", function() {
-        $.options.show();
-    });
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1009/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1009/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 243e4e749..000000000
--- a/test/apps/testing/ALOY-1009/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        touchEnabled: false,
-        text: "Click to show OptionDialog",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    var __alloyId2 = [];
-    __alloyId2.push(L("hello_world"));
-    __alloyId2.push(Ti.Locale.getString("hello_world"));
-    __alloyId2.push(Titanium.Locale.getString("hello_world"));
-    __alloyId2.push("Hello, World!");
-    $.__views.options = Ti.UI.createOptionDialog({
-        options: __alloyId2,
-        id: "options"
-    });
-    $.__views.options && $.addTopLevelView($.__views.options);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.addEventListener("click", function() {
-        $.options.show();
-    });
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1011/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1011/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index a7b4bbea2..000000000
--- a/test/apps/testing/ALOY-1011/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,58 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        title: "ALOY-991",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.bottomview = Ti.UI.createView({
-        bottom: 10,
-        height: 200,
-        backgroundColor: "orange",
-        id: "bottomview"
-    });
-    $.__views.index.add($.__views.bottomview);
-    $.__views.viewlabel = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#fff",
-        font: {
-            fontSize: "20dp"
-        },
-        text: "Not an Android!",
-        id: "viewlabel"
-    });
-    $.__views.bottomview.add($.__views.viewlabel);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1011/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1011/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 907f39dc5..000000000
--- a/test/apps/testing/ALOY-1011/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,52 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        title: "ALOY-991",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.bottomview = Ti.UI.createView({
-        bottom: 10,
-        height: 200,
-        backgroundColor: "orange",
-        id: "bottomview"
-    });
-    $.__views.index.add($.__views.bottomview);
-    $.__views.viewlabel = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#fff",
-        font: {
-            fontSize: "20dp"
-        },
-        text: "Not an Android!",
-        id: "viewlabel"
-    });
-    $.__views.bottomview.add($.__views.viewlabel);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1018/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1018/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 2b7ae08e3..000000000
--- a/test/apps/testing/ALOY-1018/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = (require("testmod").createWindow || Ti.UI.createWindow)({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = (require("testmod").createCustomButton || Ti.UI.createCustomButton)({
-        top: "100",
-        title: "I am a CustomButton",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = (require("testmod").createCustomLabel || Ti.UI.createCustomLabel)({
-        bottom: "100",
-        text: "I am a CustomLabel",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1018/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1018/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 3871a0668..000000000
--- a/test/apps/testing/ALOY-1018/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = (require("testmod").createWindow || Ti.UI.createWindow)({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = (require("testmod").createCustomButton || Ti.UI.createCustomButton)({
-        top: 100,
-        title: "I am a CustomButton",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = (require("testmod").createCustomLabel || Ti.UI.createCustomLabel)({
-        bottom: 100,
-        text: "I am a CustomLabel",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1028/_generated/android/alloy/controllers/index.js b/test/apps/testing/ALOY-1028/_generated/android/alloy/controllers/index.js
index d4f262405..ea6d4156f 100644
--- a/test/apps/testing/ALOY-1028/_generated/android/alloy/controllers/index.js
+++ b/test/apps/testing/ALOY-1028/_generated/android/alloy/controllers/index.js
@@ -40,7 +40,7 @@ function Controller() {
         },
         color: "black",
         id: "row2",
-        title: "Row 2 - Android and Mobileweb"
+        title: "Row 2 - Android"
     });
     __alloyId0.push($.__views.row2);
     $.__views.container = Ti.UI.createTableView({
diff --git a/test/apps/testing/ALOY-1028/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1028/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index b17ba356a..000000000
--- a/test/apps/testing/ALOY-1028/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,46 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.container = Ti.UI.createTableView({
-        id: "container",
-        top: "30"
-    });
-    $.__views.index.add($.__views.container);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1028/_generated/ios/alloy/controllers/index.js b/test/apps/testing/ALOY-1028/_generated/ios/alloy/controllers/index.js
index 665477c9d..3a1bbfefe 100644
--- a/test/apps/testing/ALOY-1028/_generated/ios/alloy/controllers/index.js
+++ b/test/apps/testing/ALOY-1028/_generated/ios/alloy/controllers/index.js
@@ -40,7 +40,7 @@ function Controller() {
         },
         color: "black",
         id: "row1",
-        title: "Row 3 - Mobileweb and iOS"
+        title: "Row 3 - iOS"
     });
     __alloyId0.push($.__views.row1);
     $.__views.container = Ti.UI.createTableView({
diff --git a/test/apps/testing/ALOY-1028/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1028/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index a316a3f74..000000000
--- a/test/apps/testing/ALOY-1028/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,60 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId0 = [];
-    $.__views.row2 = Ti.UI.createTableViewRow({
-        font: {
-            fontSize: "16dp"
-        },
-        color: "black",
-        id: "row2",
-        title: "Row 2 - Android and Mobileweb"
-    });
-    __alloyId0.push($.__views.row2);
-    $.__views.row1 = Ti.UI.createTableViewRow({
-        font: {
-            fontSize: "16dp"
-        },
-        color: "black",
-        id: "row1",
-        title: "Row 3 - Mobileweb and iOS"
-    });
-    __alloyId0.push($.__views.row1);
-    $.__views.container = Ti.UI.createTableView({
-        data: __alloyId0,
-        id: "container",
-        top: 30
-    });
-    $.__views.index.add($.__views.container);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1028/views/index.xml b/test/apps/testing/ALOY-1028/views/index.xml
index 23bd50153..9c0e690fb 100644
--- a/test/apps/testing/ALOY-1028/views/index.xml
+++ b/test/apps/testing/ALOY-1028/views/index.xml
@@ -2,8 +2,8 @@
     <Window backgroundColor="white" layout="vertical">
     <TableView id="container" top="30">
             <TableViewRow id="row1" title="Row 1 - iOS and Android" platform="ios,android"/>
-            <TableViewRow id="row2" title="Row 2 - Android and Mobileweb" platform="android,mobileweb"/>
-            <TableViewRow id="row1" title="Row 3 - Mobileweb and iOS" platform="mobileweb,ios"/>
+            <TableViewRow id="row2" title="Row 2 - Android" platform="android"/>
+            <TableViewRow id="row1" title="Row 3 - iOS" platform="ios"/>
     </TableView>
-    </Window>     
+    </Window>
 </Alloy>
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1033/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1033/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 03ccbe46f..000000000
--- a/test/apps/testing/ALOY-1033/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,117 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId12(e) {
-        if (e && e.fromAdapter) return;
-        var opts = __alloyId12.opts || {};
-        var models = __alloyId11.models;
-        var len = models.length;
-        var __alloyId7 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId8 = models[i];
-            __alloyId8.__transform = {};
-            var __alloyId10 = {
-                template: "template",
-                title: {
-                    text: "undefined" != typeof __alloyId8.__transform["title"] ? __alloyId8.__transform["title"] : __alloyId8.get("title")
-                },
-                properties: {
-                    searchableText: "undefined" != typeof __alloyId8.__transform["title"] ? __alloyId8.__transform["title"] : __alloyId8.get("title")
-                }
-            };
-            __alloyId7.push(__alloyId10);
-        }
-        opts.animation ? $.__views.main.setItems(__alloyId7, opts.animation) : $.__views.main.setItems(__alloyId7);
-    }
-    function randomString(length) {
-        length = length || 8;
-        var result = "";
-        for (var i = length; i > 0; --i) result += chars[Math.round(Math.random() * (chars.length - 1))];
-        return result;
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    Alloy.Collections.instance("rows");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId2 = {};
-    var __alloyId5 = [];
-    var __alloyId6 = {
-        type: "Ti.UI.Label",
-        bindId: "title",
-        properties: {
-            width: Ti.UI.SIZE,
-            height: Ti.UI.SIZE,
-            color: "#000",
-            bindId: "title",
-            left: "5"
-        }
-    };
-    __alloyId5.push(__alloyId6);
-    var __alloyId4 = {
-        properties: {
-            name: "template"
-        },
-        childTemplates: __alloyId5
-    };
-    __alloyId2["template"] = __alloyId4;
-    $.__views.main = Ti.UI.createListSection({
-        id: "main"
-    });
-    var __alloyId11 = Alloy.Collections["rows"] || rows;
-    __alloyId11.on("fetch destroy change add remove reset", __alloyId12);
-    var __alloyId13 = [];
-    __alloyId13.push($.__views.main);
-    $.__views.listView = Ti.UI.createListView({
-        sections: __alloyId13,
-        templates: __alloyId2,
-        searchView: $.__views.searchList,
-        id: "listView",
-        top: "0",
-        defaultItemTemplate: "template"
-    });
-    $.__views.index.add($.__views.listView);
-    exports.destroy = function() {
-        __alloyId11.off("fetch destroy change add remove reset", __alloyId12);
-    };
-    _.extend($, $.__views);
-    var chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-    if (!Ti.App.Properties.hasProperty("lvsearch")) {
-        for (var i = 1, j = 30; j > i; i++) Alloy.createModel("rows", {
-            title: randomString()
-        }).save();
-        Ti.App.Properties.setString("lvsearch", "yes");
-    }
-    Alloy.Collections.rows.fetch();
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1033/_generated/blackberry/alloy/models/Rows.js b/test/apps/testing/ALOY-1033/_generated/blackberry/alloy/models/Rows.js
deleted file mode 100644
index 7487e744c..000000000
--- a/test/apps/testing/ALOY-1033/_generated/blackberry/alloy/models/Rows.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            title: "text"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "rows"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("rows", exports.definition, []);
-
-collection = Alloy.C("rows", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1033/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1033/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 999046a45..000000000
--- a/test/apps/testing/ALOY-1033/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,111 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId12(e) {
-        if (e && e.fromAdapter) return;
-        var opts = __alloyId12.opts || {};
-        var models = __alloyId11.models;
-        var len = models.length;
-        var __alloyId7 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId8 = models[i];
-            __alloyId8.__transform = _.isFunction(__alloyId8.transform) ? __alloyId8.transform() : __alloyId8.toJSON();
-            var __alloyId10 = {
-                template: "template",
-                title: {
-                    text: __alloyId8.__transform.title
-                },
-                properties: {
-                    searchableText: __alloyId8.__transform.title
-                }
-            };
-            __alloyId7.push(__alloyId10);
-        }
-        opts.animation ? $.__views.main.setItems(__alloyId7, opts.animation) : $.__views.main.setItems(__alloyId7);
-    }
-    function randomString(length) {
-        length = length || 8;
-        var result = "";
-        for (var i = length; i > 0; --i) result += chars[Math.round(Math.random() * (chars.length - 1))];
-        return result;
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    Alloy.Collections.instance("rows");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId2 = {};
-    var __alloyId5 = [];
-    var __alloyId6 = {
-        type: "Ti.UI.Label",
-        bindId: "title",
-        properties: {
-            width: Ti.UI.SIZE,
-            height: Ti.UI.SIZE,
-            color: "#000",
-            bindId: "title",
-            left: 5
-        }
-    };
-    __alloyId5.push(__alloyId6);
-    var __alloyId4 = {
-        properties: {
-            name: "template"
-        },
-        childTemplates: __alloyId5
-    };
-    __alloyId2["template"] = __alloyId4;
-    $.__views.main = Ti.UI.createListSection({
-        id: "main"
-    });
-    var __alloyId11 = Alloy.Collections["rows"] || rows;
-    __alloyId11.on("fetch destroy change add remove reset", __alloyId12);
-    var __alloyId13 = [];
-    __alloyId13.push($.__views.main);
-    $.__views.listView = Ti.UI.createListView({
-        sections: __alloyId13,
-        templates: __alloyId2,
-        searchView: $.__views.searchList,
-        id: "listView",
-        top: 0,
-        defaultItemTemplate: "template"
-    });
-    $.__views.index.add($.__views.listView);
-    exports.destroy = function() {
-        __alloyId11 && __alloyId11.off("fetch destroy change add remove reset", __alloyId12);
-    };
-    _.extend($, $.__views);
-    var chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-    if (!Ti.App.Properties.hasProperty("lvsearch")) {
-        for (var i = 1, j = 30; j > i; i++) Alloy.createModel("rows", {
-            title: randomString()
-        }).save();
-        Ti.App.Properties.setString("lvsearch", "yes");
-    }
-    Alloy.Collections.rows.fetch();
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1033/_generated/mobileweb/alloy/models/Rows.js b/test/apps/testing/ALOY-1033/_generated/mobileweb/alloy/models/Rows.js
deleted file mode 100644
index 822b88ed8..000000000
--- a/test/apps/testing/ALOY-1033/_generated/mobileweb/alloy/models/Rows.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            title: "text"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "rows"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("rows", exports.definition, []);
-
-collection = Alloy.C("rows", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1036/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1036/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index adebc1b21..000000000
--- a/test/apps/testing/ALOY-1036/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,51 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.testLabel = Ti.UI.createLabel({
-        font: {
-            fontSize: "22dp"
-        },
-        color: "purple",
-        text: "Simple class label applied",
-        id: "testLabel"
-    });
-    $.__views.index.add($.__views.testLabel);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1036/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1036/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 1579d0e5e..000000000
--- a/test/apps/testing/ALOY-1036/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,45 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.testLabel = Ti.UI.createLabel({
-        font: {
-            fontSize: "22dp"
-        },
-        color: "purple",
-        text: "Simple class label applied",
-        id: "testLabel"
-    });
-    $.__views.index.add($.__views.testLabel);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1038/_generated/android/alloy/controllers/index.js b/test/apps/testing/ALOY-1038/_generated/android/alloy/controllers/index.js
old mode 100644
new mode 100755
index f6a2997cf..5d97debfd
--- a/test/apps/testing/ALOY-1038/_generated/android/alloy/controllers/index.js
+++ b/test/apps/testing/ALOY-1038/_generated/android/alloy/controllers/index.js
@@ -1,146 +1,109 @@
+var Alloy = require('/alloy'),
+Backbone = Alloy.Backbone,
+_ = Alloy._;
+
+
+
+
 function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
+  var arg = null;
+  if (obj) {
+    arg = obj[key] || null;
+  }
+  return arg;
 }
 
 function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.explain = Ti.UI.createLabel({
-        color: "blue",
-        font: {
-            fontSize: "10dp",
-            fontStyle: "italic"
-        },
-        text: "You should see 6 labels above and 6 below the line",
-        id: "explain"
-    });
-    $.__views.index.add($.__views.explain);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "android",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        text: "android,mobileweb",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        text: "ios,android",
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createLabel({
-        text: "!ios",
-        id: "__alloyId3"
-    });
-    $.__views.index.add($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        text: "!mobileweb",
-        id: "__alloyId4"
-    });
-    $.__views.index.add($.__views.__alloyId4);
-    $.__views.__alloyId5 = Ti.UI.createLabel({
-        text: "mobileweb,!ios",
-        id: "__alloyId5"
-    });
-    $.__views.index.add($.__views.__alloyId5);
-    $.__views.__alloyId6 = Ti.UI.createView({
-        height: 1,
-        width: Ti.UI.FILL,
-        backgroundColor: "black",
-        top: 10,
-        id: "__alloyId6"
-    });
-    $.__views.index.add($.__views.__alloyId6);
-    $.__views.ios = Ti.UI.createLabel({
-        height: 0,
-        id: "ios"
-    });
-    $.__views.index.add($.__views.ios);
-    $.__views.android = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: android",
-        id: "android"
-    });
-    $.__views.index.add($.__views.android);
-    $.__views.mobileweb = Ti.UI.createLabel({
-        height: 0,
-        id: "mobileweb"
-    });
-    $.__views.index.add($.__views.mobileweb);
-    $.__views.iosmobileweb = Ti.UI.createLabel({
-        height: 0,
-        id: "iosmobileweb"
-    });
-    $.__views.index.add($.__views.iosmobileweb);
-    $.__views.androidmobileweb = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: android,mobileweb",
-        id: "androidmobileweb"
-    });
-    $.__views.index.add($.__views.androidmobileweb);
-    $.__views.iosandroid = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: ios,android",
-        id: "iosandroid"
-    });
-    $.__views.index.add($.__views.iosandroid);
-    $.__views.notios = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "!ios",
-        id: "notios"
-    });
-    $.__views.index.add($.__views.notios);
-    $.__views.notandroid = Ti.UI.createLabel({
-        height: 0,
-        id: "notandroid"
-    });
-    $.__views.index.add($.__views.notandroid);
-    $.__views.notmobileweb = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: !mobileweb",
-        id: "notmobileweb"
-    });
-    $.__views.index.add($.__views.notmobileweb);
-    $.__views.mobilewebNotios = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: mobileweb,!ios",
-        id: "mobilewebNotios"
-    });
-    $.__views.index.add($.__views.mobilewebNotios);
-    $.__views.mobilewebNotandroid = Ti.UI.createLabel({
-        height: 0,
-        id: "mobilewebNotandroid"
-    });
-    $.__views.index.add($.__views.mobilewebNotandroid);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
 
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
+  require('/alloy/controllers/' + 'BaseController').apply(this, Array.prototype.slice.call(arguments));
+  this.__controllerPath = 'index';
+  this.args = arguments[0] || {};
+
+  if (arguments[0]) {
+    var __parentSymbol = __processArg(arguments[0], '__parentSymbol');
+    var $model = __processArg(arguments[0], '$model');
+    var __itemTemplate = __processArg(arguments[0], '__itemTemplate');
+  }
+  var $ = this;
+  var exports = {};
+  var __defers = {};
+
+  // Generated code that must be executed before all UI and/or
+  // controller code. One example is all model and collection
+  // declarations from markup.
+
+
+  // Generated UI code
+  $.__views["index"] = Ti.UI.createWindow(
+  { backgroundColor: "#fff", fullscreen: false, exitOnClose: true, layout: "vertical", id: "index" });
+
+  $.__views["index"] && $.addTopLevelView($.__views["index"]);
+  $.__views["explain"] = Ti.UI.createLabel(
+  { color: "blue", font: { fontSize: "10dp", fontStyle: "italic" }, text: "You should see 3 labels above and 3 below the line", id: "explain" });
+
+  $.__views["index"].add($.__views["explain"]);
+  if (true) {
+    $.__views["__alloyId0"] = Ti.UI.createLabel(
+    { text: 'android', id: "__alloyId0" });
+
+    $.__views["index"].add($.__views["__alloyId0"]);
+  }
+  if (false || true) {
+    $.__views["__alloyId1"] = Ti.UI.createLabel(
+    { text: 'ios,android', id: "__alloyId1" });
+
+    $.__views["index"].add($.__views["__alloyId1"]);
+  }
+  if (true || false || false) {
+    $.__views["__alloyId2"] = Ti.UI.createLabel(
+    { text: '!ios', id: "__alloyId2" });
+
+    $.__views["index"].add($.__views["__alloyId2"]);
+  }
+  $.__views["__alloyId3"] = Ti.UI.createView(
+  { height: 1, width: Ti.UI.FILL, backgroundColor: "black", top: 10, id: "__alloyId3" });
+
+  $.__views["index"].add($.__views["__alloyId3"]);
+  $.__views["ios"] = Ti.UI.createLabel(
+  { height: 0, id: "ios" });
+
+  $.__views["index"].add($.__views["ios"]);
+  $.__views["android"] = Ti.UI.createLabel(
+  { height: Ti.UI.SIZE, text: "TSS: android", id: "android" });
+
+  $.__views["index"].add($.__views["android"]);
+  $.__views["iosandroid"] = Ti.UI.createLabel(
+  { height: Ti.UI.SIZE, text: "TSS: ios,android", id: "iosandroid" });
+
+  $.__views["index"].add($.__views["iosandroid"]);
+  $.__views["notios"] = Ti.UI.createLabel(
+  { height: Ti.UI.SIZE, text: "!ios", id: "notios" });
+
+  $.__views["index"].add($.__views["notios"]);
+  $.__views["notandroid"] = Ti.UI.createLabel(
+  { height: 0, id: "notandroid" });
+
+  $.__views["index"].add($.__views["notandroid"]);
+  exports.destroy = function () {};
+
+  // make all IDed elements in $.__views available right on the $ in a
+  // controller's internal code. Externally the IDed elements will
+  // be accessed with getView().
+  _.extend($, $.__views);
+
+  // Controller code directly from the developer's controller file
+  $.index.open();
+
+  // Generated code that must be executed after all UI and
+  // controller code. One example deferred event handlers whose
+  // functions are not defined until after the controller code
+  // is executed.
+
+
+  // Extend the $ instance with all functions and properties
+  // defined on the exports object.
+  _.extend($, exports);
+}
 
-module.exports = Controller;
\ No newline at end of file
+module.exports = Controller;
+//# sourceMappingURL=file:///Users/jvennemann/Development/appc/alloy/test/projects/Harness/build/map/Resources/android/alloy/controllers/index.js.map
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1038/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1038/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index c95a3f5a5..000000000
--- a/test/apps/testing/ALOY-1038/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,145 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.explain = Ti.UI.createLabel({
-        color: "blue",
-        font: {
-            fontSize: "10dp",
-            fontStyle: "italic"
-        },
-        id: "explain"
-    });
-    $.__views.index.add($.__views.explain);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "!ios",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        text: "!android",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        text: "!mobileweb",
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createLabel({
-        text: "mobileweb,!ios",
-        id: "__alloyId3"
-    });
-    $.__views.index.add($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        text: "mobileweb,!android",
-        id: "__alloyId4"
-    });
-    $.__views.index.add($.__views.__alloyId4);
-    $.__views.__alloyId5 = Ti.UI.createView({
-        height: "1",
-        width: Ti.UI.FILL,
-        backgroundColor: "black",
-        top: "10",
-        id: "__alloyId5"
-    });
-    $.__views.index.add($.__views.__alloyId5);
-    $.__views.ios = Ti.UI.createLabel({
-        height: 0,
-        id: "ios"
-    });
-    $.__views.index.add($.__views.ios);
-    $.__views.android = Ti.UI.createLabel({
-        height: 0,
-        id: "android"
-    });
-    $.__views.index.add($.__views.android);
-    $.__views.mobileweb = Ti.UI.createLabel({
-        height: 0,
-        id: "mobileweb"
-    });
-    $.__views.index.add($.__views.mobileweb);
-    $.__views.iosmobileweb = Ti.UI.createLabel({
-        height: 0,
-        id: "iosmobileweb"
-    });
-    $.__views.index.add($.__views.iosmobileweb);
-    $.__views.androidmobileweb = Ti.UI.createLabel({
-        height: 0,
-        id: "androidmobileweb"
-    });
-    $.__views.index.add($.__views.androidmobileweb);
-    $.__views.iosandroid = Ti.UI.createLabel({
-        height: 0,
-        id: "iosandroid"
-    });
-    $.__views.index.add($.__views.iosandroid);
-    $.__views.notios = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "!ios",
-        id: "notios"
-    });
-    $.__views.index.add($.__views.notios);
-    $.__views.notandroid = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: !android",
-        id: "notandroid"
-    });
-    $.__views.index.add($.__views.notandroid);
-    $.__views.notmobileweb = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: !mobileweb",
-        id: "notmobileweb"
-    });
-    $.__views.index.add($.__views.notmobileweb);
-    $.__views.mobilewebNotios = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: mobileweb,!ios",
-        id: "mobilewebNotios"
-    });
-    $.__views.index.add($.__views.mobilewebNotios);
-    $.__views.mobilewebNotandroid = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: mobileweb,!android",
-        id: "mobilewebNotandroid"
-    });
-    $.__views.index.add($.__views.mobilewebNotandroid);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1038/_generated/ios/alloy/controllers/index.js b/test/apps/testing/ALOY-1038/_generated/ios/alloy/controllers/index.js
old mode 100644
new mode 100755
index d013299d4..978e1171e
--- a/test/apps/testing/ALOY-1038/_generated/ios/alloy/controllers/index.js
+++ b/test/apps/testing/ALOY-1038/_generated/ios/alloy/controllers/index.js
@@ -1,147 +1,109 @@
+var Alloy = require('/alloy'),
+Backbone = Alloy.Backbone,
+_ = Alloy._;
+
+
+
+
 function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
+  var arg = null;
+  if (obj) {
+    arg = obj[key] || null;
+  }
+  return arg;
 }
 
 function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.explain = Ti.UI.createLabel({
-        color: "blue",
-        font: {
-            fontSize: "10dp",
-            fontStyle: "italic"
-        },
-        top: 20,
-        text: "You should see 6 labels above and 6 below the line",
-        id: "explain"
-    });
-    $.__views.index.add($.__views.explain);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "ios",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        text: "ios,mobileweb",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        text: "ios,android",
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createLabel({
-        text: "!android",
-        id: "__alloyId3"
-    });
-    $.__views.index.add($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        text: "!mobileweb",
-        id: "__alloyId4"
-    });
-    $.__views.index.add($.__views.__alloyId4);
-    $.__views.__alloyId5 = Ti.UI.createLabel({
-        text: "mobileweb,!android",
-        id: "__alloyId5"
-    });
-    $.__views.index.add($.__views.__alloyId5);
-    $.__views.__alloyId6 = Ti.UI.createView({
-        height: 1,
-        width: Ti.UI.FILL,
-        backgroundColor: "black",
-        top: 10,
-        id: "__alloyId6"
-    });
-    $.__views.index.add($.__views.__alloyId6);
-    $.__views.ios = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: ios",
-        id: "ios"
-    });
-    $.__views.index.add($.__views.ios);
-    $.__views.android = Ti.UI.createLabel({
-        height: 0,
-        id: "android"
-    });
-    $.__views.index.add($.__views.android);
-    $.__views.mobileweb = Ti.UI.createLabel({
-        height: 0,
-        id: "mobileweb"
-    });
-    $.__views.index.add($.__views.mobileweb);
-    $.__views.iosmobileweb = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: ios,mobilweb",
-        id: "iosmobileweb"
-    });
-    $.__views.index.add($.__views.iosmobileweb);
-    $.__views.androidmobileweb = Ti.UI.createLabel({
-        height: 0,
-        id: "androidmobileweb"
-    });
-    $.__views.index.add($.__views.androidmobileweb);
-    $.__views.iosandroid = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: ios,android",
-        id: "iosandroid"
-    });
-    $.__views.index.add($.__views.iosandroid);
-    $.__views.notios = Ti.UI.createLabel({
-        height: 0,
-        id: "notios"
-    });
-    $.__views.index.add($.__views.notios);
-    $.__views.notandroid = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: !android",
-        id: "notandroid"
-    });
-    $.__views.index.add($.__views.notandroid);
-    $.__views.notmobileweb = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: !mobileweb",
-        id: "notmobileweb"
-    });
-    $.__views.index.add($.__views.notmobileweb);
-    $.__views.mobilewebNotios = Ti.UI.createLabel({
-        height: 0,
-        id: "mobilewebNotios"
-    });
-    $.__views.index.add($.__views.mobilewebNotios);
-    $.__views.mobilewebNotandroid = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: mobileweb,!android",
-        id: "mobilewebNotandroid"
-    });
-    $.__views.index.add($.__views.mobilewebNotandroid);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
 
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
+  require('/alloy/controllers/' + 'BaseController').apply(this, Array.prototype.slice.call(arguments));
+  this.__controllerPath = 'index';
+  this.args = arguments[0] || {};
+
+  if (arguments[0]) {
+    var __parentSymbol = __processArg(arguments[0], '__parentSymbol');
+    var $model = __processArg(arguments[0], '$model');
+    var __itemTemplate = __processArg(arguments[0], '__itemTemplate');
+  }
+  var $ = this;
+  var exports = {};
+  var __defers = {};
+
+  // Generated code that must be executed before all UI and/or
+  // controller code. One example is all model and collection
+  // declarations from markup.
+
+
+  // Generated UI code
+  $.__views["index"] = Ti.UI.createWindow(
+  { backgroundColor: "#fff", fullscreen: false, exitOnClose: true, layout: "vertical", id: "index" });
+
+  $.__views["index"] && $.addTopLevelView($.__views["index"]);
+  $.__views["explain"] = Ti.UI.createLabel(
+  { color: "blue", font: { fontSize: "10dp", fontStyle: "italic" }, top: 20, text: "You should see 3 labels above and 3 below the line", id: "explain" });
+
+  $.__views["index"].add($.__views["explain"]);
+  if (true) {
+    $.__views["__alloyId0"] = Ti.UI.createLabel(
+    { text: 'ios', id: "__alloyId0" });
+
+    $.__views["index"].add($.__views["__alloyId0"]);
+  }
+  if (true || false) {
+    $.__views["__alloyId1"] = Ti.UI.createLabel(
+    { text: 'ios,android', id: "__alloyId1" });
+
+    $.__views["index"].add($.__views["__alloyId1"]);
+  }
+  if (true || false || false) {
+    $.__views["__alloyId2"] = Ti.UI.createLabel(
+    { text: '!android', id: "__alloyId2" });
+
+    $.__views["index"].add($.__views["__alloyId2"]);
+  }
+  $.__views["__alloyId3"] = Ti.UI.createView(
+  { height: 1, width: Ti.UI.FILL, backgroundColor: "black", top: 10, id: "__alloyId3" });
+
+  $.__views["index"].add($.__views["__alloyId3"]);
+  $.__views["ios"] = Ti.UI.createLabel(
+  { height: Ti.UI.SIZE, text: "TSS: ios", id: "ios" });
+
+  $.__views["index"].add($.__views["ios"]);
+  $.__views["android"] = Ti.UI.createLabel(
+  { height: 0, id: "android" });
+
+  $.__views["index"].add($.__views["android"]);
+  $.__views["iosandroid"] = Ti.UI.createLabel(
+  { height: Ti.UI.SIZE, text: "TSS: ios,android", id: "iosandroid" });
+
+  $.__views["index"].add($.__views["iosandroid"]);
+  $.__views["notios"] = Ti.UI.createLabel(
+  { height: 0, id: "notios" });
+
+  $.__views["index"].add($.__views["notios"]);
+  $.__views["notandroid"] = Ti.UI.createLabel(
+  { height: Ti.UI.SIZE, text: "TSS: !android", id: "notandroid" });
+
+  $.__views["index"].add($.__views["notandroid"]);
+  exports.destroy = function () {};
+
+  // make all IDed elements in $.__views available right on the $ in a
+  // controller's internal code. Externally the IDed elements will
+  // be accessed with getView().
+  _.extend($, $.__views);
+
+  // Controller code directly from the developer's controller file
+  $.index.open();
+
+  // Generated code that must be executed after all UI and
+  // controller code. One example deferred event handlers whose
+  // functions are not defined until after the controller code
+  // is executed.
+
+
+  // Extend the $ instance with all functions and properties
+  // defined on the exports object.
+  _.extend($, exports);
+}
 
-module.exports = Controller;
\ No newline at end of file
+module.exports = Controller;
+//# sourceMappingURL=file:///Users/jvennemann/Development/appc/alloy/test/projects/Harness/build/map/Resources/iphone/alloy/controllers/index.js.map
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1038/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1038/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 2f936ad73..000000000
--- a/test/apps/testing/ALOY-1038/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,151 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.explain = Ti.UI.createLabel({
-        color: "blue",
-        font: {
-            fontSize: "10dp",
-            fontStyle: "italic"
-        },
-        text: "You should see 7 labels above and 7 below the line",
-        id: "explain"
-    });
-    $.__views.index.add($.__views.explain);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "mobileweb",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        text: "ios,mobileweb",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        text: "android,mobileweb",
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createLabel({
-        text: "!ios",
-        id: "__alloyId3"
-    });
-    $.__views.index.add($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        text: "!android",
-        id: "__alloyId4"
-    });
-    $.__views.index.add($.__views.__alloyId4);
-    $.__views.__alloyId5 = Ti.UI.createLabel({
-        text: "mobileweb,!ios",
-        id: "__alloyId5"
-    });
-    $.__views.index.add($.__views.__alloyId5);
-    $.__views.__alloyId6 = Ti.UI.createLabel({
-        text: "mobileweb,!android",
-        id: "__alloyId6"
-    });
-    $.__views.index.add($.__views.__alloyId6);
-    $.__views.__alloyId7 = Ti.UI.createView({
-        height: 1,
-        width: Ti.UI.FILL,
-        backgroundColor: "black",
-        top: 10,
-        id: "__alloyId7"
-    });
-    $.__views.index.add($.__views.__alloyId7);
-    $.__views.ios = Ti.UI.createLabel({
-        height: 0,
-        id: "ios"
-    });
-    $.__views.index.add($.__views.ios);
-    $.__views.android = Ti.UI.createLabel({
-        height: 0,
-        id: "android"
-    });
-    $.__views.index.add($.__views.android);
-    $.__views.mobileweb = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: mobileweb",
-        id: "mobileweb"
-    });
-    $.__views.index.add($.__views.mobileweb);
-    $.__views.iosmobileweb = Ti.UI.createLabel({
-        height: 0,
-        id: "iosmobileweb"
-    });
-    $.__views.index.add($.__views.iosmobileweb);
-    $.__views.androidmobileweb = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: android,mobileweb",
-        id: "androidmobileweb"
-    });
-    $.__views.index.add($.__views.androidmobileweb);
-    $.__views.iosandroid = Ti.UI.createLabel({
-        height: 0,
-        id: "iosandroid"
-    });
-    $.__views.index.add($.__views.iosandroid);
-    $.__views.notios = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "!ios",
-        id: "notios"
-    });
-    $.__views.index.add($.__views.notios);
-    $.__views.notandroid = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: !android",
-        id: "notandroid"
-    });
-    $.__views.index.add($.__views.notandroid);
-    $.__views.notmobileweb = Ti.UI.createLabel({
-        height: 0,
-        id: "notmobileweb"
-    });
-    $.__views.index.add($.__views.notmobileweb);
-    $.__views.mobilewebNotios = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: mobileweb,!ios",
-        id: "mobilewebNotios"
-    });
-    $.__views.index.add($.__views.mobilewebNotios);
-    $.__views.mobilewebNotandroid = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        text: "TSS: mobileweb,!android",
-        id: "mobilewebNotandroid"
-    });
-    $.__views.index.add($.__views.mobilewebNotandroid);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1038/_generated/windows/alloy/controllers/index.js b/test/apps/testing/ALOY-1038/_generated/windows/alloy/controllers/index.js
new file mode 100755
index 000000000..3b7dc9a6b
--- /dev/null
+++ b/test/apps/testing/ALOY-1038/_generated/windows/alloy/controllers/index.js
@@ -0,0 +1,103 @@
+var Alloy = require('/alloy'),
+Backbone = Alloy.Backbone,
+_ = Alloy._;
+
+
+
+
+function __processArg(obj, key) {
+  var arg = null;
+  if (obj) {
+    arg = obj[key] || null;
+  }
+  return arg;
+}
+
+function Controller() {
+
+  require('/alloy/controllers/' + 'BaseController').apply(this, Array.prototype.slice.call(arguments));
+  this.__controllerPath = 'index';
+  this.args = arguments[0] || {};
+
+  if (arguments[0]) {
+    var __parentSymbol = __processArg(arguments[0], '__parentSymbol');
+    var $model = __processArg(arguments[0], '$model');
+    var __itemTemplate = __processArg(arguments[0], '__itemTemplate');
+  }
+  var $ = this;
+  var exports = {};
+  var __defers = {};
+
+  // Generated code that must be executed before all UI and/or
+  // controller code. One example is all model and collection
+  // declarations from markup.
+
+
+  // Generated UI code
+  $.__views["index"] = Ti.UI.createWindow(
+  { backgroundColor: "#fff", fullscreen: false, exitOnClose: true, layout: "vertical", id: "index" });
+
+  $.__views["index"] && $.addTopLevelView($.__views["index"]);
+  $.__views["explain"] = Ti.UI.createLabel(
+  { color: "blue", font: { fontSize: "10dp", fontStyle: "italic" }, id: "explain" });
+
+  $.__views["index"].add($.__views["explain"]);
+  if (false || false || true) {
+    $.__views["__alloyId0"] = Ti.UI.createLabel(
+    { text: '!ios', id: "__alloyId0" });
+
+    $.__views["index"].add($.__views["__alloyId0"]);
+  }
+  if (false || false || true) {
+    $.__views["__alloyId1"] = Ti.UI.createLabel(
+    { text: '!android', id: "__alloyId1" });
+
+    $.__views["index"].add($.__views["__alloyId1"]);
+  }
+  $.__views["__alloyId2"] = Ti.UI.createView(
+  { height: 1, width: Ti.UI.FILL, backgroundColor: "black", top: 10, id: "__alloyId2" });
+
+  $.__views["index"].add($.__views["__alloyId2"]);
+  $.__views["ios"] = Ti.UI.createLabel(
+  { height: 0, id: "ios" });
+
+  $.__views["index"].add($.__views["ios"]);
+  $.__views["android"] = Ti.UI.createLabel(
+  { height: 0, id: "android" });
+
+  $.__views["index"].add($.__views["android"]);
+  $.__views["iosandroid"] = Ti.UI.createLabel(
+  { height: 0, id: "iosandroid" });
+
+  $.__views["index"].add($.__views["iosandroid"]);
+  $.__views["notios"] = Ti.UI.createLabel(
+  { height: Ti.UI.SIZE, text: "!ios", id: "notios" });
+
+  $.__views["index"].add($.__views["notios"]);
+  $.__views["notandroid"] = Ti.UI.createLabel(
+  { height: Ti.UI.SIZE, text: "TSS: !android", id: "notandroid" });
+
+  $.__views["index"].add($.__views["notandroid"]);
+  exports.destroy = function () {};
+
+  // make all IDed elements in $.__views available right on the $ in a
+  // controller's internal code. Externally the IDed elements will
+  // be accessed with getView().
+  _.extend($, $.__views);
+
+  // Controller code directly from the developer's controller file
+  $.index.open();
+
+  // Generated code that must be executed after all UI and
+  // controller code. One example deferred event handlers whose
+  // functions are not defined until after the controller code
+  // is executed.
+
+
+  // Extend the $ instance with all functions and properties
+  // defined on the exports object.
+  _.extend($, exports);
+}
+
+module.exports = Controller;
+//# sourceMappingURL=file:///Users/jvennemann/Development/appc/alloy/test/projects/Harness/build/map/Resources/windows/alloy/controllers/index.js.map
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1038/styles/index.tss b/test/apps/testing/ALOY-1038/styles/index.tss
index 47ca04faa..71b784ece 100644
--- a/test/apps/testing/ALOY-1038/styles/index.tss
+++ b/test/apps/testing/ALOY-1038/styles/index.tss
@@ -23,18 +23,6 @@
 	height: Ti.UI.SIZE,
 	text: "TSS: android"
 }
-"#mobileweb[platform=mobileweb]": {
-	height: Ti.UI.SIZE,
-	text: "TSS: mobileweb"
-}
-"#iosmobileweb[platform=ios,mobilweb]": {
-	height: Ti.UI.SIZE,
-	text: "TSS: ios,mobilweb"
-}
-"#androidmobileweb[platform=android,mobileweb]": {
-	height: Ti.UI.SIZE,
-	text: "TSS: android,mobileweb"
-}
 "#iosandroid[platform=ios,android]": {
 	height: Ti.UI.SIZE,
 	text: "TSS: ios,android"
@@ -47,18 +35,6 @@
 	height: Ti.UI.SIZE,
 	text: "TSS: !android"
 }
-"#notmobileweb[platform=!mobileweb]": {
-	height: Ti.UI.SIZE,
-	text: "TSS: !mobileweb"
-}
-"#mobilewebNotios[platform=mobileweb,!ios]": {
-	height: Ti.UI.SIZE,
-	text: "TSS: mobileweb,!ios"
-}
-"#mobilewebNotandroid[platform=mobileweb,!android]": {
-	height: Ti.UI.SIZE,
-	text: "TSS: mobileweb,!android"
-}
 
 "#explain": {
 	color: 'blue',
@@ -69,11 +45,8 @@
 }
 "#explain[platform=ios]": {
 	top: 20,
-	text: 'You should see 6 labels above and 6 below the line'
+	text: 'You should see 3 labels above and 3 below the line'
 }
 "#explain[platform=android]": {
-	text: 'You should see 6 labels above and 6 below the line'
-}
-"#explain[platform=mobileweb]": {
-	text: 'You should see 7 labels above and 7 below the line'
+	text: 'You should see 3 labels above and 3 below the line'
 }
diff --git a/test/apps/testing/ALOY-1038/views/index.xml b/test/apps/testing/ALOY-1038/views/index.xml
index 2097ed335..ecf8ee837 100644
--- a/test/apps/testing/ALOY-1038/views/index.xml
+++ b/test/apps/testing/ALOY-1038/views/index.xml
@@ -3,26 +3,14 @@
 		<Label id="explain"/>
 		<Label platform="ios">ios</Label>
 		<Label platform="android">android</Label>
-		<Label platform="mobileweb">mobileweb</Label>
-		<Label platform="ios,mobileweb">ios,mobileweb</Label>
-		<Label platform="android,mobileweb">android,mobileweb</Label>
 		<Label platform="ios,android">ios,android</Label>
 		<Label platform="!ios">!ios</Label>
 		<Label platform="!android">!android</Label>
-		<Label platform="!mobileweb">!mobileweb</Label>
-		<Label platform="mobileweb,!ios">mobileweb,!ios</Label>
-		<Label platform="mobileweb,!android">mobileweb,!android</Label>
 		<View height="1" width="Ti.UI.FILL" backgroundColor="black" top="10"/>
 		<Label class="tsslabel" id="ios"/>
 		<Label class="tsslabel" id="android"/>
-		<Label class="tsslabel" id="mobileweb"/>
-		<Label class="tsslabel" id="iosmobileweb"/>
-		<Label class="tsslabel" id="androidmobileweb"/>
 		<Label class="tsslabel" id="iosandroid"/>
 		<Label class="tsslabel" id="notios"/>
 		<Label class="tsslabel" id="notandroid"/>
-		<Label class="tsslabel" id="notmobileweb"/>
-		<Label class="tsslabel" id="mobilewebNotios"/>
-		<Label class="tsslabel" id="mobilewebNotandroid"/>
 	</Window>
 </Alloy>
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 0d9db8802..000000000
--- a/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,64 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doFoo(num) {
-        alert("Your rating = " + num);
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index",
-        title: "Books"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.starwidget = Alloy.createWidget("starrating", "widget", {
-        id: "starwidget",
-        max: "5",
-        initialRating: "2.5",
-        top: "20",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.starwidget.setParent($.__views.index);
-    $.__views.table = Ti.UI.createTableView({
-        id: "table",
-        top: "50"
-    });
-    $.__views.index.add($.__views.table);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var rows = [];
-    var titles = [ "Lord of the Rings", "Harry Potter", "Eragon", "Wheel of Time", "Narnia" ];
-    for (var i = 0, j = titles.length; j > i; i++) rows.push(Alloy.createController("row", {
-        title: titles[i]
-    }).getView());
-    $.table.data = rows;
-    $.starwidget.init(doFoo);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/controllers/row.js b/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/controllers/row.js
deleted file mode 100644
index a69bd4dbe..000000000
--- a/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/controllers/row.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "row";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.row = Ti.UI.createTableViewRow({
-        color: "blue",
-        height: "50dp",
-        id: "row"
-    });
-    $.__views.row && $.addTopLevelView($.__views.row);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    $.row.title = args.title;
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/widgets/starrating/controllers/star.js b/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/widgets/starrating/controllers/star.js
deleted file mode 100644
index 9e1715ecd..000000000
--- a/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/widgets/starrating/controllers/star.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "star";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.star = Ti.UI.createImageView({
-        height: "32dp",
-        width: "10dp",
-        left: "8dp",
-        id: "star"
-    });
-    $.__views.star && $.addTopLevelView($.__views.star);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/widgets/starrating/controllers/widget.js b/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/widgets/starrating/controllers/widget.js
deleted file mode 100644
index 4dd528eaa..000000000
--- a/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/widgets/starrating/controllers/widget.js
+++ /dev/null
@@ -1,73 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.starrating = Ti.UI.createView({
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent",
-        id: "starrating"
-    });
-    $.__views.starrating && $.addTopLevelView($.__views.starrating);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {}, stars = [], rating = 0, max = 5;
-    var setRating = function(newRating) {
-        newRating > max && (newRating = max);
-        rating = newRating;
-        for (var i = 0, l = stars.length; l > i; i++) stars[i].image = WPATH(i >= rating ? "star_off.png" : rating > i && i + 1 > rating ? "star_half.png" : "star.png");
-    };
-    exports.setRating = setRating;
-    exports.getRating = function() {
-        return rating;
-    };
-    var createStars = function(num, cb) {
-        for (var i = 0; num > i; i++) {
-            var star = Alloy.createWidget("starrating", "star").getView();
-            !function() {
-                var index = i;
-                star.addEventListener("click", function() {
-                    setRating(index + 1);
-                    cb(index + 1);
-                });
-            }();
-            stars.push(star);
-            $.starrating.add(star);
-        }
-    };
-    exports.init = function(callback) {
-        var max = args.max || 5, initialRating = args.initialRating || 0, cb = callback || function() {};
-        createStars(max, cb);
-        setRating(initialRating);
-        _.extend($.starrating, args);
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/widgets/starrating/styles/star.js b/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/widgets/starrating/styles/star.js
deleted file mode 100644
index 10e857062..000000000
--- a/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/widgets/starrating/styles/star.js
+++ /dev/null
@@ -1,40 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "TableViewRow",
-    style: {
-        color: "black",
-        height: "50dp"
-    }
-}, {
-    isApi: true,
-    priority: 1000.9001999999999,
-    key: "TableViewRow",
-    style: {
-        color: "blue"
-    }
-}, {
-    isClass: true,
-    priority: 10000.0002,
-    key: "star",
-    style: {
-        height: "24dp",
-        width: "24dp",
-        left: "5dp"
-    }
-}, {
-    isClass: true,
-    priority: 10000.9003,
-    key: "star",
-    style: {
-        height: "32dp",
-        width: "10dp",
-        left: "8dp"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/widgets/starrating/styles/widget.js b/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/widgets/starrating/styles/widget.js
deleted file mode 100644
index 8538464e4..000000000
--- a/test/apps/testing/ALOY-1047/_generated/blackberry/alloy/widgets/starrating/styles/widget.js
+++ /dev/null
@@ -1,31 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "TableViewRow",
-    style: {
-        color: "black",
-        height: "50dp"
-    }
-}, {
-    isApi: true,
-    priority: 1000.9001999999999,
-    key: "TableViewRow",
-    style: {
-        color: "blue"
-    }
-}, {
-    isId: true,
-    priority: 100000.0004,
-    key: "starrating",
-    style: {
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 9f7df7337..000000000
--- a/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,58 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doFoo(num) {
-        alert("Your rating = " + num);
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index",
-        title: "Books"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.starwidget = Alloy.createWidget("starrating", "widget", {
-        id: "starwidget",
-        max: 5,
-        initialRating: 2.5,
-        top: 20,
-        __parentSymbol: $.__views.index
-    });
-    $.__views.starwidget.setParent($.__views.index);
-    $.__views.table = Ti.UI.createTableView({
-        id: "table",
-        top: 50
-    });
-    $.__views.index.add($.__views.table);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var rows = [];
-    var titles = [ "Lord of the Rings", "Harry Potter", "Eragon", "Wheel of Time", "Narnia" ];
-    for (var i = 0, j = titles.length; j > i; i++) rows.push(Alloy.createController("row", {
-        title: titles[i]
-    }).getView());
-    $.table.data = rows;
-    $.starwidget.init(doFoo);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/controllers/row.js b/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/controllers/row.js
deleted file mode 100644
index 1304b078a..000000000
--- a/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/controllers/row.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "row";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.row = Ti.UI.createTableViewRow({
-        color: "blue",
-        height: "50dp",
-        id: "row"
-    });
-    $.__views.row && $.addTopLevelView($.__views.row);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    $.row.title = args.title;
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/widgets/starrating/controllers/star.js b/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/widgets/starrating/controllers/star.js
deleted file mode 100644
index 671dea1b3..000000000
--- a/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/widgets/starrating/controllers/star.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "star";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.star = Ti.UI.createImageView({
-        height: "32dp",
-        width: "10dp",
-        left: "8dp",
-        id: "star"
-    });
-    $.__views.star && $.addTopLevelView($.__views.star);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/widgets/starrating/controllers/widget.js b/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/widgets/starrating/controllers/widget.js
deleted file mode 100644
index cb1bc629d..000000000
--- a/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/widgets/starrating/controllers/widget.js
+++ /dev/null
@@ -1,73 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.starrating = Ti.UI.createView({
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent",
-        id: "starrating"
-    });
-    $.__views.starrating && $.addTopLevelView($.__views.starrating);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {}, stars = [], rating = 0, max = 5;
-    var setRating = function(newRating) {
-        newRating > max && (newRating = max);
-        rating = newRating;
-        for (var i = 0, l = stars.length; l > i; i++) i >= rating ? stars[i].image = WPATH("star_off.png") : rating > i && i + 1 > rating ? stars[i].image = WPATH("star_half.png") : stars[i].image = WPATH("star.png");
-    };
-    exports.setRating = setRating;
-    exports.getRating = function() {
-        return rating;
-    };
-    var createStars = function(num, cb) {
-        for (var i = 0; num > i; i++) {
-            var star = Alloy.createWidget("starrating", "star").getView();
-            !function() {
-                var index = i;
-                star.addEventListener("click", function() {
-                    setRating(index + 1);
-                    cb(index + 1);
-                });
-            }();
-            stars.push(star);
-            $.starrating.add(star);
-        }
-    };
-    exports.init = function(callback) {
-        var max = args.max || 5, initialRating = args.initialRating || 0, cb = callback || function() {};
-        createStars(max, cb);
-        setRating(initialRating);
-        _.extend($.starrating, args);
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/widgets/starrating/styles/star.js b/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/widgets/starrating/styles/star.js
deleted file mode 100644
index fa23ea02c..000000000
--- a/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/widgets/starrating/styles/star.js
+++ /dev/null
@@ -1,40 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "TableViewRow",
-    style: {
-        color: "black",
-        height: "50dp"
-    }
-}, {
-    isApi: true,
-    priority: 1000.9001999999999,
-    key: "TableViewRow",
-    style: {
-        color: "blue"
-    }
-}, {
-    isClass: true,
-    priority: 10000.0003,
-    key: "star",
-    style: {
-        height: "24dp",
-        width: "24dp",
-        left: "5dp"
-    }
-}, {
-    isClass: true,
-    priority: 10000.9004,
-    key: "star",
-    style: {
-        height: "32dp",
-        width: "10dp",
-        left: "8dp"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/widgets/starrating/styles/widget.js b/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/widgets/starrating/styles/widget.js
deleted file mode 100644
index 377153ee8..000000000
--- a/test/apps/testing/ALOY-1047/_generated/mobileweb/alloy/widgets/starrating/styles/widget.js
+++ /dev/null
@@ -1,31 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "TableViewRow",
-    style: {
-        color: "black",
-        height: "50dp"
-    }
-}, {
-    isApi: true,
-    priority: 1000.9001999999999,
-    key: "TableViewRow",
-    style: {
-        color: "blue"
-    }
-}, {
-    isId: true,
-    priority: 100000.0005,
-    key: "starrating",
-    style: {
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1047/widgets/starrating/widget.json b/test/apps/testing/ALOY-1047/widgets/starrating/widget.json
index 2da1e2583..4a8fd06ee 100644
--- a/test/apps/testing/ALOY-1047/widgets/starrating/widget.json
+++ b/test/apps/testing/ALOY-1047/widgets/starrating/widget.json
@@ -9,5 +9,5 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"3.0",
 	"tags":"",
-	"platforms":"android,ios,mobileweb"
+	"platforms":"android,ios"
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1051/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1051/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 9bb8717c7..000000000
--- a/test/apps/testing/ALOY-1051/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick() {
-        alert(JSON.stringify($.createStyle({
-            classes: [ "family", "size" ]
-        })));
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        top: "100",
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        font: {
-            fontFamily: "AmericanTypewriter",
-            fontSize: 30
-        },
-        text: "Hello, World",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    doClick ? $.__views.label.addEventListener("click", doClick) : __defers["$.__views.label!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.label!click!doClick"] && $.__views.label.addEventListener("click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1051/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1051/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 69b76cf44..000000000
--- a/test/apps/testing/ALOY-1051/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick(e) {
-        alert(JSON.stringify($.createStyle({
-            classes: [ "family", "size" ]
-        })));
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        top: 100,
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        font: {
-            fontFamily: "AmericanTypewriter",
-            fontSize: 30
-        },
-        text: "Hello, World",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    doClick ? $.addListener($.__views.label, "click", doClick) : __defers["$.__views.label!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.label!click!doClick"] && $.addListener($.__views.label, "click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1052/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1052/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 6dc0d4c97..000000000
--- a/test/apps/testing/ALOY-1052/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,95 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        color: "#000",
-        font: {
-            fontSize: 12
-        },
-        text: L("foo"),
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        color: "#000",
-        font: {
-            fontSize: 12
-        },
-        text: "TabbedBar",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    var __alloyId3 = [];
-    var __alloyId7 = {
-        title: "L(foo)"
-    };
-    __alloyId3.push(__alloyId7);
-    var __alloyId8 = {
-        title: L("foo")
-    };
-    __alloyId3.push(__alloyId8);
-    var __alloyId9 = {
-        title: L("foo")
-    };
-    __alloyId3.push(__alloyId9);
-    $.__views.tb = Ti.UI.iOS.createTabbedBar({
-        labels: __alloyId3,
-        id: "tb"
-    });
-    $.__views.index.add($.__views.tb);
-    $.__views.__alloyId10 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        color: "#000",
-        font: {
-            fontSize: 12
-        },
-        text: "ButtonBar",
-        id: "__alloyId10"
-    });
-    $.__views.index.add($.__views.__alloyId10);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1052/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1052/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 81e9bac16..000000000
--- a/test/apps/testing/ALOY-1052/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,89 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        color: "#000",
-        font: {
-            fontSize: 12
-        },
-        text: L("foo"),
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        color: "#000",
-        font: {
-            fontSize: 12
-        },
-        text: "TabbedBar",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    var __alloyId3 = [];
-    var __alloyId7 = {
-        title: "L(foo)"
-    };
-    __alloyId3.push(__alloyId7);
-    var __alloyId8 = {
-        title: L("foo")
-    };
-    __alloyId3.push(__alloyId8);
-    var __alloyId9 = {
-        title: L("foo")
-    };
-    __alloyId3.push(__alloyId9);
-    $.__views.tb = Ti.UI.iOS.createTabbedBar({
-        labels: __alloyId3,
-        id: "tb"
-    });
-    $.__views.index.add($.__views.tb);
-    $.__views.__alloyId10 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        color: "#000",
-        font: {
-            fontSize: 12
-        },
-        text: "ButtonBar",
-        id: "__alloyId10"
-    });
-    $.__views.index.add($.__views.__alloyId10);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1055/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1055/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index e154e335e..000000000
--- a/test/apps/testing/ALOY-1055/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,222 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId1 = [];
-    var __alloyId2 = {};
-    var __alloyId5 = [];
-    var __alloyId6 = {
-        type: "Ti.UI.Label",
-        bindId: "info",
-        properties: {
-            color: "black",
-            font: {
-                fontFamily: "Arial",
-                fontSize: "20dp",
-                fontWeight: "bold"
-            },
-            left: "10dp",
-            top: 0,
-            bindId: "info"
-        }
-    };
-    __alloyId5.push(__alloyId6);
-    var __alloyId7 = {
-        type: "Ti.UI.Label",
-        bindId: "es_info",
-        properties: {
-            color: "gray",
-            font: {
-                fontFamily: "Arial",
-                fontSize: "14dp"
-            },
-            left: "10dp",
-            top: "25dp",
-            bindId: "es_info"
-        }
-    };
-    __alloyId5.push(__alloyId7);
-    var __alloyId4 = {
-        properties: {
-            name: "template"
-        },
-        childTemplates: __alloyId5
-    };
-    __alloyId2["template"] = __alloyId4;
-    var __alloyId10 = [];
-    $.__views.__alloyId11 = {
-        info: {
-            text: "Apple"
-        },
-        es_info: {
-            text: "Manzana"
-        },
-        properties: {
-            id: "__alloyId11"
-        }
-    };
-    __alloyId10.push($.__views.__alloyId11);
-    $.__views.__alloyId12 = {
-        info: {
-            text: "Banana"
-        },
-        es_info: {
-            text: "Banana"
-        },
-        properties: {
-            id: "__alloyId12"
-        }
-    };
-    __alloyId10.push($.__views.__alloyId12);
-    $.__views.__alloyId8 = Ti.UI.createListSection({
-        headerTitle: "Fruit / Frutas",
-        id: "__alloyId8"
-    });
-    $.__views.__alloyId8.items = __alloyId10;
-    var __alloyId13 = [];
-    __alloyId13.push($.__views.__alloyId8);
-    var __alloyId16 = [];
-    $.__views.__alloyId17 = {
-        info: {
-            text: "Carrot"
-        },
-        es_info: {
-            text: "Zanahoria"
-        },
-        properties: {
-            id: "__alloyId17"
-        }
-    };
-    __alloyId16.push($.__views.__alloyId17);
-    $.__views.__alloyId18 = {
-        info: {
-            text: "Potato"
-        },
-        es_info: {
-            text: "Patata"
-        },
-        properties: {
-            id: "__alloyId18"
-        }
-    };
-    __alloyId16.push($.__views.__alloyId18);
-    $.__views.__alloyId14 = Ti.UI.createListSection({
-        headerTitle: "Vegetables / Verduras",
-        id: "__alloyId14"
-    });
-    $.__views.__alloyId14.items = __alloyId16;
-    __alloyId13.push($.__views.__alloyId14);
-    var __alloyId21 = [];
-    $.__views.__alloyId22 = {
-        info: {
-            text: "Corn"
-        },
-        es_info: {
-            text: "Maiz"
-        },
-        properties: {
-            id: "__alloyId22"
-        }
-    };
-    __alloyId21.push($.__views.__alloyId22);
-    $.__views.__alloyId23 = {
-        info: {
-            text: "Rice"
-        },
-        es_info: {
-            text: "Arroz"
-        },
-        properties: {
-            id: "__alloyId23"
-        }
-    };
-    __alloyId21.push($.__views.__alloyId23);
-    $.__views.__alloyId19 = Ti.UI.createListSection({
-        headerTitle: "Grains / Granos",
-        id: "__alloyId19"
-    });
-    $.__views.__alloyId19.items = __alloyId21;
-    __alloyId13.push($.__views.__alloyId19);
-    $.__views.listView = Ti.UI.createListView({
-        sections: __alloyId13,
-        templates: __alloyId2,
-        id: "listView",
-        defaultItemTemplate: "template"
-    });
-    __alloyId1.push($.__views.listView);
-    var __alloyId26 = [];
-    $.__views.__alloyId27 = {
-        properties: {
-            title: "List item 1",
-            id: "__alloyId27"
-        }
-    };
-    __alloyId26.push($.__views.__alloyId27);
-    $.__views.__alloyId28 = {
-        properties: {
-            title: "List item 2",
-            id: "__alloyId28"
-        }
-    };
-    __alloyId26.push($.__views.__alloyId28);
-    $.__views.__alloyId29 = {
-        properties: {
-            title: "List item 3",
-            id: "__alloyId29"
-        }
-    };
-    __alloyId26.push($.__views.__alloyId29);
-    $.__views.__alloyId24 = Ti.UI.createListSection({
-        id: "__alloyId24"
-    });
-    $.__views.__alloyId24.items = __alloyId26;
-    var __alloyId30 = [];
-    __alloyId30.push($.__views.__alloyId24);
-    $.__views.list = Ti.UI.createListView({
-        sections: __alloyId30,
-        id: "list"
-    });
-    __alloyId1.push($.__views.list);
-    $.__views.__alloyId0 = Ti.UI.createScrollableView({
-        views: __alloyId1,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1055/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1055/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 389ad26ce..000000000
--- a/test/apps/testing/ALOY-1055/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,216 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId1 = [];
-    var __alloyId2 = {};
-    var __alloyId5 = [];
-    var __alloyId6 = {
-        type: "Ti.UI.Label",
-        bindId: "info",
-        properties: {
-            color: "black",
-            font: {
-                fontFamily: "Arial",
-                fontSize: "20dp",
-                fontWeight: "bold"
-            },
-            left: "10dp",
-            top: 0,
-            bindId: "info"
-        }
-    };
-    __alloyId5.push(__alloyId6);
-    var __alloyId7 = {
-        type: "Ti.UI.Label",
-        bindId: "es_info",
-        properties: {
-            color: "gray",
-            font: {
-                fontFamily: "Arial",
-                fontSize: "14dp"
-            },
-            left: "10dp",
-            top: "25dp",
-            bindId: "es_info"
-        }
-    };
-    __alloyId5.push(__alloyId7);
-    var __alloyId4 = {
-        properties: {
-            name: "template"
-        },
-        childTemplates: __alloyId5
-    };
-    __alloyId2["template"] = __alloyId4;
-    var __alloyId10 = [];
-    $.__views.__alloyId11 = {
-        info: {
-            text: "Apple"
-        },
-        es_info: {
-            text: "Manzana"
-        },
-        properties: {
-            id: "__alloyId11"
-        }
-    };
-    __alloyId10.push($.__views.__alloyId11);
-    $.__views.__alloyId12 = {
-        info: {
-            text: "Banana"
-        },
-        es_info: {
-            text: "Banana"
-        },
-        properties: {
-            id: "__alloyId12"
-        }
-    };
-    __alloyId10.push($.__views.__alloyId12);
-    $.__views.__alloyId8 = Ti.UI.createListSection({
-        headerTitle: "Fruit / Frutas",
-        id: "__alloyId8"
-    });
-    $.__views.__alloyId8.items = __alloyId10;
-    var __alloyId13 = [];
-    __alloyId13.push($.__views.__alloyId8);
-    var __alloyId16 = [];
-    $.__views.__alloyId17 = {
-        info: {
-            text: "Carrot"
-        },
-        es_info: {
-            text: "Zanahoria"
-        },
-        properties: {
-            id: "__alloyId17"
-        }
-    };
-    __alloyId16.push($.__views.__alloyId17);
-    $.__views.__alloyId18 = {
-        info: {
-            text: "Potato"
-        },
-        es_info: {
-            text: "Patata"
-        },
-        properties: {
-            id: "__alloyId18"
-        }
-    };
-    __alloyId16.push($.__views.__alloyId18);
-    $.__views.__alloyId14 = Ti.UI.createListSection({
-        headerTitle: "Vegetables / Verduras",
-        id: "__alloyId14"
-    });
-    $.__views.__alloyId14.items = __alloyId16;
-    __alloyId13.push($.__views.__alloyId14);
-    var __alloyId21 = [];
-    $.__views.__alloyId22 = {
-        info: {
-            text: "Corn"
-        },
-        es_info: {
-            text: "Maiz"
-        },
-        properties: {
-            id: "__alloyId22"
-        }
-    };
-    __alloyId21.push($.__views.__alloyId22);
-    $.__views.__alloyId23 = {
-        info: {
-            text: "Rice"
-        },
-        es_info: {
-            text: "Arroz"
-        },
-        properties: {
-            id: "__alloyId23"
-        }
-    };
-    __alloyId21.push($.__views.__alloyId23);
-    $.__views.__alloyId19 = Ti.UI.createListSection({
-        headerTitle: "Grains / Granos",
-        id: "__alloyId19"
-    });
-    $.__views.__alloyId19.items = __alloyId21;
-    __alloyId13.push($.__views.__alloyId19);
-    $.__views.listView = Ti.UI.createListView({
-        sections: __alloyId13,
-        templates: __alloyId2,
-        id: "listView",
-        defaultItemTemplate: "template"
-    });
-    __alloyId1.push($.__views.listView);
-    var __alloyId26 = [];
-    $.__views.__alloyId27 = {
-        properties: {
-            title: "List item 1",
-            id: "__alloyId27"
-        }
-    };
-    __alloyId26.push($.__views.__alloyId27);
-    $.__views.__alloyId28 = {
-        properties: {
-            title: "List item 2",
-            id: "__alloyId28"
-        }
-    };
-    __alloyId26.push($.__views.__alloyId28);
-    $.__views.__alloyId29 = {
-        properties: {
-            title: "List item 3",
-            id: "__alloyId29"
-        }
-    };
-    __alloyId26.push($.__views.__alloyId29);
-    $.__views.__alloyId24 = Ti.UI.createListSection({
-        id: "__alloyId24"
-    });
-    $.__views.__alloyId24.items = __alloyId26;
-    var __alloyId30 = [];
-    __alloyId30.push($.__views.__alloyId24);
-    $.__views.list = Ti.UI.createListView({
-        sections: __alloyId30,
-        id: "list"
-    });
-    __alloyId1.push($.__views.list);
-    $.__views.__alloyId0 = Ti.UI.createScrollableView({
-        views: __alloyId1,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1056/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1056/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index c2f1b3c8e..000000000
--- a/test/apps/testing/ALOY-1056/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,49 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createSwitch({
-        tintColor: "red",
-        onTintColor: "yellow",
-        thumbTintColor: "blue",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1056/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1056/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 2a765b046..000000000
--- a/test/apps/testing/ALOY-1056/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createSwitch({
-        tintColor: "red",
-        onTintColor: "yellow",
-        thumbTintColor: "blue",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1064/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1064/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index fd4b250f4..000000000
--- a/test/apps/testing/ALOY-1064/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,143 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId2 = {};
-    var __alloyId5 = [];
-    var __alloyId6 = {
-        type: "Ti.UI.Label",
-        bindId: "title",
-        properties: {
-            bindId: "title"
-        }
-    };
-    __alloyId5.push(__alloyId6);
-    var __alloyId4 = {
-        properties: {
-            name: "first"
-        },
-        childTemplates: __alloyId5
-    };
-    __alloyId2["first"] = __alloyId4;
-    var __alloyId9 = [];
-    var __alloyId10 = {
-        type: "Ti.UI.Label",
-        bindId: "title",
-        properties: {
-            bindId: "title"
-        }
-    };
-    __alloyId9.push(__alloyId10);
-    var __alloyId11 = {
-        type: "Ti.UI.Label",
-        bindId: "subtitle",
-        properties: {
-            bindId: "subtitle"
-        }
-    };
-    __alloyId9.push(__alloyId11);
-    var __alloyId8 = {
-        properties: {
-            name: "second"
-        },
-        childTemplates: __alloyId9
-    };
-    __alloyId2["second"] = __alloyId8;
-    var __alloyId14 = [];
-    var __alloyId15 = {
-        type: "Ti.UI.ImageView",
-        bindId: "leftImage",
-        properties: {
-            bindId: "leftImage"
-        }
-    };
-    __alloyId14.push(__alloyId15);
-    var __alloyId16 = {
-        type: "Ti.UI.Label",
-        bindId: "title",
-        properties: {
-            bindId: "title"
-        }
-    };
-    __alloyId14.push(__alloyId16);
-    var __alloyId17 = {
-        type: "Ti.UI.Label",
-        bindId: "subtitle",
-        properties: {
-            bindId: "subtitle"
-        }
-    };
-    __alloyId14.push(__alloyId17);
-    var __alloyId13 = {
-        properties: {
-            name: "third"
-        },
-        childTemplates: __alloyId14
-    };
-    __alloyId2["third"] = __alloyId13;
-    var __alloyId20 = [];
-    $.__views.__alloyId21 = {
-        template: "first",
-        title: {
-            text: "this is some text"
-        },
-        properties: {
-            id: "__alloyId21"
-        }
-    };
-    __alloyId20.push($.__views.__alloyId21);
-    $.__views.__alloyId18 = Ti.UI.createListSection({
-        id: "__alloyId18"
-    });
-    $.__views.__alloyId18.items = __alloyId20;
-    var __alloyId22 = [];
-    __alloyId22.push($.__views.__alloyId18);
-    $.__views.__alloyId1 = Ti.UI.createListView({
-        sections: __alloyId22,
-        templates: __alloyId2,
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId0 = Alloy.createWidget("foo", "widget", {
-        id: "__alloyId0",
-        children: [ $.__views.__alloyId1 ],
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId0.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1064/_generated/blackberry/alloy/widgets/foo/controllers/widget.js b/test/apps/testing/ALOY-1064/_generated/blackberry/alloy/widgets/foo/controllers/widget.js
deleted file mode 100644
index a2d7d3217..000000000
--- a/test/apps/testing/ALOY-1064/_generated/blackberry/alloy/widgets/foo/controllers/widget.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "foo/" + s : s.substring(0, index) + "/foo/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("foo");
-    this.__widgetId = "foo";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1064/_generated/blackberry/alloy/widgets/foo/styles/widget.js b/test/apps/testing/ALOY-1064/_generated/blackberry/alloy/widgets/foo/styles/widget.js
deleted file mode 100644
index dd881678e..000000000
--- a/test/apps/testing/ALOY-1064/_generated/blackberry/alloy/widgets/foo/styles/widget.js
+++ /dev/null
@@ -1,20 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "foo/" + s : s.substring(0, index) + "/foo/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0002,
-    key: "Label",
-    style: {
-        color: "#000",
-        font: {
-            fontSize: 18,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1064/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1064/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 1d9e7d59d..000000000
--- a/test/apps/testing/ALOY-1064/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,137 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId2 = {};
-    var __alloyId5 = [];
-    var __alloyId6 = {
-        type: "Ti.UI.Label",
-        bindId: "title",
-        properties: {
-            bindId: "title"
-        }
-    };
-    __alloyId5.push(__alloyId6);
-    var __alloyId4 = {
-        properties: {
-            name: "first"
-        },
-        childTemplates: __alloyId5
-    };
-    __alloyId2["first"] = __alloyId4;
-    var __alloyId9 = [];
-    var __alloyId10 = {
-        type: "Ti.UI.Label",
-        bindId: "title",
-        properties: {
-            bindId: "title"
-        }
-    };
-    __alloyId9.push(__alloyId10);
-    var __alloyId11 = {
-        type: "Ti.UI.Label",
-        bindId: "subtitle",
-        properties: {
-            bindId: "subtitle"
-        }
-    };
-    __alloyId9.push(__alloyId11);
-    var __alloyId8 = {
-        properties: {
-            name: "second"
-        },
-        childTemplates: __alloyId9
-    };
-    __alloyId2["second"] = __alloyId8;
-    var __alloyId14 = [];
-    var __alloyId15 = {
-        type: "Ti.UI.ImageView",
-        bindId: "leftImage",
-        properties: {
-            bindId: "leftImage"
-        }
-    };
-    __alloyId14.push(__alloyId15);
-    var __alloyId16 = {
-        type: "Ti.UI.Label",
-        bindId: "title",
-        properties: {
-            bindId: "title"
-        }
-    };
-    __alloyId14.push(__alloyId16);
-    var __alloyId17 = {
-        type: "Ti.UI.Label",
-        bindId: "subtitle",
-        properties: {
-            bindId: "subtitle"
-        }
-    };
-    __alloyId14.push(__alloyId17);
-    var __alloyId13 = {
-        properties: {
-            name: "third"
-        },
-        childTemplates: __alloyId14
-    };
-    __alloyId2["third"] = __alloyId13;
-    var __alloyId20 = [];
-    $.__views.__alloyId21 = {
-        template: "first",
-        title: {
-            text: "this is some text"
-        },
-        properties: {
-            id: "__alloyId21"
-        }
-    };
-    __alloyId20.push($.__views.__alloyId21);
-    $.__views.__alloyId18 = Ti.UI.createListSection({
-        id: "__alloyId18"
-    });
-    $.__views.__alloyId18.items = __alloyId20;
-    var __alloyId22 = [];
-    __alloyId22.push($.__views.__alloyId18);
-    $.__views.__alloyId1 = Ti.UI.createListView({
-        sections: __alloyId22,
-        templates: __alloyId2,
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId0 = Alloy.createWidget("foo", "widget", {
-        id: "__alloyId0",
-        children: [ $.__views.__alloyId1 ],
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId0.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1064/_generated/mobileweb/alloy/widgets/foo/controllers/widget.js b/test/apps/testing/ALOY-1064/_generated/mobileweb/alloy/widgets/foo/controllers/widget.js
deleted file mode 100644
index bdd92171e..000000000
--- a/test/apps/testing/ALOY-1064/_generated/mobileweb/alloy/widgets/foo/controllers/widget.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "foo/" + s : s.substring(0, index) + "/foo/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("foo");
-    this.__widgetId = "foo";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1064/_generated/mobileweb/alloy/widgets/foo/styles/widget.js b/test/apps/testing/ALOY-1064/_generated/mobileweb/alloy/widgets/foo/styles/widget.js
deleted file mode 100644
index a815ef892..000000000
--- a/test/apps/testing/ALOY-1064/_generated/mobileweb/alloy/widgets/foo/styles/widget.js
+++ /dev/null
@@ -1,20 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "foo/" + s : s.substring(0, index) + "/foo/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "Label",
-    style: {
-        color: "#000",
-        font: {
-            fontSize: 18,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1064/config.json b/test/apps/testing/ALOY-1064/config.json
index 1ee1691b1..7c5db601c 100644
--- a/test/apps/testing/ALOY-1064/config.json
+++ b/test/apps/testing/ALOY-1064/config.json
@@ -4,9 +4,7 @@
 	"env:test": {},
 	"env:production": {},
 	"os:android": {},
-	"os:blackberry": {},
 	"os:ios": {},
-	"os:mobileweb": {},
 	"dependencies": {
 		"foo": "1.0"
 	}
diff --git a/test/apps/testing/ALOY-1064/widgets/foo/widget.json b/test/apps/testing/ALOY-1064/widgets/foo/widget.json
index c5b0716c3..bef57c8f5 100644
--- a/test/apps/testing/ALOY-1064/widgets/foo/widget.json
+++ b/test/apps/testing/ALOY-1064/widgets/foo/widget.json
@@ -9,5 +9,5 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"2.1",
 	"tags":"",
-	"platforms":"android,blackberry,ios,mobileweb"
+	"platforms":"android,ios"
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1067/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1067/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 53b375c65..000000000
--- a/test/apps/testing/ALOY-1067/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,76 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        font: {
-            fontSize: 12
-        },
-        text: "Support L() in XML as Label text",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        font: {
-            fontSize: 12
-        },
-        text: L("hello_world"),
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        font: {
-            fontSize: 12
-        },
-        text: L("hello_world"),
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1067/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1067/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 953c70cb1..000000000
--- a/test/apps/testing/ALOY-1067/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,70 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        font: {
-            fontSize: 12
-        },
-        text: "Support L() in XML as Label text",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        font: {
-            fontSize: 12
-        },
-        text: L("hello_world"),
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        font: {
-            fontSize: 12
-        },
-        text: L("hello_world"),
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1068/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1068/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 295ca8e04..000000000
--- a/test/apps/testing/ALOY-1068/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,76 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        font: {
-            fontSize: 12
-        },
-        text: L("foo"),
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        font: {
-            fontSize: 12
-        },
-        text: L("foo"),
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        font: {
-            fontSize: 12
-        },
-        textid: "foo",
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1068/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1068/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 3745b91d5..000000000
--- a/test/apps/testing/ALOY-1068/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,70 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        font: {
-            fontSize: 12
-        },
-        text: L("foo"),
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        font: {
-            fontSize: 12
-        },
-        text: L("foo"),
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: "25dp",
-        font: {
-            fontSize: 12
-        },
-        textid: "foo",
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1090/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1090/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 2e52c7684..000000000
--- a/test/apps/testing/ALOY-1090/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1090/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1090/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 320132673..000000000
--- a/test/apps/testing/ALOY-1090/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createButton({
-        title: "Click",
-        bottom: 5,
-        width: Ti.UI.FILL,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1090/views/index.xml b/test/apps/testing/ALOY-1090/views/index.xml
index 5bc88ebcd..227cb899c 100644
--- a/test/apps/testing/ALOY-1090/views/index.xml
+++ b/test/apps/testing/ALOY-1090/views/index.xml
@@ -1,5 +1,5 @@
 <Alloy>
-	<Window platform="ios , android, mobileweb " exitOnClose="true">
+	<Window platform="ios , android " exitOnClose="true">
 		<Button bottom="5" width="Ti.UI.FILL">Click</Button>
 	</Window>
 </Alloy>
diff --git a/test/apps/testing/ALOY-1092/_generated/blackberry/alloy/controllers/childWindow.js b/test/apps/testing/ALOY-1092/_generated/blackberry/alloy/controllers/childWindow.js
deleted file mode 100644
index 3bc6e8e1e..000000000
--- a/test/apps/testing/ALOY-1092/_generated/blackberry/alloy/controllers/childWindow.js
+++ /dev/null
@@ -1,35 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "childWindow";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    arguments[0] || {};
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1092/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1092/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index ac92a9742..000000000
--- a/test/apps/testing/ALOY-1092/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,132 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function myFunction() {
-        return true;
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        layout: "vertical",
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label1 = Ti.UI.createLabel(function() {
-        var o = {};
-        _.extend(o, {
-            top: 20,
-            left: 0,
-            font: {
-                fontSize: "14dp"
-            },
-            color: "black"
-        });
-        Alloy.Globals.isiPhone6 && _.extend(o, {
-            font: {
-                fontSize: "16dp"
-            },
-            color: "green"
-        });
-        _.extend(o, {
-            color: "blue",
-            text: "This is a label",
-            id: "label1"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.label1);
-    $.__views.label2 = Ti.UI.createLabel(function() {
-        var o = {};
-        _.extend(o, {
-            top: 20,
-            left: 0,
-            font: {
-                fontSize: "14dp"
-            },
-            color: "black"
-        });
-        Alloy.Globals.isiPhone6 && _.extend(o, {
-            font: {
-                fontSize: "16dp"
-            },
-            color: "green"
-        });
-        _.extend(o, {
-            color: "blue",
-            text: "This is also a label",
-            id: "label2"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.label2);
-    $.__views.label3 = Ti.UI.createLabel(function() {
-        var o = {};
-        _.extend(o, {
-            top: 20,
-            left: 0,
-            font: {
-                fontSize: "14dp"
-            },
-            color: "black"
-        });
-        Alloy.Globals.isiPhone6 && _.extend(o, {
-            font: {
-                fontSize: "16dp"
-            },
-            color: "green"
-        });
-        _.extend(o, {
-            color: "blue",
-            text: "Tap for new Window"
-        });
-        myFunction() && _.extend(o, {
-            font: {
-                fontSize: "18dp"
-            },
-            color: "red"
-        });
-        _.extend(o, {
-            id: "label3"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.label3);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.label3.addEventListener("click", function() {
-        var child = Alloy.createController("childWindow", {
-            someProperty: true
-        });
-        console.log("__controllerPath = " + child.__controllerPath);
-        console.log("args = " + JSON.stringify(child.args));
-        child.getView().open();
-    });
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1092/_generated/mobileweb/alloy/controllers/childWindow.js b/test/apps/testing/ALOY-1092/_generated/mobileweb/alloy/controllers/childWindow.js
deleted file mode 100644
index ce2b3da73..000000000
--- a/test/apps/testing/ALOY-1092/_generated/mobileweb/alloy/controllers/childWindow.js
+++ /dev/null
@@ -1,96 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClose() {
-        $.navWin.close();
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "childWindow";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.childWindow = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        layout: "vertical",
-        id: "childWindow"
-    });
-    $.__views.childWindow && $.addTopLevelView($.__views.childWindow);
-    $.__views.navWin = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        layout: "vertical",
-        title: "Child window",
-        id: "navWin"
-    });
-    $.__views.close = Ti.UI.createButton({
-        id: "close",
-        title: "Close"
-    });
-    doClose ? $.addListener($.__views.close, "click", doClose) : __defers["$.__views.close!click!doClose"] = true;
-    $.__views.navWin.leftNavButton = $.__views.close;
-    $.__views.argLabel = Ti.UI.createLabel(function() {
-        var o = {};
-        Alloy.deepExtend(true, o, {
-            height: Ti.UI.SIZE,
-            width: Ti.UI.SIZE,
-            color: "#000",
-            textAlign: "center",
-            font: {
-                fontSize: "24dp",
-                fontWeight: "bold"
-            },
-            text: "args.someProperty is falsey",
-            top: 25
-        });
-        $.args.someProperty && Alloy.deepExtend(true, o, {
-            text: "args.someProperty is truthy"
-        });
-        Alloy.deepExtend(true, o, {
-            id: "argLabel"
-        });
-        return o;
-    }());
-    $.__views.navWin.add($.__views.argLabel);
-    if ($.args.someProperty) {
-        $.__views.argLabelTwo = Ti.UI.createLabel({
-            height: Ti.UI.SIZE,
-            width: Ti.UI.SIZE,
-            color: "#000",
-            textAlign: "center",
-            font: {
-                fontSize: "24dp",
-                fontWeight: "bold"
-            },
-            text: "XML-based if condition",
-            top: 25,
-            id: "argLabelTwo"
-        });
-        $.__views.navWin.add($.__views.argLabelTwo);
-    }
-    $.__views.__alloyId0 = Ti.UI.MobileWeb.createNavigationGroup({
-        window: $.__views.navWin,
-        id: "__alloyId0"
-    });
-    $.__views.childWindow.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    arguments[0] || {};
-    __defers["$.__views.close!click!doClose"] && $.addListener($.__views.close, "click", doClose);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1092/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1092/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index b73f1df67..000000000
--- a/test/apps/testing/ALOY-1092/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,126 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function myFunction() {
-        return true;
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        layout: "vertical",
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label1 = Ti.UI.createLabel(function() {
-        var o = {};
-        Alloy.deepExtend(true, o, {
-            top: 20,
-            left: 0,
-            font: {
-                fontSize: "14dp"
-            },
-            color: "black"
-        });
-        Alloy.Globals.isiPhone6 && Alloy.deepExtend(true, o, {
-            font: {
-                fontSize: "16dp"
-            },
-            color: "green"
-        });
-        Alloy.deepExtend(true, o, {
-            color: "blue",
-            text: "This is a label",
-            id: "label1"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.label1);
-    $.__views.label2 = Ti.UI.createLabel(function() {
-        var o = {};
-        Alloy.deepExtend(true, o, {
-            top: 20,
-            left: 0,
-            font: {
-                fontSize: "14dp"
-            },
-            color: "black"
-        });
-        Alloy.Globals.isiPhone6 && Alloy.deepExtend(true, o, {
-            font: {
-                fontSize: "16dp"
-            },
-            color: "green"
-        });
-        Alloy.deepExtend(true, o, {
-            color: "blue",
-            text: "This is also a label",
-            id: "label2"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.label2);
-    $.__views.label3 = Ti.UI.createLabel(function() {
-        var o = {};
-        Alloy.deepExtend(true, o, {
-            top: 20,
-            left: 0,
-            font: {
-                fontSize: "14dp"
-            },
-            color: "black"
-        });
-        Alloy.Globals.isiPhone6 && Alloy.deepExtend(true, o, {
-            font: {
-                fontSize: "16dp"
-            },
-            color: "green"
-        });
-        Alloy.deepExtend(true, o, {
-            color: "blue",
-            text: "Tap for new Window"
-        });
-        myFunction() && Alloy.deepExtend(true, o, {
-            font: {
-                fontSize: "18dp"
-            },
-            color: "red"
-        });
-        Alloy.deepExtend(true, o, {
-            id: "label3"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.label3);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.label3.addEventListener("click", function() {
-        var child = Alloy.createController("childWindow", {
-            someProperty: true
-        });
-        console.log("__controllerPath = " + child.__controllerPath);
-        console.log("args = " + JSON.stringify(child.args));
-        child.getView().open();
-    });
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1092/views/childWindow.xml b/test/apps/testing/ALOY-1092/views/childWindow.xml
index 4cc581ebd..aae3d333d 100644
--- a/test/apps/testing/ALOY-1092/views/childWindow.xml
+++ b/test/apps/testing/ALOY-1092/views/childWindow.xml
@@ -13,18 +13,4 @@
 		<Label id="argLabel"/>
 			<Label id="argLabelTwo" if="$.args.someProperty" text="XML-based if condition"/>
 	</Window>
-
-	<Window platform="mobileweb">
-		<NavigationGroup>
-			<Window title="Child window" id="navWin">
-			<LeftNavButton>
-				<Button id="close" title="Close" onClick="doClose"/>
-			</LeftNavButton>
-			<Label id="argLabel"/>
-			<Label id="argLabelTwo" if="$.args.someProperty" text="XML-based if condition"/>
-			</Window>
-		</NavigationGroup>
-	</Window>
-
-
 </Alloy>
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1098/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1098/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 8828797d9..000000000
--- a/test/apps/testing/ALOY-1098/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1098/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1098/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index f889d4363..000000000
--- a/test/apps/testing/ALOY-1098/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,45 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        color: "black",
-        font: {
-            fontSize: "14dp"
-        },
-        text: "This app is for Android only",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1098/views/index.xml b/test/apps/testing/ALOY-1098/views/index.xml
index 0249eff60..805137740 100644
--- a/test/apps/testing/ALOY-1098/views/index.xml
+++ b/test/apps/testing/ALOY-1098/views/index.xml
@@ -13,7 +13,7 @@
 		  </MenuItem>
 		  <MenuItem title="Normal"/>
 		</Menu>
-		<Label platform="ios,mobileweb" text="This app is for Android only"/>
+		<Label platform="ios" text="This app is for Android only"/>
 		<Label platform="android" text="Tap search icon to expand ActionView"/>
 	</Window>
 </Alloy>
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1103/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1103/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index a4995ae3f..000000000
--- a/test/apps/testing/ALOY-1103/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,114 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    if (Alloy.isTablet) {
-        $.__views.__alloyId2 = Ti.UI.createView({
-            id: "__alloyId2"
-        });
-        $.__views.__alloyId3 = Ti.UI.createLabel({
-            font: {
-                fontSize: "20dp",
-                color: "black"
-            },
-            text: "HeaderView Tablet",
-            id: "__alloyId3"
-        });
-        $.__views.__alloyId2.add($.__views.__alloyId3);
-    }
-    if (!Alloy.isTablet) {
-        $.__views.__alloyId5 = Ti.UI.createView({
-            id: "__alloyId5"
-        });
-        $.__views.__alloyId6 = Ti.UI.createLabel({
-            font: {
-                fontSize: "20dp",
-                color: "black"
-            },
-            text: "HeaderView Handheld",
-            id: "__alloyId6"
-        });
-        $.__views.__alloyId5.add($.__views.__alloyId6);
-    }
-    $.__views.__alloyId0 = Ti.UI.createTableView(function() {
-        var o = {};
-        Alloy.isTablet && _.extend(o, {
-            headerView: $.__views.__alloyId2
-        });
-        Alloy.isHandheld && _.extend(o, {
-            headerView: $.__views.__alloyId5
-        });
-        _.extend(o, {
-            height: "80%",
-            id: "__alloyId0"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.__alloyId0);
-    if (Alloy.isTablet) {
-        $.__views.__alloyId7 = Ti.UI.createView({
-            id: "__alloyId7"
-        });
-        $.__views.index.add($.__views.__alloyId7);
-        $.__views.__alloyId8 = Ti.UI.createLabel({
-            font: {
-                fontSize: "20dp",
-                color: "black"
-            },
-            text: "View Tablet",
-            id: "__alloyId8"
-        });
-        $.__views.__alloyId7.add($.__views.__alloyId8);
-    }
-    if (!Alloy.isTablet) {
-        $.__views.__alloyId9 = Ti.UI.createView({
-            id: "__alloyId9"
-        });
-        $.__views.index.add($.__views.__alloyId9);
-        $.__views.__alloyId10 = Ti.UI.createLabel({
-            font: {
-                fontSize: "20dp",
-                color: "black"
-            },
-            text: "View Handheld",
-            id: "__alloyId10"
-        });
-        $.__views.__alloyId9.add($.__views.__alloyId10);
-    }
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1103/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1103/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 671366e8f..000000000
--- a/test/apps/testing/ALOY-1103/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,108 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    if (Alloy.isTablet) {
-        $.__views.__alloyId2 = Ti.UI.createView({
-            id: "__alloyId2"
-        });
-        $.__views.__alloyId3 = Ti.UI.createLabel({
-            font: {
-                fontSize: "20dp",
-                color: "black"
-            },
-            text: "HeaderView Tablet",
-            id: "__alloyId3"
-        });
-        $.__views.__alloyId2.add($.__views.__alloyId3);
-    }
-    if (!Alloy.isTablet) {
-        $.__views.__alloyId5 = Ti.UI.createView({
-            id: "__alloyId5"
-        });
-        $.__views.__alloyId6 = Ti.UI.createLabel({
-            font: {
-                fontSize: "20dp",
-                color: "black"
-            },
-            text: "HeaderView Handheld",
-            id: "__alloyId6"
-        });
-        $.__views.__alloyId5.add($.__views.__alloyId6);
-    }
-    $.__views.__alloyId0 = Ti.UI.createTableView(function() {
-        var o = {};
-        Alloy.isTablet && Alloy.deepExtend(true, o, {
-            headerView: $.__views.__alloyId2
-        });
-        Alloy.isHandheld && Alloy.deepExtend(true, o, {
-            headerView: $.__views.__alloyId5
-        });
-        Alloy.deepExtend(true, o, {
-            height: "80%",
-            id: "__alloyId0"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.__alloyId0);
-    if (Alloy.isTablet) {
-        $.__views.__alloyId7 = Ti.UI.createView({
-            id: "__alloyId7"
-        });
-        $.__views.index.add($.__views.__alloyId7);
-        $.__views.__alloyId8 = Ti.UI.createLabel({
-            font: {
-                fontSize: "20dp",
-                color: "black"
-            },
-            text: "View Tablet",
-            id: "__alloyId8"
-        });
-        $.__views.__alloyId7.add($.__views.__alloyId8);
-    }
-    if (!Alloy.isTablet) {
-        $.__views.__alloyId9 = Ti.UI.createView({
-            id: "__alloyId9"
-        });
-        $.__views.index.add($.__views.__alloyId9);
-        $.__views.__alloyId10 = Ti.UI.createLabel({
-            font: {
-                fontSize: "20dp",
-                color: "black"
-            },
-            text: "View Handheld",
-            id: "__alloyId10"
-        });
-        $.__views.__alloyId9.add($.__views.__alloyId10);
-    }
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1112/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1112/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index a87339415..000000000
--- a/test/apps/testing/ALOY-1112/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,67 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: 30,
-        color: "#000",
-        font: {
-            fontSize: 12
-        },
-        text: "Background should be YELLOW on ios & android, WHITE on mobile web",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.lbl1 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: 30,
-        color: "#000",
-        font: {
-            fontSize: 12
-        },
-        text: "This should be RED on ios and android handheld, BLACK on others",
-        id: "lbl1"
-    });
-    $.__views.index.add($.__views.lbl1);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1112/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1112/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index de4614475..000000000
--- a/test/apps/testing/ALOY-1112/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: 30,
-        color: "#000",
-        font: {
-            fontSize: 12
-        },
-        text: "Background should be YELLOW on ios & android, WHITE on mobile web",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.lbl1 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        top: 30,
-        color: "#000",
-        font: {
-            fontSize: 12
-        },
-        text: "This should be RED on ios and android handheld, BLACK on others",
-        id: "lbl1"
-    });
-    $.__views.index.add($.__views.lbl1);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1122/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1122/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 9fafb7264..000000000
--- a/test/apps/testing/ALOY-1122/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,60 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick() {
-        alert("The sum of 1+2 is " + util.sum(1, 2));
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "Click to add some numbers",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    doClick ? $.__views.__alloyId0.addEventListener("click", doClick) : __defers["$.__views.__alloyId0!click!doClick"] = true;
-    $.__views.__alloyId1 = Ti.UI.createImageView({
-        image: "/appcelerator.png",
-        bottom: "0",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var util = require("util");
-    $.index.open();
-    __defers["$.__views.__alloyId0!click!doClick"] && $.__views.__alloyId0.addEventListener("click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1122/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1122/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 34714bcb9..000000000
--- a/test/apps/testing/ALOY-1122/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick() {
-        alert("The sum of 1+2 is " + util.sum(1, 2));
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "Click to add some numbers",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    doClick ? $.addListener($.__views.__alloyId0, "click", doClick) : __defers["$.__views.__alloyId0!click!doClick"] = true;
-    $.__views.__alloyId1 = Ti.UI.createImageView({
-        image: "/appcelerator.png",
-        bottom: 0,
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var util = require("util");
-    $.index.open();
-    __defers["$.__views.__alloyId0!click!doClick"] && $.addListener($.__views.__alloyId0, "click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1122/assets/mobileweb/appcelerator.png b/test/apps/testing/ALOY-1122/assets/mobileweb/appcelerator.png
deleted file mode 100644
index 1534670c7..000000000
Binary files a/test/apps/testing/ALOY-1122/assets/mobileweb/appcelerator.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-1122/lib/util.js b/test/apps/testing/ALOY-1122/lib/util.js
deleted file mode 100644
index 6de3bb259..000000000
--- a/test/apps/testing/ALOY-1122/lib/util.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// for MobileWeb, BlackBerry
-exports.sum = function(a, b) {
-    return a + b;
-};
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1127/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1127/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 48cafdbcf..000000000
--- a/test/apps/testing/ALOY-1127/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    Alloy.Collections.instance("test");
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    Ti.API.info("aloy1127: " + Ti.App.Properties.hasProperty("aloy1127"));
-    if (!Ti.App.Properties.hasProperty("aloy1127")) {
-        for (var i = 1, j = 7; j > i; i++) Alloy.createModel("test", {
-            username: "User " + i
-        }).save();
-        Ti.App.Properties.setString("aloy1127", "yes");
-    }
-    Alloy.Collections.test.fetch();
-    $.index.addEventListener("open", function() {
-        $.destroy();
-    });
-    $.index.open();
-    render();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1127/_generated/blackberry/alloy/models/Test.js b/test/apps/testing/ALOY-1127/_generated/blackberry/alloy/models/Test.js
deleted file mode 100644
index 4048941c6..000000000
--- a/test/apps/testing/ALOY-1127/_generated/blackberry/alloy/models/Test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            username: "text"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "test"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("test", exports.definition, []);
-
-collection = Alloy.C("test", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1127/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1127/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 04ae22245..000000000
--- a/test/apps/testing/ALOY-1127/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    Alloy.Collections.instance("test");
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    Ti.API.info("aloy1127: " + Ti.App.Properties.hasProperty("aloy1127"));
-    if (!Ti.App.Properties.hasProperty("aloy1127")) {
-        for (var i = 1, j = 7; j > i; i++) Alloy.createModel("test", {
-            username: "User " + i
-        }).save();
-        Ti.App.Properties.setString("aloy1127", "yes");
-    }
-    Alloy.Collections.test.fetch();
-    $.index.addEventListener("open", function() {
-        $.destroy();
-    });
-    $.index.open();
-    render();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1127/_generated/mobileweb/alloy/models/Test.js b/test/apps/testing/ALOY-1127/_generated/mobileweb/alloy/models/Test.js
deleted file mode 100644
index 26d10f1e1..000000000
--- a/test/apps/testing/ALOY-1127/_generated/mobileweb/alloy/models/Test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            username: "text"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "test"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("test", exports.definition, []);
-
-collection = Alloy.C("test", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1152/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1152/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index d4c0e2e0c..000000000
--- a/test/apps/testing/ALOY-1152/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,207 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        top: "20dp",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId1 = {};
-    var __alloyId4 = [];
-    ({
-        type: "Ti.UI.Label",
-        bindId: "lHintText",
-        properties: {
-            height: Ti.UI.SIZE,
-            width: Ti.UI.FILL,
-            textAlign: "left",
-            color: "#000",
-            bottom: 0,
-            font: {
-                fontSize: 10,
-                fontWeight: "bold"
-            },
-            bindId: "lHintText"
-        }
-    });
-    var __alloyId8 = {
-        type: "Ti.UI.TextArea",
-        bindId: "cMsg",
-        childTemplates: function() {
-            var __alloyId9 = [];
-            var __alloyId10 = {
-                type: "Ti.UI.Label",
-                bindId: "lHintText",
-                properties: {
-                    height: Ti.UI.SIZE,
-                    width: Ti.UI.FILL,
-                    textAlign: "left",
-                    color: "#000",
-                    bottom: 0,
-                    font: {
-                        fontSize: 10,
-                        fontWeight: "bold"
-                    },
-                    bindId: "lHintText"
-                }
-            };
-            __alloyId9.push(__alloyId10);
-            return __alloyId9;
-        }(),
-        properties: {
-            height: "30",
-            width: Ti.UI.FILL,
-            textAlign: "left",
-            left: 10,
-            font: {
-                fontSize: 12,
-                fontWeight: "bold"
-            },
-            bindId: "cMsg"
-        }
-    };
-    __alloyId4.push(__alloyId8);
-    var __alloyId3 = {
-        properties: {
-            name: "tMsg"
-        },
-        childTemplates: __alloyId4
-    };
-    __alloyId1["tMsg"] = __alloyId3;
-    var __alloyId13 = [];
-    ({
-        type: "Ti.UI.Label",
-        bindId: "lHintText",
-        properties: {
-            height: Ti.UI.SIZE,
-            width: Ti.UI.FILL,
-            textAlign: "left",
-            color: "#000",
-            bottom: 0,
-            font: {
-                fontSize: 10,
-                fontWeight: "bold"
-            },
-            bindId: "lHintText"
-        }
-    });
-    var __alloyId17 = {
-        type: "Ti.UI.TextField",
-        bindId: "cMsg",
-        childTemplates: function() {
-            var __alloyId18 = [];
-            var __alloyId19 = {
-                type: "Ti.UI.Label",
-                bindId: "lHintText",
-                properties: {
-                    height: Ti.UI.SIZE,
-                    width: Ti.UI.FILL,
-                    textAlign: "left",
-                    color: "#000",
-                    bottom: 0,
-                    font: {
-                        fontSize: 10,
-                        fontWeight: "bold"
-                    },
-                    bindId: "lHintText"
-                }
-            };
-            __alloyId18.push(__alloyId19);
-            return __alloyId18;
-        }(),
-        properties: {
-            height: "30",
-            width: Ti.UI.FILL,
-            textAlign: "left",
-            left: 10,
-            font: {
-                fontSize: 12,
-                fontWeight: "bold"
-            },
-            bindId: "cMsg"
-        }
-    };
-    __alloyId13.push(__alloyId17);
-    var __alloyId12 = {
-        properties: {
-            name: "fMsg"
-        },
-        childTemplates: __alloyId13
-    };
-    __alloyId1["fMsg"] = __alloyId12;
-    var __alloyId22 = [];
-    $.__views.__alloyId23 = {
-        properties: {
-            itemId: "liMessage",
-            id: "__alloyId23"
-        },
-        template: "tMsg",
-        cMsg: {
-            value: "TEXTAREA"
-        },
-        lHintText: {
-            text: "CHILD LABEL"
-        }
-    };
-    __alloyId22.push($.__views.__alloyId23);
-    $.__views.__alloyId24 = {
-        properties: {
-            itemId: "liMessage",
-            id: "__alloyId24"
-        },
-        template: "fMsg",
-        cMsg: {
-            value: "TEXTFIELD"
-        },
-        lHintText: {
-            text: "CHILD LABEL"
-        }
-    };
-    __alloyId22.push($.__views.__alloyId24);
-    $.__views.__alloyId20 = Ti.UI.createListSection({
-        id: "__alloyId20"
-    });
-    $.__views.__alloyId20.items = __alloyId22;
-    var __alloyId25 = [];
-    __alloyId25.push($.__views.__alloyId20);
-    $.__views.__alloyId0 = Ti.UI.createListView({
-        sections: __alloyId25,
-        templates: __alloyId1,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1152/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1152/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 8f6bd072f..000000000
--- a/test/apps/testing/ALOY-1152/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,201 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        top: "20dp",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId1 = {};
-    var __alloyId4 = [];
-    ({
-        type: "Ti.UI.Label",
-        bindId: "lHintText",
-        properties: {
-            height: Ti.UI.SIZE,
-            width: Ti.UI.FILL,
-            textAlign: "left",
-            color: "#000",
-            bottom: 0,
-            font: {
-                fontSize: 10,
-                fontWeight: "bold"
-            },
-            bindId: "lHintText"
-        }
-    });
-    var __alloyId8 = {
-        type: "Ti.UI.TextArea",
-        bindId: "cMsg",
-        childTemplates: function() {
-            var __alloyId9 = [];
-            var __alloyId10 = {
-                type: "Ti.UI.Label",
-                bindId: "lHintText",
-                properties: {
-                    height: Ti.UI.SIZE,
-                    width: Ti.UI.FILL,
-                    textAlign: "left",
-                    color: "#000",
-                    bottom: 0,
-                    font: {
-                        fontSize: 10,
-                        fontWeight: "bold"
-                    },
-                    bindId: "lHintText"
-                }
-            };
-            __alloyId9.push(__alloyId10);
-            return __alloyId9;
-        }(),
-        properties: {
-            height: "30",
-            width: Ti.UI.FILL,
-            textAlign: "left",
-            left: 10,
-            font: {
-                fontSize: 12,
-                fontWeight: "bold"
-            },
-            bindId: "cMsg"
-        }
-    };
-    __alloyId4.push(__alloyId8);
-    var __alloyId3 = {
-        properties: {
-            name: "tMsg"
-        },
-        childTemplates: __alloyId4
-    };
-    __alloyId1["tMsg"] = __alloyId3;
-    var __alloyId13 = [];
-    ({
-        type: "Ti.UI.Label",
-        bindId: "lHintText",
-        properties: {
-            height: Ti.UI.SIZE,
-            width: Ti.UI.FILL,
-            textAlign: "left",
-            color: "#000",
-            bottom: 0,
-            font: {
-                fontSize: 10,
-                fontWeight: "bold"
-            },
-            bindId: "lHintText"
-        }
-    });
-    var __alloyId17 = {
-        type: "Ti.UI.TextField",
-        bindId: "cMsg",
-        childTemplates: function() {
-            var __alloyId18 = [];
-            var __alloyId19 = {
-                type: "Ti.UI.Label",
-                bindId: "lHintText",
-                properties: {
-                    height: Ti.UI.SIZE,
-                    width: Ti.UI.FILL,
-                    textAlign: "left",
-                    color: "#000",
-                    bottom: 0,
-                    font: {
-                        fontSize: 10,
-                        fontWeight: "bold"
-                    },
-                    bindId: "lHintText"
-                }
-            };
-            __alloyId18.push(__alloyId19);
-            return __alloyId18;
-        }(),
-        properties: {
-            height: "30",
-            width: Ti.UI.FILL,
-            textAlign: "left",
-            left: 10,
-            font: {
-                fontSize: 12,
-                fontWeight: "bold"
-            },
-            bindId: "cMsg"
-        }
-    };
-    __alloyId13.push(__alloyId17);
-    var __alloyId12 = {
-        properties: {
-            name: "fMsg"
-        },
-        childTemplates: __alloyId13
-    };
-    __alloyId1["fMsg"] = __alloyId12;
-    var __alloyId22 = [];
-    $.__views.__alloyId23 = {
-        properties: {
-            itemId: "liMessage",
-            id: "__alloyId23"
-        },
-        template: "tMsg",
-        cMsg: {
-            value: "TEXTAREA"
-        },
-        lHintText: {
-            text: "CHILD LABEL"
-        }
-    };
-    __alloyId22.push($.__views.__alloyId23);
-    $.__views.__alloyId24 = {
-        properties: {
-            itemId: "liMessage",
-            id: "__alloyId24"
-        },
-        template: "fMsg",
-        cMsg: {
-            value: "TEXTFIELD"
-        },
-        lHintText: {
-            text: "CHILD LABEL"
-        }
-    };
-    __alloyId22.push($.__views.__alloyId24);
-    $.__views.__alloyId20 = Ti.UI.createListSection({
-        id: "__alloyId20"
-    });
-    $.__views.__alloyId20.items = __alloyId22;
-    var __alloyId25 = [];
-    __alloyId25.push($.__views.__alloyId20);
-    $.__views.__alloyId0 = Ti.UI.createListView({
-        sections: __alloyId25,
-        templates: __alloyId1,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1175/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1175/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 0ffb3f8a9..000000000
--- a/test/apps/testing/ALOY-1175/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,45 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.win = Ti.UI.createWindow({
-        id: "win"
-    });
-    $.__views.win && $.addTopLevelView($.__views.win);
-    $.__views.msg = Ti.UI.createLabel({
-        color: "white",
-        text: "This example for Android only",
-        id: "msg"
-    });
-    $.__views.win.add($.__views.msg);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.win.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1175/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1175/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 51a787281..000000000
--- a/test/apps/testing/ALOY-1175/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,39 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.win = Ti.UI.createWindow({
-        id: "win"
-    });
-    $.__views.win && $.addTopLevelView($.__views.win);
-    $.__views.msg = Ti.UI.createLabel({
-        color: "white",
-        text: "This example for Android only",
-        id: "msg"
-    });
-    $.__views.win.add($.__views.msg);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.win.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1177/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-1177/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index d59d5e0df..000000000
--- a/test/apps/testing/ALOY-1177/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,127 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId1 = [];
-    $.__views.__alloyId4 = Ti.UI.createView({
-        backgroundColor: "#a00",
-        height: "50dp",
-        id: "__alloyId4"
-    });
-    $.__views.__alloyId6 = Ti.UI.createView({
-        backgroundColor: "#0a0",
-        height: "50dp",
-        id: "__alloyId6"
-    });
-    $.__views.__alloyId2 = Ti.UI.createTableViewSection({
-        headerView: $.__views.__alloyId4,
-        footerView: $.__views.__alloyId6,
-        id: "__alloyId2"
-    });
-    __alloyId1.push($.__views.__alloyId2);
-    $.__views.__alloyId7 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 1",
-        id: "__alloyId7"
-    });
-    $.__views.__alloyId2.add($.__views.__alloyId7);
-    $.__views.__alloyId8 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 2",
-        id: "__alloyId8"
-    });
-    $.__views.__alloyId2.add($.__views.__alloyId8);
-    $.__views.__alloyId9 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 3",
-        id: "__alloyId9"
-    });
-    $.__views.__alloyId2.add($.__views.__alloyId9);
-    $.__views.__alloyId10 = Ti.UI.createTableViewSection({
-        headerTitle: "Section 2",
-        id: "__alloyId10"
-    });
-    __alloyId1.push($.__views.__alloyId10);
-    $.__views.__alloyId11 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 1",
-        id: "__alloyId11"
-    });
-    $.__views.__alloyId10.add($.__views.__alloyId11);
-    $.__views.__alloyId12 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 2",
-        id: "__alloyId12"
-    });
-    $.__views.__alloyId10.add($.__views.__alloyId12);
-    $.__views.__alloyId13 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 3",
-        id: "__alloyId13"
-    });
-    $.__views.__alloyId10.add($.__views.__alloyId13);
-    $.__views.__alloyId14 = Ti.UI.createTableViewSection({
-        headerTitle: "Section 3",
-        id: "__alloyId14"
-    });
-    __alloyId1.push($.__views.__alloyId14);
-    $.__views.__alloyId15 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 1",
-        id: "__alloyId15"
-    });
-    $.__views.__alloyId14.add($.__views.__alloyId15);
-    $.__views.__alloyId16 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 2",
-        id: "__alloyId16"
-    });
-    $.__views.__alloyId14.add($.__views.__alloyId16);
-    $.__views.__alloyId17 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 3",
-        id: "__alloyId17"
-    });
-    $.__views.__alloyId14.add($.__views.__alloyId17);
-    $.__views.__alloyId0 = Ti.UI.createTableView({
-        data: __alloyId1,
-        filterAttribute: "title",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1177/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1177/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index aaa463afd..000000000
--- a/test/apps/testing/ALOY-1177/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,121 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId1 = [];
-    $.__views.__alloyId4 = Ti.UI.createView({
-        backgroundColor: "#a00",
-        height: "50dp",
-        id: "__alloyId4"
-    });
-    $.__views.__alloyId6 = Ti.UI.createView({
-        backgroundColor: "#0a0",
-        height: "50dp",
-        id: "__alloyId6"
-    });
-    $.__views.__alloyId2 = Ti.UI.createTableViewSection({
-        headerView: $.__views.__alloyId4,
-        footerView: $.__views.__alloyId6,
-        id: "__alloyId2"
-    });
-    __alloyId1.push($.__views.__alloyId2);
-    $.__views.__alloyId7 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 1",
-        id: "__alloyId7"
-    });
-    $.__views.__alloyId2.add($.__views.__alloyId7);
-    $.__views.__alloyId8 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 2",
-        id: "__alloyId8"
-    });
-    $.__views.__alloyId2.add($.__views.__alloyId8);
-    $.__views.__alloyId9 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 3",
-        id: "__alloyId9"
-    });
-    $.__views.__alloyId2.add($.__views.__alloyId9);
-    $.__views.__alloyId10 = Ti.UI.createTableViewSection({
-        headerTitle: "Section 2",
-        id: "__alloyId10"
-    });
-    __alloyId1.push($.__views.__alloyId10);
-    $.__views.__alloyId11 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 1",
-        id: "__alloyId11"
-    });
-    $.__views.__alloyId10.add($.__views.__alloyId11);
-    $.__views.__alloyId12 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 2",
-        id: "__alloyId12"
-    });
-    $.__views.__alloyId10.add($.__views.__alloyId12);
-    $.__views.__alloyId13 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 3",
-        id: "__alloyId13"
-    });
-    $.__views.__alloyId10.add($.__views.__alloyId13);
-    $.__views.__alloyId14 = Ti.UI.createTableViewSection({
-        headerTitle: "Section 3",
-        id: "__alloyId14"
-    });
-    __alloyId1.push($.__views.__alloyId14);
-    $.__views.__alloyId15 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 1",
-        id: "__alloyId15"
-    });
-    $.__views.__alloyId14.add($.__views.__alloyId15);
-    $.__views.__alloyId16 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 2",
-        id: "__alloyId16"
-    });
-    $.__views.__alloyId14.add($.__views.__alloyId16);
-    $.__views.__alloyId17 = Ti.UI.createTableViewRow({
-        height: "50dp",
-        title: "Row 3",
-        id: "__alloyId17"
-    });
-    $.__views.__alloyId14.add($.__views.__alloyId17);
-    $.__views.__alloyId0 = Ti.UI.createTableView({
-        data: __alloyId1,
-        filterAttribute: "title",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1280/controllers/index.js b/test/apps/testing/ALOY-1280/controllers/index.js
deleted file mode 100644
index a46fce263..000000000
--- a/test/apps/testing/ALOY-1280/controllers/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-function onButtonClick(e) {
-	alert('onButtonClick');
-}
-
-function onToggleButtonClick(e) {
-	alert('onToggleButtonClick');
-}
-
-
-$.index.open();
diff --git a/test/apps/testing/ALOY-1280/styles/index.tss b/test/apps/testing/ALOY-1280/styles/index.tss
deleted file mode 100644
index f3c4157ad..000000000
--- a/test/apps/testing/ALOY-1280/styles/index.tss
+++ /dev/null
@@ -1,3 +0,0 @@
-".container": {
-	backgroundColor:"white"
-}
diff --git a/test/apps/testing/ALOY-1280/views/index.xml b/test/apps/testing/ALOY-1280/views/index.xml
deleted file mode 100644
index 9ebfd3748..000000000
--- a/test/apps/testing/ALOY-1280/views/index.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Alloy>
-	<Window class="container">
-		<CommandBar platform="windows">
-			<Items>
-				<AppBarButton icon="Ti.UI.Windows.SystemIcon.ADD" onClick="onButtonClick"/>
-				<!-- Support shorthand notation, that is, omit the namespace -->
-				<AppBarToggleButton icon="LIKEDISLIKE" onClick="onToggleButtonClick"/>
-				<AppBarSeparator />
-				<AppBarToggleButton icon="Ti.UI.Windows.SystemIcon.FAVORITE" />
-			</Items>
-		</CommandBar>
-	</Window>
-</Alloy>
diff --git a/test/apps/testing/ALOY-1304/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1304/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100755
index 241e54260..000000000
--- a/test/apps/testing/ALOY-1304/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,98 +0,0 @@
-var Alloy = require('/alloy'),
-Backbone = Alloy.Backbone,
-_ = Alloy._;
-
-
-
-
-function __processArg(obj, key) {
-	var arg = null;
-	if (obj) {
-		arg = obj[key] || null;
-	}
-	return arg;
-}
-
-function Controller() {
-
-	require('/alloy/controllers/' + 'BaseController').apply(this, Array.prototype.slice.call(arguments));
-	this.__controllerPath = 'index';
-	this.args = arguments[0] || {};
-
-	if (arguments[0]) {
-		var __parentSymbol = __processArg(arguments[0], '__parentSymbol');
-		var $model = __processArg(arguments[0], '$model');
-		var __itemTemplate = __processArg(arguments[0], '__itemTemplate');
-	}
-	var $ = this;
-	var exports = {};
-	var __defers = {};
-
-
-
-
-
-
-
-	$.__views.index = Ti.UI.createWindow(
-	{ backgroundColor: "#fff", fullscreen: false, exitOnClose: true, layout: "vertical", id: "index" });
-
-	$.__views.index && $.addTopLevelView($.__views.index);
-	$.__views.__alloyId0 = Ti.UI.createLabel(
-	{ text: 'Hello', top: 20, width: 100, backgroundColor: "#ccc", id: "__alloyId0" });
-
-	$.__views.index.add($.__views.__alloyId0);
-	$.__views.__alloyId1 = Ti.UI.createLabel(
-	{ text: L('hello_world'), id: "__alloyId1" });
-
-	$.__views.index.add($.__views.__alloyId1);
-	$.__views.__alloyId2 = Ti.UI.createLabel(
-	{ text: L('hello_world'), id: "__alloyId2" });
-
-	$.__views.index.add($.__views.__alloyId2);
-	$.__views.__alloyId3 = Ti.UI.createTextField(
-	{ value: 'Hello', top: 20, width: 100, backgroundColor: "#ccc", id: "__alloyId3" });
-
-	$.__views.index.add($.__views.__alloyId3);
-	$.__views.__alloyId4 = Ti.UI.createTextField(
-	{ value: L('hello_world'), id: "__alloyId4" });
-
-	$.__views.index.add($.__views.__alloyId4);
-	$.__views.__alloyId5 = Ti.UI.createTextField(
-	{ value: L('hello_world'), id: "__alloyId5" });
-
-	$.__views.index.add($.__views.__alloyId5);
-	$.__views.__alloyId6 = Ti.UI.createTextArea(
-	{ value: 'Hello', top: 20, width: 100, backgroundColor: "#ccc", id: "__alloyId6" });
-
-	$.__views.index.add($.__views.__alloyId6);
-	$.__views.__alloyId7 = Ti.UI.createTextArea(
-	{ value: L('hello_world'), id: "__alloyId7" });
-
-	$.__views.index.add($.__views.__alloyId7);
-	$.__views.__alloyId8 = Ti.UI.createTextArea(
-	{ value: L('hello_world'), id: "__alloyId8" });
-
-	$.__views.index.add($.__views.__alloyId8);
-	exports.destroy = function () {};
-
-
-
-
-	_.extend($, $.__views);
-
-
-	$.index.open();
-
-
-
-
-
-
-
-
-
-	_.extend($, exports);
-}
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1356/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1356/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index f3df35efd..000000000
--- a/test/apps/testing/ALOY-1356/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1358/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1358/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index f3df35efd..000000000
--- a/test/apps/testing/ALOY-1358/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1360/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1360/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 99b308e73..000000000
--- a/test/apps/testing/ALOY-1360/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/myBaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.myWindow.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1360/_generated/mobileweb/alloy/controllers/myBaseController.js b/test/apps/testing/ALOY-1360/_generated/mobileweb/alloy/controllers/myBaseController.js
deleted file mode 100644
index afed1b5d1..000000000
--- a/test/apps/testing/ALOY-1360/_generated/mobileweb/alloy/controllers/myBaseController.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "myBaseController";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.myWindow = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "myWindow"
-    });
-    $.__views.myWindow && $.addTopLevelView($.__views.myWindow);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        color: "#000",
-        text: "This label is in myBaseController.xml...",
-        id: "__alloyId0"
-    });
-    $.__views.myWindow.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1363/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1363/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 94b8bd2fc..000000000
--- a/test/apps/testing/ALOY-1363/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,51 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "Big Text",
-        color: "black",
-        id: "__alloyId0",
-        font: {
-            fontSize: "50sp"
-        }
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1474/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1474/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index adc017946..000000000
--- a/test/apps/testing/ALOY-1474/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,257 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId20(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId20.opts || {};
-        var models = __alloyId19.models;
-        var len = models.length;
-        var __alloyId17 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId16 = models[i];
-            __alloyId16.__transform = _.isFunction(__alloyId16.transform) ? __alloyId16.transform() : __alloyId16.toJSON();
-            var __alloyId18 = {
-                title: __alloyId16.__transform.foo
-            };
-            __alloyId17.push(__alloyId18);
-            __alloyId14.push(__alloyId18);
-        }
-        $.__views.__alloyId12.labels = __alloyId17;
-    }
-    function __alloyId29(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId29.opts || {};
-        var models = __alloyId28.models;
-        var len = models.length;
-        var __alloyId26 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId25 = models[i];
-            __alloyId25.__transform = _.isFunction(__alloyId25.transform) ? __alloyId25.transform() : __alloyId25.toJSON();
-            var __alloyId27 = {
-                title: __alloyId25.__transform.foo + " and " + __alloyId25.__transform.bar
-            };
-            __alloyId26.push(__alloyId27);
-            __alloyId23.push(__alloyId27);
-        }
-        $.__views.__alloyId21.labels = __alloyId26;
-    }
-    function __alloyId38(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId38.opts || {};
-        var models = __alloyId37.models;
-        var len = models.length;
-        var __alloyId35 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId34 = models[i];
-            __alloyId34.__transform = myTransformer(__alloyId34);
-            var __alloyId36 = {
-                title: __alloyId34.__transform.foo + " and " + __alloyId34.__transform.bar
-            };
-            __alloyId35.push(__alloyId36);
-            __alloyId32.push(__alloyId36);
-        }
-        $.__views.__alloyId30.labels = __alloyId35;
-    }
-    function __alloyId47(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId47.opts || {};
-        var models = __alloyId46.models;
-        var len = models.length;
-        var __alloyId44 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId43 = models[i];
-            __alloyId43.__transform = _.isFunction(__alloyId43.transform) ? __alloyId43.transform() : __alloyId43.toJSON();
-            var __alloyId45 = {
-                title: __alloyId43.__transform.foo
-            };
-            __alloyId44.push(__alloyId45);
-            __alloyId41.push(__alloyId45);
-        }
-        $.__views.__alloyId39.labels = __alloyId44;
-    }
-    function __alloyId56(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId56.opts || {};
-        var models = __alloyId55.models;
-        var len = models.length;
-        var __alloyId53 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId52 = models[i];
-            __alloyId52.__transform = _.isFunction(__alloyId52.transform) ? __alloyId52.transform() : __alloyId52.toJSON();
-            var __alloyId54 = {
-                title: __alloyId52.__transform.foo + " and " + __alloyId52.__transform.bar
-            };
-            __alloyId53.push(__alloyId54);
-            __alloyId50.push(__alloyId54);
-        }
-        $.__views.__alloyId48.labels = __alloyId53;
-    }
-    function __alloyId65(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId65.opts || {};
-        var models = __alloyId64.models;
-        var len = models.length;
-        var __alloyId62 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId61 = models[i];
-            __alloyId61.__transform = myTransformer(__alloyId61);
-            var __alloyId63 = {
-                title: __alloyId61.__transform.foo + " and " + __alloyId61.__transform.bar
-            };
-            __alloyId62.push(__alloyId63);
-            __alloyId59.push(__alloyId63);
-        }
-        $.__views.__alloyId57.labels = __alloyId62;
-    }
-    function myTransformer(model) {
-        var transformed = model.toJSON();
-        transformed.foo = transformed.foo + "D";
-        transformed.bar = transformed.bar + "T";
-        return transformed;
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    Alloy.Models.instance("transformless");
-    Alloy.Models.instance("transformer");
-    Alloy.Collections.instance("transformless");
-    Alloy.Collections.instance("transformer");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId8 = Ti.UI.createLabel({
-        top: 30,
-        id: "__alloyId8"
-    });
-    $.__views.index.add($.__views.__alloyId8);
-    $.__views.__alloyId9 = Ti.UI.createLabel({
-        id: "__alloyId9"
-    });
-    $.__views.index.add($.__views.__alloyId9);
-    $.__views.__alloyId10 = Ti.UI.createLabel({
-        id: "__alloyId10"
-    });
-    $.__views.index.add($.__views.__alloyId10);
-    $.__views.__alloyId11 = Ti.UI.createLabel({
-        id: "__alloyId11"
-    });
-    $.__views.index.add($.__views.__alloyId11);
-    var __alloyId14 = [];
-    var __alloyId19 = Alloy.Collections["transformless"] || transformless;
-    __alloyId19.on("fetch destroy change add remove reset", __alloyId20);
-    $.__views.__alloyId12 = Ti.UI.createButtonBar({
-        labels: __alloyId14,
-        id: "__alloyId12"
-    });
-    $.__views.index.add($.__views.__alloyId12);
-    var __alloyId23 = [];
-    var __alloyId28 = Alloy.Collections["transformless"] || transformless;
-    __alloyId28.on("fetch destroy change add remove reset", __alloyId29);
-    $.__views.__alloyId21 = Ti.UI.createButtonBar({
-        labels: __alloyId23,
-        id: "__alloyId21"
-    });
-    $.__views.index.add($.__views.__alloyId21);
-    var __alloyId32 = [];
-    var __alloyId37 = Alloy.Collections["transformless"] || transformless;
-    __alloyId37.on("fetch destroy change add remove reset", __alloyId38);
-    $.__views.__alloyId30 = Ti.UI.createButtonBar({
-        labels: __alloyId32,
-        id: "__alloyId30"
-    });
-    $.__views.index.add($.__views.__alloyId30);
-    var __alloyId41 = [];
-    var __alloyId46 = Alloy.Collections["transformer"] || transformer;
-    __alloyId46.on("fetch destroy change add remove reset", __alloyId47);
-    $.__views.__alloyId39 = Ti.UI.createButtonBar({
-        labels: __alloyId41,
-        id: "__alloyId39"
-    });
-    $.__views.index.add($.__views.__alloyId39);
-    var __alloyId50 = [];
-    var __alloyId55 = Alloy.Collections["transformer"] || transformer;
-    __alloyId55.on("fetch destroy change add remove reset", __alloyId56);
-    $.__views.__alloyId48 = Ti.UI.createButtonBar({
-        labels: __alloyId50,
-        id: "__alloyId48"
-    });
-    $.__views.index.add($.__views.__alloyId48);
-    var __alloyId59 = [];
-    var __alloyId64 = Alloy.Collections["transformer"] || transformer;
-    __alloyId64.on("fetch destroy change add remove reset", __alloyId65);
-    $.__views.__alloyId57 = Ti.UI.createButtonBar({
-        labels: __alloyId59,
-        id: "__alloyId57"
-    });
-    $.__views.index.add($.__views.__alloyId57);
-    var __alloyId66 = function() {
-        Alloy["Models"]["transformless"].__transform = _.isFunction(Alloy["Models"]["transformless"].transform) ? Alloy["Models"]["transformless"].transform() : Alloy["Models"]["transformless"].toJSON();
-        $.__alloyId8.text = Alloy["Models"]["transformless"]["__transform"]["foo"];
-        $.__alloyId9.text = Alloy["Models"]["transformless"]["__transform"]["foo"] + " and " + Alloy["Models"]["transformless"]["__transform"]["bar"];
-    };
-    Alloy["Models"]["transformless"].on("fetch change destroy", __alloyId66);
-    var __alloyId67 = function() {
-        Alloy["Models"]["transformer"].__transform = _.isFunction(Alloy["Models"]["transformer"].transform) ? Alloy["Models"]["transformer"].transform() : Alloy["Models"]["transformer"].toJSON();
-        $.__alloyId10.text = Alloy["Models"]["transformer"]["__transform"]["foo"];
-        $.__alloyId11.text = Alloy["Models"]["transformer"]["__transform"]["foo"] + " and " + Alloy["Models"]["transformer"]["__transform"]["bar"];
-    };
-    Alloy["Models"]["transformer"].on("fetch change destroy", __alloyId67);
-    exports.destroy = function() {
-        __alloyId19 && __alloyId19.off("fetch destroy change add remove reset", __alloyId20);
-        __alloyId28 && __alloyId28.off("fetch destroy change add remove reset", __alloyId29);
-        __alloyId37 && __alloyId37.off("fetch destroy change add remove reset", __alloyId38);
-        __alloyId46 && __alloyId46.off("fetch destroy change add remove reset", __alloyId47);
-        __alloyId55 && __alloyId55.off("fetch destroy change add remove reset", __alloyId56);
-        __alloyId64 && __alloyId64.off("fetch destroy change add remove reset", __alloyId65);
-        Alloy["Models"]["transformless"] && Alloy["Models"]["transformless"].off("fetch change destroy", __alloyId66);
-        Alloy["Models"]["transformer"] && Alloy["Models"]["transformer"].off("fetch change destroy", __alloyId67);
-    };
-    _.extend($, $.__views);
-    Alloy.Models.transformless.set({
-        foo: "FOO",
-        bar: "BAR"
-    });
-    Alloy.Models.transformer.set({
-        foo: "FOO",
-        bar: "BAR"
-    });
-    Alloy.Collections.transformless.reset([ {
-        foo: "1 FOO",
-        bar: "1 BAR"
-    }, {
-        foo: "2 FOO",
-        bar: "2 BAR"
-    } ]);
-    Alloy.Collections.transformer.reset([ {
-        foo: "1 FOO",
-        bar: "1 BAR"
-    }, {
-        foo: "2 FOO",
-        bar: "2 BAR"
-    } ]);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1474/_generated/mobileweb/alloy/models/Transformer.js b/test/apps/testing/ALOY-1474/_generated/mobileweb/alloy/models/Transformer.js
deleted file mode 100644
index 04bd16f41..000000000
--- a/test/apps/testing/ALOY-1474/_generated/mobileweb/alloy/models/Transformer.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {
-            transform: function() {
-                var transformed = this.toJSON();
-                transformed.foo = transformed.foo + "D!";
-                transformed.bar = transformed.bar + "T!";
-                return transformed;
-            }
-        });
-        return Model;
-    }
-};
-
-model = Alloy.M("transformer", exports.definition, []);
-
-collection = Alloy.C("transformer", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1474/_generated/mobileweb/alloy/models/Transformless.js b/test/apps/testing/ALOY-1474/_generated/mobileweb/alloy/models/Transformless.js
deleted file mode 100644
index 23a686d60..000000000
--- a/test/apps/testing/ALOY-1474/_generated/mobileweb/alloy/models/Transformless.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {};
-
-model = Alloy.M("transformless", exports.definition, []);
-
-collection = Alloy.C("transformless", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1477/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1477/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index bd3179d05..000000000
--- a/test/apps/testing/ALOY-1477/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,103 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId13(e) {
-        if (e && e.fromAdapter) return;
-        var opts = __alloyId13.opts || {};
-        var models = __alloyId12.models;
-        var len = models.length;
-        var __alloyId8 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId9 = models[i];
-            __alloyId9.__transform = _.isFunction(__alloyId9.transform) ? __alloyId9.transform() : __alloyId9.toJSON();
-            var __alloyId11 = {
-                properties: {
-                    title: __alloyId9.__transform.id + " - " + __alloyId9.__transform.title
-                }
-            };
-            __alloyId8.push(__alloyId11);
-        }
-        opts.animation ? $.__views.__alloyId7.setItems(__alloyId8, opts.animation) : $.__views.__alloyId7.setItems(__alloyId8);
-    }
-    function createModel() {
-        Alloy.Collections.mymodel.create({
-            title: "crt TITLE"
-        });
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    Alloy.Models.instance("mymodel");
-    Alloy.Collections.instance("mymodel");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        top: 30,
-        id: "__alloyId4"
-    });
-    $.__views.index.add($.__views.__alloyId4);
-    $.__views.__alloyId5 = Ti.UI.createButton({
-        title: "Create Model Should Not Error",
-        id: "__alloyId5"
-    });
-    $.__views.index.add($.__views.__alloyId5);
-    createModel ? $.addListener($.__views.__alloyId5, "click", createModel) : __defers["$.__views.__alloyId5!click!createModel"] = true;
-    $.__views.__alloyId7 = Ti.UI.createListSection({
-        id: "__alloyId7"
-    });
-    var __alloyId12 = Alloy.Collections["mymodel"] || mymodel;
-    __alloyId12.on("fetch destroy change add remove reset", __alloyId13);
-    var __alloyId14 = [];
-    __alloyId14.push($.__views.__alloyId7);
-    $.__views.__alloyId6 = Ti.UI.createListView({
-        sections: __alloyId14,
-        id: "__alloyId6"
-    });
-    $.__views.index.add($.__views.__alloyId6);
-    var __alloyId15 = function() {
-        Alloy["Models"]["mymodel"].__transform = _.isFunction(Alloy["Models"]["mymodel"].transform) ? Alloy["Models"]["mymodel"].transform() : Alloy["Models"]["mymodel"].toJSON();
-        $.__alloyId4.text = Alloy["Models"]["mymodel"]["__transform"]["id"] + " - " + Alloy["Models"]["mymodel"]["__transform"]["title"];
-    };
-    Alloy["Models"]["mymodel"].on("fetch change destroy", __alloyId15);
-    exports.destroy = function() {
-        __alloyId12 && __alloyId12.off("fetch destroy change add remove reset", __alloyId13);
-        Alloy["Models"]["mymodel"] && Alloy["Models"]["mymodel"].off("fetch change destroy", __alloyId15);
-    };
-    _.extend($, $.__views);
-    Alloy.Models.mymodel.set({
-        id: 0,
-        title: "mod TITLE"
-    });
-    Alloy.Collections.mymodel.reset([ {
-        id: 0,
-        title: "col TITLE"
-    } ]);
-    $.index.open();
-    $.createModel = createModel;
-    require("specs/index")($);
-    __defers["$.__views.__alloyId5!click!createModel"] && $.addListener($.__views.__alloyId5, "click", createModel);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1477/_generated/mobileweb/alloy/models/Mymodel.js b/test/apps/testing/ALOY-1477/_generated/mobileweb/alloy/models/Mymodel.js
deleted file mode 100644
index 4907cfbc8..000000000
--- a/test/apps/testing/ALOY-1477/_generated/mobileweb/alloy/models/Mymodel.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            id: "INTEGER PRIMARY KEY AUTOINCREMENT",
-            title: "TEXT"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "mymodel",
-            idAttribute: "id"
-        }
-    }
-};
-
-model = Alloy.M("mymodel", exports.definition, []);
-
-collection = Alloy.C("mymodel", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1479/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1479/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index d3dbd7c3d..000000000
--- a/test/apps/testing/ALOY-1479/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,233 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId15(e) {
-        if (e && e.fromAdapter) return;
-        var opts = __alloyId15.opts || {};
-        var models = __alloyId14.models;
-        var len = models.length;
-        var __alloyId10 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId11 = models[i];
-            __alloyId11.__transform = _.isFunction(__alloyId11.transform) ? __alloyId11.transform() : __alloyId11.toJSON();
-            var __alloyId13 = {
-                properties: {
-                    title: __alloyId11.__transform.foo,
-                    subtitle: __alloyId11.__transform.foo + " " + __alloyId11.__transform.bar + " " + __alloyId11.__transform.missing
-                }
-            };
-            __alloyId10.push(__alloyId13);
-        }
-        opts.animation ? $.__views.__alloyId9.setItems(__alloyId10, opts.animation) : $.__views.__alloyId9.setItems(__alloyId10);
-    }
-    function __alloyId24(e) {
-        if (e && e.fromAdapter) return;
-        var opts = __alloyId24.opts || {};
-        var models = __alloyId23.models;
-        var len = models.length;
-        var __alloyId19 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId20 = models[i];
-            __alloyId20.__transform = _.isFunction(__alloyId20.transform) ? __alloyId20.transform() : __alloyId20.toJSON();
-            var __alloyId22 = {
-                properties: {
-                    title: __alloyId20.__transform.foo,
-                    subtitle: __alloyId20.__transform.foo + " " + __alloyId20.__transform.bar + " " + __alloyId20.__transform.missing
-                }
-            };
-            __alloyId19.push(__alloyId22);
-        }
-        opts.animation ? $.__views.__alloyId18.setItems(__alloyId19, opts.animation) : $.__views.__alloyId18.setItems(__alloyId19);
-    }
-    function __alloyId35(e) {
-        if (e && e.fromAdapter) return;
-        var opts = __alloyId35.opts || {};
-        var models = __alloyId34.models;
-        var len = models.length;
-        var __alloyId28 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId31 = models[i];
-            __alloyId31.__transform = _.isFunction(__alloyId31.transform) ? __alloyId31.transform() : __alloyId31.toJSON();
-            var __alloyId33 = Alloy.createController("inherit", {
-                $model: __alloyId31
-            });
-            __alloyId28.push(__alloyId33.getViewEx({
-                recurse: true
-            }));
-        }
-        opts.animation ? $.__views.__alloyId27.setItems(__alloyId28, opts.animation) : $.__views.__alloyId27.setItems(__alloyId28);
-    }
-    function __alloyId46(e) {
-        if (e && e.fromAdapter) return;
-        var opts = __alloyId46.opts || {};
-        var models = __alloyId45.models;
-        var len = models.length;
-        var __alloyId39 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId42 = models[i];
-            __alloyId42.__transform = _.isFunction(__alloyId42.transform) ? __alloyId42.transform() : __alloyId42.toJSON();
-            var __alloyId44 = Alloy.createController("inherit", {
-                $model: __alloyId42
-            });
-            __alloyId39.push(__alloyId44.getViewEx({
-                recurse: true
-            }));
-        }
-        opts.animation ? $.__views.__alloyId38.setItems(__alloyId39, opts.animation) : $.__views.__alloyId38.setItems(__alloyId39);
-    }
-    function init() {
-        var attributes = {
-            foo: "FOO",
-            bar: "BAR"
-        };
-        $.modelinstance.set(attributes);
-        Alloy.Models.mymodel.set(attributes);
-        Alloy.Collections.mymodel.reset([ attributes ]);
-        $.colinstance.reset([ attributes ]);
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    Alloy.Models.instance("mymodel");
-    $.modelinstance = Alloy.createModel("mymodel");
-    Alloy.Collections.instance("mymodel");
-    $.colinstance = Alloy.createCollection("mymodel");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        top: 20,
-        id: "__alloyId4"
-    });
-    $.__views.index.add($.__views.__alloyId4);
-    $.__views.__alloyId5 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId5"
-    });
-    $.__views.index.add($.__views.__alloyId5);
-    $.__views.__alloyId6 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId6"
-    });
-    $.__views.index.add($.__views.__alloyId6);
-    $.__views.__alloyId7 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId7"
-    });
-    $.__views.index.add($.__views.__alloyId7);
-    $.__views.__alloyId9 = Ti.UI.createListSection({
-        id: "__alloyId9"
-    });
-    var __alloyId14 = Alloy.Collections["mymodel"] || mymodel;
-    __alloyId14.on("fetch destroy change add remove reset", __alloyId15);
-    var __alloyId16 = [];
-    __alloyId16.push($.__views.__alloyId9);
-    $.__views.__alloyId8 = Ti.UI.createListView({
-        sections: __alloyId16,
-        height: Ti.UI.SIZE,
-        canScroll: false,
-        defaultItemTemplate: Ti.UI.LIST_ITEM_TEMPLATE_SUBTITLE,
-        id: "__alloyId8"
-    });
-    $.__views.index.add($.__views.__alloyId8);
-    $.__views.__alloyId18 = Ti.UI.createListSection({
-        id: "__alloyId18"
-    });
-    var __alloyId23 = Alloy.Collections["$.colinstance"] || $.colinstance;
-    __alloyId23.on("fetch destroy change add remove reset", __alloyId24);
-    var __alloyId25 = [];
-    __alloyId25.push($.__views.__alloyId18);
-    $.__views.__alloyId17 = Ti.UI.createListView({
-        sections: __alloyId25,
-        height: Ti.UI.SIZE,
-        canScroll: false,
-        defaultItemTemplate: Ti.UI.LIST_ITEM_TEMPLATE_SUBTITLE,
-        id: "__alloyId17"
-    });
-    $.__views.index.add($.__views.__alloyId17);
-    $.__views.__alloyId27 = Ti.UI.createListSection({
-        id: "__alloyId27"
-    });
-    var __alloyId34 = Alloy.Collections["mymodel"] || mymodel;
-    __alloyId34.on("fetch destroy change add remove reset", __alloyId35);
-    var __alloyId36 = [];
-    __alloyId36.push($.__views.__alloyId27);
-    $.__views.__alloyId26 = Ti.UI.createListView({
-        sections: __alloyId36,
-        height: Ti.UI.SIZE,
-        canScroll: false,
-        defaultItemTemplate: Ti.UI.LIST_ITEM_TEMPLATE_SUBTITLE,
-        id: "__alloyId26"
-    });
-    $.__views.index.add($.__views.__alloyId26);
-    $.__views.__alloyId38 = Ti.UI.createListSection({
-        id: "__alloyId38"
-    });
-    var __alloyId45 = Alloy.Collections["$.colinstance"] || $.colinstance;
-    __alloyId45.on("fetch destroy change add remove reset", __alloyId46);
-    var __alloyId47 = [];
-    __alloyId47.push($.__views.__alloyId38);
-    $.__views.__alloyId37 = Ti.UI.createListView({
-        sections: __alloyId47,
-        height: Ti.UI.SIZE,
-        canScroll: false,
-        defaultItemTemplate: Ti.UI.LIST_ITEM_TEMPLATE_SUBTITLE,
-        id: "__alloyId37"
-    });
-    $.__views.index.add($.__views.__alloyId37);
-    var __alloyId48 = function() {
-        $["modelinstance"].__transform = _.isFunction($["modelinstance"].transform) ? $["modelinstance"].transform() : $["modelinstance"].toJSON();
-        $.__alloyId4.text = $["modelinstance"]["__transform"]["foo"];
-        $.__alloyId5.text = $["modelinstance"]["__transform"]["foo"] + " " + $["modelinstance"]["__transform"]["bar"] + " " + $["modelinstance"]["__transform"]["missing"];
-    };
-    $["modelinstance"].on("fetch change destroy", __alloyId48);
-    var __alloyId49 = function() {
-        Alloy["Models"]["mymodel"].__transform = _.isFunction(Alloy["Models"]["mymodel"].transform) ? Alloy["Models"]["mymodel"].transform() : Alloy["Models"]["mymodel"].toJSON();
-        $.__alloyId6.text = Alloy["Models"]["mymodel"]["__transform"]["foo"];
-        $.__alloyId7.text = Alloy["Models"]["mymodel"]["__transform"]["foo"] + " " + Alloy["Models"]["mymodel"]["__transform"]["bar"] + " " + Alloy["Models"]["mymodel"]["__transform"]["missing"];
-    };
-    Alloy["Models"]["mymodel"].on("fetch change destroy", __alloyId49);
-    exports.destroy = function() {
-        __alloyId14 && __alloyId14.off("fetch destroy change add remove reset", __alloyId15);
-        __alloyId23 && __alloyId23.off("fetch destroy change add remove reset", __alloyId24);
-        __alloyId34 && __alloyId34.off("fetch destroy change add remove reset", __alloyId35);
-        __alloyId45 && __alloyId45.off("fetch destroy change add remove reset", __alloyId46);
-        $["modelinstance"] && $["modelinstance"].off("fetch change destroy", __alloyId48);
-        Alloy["Models"]["mymodel"] && Alloy["Models"]["mymodel"].off("fetch change destroy", __alloyId49);
-    };
-    _.extend($, $.__views);
-    $.index.open();
-    $.init = init;
-    require("specs/index")($);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1479/_generated/mobileweb/alloy/controllers/inherit.js b/test/apps/testing/ALOY-1479/_generated/mobileweb/alloy/controllers/inherit.js
deleted file mode 100644
index 3dde9fb7f..000000000
--- a/test/apps/testing/ALOY-1479/_generated/mobileweb/alloy/controllers/inherit.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "inherit";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        var $model = __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.inherit = {
-        properties: {
-            title: $model.__transform.foo,
-            subtitle: $model.__transform.foo + " " + $model.__transform.bar + " " + $model.__transform.missing,
-            id: "inherit"
-        }
-    };
-    $.__views.inherit && $.addTopLevelView($.__views.inherit);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1479/_generated/mobileweb/alloy/models/Mymodel.js b/test/apps/testing/ALOY-1479/_generated/mobileweb/alloy/models/Mymodel.js
deleted file mode 100644
index 0ff498cb8..000000000
--- a/test/apps/testing/ALOY-1479/_generated/mobileweb/alloy/models/Mymodel.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {};
-
-model = Alloy.M("mymodel", exports.definition, []);
-
-collection = Alloy.C("mymodel", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1480/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1480/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index f70eaf7b0..000000000
--- a/test/apps/testing/ALOY-1480/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,136 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId17(e) {
-        if (e && e.fromAdapter) return;
-        var opts = __alloyId17.opts || {};
-        var models = __alloyId16.models;
-        var len = models.length;
-        var __alloyId12 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId13 = models[i];
-            __alloyId13.__transform = _.isFunction(__alloyId13.transform) ? __alloyId13.transform() : __alloyId13.toJSON();
-            var __alloyId15 = {
-                properties: {
-                    font: __alloyId13.__transform.font,
-                    title: "well " + __alloyId13.__transform.greeting + " there " + __alloyId13.__transform.subject + "!"
-                }
-            };
-            __alloyId12.push(__alloyId15);
-        }
-        opts.animation ? $.__views.__alloyId11.setItems(__alloyId12, opts.animation) : $.__views.__alloyId11.setItems(__alloyId12);
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    Alloy.Models.instance("model-a");
-    Alloy.Models.instance("modelb");
-    Alloy.Collections.instance("model-a");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId6 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        top: 20,
-        id: "__alloyId6"
-    });
-    $.__views.index.add($.__views.__alloyId6);
-    $.__views.__alloyId7 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId7"
-    });
-    $.__views.index.add($.__views.__alloyId7);
-    $.__views.__alloyId8 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId8"
-    });
-    $.__views.index.add($.__views.__alloyId8);
-    $.__views.__alloyId9 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId9"
-    });
-    $.__views.index.add($.__views.__alloyId9);
-    $.__views.__alloyId11 = Ti.UI.createListSection({
-        id: "__alloyId11"
-    });
-    var __alloyId16 = Alloy.Collections["model-a"] || model - a;
-    __alloyId16.on("fetch destroy change add remove reset", __alloyId17);
-    var __alloyId18 = [];
-    __alloyId18.push($.__views.__alloyId11);
-    $.__views.__alloyId10 = Ti.UI.createListView({
-        sections: __alloyId18,
-        height: Ti.UI.SIZE,
-        canScroll: false,
-        id: "__alloyId10"
-    });
-    $.__views.index.add($.__views.__alloyId10);
-    var __alloyId19 = function() {
-        Alloy["Models"]["model-a"].__transform = _.isFunction(Alloy["Models"]["model-a"].transform) ? Alloy["Models"]["model-a"].transform() : Alloy["Models"]["model-a"].toJSON();
-        Alloy["Models"]["modelb"].__transform = _.isFunction(Alloy["Models"]["modelb"].transform) ? Alloy["Models"]["modelb"].transform() : Alloy["Models"]["modelb"].toJSON();
-        $.__alloyId6.font = Alloy["Models"]["model-a"]["__transform"]["font"];
-        $.__alloyId6.text = Alloy["Models"]["model-a"]["__transform"]["greeting"] + " " + Alloy["Models"]["modelb"]["__transform"]["mix-it"];
-        $.__alloyId7.font = Alloy["Models"]["model-a"]["__transform"]["font"];
-        $.__alloyId7.text = "well " + Alloy["Models"]["model-a"]["__transform"]["greeting"];
-        $.__alloyId8.font = Alloy["Models"]["model-a"]["__transform"]["font"];
-        $.__alloyId8.text = Alloy["Models"]["model-a"]["__transform"]["greeting"] + " " + Alloy["Models"]["modelb"]["__transform"]["deep"]["link"] + "!";
-        $.__alloyId9.font = Alloy["Models"]["model-a"]["__transform"]["font"];
-        $.__alloyId9.text = "well " + Alloy["Models"]["model-a"]["__transform"]["greeting"] + " there's " + Alloy["Models"]["model-a"]["__transform"]["subject"] + "!";
-    };
-    Alloy["Models"]["model-a"].on("fetch change destroy", __alloyId19);
-    var __alloyId20 = function() {
-        Alloy["Models"]["model-a"].__transform = _.isFunction(Alloy["Models"]["model-a"].transform) ? Alloy["Models"]["model-a"].transform() : Alloy["Models"]["model-a"].toJSON();
-        Alloy["Models"]["modelb"].__transform = _.isFunction(Alloy["Models"]["modelb"].transform) ? Alloy["Models"]["modelb"].transform() : Alloy["Models"]["modelb"].toJSON();
-        $.__alloyId6.text = Alloy["Models"]["model-a"]["__transform"]["greeting"] + " " + Alloy["Models"]["modelb"]["__transform"]["mix-it"];
-        $.__alloyId8.text = Alloy["Models"]["model-a"]["__transform"]["greeting"] + " " + Alloy["Models"]["modelb"]["__transform"]["deep"]["link"] + "!";
-    };
-    Alloy["Models"]["modelb"].on("fetch change destroy", __alloyId20);
-    exports.destroy = function() {
-        __alloyId16 && __alloyId16.off("fetch destroy change add remove reset", __alloyId17);
-        Alloy["Models"]["model-a"] && Alloy["Models"]["model-a"].off("fetch change destroy", __alloyId19);
-        Alloy["Models"]["modelb"] && Alloy["Models"]["modelb"].off("fetch change destroy", __alloyId20);
-    };
-    _.extend($, $.__views);
-    var attributes = {
-        greeting: "hello",
-        subject: "world"
-    };
-    Alloy.Models.modelb.set({
-        "mix-it": "Mix It!",
-        deep: {
-            link: "deep-link"
-        }
-    });
-    Alloy.Models["model-a"].set(attributes);
-    Alloy.Collections["model-a"].reset([ attributes ]);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1480/_generated/mobileweb/alloy/models/Model-a.js b/test/apps/testing/ALOY-1480/_generated/mobileweb/alloy/models/Model-a.js
deleted file mode 100644
index ddd72c637..000000000
--- a/test/apps/testing/ALOY-1480/_generated/mobileweb/alloy/models/Model-a.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {
-            transform: function() {
-                var transformed = this.toJSON();
-                transformed.subject && (transformed.subject = transformed.subject.toUpperCase());
-                transformed.font = {
-                    fontSize: 20,
-                    fontWeight: "bold"
-                };
-                return transformed;
-            }
-        });
-        return Model;
-    }
-};
-
-model = Alloy.M("model-a", exports.definition, []);
-
-collection = Alloy.C("model-a", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1480/_generated/mobileweb/alloy/models/Modelb.js b/test/apps/testing/ALOY-1480/_generated/mobileweb/alloy/models/Modelb.js
deleted file mode 100644
index 4d62bbb2d..000000000
--- a/test/apps/testing/ALOY-1480/_generated/mobileweb/alloy/models/Modelb.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {};
-
-model = Alloy.M("modelb", exports.definition, []);
-
-collection = Alloy.C("modelb", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1486/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1486/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 70d8641ac..000000000
--- a/test/apps/testing/ALOY-1486/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,37 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "blue",
-        orientationModes: [ Titanium.UI.PORTRAIT ],
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1494/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1494/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index f3df35efd..000000000
--- a/test/apps/testing/ALOY-1494/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1503/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1503/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 8ead3577b..000000000
--- a/test/apps/testing/ALOY-1503/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,40 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.webView = Ti.UI.createView({
-        id: "webView"
-    });
-    $.__views.index.add($.__views.webView);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1505/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1505/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100755
index 4cbaa428b..000000000
--- a/test/apps/testing/ALOY-1505/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,65 +0,0 @@
-var Alloy = require('/alloy'),
-Backbone = Alloy.Backbone,
-_ = Alloy._;
-
-
-
-
-function __processArg(obj, key) {
-	var arg = null;
-	if (obj) {
-		arg = obj[key] || null;
-	}
-	return arg;
-}
-
-function Controller() {
-
-	require('/alloy/controllers/' + 'BaseController').apply(this, Array.prototype.slice.call(arguments));
-	this.__controllerPath = 'index';
-	this.args = arguments[0] || {};
-
-	if (arguments[0]) {
-		var __parentSymbol = __processArg(arguments[0], '__parentSymbol');
-		var $model = __processArg(arguments[0], '$model');
-		var __itemTemplate = __processArg(arguments[0], '__itemTemplate');
-	}
-	var $ = this;
-	var exports = {};
-	var __defers = {};
-
-
-
-
-
-
-
-	$.__views.index = Ti.UI.createWindow(
-	{ backgroundColor: "#fff", fullscreen: false, exitOnClose: true, id: "index" });
-
-	$.__views.index && $.addTopLevelView($.__views.index);
-	var __alloyId0 = undefined;var __alloyId1 = undefined;var __alloyId3 = [];__alloyId3.push("Confirm");__alloyId0 = __alloyId3.push("Cancel") - 1;$.__views.dialog = Ti.UI.createOptionDialog(
-	{ options: __alloyId3, cancel: __alloyId0, destructive: __alloyId1, id: "dialog", title: "Delete File?" });
-
-	exports.destroy = function () {};
-
-
-
-
-	_.extend($, $.__views);
-
-
-	$.index.open();
-
-
-
-
-
-
-
-
-
-	_.extend($, exports);
-}
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1516/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1516/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index e50e01388..000000000
--- a/test/apps/testing/ALOY-1516/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,52 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.appVersion = Ti.UI.createLabel({
-        id: "appVersion",
-        textAlign: "centerAlign",
-        text: Ti.App.getVersion() + "test",
-        height: Ti.UI.SIZE,
-        top: 50
-    });
-    $.__views.index.add($.__views.appVersion);
-    $.__views.appVersion = Ti.UI.createLabel({
-        id: "appVersion",
-        textAlign: "centerAlign",
-        text: "test" + Ti.App.getVersion(),
-        height: Ti.UI.SIZE,
-        top: 100
-    });
-    $.__views.index.add($.__views.appVersion);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1517/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1517/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 8d520d74a..000000000
--- a/test/apps/testing/ALOY-1517/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.__alloyId0 = Ti.UI.createWindow({
-        id: "__alloyId0"
-    });
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "Hello, World",
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId0.add($.__views.__alloyId1);
-    $.__views.index = Ti.UI.iOS.createNavigationWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        window: $.__views.__alloyId0,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1519/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1519/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 6b78f7b92..000000000
--- a/test/apps/testing/ALOY-1519/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doRefresh(e) {
-        alert("refreshed");
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId1 = Ti.UI.createRefreshControl({
-        tintColor: "red",
-        id: "__alloyId1"
-    });
-    doRefresh ? $.addListener($.__views.__alloyId1, "refreshstart", doRefresh) : __defers["$.__views.__alloyId1!refreshstart!doRefresh"] = true;
-    $.__views.__alloyId0 = Ti.UI.createScrollView({
-        refreshControl: $.__views.__alloyId1,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        text: "Hello",
-        id: "__alloyId2"
-    });
-    $.__views.__alloyId0.add($.__views.__alloyId2);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.__alloyId1!refreshstart!doRefresh"] && $.addListener($.__views.__alloyId1, "refreshstart", doRefresh);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1526/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1526/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index eb74b3ce4..000000000
--- a/test/apps/testing/ALOY-1526/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,46 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "#js:dtgL('report46')",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        text: "#js:dtg" + L("report46"),
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1527/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1527/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 8329937f2..000000000
--- a/test/apps/testing/ALOY-1527/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,85 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId1 = {};
-    var __alloyId4 = [];
-    var __alloyId6 = {
-        type: "Ti.UI.Label",
-        properties: {
-            bindid: "title"
-        }
-    };
-    __alloyId4.push(__alloyId6);
-    var __alloyId3 = {
-        properties: {
-            name: "TabbedItem"
-        },
-        childTemplates: __alloyId4
-    };
-    __alloyId1["TabbedItem"] = __alloyId3;
-    var __alloyId9 = [];
-    $.__views.__alloyId10 = {
-        template: "TabbedItem",
-        tabs: {
-            index: 0
-        },
-        properties: {
-            id: "__alloyId10"
-        }
-    };
-    __alloyId9.push($.__views.__alloyId10);
-    $.__views.__alloyId11 = {
-        template: "TabbedItem",
-        tabs: {
-            index: 1
-        },
-        properties: {
-            id: "__alloyId11"
-        }
-    };
-    __alloyId9.push($.__views.__alloyId11);
-    $.__views.__alloyId7 = Ti.UI.createListSection({
-        id: "__alloyId7"
-    });
-    $.__views.__alloyId7.items = __alloyId9;
-    var __alloyId12 = [];
-    __alloyId12.push($.__views.__alloyId7);
-    $.__views.__alloyId0 = Ti.UI.createListView({
-        sections: __alloyId12,
-        templates: __alloyId1,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1541/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1541/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 74b012f15..000000000
--- a/test/apps/testing/ALOY-1541/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,50 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.__alloyId0 = Ti.UI.createWindow({
-        id: "__alloyId0"
-    });
-    $.__views.__alloyId1 = Alloy.createController("navbar", {
-        id: "__alloyId1",
-        __parentSymbol: $.__views.__alloyId0
-    });
-    $.__views.__alloyId1.setParent($.__views.__alloyId0);
-    $.__views.label = Ti.UI.createLabel({
-        text: "Hello, World",
-        id: "label"
-    });
-    $.__views.__alloyId0.add($.__views.label);
-    $.__views.index = Ti.UI.iOS.createNavigationWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        window: $.__views.__alloyId0,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1541/_generated/mobileweb/alloy/controllers/navbar.js b/test/apps/testing/ALOY-1541/_generated/mobileweb/alloy/controllers/navbar.js
deleted file mode 100644
index 6bf520098..000000000
--- a/test/apps/testing/ALOY-1541/_generated/mobileweb/alloy/controllers/navbar.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "navbar";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        var __parentSymbol = __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var leftNavButtons = [];
-    $.__views.__alloyId2 = Ti.UI.createButton({
-        title: "Btn1",
-        id: "__alloyId2"
-    });
-    leftNavButtons.push($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createButton({
-        title: "Btn2",
-        id: "__alloyId3"
-    });
-    leftNavButtons.push($.__views.__alloyId3);
-    __parentSymbol.leftNavButtons = leftNavButtons;
-    $.__views.navbar && $.addTopLevelView($.__views.navbar);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1545/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1545/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 08587ae1d..000000000
--- a/test/apps/testing/ALOY-1545/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,72 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId7(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId7.opts || {};
-        var models = __alloyId6.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId1 = models[i];
-            __alloyId1.__transform = _.isFunction(__alloyId1.transform) ? __alloyId1.transform() : __alloyId1.toJSON();
-            var __alloyId3 = Ti.UI.createTableViewRow({});
-            rows.push(__alloyId3);
-            var __alloyId5 = Alloy.createWidget("foo", "widget", {
-                $model: __alloyId1,
-                __parentSymbol: __alloyId3
-            });
-            __alloyId5.setParent(__alloyId3);
-            onCustomEvent ? __alloyId5.on("customevent", onCustomEvent) : __defers["__alloyId5!customevent!onCustomEvent"] = true;
-        }
-        $.__views.__alloyId0.setData(rows);
-    }
-    function onCustomEvent(e) {
-        console.log("Congratulations! It works!");
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.demo = Alloy.createCollection("Demo");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createTableView({
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    var __alloyId6 = Alloy.Collections["$.demo"] || $.demo;
-    __alloyId6.on("fetch destroy change add remove reset", __alloyId7);
-    exports.destroy = function() {
-        __alloyId6 && __alloyId6.off("fetch destroy change add remove reset", __alloyId7);
-    };
-    _.extend($, $.__views);
-    var demoModel = Alloy.createModel("Demo");
-    $.demo.add(demoModel);
-    $.index.open();
-    __defers["__alloyId5!customevent!onCustomEvent"] && __alloyId5.on("customevent", onCustomEvent);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1545/_generated/mobileweb/alloy/models/Demo.js b/test/apps/testing/ALOY-1545/_generated/mobileweb/alloy/models/Demo.js
deleted file mode 100644
index 95aea6908..000000000
--- a/test/apps/testing/ALOY-1545/_generated/mobileweb/alloy/models/Demo.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            name: "text"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "Demo"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("Demo", exports.definition, []);
-
-collection = Alloy.C("Demo", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1545/_generated/mobileweb/alloy/widgets/foo/controllers/widget.js b/test/apps/testing/ALOY-1545/_generated/mobileweb/alloy/widgets/foo/controllers/widget.js
deleted file mode 100644
index 5bac4be13..000000000
--- a/test/apps/testing/ALOY-1545/_generated/mobileweb/alloy/widgets/foo/controllers/widget.js
+++ /dev/null
@@ -1,50 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "foo/" + s : s.substring(0, index) + "/foo/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function onClick(e) {
-        $.trigger("customevent", {
-            sender: $,
-            data: e
-        });
-    }
-    new (require("/alloy/widget"))("foo");
-    this.__widgetId = "foo";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.widget = Ti.UI.createLabel({
-        text: "Click Me!",
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    onClick ? $.addListener($.__views.widget, "click", onClick) : __defers["$.__views.widget!click!onClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    __defers["$.__views.widget!click!onClick"] && $.addListener($.__views.widget, "click", onClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1545/_generated/mobileweb/alloy/widgets/foo/styles/widget.js b/test/apps/testing/ALOY-1545/_generated/mobileweb/alloy/widgets/foo/styles/widget.js
deleted file mode 100644
index 39b21a170..000000000
--- a/test/apps/testing/ALOY-1545/_generated/mobileweb/alloy/widgets/foo/styles/widget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "foo/" + s : s.substring(0, index) + "/foo/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1564/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1564/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 3a33b9eda..000000000
--- a/test/apps/testing/ALOY-1564/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,71 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId5(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId5.opts || {};
-        var models = __alloyId4.models;
-        var len = models.length;
-        var children = $.__views.__alloyId0.children;
-        for (var d = children.length - 1; d >= 0; d--) $.__views.__alloyId0.remove(children[d]);
-        for (var i = 0; len > i; i++) {
-            var __alloyId1 = models[i];
-            __alloyId1.__transform = _.isFunction(__alloyId1.transform) ? __alloyId1.transform() : __alloyId1.toJSON();
-            var __alloyId3 = Alloy.createController("products", {
-                $model: __alloyId1,
-                __parentSymbol: $.__views.__alloyId0
-            });
-            __alloyId3.setParent($.__views.__alloyId0);
-            doSomething ? __alloyId3.on("click", doSomething) : __defers["__alloyId3!click!doSomething"] = true;
-        }
-    }
-    function doSomething() {
-        console.log("Congratulations! It works!");
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.demo = Alloy.createCollection("Demo");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createScrollView({
-        layout: "vertical",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    var __alloyId4 = Alloy.Collections["$.demo"] || $.demo;
-    __alloyId4.on("fetch destroy change add remove reset", __alloyId5);
-    exports.destroy = function() {
-        __alloyId4 && __alloyId4.off("fetch destroy change add remove reset", __alloyId5);
-    };
-    _.extend($, $.__views);
-    var demoModel = Alloy.createModel("Demo");
-    $.demo.add(demoModel);
-    $.index.open();
-    __defers["__alloyId3!click!doSomething"] && __alloyId3.on("click", doSomething);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1564/_generated/mobileweb/alloy/controllers/products.js b/test/apps/testing/ALOY-1564/_generated/mobileweb/alloy/controllers/products.js
deleted file mode 100644
index 9c19d16b4..000000000
--- a/test/apps/testing/ALOY-1564/_generated/mobileweb/alloy/controllers/products.js
+++ /dev/null
@@ -1,40 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "products";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.products = Ti.UI.createView({
-        id: "products"
-    });
-    $.__views.products && $.addTopLevelView($.__views.products);
-    $.__views.lbl = Ti.UI.createLabel({
-        text: "HELLO",
-        id: "lbl"
-    });
-    $.__views.products.add($.__views.lbl);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.lbl.addEventListener("click", function(e) {
-        $.trigger("click", e);
-    });
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1564/_generated/mobileweb/alloy/models/Demo.js b/test/apps/testing/ALOY-1564/_generated/mobileweb/alloy/models/Demo.js
deleted file mode 100644
index 95aea6908..000000000
--- a/test/apps/testing/ALOY-1564/_generated/mobileweb/alloy/models/Demo.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            name: "text"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "Demo"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("Demo", exports.definition, []);
-
-collection = Alloy.C("Demo", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1579/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1579/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100755
index 06216a13d..000000000
--- a/test/apps/testing/ALOY-1579/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-var Alloy = require('/alloy'),
-    Backbone = Alloy.Backbone,
-    _ = Alloy._;
-
-function __processArg(obj, key) {
-	var arg = null;
-	if (obj) {
-		arg = obj[key] || null;
-		delete obj[key];
-	}
-	return arg;
-}
-
-function Controller() {
-
-	require('/alloy/controllers/' + 'BaseController').apply(this, Array.prototype.slice.call(arguments));
-	this.__controllerPath = 'index';
-	this.args = arguments[0] || {};
-
-	if (arguments[0]) {
-		var __parentSymbol = __processArg(arguments[0], '__parentSymbol');
-		var $model = __processArg(arguments[0], '$model');
-		var __itemTemplate = __processArg(arguments[0], '__itemTemplate');
-	}
-	var $ = this;
-	var exports = {};
-	var __defers = {};
-
-	$.__views.index = Ti.UI.createWindow({ backgroundColor: "#fff", fullscreen: false, exitOnClose: true, id: "index" });
-	$.__views.index && $.addTopLevelView($.__views.index);
-	$.__views.drawer = Ti.UI.Android.createDrawerLayout({ id: "drawer" });
-	$.__views.index.add($.__views.drawer);
-	$.__views.__alloyId2 = Ti.UI.createView({ backgroundColor: "yellow", id: "__alloyId2" });
-	$.__views.__alloyId3 = Ti.UI.createButton({ title: 'RIGHT', id: "__alloyId3" });
-	$.__views.__alloyId2.add($.__views.__alloyId3);
-	doButtonClick ? $.addListener($.__views.__alloyId3, 'click', doButtonClick) : __defers['$.__views.__alloyId3!click!doButtonClick'] = true;$.__views.drawer.centerView = $.__views.__alloyId2;$.__views.__alloyId5 = Ti.UI.createView({ backgroundColor: "orange", id: "__alloyId5" });
-	$.__views.drawer.rightView = $.__views.__alloyId5;exports.destroy = function () {};
-
-	_.extend($, $.__views);
-
-	function doButtonClick(e) {
-		$.drawer.toggleRight();
-	}
-
-	function doHomeIcon(e) {
-		$.drawer.toggleLeft();
-	}
-
-	$.index.open();
-
-	__defers['$.__views.__alloyId3!click!doButtonClick'] && $.addListener($.__views.__alloyId3, 'click', doButtonClick);
-
-	_.extend($, exports);
-}
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1584/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1584/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 6a9b83016..000000000
--- a/test/apps/testing/ALOY-1584/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,62 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId0() {
-        $.__views.index.removeEventListener("open", __alloyId0);
-        if ($.__views.index.activity) {
-            $.__views.index.activity.setSupportActionBar($.__views.toolBarID);
-            $.__views.index.activity.actionBar.displayHomeAsUp = true;
-            $.__views.index.activity.actionBar.homeButtonEnabled = true;
-        } else {
-            Ti.API.warn("You attempted to access an Activity on a lightweight Window or other");
-            Ti.API.warn("UI component which does not have an Android activity. Android Activities");
-            Ti.API.warn("are valid with only windows in TabGroups or heavyweight Windows.");
-        }
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        title: "My Test App",
-        backgroundColor: "gray",
-        customToolbar: "toolBarID",
-        theme: "Theme.AppCompat.NoTitleBar",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.toolBarID = Ti.UI.createToolbar({
-        id: "toolBarID",
-        title: "MyMenu",
-        subtitle: "Subtitle",
-        width: Ti.UI.FILL,
-        top: 0,
-        homeButtonEnabled: true,
-        displayHomeAsUp: true,
-        onHomeIconItemSelected: "clickAlert",
-        barColor: "#639851"
-    });
-    $.__views.index.add($.__views.toolBarID);
-    $.__views.index.addEventListener("open", __alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1599/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1599/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100755
index e098e16cc..000000000
--- a/test/apps/testing/ALOY-1599/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,74 +0,0 @@
-var Alloy = require('/alloy'),
-Backbone = Alloy.Backbone,
-_ = Alloy._;
-
-
-
-
-function __processArg(obj, key) {
-	var arg = null;
-	if (obj) {
-		arg = obj[key] || null;
-		delete obj[key];
-	}
-	return arg;
-}
-
-function Controller() {
-
-	require('/alloy/controllers/' + 'BaseController').apply(this, Array.prototype.slice.call(arguments));
-	this.__controllerPath = 'index';
-	this.args = arguments[0] || {};
-
-	if (arguments[0]) {
-		var __parentSymbol = __processArg(arguments[0], '__parentSymbol');
-		var $model = __processArg(arguments[0], '$model');
-		var __itemTemplate = __processArg(arguments[0], '__itemTemplate');
-	}
-	var $ = this;
-	var exports = {};
-	var __defers = {};
-
-
-
-
-	Alloy.Models.instance('Big');Alloy.Models.instance('small');
-
-
-	$.__views.index = Ti.UI.createWindow(
-	{ backgroundColor: "#fff", layout: "vertical", exitOnClose: true, fullscreen: false, id: "index" });
-
-	$.__views.index && $.addTopLevelView($.__views.index);
-	$.__views.lbl1 = Ti.UI.createLabel(
-	{ id: "lbl1" });
-
-	$.__views.index.add($.__views.lbl1);
-	$.__views.lbl2 = Ti.UI.createLabel(
-	{ id: "lbl2" });
-
-	$.__views.index.add($.__views.lbl2);
-	var __alloyId4 = function () {Alloy['Models']['Big'].__transform = _.isFunction(Alloy['Models']['Big'].transform) ? Alloy['Models']['Big'].transform() : Alloy['Models']['Big'].toJSON();$.lbl1.text = Alloy['Models']['Big']['__transform']['name'];};Alloy['Models']['Big'].on('fetch change destroy', __alloyId4);var __alloyId5 = function () {Alloy['Models']['small'].__transform = _.isFunction(Alloy['Models']['small'].transform) ? Alloy['Models']['small'].transform() : Alloy['Models']['small'].toJSON();$.lbl2.text = Alloy['Models']['small']['__transform']['name'];};Alloy['Models']['small'].on('fetch change destroy', __alloyId5);exports.destroy = function () {Alloy['Models']['Big'] && Alloy['Models']['Big'].off('fetch change destroy', __alloyId4);Alloy['Models']['small'] && Alloy['Models']['small'].off('fetch change destroy', __alloyId5);};
-
-
-
-
-	_.extend($, $.__views);
-
-
-	Alloy.Models.instance("Big").set({ name: "Big!" });
-	Alloy.Models.instance("small").set({ name: "small!" });
-
-	$.index.open();
-
-
-
-
-
-
-
-
-
-	_.extend($, exports);
-}
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1599/_generated/mobileweb/alloy/models/Big.js b/test/apps/testing/ALOY-1599/_generated/mobileweb/alloy/models/Big.js
deleted file mode 100755
index 484d10e63..000000000
--- a/test/apps/testing/ALOY-1599/_generated/mobileweb/alloy/models/Big.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var Alloy = require('/alloy'),
-    _ = require("/alloy/underscore")._,
-    model,
-    collection;
-
-exports.definition = {
-	config: {
-
-		adapter: {
-			type: "properties",
-			collection_name: "Big"
-		}
-	},
-	extendModel: function (Model) {
-		_.extend(Model.prototype, {});
-
-		return Model;
-	},
-	extendCollection: function (Collection) {
-		_.extend(Collection.prototype, {});
-
-		return Collection;
-	}
-};
-
-model = Alloy.M('Big', exports.definition, []);
-
-collection = Alloy.C('Big', exports.definition, model);
-
-exports.Model = model;
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1599/_generated/mobileweb/alloy/models/Small.js b/test/apps/testing/ALOY-1599/_generated/mobileweb/alloy/models/Small.js
deleted file mode 100755
index bd7751c78..000000000
--- a/test/apps/testing/ALOY-1599/_generated/mobileweb/alloy/models/Small.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var Alloy = require('/alloy'),
-    _ = require("/alloy/underscore")._,
-    model,
-    collection;
-
-exports.definition = {
-	config: {
-
-		adapter: {
-			type: "properties",
-			collection_name: "small"
-		}
-	},
-	extendModel: function (Model) {
-		_.extend(Model.prototype, {});
-
-		return Model;
-	},
-	extendCollection: function (Collection) {
-		_.extend(Collection.prototype, {});
-
-		return Collection;
-	}
-};
-
-model = Alloy.M('small', exports.definition, []);
-
-collection = Alloy.C('small', exports.definition, model);
-
-exports.Model = model;
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1615/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1615/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100755
index ba9ed614d..000000000
--- a/test/apps/testing/ALOY-1615/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,66 +0,0 @@
-var Alloy = require('/alloy'),
-Backbone = Alloy.Backbone,
-_ = Alloy._;
-
-
-
-
-function __processArg(obj, key) {
-	var arg = null;
-	if (obj) {
-		arg = obj[key] || null;
-	}
-	return arg;
-}
-
-function Controller() {
-
-	require('/alloy/controllers/' + 'BaseController').apply(this, Array.prototype.slice.call(arguments));
-	this.__controllerPath = 'index';
-	this.args = arguments[0] || {};
-
-	if (arguments[0]) {
-		var __parentSymbol = __processArg(arguments[0], '__parentSymbol');
-		var $model = __processArg(arguments[0], '$model');
-		var __itemTemplate = __processArg(arguments[0], '__itemTemplate');
-	}
-	var $ = this;
-	var exports = {};
-	var __defers = {};
-
-
-
-
-
-
-
-	$.__views.index = Ti.UI.createWindow(
-	{ backgroundColor: "#fff", fullscreen: false, exitOnClose: true, id: "index" });
-
-	$.__views.index && $.addTopLevelView($.__views.index);
-	$.__views.player = Ti.Media.createAudioPlayer(
-	{ id: "player" });
-
-	$.__views.index.add($.__views.player);
-	exports.destroy = function () {};
-
-
-
-
-	_.extend($, $.__views);
-
-
-	$.index.open();
-
-
-
-
-
-
-
-
-
-	_.extend($, exports);
-}
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-1697/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-1697/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100755
index f7b0a2301..000000000
--- a/test/apps/testing/ALOY-1697/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,89 +0,0 @@
-var Alloy = require('/alloy'),
-Backbone = Alloy.Backbone,
-_ = Alloy._;
-
-
-
-
-function __processArg(obj, key) {
-  var arg = null;
-  if (obj) {
-    arg = obj[key] || null;
-  }
-  return arg;
-}
-
-function Controller() {
-
-  require('/alloy/controllers/' + 'BaseController').apply(this, Array.prototype.slice.call(arguments));
-  this.__controllerPath = 'index';
-  this.args = arguments[0] || {};
-
-  if (arguments[0]) {
-    var __parentSymbol = __processArg(arguments[0], '__parentSymbol');
-    var $model = __processArg(arguments[0], '$model');
-    var __itemTemplate = __processArg(arguments[0], '__itemTemplate');
-  }
-  var $ = this;
-  var exports = {};
-  var __defers = {};
-
-  // Generated code that must be executed before all UI and/or
-  // controller code. One example is all model and collection
-  // declarations from markup.
-
-
-  // Generated UI code
-  $.__views.index = Ti.UI.createWindow(
-  { backgroundColor: "#fff", fullscreen: false, exitOnClose: true, id: "index" });
-
-  $.__views.index && $.addTopLevelView($.__views.index);
-  $.__views.webview = Ti.UI.createWebView(
-  { id: "webview", onlink: onLinkHandler });
-
-  $.__views.index.add($.__views.webview);
-  exports.destroy = function () {};
-
-  // make all IDed elements in $.__views available right on the $ in a
-  // controller's internal code. Externally the IDed elements will
-  // be accessed with getView().
-  _.extend($, $.__views);
-
-  // Controller code directly from the developer's controller file
-  var htmlText =
-  '<!DOCTYPE html>\n' +
-  '<html>\n' +
-  '	<head>\n' +
-  '		<meta name="viewport" content="width=device-width, initial-scale=1.0">\n' +
-  '	</head>\n' +
-  '	<body>\n' +
-  '		<p>WebView "onlink" Test</p>\n' +
-  '		<br/>\n' +
-  '		<br/>\n' +
-  '		<a href="mylink://show/alert">Show Alert</a>\n' +
-  '	</body>\n' +
-  '</html>\n';
-
-  function onLinkHandler(e) {
-    if (e.url === 'mylink://show/alert') {
-      alert("The 'onLinkHandler' callback was invoked.");
-      return false;
-    }
-    return true;
-  }
-  $.webview.html = htmlText;
-  $.index.open();
-
-  // Generated code that must be executed after all UI and
-  // controller code. One example deferred event handlers whose
-  // functions are not defined until after the controller code
-  // is executed.
-
-
-  // Extend the $ instance with all functions and properties
-  // defined on the exports object.
-  _.extend($, exports);
-}
-
-module.exports = Controller;
-//# sourceMappingURL=file:///Users/eharris/Documents/git/alloy/test/projects/Harness/build/map/Resources/mobileweb/alloy/controllers/index.js.map
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-262/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-262/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 68c6acd76..000000000
--- a/test/apps/testing/ALOY-262/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "This app is supported only on iOS",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-262/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-262/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 4fdae8cf8..000000000
--- a/test/apps/testing/ALOY-262/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "This app is supported only on iOS",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-351/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-351/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 463a03518..000000000
--- a/test/apps/testing/ALOY-351/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,50 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        color: "#000",
-        left: 20,
-        right: 20,
-        text: "Check the Alloy compile log and ensure that the sync adapters are not listed in the processed files.",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-351/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-351/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 462be083d..000000000
--- a/test/apps/testing/ALOY-351/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,44 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        color: "#000",
-        left: 20,
-        right: 20,
-        text: "Check the Alloy compile log and ensure that the sync adapters are not listed in the processed files.",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-362/_generated/blackberry/alloy/controllers/aRequiredLabel.js b/test/apps/testing/ALOY-362/_generated/blackberry/alloy/controllers/aRequiredLabel.js
deleted file mode 100644
index 70134b113..000000000
--- a/test/apps/testing/ALOY-362/_generated/blackberry/alloy/controllers/aRequiredLabel.js
+++ /dev/null
@@ -1,38 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "aRequiredLabel";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.foo = Ti.UI.createLabel({
-        id: "foo"
-    });
-    $.__views.foo && $.addTopLevelView($.__views.foo);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-362/_generated/blackberry/alloy/controllers/childview.js b/test/apps/testing/ALOY-362/_generated/blackberry/alloy/controllers/childview.js
deleted file mode 100644
index 49a90a166..000000000
--- a/test/apps/testing/ALOY-362/_generated/blackberry/alloy/controllers/childview.js
+++ /dev/null
@@ -1,58 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "childview";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.childview = Ti.UI.createView({
-        layout: "vertical",
-        id: "childview"
-    });
-    $.__views.childview && $.addTopLevelView($.__views.childview);
-    $.__views.label = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: "200dp",
-        color: "white",
-        font: {
-            fontWeight: "bold"
-        },
-        id: "label"
-    });
-    $.__views.childview.add($.__views.label);
-    $.__views.anotherlabel = Ti.UI.createLabel({
-        id: "anotherlabel"
-    });
-    $.__views.childview.add($.__views.anotherlabel);
-    $.__views.aRequiredView = Alloy.createController("aRequiredLabel", {
-        id: "aRequiredView",
-        __parentSymbol: $.__views.childview
-    });
-    $.__views.aRequiredView.setParent($.__views.childview);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-362/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-362/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 5181336bf..000000000
--- a/test/apps/testing/ALOY-362/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,96 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var childView = Alloy.createController("childview");
-    childView.updateViews({
-        "#label": {
-            text: "I am a label",
-            top: 50,
-            width: Ti.UI.FILL,
-            textAlign: Ti.UI.TEXT_ALIGNMENT_CENTER,
-            ellipsize: false,
-            backgroundGradient: {
-                type: "linear",
-                startPoint: {
-                    x: "0%",
-                    y: "50%"
-                },
-                endPoint: {
-                    x: "100%",
-                    y: "50%"
-                },
-                colors: [ {
-                    color: "red",
-                    offset: 0
-                }, {
-                    color: "blue",
-                    offset: .25
-                }, {
-                    color: "red",
-                    offset: 1
-                } ]
-            }
-        },
-        "#anotherlabel": {
-            text: "I am also a label",
-            foo: "bar"
-        },
-        "#someNonExistentId": {
-            text: "I do not exist"
-        }
-    });
-    $.index.add(childView.getView());
-    var opts = {
-        "#normallabel": {
-            text: "i used updateViews()",
-            color: "#a00",
-            font: {
-                fontWeight: "bold",
-                fontSize: 24
-            },
-            bottom: 50
-        }
-    };
-    $.index.add(Alloy.createController("normalchild").updateViews(opts).getView());
-    $.index.add(Alloy.createController("normalchild", {
-        text: "Set the old-fashioned way"
-    }).getView());
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-362/_generated/blackberry/alloy/controllers/normalchild.js b/test/apps/testing/ALOY-362/_generated/blackberry/alloy/controllers/normalchild.js
deleted file mode 100644
index dc7ff79ca..000000000
--- a/test/apps/testing/ALOY-362/_generated/blackberry/alloy/controllers/normalchild.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "normalchild";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.normallabel = Ti.UI.createLabel({
-        bottom: 10,
-        id: "normallabel"
-    });
-    $.__views.normallabel && $.addTopLevelView($.__views.normallabel);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    $.normallabel.text = args.text;
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-362/_generated/mobileweb/alloy/controllers/aRequiredLabel.js b/test/apps/testing/ALOY-362/_generated/mobileweb/alloy/controllers/aRequiredLabel.js
deleted file mode 100644
index aa10e5266..000000000
--- a/test/apps/testing/ALOY-362/_generated/mobileweb/alloy/controllers/aRequiredLabel.js
+++ /dev/null
@@ -1,32 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "aRequiredLabel";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.foo = Ti.UI.createLabel({
-        id: "foo"
-    });
-    $.__views.foo && $.addTopLevelView($.__views.foo);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-362/_generated/mobileweb/alloy/controllers/childview.js b/test/apps/testing/ALOY-362/_generated/mobileweb/alloy/controllers/childview.js
deleted file mode 100644
index d339ac822..000000000
--- a/test/apps/testing/ALOY-362/_generated/mobileweb/alloy/controllers/childview.js
+++ /dev/null
@@ -1,52 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "childview";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.childview = Ti.UI.createView({
-        layout: "vertical",
-        id: "childview"
-    });
-    $.__views.childview && $.addTopLevelView($.__views.childview);
-    $.__views.label = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: "200dp",
-        color: "white",
-        font: {
-            fontWeight: "bold"
-        },
-        id: "label"
-    });
-    $.__views.childview.add($.__views.label);
-    $.__views.anotherlabel = Ti.UI.createLabel({
-        id: "anotherlabel"
-    });
-    $.__views.childview.add($.__views.anotherlabel);
-    $.__views.aRequiredView = Alloy.createController("aRequiredLabel", {
-        id: "aRequiredView",
-        __parentSymbol: $.__views.childview
-    });
-    $.__views.aRequiredView.setParent($.__views.childview);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-362/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-362/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index d3a6600a5..000000000
--- a/test/apps/testing/ALOY-362/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,90 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var childView = Alloy.createController("childview");
-    childView.updateViews({
-        "#label": {
-            text: "I am a label",
-            top: 50,
-            width: Ti.UI.FILL,
-            textAlign: Ti.UI.TEXT_ALIGNMENT_CENTER,
-            ellipsize: false,
-            backgroundGradient: {
-                type: "linear",
-                startPoint: {
-                    x: "0%",
-                    y: "50%"
-                },
-                endPoint: {
-                    x: "100%",
-                    y: "50%"
-                },
-                colors: [ {
-                    color: "red",
-                    offset: 0
-                }, {
-                    color: "blue",
-                    offset: .25
-                }, {
-                    color: "red",
-                    offset: 1
-                } ]
-            }
-        },
-        "#anotherlabel": {
-            text: "I am also a label",
-            foo: "bar"
-        },
-        "#someNonExistentId": {
-            text: "I do not exist"
-        }
-    });
-    $.index.add(childView.getView());
-    var opts = {
-        "#normallabel": {
-            text: "i used updateViews()",
-            color: "#a00",
-            font: {
-                fontWeight: "bold",
-                fontSize: 24
-            },
-            bottom: 50
-        }
-    };
-    $.index.add(Alloy.createController("normalchild").updateViews(opts).getView());
-    $.index.add(Alloy.createController("normalchild", {
-        text: "Set the old-fashioned way"
-    }).getView());
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-362/_generated/mobileweb/alloy/controllers/normalchild.js b/test/apps/testing/ALOY-362/_generated/mobileweb/alloy/controllers/normalchild.js
deleted file mode 100644
index 8c35639b1..000000000
--- a/test/apps/testing/ALOY-362/_generated/mobileweb/alloy/controllers/normalchild.js
+++ /dev/null
@@ -1,35 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "normalchild";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.normallabel = Ti.UI.createLabel({
-        bottom: 10,
-        id: "normallabel"
-    });
-    $.__views.normallabel && $.addTopLevelView($.__views.normallabel);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    $.normallabel.text = args.text;
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-378/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-378/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 0d9db8802..000000000
--- a/test/apps/testing/ALOY-378/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,64 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doFoo(num) {
-        alert("Your rating = " + num);
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index",
-        title: "Books"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.starwidget = Alloy.createWidget("starrating", "widget", {
-        id: "starwidget",
-        max: "5",
-        initialRating: "2.5",
-        top: "20",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.starwidget.setParent($.__views.index);
-    $.__views.table = Ti.UI.createTableView({
-        id: "table",
-        top: "50"
-    });
-    $.__views.index.add($.__views.table);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var rows = [];
-    var titles = [ "Lord of the Rings", "Harry Potter", "Eragon", "Wheel of Time", "Narnia" ];
-    for (var i = 0, j = titles.length; j > i; i++) rows.push(Alloy.createController("row", {
-        title: titles[i]
-    }).getView());
-    $.table.data = rows;
-    $.starwidget.init(doFoo);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-378/_generated/blackberry/alloy/controllers/row.js b/test/apps/testing/ALOY-378/_generated/blackberry/alloy/controllers/row.js
deleted file mode 100644
index a69bd4dbe..000000000
--- a/test/apps/testing/ALOY-378/_generated/blackberry/alloy/controllers/row.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "row";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.row = Ti.UI.createTableViewRow({
-        color: "blue",
-        height: "50dp",
-        id: "row"
-    });
-    $.__views.row && $.addTopLevelView($.__views.row);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    $.row.title = args.title;
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-378/_generated/blackberry/alloy/widgets/starrating/controllers/star.js b/test/apps/testing/ALOY-378/_generated/blackberry/alloy/widgets/starrating/controllers/star.js
deleted file mode 100644
index 9e1715ecd..000000000
--- a/test/apps/testing/ALOY-378/_generated/blackberry/alloy/widgets/starrating/controllers/star.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "star";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.star = Ti.UI.createImageView({
-        height: "32dp",
-        width: "10dp",
-        left: "8dp",
-        id: "star"
-    });
-    $.__views.star && $.addTopLevelView($.__views.star);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-378/_generated/blackberry/alloy/widgets/starrating/controllers/widget.js b/test/apps/testing/ALOY-378/_generated/blackberry/alloy/widgets/starrating/controllers/widget.js
deleted file mode 100644
index 4dd528eaa..000000000
--- a/test/apps/testing/ALOY-378/_generated/blackberry/alloy/widgets/starrating/controllers/widget.js
+++ /dev/null
@@ -1,73 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.starrating = Ti.UI.createView({
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent",
-        id: "starrating"
-    });
-    $.__views.starrating && $.addTopLevelView($.__views.starrating);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {}, stars = [], rating = 0, max = 5;
-    var setRating = function(newRating) {
-        newRating > max && (newRating = max);
-        rating = newRating;
-        for (var i = 0, l = stars.length; l > i; i++) stars[i].image = WPATH(i >= rating ? "star_off.png" : rating > i && i + 1 > rating ? "star_half.png" : "star.png");
-    };
-    exports.setRating = setRating;
-    exports.getRating = function() {
-        return rating;
-    };
-    var createStars = function(num, cb) {
-        for (var i = 0; num > i; i++) {
-            var star = Alloy.createWidget("starrating", "star").getView();
-            !function() {
-                var index = i;
-                star.addEventListener("click", function() {
-                    setRating(index + 1);
-                    cb(index + 1);
-                });
-            }();
-            stars.push(star);
-            $.starrating.add(star);
-        }
-    };
-    exports.init = function(callback) {
-        var max = args.max || 5, initialRating = args.initialRating || 0, cb = callback || function() {};
-        createStars(max, cb);
-        setRating(initialRating);
-        _.extend($.starrating, args);
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-378/_generated/blackberry/alloy/widgets/starrating/styles/star.js b/test/apps/testing/ALOY-378/_generated/blackberry/alloy/widgets/starrating/styles/star.js
deleted file mode 100644
index 10e857062..000000000
--- a/test/apps/testing/ALOY-378/_generated/blackberry/alloy/widgets/starrating/styles/star.js
+++ /dev/null
@@ -1,40 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "TableViewRow",
-    style: {
-        color: "black",
-        height: "50dp"
-    }
-}, {
-    isApi: true,
-    priority: 1000.9001999999999,
-    key: "TableViewRow",
-    style: {
-        color: "blue"
-    }
-}, {
-    isClass: true,
-    priority: 10000.0002,
-    key: "star",
-    style: {
-        height: "24dp",
-        width: "24dp",
-        left: "5dp"
-    }
-}, {
-    isClass: true,
-    priority: 10000.9003,
-    key: "star",
-    style: {
-        height: "32dp",
-        width: "10dp",
-        left: "8dp"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-378/_generated/blackberry/alloy/widgets/starrating/styles/widget.js b/test/apps/testing/ALOY-378/_generated/blackberry/alloy/widgets/starrating/styles/widget.js
deleted file mode 100644
index 8538464e4..000000000
--- a/test/apps/testing/ALOY-378/_generated/blackberry/alloy/widgets/starrating/styles/widget.js
+++ /dev/null
@@ -1,31 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "TableViewRow",
-    style: {
-        color: "black",
-        height: "50dp"
-    }
-}, {
-    isApi: true,
-    priority: 1000.9001999999999,
-    key: "TableViewRow",
-    style: {
-        color: "blue"
-    }
-}, {
-    isId: true,
-    priority: 100000.0004,
-    key: "starrating",
-    style: {
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 9f7df7337..000000000
--- a/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,58 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doFoo(num) {
-        alert("Your rating = " + num);
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index",
-        title: "Books"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.starwidget = Alloy.createWidget("starrating", "widget", {
-        id: "starwidget",
-        max: 5,
-        initialRating: 2.5,
-        top: 20,
-        __parentSymbol: $.__views.index
-    });
-    $.__views.starwidget.setParent($.__views.index);
-    $.__views.table = Ti.UI.createTableView({
-        id: "table",
-        top: 50
-    });
-    $.__views.index.add($.__views.table);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var rows = [];
-    var titles = [ "Lord of the Rings", "Harry Potter", "Eragon", "Wheel of Time", "Narnia" ];
-    for (var i = 0, j = titles.length; j > i; i++) rows.push(Alloy.createController("row", {
-        title: titles[i]
-    }).getView());
-    $.table.data = rows;
-    $.starwidget.init(doFoo);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/controllers/row.js b/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/controllers/row.js
deleted file mode 100644
index 1304b078a..000000000
--- a/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/controllers/row.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "row";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.row = Ti.UI.createTableViewRow({
-        color: "blue",
-        height: "50dp",
-        id: "row"
-    });
-    $.__views.row && $.addTopLevelView($.__views.row);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    $.row.title = args.title;
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/widgets/starrating/controllers/star.js b/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/widgets/starrating/controllers/star.js
deleted file mode 100644
index 671dea1b3..000000000
--- a/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/widgets/starrating/controllers/star.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "star";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.star = Ti.UI.createImageView({
-        height: "32dp",
-        width: "10dp",
-        left: "8dp",
-        id: "star"
-    });
-    $.__views.star && $.addTopLevelView($.__views.star);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/widgets/starrating/controllers/widget.js b/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/widgets/starrating/controllers/widget.js
deleted file mode 100644
index cb1bc629d..000000000
--- a/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/widgets/starrating/controllers/widget.js
+++ /dev/null
@@ -1,73 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.starrating = Ti.UI.createView({
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent",
-        id: "starrating"
-    });
-    $.__views.starrating && $.addTopLevelView($.__views.starrating);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {}, stars = [], rating = 0, max = 5;
-    var setRating = function(newRating) {
-        newRating > max && (newRating = max);
-        rating = newRating;
-        for (var i = 0, l = stars.length; l > i; i++) i >= rating ? stars[i].image = WPATH("star_off.png") : rating > i && i + 1 > rating ? stars[i].image = WPATH("star_half.png") : stars[i].image = WPATH("star.png");
-    };
-    exports.setRating = setRating;
-    exports.getRating = function() {
-        return rating;
-    };
-    var createStars = function(num, cb) {
-        for (var i = 0; num > i; i++) {
-            var star = Alloy.createWidget("starrating", "star").getView();
-            !function() {
-                var index = i;
-                star.addEventListener("click", function() {
-                    setRating(index + 1);
-                    cb(index + 1);
-                });
-            }();
-            stars.push(star);
-            $.starrating.add(star);
-        }
-    };
-    exports.init = function(callback) {
-        var max = args.max || 5, initialRating = args.initialRating || 0, cb = callback || function() {};
-        createStars(max, cb);
-        setRating(initialRating);
-        _.extend($.starrating, args);
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/widgets/starrating/styles/star.js b/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/widgets/starrating/styles/star.js
deleted file mode 100644
index fa23ea02c..000000000
--- a/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/widgets/starrating/styles/star.js
+++ /dev/null
@@ -1,40 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "TableViewRow",
-    style: {
-        color: "black",
-        height: "50dp"
-    }
-}, {
-    isApi: true,
-    priority: 1000.9001999999999,
-    key: "TableViewRow",
-    style: {
-        color: "blue"
-    }
-}, {
-    isClass: true,
-    priority: 10000.0003,
-    key: "star",
-    style: {
-        height: "24dp",
-        width: "24dp",
-        left: "5dp"
-    }
-}, {
-    isClass: true,
-    priority: 10000.9004,
-    key: "star",
-    style: {
-        height: "32dp",
-        width: "10dp",
-        left: "8dp"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/widgets/starrating/styles/widget.js b/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/widgets/starrating/styles/widget.js
deleted file mode 100644
index 377153ee8..000000000
--- a/test/apps/testing/ALOY-378/_generated/mobileweb/alloy/widgets/starrating/styles/widget.js
+++ /dev/null
@@ -1,31 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "TableViewRow",
-    style: {
-        color: "black",
-        height: "50dp"
-    }
-}, {
-    isApi: true,
-    priority: 1000.9001999999999,
-    key: "TableViewRow",
-    style: {
-        color: "blue"
-    }
-}, {
-    isId: true,
-    priority: 100000.0005,
-    key: "starrating",
-    style: {
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-378/widgets/starrating/widget.json b/test/apps/testing/ALOY-378/widgets/starrating/widget.json
index 2da1e2583..4a8fd06ee 100644
--- a/test/apps/testing/ALOY-378/widgets/starrating/widget.json
+++ b/test/apps/testing/ALOY-378/widgets/starrating/widget.json
@@ -9,5 +9,5 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"3.0",
 	"tags":"",
-	"platforms":"android,ios,mobileweb"
+	"platforms":"android,ios"
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-440/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-440/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 995193f05..000000000
--- a/test/apps/testing/ALOY-440/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,132 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId8(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId8.opts || {};
-        var models = __alloyId7.models;
-        var len = models.length;
-        var rows = [];
-        _.each($.__views.column1.getRows(), function(r) {
-            $.__views.column1.removeRow(r);
-        });
-        for (var i = 0; len > i; i++) {
-            var __alloyId5 = models[i];
-            __alloyId5.__transform = {};
-            $.__views.__alloyId6 = Ti.UI.createPickerRow({
-                title: "undefined" != typeof __alloyId5.__transform["name"] ? __alloyId5.__transform["name"] : __alloyId5.get("name"),
-                id: "__alloyId6"
-            });
-            rows.push($.__views.__alloyId6);
-        }
-        _.each(rows, function(row) {
-            $.__views.column1.addRow(row);
-        });
-    }
-    function __alloyId12(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId12.opts || {};
-        var models = __alloyId11.models;
-        var len = models.length;
-        var rows = [];
-        _.each($.__views.column2.getRows(), function(r) {
-            $.__views.column2.removeRow(r);
-        });
-        for (var i = 0; len > i; i++) {
-            var __alloyId9 = models[i];
-            __alloyId9.__transform = doTransform(__alloyId9);
-            $.__views.__alloyId10 = Ti.UI.createPickerRow({
-                title: "undefined" != typeof __alloyId9.__transform["color"] ? __alloyId9.__transform["color"] : __alloyId9.get("color"),
-                id: "__alloyId10"
-            });
-            rows.push($.__views.__alloyId10);
-        }
-        _.each(rows, function(row) {
-            $.__views.column2.addRow(row);
-        });
-    }
-    function doTransform(model) {
-        var transform = model.toJSON();
-        transform.color = transform.color.toUpperCase();
-        return transform;
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    Alloy.Collections.instance("fruits");
-    Alloy.Collections.instance("colors");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.picker = Ti.UI.createPicker({
-        id: "picker",
-        top: "50",
-        useSpinner: "true"
-    });
-    $.__views.index.add($.__views.picker);
-    var __alloyId4 = [];
-    $.__views.column1 = Ti.UI.createPickerColumn({
-        id: "column1"
-    });
-    __alloyId4.push($.__views.column1);
-    var __alloyId7 = Alloy.Collections["fruits"] || fruits;
-    __alloyId7.on("fetch destroy change add remove reset", __alloyId8);
-    $.__views.column2 = Ti.UI.createPickerColumn({
-        id: "column2"
-    });
-    __alloyId4.push($.__views.column2);
-    var __alloyId11 = Alloy.Collections["colors"] || colors;
-    __alloyId11.on("fetch destroy change add remove reset", __alloyId12);
-    $.__views.picker.add(__alloyId4);
-    exports.destroy = function() {
-        __alloyId7.off("fetch destroy change add remove reset", __alloyId8);
-        __alloyId11.off("fetch destroy change add remove reset", __alloyId12);
-    };
-    _.extend($, $.__views);
-    Ti.API.info("seeded: " + Ti.App.Properties.hasProperty("seeded"));
-    if (!Ti.App.Properties.hasProperty("seeded")) {
-        var fruits = [ "apple", "banana", "cherry", "blueberry", "orange", "pear" ];
-        var colors = [ "red", "yellow", "blue", "orange", "green", "white" ];
-        for (var i = 1, j = fruits.length; j > i; i++) {
-            Alloy.createModel("fruits", {
-                name: fruits[i]
-            }).save();
-            Alloy.createModel("colors", {
-                color: colors[i]
-            }).save();
-        }
-        Ti.App.Properties.setString("seeded", "yes");
-    }
-    Alloy.Collections.fruits.fetch();
-    Alloy.Collections.colors.fetch();
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-440/_generated/blackberry/alloy/models/Colors.js b/test/apps/testing/ALOY-440/_generated/blackberry/alloy/models/Colors.js
deleted file mode 100644
index 25a72f8a8..000000000
--- a/test/apps/testing/ALOY-440/_generated/blackberry/alloy/models/Colors.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            color: "text"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "colors"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("colors", exports.definition, []);
-
-collection = Alloy.C("colors", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-440/_generated/blackberry/alloy/models/Fruits.js b/test/apps/testing/ALOY-440/_generated/blackberry/alloy/models/Fruits.js
deleted file mode 100644
index cf8c73904..000000000
--- a/test/apps/testing/ALOY-440/_generated/blackberry/alloy/models/Fruits.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            name: "text"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "fruits"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("fruits", exports.definition, []);
-
-collection = Alloy.C("fruits", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-440/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-440/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index e8e08e9de..000000000
--- a/test/apps/testing/ALOY-440/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,122 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId8(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId8.opts || {};
-        var models = __alloyId7.models;
-        var len = models.length;
-        var rows = [];
-        _.each($.__views.column1.getRows(), function(r) {
-            $.__views.column1.removeRow(r);
-        });
-        for (var i = 0; len > i; i++) {
-            var __alloyId5 = models[i];
-            __alloyId5.__transform = _.isFunction(__alloyId5.transform) ? __alloyId5.transform() : __alloyId5.toJSON();
-            $.__views.__alloyId6 = Ti.UI.createPickerRow({
-                title: __alloyId5.__transform.name,
-                id: "__alloyId6"
-            });
-            rows.push($.__views.__alloyId6);
-        }
-        _.each(rows, function(row) {
-            $.__views.column1.addRow(row);
-        });
-    }
-    function __alloyId12(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId12.opts || {};
-        var models = __alloyId11.models;
-        var len = models.length;
-        var rows = [];
-        _.each($.__views.column2.getRows(), function(r) {
-            $.__views.column2.removeRow(r);
-        });
-        for (var i = 0; len > i; i++) {
-            var __alloyId9 = models[i];
-            __alloyId9.__transform = doTransform(__alloyId9);
-            $.__views.__alloyId10 = Ti.UI.createPickerRow({
-                title: __alloyId9.__transform.color,
-                id: "__alloyId10"
-            });
-            rows.push($.__views.__alloyId10);
-        }
-        _.each(rows, function(row) {
-            $.__views.column2.addRow(row);
-        });
-    }
-    function doTransform(model) {
-        var transform = model.toJSON();
-        transform.color = transform.color.toUpperCase();
-        return transform;
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    Alloy.Collections.instance("fruits");
-    Alloy.Collections.instance("colors");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.picker = Ti.UI.createPicker({
-        id: "picker",
-        top: 50,
-        useSpinner: true
-    });
-    $.__views.index.add($.__views.picker);
-    var __alloyId4 = [];
-    $.__views.column1 = Ti.UI.createPickerColumn({
-        id: "column1"
-    });
-    __alloyId4.push($.__views.column1);
-    var __alloyId7 = Alloy.Collections["fruits"] || fruits;
-    __alloyId7.on("fetch destroy change add remove reset", __alloyId8);
-    $.__views.column2 = Ti.UI.createPickerColumn({
-        id: "column2"
-    });
-    __alloyId4.push($.__views.column2);
-    var __alloyId11 = Alloy.Collections["colors"] || colors;
-    __alloyId11.on("fetch destroy change add remove reset", __alloyId12);
-    $.__views.picker.add(__alloyId4);
-    exports.destroy = function() {
-        __alloyId7 && __alloyId7.off("fetch destroy change add remove reset", __alloyId8);
-        __alloyId11 && __alloyId11.off("fetch destroy change add remove reset", __alloyId12);
-    };
-    _.extend($, $.__views);
-    var fruits = [ "apple", "banana", "cherry", "blueberry", "orange", "pear" ];
-    var colors = [ "red", "yellow", "blue", "orange", "green", "white" ];
-    for (var i = 1, j = fruits.length; j > i; i++) {
-        Alloy.createModel("fruits", {
-            name: fruits[i]
-        }).save();
-        Alloy.createModel("colors", {
-            color: colors[i]
-        }).save();
-    }
-    Alloy.Collections.fruits.fetch();
-    Alloy.Collections.colors.fetch();
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-440/_generated/mobileweb/alloy/models/Colors.js b/test/apps/testing/ALOY-440/_generated/mobileweb/alloy/models/Colors.js
deleted file mode 100644
index 6040a2e30..000000000
--- a/test/apps/testing/ALOY-440/_generated/mobileweb/alloy/models/Colors.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            color: "text"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "colors"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("colors", exports.definition, []);
-
-collection = Alloy.C("colors", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-440/_generated/mobileweb/alloy/models/Fruits.js b/test/apps/testing/ALOY-440/_generated/mobileweb/alloy/models/Fruits.js
deleted file mode 100644
index 98f9a544d..000000000
--- a/test/apps/testing/ALOY-440/_generated/mobileweb/alloy/models/Fruits.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            name: "text"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "fruits"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("fruits", exports.definition, []);
-
-collection = Alloy.C("fruits", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-440c/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-440c/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 9ff210412..000000000
--- a/test/apps/testing/ALOY-440c/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,51 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "black",
-        font: {
-            fontSize: "15dp"
-        },
-        text: "Sample is meant for Android only",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-440c/_generated/blackberry/alloy/models/Book.js b/test/apps/testing/ALOY-440c/_generated/blackberry/alloy/models/Book.js
deleted file mode 100644
index cb59c2f14..000000000
--- a/test/apps/testing/ALOY-440c/_generated/blackberry/alloy/models/Book.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        adapter: {
-            type: "properties",
-            collection_name: "book"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("book", exports.definition, []);
-
-collection = Alloy.C("book", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-440c/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-440c/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 1a68b1a43..000000000
--- a/test/apps/testing/ALOY-440c/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,45 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "black",
-        font: {
-            fontSize: "15dp"
-        },
-        text: "Sample is meant for Android only",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-440c/_generated/mobileweb/alloy/models/Book.js b/test/apps/testing/ALOY-440c/_generated/mobileweb/alloy/models/Book.js
deleted file mode 100644
index 7fb5910d9..000000000
--- a/test/apps/testing/ALOY-440c/_generated/mobileweb/alloy/models/Book.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        adapter: {
-            type: "properties",
-            collection_name: "book"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("book", exports.definition, []);
-
-collection = Alloy.C("book", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-443/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-443/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index a4b8d28e5..000000000
--- a/test/apps/testing/ALOY-443/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,140 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId13(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId13.opts || {};
-        var models = __alloyId12.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId8 = models[i];
-            __alloyId8.__transform = {};
-            var __alloyId9 = Ti.UI.createTableViewRow({});
-            rows.push(__alloyId9);
-            var __alloyId11 = Ti.UI.createLabel({
-                width: Ti.UI.SIZE,
-                height: Ti.UI.SIZE,
-                color: "#000",
-                text: "undefined" != typeof __alloyId8.__transform["title"] ? __alloyId8.__transform["title"] : __alloyId8.get("title") + ", by " + __alloyId8.get("author")
-            });
-            __alloyId9.add(__alloyId11);
-        }
-        $.__views.tableview.setData(rows);
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    Alloy.Models.instance("book");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        layout: "vertical",
-        top: "20",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId3"
-    });
-    $.__views.index.add($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "- Reading List -",
-        id: "__alloyId4"
-    });
-    $.__views.index.add($.__views.__alloyId4);
-    $.__views.__alloyId5 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId5"
-    });
-    $.__views.index.add($.__views.__alloyId5);
-    $.__views.__alloyId6 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId6"
-    });
-    $.__views.index.add($.__views.__alloyId6);
-    $.__views.__alloyId7 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId7"
-    });
-    $.__views.index.add($.__views.__alloyId7);
-    $.__views.tableview = Ti.UI.createTableView({
-        id: "tableview",
-        top: "30"
-    });
-    $.__views.index.add($.__views.tableview);
-    var __alloyId12 = Alloy.Collections["book"] || book;
-    __alloyId12.on("fetch destroy change add remove reset", __alloyId13);
-    var __alloyId14 = function() {
-        $.__alloyId2.text = _.isFunction(Alloy.Models.book.transform) ? Alloy.Models.book.transform()["title"] : _.template("<%=book.title%>", {
-            book: Alloy.Models.book.toJSON()
-        });
-        $.__alloyId3.text = _.isFunction(Alloy.Models.book.transform) ? Alloy.Models.book.transform()["author"] : _.template("Written by <%=book.author%>", {
-            book: Alloy.Models.book.toJSON()
-        });
-        $.__alloyId5.text = _.isFunction(Alloy.Models.book.transform) ? Alloy.Models.book.transform()["title"] : _.template("<%=book.title%>", {
-            book: Alloy.Models.book.toJSON()
-        });
-        $.__alloyId6.text = _.isFunction(Alloy.Models.book.transform) ? Alloy.Models.book.transform()["author"] : _.template("Written by <%=book.author%>", {
-            book: Alloy.Models.book.toJSON()
-        });
-        $.__alloyId7.text = _.isFunction(Alloy.Models.book.transform) ? Alloy.Models.book.transform()["title"] : _.template("Title: <%=book.title%>, by <%=book.author%> :)", {
-            book: Alloy.Models.book.toJSON()
-        });
-    };
-    Alloy.Models.book.on("fetch change destroy", __alloyId14);
-    exports.destroy = function() {
-        __alloyId12.off("fetch destroy change add remove reset", __alloyId13);
-        Alloy.Models.book.off("fetch change destroy", __alloyId14);
-    };
-    _.extend($, $.__views);
-    Alloy.Models.book.set({
-        title: "The Death of Ivan Ilyich",
-        author: "Leo Tolstoy"
-    });
-    Alloy.Collections.book.trigger("change");
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-443/_generated/blackberry/alloy/models/Book.js b/test/apps/testing/ALOY-443/_generated/blackberry/alloy/models/Book.js
deleted file mode 100644
index a0e90c2c3..000000000
--- a/test/apps/testing/ALOY-443/_generated/blackberry/alloy/models/Book.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            title: "string",
-            author: "string"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "book"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("book", exports.definition, []);
-
-collection = Alloy.C("book", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-443/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-443/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index f45d1594a..000000000
--- a/test/apps/testing/ALOY-443/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,125 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId13(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId13.opts || {};
-        var models = __alloyId12.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId8 = models[i];
-            __alloyId8.__transform = _.isFunction(__alloyId8.transform) ? __alloyId8.transform() : __alloyId8.toJSON();
-            var __alloyId9 = Ti.UI.createTableViewRow({});
-            rows.push(__alloyId9);
-            var __alloyId11 = Ti.UI.createLabel({
-                width: Ti.UI.SIZE,
-                height: Ti.UI.SIZE,
-                color: "#000",
-                text: __alloyId8.__transform.title + ", by " + __alloyId8.__transform.author
-            });
-            __alloyId9.add(__alloyId11);
-        }
-        $.__views.tableview.setData(rows);
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    Alloy.Models.instance("book");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        layout: "vertical",
-        top: 20,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId3"
-    });
-    $.__views.index.add($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "- Reading List -",
-        id: "__alloyId4"
-    });
-    $.__views.index.add($.__views.__alloyId4);
-    $.__views.__alloyId5 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId5"
-    });
-    $.__views.index.add($.__views.__alloyId5);
-    $.__views.__alloyId6 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId6"
-    });
-    $.__views.index.add($.__views.__alloyId6);
-    $.__views.__alloyId7 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        id: "__alloyId7"
-    });
-    $.__views.index.add($.__views.__alloyId7);
-    $.__views.tableview = Ti.UI.createTableView({
-        id: "tableview",
-        top: 30
-    });
-    $.__views.index.add($.__views.tableview);
-    var __alloyId12 = Alloy.Collections["book"] || book;
-    __alloyId12.on("fetch destroy change add remove reset", __alloyId13);
-    var __alloyId14 = function() {
-        Alloy["Models"]["book"].__transform = _.isFunction(Alloy["Models"]["book"].transform) ? Alloy["Models"]["book"].transform() : Alloy["Models"]["book"].toJSON();
-        $.__alloyId2.text = Alloy["Models"]["book"]["__transform"]["title"];
-        $.__alloyId3.text = "Written by " + Alloy["Models"]["book"]["__transform"]["author"];
-        $.__alloyId5.text = Alloy["Models"]["book"]["__transform"]["title"];
-        $.__alloyId6.text = "Written by " + Alloy["Models"]["book"]["__transform"]["author"];
-        $.__alloyId7.text = "Title: " + Alloy["Models"]["book"]["__transform"]["title"] + ", by " + Alloy["Models"]["book"]["__transform"]["author"] + " :)";
-    };
-    Alloy["Models"]["book"].on("fetch change destroy", __alloyId14);
-    exports.destroy = function() {
-        __alloyId12 && __alloyId12.off("fetch destroy change add remove reset", __alloyId13);
-        Alloy["Models"]["book"] && Alloy["Models"]["book"].off("fetch change destroy", __alloyId14);
-    };
-    _.extend($, $.__views);
-    Alloy.Models.book.set({
-        title: "The Death of Ivan Ilyich",
-        author: "Leo Tolstoy"
-    });
-    Alloy.Collections.book.trigger("change");
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-443/_generated/mobileweb/alloy/models/Book.js b/test/apps/testing/ALOY-443/_generated/mobileweb/alloy/models/Book.js
deleted file mode 100644
index 21b3e25f1..000000000
--- a/test/apps/testing/ALOY-443/_generated/mobileweb/alloy/models/Book.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            title: "string",
-            author: "string"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "book"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("book", exports.definition, []);
-
-collection = Alloy.C("book", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-488/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 92c6d5670..000000000
--- a/test/apps/testing/ALOY-488/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,70 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick() {
-        alert($.label.text);
-    }
-    function doAlert(num) {
-        alert("Your rating = " + num);
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.starwidget = Alloy.createWidget("starrating", "widget", {
-        id: "starwidget",
-        max: "5",
-        initialRating: "2.5",
-        top: "20",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.starwidget.setParent($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        font: {
-            fontSize: 12
-        },
-        text: "Hello, World",
-        id: "label",
-        top: "100"
-    });
-    $.__views.index.add($.__views.label);
-    doClick ? $.__views.label.addEventListener("click", doClick) : __defers["$.__views.label!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.starwidget.init(doAlert);
-    $.index.open();
-    __defers["$.__views.label!click!doClick"] && $.__views.label.addEventListener("click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/foo/controllers/widget.js b/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/foo/controllers/widget.js
deleted file mode 100644
index a2d7d3217..000000000
--- a/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/foo/controllers/widget.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "foo/" + s : s.substring(0, index) + "/foo/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("foo");
-    this.__widgetId = "foo";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/foo/styles/widget.js b/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/foo/styles/widget.js
deleted file mode 100644
index ecdd1a526..000000000
--- a/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/foo/styles/widget.js
+++ /dev/null
@@ -1,20 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "foo/" + s : s.substring(0, index) + "/foo/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0004,
-    key: "Label",
-    style: {
-        color: "#000",
-        font: {
-            fontSize: 18,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/starrating/controllers/star.js b/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/starrating/controllers/star.js
deleted file mode 100644
index 62db34318..000000000
--- a/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/starrating/controllers/star.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "star";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.star = Ti.UI.createImageView({
-        height: "24dp",
-        width: "24dp",
-        left: "5dp",
-        id: "star"
-    });
-    $.__views.star && $.addTopLevelView($.__views.star);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/starrating/controllers/widget.js b/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/starrating/controllers/widget.js
deleted file mode 100644
index 4dd528eaa..000000000
--- a/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/starrating/controllers/widget.js
+++ /dev/null
@@ -1,73 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.starrating = Ti.UI.createView({
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent",
-        id: "starrating"
-    });
-    $.__views.starrating && $.addTopLevelView($.__views.starrating);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {}, stars = [], rating = 0, max = 5;
-    var setRating = function(newRating) {
-        newRating > max && (newRating = max);
-        rating = newRating;
-        for (var i = 0, l = stars.length; l > i; i++) stars[i].image = WPATH(i >= rating ? "star_off.png" : rating > i && i + 1 > rating ? "star_half.png" : "star.png");
-    };
-    exports.setRating = setRating;
-    exports.getRating = function() {
-        return rating;
-    };
-    var createStars = function(num, cb) {
-        for (var i = 0; num > i; i++) {
-            var star = Alloy.createWidget("starrating", "star").getView();
-            !function() {
-                var index = i;
-                star.addEventListener("click", function() {
-                    setRating(index + 1);
-                    cb(index + 1);
-                });
-            }();
-            stars.push(star);
-            $.starrating.add(star);
-        }
-    };
-    exports.init = function(callback) {
-        var max = args.max || 5, initialRating = args.initialRating || 0, cb = callback || function() {};
-        createStars(max, cb);
-        setRating(initialRating);
-        _.extend($.starrating, args);
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/starrating/styles/star.js b/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/starrating/styles/star.js
deleted file mode 100644
index 1df3da050..000000000
--- a/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/starrating/styles/star.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isClass: true,
-    priority: 10000.0002,
-    key: "star",
-    style: {
-        height: "24dp",
-        width: "24dp",
-        left: "5dp"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/starrating/styles/widget.js b/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/starrating/styles/widget.js
deleted file mode 100644
index b3efc6b24..000000000
--- a/test/apps/testing/ALOY-488/_generated/blackberry/alloy/widgets/starrating/styles/widget.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isId: true,
-    priority: 100000.0003,
-    key: "starrating",
-    style: {
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 3992ed3ce..000000000
--- a/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,64 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick(e) {
-        alert($.label.text);
-    }
-    function doAlert(num) {
-        alert("Your rating = " + num);
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.starwidget = Alloy.createWidget("starrating", "widget", {
-        id: "starwidget",
-        max: 5,
-        initialRating: 2.5,
-        top: 20,
-        __parentSymbol: $.__views.index
-    });
-    $.__views.starwidget.setParent($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        font: {
-            fontSize: 12
-        },
-        text: "Hello, World",
-        id: "label",
-        top: 100
-    });
-    $.__views.index.add($.__views.label);
-    doClick ? $.addListener($.__views.label, "click", doClick) : __defers["$.__views.label!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.starwidget.init(doAlert);
-    $.index.open();
-    __defers["$.__views.label!click!doClick"] && $.addListener($.__views.label, "click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/foo/controllers/widget.js b/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/foo/controllers/widget.js
deleted file mode 100644
index bdd92171e..000000000
--- a/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/foo/controllers/widget.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "foo/" + s : s.substring(0, index) + "/foo/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("foo");
-    this.__widgetId = "foo";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/foo/styles/widget.js b/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/foo/styles/widget.js
deleted file mode 100644
index 8555531cc..000000000
--- a/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/foo/styles/widget.js
+++ /dev/null
@@ -1,20 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "foo/" + s : s.substring(0, index) + "/foo/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0003,
-    key: "Label",
-    style: {
-        color: "#000",
-        font: {
-            fontSize: 18,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/starrating/controllers/star.js b/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/starrating/controllers/star.js
deleted file mode 100644
index 1dea4f258..000000000
--- a/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/starrating/controllers/star.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "star";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.star = Ti.UI.createImageView({
-        height: "24dp",
-        width: "24dp",
-        left: "5dp",
-        id: "star"
-    });
-    $.__views.star && $.addTopLevelView($.__views.star);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/starrating/controllers/widget.js b/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/starrating/controllers/widget.js
deleted file mode 100644
index cb1bc629d..000000000
--- a/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/starrating/controllers/widget.js
+++ /dev/null
@@ -1,73 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.starrating = Ti.UI.createView({
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent",
-        id: "starrating"
-    });
-    $.__views.starrating && $.addTopLevelView($.__views.starrating);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {}, stars = [], rating = 0, max = 5;
-    var setRating = function(newRating) {
-        newRating > max && (newRating = max);
-        rating = newRating;
-        for (var i = 0, l = stars.length; l > i; i++) i >= rating ? stars[i].image = WPATH("star_off.png") : rating > i && i + 1 > rating ? stars[i].image = WPATH("star_half.png") : stars[i].image = WPATH("star.png");
-    };
-    exports.setRating = setRating;
-    exports.getRating = function() {
-        return rating;
-    };
-    var createStars = function(num, cb) {
-        for (var i = 0; num > i; i++) {
-            var star = Alloy.createWidget("starrating", "star").getView();
-            !function() {
-                var index = i;
-                star.addEventListener("click", function() {
-                    setRating(index + 1);
-                    cb(index + 1);
-                });
-            }();
-            stars.push(star);
-            $.starrating.add(star);
-        }
-    };
-    exports.init = function(callback) {
-        var max = args.max || 5, initialRating = args.initialRating || 0, cb = callback || function() {};
-        createStars(max, cb);
-        setRating(initialRating);
-        _.extend($.starrating, args);
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/starrating/styles/star.js b/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/starrating/styles/star.js
deleted file mode 100644
index 6810b0772..000000000
--- a/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/starrating/styles/star.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isClass: true,
-    priority: 10000.0001,
-    key: "star",
-    style: {
-        height: "24dp",
-        width: "24dp",
-        left: "5dp"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/starrating/styles/widget.js b/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/starrating/styles/widget.js
deleted file mode 100644
index 89cb6289f..000000000
--- a/test/apps/testing/ALOY-488/_generated/mobileweb/alloy/widgets/starrating/styles/widget.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isId: true,
-    priority: 100000.0002,
-    key: "starrating",
-    style: {
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/assets/blackberry/Ti.Manifest b/test/apps/testing/ALOY-488/assets/blackberry/Ti.Manifest
deleted file mode 100644
index a13223048..000000000
--- a/test/apps/testing/ALOY-488/assets/blackberry/Ti.Manifest
+++ /dev/null
@@ -1 +0,0 @@
-buildID=1
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/assets/blackberry/appicon.png b/test/apps/testing/ALOY-488/assets/blackberry/appicon.png
deleted file mode 100644
index c1570b338..000000000
Binary files a/test/apps/testing/ALOY-488/assets/blackberry/appicon.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/assets/blackberry/map/bubble.png b/test/apps/testing/ALOY-488/assets/blackberry/map/bubble.png
deleted file mode 100644
index 63cbfbeb8..000000000
Binary files a/test/apps/testing/ALOY-488/assets/blackberry/map/bubble.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/assets/blackberry/map/green_pin.png b/test/apps/testing/ALOY-488/assets/blackberry/map/green_pin.png
deleted file mode 100644
index 6125399e9..000000000
Binary files a/test/apps/testing/ALOY-488/assets/blackberry/map/green_pin.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/assets/blackberry/map/purple_pin.png b/test/apps/testing/ALOY-488/assets/blackberry/map/purple_pin.png
deleted file mode 100644
index 0825d4778..000000000
Binary files a/test/apps/testing/ALOY-488/assets/blackberry/map/purple_pin.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/assets/blackberry/map/red_pin.png b/test/apps/testing/ALOY-488/assets/blackberry/map/red_pin.png
deleted file mode 100644
index 7cf9fb26c..000000000
Binary files a/test/apps/testing/ALOY-488/assets/blackberry/map/red_pin.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/assets/blackberry/splash-600x1024.png b/test/apps/testing/ALOY-488/assets/blackberry/splash-600x1024.png
deleted file mode 100644
index eb2ee993f..000000000
Binary files a/test/apps/testing/ALOY-488/assets/blackberry/splash-600x1024.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/assets/blackberry/splash-720x720.png b/test/apps/testing/ALOY-488/assets/blackberry/splash-720x720.png
deleted file mode 100644
index 1e282398d..000000000
Binary files a/test/apps/testing/ALOY-488/assets/blackberry/splash-720x720.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/assets/mobileweb/appicon.png b/test/apps/testing/ALOY-488/assets/mobileweb/appicon.png
deleted file mode 100644
index 34dd10580..000000000
Binary files a/test/apps/testing/ALOY-488/assets/mobileweb/appicon.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default-Landscape.jpg b/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default-Landscape.jpg
deleted file mode 100644
index c7227cae1..000000000
Binary files a/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default-Landscape.jpg and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default-Landscape.png b/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default-Landscape.png
deleted file mode 100644
index 73895ce16..000000000
Binary files a/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default-Landscape.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default-Portrait.jpg b/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default-Portrait.jpg
deleted file mode 100644
index 1f7d7ab36..000000000
Binary files a/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default-Portrait.jpg and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default-Portrait.png b/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default-Portrait.png
deleted file mode 100644
index 0e1069324..000000000
Binary files a/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default-Portrait.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default.jpg b/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default.jpg
deleted file mode 100644
index 1b5600f89..000000000
Binary files a/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default.jpg and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default.png b/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default.png
deleted file mode 100644
index 110cafac7..000000000
Binary files a/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/Default.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/README b/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/README
deleted file mode 100644
index 71e8c2af9..000000000
--- a/test/apps/testing/ALOY-488/assets/mobileweb/apple_startup_images/README
+++ /dev/null
@@ -1,12 +0,0 @@
-These startup images are used by iPhone and iPad apps that are installed to the
-home screen. These images are displayed before the splash screen is displayed.
-
-If you want to create a new splash screen, it is recommended that you start by
-modifying the files in the adjacent "splash" folder, then take screenshots of
-device, crop, and save into this directory. This is the best way to avoid visual
-artifacts when the app transitions from the Apple startup images to the splash
-screen assets.
-
-IMPORTANT! Only one file format of each unique filename will be copied. PNG is
-preferred over JPG. In other words, if "Default.png" exists, it will be copied
-instead of "Default.jpg".
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/assets/mobileweb/splash/README b/test/apps/testing/ALOY-488/assets/mobileweb/splash/README
deleted file mode 100644
index 461faf47d..000000000
--- a/test/apps/testing/ALOY-488/assets/mobileweb/splash/README
+++ /dev/null
@@ -1,49 +0,0 @@
-This folder contains assets to make the startup splash screen assets. Splash
-screens are made up of HTML and CSS. This allows you the flexibility to
-customize your splash screen to fit a variety of screen sizes and orientations.
-
-
-splash.html
------------
-Contains an HTML fragment that is inserted into a div tag with an id="splash".
-You can choose to leave this file empty. You can put <script> tags in this file,
-though it is not recommended.
-
-Currently, the HTML code is NOT minified before being inserted into the page.
-
-
-splash.css
-----------
-Contains the styles used to control the display of the HTML. In addition to
-styling the default splash div, you can style other HTML elements.
-
-One advantage of using CSS background images in your splash screen is the images
-will be inlined in the CSS using data: URIs. It's best to keep the size of your
-images as small as possible. You can use PNG, JPG, or GIF images. You should use
-an image optimization tool to remove unnecessary meta data from the images such
-as smushit.com or crushpng.
-
-It is recommended that you develop your splash screen on an iPhone-sized screen
-so that you make your splash screen look good on small screens.
-
-Additionally, it is recommended that you use CSS media queries to tweak the
-layout for various screen sizes.
-
-The CSS code is minified when your mobile web application is packaged.
-
-
-Apple Startup Images
---------------------
-After crafting your startup screen, it is recommended that you:
-
-1) Create a sample application with an empty app.js
-2) Run your sample app in both the iphone and ipad simulator
-3) Take screenshots of your splash screen in both portrait and landscape
-4) Crop the screenshots to remove the status bar from the top
-5) Save the images in the Resources/mobileweb/apple_startup_images directory
-
-These steps are the best way to avoid visual artifacts when the app transitions
-from the Apple startup images to the splash screen assets.
-
-It is recommended you save these images in the JPG format so that these images
-download faster.
diff --git a/test/apps/testing/ALOY-488/assets/mobileweb/splash/appc.png b/test/apps/testing/ALOY-488/assets/mobileweb/splash/appc.png
deleted file mode 100644
index 31c307095..000000000
Binary files a/test/apps/testing/ALOY-488/assets/mobileweb/splash/appc.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/assets/mobileweb/splash/splash.css b/test/apps/testing/ALOY-488/assets/mobileweb/splash/splash.css
deleted file mode 100644
index 22674de8a..000000000
--- a/test/apps/testing/ALOY-488/assets/mobileweb/splash/splash.css
+++ /dev/null
@@ -1,60 +0,0 @@
-#splash {
-	background: #6d6d71;
-	background: -moz-linear-gradient(top,#6d6d71 0%,#736c6f 100%);
-	background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#6d6d71),color-stop(100%,#736c6f));
-	background: -webkit-linear-gradient(top,#6d6d71 0%,#736c6f 100%);
-	background: -o-linear-gradient(top,#6d6d71 0%,#736c6f 100%);
-	background: -ms-linear-gradient(top,#6d6d71 0%,#736c6f 100%);
-	background: linear-gradient(top,#6d6d71 0%,#736c6f 100%);
-	-webkit-box-shadow: inset 0px 0px 15px 6px rgba(0,0,0,0.5);
-	-moz-box-shadow: inset 0px 0px 15px 6px rgba(0,0,0,0.5);
-	box-shadow: inset 0px 0px 15px 6px rgba(0,0,0,0.5);
-	bottom: 0;
-	min-height: 300px;
-	left: 0;
-	position: fixed;
-	right: 0;
-	top: 0;
-}
-
-#splash:before {
-	background: url(appc.png) no-repeat 0 0;
-	content: "";
-	height: 150px;
-	left: 50%;
-	margin-left: -85px;
-	position: absolute;
-	top: 22%;
-	width: 170px;
-}
-
-#splash:after {
-	background: url(titanium.png) no-repeat 0 0;
-	content: "";
-	height: 48px;
-	left: 50%;
-	margin-left: -105px;
-	position: absolute;
-	bottom: 15%;
-	width: 200px;
-}
-
-@media all and (max-height: 320px) {
-	#splash:before {
-		top: 15%;
-	}
-
-	#splash:after {
-		bottom: 12%;
-	}
-}
-
-@media all and (min-height: 699px) {
-	#splash:before {
-		top: 25%;
-	}
-
-	#splash:after {
-		bottom: 25%;
-	}
-}
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/assets/mobileweb/splash/splash.html b/test/apps/testing/ALOY-488/assets/mobileweb/splash/splash.html
deleted file mode 100644
index e69de29bb..000000000
diff --git a/test/apps/testing/ALOY-488/assets/mobileweb/splash/titanium.png b/test/apps/testing/ALOY-488/assets/mobileweb/splash/titanium.png
deleted file mode 100644
index ae669ae5d..000000000
Binary files a/test/apps/testing/ALOY-488/assets/mobileweb/splash/titanium.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-488/widgets/foo/widget.json b/test/apps/testing/ALOY-488/widgets/foo/widget.json
index c5b0716c3..bef57c8f5 100644
--- a/test/apps/testing/ALOY-488/widgets/foo/widget.json
+++ b/test/apps/testing/ALOY-488/widgets/foo/widget.json
@@ -9,5 +9,5 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"2.1",
 	"tags":"",
-	"platforms":"android,blackberry,ios,mobileweb"
+	"platforms":"android,ios"
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-488/widgets/starrating/widget.json b/test/apps/testing/ALOY-488/widgets/starrating/widget.json
index 2da1e2583..4a8fd06ee 100644
--- a/test/apps/testing/ALOY-488/widgets/starrating/widget.json
+++ b/test/apps/testing/ALOY-488/widgets/starrating/widget.json
@@ -9,5 +9,5 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"3.0",
 	"tags":"",
-	"platforms":"android,ios,mobileweb"
+	"platforms":"android,ios"
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-502/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-502/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 490f2d53c..000000000
--- a/test/apps/testing/ALOY-502/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,76 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createTabGroup({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.__alloyId2 = Alloy.createWidget("alloy.window", "widget", {
-        id: "__alloyId2"
-    });
-    $.__views.__alloyId1 = Ti.UI.createTab({
-        window: $.__views.__alloyId2.getViewEx({
-            recurse: true
-        }),
-        title: "tab 1",
-        id: "__alloyId1"
-    });
-    $.__views.index.addTab($.__views.__alloyId1);
-    $.__views.__alloyId5 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        modal: false,
-        title: "window 2",
-        id: "__alloyId5"
-    });
-    $.__views.__alloyId6 = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: "center",
-        font: {
-            fontSize: "48dp",
-            fontWeight: "bold"
-        },
-        text: "label 2",
-        id: "__alloyId6"
-    });
-    $.__views.__alloyId5.add($.__views.__alloyId6);
-    $.__views.__alloyId4 = Ti.UI.createTab({
-        window: $.__views.__alloyId5,
-        title: "tab 2",
-        id: "__alloyId4"
-    });
-    $.__views.index.addTab($.__views.__alloyId4);
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-502/_generated/blackberry/alloy/widgets/alloy.window/controllers/widget.js b/test/apps/testing/ALOY-502/_generated/blackberry/alloy/widgets/alloy.window/controllers/widget.js
deleted file mode 100644
index 5c27dfbd6..000000000
--- a/test/apps/testing/ALOY-502/_generated/blackberry/alloy/widgets/alloy.window/controllers/widget.js
+++ /dev/null
@@ -1,45 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "alloy.window/" + s : s.substring(0, index) + "/alloy.window/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("alloy.window");
-    this.__widgetId = "alloy.window";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createWindow({
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    $.__views.__alloyId0 = Ti.UI.createButton({
-        title: "click me",
-        id: "__alloyId0"
-    });
-    $.__views.widget.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-502/_generated/blackberry/alloy/widgets/alloy.window/styles/widget.js b/test/apps/testing/ALOY-502/_generated/blackberry/alloy/widgets/alloy.window/styles/widget.js
deleted file mode 100644
index 5b8788d4a..000000000
--- a/test/apps/testing/ALOY-502/_generated/blackberry/alloy/widgets/alloy.window/styles/widget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "alloy.window/" + s : s.substring(0, index) + "/alloy.window/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-502/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-502/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 92cce12bb..000000000
--- a/test/apps/testing/ALOY-502/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,72 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __alloyId1 = [];
-    $.__views.__alloyId3 = Alloy.createWidget("alloy.window", "widget", {
-        id: "__alloyId3"
-    });
-    $.__views.__alloyId2 = Ti.UI.createTab({
-        window: $.__views.__alloyId3.getViewEx({
-            recurse: true
-        }),
-        title: "tab 1",
-        id: "__alloyId2"
-    });
-    __alloyId1.push($.__views.__alloyId2);
-    $.__views.__alloyId6 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        modal: false,
-        title: "window 2",
-        id: "__alloyId6"
-    });
-    $.__views.__alloyId7 = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: "center",
-        font: {
-            fontSize: "48dp",
-            fontWeight: "bold"
-        },
-        text: "label 2",
-        id: "__alloyId7"
-    });
-    $.__views.__alloyId6.add($.__views.__alloyId7);
-    $.__views.__alloyId5 = Ti.UI.createTab({
-        window: $.__views.__alloyId6,
-        title: "tab 2",
-        id: "__alloyId5"
-    });
-    __alloyId1.push($.__views.__alloyId5);
-    $.__views.index = Ti.UI.createTabGroup({
-        backgroundColor: "#fff",
-        tabs: __alloyId1,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-502/_generated/mobileweb/alloy/widgets/alloy.window/controllers/widget.js b/test/apps/testing/ALOY-502/_generated/mobileweb/alloy/widgets/alloy.window/controllers/widget.js
deleted file mode 100644
index 8f6efa980..000000000
--- a/test/apps/testing/ALOY-502/_generated/mobileweb/alloy/widgets/alloy.window/controllers/widget.js
+++ /dev/null
@@ -1,45 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "alloy.window/" + s : s.substring(0, index) + "/alloy.window/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("alloy.window");
-    this.__widgetId = "alloy.window";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createWindow({
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    $.__views.__alloyId0 = Ti.UI.createButton({
-        title: "click me",
-        id: "__alloyId0"
-    });
-    $.__views.widget.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-502/_generated/mobileweb/alloy/widgets/alloy.window/styles/widget.js b/test/apps/testing/ALOY-502/_generated/mobileweb/alloy/widgets/alloy.window/styles/widget.js
deleted file mode 100644
index 5b8788d4a..000000000
--- a/test/apps/testing/ALOY-502/_generated/mobileweb/alloy/widgets/alloy.window/styles/widget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "alloy.window/" + s : s.substring(0, index) + "/alloy.window/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-503/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-503/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index f593a91d5..000000000
--- a/test/apps/testing/ALOY-503/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,101 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId6(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId6.opts || {};
-        var models = __alloyId5.models;
-        var len = models.length;
-        for (var i = 0; len > i; i++) {
-            var __alloyId4 = models[i];
-            __alloyId2.push(require("ti.map").createAnnotation(__alloyId4.toJSON()));
-        }
-        $.__views.map.annotations = __alloyId2;
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    Alloy.Collections.instance("pins");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId2 = [];
-    $.__views.__alloyId3 = Ti.Map.createAnnotation({
-        latitude: 37.39,
-        longitude: -122.051,
-        title: "XML Annotation",
-        id: "__alloyId3"
-    });
-    __alloyId2.push($.__views.__alloyId3);
-    $.__views.map = (require("ti.map").createView || Ti.UI.createView)({
-        userLocation: false,
-        animate: true,
-        region: {
-            latitude: 37.3892876,
-            latitudeDelta: .015,
-            longitude: -122.0502364,
-            longitudeDelta: .015
-        },
-        annotations: __alloyId2,
-        id: "map"
-    });
-    $.__views.index.add($.__views.map);
-    var __alloyId5 = Alloy.Collections["pins"] || pins;
-    __alloyId5.on("fetch destroy change add remove reset", __alloyId6);
-    exports.destroy = function() {
-        __alloyId5.off("fetch destroy change add remove reset", __alloyId6);
-    };
-    _.extend($, $.__views);
-    if (!Ti.App.Properties.hasProperty("seeded")) {
-        var pins = [ {
-            title: "Appcelerator",
-            latitude: 37.3892876,
-            longitude: -122.0502364
-        }, {
-            title: "SETI Institute",
-            latitude: 37.386697,
-            longitude: -122.052028
-        }, {
-            title: "Someplace nearby",
-            latitude: 37.3880608,
-            longitude: -122.0559039
-        } ];
-        for (var i = 0, j = pins.length; j > i; i++) Alloy.createModel("pins", {
-            title: pins[i].title,
-            latitude: pins[i].latitude,
-            longitude: pins[i].longitude
-        }).save();
-        Ti.App.Properties.setString("seeded", "yuppers");
-    }
-    Alloy.Collections.pins.fetch();
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-503/_generated/blackberry/alloy/models/Pins.js b/test/apps/testing/ALOY-503/_generated/blackberry/alloy/models/Pins.js
deleted file mode 100644
index 87c6190c7..000000000
--- a/test/apps/testing/ALOY-503/_generated/blackberry/alloy/models/Pins.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            title: "text",
-            latitude: "real",
-            longitude: "real"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "pins"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("pins", exports.definition, []);
-
-collection = Alloy.C("pins", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-503/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-503/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 449171e57..000000000
--- a/test/apps/testing/ALOY-503/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,95 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId6(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId6.opts || {};
-        var models = __alloyId5.models;
-        var len = models.length;
-        for (var i = 0; len > i; i++) {
-            var __alloyId4 = models[i];
-            __alloyId2.push(require("ti.map").createAnnotation(_.isFunction(__alloyId4.transform) ? __alloyId4.transform() : __alloyId4.toJSON()));
-        }
-        $.__views.map.annotations = __alloyId2;
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    Alloy.Collections.instance("pins");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId2 = [];
-    $.__views.__alloyId3 = Ti.Map.createAnnotation({
-        latitude: 37.39,
-        longitude: -122.051,
-        title: "XML Annotation",
-        id: "__alloyId3"
-    });
-    __alloyId2.push($.__views.__alloyId3);
-    $.__views.map = (require("ti.map").createView || Ti.UI.createView)({
-        userLocation: false,
-        animate: true,
-        region: {
-            latitude: 37.3892876,
-            latitudeDelta: .015,
-            longitude: -122.0502364,
-            longitudeDelta: .015
-        },
-        annotations: __alloyId2,
-        id: "map"
-    });
-    $.__views.index.add($.__views.map);
-    var __alloyId5 = Alloy.Collections["pins"] || pins;
-    __alloyId5.on("fetch destroy change add remove reset", __alloyId6);
-    exports.destroy = function() {
-        __alloyId5 && __alloyId5.off("fetch destroy change add remove reset", __alloyId6);
-    };
-    _.extend($, $.__views);
-    if (!Ti.App.Properties.hasProperty("seeded")) {
-        var pins = [ {
-            title: "Appcelerator",
-            latitude: 37.3892876,
-            longitude: -122.0502364
-        }, {
-            title: "SETI Institute",
-            latitude: 37.386697,
-            longitude: -122.052028
-        }, {
-            title: "Someplace nearby",
-            latitude: 37.3880608,
-            longitude: -122.0559039
-        } ];
-        for (var i = 0, j = pins.length; j > i; i++) Alloy.createModel("pins", {
-            title: pins[i].title,
-            latitude: pins[i].latitude,
-            longitude: pins[i].longitude
-        }).save();
-        Ti.App.Properties.setString("seeded", "yuppers");
-    }
-    Alloy.Collections.pins.fetch();
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-503/_generated/mobileweb/alloy/models/Pins.js b/test/apps/testing/ALOY-503/_generated/mobileweb/alloy/models/Pins.js
deleted file mode 100644
index 34de6eeb7..000000000
--- a/test/apps/testing/ALOY-503/_generated/mobileweb/alloy/models/Pins.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            title: "text",
-            latitude: "real",
-            longitude: "real"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "pins"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("pins", exports.definition, []);
-
-collection = Alloy.C("pins", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-575/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-575/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index d00aadd26..000000000
--- a/test/apps/testing/ALOY-575/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "Testing a widget...",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    Alloy.createWidget("test.widget").sayHello();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-575/_generated/blackberry/alloy/widgets/test.widget/controllers/widget.js b/test/apps/testing/ALOY-575/_generated/blackberry/alloy/widgets/test.widget/controllers/widget.js
deleted file mode 100644
index 687b7181a..000000000
--- a/test/apps/testing/ALOY-575/_generated/blackberry/alloy/widgets/test.widget/controllers/widget.js
+++ /dev/null
@@ -1,39 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "test.widget/" + s : s.substring(0, index) + "/test.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("test.widget");
-    this.__widgetId = "test.widget";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    exports.sayHello = function() {
-        alert("hello!");
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-575/_generated/blackberry/alloy/widgets/test.widget/styles/widget.js b/test/apps/testing/ALOY-575/_generated/blackberry/alloy/widgets/test.widget/styles/widget.js
deleted file mode 100644
index 857007204..000000000
--- a/test/apps/testing/ALOY-575/_generated/blackberry/alloy/widgets/test.widget/styles/widget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "test.widget/" + s : s.substring(0, index) + "/test.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-575/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-575/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index a0a817173..000000000
--- a/test/apps/testing/ALOY-575/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "Testing a widget...",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    Alloy.createWidget("test.widget").sayHello();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-575/_generated/mobileweb/alloy/widgets/test.widget/controllers/widget.js b/test/apps/testing/ALOY-575/_generated/mobileweb/alloy/widgets/test.widget/controllers/widget.js
deleted file mode 100644
index d9a945a95..000000000
--- a/test/apps/testing/ALOY-575/_generated/mobileweb/alloy/widgets/test.widget/controllers/widget.js
+++ /dev/null
@@ -1,39 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "test.widget/" + s : s.substring(0, index) + "/test.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("test.widget");
-    this.__widgetId = "test.widget";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    exports.sayHello = function() {
-        alert("hello!");
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-575/_generated/mobileweb/alloy/widgets/test.widget/styles/widget.js b/test/apps/testing/ALOY-575/_generated/mobileweb/alloy/widgets/test.widget/styles/widget.js
deleted file mode 100644
index 857007204..000000000
--- a/test/apps/testing/ALOY-575/_generated/mobileweb/alloy/widgets/test.widget/styles/widget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "test.widget/" + s : s.substring(0, index) + "/test.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-575/widgets/test.widget/widget.json b/test/apps/testing/ALOY-575/widgets/test.widget/widget.json
index 824a775c7..cc2d5d64c 100755
--- a/test/apps/testing/ALOY-575/widgets/test.widget/widget.json
+++ b/test/apps/testing/ALOY-575/widgets/test.widget/widget.json
@@ -9,6 +9,6 @@
 	"min-alloy-version": "1.2",
 	"min-titanium-version":"3.1",
 	"tags":"",
-	"platforms":"android,ios,mobileweb,blackberry",
+	"platforms":"android,ios",
 	"dependencies": {}
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-577/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-577/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 09e1aa769..000000000
--- a/test/apps/testing/ALOY-577/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,59 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#f00",
-        modal: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createImageView({
-        top: "10dp",
-        height: "150dp",
-        width: "150dp",
-        image: "/red.png",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createImageView({
-        top: "10dp",
-        height: "150dp",
-        width: "150dp",
-        image: "/blue.png",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-577/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-577/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 69760259a..000000000
--- a/test/apps/testing/ALOY-577/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,53 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#f00",
-        modal: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createImageView({
-        top: "10dp",
-        height: "150dp",
-        width: "150dp",
-        image: "/red.png",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createImageView({
-        top: "10dp",
-        height: "150dp",
-        width: "150dp",
-        image: "/blue.png",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-594/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-594/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 14f904779..000000000
--- a/test/apps/testing/ALOY-594/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,89 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId7(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId7.opts || {};
-        var models = filterCollection(__alloyId6);
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId1 = models[i];
-            __alloyId1.__transform = transformCollection(__alloyId1);
-            var __alloyId3 = Ti.UI.createTableViewRow({
-                backgroundColor: "#efefef",
-                height: "60dp"
-            });
-            rows.push(__alloyId3);
-            var __alloyId5 = Ti.UI.createLabel({
-                textAlign: "left",
-                color: "#181818",
-                font: {
-                    fontSize: "32dp",
-                    fontWeight: "bold"
-                },
-                touchEnabled: false,
-                text: "undefined" != typeof __alloyId1.__transform["text"] ? __alloyId1.__transform["text"] : __alloyId1.get("text")
-            });
-            __alloyId3.add(__alloyId5);
-        }
-        $.__views.__alloyId0.setData(rows);
-    }
-    function filterCollection(collection) {
-        return collection.filter(function(model) {
-            return model.get("text").split(/\s+/)[1] % 2;
-        });
-    }
-    function transformCollection(model) {
-        var o = model.toJSON();
-        o.text = "### " + o.text + " ###";
-        return o;
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#efefef",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createTableView({
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    var __alloyId6 = Alloy.Collections["collection"] || collection;
-    __alloyId6.on("fetch destroy change add remove reset", __alloyId7);
-    exports.destroy = function() {
-        __alloyId6.off("fetch destroy change add remove reset", __alloyId7);
-    };
-    _.extend($, $.__views);
-    Alloy.Collections.collection.trigger("change");
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-594/_generated/blackberry/alloy/models/Collection.js b/test/apps/testing/ALOY-594/_generated/blackberry/alloy/models/Collection.js
deleted file mode 100644
index 921921e46..000000000
--- a/test/apps/testing/ALOY-594/_generated/blackberry/alloy/models/Collection.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            text: "TEXT"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "collection"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("collection", exports.definition, [ function(migration) {
-    migration.name = "collection";
-    migration.id = "201306200000000";
-    migration.up = function(migrator) {
-        migrator.createTable({
-            columns: {
-                text: "TEXT"
-            }
-        });
-        for (var i = 0; 20 > i; i++) migrator.insertRow({
-            text: "label " + (i + 1)
-        });
-    };
-    migration.down = function(migrator) {
-        migrator.dropTable("collection");
-    };
-} ]);
-
-collection = Alloy.C("collection", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-594/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-594/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index ed8cb8997..000000000
--- a/test/apps/testing/ALOY-594/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,83 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId7(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId7.opts || {};
-        var models = filterCollection(__alloyId6);
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId1 = models[i];
-            __alloyId1.__transform = transformCollection(__alloyId1);
-            var __alloyId3 = Ti.UI.createTableViewRow({
-                backgroundColor: "#efefef",
-                height: "60dp"
-            });
-            rows.push(__alloyId3);
-            var __alloyId5 = Ti.UI.createLabel({
-                textAlign: "left",
-                color: "#181818",
-                font: {
-                    fontSize: "32dp",
-                    fontWeight: "bold"
-                },
-                touchEnabled: false,
-                text: __alloyId1.__transform.text
-            });
-            __alloyId3.add(__alloyId5);
-        }
-        $.__views.__alloyId0.setData(rows);
-    }
-    function filterCollection(collection) {
-        return collection.filter(function(model) {
-            return model.get("text").split(/\s+/)[1] % 2;
-        });
-    }
-    function transformCollection(model) {
-        var o = model.toJSON();
-        o.text = "### " + o.text + " ###";
-        return o;
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#efefef",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createTableView({
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    var __alloyId6 = Alloy.Collections["collection"] || collection;
-    __alloyId6.on("fetch destroy change add remove reset", __alloyId7);
-    exports.destroy = function() {
-        __alloyId6 && __alloyId6.off("fetch destroy change add remove reset", __alloyId7);
-    };
-    _.extend($, $.__views);
-    Alloy.Collections.collection.trigger("change");
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-594/_generated/mobileweb/alloy/models/Collection.js b/test/apps/testing/ALOY-594/_generated/mobileweb/alloy/models/Collection.js
deleted file mode 100644
index 28f440bb8..000000000
--- a/test/apps/testing/ALOY-594/_generated/mobileweb/alloy/models/Collection.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            text: "TEXT"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "collection"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("collection", exports.definition, [ function(migration) {
-    migration.name = "collection";
-    migration.id = "201306200000000";
-    migration.up = function(migrator) {
-        migrator.createTable({
-            columns: {
-                text: "TEXT"
-            }
-        });
-        for (var i = 0; 20 > i; i++) migrator.insertRow({
-            text: "label " + (i + 1)
-        });
-    };
-    migration.down = function(migrator) {
-        migrator.dropTable("collection");
-    };
-} ]);
-
-collection = Alloy.C("collection", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-604/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-604/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index c8d4e9d45..000000000
--- a/test/apps/testing/ALOY-604/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,90 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId9(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId9.opts || {};
-        var models = __alloyId8.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId1 = models[i];
-            __alloyId1.__transform = {};
-            var __alloyId3 = Ti.UI.createTableViewRow({});
-            rows.push(__alloyId3);
-            var __alloyId5 = Ti.UI.createView({
-                backgroundColor: "#efefef",
-                height: "60dp"
-            });
-            __alloyId3.add(__alloyId5);
-            test ? __alloyId5.addEventListener("click", test) : __defers["__alloyId5!click!test"] = true;
-            var __alloyId7 = Ti.UI.createLabel({
-                left: "100dp",
-                right: "10dp",
-                height: Ti.UI.SIZE,
-                textAlign: "left",
-                color: "#181818",
-                font: {
-                    fontSize: "32dp",
-                    fontWeight: "bold"
-                },
-                touchEnabled: false,
-                text: "Location"
-            });
-            __alloyId5.add(__alloyId7);
-        }
-        $.__views.__alloyId0.setData(rows);
-    }
-    function test() {
-        Ti.API.info("test");
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#efefef",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createTableView({
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    var __alloyId8 = Alloy.Collections["data"] || data;
-    __alloyId8.on("fetch destroy change add remove reset", __alloyId9);
-    exports.destroy = function() {
-        __alloyId8.off("fetch destroy change add remove reset", __alloyId9);
-    };
-    _.extend($, $.__views);
-    Alloy.Collections.data.trigger("change");
-    $.index.open();
-    __defers["__alloyId5!click!test"] && __alloyId5.addEventListener("click", test);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-604/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-604/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index bde87e44b..000000000
--- a/test/apps/testing/ALOY-604/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,84 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId9(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId9.opts || {};
-        var models = __alloyId8.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId1 = models[i];
-            __alloyId1.__transform = _.isFunction(__alloyId1.transform) ? __alloyId1.transform() : __alloyId1.toJSON();
-            var __alloyId3 = Ti.UI.createTableViewRow({});
-            rows.push(__alloyId3);
-            var __alloyId5 = Ti.UI.createView({
-                backgroundColor: "#efefef",
-                height: "60dp"
-            });
-            __alloyId3.add(__alloyId5);
-            test ? $.addListener(__alloyId5, "click", test) : __defers["__alloyId5!click!test"] = true;
-            var __alloyId7 = Ti.UI.createLabel({
-                left: "100dp",
-                right: "10dp",
-                height: Ti.UI.SIZE,
-                textAlign: "left",
-                color: "#181818",
-                font: {
-                    fontSize: "32dp",
-                    fontWeight: "bold"
-                },
-                touchEnabled: false,
-                text: "Location"
-            });
-            __alloyId5.add(__alloyId7);
-        }
-        $.__views.__alloyId0.setData(rows);
-    }
-    function test(e) {
-        Ti.API.info("test");
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#efefef",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createTableView({
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    var __alloyId8 = Alloy.Collections["data"] || data;
-    __alloyId8.on("fetch destroy change add remove reset", __alloyId9);
-    exports.destroy = function() {
-        __alloyId8 && __alloyId8.off("fetch destroy change add remove reset", __alloyId9);
-    };
-    _.extend($, $.__views);
-    Alloy.Collections.data.trigger("change");
-    $.index.open();
-    __defers["__alloyId5!click!test"] && $.addListener(__alloyId5, "click", test);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-609/_generated/blackberry/alloy/controllers/button.js b/test/apps/testing/ALOY-609/_generated/blackberry/alloy/controllers/button.js
deleted file mode 100644
index 136710c08..000000000
--- a/test/apps/testing/ALOY-609/_generated/blackberry/alloy/controllers/button.js
+++ /dev/null
@@ -1,90 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doTouchstart(e) {
-        e.source.backgroundColor = "#333";
-        var obj = {};
-        switch (label) {
-          case "reset":
-            break;
-
-          case "template3":
-            obj.image = "/alloy.png";
-
-          case "template2":
-            obj.subtitle = "this is the subtitle for the item";
-
-          case "template1":
-            obj.title = "some title";
-            break;
-
-          default:
-            Ti.API.warn('invalid template type "' + label + '"');
-        }
-        $.trigger("buttonClick", _.extend(e, {
-            modelObj: obj
-        }));
-    }
-    function doTouchend(e) {
-        e.source.backgroundColor = "#a00";
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "button";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.button = Ti.UI.createView({
-        height: "50dp",
-        width: "25%",
-        borderWidth: 1,
-        borderColor: "#000",
-        backgroundColor: "#a00",
-        id: "button"
-    });
-    $.__views.button && $.addTopLevelView($.__views.button);
-    doTouchstart ? $.__views.button.addEventListener("touchstart", doTouchstart) : __defers["$.__views.button!touchstart!doTouchstart"] = true;
-    doTouchend ? $.__views.button.addEventListener("touchend", doTouchend) : __defers["$.__views.button!touchend!doTouchend"] = true;
-    $.__views.label = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        color: "#fff",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        touchEnabled: false,
-        id: "label"
-    });
-    $.__views.button.add($.__views.label);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    var label = args.label || "";
-    args.label && ($.label.text = args.label);
-    __defers["$.__views.button!touchstart!doTouchstart"] && $.__views.button.addEventListener("touchstart", doTouchstart);
-    __defers["$.__views.button!touchend!doTouchend"] && $.__views.button.addEventListener("touchend", doTouchend);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-609/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-609/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 870197ec4..000000000
--- a/test/apps/testing/ALOY-609/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,273 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId27(e) {
-        if (e && e.fromAdapter) return;
-        var opts = __alloyId27.opts || {};
-        var models = __alloyId26.models;
-        var len = models.length;
-        var __alloyId22 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId23 = models[i];
-            __alloyId23.__transform = doTransform(__alloyId23);
-            var __alloyId25 = {
-                template: "undefined" != typeof __alloyId23.__transform["template"] ? __alloyId23.__transform["template"] : __alloyId23.get("template"),
-                title: {
-                    text: "undefined" != typeof __alloyId23.__transform["title"] ? __alloyId23.__transform["title"] : __alloyId23.get("title")
-                },
-                subtitle: {
-                    text: "undefined" != typeof __alloyId23.__transform["subtitle"] ? __alloyId23.__transform["subtitle"] : __alloyId23.get("subtitle")
-                },
-                image: {
-                    image: "undefined" != typeof __alloyId23.__transform["image"] ? __alloyId23.__transform["image"] : __alloyId23.get("image")
-                }
-            };
-            __alloyId22.push(__alloyId25);
-        }
-        opts.animation ? $.__views.section.setItems(__alloyId22, opts.animation) : $.__views.section.setItems(__alloyId22);
-    }
-    function doTransform(model) {
-        var o = model.toJSON();
-        o.template = o.subtitle ? o.image ? "fullItem" : "titleAndSub" : "title";
-        return o;
-    }
-    function doButtonClick(e) {
-        if (_.isEmpty(e.modelObj)) {
-            var db = Ti.Database.open("_alloy_");
-            db.execute("DELETE FROM info;");
-            db.close();
-            info.fetch();
-        } else {
-            var model = Alloy.createModel("info", e.modelObj);
-            info.add(model);
-            model.save();
-        }
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId0 = {};
-    var __alloyId3 = [];
-    var __alloyId5 = {
-        type: "Ti.UI.ImageView",
-        bindId: "image",
-        properties: {
-            left: "10dp",
-            top: "10dp",
-            height: "50dp",
-            width: "50dp",
-            bindId: "image"
-        }
-    };
-    __alloyId3.push(__alloyId5);
-    var __alloyId7 = {
-        type: "Ti.UI.Label",
-        bindId: "title",
-        properties: {
-            left: "70dp",
-            right: "10dp",
-            top: "10dp",
-            font: {
-                fontSize: "18dp",
-                fontWeight: "bold"
-            },
-            height: "30dp",
-            color: "#222",
-            textAlign: "left",
-            bindId: "title"
-        }
-    };
-    __alloyId3.push(__alloyId7);
-    var __alloyId9 = {
-        type: "Ti.UI.Label",
-        bindId: "subtitle",
-        properties: {
-            left: "70dp",
-            right: "10dp",
-            bottom: "10dp",
-            font: {
-                fontSize: "12dp",
-                fontWeight: "normal"
-            },
-            height: "20dp",
-            color: "#444",
-            textAlign: "left",
-            bindId: "subtitle"
-        }
-    };
-    __alloyId3.push(__alloyId9);
-    var __alloyId2 = {
-        properties: {
-            name: "fullItem",
-            height: "70"
-        },
-        childTemplates: __alloyId3
-    };
-    __alloyId0["fullItem"] = __alloyId2;
-    var __alloyId12 = [];
-    var __alloyId14 = {
-        type: "Ti.UI.Label",
-        bindId: "title",
-        properties: {
-            left: "10dp",
-            right: "10dp",
-            top: "10dp",
-            font: {
-                fontSize: "18dp",
-                fontWeight: "bold"
-            },
-            height: "30dp",
-            color: "#222",
-            textAlign: "left",
-            bindId: "title"
-        }
-    };
-    __alloyId12.push(__alloyId14);
-    var __alloyId16 = {
-        type: "Ti.UI.Label",
-        bindId: "subtitle",
-        properties: {
-            left: "10dp",
-            right: "10dp",
-            bottom: "10dp",
-            font: {
-                fontSize: "12dp",
-                fontWeight: "normal"
-            },
-            height: "20dp",
-            color: "#444",
-            textAlign: "left",
-            bindId: "subtitle"
-        }
-    };
-    __alloyId12.push(__alloyId16);
-    var __alloyId11 = {
-        properties: {
-            name: "titleAndSub",
-            height: "70"
-        },
-        childTemplates: __alloyId12
-    };
-    __alloyId0["titleAndSub"] = __alloyId11;
-    var __alloyId19 = [];
-    var __alloyId21 = {
-        type: "Ti.UI.Label",
-        bindId: "title",
-        properties: {
-            left: "10dp",
-            right: "10dp",
-            top: "10dp",
-            font: {
-                fontSize: "18dp",
-                fontWeight: "bold"
-            },
-            height: "30dp",
-            color: "#222",
-            textAlign: "left",
-            bindId: "title"
-        }
-    };
-    __alloyId19.push(__alloyId21);
-    var __alloyId18 = {
-        properties: {
-            name: "title",
-            height: "50"
-        },
-        childTemplates: __alloyId19
-    };
-    __alloyId0["title"] = __alloyId18;
-    $.__views.section = Ti.UI.createListSection({
-        id: "section"
-    });
-    var __alloyId26 = Alloy.Collections["info"] || info;
-    __alloyId26.on("fetch destroy change add remove reset", __alloyId27);
-    var __alloyId28 = [];
-    __alloyId28.push($.__views.section);
-    $.__views.list = Ti.UI.createListView({
-        top: 0,
-        bottom: "50dp",
-        sections: __alloyId28,
-        templates: __alloyId0,
-        id: "list",
-        defaultItemTemplate: "title"
-    });
-    $.__views.index.add($.__views.list);
-    $.__views.toolbar = Ti.UI.createView({
-        height: "50dp",
-        width: "100%",
-        bottom: 0,
-        layout: "horizontal",
-        id: "toolbar"
-    });
-    $.__views.index.add($.__views.toolbar);
-    $.__views.__alloyId29 = Alloy.createController("button", {
-        label: "reset",
-        id: "__alloyId29",
-        __parentSymbol: $.__views.toolbar
-    });
-    $.__views.__alloyId29.setParent($.__views.toolbar);
-    doButtonClick ? $.__views.__alloyId29.on("buttonClick", doButtonClick) : __defers["$.__views.__alloyId29!buttonClick!doButtonClick"] = true;
-    $.__views.__alloyId30 = Alloy.createController("button", {
-        label: "template1",
-        id: "__alloyId30",
-        __parentSymbol: $.__views.toolbar
-    });
-    $.__views.__alloyId30.setParent($.__views.toolbar);
-    doButtonClick ? $.__views.__alloyId30.on("buttonClick", doButtonClick) : __defers["$.__views.__alloyId30!buttonClick!doButtonClick"] = true;
-    $.__views.__alloyId31 = Alloy.createController("button", {
-        label: "template2",
-        id: "__alloyId31",
-        __parentSymbol: $.__views.toolbar
-    });
-    $.__views.__alloyId31.setParent($.__views.toolbar);
-    doButtonClick ? $.__views.__alloyId31.on("buttonClick", doButtonClick) : __defers["$.__views.__alloyId31!buttonClick!doButtonClick"] = true;
-    $.__views.__alloyId32 = Alloy.createController("button", {
-        label: "template3",
-        id: "__alloyId32",
-        __parentSymbol: $.__views.toolbar
-    });
-    $.__views.__alloyId32.setParent($.__views.toolbar);
-    doButtonClick ? $.__views.__alloyId32.on("buttonClick", doButtonClick) : __defers["$.__views.__alloyId32!buttonClick!doButtonClick"] = true;
-    exports.destroy = function() {
-        __alloyId26.off("fetch destroy change add remove reset", __alloyId27);
-    };
-    _.extend($, $.__views);
-    var info = Alloy.Collections.info;
-    $.index.open();
-    info.fetch();
-    __defers["$.__views.__alloyId29!buttonClick!doButtonClick"] && $.__views.__alloyId29.on("buttonClick", doButtonClick);
-    __defers["$.__views.__alloyId30!buttonClick!doButtonClick"] && $.__views.__alloyId30.on("buttonClick", doButtonClick);
-    __defers["$.__views.__alloyId31!buttonClick!doButtonClick"] && $.__views.__alloyId31.on("buttonClick", doButtonClick);
-    __defers["$.__views.__alloyId32!buttonClick!doButtonClick"] && $.__views.__alloyId32.on("buttonClick", doButtonClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-609/_generated/blackberry/alloy/models/Info.js b/test/apps/testing/ALOY-609/_generated/blackberry/alloy/models/Info.js
deleted file mode 100644
index bf6f51ed4..000000000
--- a/test/apps/testing/ALOY-609/_generated/blackberry/alloy/models/Info.js
+++ /dev/null
@@ -1,65 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            id: "INTEGER PRIMARY KEY AUTOINCREMENT",
-            title: "TEXT",
-            subtitle: "TEXT",
-            image: "TEXT"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "info",
-            idAttribute: "id"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("info", exports.definition, [ function(migration) {
-    migration.name = "info";
-    migration.id = "201209301904312";
-    migration.up = function(migrator) {
-        migrator.createTable({
-            columns: {
-                id: "INTEGER PRIMARY KEY AUTOINCREMENT",
-                title: "TEXT",
-                subtitle: "TEXT",
-                image: "TEXT"
-            }
-        });
-    };
-    migration.down = function(migrator) {
-        migrator.dropTable("info");
-    };
-}, function(migration) {
-    migration.name = "info";
-    migration.id = "201301161234567";
-    var info = [];
-    for (var i = 0; 500 > i; i++) info.push(i % 7 === 0 ? {
-        title: "This is the title",
-        subtitle: "This is the slightly more verbose subtitle",
-        image: i % 2 ? "/appc.png" : "/alloy.png"
-    } : i % 2 ? {
-        title: "This is the title with subtitle",
-        subtitle: "This is the slightly more verbose subtitle"
-    } : {
-        title: "This is the lonely title"
-    });
-    migration.up = function(migrator) {
-        for (var i = 0; i < info.length; i++) migrator.insertRow(info[i]);
-    };
-    migration.down = function(migrator) {
-        for (var i = 0; i < info.length; i++) migrator.deleteRow(info[i]);
-    };
-} ]);
-
-collection = Alloy.C("info", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-609/_generated/mobileweb/alloy/controllers/button.js b/test/apps/testing/ALOY-609/_generated/mobileweb/alloy/controllers/button.js
deleted file mode 100644
index 20f15443f..000000000
--- a/test/apps/testing/ALOY-609/_generated/mobileweb/alloy/controllers/button.js
+++ /dev/null
@@ -1,84 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doTouchstart(e) {
-        e.source.backgroundColor = "#333";
-        var obj = {};
-        switch (label) {
-          case "reset":
-            break;
-
-          case "template3":
-            obj.image = "/alloy.png";
-
-          case "template2":
-            obj.subtitle = "this is the subtitle for the item";
-
-          case "template1":
-            obj.title = "some title";
-            break;
-
-          default:
-            Ti.API.warn('invalid template type "' + label + '"');
-        }
-        $.trigger("buttonClick", _.extend(e, {
-            modelObj: obj
-        }));
-    }
-    function doTouchend(e) {
-        e.source.backgroundColor = "#a00";
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "button";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.button = Ti.UI.createView({
-        height: "50dp",
-        width: "25%",
-        borderWidth: 1,
-        borderColor: "#000",
-        backgroundColor: "#a00",
-        id: "button"
-    });
-    $.__views.button && $.addTopLevelView($.__views.button);
-    doTouchstart ? $.addListener($.__views.button, "touchstart", doTouchstart) : __defers["$.__views.button!touchstart!doTouchstart"] = true;
-    doTouchend ? $.addListener($.__views.button, "touchend", doTouchend) : __defers["$.__views.button!touchend!doTouchend"] = true;
-    $.__views.label = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        color: "#fff",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        touchEnabled: false,
-        id: "label"
-    });
-    $.__views.button.add($.__views.label);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    var label = args.label || "";
-    args.label && ($.label.text = args.label);
-    __defers["$.__views.button!touchstart!doTouchstart"] && $.addListener($.__views.button, "touchstart", doTouchstart);
-    __defers["$.__views.button!touchend!doTouchend"] && $.addListener($.__views.button, "touchend", doTouchend);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-609/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-609/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index eb04f6af0..000000000
--- a/test/apps/testing/ALOY-609/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,267 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId27(e) {
-        if (e && e.fromAdapter) return;
-        var opts = __alloyId27.opts || {};
-        var models = __alloyId26.models;
-        var len = models.length;
-        var __alloyId22 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId23 = models[i];
-            __alloyId23.__transform = doTransform(__alloyId23);
-            var __alloyId25 = {
-                template: __alloyId23.__transform.template,
-                title: {
-                    text: __alloyId23.__transform.title
-                },
-                subtitle: {
-                    text: __alloyId23.__transform.subtitle
-                },
-                image: {
-                    image: __alloyId23.__transform.image
-                }
-            };
-            __alloyId22.push(__alloyId25);
-        }
-        opts.animation ? $.__views.section.setItems(__alloyId22, opts.animation) : $.__views.section.setItems(__alloyId22);
-    }
-    function doTransform(model) {
-        var o = model.toJSON();
-        o.subtitle ? o.image ? o.template = "fullItem" : o.template = "titleAndSub" : o.template = "title";
-        return o;
-    }
-    function doButtonClick(e) {
-        if (_.isEmpty(e.modelObj)) {
-            var db = Ti.Database.open("_alloy_");
-            db.execute("DELETE FROM info;");
-            db.close();
-            info.fetch();
-        } else {
-            var model = Alloy.createModel("info", e.modelObj);
-            info.add(model);
-            model.save();
-        }
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId0 = {};
-    var __alloyId3 = [];
-    var __alloyId5 = {
-        type: "Ti.UI.ImageView",
-        bindId: "image",
-        properties: {
-            left: "10dp",
-            top: "10dp",
-            height: "50dp",
-            width: "50dp",
-            bindId: "image"
-        }
-    };
-    __alloyId3.push(__alloyId5);
-    var __alloyId7 = {
-        type: "Ti.UI.Label",
-        bindId: "title",
-        properties: {
-            left: "70dp",
-            right: "10dp",
-            top: "10dp",
-            font: {
-                fontSize: "18dp",
-                fontWeight: "bold"
-            },
-            height: "30dp",
-            color: "#222",
-            textAlign: "left",
-            bindId: "title"
-        }
-    };
-    __alloyId3.push(__alloyId7);
-    var __alloyId9 = {
-        type: "Ti.UI.Label",
-        bindId: "subtitle",
-        properties: {
-            left: "70dp",
-            right: "10dp",
-            bottom: "10dp",
-            font: {
-                fontSize: "12dp",
-                fontWeight: "normal"
-            },
-            height: "20dp",
-            color: "#444",
-            textAlign: "left",
-            bindId: "subtitle"
-        }
-    };
-    __alloyId3.push(__alloyId9);
-    var __alloyId2 = {
-        properties: {
-            name: "fullItem",
-            height: 70
-        },
-        childTemplates: __alloyId3
-    };
-    __alloyId0["fullItem"] = __alloyId2;
-    var __alloyId12 = [];
-    var __alloyId14 = {
-        type: "Ti.UI.Label",
-        bindId: "title",
-        properties: {
-            left: "10dp",
-            right: "10dp",
-            top: "10dp",
-            font: {
-                fontSize: "18dp",
-                fontWeight: "bold"
-            },
-            height: "30dp",
-            color: "#222",
-            textAlign: "left",
-            bindId: "title"
-        }
-    };
-    __alloyId12.push(__alloyId14);
-    var __alloyId16 = {
-        type: "Ti.UI.Label",
-        bindId: "subtitle",
-        properties: {
-            left: "10dp",
-            right: "10dp",
-            bottom: "10dp",
-            font: {
-                fontSize: "12dp",
-                fontWeight: "normal"
-            },
-            height: "20dp",
-            color: "#444",
-            textAlign: "left",
-            bindId: "subtitle"
-        }
-    };
-    __alloyId12.push(__alloyId16);
-    var __alloyId11 = {
-        properties: {
-            name: "titleAndSub",
-            height: 70
-        },
-        childTemplates: __alloyId12
-    };
-    __alloyId0["titleAndSub"] = __alloyId11;
-    var __alloyId19 = [];
-    var __alloyId21 = {
-        type: "Ti.UI.Label",
-        bindId: "title",
-        properties: {
-            left: "10dp",
-            right: "10dp",
-            top: "10dp",
-            font: {
-                fontSize: "18dp",
-                fontWeight: "bold"
-            },
-            height: "30dp",
-            color: "#222",
-            textAlign: "left",
-            bindId: "title"
-        }
-    };
-    __alloyId19.push(__alloyId21);
-    var __alloyId18 = {
-        properties: {
-            name: "title",
-            height: 50
-        },
-        childTemplates: __alloyId19
-    };
-    __alloyId0["title"] = __alloyId18;
-    $.__views.section = Ti.UI.createListSection({
-        id: "section"
-    });
-    var __alloyId26 = Alloy.Collections["info"] || info;
-    __alloyId26.on("fetch destroy change add remove reset", __alloyId27);
-    var __alloyId28 = [];
-    __alloyId28.push($.__views.section);
-    $.__views.list = Ti.UI.createListView({
-        top: 0,
-        bottom: "50dp",
-        sections: __alloyId28,
-        templates: __alloyId0,
-        id: "list",
-        defaultItemTemplate: "title"
-    });
-    $.__views.index.add($.__views.list);
-    $.__views.toolbar = Ti.UI.createView({
-        height: "50dp",
-        width: "100%",
-        bottom: 0,
-        layout: "horizontal",
-        id: "toolbar"
-    });
-    $.__views.index.add($.__views.toolbar);
-    $.__views.__alloyId29 = Alloy.createController("button", {
-        label: "reset",
-        id: "__alloyId29",
-        __parentSymbol: $.__views.toolbar
-    });
-    $.__views.__alloyId29.setParent($.__views.toolbar);
-    doButtonClick ? $.__views.__alloyId29.on("buttonClick", doButtonClick) : __defers["$.__views.__alloyId29!buttonClick!doButtonClick"] = true;
-    $.__views.__alloyId30 = Alloy.createController("button", {
-        label: "template1",
-        id: "__alloyId30",
-        __parentSymbol: $.__views.toolbar
-    });
-    $.__views.__alloyId30.setParent($.__views.toolbar);
-    doButtonClick ? $.__views.__alloyId30.on("buttonClick", doButtonClick) : __defers["$.__views.__alloyId30!buttonClick!doButtonClick"] = true;
-    $.__views.__alloyId31 = Alloy.createController("button", {
-        label: "template2",
-        id: "__alloyId31",
-        __parentSymbol: $.__views.toolbar
-    });
-    $.__views.__alloyId31.setParent($.__views.toolbar);
-    doButtonClick ? $.__views.__alloyId31.on("buttonClick", doButtonClick) : __defers["$.__views.__alloyId31!buttonClick!doButtonClick"] = true;
-    $.__views.__alloyId32 = Alloy.createController("button", {
-        label: "template3",
-        id: "__alloyId32",
-        __parentSymbol: $.__views.toolbar
-    });
-    $.__views.__alloyId32.setParent($.__views.toolbar);
-    doButtonClick ? $.__views.__alloyId32.on("buttonClick", doButtonClick) : __defers["$.__views.__alloyId32!buttonClick!doButtonClick"] = true;
-    exports.destroy = function() {
-        __alloyId26 && __alloyId26.off("fetch destroy change add remove reset", __alloyId27);
-    };
-    _.extend($, $.__views);
-    var info = Alloy.Collections.info;
-    $.index.open();
-    info.fetch();
-    __defers["$.__views.__alloyId29!buttonClick!doButtonClick"] && $.__views.__alloyId29.on("buttonClick", doButtonClick);
-    __defers["$.__views.__alloyId30!buttonClick!doButtonClick"] && $.__views.__alloyId30.on("buttonClick", doButtonClick);
-    __defers["$.__views.__alloyId31!buttonClick!doButtonClick"] && $.__views.__alloyId31.on("buttonClick", doButtonClick);
-    __defers["$.__views.__alloyId32!buttonClick!doButtonClick"] && $.__views.__alloyId32.on("buttonClick", doButtonClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-609/_generated/mobileweb/alloy/models/Info.js b/test/apps/testing/ALOY-609/_generated/mobileweb/alloy/models/Info.js
deleted file mode 100644
index 020b5e1cd..000000000
--- a/test/apps/testing/ALOY-609/_generated/mobileweb/alloy/models/Info.js
+++ /dev/null
@@ -1,65 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            id: "INTEGER PRIMARY KEY AUTOINCREMENT",
-            title: "TEXT",
-            subtitle: "TEXT",
-            image: "TEXT"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "info",
-            idAttribute: "id"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("info", exports.definition, [ function(migration) {
-    migration.name = "info";
-    migration.id = "201209301904312";
-    migration.up = function(migrator) {
-        migrator.createTable({
-            columns: {
-                id: "INTEGER PRIMARY KEY AUTOINCREMENT",
-                title: "TEXT",
-                subtitle: "TEXT",
-                image: "TEXT"
-            }
-        });
-    };
-    migration.down = function(migrator) {
-        migrator.dropTable("info");
-    };
-}, function(migration) {
-    migration.name = "info";
-    migration.id = "201301161234567";
-    var info = [];
-    for (var i = 0; 500 > i; i++) i % 7 === 0 ? info.push({
-        title: "This is the title",
-        subtitle: "This is the slightly more verbose subtitle",
-        image: i % 2 ? "/appc.png" : "/alloy.png"
-    }) : i % 2 ? info.push({
-        title: "This is the title with subtitle",
-        subtitle: "This is the slightly more verbose subtitle"
-    }) : info.push({
-        title: "This is the lonely title"
-    });
-    migration.up = function(migrator) {
-        for (var i = 0; i < info.length; i++) migrator.insertRow(info[i]);
-    };
-    migration.down = function(migrator) {
-        for (var i = 0; i < info.length; i++) migrator.deleteRow(info[i]);
-    };
-} ]);
-
-collection = Alloy.C("info", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-612/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-612/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index c94edc24b..000000000
--- a/test/apps/testing/ALOY-612/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,100 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.info = Ti.UI.createLabel({
-        color: "#000",
-        height: Ti.UI.SIZE,
-        width: "250dp",
-        top: "15dp",
-        textAlign: "center",
-        font: {
-            fontSize: "18dp",
-            fontWeight: "normal"
-        },
-        text: "Click anything to see its ID style entry",
-        id: "info"
-    });
-    $.__views.index.add($.__views.info);
-    $.__views.button1 = Ti.UI.createButton({
-        top: "15dp",
-        color: "#500",
-        height: "70dp",
-        width: "250dp",
-        borderRadius: 8,
-        borderWidth: 2,
-        borderColor: "#500",
-        title: "button1",
-        id: "button1"
-    });
-    $.__views.index.add($.__views.button1);
-    $.__views.button2 = Ti.UI.createButton({
-        top: "15dp",
-        color: "#500",
-        width: "100dp",
-        height: Ti.UI.SIZE,
-        title: "button2",
-        id: "button2"
-    });
-    $.__views.index.add($.__views.button2);
-    $.__views.button3 = Ti.UI.createButton({
-        top: "15dp",
-        color: "#500",
-        height: "40dp",
-        width: "200dp",
-        borderRadius: 32,
-        borderWidth: 1,
-        borderColor: "#0f0",
-        title: "button3",
-        id: "button3"
-    });
-    $.__views.index.add($.__views.button3);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    var style = require("alloy/styles/index");
-    var i, len;
-    for (i = 0, len = $.index.children.length; len > i; i++) {
-        var child = $.index.children[i];
-        child.addEventListener("click", function(e) {
-            var id = e.source.id;
-            _.each(style, function(o) {
-                o.key === id && o.isId && Ti.API.info(JSON.stringify(o));
-            });
-        });
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-612/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-612/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 21428e84e..000000000
--- a/test/apps/testing/ALOY-612/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,94 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.info = Ti.UI.createLabel({
-        color: "#000",
-        height: Ti.UI.SIZE,
-        width: "250dp",
-        top: "15dp",
-        textAlign: "center",
-        font: {
-            fontSize: "18dp",
-            fontWeight: "normal"
-        },
-        text: "Click anything to see its ID style entry",
-        id: "info"
-    });
-    $.__views.index.add($.__views.info);
-    $.__views.button1 = Ti.UI.createButton({
-        color: "#500",
-        top: "15dp",
-        height: "70dp",
-        width: "250dp",
-        borderRadius: 8,
-        borderWidth: 2,
-        borderColor: "#500",
-        title: "button1",
-        id: "button1"
-    });
-    $.__views.index.add($.__views.button1);
-    $.__views.button2 = Ti.UI.createButton({
-        color: "#500",
-        top: "15dp",
-        width: "100dp",
-        height: Ti.UI.SIZE,
-        title: "button2",
-        id: "button2"
-    });
-    $.__views.index.add($.__views.button2);
-    $.__views.button3 = Ti.UI.createButton({
-        color: "#500",
-        top: "15dp",
-        height: "40dp",
-        width: "200dp",
-        borderRadius: 32,
-        borderWidth: 1,
-        borderColor: "#0f0",
-        title: "button3",
-        id: "button3"
-    });
-    $.__views.index.add($.__views.button3);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    var style = require("alloy/styles/index");
-    var i, len;
-    for (i = 0, len = $.index.children.length; len > i; i++) {
-        var child = $.index.children[i];
-        child.addEventListener("click", function(e) {
-            var id = e.source.id;
-            _.each(style, function(o) {
-                o.key === id && o.isId && Ti.API.info(JSON.stringify(o));
-            });
-        });
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-613/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-613/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 3ec16c89d..000000000
--- a/test/apps/testing/ALOY-613/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,133 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#efefef",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.labelNoAutoStyle = Ti.UI.createLabel({
-        color: "#88f",
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        right: null,
-        left: null,
-        bottom: null,
-        top: "15dp",
-        textAlign: "center",
-        shadowOffset: {
-            x: 2,
-            y: 2
-        },
-        shadowColor: "#222",
-        text: '["blueshadow"]',
-        id: "labelNoAutoStyle"
-    });
-    $.__views.index.add($.__views.labelNoAutoStyle);
-    $.__views.labelAutoStyle = Ti.UI.createLabel({
-        color: "#a00",
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        right: null,
-        left: null,
-        bottom: null,
-        top: "15dp",
-        textAlign: "center",
-        backgroundColor: "#999",
-        text: '["red","greyBg"]',
-        apiName: "Ti.UI.Label",
-        id: "labelAutoStyle",
-        classes: [ "red", "greyBg" ]
-    });
-    $.__views.index.add($.__views.labelAutoStyle);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.labelNoAutoStyle.apiName = "Label";
-    $.labelNoAutoStyle.classes = [ "blueshadow" ];
-    var labels = [ {
-        label: $.labelNoAutoStyle,
-        classes: [ "huge" ]
-    }, {
-        label: $.labelAutoStyle,
-        classes: [ "huge" ]
-    }, {
-        label: $.UI.create("Label", {
-            classes: [ "tiny" ],
-            text: '["tiny"]'
-        }),
-        classes: [ "right", "greyBg" ]
-    }, {
-        label: $.UI.create("Label", {
-            classes: [ "red" ],
-            text: '["red"]'
-        }),
-        classes: [ "left", "blueshadow" ]
-    }, {
-        label: Ti.UI.createLabel({
-            text: "[]",
-            apiName: "Label"
-        }),
-        classes: [ "bigspace", "red", "huge" ]
-    } ];
-    _.each(labels, function(o, index) {
-        var label = o.label, classes = o.classes;
-        label.addEventListener("click", function() {
-            label._wasClicked = "undefined" == typeof label._wasClicked ? false : !label._wasClicked;
-            if (label._wasClicked) {
-                Ti.API.info("remove: " + JSON.stringify(classes) + " from " + JSON.stringify(label.classes));
-                $.removeClass(label, classes);
-            } else {
-                Ti.API.info("add: " + JSON.stringify(classes) + " to " + JSON.stringify(label.classes));
-                $.addClass(label, classes);
-            }
-            label.text = JSON.stringify(label.classes);
-        });
-        index > 1 && $.index.add(label);
-    });
-    $.index.open();
-    try {
-        $.tester = $.UI.create("Label");
-        require("specs/index")($);
-    } catch (e) {
-        Ti.API.warn('No unit tests found for controller "index"');
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-613/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-613/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 4880ad99b..000000000
--- a/test/apps/testing/ALOY-613/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,127 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#efefef",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.labelNoAutoStyle = Ti.UI.createLabel({
-        color: "#88f",
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        right: null,
-        left: null,
-        bottom: null,
-        top: "15dp",
-        textAlign: "center",
-        shadowOffset: {
-            x: 2,
-            y: 2
-        },
-        shadowColor: "#222",
-        text: '["blueshadow"]',
-        id: "labelNoAutoStyle"
-    });
-    $.__views.index.add($.__views.labelNoAutoStyle);
-    $.__views.labelAutoStyle = Ti.UI.createLabel({
-        color: "#a00",
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        right: null,
-        left: null,
-        bottom: null,
-        top: "15dp",
-        textAlign: "center",
-        backgroundColor: "#999",
-        text: '["red","greyBg"]',
-        apiName: "Ti.UI.Label",
-        id: "labelAutoStyle",
-        classes: [ "red", "greyBg" ]
-    });
-    $.__views.index.add($.__views.labelAutoStyle);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.labelNoAutoStyle.apiName = "Label";
-    $.labelNoAutoStyle.classes = [ "blueshadow" ];
-    var labels = [ {
-        label: $.labelNoAutoStyle,
-        classes: [ "huge" ]
-    }, {
-        label: $.labelAutoStyle,
-        classes: [ "huge" ]
-    }, {
-        label: $.UI.create("Label", {
-            classes: [ "tiny" ],
-            text: '["tiny"]'
-        }),
-        classes: [ "right", "greyBg" ]
-    }, {
-        label: $.UI.create("Label", {
-            classes: [ "red" ],
-            text: '["red"]'
-        }),
-        classes: [ "left", "blueshadow" ]
-    }, {
-        label: Ti.UI.createLabel({
-            text: "[]",
-            apiName: "Label"
-        }),
-        classes: [ "bigspace", "red", "huge" ]
-    } ];
-    _.each(labels, function(o, index) {
-        var label = o.label, classes = o.classes;
-        label.addEventListener("click", function(e) {
-            label._wasClicked = "undefined" == typeof label._wasClicked ? false : !label._wasClicked;
-            if (label._wasClicked) {
-                Ti.API.info("remove: " + JSON.stringify(classes) + " from " + JSON.stringify(label.classes));
-                $.removeClass(label, classes);
-            } else {
-                Ti.API.info("add: " + JSON.stringify(classes) + " to " + JSON.stringify(label.classes));
-                $.addClass(label, classes);
-            }
-            label.text = JSON.stringify(label.classes);
-        });
-        index > 1 && $.index.add(label);
-    });
-    $.index.open();
-    try {
-        $.tester = $.UI.create("Label");
-        require("specs/index")($);
-    } catch (e) {
-        Ti.API.warn('No unit tests found for controller "index"');
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-613/specs/index.js b/test/apps/testing/ALOY-613/specs/index.js
index 9d9d9135e..69af4dcf2 100644
--- a/test/apps/testing/ALOY-613/specs/index.js
+++ b/test/apps/testing/ALOY-613/specs/index.js
@@ -5,15 +5,14 @@ var labelStyle = {
 	height: Ti.UI.SIZE,
 	width: Ti.UI.SIZE,
 	font: {
-		fontSize: OS_MOBILEWEB ? '24px' : '24dp',
+		fontSize: '24dp',
 		fontWeight: 'bold'
 	},
-	right: OS_MOBILEWEB ? undefined : null,
-	left: OS_MOBILEWEB ? undefined : null,
-	bottom: OS_MOBILEWEB ? undefined : null
+	right: null,
+	left: null,
+	bottom: null
 };
 
-// TODO: Mobileweb represents null values differently. Remove mobileweb-specific
 // code when this is resolved: https://jira.appcelerator.org/browse/TIMOB-14295
 module.exports = function($) {
 	addMatchers();
@@ -36,7 +35,7 @@ module.exports = function($) {
 			style: _.extend(_.clone(labelStyle), {
 				backgroundColor: '#efefef',
 				font: {
-					fontSize: OS_MOBILEWEB ? '10px' : '10dp',
+					fontSize: '10dp',
 					fontWeight: 'normal'
 				},
 				right: 0,
@@ -57,7 +56,7 @@ module.exports = function($) {
 			style: _.extend(_.clone(labelStyle), {
 				backgroundColor: '#efefef',
 				font: {
-					fontSize: OS_MOBILEWEB ? '10px' : '10dp',
+					fontSize: '10dp',
 					fontWeight: 'normal'
 				},
 				apiName: 'Ti.UI.Label',
@@ -92,7 +91,7 @@ module.exports = function($) {
 			style: _.extend(_.clone(labelStyle), {
 				backgroundColor: '#efefef',
 				font: {
-					fontSize: OS_MOBILEWEB ? '10px' : '10dp',
+					fontSize: '10dp',
 					fontWeight: 'normal'
 				},
 				right: 0,
diff --git a/test/apps/testing/ALOY-616/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-616/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 19247876a..000000000
--- a/test/apps/testing/ALOY-616/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,68 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick() {
-        alert(util.formatNumber(rand.getRandomNumber(12)));
-    }
-    function doFoo(num) {
-        alert("Random " + num + "-digit rating = " + util.formatNumber(rand.getRandomNumber(num)));
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.starwidget = Alloy.createWidget("starrating", "widget", {
-        id: "starwidget",
-        max: "5",
-        initialRating: "2.5",
-        top: "20",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.starwidget.setParent($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "Tap for random number",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    doClick ? $.__views.label.addEventListener("click", doClick) : __defers["$.__views.label!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var util = require("util");
-    var rand = require("random");
-    $.starwidget.init(doFoo);
-    $.index.open();
-    __defers["$.__views.label!click!doClick"] && $.__views.label.addEventListener("click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-616/_generated/blackberry/alloy/widgets/starrating/controllers/star.js b/test/apps/testing/ALOY-616/_generated/blackberry/alloy/widgets/starrating/controllers/star.js
deleted file mode 100644
index 62db34318..000000000
--- a/test/apps/testing/ALOY-616/_generated/blackberry/alloy/widgets/starrating/controllers/star.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "star";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.star = Ti.UI.createImageView({
-        height: "24dp",
-        width: "24dp",
-        left: "5dp",
-        id: "star"
-    });
-    $.__views.star && $.addTopLevelView($.__views.star);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-616/_generated/blackberry/alloy/widgets/starrating/controllers/widget.js b/test/apps/testing/ALOY-616/_generated/blackberry/alloy/widgets/starrating/controllers/widget.js
deleted file mode 100644
index 4dd528eaa..000000000
--- a/test/apps/testing/ALOY-616/_generated/blackberry/alloy/widgets/starrating/controllers/widget.js
+++ /dev/null
@@ -1,73 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.starrating = Ti.UI.createView({
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent",
-        id: "starrating"
-    });
-    $.__views.starrating && $.addTopLevelView($.__views.starrating);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {}, stars = [], rating = 0, max = 5;
-    var setRating = function(newRating) {
-        newRating > max && (newRating = max);
-        rating = newRating;
-        for (var i = 0, l = stars.length; l > i; i++) stars[i].image = WPATH(i >= rating ? "star_off.png" : rating > i && i + 1 > rating ? "star_half.png" : "star.png");
-    };
-    exports.setRating = setRating;
-    exports.getRating = function() {
-        return rating;
-    };
-    var createStars = function(num, cb) {
-        for (var i = 0; num > i; i++) {
-            var star = Alloy.createWidget("starrating", "star").getView();
-            !function() {
-                var index = i;
-                star.addEventListener("click", function() {
-                    setRating(index + 1);
-                    cb(index + 1);
-                });
-            }();
-            stars.push(star);
-            $.starrating.add(star);
-        }
-    };
-    exports.init = function(callback) {
-        var max = args.max || 5, initialRating = args.initialRating || 0, cb = callback || function() {};
-        createStars(max, cb);
-        setRating(initialRating);
-        _.extend($.starrating, args);
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-616/_generated/blackberry/alloy/widgets/starrating/styles/star.js b/test/apps/testing/ALOY-616/_generated/blackberry/alloy/widgets/starrating/styles/star.js
deleted file mode 100644
index 1df3da050..000000000
--- a/test/apps/testing/ALOY-616/_generated/blackberry/alloy/widgets/starrating/styles/star.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isClass: true,
-    priority: 10000.0002,
-    key: "star",
-    style: {
-        height: "24dp",
-        width: "24dp",
-        left: "5dp"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-616/_generated/blackberry/alloy/widgets/starrating/styles/widget.js b/test/apps/testing/ALOY-616/_generated/blackberry/alloy/widgets/starrating/styles/widget.js
deleted file mode 100644
index b3efc6b24..000000000
--- a/test/apps/testing/ALOY-616/_generated/blackberry/alloy/widgets/starrating/styles/widget.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isId: true,
-    priority: 100000.0003,
-    key: "starrating",
-    style: {
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-616/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-616/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 5528af88c..000000000
--- a/test/apps/testing/ALOY-616/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,62 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick(e) {
-        alert(util.formatNumber(rand.getRandomNumber(12)));
-    }
-    function doFoo(num) {
-        alert("Random " + num + "-digit rating = " + util.formatNumber(rand.getRandomNumber(num)));
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.starwidget = Alloy.createWidget("starrating", "widget", {
-        id: "starwidget",
-        max: 5,
-        initialRating: 2.5,
-        top: 20,
-        __parentSymbol: $.__views.index
-    });
-    $.__views.starwidget.setParent($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "Tap for random number",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    doClick ? $.addListener($.__views.label, "click", doClick) : __defers["$.__views.label!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var util = require("util");
-    var rand = require("random");
-    $.starwidget.init(doFoo);
-    $.index.open();
-    __defers["$.__views.label!click!doClick"] && $.addListener($.__views.label, "click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-616/_generated/mobileweb/alloy/widgets/starrating/controllers/star.js b/test/apps/testing/ALOY-616/_generated/mobileweb/alloy/widgets/starrating/controllers/star.js
deleted file mode 100644
index 1dea4f258..000000000
--- a/test/apps/testing/ALOY-616/_generated/mobileweb/alloy/widgets/starrating/controllers/star.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "star";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.star = Ti.UI.createImageView({
-        height: "24dp",
-        width: "24dp",
-        left: "5dp",
-        id: "star"
-    });
-    $.__views.star && $.addTopLevelView($.__views.star);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-616/_generated/mobileweb/alloy/widgets/starrating/controllers/widget.js b/test/apps/testing/ALOY-616/_generated/mobileweb/alloy/widgets/starrating/controllers/widget.js
deleted file mode 100644
index cb1bc629d..000000000
--- a/test/apps/testing/ALOY-616/_generated/mobileweb/alloy/widgets/starrating/controllers/widget.js
+++ /dev/null
@@ -1,73 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("starrating");
-    this.__widgetId = "starrating";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.starrating = Ti.UI.createView({
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent",
-        id: "starrating"
-    });
-    $.__views.starrating && $.addTopLevelView($.__views.starrating);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {}, stars = [], rating = 0, max = 5;
-    var setRating = function(newRating) {
-        newRating > max && (newRating = max);
-        rating = newRating;
-        for (var i = 0, l = stars.length; l > i; i++) i >= rating ? stars[i].image = WPATH("star_off.png") : rating > i && i + 1 > rating ? stars[i].image = WPATH("star_half.png") : stars[i].image = WPATH("star.png");
-    };
-    exports.setRating = setRating;
-    exports.getRating = function() {
-        return rating;
-    };
-    var createStars = function(num, cb) {
-        for (var i = 0; num > i; i++) {
-            var star = Alloy.createWidget("starrating", "star").getView();
-            !function() {
-                var index = i;
-                star.addEventListener("click", function() {
-                    setRating(index + 1);
-                    cb(index + 1);
-                });
-            }();
-            stars.push(star);
-            $.starrating.add(star);
-        }
-    };
-    exports.init = function(callback) {
-        var max = args.max || 5, initialRating = args.initialRating || 0, cb = callback || function() {};
-        createStars(max, cb);
-        setRating(initialRating);
-        _.extend($.starrating, args);
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-616/_generated/mobileweb/alloy/widgets/starrating/styles/star.js b/test/apps/testing/ALOY-616/_generated/mobileweb/alloy/widgets/starrating/styles/star.js
deleted file mode 100644
index 6810b0772..000000000
--- a/test/apps/testing/ALOY-616/_generated/mobileweb/alloy/widgets/starrating/styles/star.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isClass: true,
-    priority: 10000.0001,
-    key: "star",
-    style: {
-        height: "24dp",
-        width: "24dp",
-        left: "5dp"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-616/_generated/mobileweb/alloy/widgets/starrating/styles/widget.js b/test/apps/testing/ALOY-616/_generated/mobileweb/alloy/widgets/starrating/styles/widget.js
deleted file mode 100644
index 89cb6289f..000000000
--- a/test/apps/testing/ALOY-616/_generated/mobileweb/alloy/widgets/starrating/styles/widget.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "starrating/" + s : s.substring(0, index) + "/starrating/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isId: true,
-    priority: 100000.0002,
-    key: "starrating",
-    style: {
-        layout: "horizontal",
-        width: Ti.UI.SIZE,
-        backgroundColor: "transparent"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-616/config.json b/test/apps/testing/ALOY-616/config.json
index 7953b5683..6e103e610 100644
--- a/test/apps/testing/ALOY-616/config.json
+++ b/test/apps/testing/ALOY-616/config.json
@@ -1,13 +1,11 @@
 {
 	"sourcemap": true,
-	"global": {}, 
-	"env:development": {}, 
-	"env:test": {}, 
-	"env:production": {}, 
+	"global": {},
+	"env:development": {},
+	"env:test": {},
+	"env:production": {},
 	"os:android": {},
-	"os:blackberry": {},
 	"os:ios": {},
-	"os:mobileweb": {},
 	"dependencies": {
 		"starrating": "1.0"
 	}
diff --git a/test/apps/testing/ALOY-616/widgets/starrating/widget.json b/test/apps/testing/ALOY-616/widgets/starrating/widget.json
index 2da1e2583..4a8fd06ee 100644
--- a/test/apps/testing/ALOY-616/widgets/starrating/widget.json
+++ b/test/apps/testing/ALOY-616/widgets/starrating/widget.json
@@ -9,5 +9,5 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"3.0",
 	"tags":"",
-	"platforms":"android,ios,mobileweb"
+	"platforms":"android,ios"
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-625/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-625/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 1d7a837b7..000000000
--- a/test/apps/testing/ALOY-625/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,52 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#888",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        backgroundColor: "#00f",
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#fff",
-        font: {
-            fontSize: 12
-        },
-        text: "This should be white text with a blue background on a gray window",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-625/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-625/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 964fd4781..000000000
--- a/test/apps/testing/ALOY-625/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,46 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#888",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        backgroundColor: "#00f",
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#fff",
-        font: {
-            fontSize: 12
-        },
-        text: "This should be white text with a blue background on a gray window",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-629/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-629/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 05ce7906f..000000000
--- a/test/apps/testing/ALOY-629/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,73 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.notes = Ti.UI.createLabel({
-        top: 10,
-        left: 15,
-        right: 15,
-        height: Ti.UI.SIZE,
-        textAlign: "left",
-        color: "#000",
-        font: {
-            fontSize: 14,
-            fontWeight: "normal"
-        },
-        text: 'Below you should see a red box with a rounded black border and white bold text inside. On iOS, it should say "global merging is working!" with a gray drop shadow. On all other platforms, it should say "you should only see this on non-iOS builds" with no drop shadow.',
-        id: "notes"
-    });
-    $.__views.index.add($.__views.notes);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        color: "#fff",
-        font: {
-            fontSize: 24,
-            fontWeight: "bold"
-        },
-        bottom: 15,
-        height: 120,
-        width: 300,
-        textAlign: "center",
-        text: "you should only see this on non-iOS builds",
-        backgroundColor: "#a00",
-        borderWidth: 2,
-        borderRadius: 8,
-        borderColor: "#000",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-629/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-629/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index ddbd4c769..000000000
--- a/test/apps/testing/ALOY-629/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,67 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.notes = Ti.UI.createLabel({
-        top: 10,
-        left: 15,
-        right: 15,
-        height: Ti.UI.SIZE,
-        textAlign: "left",
-        color: "#000",
-        font: {
-            fontSize: 14,
-            fontWeight: "normal"
-        },
-        text: 'Below you should see a red box with a rounded black border and white bold text inside. On iOS, it should say "global merging is working!" with a gray drop shadow. On all other platforms, it should say "you should only see this on non-iOS builds" with no drop shadow.',
-        id: "notes"
-    });
-    $.__views.index.add($.__views.notes);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        color: "#fff",
-        font: {
-            fontSize: 24,
-            fontWeight: "bold"
-        },
-        bottom: 15,
-        height: 120,
-        width: 300,
-        textAlign: "center",
-        text: "you should only see this on non-iOS builds",
-        backgroundColor: "#a00",
-        borderWidth: 2,
-        borderRadius: 8,
-        borderColor: "#000",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-632/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-632/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 5ac96531c..000000000
--- a/test/apps/testing/ALOY-632/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,58 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.opt = Alloy.createWidget("optionDialog", "widget", {
-        id: "opt",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.opt.setParent($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "As long as you don't see a red screen of death, this is working as expected",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    require("alloy/animation").popIn(Ti.UI.createView({
-        width: 300,
-        height: 300,
-        backgroundColor: "red"
-    }), function() {});
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-632/_generated/blackberry/alloy/widgets/optionDialog/controllers/widget.js b/test/apps/testing/ALOY-632/_generated/blackberry/alloy/widgets/optionDialog/controllers/widget.js
deleted file mode 100644
index 27fe4e703..000000000
--- a/test/apps/testing/ALOY-632/_generated/blackberry/alloy/widgets/optionDialog/controllers/widget.js
+++ /dev/null
@@ -1,44 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "optionDialog/" + s : s.substring(0, index) + "/optionDialog/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("optionDialog");
-    this.__widgetId = "optionDialog";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.theView = Ti.UI.createView({
-        height: 200,
-        width: 200,
-        backgroundColor: "#888",
-        id: "theView"
-    });
-    $.__views.theView && $.addTopLevelView($.__views.theView);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    require("alloy/animation").popIn($.theView, function() {});
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-632/_generated/blackberry/alloy/widgets/optionDialog/styles/widget.js b/test/apps/testing/ALOY-632/_generated/blackberry/alloy/widgets/optionDialog/styles/widget.js
deleted file mode 100644
index 7670c28a8..000000000
--- a/test/apps/testing/ALOY-632/_generated/blackberry/alloy/widgets/optionDialog/styles/widget.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "optionDialog/" + s : s.substring(0, index) + "/optionDialog/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isId: true,
-    priority: 100000.0002,
-    key: "theView",
-    style: {
-        height: 200,
-        width: 200,
-        backgroundColor: "#888"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-632/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-632/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index c15f4c547..000000000
--- a/test/apps/testing/ALOY-632/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,52 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.opt = Alloy.createWidget("optionDialog", "widget", {
-        id: "opt",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.opt.setParent($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "As long as you don't see a red screen of death, this is working as expected",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    require("alloy/animation").popIn(Ti.UI.createView({
-        width: 300,
-        height: 300,
-        backgroundColor: "red"
-    }), function(e) {});
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-632/_generated/mobileweb/alloy/widgets/optionDialog/controllers/widget.js b/test/apps/testing/ALOY-632/_generated/mobileweb/alloy/widgets/optionDialog/controllers/widget.js
deleted file mode 100644
index f790578cd..000000000
--- a/test/apps/testing/ALOY-632/_generated/mobileweb/alloy/widgets/optionDialog/controllers/widget.js
+++ /dev/null
@@ -1,44 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "optionDialog/" + s : s.substring(0, index) + "/optionDialog/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("optionDialog");
-    this.__widgetId = "optionDialog";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.theView = Ti.UI.createView({
-        height: 200,
-        width: 200,
-        backgroundColor: "#888",
-        id: "theView"
-    });
-    $.__views.theView && $.addTopLevelView($.__views.theView);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    require("alloy/animation").popIn($.theView, function(e) {});
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-632/_generated/mobileweb/alloy/widgets/optionDialog/styles/widget.js b/test/apps/testing/ALOY-632/_generated/mobileweb/alloy/widgets/optionDialog/styles/widget.js
deleted file mode 100644
index c2bbd2d8a..000000000
--- a/test/apps/testing/ALOY-632/_generated/mobileweb/alloy/widgets/optionDialog/styles/widget.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "optionDialog/" + s : s.substring(0, index) + "/optionDialog/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isId: true,
-    priority: 100000.0001,
-    key: "theView",
-    style: {
-        height: 200,
-        width: 200,
-        backgroundColor: "#888"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-632/widgets/optionDialog/widget.json b/test/apps/testing/ALOY-632/widgets/optionDialog/widget.json
index 45774aac9..301f49ed6 100644
--- a/test/apps/testing/ALOY-632/widgets/optionDialog/widget.json
+++ b/test/apps/testing/ALOY-632/widgets/optionDialog/widget.json
@@ -8,5 +8,5 @@
 	"min-alloy-version": "1.0.0",
 	"min-titanium-version": "3.0",
 	"tags": "utility",
-	"platforms": "android,ios,mobileweb"
+	"platforms": "android,ios"
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-635/_generated/blackberry/alloy/controllers/bob.js b/test/apps/testing/ALOY-635/_generated/blackberry/alloy/controllers/bob.js
deleted file mode 100644
index 75aaa8ec5..000000000
--- a/test/apps/testing/ALOY-635/_generated/blackberry/alloy/controllers/bob.js
+++ /dev/null
@@ -1,34 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "bob";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-635/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-635/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index eaacc0641..000000000
--- a/test/apps/testing/ALOY-635/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,52 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#ffa",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        color: "#000",
-        font: {
-            fontSize: 32,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        text: "you should see this text",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-635/_generated/mobileweb/alloy/controllers/bob.js b/test/apps/testing/ALOY-635/_generated/mobileweb/alloy/controllers/bob.js
deleted file mode 100644
index de4b1c9f6..000000000
--- a/test/apps/testing/ALOY-635/_generated/mobileweb/alloy/controllers/bob.js
+++ /dev/null
@@ -1,28 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "bob";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-635/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-635/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index ed0f99a23..000000000
--- a/test/apps/testing/ALOY-635/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,46 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#ffa",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        color: "#000",
-        font: {
-            fontSize: 32,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        text: "you should see this text",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-642/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-642/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 260f11bc9..000000000
--- a/test/apps/testing/ALOY-642/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,80 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function fadeIn(view, duration) {
-        anim.fadeIn(view, duration, function() {
-            fadeOut(view, duration);
-        });
-    }
-    function fadeOut(view, duration) {
-        anim.fadeOut(view, duration, function() {
-            fadeIn(view, duration);
-        });
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.view1 = Ti.UI.createView({
-        height: 100,
-        width: 100,
-        backgroundColor: "#f00",
-        top: 15,
-        opacity: 0,
-        id: "view1"
-    });
-    $.__views.index.add($.__views.view1);
-    $.__views.view2 = Ti.UI.createView({
-        height: 100,
-        width: 100,
-        backgroundColor: "#00f",
-        bottom: 15,
-        opacity: 1,
-        id: "view2"
-    });
-    $.__views.index.add($.__views.view2);
-    $.__views.view3 = Ti.UI.createView({
-        height: 60,
-        width: 200,
-        backgroundColor: "#0f0",
-        opacity: 1,
-        id: "view3"
-    });
-    $.__views.index.add($.__views.view3);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var anim = require("alloy/animation");
-    $.index.open();
-    fadeIn($.view1, 1e3);
-    fadeOut($.view2, 1e3);
-    fadeIn($.view3, 2e3);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-642/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-642/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 2c472c6a0..000000000
--- a/test/apps/testing/ALOY-642/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,74 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function fadeIn(view, duration) {
-        anim.fadeIn(view, duration, function() {
-            fadeOut(view, duration);
-        });
-    }
-    function fadeOut(view, duration) {
-        anim.fadeOut(view, duration, function() {
-            fadeIn(view, duration);
-        });
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.view1 = Ti.UI.createView({
-        height: 100,
-        width: 100,
-        backgroundColor: "#f00",
-        top: 15,
-        opacity: 0,
-        id: "view1"
-    });
-    $.__views.index.add($.__views.view1);
-    $.__views.view2 = Ti.UI.createView({
-        height: 100,
-        width: 100,
-        backgroundColor: "#00f",
-        bottom: 15,
-        opacity: 1,
-        id: "view2"
-    });
-    $.__views.index.add($.__views.view2);
-    $.__views.view3 = Ti.UI.createView({
-        height: 60,
-        width: 200,
-        backgroundColor: "#0f0",
-        opacity: 1,
-        id: "view3"
-    });
-    $.__views.index.add($.__views.view3);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var anim = require("alloy/animation");
-    $.index.open();
-    fadeIn($.view1, 1e3);
-    fadeOut($.view2, 1e3);
-    fadeIn($.view3, 2e3);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-644/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-644/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 1e039e9cb..000000000
--- a/test/apps/testing/ALOY-644/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,167 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId10(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId10.opts || {};
-        var models = __alloyId9.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId6 = models[i];
-            __alloyId6.__transform = {};
-            var __alloyId8 = Ti.UI.createTableViewRow({
-                title: "undefined" != typeof __alloyId6.__transform["name"] ? __alloyId6.__transform["name"] : __alloyId6.get("name")
-            });
-            rows.push(__alloyId8);
-        }
-        $.__views.table.setData(rows);
-    }
-    function generateRandomColor() {
-        var c = 256 * Math.floor(255 * Math.random()) * 256 + 256 * Math.floor(255 * Math.random()) + Math.floor(255 * Math.random());
-        c = c.toString(16);
-        while (c.length < 6) c = "0" + c;
-        return "#" + c;
-    }
-    function modifyHero(e) {
-        var model = heroes.at(e.index);
-        model.set("name", model.get("name") + "+");
-        model.save();
-    }
-    function updateState() {
-        appState.set({
-            counter: appState.get("counter") + 1,
-            color: generateRandomColor()
-        });
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createTabGroup({
-        id: "index"
-    });
-    $.__views.__alloyId1 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        navBarHidden: true,
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        height: "50dp",
-        width: Ti.UI.FILL,
-        top: 0,
-        textAlign: "center",
-        color: "#fff",
-        font: {
-            fontSize: "32dp",
-            fontWeight: "bold"
-        },
-        text: "Model",
-        id: "__alloyId2"
-    });
-    $.__views.__alloyId1.add($.__views.__alloyId2);
-    $.__views.counter = Ti.UI.createLabel({
-        font: {
-            fontSize: "160dp",
-            fontWeight: "bold"
-        },
-        id: "counter"
-    });
-    $.__views.__alloyId1.add($.__views.counter);
-    updateState ? $.__views.counter.addEventListener("click", updateState) : __defers["$.__views.counter!click!updateState"] = true;
-    $.__views.__alloyId0 = Ti.UI.createTab({
-        window: $.__views.__alloyId1,
-        title: "model",
-        id: "__alloyId0"
-    });
-    $.__views.index.addTab($.__views.__alloyId0);
-    $.__views.__alloyId4 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        navBarHidden: true,
-        id: "__alloyId4"
-    });
-    $.__views.__alloyId5 = Ti.UI.createLabel({
-        height: "50dp",
-        width: Ti.UI.FILL,
-        top: 0,
-        textAlign: "center",
-        color: "#fff",
-        font: {
-            fontSize: "32dp",
-            fontWeight: "bold"
-        },
-        text: "Collection",
-        id: "__alloyId5"
-    });
-    $.__views.__alloyId4.add($.__views.__alloyId5);
-    $.__views.table = Ti.UI.createTableView({
-        top: "50dp",
-        id: "table"
-    });
-    $.__views.__alloyId4.add($.__views.table);
-    var __alloyId9 = Alloy.Collections["heroes"] || heroes;
-    __alloyId9.on("fetch destroy change add remove reset", __alloyId10);
-    modifyHero ? $.__views.table.addEventListener("click", modifyHero) : __defers["$.__views.table!click!modifyHero"] = true;
-    $.__views.__alloyId3 = Ti.UI.createTab({
-        window: $.__views.__alloyId4,
-        title: "collection",
-        id: "__alloyId3"
-    });
-    $.__views.index.addTab($.__views.__alloyId3);
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId11 = function() {
-        $.__alloyId2.backgroundColor = _.isFunction(Alloy.Models.appState.transform) ? Alloy.Models.appState.transform()["color"] : _.template("<%=appState.color%>", {
-            appState: Alloy.Models.appState.toJSON()
-        });
-        $.counter.text = _.isFunction(Alloy.Models.appState.transform) ? Alloy.Models.appState.transform()["counter"] : _.template("<%=appState.counter%>", {
-            appState: Alloy.Models.appState.toJSON()
-        });
-        $.counter.color = _.isFunction(Alloy.Models.appState.transform) ? Alloy.Models.appState.transform()["color"] : _.template("<%=appState.color%>", {
-            appState: Alloy.Models.appState.toJSON()
-        });
-        $.__alloyId5.backgroundColor = _.isFunction(Alloy.Models.appState.transform) ? Alloy.Models.appState.transform()["color"] : _.template("<%=appState.color%>", {
-            appState: Alloy.Models.appState.toJSON()
-        });
-    };
-    Alloy.Models.appState.on("fetch change destroy", __alloyId11);
-    exports.destroy = function() {
-        __alloyId9.off("fetch destroy change add remove reset", __alloyId10);
-        Alloy.Models.appState.off("fetch change destroy", __alloyId11);
-    };
-    _.extend($, $.__views);
-    var appState = Alloy.Models.appState;
-    var heroes = Alloy.Collections.heroes;
-    appState.trigger("change");
-    heroes.trigger("change");
-    appState.fetch();
-    $.index.open();
-    __defers["$.__views.counter!click!updateState"] && $.__views.counter.addEventListener("click", updateState);
-    __defers["$.__views.table!click!modifyHero"] && $.__views.table.addEventListener("click", modifyHero);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-644/_generated/blackberry/alloy/models/AppState.js b/test/apps/testing/ALOY-644/_generated/blackberry/alloy/models/AppState.js
deleted file mode 100644
index 6ccb58c52..000000000
--- a/test/apps/testing/ALOY-644/_generated/blackberry/alloy/models/AppState.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        defaults: {
-            counter: 1,
-            color: "#00f"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("appState", exports.definition, []);
-
-collection = Alloy.C("appState", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-644/_generated/blackberry/alloy/models/Heroes.js b/test/apps/testing/ALOY-644/_generated/blackberry/alloy/models/Heroes.js
deleted file mode 100644
index db5eca323..000000000
--- a/test/apps/testing/ALOY-644/_generated/blackberry/alloy/models/Heroes.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("heroes", exports.definition, []);
-
-collection = Alloy.C("heroes", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-644/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-644/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index b225cc18c..000000000
--- a/test/apps/testing/ALOY-644/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,156 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId11(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId11.opts || {};
-        var models = __alloyId10.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId7 = models[i];
-            __alloyId7.__transform = _.isFunction(__alloyId7.transform) ? __alloyId7.transform() : __alloyId7.toJSON();
-            var __alloyId9 = Ti.UI.createTableViewRow({
-                title: __alloyId7.__transform.name
-            });
-            rows.push(__alloyId9);
-        }
-        $.__views.table.setData(rows);
-    }
-    function generateRandomColor() {
-        var c = 256 * Math.floor(255 * Math.random()) * 256 + 256 * Math.floor(255 * Math.random()) + Math.floor(255 * Math.random());
-        c = c.toString(16);
-        while (c.length < 6) c = "0" + c;
-        return "#" + c;
-    }
-    function modifyHero(e) {
-        var model = heroes.at(e.index);
-        model.set("name", model.get("name") + "+");
-        model.save();
-    }
-    function updateState() {
-        appState.set({
-            counter: appState.get("counter") + 1,
-            color: generateRandomColor()
-        });
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    var __alloyId0 = [];
-    $.__views.__alloyId2 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        navBarHidden: true,
-        id: "__alloyId2"
-    });
-    $.__views.__alloyId3 = Ti.UI.createLabel({
-        height: "50dp",
-        width: Ti.UI.FILL,
-        top: 0,
-        textAlign: "center",
-        color: "#fff",
-        font: {
-            fontSize: "32dp",
-            fontWeight: "bold"
-        },
-        text: "Model",
-        id: "__alloyId3"
-    });
-    $.__views.__alloyId2.add($.__views.__alloyId3);
-    $.__views.counter = Ti.UI.createLabel({
-        font: {
-            fontSize: "160dp",
-            fontWeight: "bold"
-        },
-        id: "counter"
-    });
-    $.__views.__alloyId2.add($.__views.counter);
-    updateState ? $.addListener($.__views.counter, "click", updateState) : __defers["$.__views.counter!click!updateState"] = true;
-    $.__views.__alloyId1 = Ti.UI.createTab({
-        window: $.__views.__alloyId2,
-        title: "model",
-        id: "__alloyId1"
-    });
-    __alloyId0.push($.__views.__alloyId1);
-    $.__views.__alloyId5 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        navBarHidden: true,
-        id: "__alloyId5"
-    });
-    $.__views.__alloyId6 = Ti.UI.createLabel({
-        height: "50dp",
-        width: Ti.UI.FILL,
-        top: 0,
-        textAlign: "center",
-        color: "#fff",
-        font: {
-            fontSize: "32dp",
-            fontWeight: "bold"
-        },
-        text: "Collection",
-        id: "__alloyId6"
-    });
-    $.__views.__alloyId5.add($.__views.__alloyId6);
-    $.__views.table = Ti.UI.createTableView({
-        top: "50dp",
-        id: "table"
-    });
-    $.__views.__alloyId5.add($.__views.table);
-    var __alloyId10 = Alloy.Collections["heroes"] || heroes;
-    __alloyId10.on("fetch destroy change add remove reset", __alloyId11);
-    modifyHero ? $.addListener($.__views.table, "click", modifyHero) : __defers["$.__views.table!click!modifyHero"] = true;
-    $.__views.__alloyId4 = Ti.UI.createTab({
-        window: $.__views.__alloyId5,
-        title: "collection",
-        id: "__alloyId4"
-    });
-    __alloyId0.push($.__views.__alloyId4);
-    $.__views.index = Ti.UI.createTabGroup({
-        tabs: __alloyId0,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId12 = function() {
-        Alloy["Models"]["appState"].__transform = _.isFunction(Alloy["Models"]["appState"].transform) ? Alloy["Models"]["appState"].transform() : Alloy["Models"]["appState"].toJSON();
-        $.__alloyId3.backgroundColor = Alloy["Models"]["appState"]["__transform"]["color"];
-        $.counter.text = Alloy["Models"]["appState"]["__transform"]["counter"];
-        $.counter.color = Alloy["Models"]["appState"]["__transform"]["color"];
-        $.__alloyId6.backgroundColor = Alloy["Models"]["appState"]["__transform"]["color"];
-    };
-    Alloy["Models"]["appState"].on("fetch change destroy", __alloyId12);
-    exports.destroy = function() {
-        __alloyId10 && __alloyId10.off("fetch destroy change add remove reset", __alloyId11);
-        Alloy["Models"]["appState"] && Alloy["Models"]["appState"].off("fetch change destroy", __alloyId12);
-    };
-    _.extend($, $.__views);
-    var appState = Alloy.Models.appState;
-    var heroes = Alloy.Collections.heroes;
-    appState.trigger("change");
-    heroes.trigger("change");
-    appState.fetch();
-    $.index.open();
-    __defers["$.__views.counter!click!updateState"] && $.addListener($.__views.counter, "click", updateState);
-    __defers["$.__views.table!click!modifyHero"] && $.addListener($.__views.table, "click", modifyHero);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-644/_generated/mobileweb/alloy/models/AppState.js b/test/apps/testing/ALOY-644/_generated/mobileweb/alloy/models/AppState.js
deleted file mode 100644
index 0ac303958..000000000
--- a/test/apps/testing/ALOY-644/_generated/mobileweb/alloy/models/AppState.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        defaults: {
-            counter: 1,
-            color: "#00f"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("appState", exports.definition, []);
-
-collection = Alloy.C("appState", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-644/_generated/mobileweb/alloy/models/Heroes.js b/test/apps/testing/ALOY-644/_generated/mobileweb/alloy/models/Heroes.js
deleted file mode 100644
index a014bb34f..000000000
--- a/test/apps/testing/ALOY-644/_generated/mobileweb/alloy/models/Heroes.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("heroes", exports.definition, []);
-
-collection = Alloy.C("heroes", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-648/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-648/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 16ad79b14..000000000
--- a/test/apps/testing/ALOY-648/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,88 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function loadData(e) {
-        if (e && e.fromAdapter) return;
-        var opts = loadData.opts || {};
-        var models = __alloyId5.models;
-        var len = models.length;
-        var __alloyId1 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId2 = models[i];
-            __alloyId2.__transform = {};
-            var __alloyId4 = {
-                properties: {
-                    title: "undefined" != typeof __alloyId2.__transform["title"] ? __alloyId2.__transform["title"] : __alloyId2.get("title")
-                }
-            };
-            __alloyId1.push(__alloyId4);
-        }
-        opts.animation ? $.__views.section.setItems(__alloyId1, opts.animation) : $.__views.section.setItems(__alloyId1);
-    }
-    function doClick(e) {
-        0 === e.sectionIndex && 0 === e.itemIndex && info.add({
-            title: 0 === ctr++ ? TEXT : "Row #" + ctr
-        });
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.section = Ti.UI.createListSection({
-        id: "section"
-    });
-    var __alloyId5 = Alloy.Collections["info"] || info;
-    __alloyId5.on("fetch destroy change add remove reset", loadData);
-    var __alloyId6 = [];
-    __alloyId6.push($.__views.section);
-    $.__views.__alloyId0 = Ti.UI.createListView({
-        sections: __alloyId6,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    doClick ? $.__views.__alloyId0.addEventListener("itemclick", doClick) : __defers["$.__views.__alloyId0!itemclick!doClick"] = true;
-    exports.destroy = function() {
-        __alloyId5.off("fetch destroy change add remove reset", loadData);
-    };
-    _.extend($, $.__views);
-    var TEXT = "Click me to add more items";
-    var info = Alloy.Collections.info;
-    var ctr = 0;
-    $.section.items = [ {
-        properties: {
-            title: TEXT
-        }
-    } ];
-    $.index.open();
-    __defers["$.__views.__alloyId0!itemclick!doClick"] && $.__views.__alloyId0.addEventListener("itemclick", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-648/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-648/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index a40439e96..000000000
--- a/test/apps/testing/ALOY-648/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,82 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function loadData(e) {
-        if (e && e.fromAdapter) return;
-        var opts = loadData.opts || {};
-        var models = __alloyId5.models;
-        var len = models.length;
-        var __alloyId1 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId2 = models[i];
-            __alloyId2.__transform = _.isFunction(__alloyId2.transform) ? __alloyId2.transform() : __alloyId2.toJSON();
-            var __alloyId4 = {
-                properties: {
-                    title: __alloyId2.__transform.title
-                }
-            };
-            __alloyId1.push(__alloyId4);
-        }
-        opts.animation ? $.__views.section.setItems(__alloyId1, opts.animation) : $.__views.section.setItems(__alloyId1);
-    }
-    function doClick(e) {
-        0 === e.sectionIndex && 0 === e.itemIndex && info.add({
-            title: 0 === ctr++ ? TEXT : "Row #" + ctr
-        });
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.section = Ti.UI.createListSection({
-        id: "section"
-    });
-    var __alloyId5 = Alloy.Collections["info"] || info;
-    __alloyId5.on("fetch destroy change add remove reset", loadData);
-    var __alloyId6 = [];
-    __alloyId6.push($.__views.section);
-    $.__views.__alloyId0 = Ti.UI.createListView({
-        sections: __alloyId6,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    doClick ? $.addListener($.__views.__alloyId0, "itemclick", doClick) : __defers["$.__views.__alloyId0!itemclick!doClick"] = true;
-    exports.destroy = function() {
-        __alloyId5 && __alloyId5.off("fetch destroy change add remove reset", loadData);
-    };
-    _.extend($, $.__views);
-    var TEXT = "Click me to add more items";
-    var info = Alloy.Collections.info;
-    var ctr = 0;
-    $.section.items = [ {
-        properties: {
-            title: TEXT
-        }
-    } ];
-    $.index.open();
-    __defers["$.__views.__alloyId0!itemclick!doClick"] && $.addListener($.__views.__alloyId0, "itemclick", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-656/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-656/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 8857d26e9..000000000
--- a/test/apps/testing/ALOY-656/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        font: {
-            fontSize: 12
-        },
-        text: "Hello, World",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    doClick ? $.__views.label.addEventListener("click", doClick) : __defers["$.__views.label!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var win2 = Alloy.createController("win2").getView();
-    win2.open();
-    __defers["$.__views.label!click!doClick"] && $.__views.label.addEventListener("click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-656/_generated/blackberry/alloy/controllers/win2.js b/test/apps/testing/ALOY-656/_generated/blackberry/alloy/controllers/win2.js
deleted file mode 100644
index 53509edaa..000000000
--- a/test/apps/testing/ALOY-656/_generated/blackberry/alloy/controllers/win2.js
+++ /dev/null
@@ -1,46 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "win2";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.win2 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "win2"
-    });
-    $.__views.win2 && $.addTopLevelView($.__views.win2);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "I'm in window 2",
-        id: "__alloyId0"
-    });
-    $.__views.win2.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-656/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-656/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 814fddc53..000000000
--- a/test/apps/testing/ALOY-656/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,49 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        font: {
-            fontSize: 12
-        },
-        text: "Hello, World",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    doClick ? $.addListener($.__views.label, "click", doClick) : __defers["$.__views.label!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var win2 = Alloy.createController("win2").getView();
-    win2.open();
-    __defers["$.__views.label!click!doClick"] && $.addListener($.__views.label, "click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-656/_generated/mobileweb/alloy/controllers/win2.js b/test/apps/testing/ALOY-656/_generated/mobileweb/alloy/controllers/win2.js
deleted file mode 100644
index 6f669c6ae..000000000
--- a/test/apps/testing/ALOY-656/_generated/mobileweb/alloy/controllers/win2.js
+++ /dev/null
@@ -1,40 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "win2";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.win2 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "win2"
-    });
-    $.__views.win2 && $.addTopLevelView($.__views.win2);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "I'm in window 2",
-        id: "__alloyId0"
-    });
-    $.__views.win2.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-657/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-657/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 85d401907..000000000
--- a/test/apps/testing/ALOY-657/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,76 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId2 = [];
-    $.__views.__alloyId3 = Ti.UI.createButton({
-        systemButton: Ti.UI.iOS.SystemButton.FIXED_SPACE
-    });
-    __alloyId2.push($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createButton({
-        systemButton: Titanium.UI.iOS.SystemButton.EDIT,
-        id: "__alloyId4"
-    });
-    __alloyId2.push($.__views.__alloyId4);
-    $.__views.__alloyId5 = Ti.UI.createButton({
-        systemButton: Ti.UI.iOS.SystemButton.FIXED_SPACE
-    });
-    __alloyId2.push($.__views.__alloyId5);
-    $.__views.__alloyId6 = Ti.UI.createButton({
-        systemButton: Titanium.UI.iOS.SystemButton.ADD,
-        id: "__alloyId6"
-    });
-    __alloyId2.push($.__views.__alloyId6);
-    $.__views.__alloyId7 = Ti.UI.createButton({
-        systemButton: Ti.UI.iOS.SystemButton.FIXED_SPACE,
-        width: "100"
-    });
-    __alloyId2.push($.__views.__alloyId7);
-    $.__views.__alloyId8 = Ti.UI.createButton({
-        systemButton: Titanium.UI.iOS.SystemButton.DONE,
-        id: "__alloyId8"
-    });
-    __alloyId2.push($.__views.__alloyId8);
-    $.__views.__alloyId0 = Ti.UI.iOS.createToolbar({
-        items: __alloyId2,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-657/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-657/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 808e14960..000000000
--- a/test/apps/testing/ALOY-657/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,70 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId2 = [];
-    $.__views.__alloyId3 = Ti.UI.createButton({
-        systemButton: Ti.UI.iOS.SystemButton.FIXED_SPACE
-    });
-    __alloyId2.push($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createButton({
-        systemButton: Titanium.UI.iPhone.SystemButton.EDIT,
-        id: "__alloyId4"
-    });
-    __alloyId2.push($.__views.__alloyId4);
-    $.__views.__alloyId5 = Ti.UI.createButton({
-        systemButton: Ti.UI.iOS.SystemButton.FIXED_SPACE
-    });
-    __alloyId2.push($.__views.__alloyId5);
-    $.__views.__alloyId6 = Ti.UI.createButton({
-        systemButton: Titanium.UI.iPhone.SystemButton.ADD,
-        id: "__alloyId6"
-    });
-    __alloyId2.push($.__views.__alloyId6);
-    $.__views.__alloyId7 = Ti.UI.createButton({
-        systemButton: Ti.UI.iOS.SystemButton.FIXED_SPACE,
-        width: "100"
-    });
-    __alloyId2.push($.__views.__alloyId7);
-    $.__views.__alloyId8 = Ti.UI.createButton({
-        systemButton: Titanium.UI.iPhone.SystemButton.DONE,
-        id: "__alloyId8"
-    });
-    __alloyId2.push($.__views.__alloyId8);
-    $.__views.__alloyId0 = Ti.UI.iOS.createToolbar({
-        items: __alloyId2,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
diff --git a/test/apps/testing/ALOY-659/_generated/blackberry/alloy/controllers/blackerry/index.js b/test/apps/testing/ALOY-659/_generated/blackberry/alloy/controllers/blackerry/index.js
deleted file mode 100644
index 505d5c54a..000000000
--- a/test/apps/testing/ALOY-659/_generated/blackberry/alloy/controllers/blackerry/index.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "blackerry/index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    alert("blackberry");
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-659/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-659/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 8828797d9..000000000
--- a/test/apps/testing/ALOY-659/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-659/_generated/mobileweb/alloy/controllers/blackerry/index.js b/test/apps/testing/ALOY-659/_generated/mobileweb/alloy/controllers/blackerry/index.js
deleted file mode 100644
index 4167da537..000000000
--- a/test/apps/testing/ALOY-659/_generated/mobileweb/alloy/controllers/blackerry/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "blackerry/index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    alert("blackberry");
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-659/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-659/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index ab0de982f..000000000
--- a/test/apps/testing/ALOY-659/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,37 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    alert("mobileweb");
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-659/controllers/mobileweb/index.js b/test/apps/testing/ALOY-659/controllers/mobileweb/index.js
deleted file mode 100644
index bdc6fd7bc..000000000
--- a/test/apps/testing/ALOY-659/controllers/mobileweb/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-$.index.open();
-
-alert('mobileweb');
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-665/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-665/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 423cfc695..000000000
--- a/test/apps/testing/ALOY-665/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,83 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doSwipe(e) {
-        Ti.API.info("swipe: " + e.direction);
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#efefef",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    try {
-        $.__views.index.addEventListener("touchstart", touch.start);
-    } catch (e) {
-        __defers["$.__views.index!touchstart!touch.start"] = true;
-    }
-    try {
-        $.__views.index.addEventListener("touchend", touch["end"].func);
-    } catch (e) {
-        __defers["$.__views.index!touchend!touch['end'].func"] = true;
-    }
-    doSwipe ? $.__views.index.addEventListener("swipe", doSwipe) : __defers["$.__views.index!swipe!doSwipe"] = true;
-    $.__views.label = Ti.UI.createLabel({
-        touchEnabled: false,
-        color: "#000",
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        text: "touch and swipe",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var touch = {
-        start: function() {
-            Ti.API.info("touchstart");
-        },
-        end: {
-            func: function() {
-                Ti.API.info("touchend");
-            }
-        }
-    };
-    $.index.open();
-    __defers["$.__views.index!touchstart!touch.start"] && $.__views.index.addEventListener("touchstart", touch.start);
-    __defers["$.__views.index!touchend!touch['end'].func"] && $.__views.index.addEventListener("touchend", touch["end"].func);
-    __defers["$.__views.index!swipe!doSwipe"] && $.__views.index.addEventListener("swipe", doSwipe);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-665/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-665/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 417989f41..000000000
--- a/test/apps/testing/ALOY-665/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,77 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doSwipe(e) {
-        Ti.API.info("swipe: " + e.direction);
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#efefef",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    try {
-        $.addListener($.__views.index, "touchstart", touch.start);
-    } catch (e) {
-        __defers["$.__views.index!touchstart!touch.start"] = true;
-    }
-    try {
-        $.addListener($.__views.index, "touchend", touch["end"].func);
-    } catch (e) {
-        __defers["$.__views.index!touchend!touch['end'].func"] = true;
-    }
-    doSwipe ? $.addListener($.__views.index, "swipe", doSwipe) : __defers["$.__views.index!swipe!doSwipe"] = true;
-    $.__views.label = Ti.UI.createLabel({
-        touchEnabled: false,
-        color: "#000",
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        text: "touch and swipe",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var touch = {
-        start: function(e) {
-            Ti.API.info("touchstart");
-        },
-        end: {
-            func: function(e) {
-                Ti.API.info("touchend");
-            }
-        }
-    };
-    $.index.open();
-    __defers["$.__views.index!touchstart!touch.start"] && $.addListener($.__views.index, "touchstart", touch.start);
-    __defers["$.__views.index!touchend!touch['end'].func"] && $.addListener($.__views.index, "touchend", touch["end"].func);
-    __defers["$.__views.index!swipe!doSwipe"] && $.addListener($.__views.index, "swipe", doSwipe);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-667/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-667/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index dd8e71263..000000000
--- a/test/apps/testing/ALOY-667/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    exports.showContacts = function(e) {
-        Ti.API.info("showContacts: " + e.source.title);
-    };
-    $.welcomeNav.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-667/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-667/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 6d0455e77..000000000
--- a/test/apps/testing/ALOY-667/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,32 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    exports.showContacts = function(e) {
-        Ti.API.info("showContacts: " + e.source.title);
-    };
-    $.welcomeNav.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-676/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-676/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 091fdfe4a..000000000
--- a/test/apps/testing/ALOY-676/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,60 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#eee",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createScrollView({
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.constantsLabel = Ti.UI.createLabel({
-        color: "#222",
-        font: {
-            fontSize: "14dp",
-            fontWeight: "normal"
-        },
-        top: "15dp",
-        height: Ti.UI.SIZE,
-        width: "90%",
-        id: "constantsLabel"
-    });
-    $.__views.__alloyId0.add($.__views.constantsLabel);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var constants = require("alloy/constants");
-    $.constantsLabel.text = JSON.stringify(constants.IMPLICIT_NAMESPACES, null, "	");
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-676/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-676/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index e00118dad..000000000
--- a/test/apps/testing/ALOY-676/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#eee",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createScrollView({
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.constantsLabel = Ti.UI.createLabel({
-        color: "#222",
-        font: {
-            fontSize: "14dp",
-            fontWeight: "normal"
-        },
-        top: "15dp",
-        height: Ti.UI.SIZE,
-        width: "90%",
-        id: "constantsLabel"
-    });
-    $.__views.__alloyId0.add($.__views.constantsLabel);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var constants = require("alloy/constants");
-    $.constantsLabel.text = JSON.stringify(constants.IMPLICIT_NAMESPACES, null, "	");
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-677/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-677/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 0f4f09400..000000000
--- a/test/apps/testing/ALOY-677/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,67 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "'Hello foo & bar\"",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createButton({
-        title: "'Hello foo & bar\"",
-        bottom: "50",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    var __alloyId3 = [];
-    __alloyId3.push("option &1");
-    __alloyId3.push("option 2");
-    __alloyId3.push("cancel &");
-    __alloyId3.push("destructive");
-    $.__views.options = Ti.UI.createOptionDialog({
-        options: __alloyId3,
-        id: "options",
-        title: "App Options",
-        destructive: "3",
-        cancel: "2"
-    });
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    $.options.show();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-677/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-677/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 580eeaff8..000000000
--- a/test/apps/testing/ALOY-677/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "'Hello foo & bar\"",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createButton({
-        title: "'Hello foo & bar\"",
-        bottom: 50,
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    var __alloyId3 = [];
-    __alloyId3.push("option &1");
-    __alloyId3.push("option 2");
-    __alloyId3.push("cancel &");
-    __alloyId3.push("destructive");
-    $.__views.options = Ti.UI.createOptionDialog({
-        options: __alloyId3,
-        id: "options",
-        title: "App Options",
-        destructive: 3,
-        cancel: 2
-    });
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    $.options.show();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-678/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-678/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index a81fe02bb..000000000
--- a/test/apps/testing/ALOY-678/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,203 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId1 = {};
-    var __alloyId4 = [];
-    var __alloyId6 = {
-        type: "Ti.UI.View",
-        childTemplates: function() {
-            var __alloyId7 = [];
-            var __alloyId9 = {
-                type: "Ti.UI.ImageView",
-                bindId: "image",
-                properties: {
-                    bindId: "image",
-                    width: "60",
-                    left: "10"
-                }
-            };
-            __alloyId7.push(__alloyId9);
-            var __alloyId11 = {
-                type: "Ti.UI.View",
-                childTemplates: function() {
-                    var __alloyId12 = [];
-                    var __alloyId14 = {
-                        type: "Ti.UI.Label",
-                        bindId: "label",
-                        properties: {
-                            width: Ti.UI.SIZE,
-                            height: Ti.UI.SIZE,
-                            color: "#000",
-                            bindId: "label"
-                        }
-                    };
-                    __alloyId12.push(__alloyId14);
-                    return __alloyId12;
-                }(),
-                properties: {
-                    backgroundColor: "#a00",
-                    height: "50",
-                    width: "130"
-                }
-            };
-            __alloyId7.push(__alloyId11);
-            var __alloyId16 = {
-                type: "Ti.UI.View",
-                childTemplates: function() {
-                    var __alloyId17 = [];
-                    var __alloyId19 = {
-                        type: "Ti.UI.View",
-                        childTemplates: function() {
-                            var __alloyId20 = [];
-                            var __alloyId22 = {
-                                type: "Ti.UI.Button",
-                                bindId: "button",
-                                properties: {
-                                    bindId: "button",
-                                    height: "40",
-                                    width: "50"
-                                }
-                            };
-                            __alloyId20.push(__alloyId22);
-                            return __alloyId20;
-                        }(),
-                        properties: {
-                            backgroundColor: "#0f0",
-                            height: "50",
-                            width: "60"
-                        }
-                    };
-                    __alloyId17.push(__alloyId19);
-                    return __alloyId17;
-                }(),
-                properties: {
-                    backgroundColor: "#00f",
-                    height: "60",
-                    width: "80",
-                    right: "10"
-                }
-            };
-            __alloyId7.push(__alloyId16);
-            return __alloyId7;
-        }(),
-        properties: {
-            backgroundColor: "#aa0"
-        }
-    };
-    __alloyId4.push(__alloyId6);
-    var __alloyId3 = {
-        properties: {
-            name: "template1",
-            height: "70"
-        },
-        childTemplates: __alloyId4
-    };
-    __alloyId1["template1"] = __alloyId3;
-    var __alloyId24 = [];
-    $.__views.__alloyId25 = {
-        image: {
-            image: "/appc.png"
-        },
-        label: {
-            text: "ugly rows"
-        },
-        button: {
-            title: "Hi"
-        },
-        properties: {
-            id: "__alloyId25"
-        }
-    };
-    __alloyId24.push($.__views.__alloyId25);
-    $.__views.__alloyId26 = {
-        image: {
-            image: "/appc.png"
-        },
-        label: {
-            text: "nested views"
-        },
-        button: {
-            title: "there"
-        },
-        properties: {
-            id: "__alloyId26"
-        }
-    };
-    __alloyId24.push($.__views.__alloyId26);
-    $.__views.__alloyId27 = {
-        image: {
-            image: "/appc.png"
-        },
-        label: {
-            text: '"colorful"'
-        },
-        button: {
-            title: "!"
-        },
-        properties: {
-            id: "__alloyId27"
-        }
-    };
-    __alloyId24.push($.__views.__alloyId27);
-    $.__views.section = Ti.UI.createListSection({
-        id: "section"
-    });
-    $.__views.section.items = __alloyId24;
-    var __alloyId28 = [];
-    __alloyId28.push($.__views.section);
-    $.__views.__alloyId0 = Ti.UI.createListView({
-        sections: __alloyId28,
-        templates: __alloyId1,
-        defaultItemTemplate: "template1",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var items = [];
-    for (var i = 0; 10 > i; i++) items.push({
-        image: {
-            image: "/appc.png"
-        },
-        label: {
-            text: "auto-row #" + (i + 1)
-        },
-        button: {
-            title: i + 1
-        }
-    });
-    $.section.items = $.section.items.concat(items);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-678/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-678/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 88fbc5c00..000000000
--- a/test/apps/testing/ALOY-678/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,197 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId1 = {};
-    var __alloyId4 = [];
-    var __alloyId6 = {
-        type: "Ti.UI.View",
-        childTemplates: function() {
-            var __alloyId7 = [];
-            var __alloyId9 = {
-                type: "Ti.UI.ImageView",
-                bindId: "image",
-                properties: {
-                    bindId: "image",
-                    width: 60,
-                    left: 10
-                }
-            };
-            __alloyId7.push(__alloyId9);
-            var __alloyId11 = {
-                type: "Ti.UI.View",
-                childTemplates: function() {
-                    var __alloyId12 = [];
-                    var __alloyId14 = {
-                        type: "Ti.UI.Label",
-                        bindId: "label",
-                        properties: {
-                            width: Ti.UI.SIZE,
-                            height: Ti.UI.SIZE,
-                            color: "#000",
-                            bindId: "label"
-                        }
-                    };
-                    __alloyId12.push(__alloyId14);
-                    return __alloyId12;
-                }(),
-                properties: {
-                    backgroundColor: "#a00",
-                    height: 50,
-                    width: 130
-                }
-            };
-            __alloyId7.push(__alloyId11);
-            var __alloyId16 = {
-                type: "Ti.UI.View",
-                childTemplates: function() {
-                    var __alloyId17 = [];
-                    var __alloyId19 = {
-                        type: "Ti.UI.View",
-                        childTemplates: function() {
-                            var __alloyId20 = [];
-                            var __alloyId22 = {
-                                type: "Ti.UI.Button",
-                                bindId: "button",
-                                properties: {
-                                    bindId: "button",
-                                    height: 40,
-                                    width: 50
-                                }
-                            };
-                            __alloyId20.push(__alloyId22);
-                            return __alloyId20;
-                        }(),
-                        properties: {
-                            backgroundColor: "#0f0",
-                            height: 50,
-                            width: 60
-                        }
-                    };
-                    __alloyId17.push(__alloyId19);
-                    return __alloyId17;
-                }(),
-                properties: {
-                    backgroundColor: "#00f",
-                    height: 60,
-                    width: 80,
-                    right: 10
-                }
-            };
-            __alloyId7.push(__alloyId16);
-            return __alloyId7;
-        }(),
-        properties: {
-            backgroundColor: "#aa0"
-        }
-    };
-    __alloyId4.push(__alloyId6);
-    var __alloyId3 = {
-        properties: {
-            name: "template1",
-            height: 70
-        },
-        childTemplates: __alloyId4
-    };
-    __alloyId1["template1"] = __alloyId3;
-    var __alloyId24 = [];
-    $.__views.__alloyId25 = {
-        image: {
-            image: "/appc.png"
-        },
-        label: {
-            text: "ugly rows"
-        },
-        button: {
-            title: "Hi"
-        },
-        properties: {
-            id: "__alloyId25"
-        }
-    };
-    __alloyId24.push($.__views.__alloyId25);
-    $.__views.__alloyId26 = {
-        image: {
-            image: "/appc.png"
-        },
-        label: {
-            text: "nested views"
-        },
-        button: {
-            title: "there"
-        },
-        properties: {
-            id: "__alloyId26"
-        }
-    };
-    __alloyId24.push($.__views.__alloyId26);
-    $.__views.__alloyId27 = {
-        image: {
-            image: "/appc.png"
-        },
-        label: {
-            text: '"colorful"'
-        },
-        button: {
-            title: "!"
-        },
-        properties: {
-            id: "__alloyId27"
-        }
-    };
-    __alloyId24.push($.__views.__alloyId27);
-    $.__views.section = Ti.UI.createListSection({
-        id: "section"
-    });
-    $.__views.section.items = __alloyId24;
-    var __alloyId28 = [];
-    __alloyId28.push($.__views.section);
-    $.__views.__alloyId0 = Ti.UI.createListView({
-        sections: __alloyId28,
-        templates: __alloyId1,
-        defaultItemTemplate: "template1",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var items = [];
-    for (var i = 0; 10 > i; i++) items.push({
-        image: {
-            image: "/appc.png"
-        },
-        label: {
-            text: "auto-row #" + (i + 1)
-        },
-        button: {
-            title: i + 1
-        }
-    });
-    $.section.items = $.section.items.concat(items);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-680/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-680/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 0e95658eb..000000000
--- a/test/apps/testing/ALOY-680/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.build = Ti.UI.createLabel({
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        color: "#27ae60",
-        id: "build"
-    });
-    $.__views.index.add($.__views.build);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var deployType, dist;
-    deployType = "development";
-    $.build.text = deployType + (dist ? ":" + dist : "");
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-680/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-680/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index a5b197b8e..000000000
--- a/test/apps/testing/ALOY-680/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.build = Ti.UI.createLabel({
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        color: "#27ae60",
-        id: "build"
-    });
-    $.__views.index.add($.__views.build);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var deployType, dist;
-    deployType = "development";
-    $.build.text = deployType + (dist ? ":" + dist : "");
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-682/_generated/blackberry/alloy/controllers/another.js b/test/apps/testing/ALOY-682/_generated/blackberry/alloy/controllers/another.js
deleted file mode 100644
index 10cd3a8f5..000000000
--- a/test/apps/testing/ALOY-682/_generated/blackberry/alloy/controllers/another.js
+++ /dev/null
@@ -1,50 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "another";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.another = Ti.UI.createWindow({
-        id: "another"
-    });
-    $.__views.another && $.addTopLevelView($.__views.another);
-    $.__views.__alloyId0 = Ti.UI.createView({
-        id: "__alloyId0"
-    });
-    $.__views.another.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createView({
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId0.add($.__views.__alloyId1);
-    $.__views.another = Ti.UI.createView({
-        id: "another"
-    });
-    $.__views.__alloyId1.add($.__views.another);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-682/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-682/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index d827545fa..000000000
--- a/test/apps/testing/ALOY-682/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.win = Ti.UI.createWindow({
-        id: "win",
-        backgroundColor: "#fff"
-    });
-    $.__views.win && $.addTopLevelView($.__views.win);
-    $.__views.index = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "My ID will cause a compile warning",
-        id: "index"
-    });
-    $.__views.win.add($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.win.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-682/_generated/mobileweb/alloy/controllers/another.js b/test/apps/testing/ALOY-682/_generated/mobileweb/alloy/controllers/another.js
deleted file mode 100644
index 9f903cc19..000000000
--- a/test/apps/testing/ALOY-682/_generated/mobileweb/alloy/controllers/another.js
+++ /dev/null
@@ -1,44 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "another";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.another = Ti.UI.createWindow({
-        id: "another"
-    });
-    $.__views.another && $.addTopLevelView($.__views.another);
-    $.__views.__alloyId0 = Ti.UI.createView({
-        id: "__alloyId0"
-    });
-    $.__views.another.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createView({
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId0.add($.__views.__alloyId1);
-    $.__views.another = Ti.UI.createView({
-        id: "another"
-    });
-    $.__views.__alloyId1.add($.__views.another);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-682/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-682/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 3fdcc6fa3..000000000
--- a/test/apps/testing/ALOY-682/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.win = Ti.UI.createWindow({
-        id: "win",
-        backgroundColor: "#fff"
-    });
-    $.__views.win && $.addTopLevelView($.__views.win);
-    $.__views.index = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "My ID will cause a compile warning",
-        id: "index"
-    });
-    $.__views.win.add($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.win.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-684/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-684/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 4ac95f66a..000000000
--- a/test/apps/testing/ALOY-684/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,76 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function addNewLabel() {
-        var index = ctr % classes.length;
-        var label = Alloy.UI.create("index", "Label", {
-            classes: classes[index],
-            id: "newLabel" + (ctr + 1),
-            text: "this is label #" + (ctr + 1),
-            touchEnabled: false
-        });
-        $.index.add(label);
-        ctr++;
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    addNewLabel ? $.__views.index.addEventListener("click", addNewLabel) : __defers["$.__views.index!click!addNewLabel"] = true;
-    $.__views.staticLabel = Ti.UI.createLabel({
-        color: "#a00",
-        font: {
-            fontSize: "32dp",
-            fontWeight: "bold"
-        },
-        textAlign: "center",
-        top: "15dp",
-        shadowColor: "#aaa",
-        shadowOffset: {
-            x: 2,
-            y: 2
-        },
-        text: "static text",
-        id: "staticLabel"
-    });
-    $.__views.index.add($.__views.staticLabel);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var ctr = 0;
-    var classes = [ [], [ "big" ], [ "blue" ], "shadow", [ "shadow" ], [ "shadow", "big" ], [ "big", "shadow" ], [ "big", "blue", "shadow" ], "big blue shadow" ];
-    $.index.open();
-    __defers["$.__views.index!click!addNewLabel"] && $.__views.index.addEventListener("click", addNewLabel);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-684/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-684/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 1edccb6a2..000000000
--- a/test/apps/testing/ALOY-684/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,70 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function addNewLabel(e) {
-        var index = ctr % classes.length;
-        var label = Alloy.UI.create("index", "Label", {
-            classes: classes[index],
-            id: "newLabel" + (ctr + 1),
-            text: "this is label #" + (ctr + 1),
-            touchEnabled: false
-        });
-        $.index.add(label);
-        ctr++;
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    addNewLabel ? $.addListener($.__views.index, "click", addNewLabel) : __defers["$.__views.index!click!addNewLabel"] = true;
-    $.__views.staticLabel = Ti.UI.createLabel({
-        color: "#a00",
-        font: {
-            fontSize: "32dp",
-            fontWeight: "bold"
-        },
-        textAlign: "center",
-        top: "15dp",
-        shadowColor: "#aaa",
-        shadowOffset: {
-            x: 2,
-            y: 2
-        },
-        text: "static text",
-        id: "staticLabel"
-    });
-    $.__views.index.add($.__views.staticLabel);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var ctr = 0;
-    var classes = [ [], [ "big" ], [ "blue" ], "shadow", [ "shadow" ], [ "shadow", "big" ], [ "big", "shadow" ], [ "big", "blue", "shadow" ], "big blue shadow" ];
-    $.index.open();
-    __defers["$.__views.index!click!addNewLabel"] && $.addListener($.__views.index, "click", addNewLabel);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-685/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-685/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index c4e156b24..000000000
--- a/test/apps/testing/ALOY-685/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,77 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#eee",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        color: "#222",
-        font: {
-            fontSize: "28dp",
-            fontWeight: "bold"
-        },
-        textAlign: "center",
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        top: "15dp",
-        text: "static label",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    var labels = [];
-    for (var i = 0; 4 > i; i++) {
-        var theStyle = Alloy.createStyle("index", {
-            apiName: "Label",
-            classes: [ "blue", "shadow" ],
-            id: "label" + (i + 1),
-            textAlign: "left",
-            text: "I'm ugly, but styled dynamically!"
-        });
-        var label = Ti.UI.createLabel(theStyle);
-        labels.push(label);
-        $.index.add(label);
-    }
-    try {
-        require("specs/index")($, {
-            labels: labels
-        });
-    } catch (e) {
-        Ti.API.warn('No unit tests for controller "index"');
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-685/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-685/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 9953dd0e8..000000000
--- a/test/apps/testing/ALOY-685/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,71 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#eee",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        color: "#222",
-        font: {
-            fontSize: "28dp",
-            fontWeight: "bold"
-        },
-        textAlign: "center",
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        top: "15dp",
-        text: "static label",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    var labels = [];
-    for (var i = 0; 4 > i; i++) {
-        var theStyle = Alloy.createStyle("index", {
-            apiName: "Label",
-            classes: [ "blue", "shadow" ],
-            id: "label" + (i + 1),
-            textAlign: "left",
-            text: "I'm ugly, but styled dynamically!"
-        });
-        var label = Ti.UI.createLabel(theStyle);
-        labels.push(label);
-        $.index.add(label);
-    }
-    try {
-        require("specs/index")($, {
-            labels: labels
-        });
-    } catch (e) {
-        Ti.API.warn('No unit tests for controller "index"');
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-685/specs/index.js b/test/apps/testing/ALOY-685/specs/index.js
index ca55211fa..483367d89 100644
--- a/test/apps/testing/ALOY-685/specs/index.js
+++ b/test/apps/testing/ALOY-685/specs/index.js
@@ -23,7 +23,7 @@ module.exports = function($, opts) {
 			style: {
 				color: color,
 				font: {
-					fontSize: OS_MOBILEWEB ? '28px' : '28dp',
+					fontSize: '28dp',
 					fontWeight: 'bold'
 				},
 				textAlign: 'center',
@@ -42,17 +42,17 @@ module.exports = function($, opts) {
 			var font = (function() {
 				if (i === 0) {
 					return {
-						fontSize: OS_MOBILEWEB ? '14px' : 14,
+						fontSize: 14,
 						fontWeight: 'normal'
 					};
 				} else if (i === 3) {
 					return {
-						fontSize: OS_MOBILEWEB ? '48px' : '48dp',
+						fontSize: '48dp',
 						fontWeight: 'normal'
 					};
 				} else {
 					return {
-						fontSize: OS_MOBILEWEB ? '28px' : '28dp',
+						fontSize: '28dp',
 						fontWeight: 'bold'
 					};
 				}
diff --git a/test/apps/testing/ALOY-687/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-687/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index e06dd1d1d..000000000
--- a/test/apps/testing/ALOY-687/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        width: "90%",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "normal"
-        },
-        textAlign: "center",
-        color: "#00f",
-        text: 'Check the console output and make sure that only styles relevant to the current build platform are listed in the printed array. Note also that the "platform" key has been removed entirely from the "queries" object in conditional styles.',
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    Ti.API.info(JSON.stringify(require("alloy/styles/index")));
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-687/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-687/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 3b1544b64..000000000
--- a/test/apps/testing/ALOY-687/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,49 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        width: "90%",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "normal"
-        },
-        textAlign: "center",
-        color: "#ff0",
-        text: 'Check the console output and make sure that only styles relevant to the current build platform are listed in the printed array. Note also that the "platform" key has been removed entirely from the "queries" object in conditional styles.',
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    Ti.API.info(JSON.stringify(require("alloy/styles/index")));
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-687/styles/index.tss b/test/apps/testing/ALOY-687/styles/index.tss
index 6d8bfca2a..14ec0373c 100644
--- a/test/apps/testing/ALOY-687/styles/index.tss
+++ b/test/apps/testing/ALOY-687/styles/index.tss
@@ -31,12 +31,4 @@
 
 "#label[platform=ios formFactor=tablet]": {
 	color: '#963'
-}
-
-"#label[platform=blackberry]": {
-	color: '#00f'
-}
-
-"#label[platform=mobileweb]": {
-	color: '#ff0'
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-690/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-690/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index bb6e1018c..000000000
--- a/test/apps/testing/ALOY-690/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,40 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-690/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-690/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 835da412b..000000000
--- a/test/apps/testing/ALOY-690/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,34 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-691/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-691/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index b8ca92cba..000000000
--- a/test/apps/testing/ALOY-691/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,45 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    Alloy.Collections.instance("test");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    render();
-    $.destroy();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-691/_generated/blackberry/alloy/models/Test.js b/test/apps/testing/ALOY-691/_generated/blackberry/alloy/models/Test.js
deleted file mode 100644
index 1dd606c1a..000000000
--- a/test/apps/testing/ALOY-691/_generated/blackberry/alloy/models/Test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    configuration: {
-        columns: {
-            username: "string"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "test"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("test", exports.definition, []);
-
-collection = Alloy.C("test", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-691/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-691/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 71dadbfa2..000000000
--- a/test/apps/testing/ALOY-691/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,63 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function render(e) {
-        if (e && e.fromAdapter) return;
-        render.opts || {};
-        var models = __alloyId7.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId2 = models[i];
-            __alloyId2.__transform = _.isFunction(__alloyId2.transform) ? __alloyId2.transform() : __alloyId2.toJSON();
-            var __alloyId4 = Ti.UI.createTableViewRow({});
-            rows.push(__alloyId4);
-            var __alloyId6 = Ti.UI.createView({});
-            __alloyId4.add(__alloyId6);
-        }
-        $.__views.content.setData(rows);
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    Alloy.Collections.instance("test");
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.content = Ti.UI.createTableView({
-        id: "content"
-    });
-    $.__views.index.add($.__views.content);
-    var __alloyId7 = Alloy.Collections["test"] || test;
-    __alloyId7.on("fetch destroy change add remove reset", render);
-    exports.destroy = function() {
-        __alloyId7 && __alloyId7.off("fetch destroy change add remove reset", render);
-    };
-    _.extend($, $.__views);
-    $.index.open();
-    render();
-    $.destroy();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-691/_generated/mobileweb/alloy/models/Test.js b/test/apps/testing/ALOY-691/_generated/mobileweb/alloy/models/Test.js
deleted file mode 100644
index 17a0a1bc3..000000000
--- a/test/apps/testing/ALOY-691/_generated/mobileweb/alloy/models/Test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    configuration: {
-        columns: {
-            username: "string"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "test"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("test", exports.definition, []);
-
-collection = Alloy.C("test", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-691/views/index.xml b/test/apps/testing/ALOY-691/views/index.xml
index e4fefcab1..2d7c22d22 100644
--- a/test/apps/testing/ALOY-691/views/index.xml
+++ b/test/apps/testing/ALOY-691/views/index.xml
@@ -4,7 +4,7 @@
 		<View id="content" dataCollection="test" dataFunction="render" platform="android">
 			<View></View>
 		</View>
-		<TableView id="content" dataCollection="test" dataFunction="render" platform="ios,mobileweb">
+		<TableView id="content" dataCollection="test" dataFunction="render" platform="ios">
 			<TableViewRow>
 				<View></View>
 			</TableViewRow>
diff --git a/test/apps/testing/ALOY-695/_generated/blackberry/alloy/controllers/foo/bar.js b/test/apps/testing/ALOY-695/_generated/blackberry/alloy/controllers/foo/bar.js
deleted file mode 100644
index 8f49f0caa..000000000
--- a/test/apps/testing/ALOY-695/_generated/blackberry/alloy/controllers/foo/bar.js
+++ /dev/null
@@ -1,56 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function addNewLabel() {
-        var index = ctr % Alloy.Globals.classes.length;
-        var label = $.UI.create("Label", {
-            classes: Alloy.Globals.classes[index],
-            id: "newLabel" + (ctr + 1),
-            text: "this is label #" + (ctr + 1),
-            touchEnabled: false
-        });
-        $.bar.add(label);
-        ctr++;
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "foo/bar";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.bar = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        layout: "vertical",
-        id: "bar"
-    });
-    $.__views.bar && $.addTopLevelView($.__views.bar);
-    addNewLabel ? $.__views.bar.addEventListener("click", addNewLabel) : __defers["$.__views.bar!click!addNewLabel"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var ctr = 0;
-    __defers["$.__views.bar!click!addNewLabel"] && $.__views.bar.addEventListener("click", addNewLabel);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-695/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-695/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 47f382d4e..000000000
--- a/test/apps/testing/ALOY-695/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,80 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function addNewLabel() {
-        var index = ctr % Alloy.Globals.classes.length;
-        var label = $.UI.create("Label", {
-            classes: Alloy.Globals.classes[index],
-            id: "newLabel" + (ctr + 1),
-            text: "this is label #" + (ctr + 1),
-            touchEnabled: false
-        });
-        $.index.add(label);
-        ctr++;
-    }
-    function openFooBar() {
-        Alloy.createController("foo/bar").getView().open();
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    addNewLabel ? $.__views.index.addEventListener("click", addNewLabel) : __defers["$.__views.index!click!addNewLabel"] = true;
-    $.__views.staticLabel = Ti.UI.createLabel({
-        color: "#a00",
-        font: {
-            fontSize: "32dp",
-            fontWeight: "bold"
-        },
-        textAlign: "center",
-        top: "15dp",
-        shadowColor: "#aaa",
-        shadowOffset: {
-            x: 2,
-            y: 2
-        },
-        text: "click me to open another window",
-        id: "staticLabel"
-    });
-    $.__views.index.add($.__views.staticLabel);
-    openFooBar ? $.__views.staticLabel.addEventListener("click", openFooBar) : __defers["$.__views.staticLabel!click!openFooBar"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var ctr = 0;
-    $.index.open();
-    __defers["$.__views.index!click!addNewLabel"] && $.__views.index.addEventListener("click", addNewLabel);
-    __defers["$.__views.staticLabel!click!openFooBar"] && $.__views.staticLabel.addEventListener("click", openFooBar);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-695/_generated/mobileweb/alloy/controllers/foo/bar.js b/test/apps/testing/ALOY-695/_generated/mobileweb/alloy/controllers/foo/bar.js
deleted file mode 100644
index 47c009f68..000000000
--- a/test/apps/testing/ALOY-695/_generated/mobileweb/alloy/controllers/foo/bar.js
+++ /dev/null
@@ -1,50 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function addNewLabel(e) {
-        var index = ctr % Alloy.Globals.classes.length;
-        var label = $.UI.create("Label", {
-            classes: Alloy.Globals.classes[index],
-            id: "newLabel" + (ctr + 1),
-            text: "this is label #" + (ctr + 1),
-            touchEnabled: false
-        });
-        $.bar.add(label);
-        ctr++;
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "foo/bar";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.bar = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        layout: "vertical",
-        id: "bar"
-    });
-    $.__views.bar && $.addTopLevelView($.__views.bar);
-    addNewLabel ? $.addListener($.__views.bar, "click", addNewLabel) : __defers["$.__views.bar!click!addNewLabel"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var ctr = 0;
-    __defers["$.__views.bar!click!addNewLabel"] && $.addListener($.__views.bar, "click", addNewLabel);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-695/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-695/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index c5918dfb4..000000000
--- a/test/apps/testing/ALOY-695/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,74 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function addNewLabel(e) {
-        var index = ctr % Alloy.Globals.classes.length;
-        var label = $.UI.create("Label", {
-            classes: Alloy.Globals.classes[index],
-            id: "newLabel" + (ctr + 1),
-            text: "this is label #" + (ctr + 1),
-            touchEnabled: false
-        });
-        $.index.add(label);
-        ctr++;
-    }
-    function openFooBar(e) {
-        Alloy.createController("foo/bar").getView().open();
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    addNewLabel ? $.addListener($.__views.index, "click", addNewLabel) : __defers["$.__views.index!click!addNewLabel"] = true;
-    $.__views.staticLabel = Ti.UI.createLabel({
-        color: "#a00",
-        font: {
-            fontSize: "32dp",
-            fontWeight: "bold"
-        },
-        textAlign: "center",
-        top: "15dp",
-        shadowColor: "#aaa",
-        shadowOffset: {
-            x: 2,
-            y: 2
-        },
-        text: "click me to open another window",
-        id: "staticLabel"
-    });
-    $.__views.index.add($.__views.staticLabel);
-    openFooBar ? $.addListener($.__views.staticLabel, "click", openFooBar) : __defers["$.__views.staticLabel!click!openFooBar"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var ctr = 0;
-    $.index.open();
-    __defers["$.__views.index!click!addNewLabel"] && $.addListener($.__views.index, "click", addNewLabel);
-    __defers["$.__views.staticLabel!click!openFooBar"] && $.addListener($.__views.staticLabel, "click", openFooBar);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-696/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-696/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index c420992d1..000000000
--- a/test/apps/testing/ALOY-696/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,69 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function addLabels() {
-        $.scroller.add(Ti.UI.createLabel(Alloy.createStyle("index", {
-            apiName: "Ti.UI.Label",
-            text: "Alloy.createStyle() + Ti.UI.createLabel()"
-        })));
-        $.scroller.add(Ti.UI.createLabel($.createStyle({
-            apiName: "Ti.UI.Label",
-            text: "$.createStyle() + Ti.UI.createLabel()"
-        })));
-        $.scroller.add(Alloy.UI.create("index", "Ti.UI.Label", {
-            text: "Alloy.UI.create()"
-        }));
-        $.scroller.add($.UI.create("Ti.UI.Label", {
-            text: "$.UI.create()"
-        }));
-        $.scroller.add(Alloy.createWidget("alloy.testWidget", "labelmaker").createLabels());
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    addLabels ? $.__views.index.addEventListener("click", addLabels) : __defers["$.__views.index!click!addLabels"] = true;
-    $.__views.scroller = Ti.UI.createScrollView({
-        layout: "vertical",
-        height: Ti.UI.FILL,
-        width: Ti.UI.FILL,
-        id: "scroller"
-    });
-    $.__views.index.add($.__views.scroller);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.index!click!addLabels"] && $.__views.index.addEventListener("click", addLabels);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-696/_generated/blackberry/alloy/widgets/alloy.testWidget/controllers/labelmaker.js b/test/apps/testing/ALOY-696/_generated/blackberry/alloy/widgets/alloy.testWidget/controllers/labelmaker.js
deleted file mode 100644
index a86075a0a..000000000
--- a/test/apps/testing/ALOY-696/_generated/blackberry/alloy/widgets/alloy.testWidget/controllers/labelmaker.js
+++ /dev/null
@@ -1,62 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "alloy.testWidget/" + s : s.substring(0, index) + "/alloy.testWidget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("alloy.testWidget");
-    this.__widgetId = "alloy.testWidget";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "labelmaker";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    exports.createLabels = function() {
-        var container = $.UI.create("View", {
-            classes: "container"
-        });
-        container.add(Ti.UI.createLabel(Alloy.createStyle({
-            widgetId: "alloy.testWidget",
-            name: "labelmaker"
-        }, {
-            apiName: "Ti.UI.Label",
-            text: "Alloy.createStyle() + Ti.UI.createLabel()"
-        })));
-        container.add(Ti.UI.createLabel($.createStyle({
-            apiName: "Ti.UI.Label",
-            text: "$.createStyle() + Ti.UI.createLabel()"
-        })));
-        container.add(Alloy.UI.create({
-            widgetId: "alloy.testWidget",
-            name: "labelmaker"
-        }, "Ti.UI.Label", {
-            text: "Alloy.UI.create()"
-        }));
-        container.add($.UI.create("Ti.UI.Label", {
-            text: "$.UI.create()"
-        }));
-        return container;
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-696/_generated/blackberry/alloy/widgets/alloy.testWidget/styles/labelmaker.js b/test/apps/testing/ALOY-696/_generated/blackberry/alloy/widgets/alloy.testWidget/styles/labelmaker.js
deleted file mode 100644
index ed91f226d..000000000
--- a/test/apps/testing/ALOY-696/_generated/blackberry/alloy/widgets/alloy.testWidget/styles/labelmaker.js
+++ /dev/null
@@ -1,31 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "alloy.testWidget/" + s : s.substring(0, index) + "/alloy.testWidget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0003,
-    key: "Label",
-    style: {
-        top: "10dp",
-        color: "#ff0",
-        backgroundColor: "#000",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE
-    }
-}, {
-    isClass: true,
-    priority: 10000.0002,
-    key: "container",
-    style: {
-        height: Ti.UI.SIZE,
-        width: Ti.UI.FILL,
-        layout: "vertical"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-696/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-696/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 9fa3c35d3..000000000
--- a/test/apps/testing/ALOY-696/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,63 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function addLabels(e) {
-        $.scroller.add(Ti.UI.createLabel(Alloy.createStyle("index", {
-            apiName: "Ti.UI.Label",
-            text: "Alloy.createStyle() + Ti.UI.createLabel()"
-        })));
-        $.scroller.add(Ti.UI.createLabel($.createStyle({
-            apiName: "Ti.UI.Label",
-            text: "$.createStyle() + Ti.UI.createLabel()"
-        })));
-        $.scroller.add(Alloy.UI.create("index", "Ti.UI.Label", {
-            text: "Alloy.UI.create()"
-        }));
-        $.scroller.add($.UI.create("Ti.UI.Label", {
-            text: "$.UI.create()"
-        }));
-        $.scroller.add(Alloy.createWidget("alloy.testWidget", "labelmaker").createLabels());
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    addLabels ? $.addListener($.__views.index, "click", addLabels) : __defers["$.__views.index!click!addLabels"] = true;
-    $.__views.scroller = Ti.UI.createScrollView({
-        layout: "vertical",
-        height: Ti.UI.FILL,
-        width: Ti.UI.FILL,
-        id: "scroller"
-    });
-    $.__views.index.add($.__views.scroller);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.index!click!addLabels"] && $.addListener($.__views.index, "click", addLabels);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-696/_generated/mobileweb/alloy/widgets/alloy.testWidget/controllers/labelmaker.js b/test/apps/testing/ALOY-696/_generated/mobileweb/alloy/widgets/alloy.testWidget/controllers/labelmaker.js
deleted file mode 100644
index 9e03a2c89..000000000
--- a/test/apps/testing/ALOY-696/_generated/mobileweb/alloy/widgets/alloy.testWidget/controllers/labelmaker.js
+++ /dev/null
@@ -1,62 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "alloy.testWidget/" + s : s.substring(0, index) + "/alloy.testWidget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("alloy.testWidget");
-    this.__widgetId = "alloy.testWidget";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "labelmaker";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    exports.createLabels = function() {
-        var container = $.UI.create("View", {
-            classes: "container"
-        });
-        container.add(Ti.UI.createLabel(Alloy.createStyle({
-            widgetId: "alloy.testWidget",
-            name: "labelmaker"
-        }, {
-            apiName: "Ti.UI.Label",
-            text: "Alloy.createStyle() + Ti.UI.createLabel()"
-        })));
-        container.add(Ti.UI.createLabel($.createStyle({
-            apiName: "Ti.UI.Label",
-            text: "$.createStyle() + Ti.UI.createLabel()"
-        })));
-        container.add(Alloy.UI.create({
-            widgetId: "alloy.testWidget",
-            name: "labelmaker"
-        }, "Ti.UI.Label", {
-            text: "Alloy.UI.create()"
-        }));
-        container.add($.UI.create("Ti.UI.Label", {
-            text: "$.UI.create()"
-        }));
-        return container;
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-696/_generated/mobileweb/alloy/widgets/alloy.testWidget/styles/labelmaker.js b/test/apps/testing/ALOY-696/_generated/mobileweb/alloy/widgets/alloy.testWidget/styles/labelmaker.js
deleted file mode 100644
index 992847e83..000000000
--- a/test/apps/testing/ALOY-696/_generated/mobileweb/alloy/widgets/alloy.testWidget/styles/labelmaker.js
+++ /dev/null
@@ -1,31 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "alloy.testWidget/" + s : s.substring(0, index) + "/alloy.testWidget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0002,
-    key: "Label",
-    style: {
-        top: "10dp",
-        color: "#ff0",
-        backgroundColor: "#000",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE
-    }
-}, {
-    isClass: true,
-    priority: 10000.0001,
-    key: "container",
-    style: {
-        height: Ti.UI.SIZE,
-        width: Ti.UI.FILL,
-        layout: "vertical"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-696/widgets/alloy.testWidget/widget.json b/test/apps/testing/ALOY-696/widgets/alloy.testWidget/widget.json
index 92e2e4370..b07be2496 100644
--- a/test/apps/testing/ALOY-696/widgets/alloy.testWidget/widget.json
+++ b/test/apps/testing/ALOY-696/widgets/alloy.testWidget/widget.json
@@ -9,5 +9,5 @@
 	"min-alloy-version": "1.2.0",
 	"min-titanium-version":"3.1.0",
 	"tags":"",
-	"platforms":"ios,android,mobileweb"
+	"platforms":"ios,android"
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-706/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-706/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 0caeeea49..000000000
--- a/test/apps/testing/ALOY-706/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,72 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#eee",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        color: "#a00",
-        font: {
-            fontSize: "48dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        shadowColor: "#999",
-        shadowOffset: {
-            x: 3,
-            y: 3
-        },
-        text: "some text",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    $.newLabel = $.UI.create("Ti.UI.Label", {
-        id: "newLabel",
-        classes: "main",
-        bottom: 0,
-        text: "$.UI.create() Label",
-        textAlign: "center"
-    });
-    $.index.add($.newLabel);
-    try {
-        require("specs/index")($);
-    } catch (e) {
-        Ti.API.warn("no unit tests found for index.js");
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-706/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-706/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index ae57412a0..000000000
--- a/test/apps/testing/ALOY-706/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,66 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#eee",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        color: "#a00",
-        font: {
-            fontSize: "48dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        shadowColor: "#999",
-        shadowOffset: {
-            x: 3,
-            y: 3
-        },
-        text: "some text",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    $.newLabel = $.UI.create("Ti.UI.Label", {
-        id: "newLabel",
-        classes: "main",
-        bottom: 0,
-        text: "$.UI.create() Label",
-        textAlign: "center"
-    });
-    $.index.add($.newLabel);
-    try {
-        require("specs/index")($);
-    } catch (e) {
-        Ti.API.warn("no unit tests found for index.js");
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-706/specs/index.js b/test/apps/testing/ALOY-706/specs/index.js
index 0d2b8973a..64151cc6e 100644
--- a/test/apps/testing/ALOY-706/specs/index.js
+++ b/test/apps/testing/ALOY-706/specs/index.js
@@ -23,7 +23,7 @@ module.exports = function($) {
 			style: {
 				color: '#a00',
 				font: {
-					fontSize: OS_MOBILEWEB ? '48px' : '48dp',
+					fontSize: '48dp',
 					fontWeight: 'bold'
 				},
 				height: Ti.UI.SIZE,
@@ -43,7 +43,7 @@ module.exports = function($) {
 			style: {
 				color: '#a00',
 				font: {
-					fontSize: OS_MOBILEWEB ? '48px' : '48dp',
+					fontSize: '48dp',
 					fontWeight: 'bold'
 				},
 				height: Ti.UI.SIZE,
diff --git a/test/apps/testing/ALOY-709/_generated/blackberry/alloy/controllers/buttons.js b/test/apps/testing/ALOY-709/_generated/blackberry/alloy/controllers/buttons.js
deleted file mode 100644
index d030aac43..000000000
--- a/test/apps/testing/ALOY-709/_generated/blackberry/alloy/controllers/buttons.js
+++ /dev/null
@@ -1,58 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "buttons";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.button1 = Ti.UI.createButton({
-        title: "button 1",
-        apiName: "Ti.UI.Button",
-        id: "button1",
-        classes: [ "bob", "lou" ]
-    });
-    $.__views.button1 && $.addTopLevelView($.__views.button1);
-    $.__views.button2 = Ti.UI.createButton({
-        title: "button 2",
-        apiName: "Ti.UI.Button",
-        id: "button2",
-        classes: [ "bob", "lou" ]
-    });
-    $.__views.button2 && $.addTopLevelView($.__views.button2);
-    $.__views.button3 = Ti.UI.createButton({
-        title: "button 3",
-        id: "button3"
-    });
-    $.__views.button3 && $.addTopLevelView($.__views.button3);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    try {
-        require("specs/buttons")($);
-    } catch (e) {
-        Ti.API.warn("no unit tests found for buttons.js");
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-709/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-709/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 26ab62bdf..000000000
--- a/test/apps/testing/ALOY-709/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,83 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#eee",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        apiName: "Ti.UI.Window",
-        id: "index",
-        classes: []
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        color: "#a00",
-        font: {
-            fontSize: "48dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        shadowColor: "#999",
-        shadowOffset: {
-            x: 3,
-            y: 3
-        },
-        text: "some text",
-        apiName: "Ti.UI.Label",
-        id: "label",
-        classes: [ "main", "shadow" ]
-    });
-    $.__views.index.add($.__views.label);
-    $.__views.__alloyId0 = Alloy.createController("labels", {
-        apiName: "Alloy.Require",
-        id: "__alloyId0",
-        classes: [],
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId0.setParent($.__views.index);
-    $.__views.__alloyId1 = Alloy.createController("buttons", {
-        apiName: "Alloy.Require",
-        id: "__alloyId1",
-        classes: [],
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId1.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    try {
-        require("specs/index")($);
-    } catch (e) {
-        Ti.API.warn("no unit tests found for index.js");
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-709/_generated/blackberry/alloy/controllers/labels.js b/test/apps/testing/ALOY-709/_generated/blackberry/alloy/controllers/labels.js
deleted file mode 100644
index bd2c6d146..000000000
--- a/test/apps/testing/ALOY-709/_generated/blackberry/alloy/controllers/labels.js
+++ /dev/null
@@ -1,84 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "labels";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.labels = Ti.UI.createView({
-        apiName: "Ti.UI.View",
-        backgroundColor: "#fcc",
-        height: Ti.UI.SIZE,
-        layout: "vertical",
-        id: "labels",
-        classes: []
-    });
-    $.__views.labels && $.addTopLevelView($.__views.labels);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        color: "#000",
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        top: 15,
-        backgroundColor: "#ccf",
-        text: "label 1",
-        apiName: "Ti.UI.Label",
-        classes: [ "someClass" ],
-        id: "__alloyId2"
-    });
-    $.__views.labels.add($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createLabel({
-        color: "#000",
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        top: 15,
-        backgroundColor: "#ccf",
-        text: "label 2",
-        apiName: "Ti.UI.Label",
-        classes: [ "someClass" ],
-        id: "__alloyId3"
-    });
-    $.__views.labels.add($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        color: "#000",
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        top: 15,
-        backgroundColor: "#ccf",
-        text: "label 3",
-        apiName: "Ti.UI.Label",
-        classes: [ "someClass" ],
-        id: "__alloyId4"
-    });
-    $.__views.labels.add($.__views.__alloyId4);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    try {
-        require("specs/labels")($);
-    } catch (e) {
-        Ti.API.warn("no unit tests found for labels.js");
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-709/_generated/mobileweb/alloy/controllers/buttons.js b/test/apps/testing/ALOY-709/_generated/mobileweb/alloy/controllers/buttons.js
deleted file mode 100644
index c1db14914..000000000
--- a/test/apps/testing/ALOY-709/_generated/mobileweb/alloy/controllers/buttons.js
+++ /dev/null
@@ -1,52 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "buttons";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.button1 = Ti.UI.createButton({
-        title: "button 1",
-        apiName: "Ti.UI.Button",
-        id: "button1",
-        classes: [ "bob", "lou" ]
-    });
-    $.__views.button1 && $.addTopLevelView($.__views.button1);
-    $.__views.button2 = Ti.UI.createButton({
-        title: "button 2",
-        apiName: "Ti.UI.Button",
-        id: "button2",
-        classes: [ "bob", "lou" ]
-    });
-    $.__views.button2 && $.addTopLevelView($.__views.button2);
-    $.__views.button3 = Ti.UI.createButton({
-        title: "button 3",
-        id: "button3"
-    });
-    $.__views.button3 && $.addTopLevelView($.__views.button3);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    try {
-        require("specs/buttons")($);
-    } catch (e) {
-        Ti.API.warn("no unit tests found for buttons.js");
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-709/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-709/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 8aa1168ea..000000000
--- a/test/apps/testing/ALOY-709/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,77 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#eee",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        apiName: "Ti.UI.Window",
-        id: "index",
-        classes: []
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        color: "#a00",
-        font: {
-            fontSize: "48dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        shadowColor: "#999",
-        shadowOffset: {
-            x: 3,
-            y: 3
-        },
-        text: "some text",
-        apiName: "Ti.UI.Label",
-        id: "label",
-        classes: [ "main", "shadow" ]
-    });
-    $.__views.index.add($.__views.label);
-    $.__views.__alloyId0 = Alloy.createController("labels", {
-        apiName: "Alloy.Require",
-        id: "__alloyId0",
-        classes: [],
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId0.setParent($.__views.index);
-    $.__views.__alloyId1 = Alloy.createController("buttons", {
-        apiName: "Alloy.Require",
-        id: "__alloyId1",
-        classes: [],
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId1.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    try {
-        require("specs/index")($);
-    } catch (e) {
-        Ti.API.warn("no unit tests found for index.js");
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-709/_generated/mobileweb/alloy/controllers/labels.js b/test/apps/testing/ALOY-709/_generated/mobileweb/alloy/controllers/labels.js
deleted file mode 100644
index ff804fd79..000000000
--- a/test/apps/testing/ALOY-709/_generated/mobileweb/alloy/controllers/labels.js
+++ /dev/null
@@ -1,78 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "labels";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.labels = Ti.UI.createView({
-        apiName: "Ti.UI.View",
-        backgroundColor: "#fcc",
-        height: Ti.UI.SIZE,
-        layout: "vertical",
-        id: "labels",
-        classes: []
-    });
-    $.__views.labels && $.addTopLevelView($.__views.labels);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        color: "#000",
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        top: 15,
-        backgroundColor: "#ccf",
-        text: "label 1",
-        apiName: "Ti.UI.Label",
-        classes: [ "someClass" ],
-        id: "__alloyId2"
-    });
-    $.__views.labels.add($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createLabel({
-        color: "#000",
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        top: 15,
-        backgroundColor: "#ccf",
-        text: "label 2",
-        apiName: "Ti.UI.Label",
-        classes: [ "someClass" ],
-        id: "__alloyId3"
-    });
-    $.__views.labels.add($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        color: "#000",
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        top: 15,
-        backgroundColor: "#ccf",
-        text: "label 3",
-        apiName: "Ti.UI.Label",
-        classes: [ "someClass" ],
-        id: "__alloyId4"
-    });
-    $.__views.labels.add($.__views.__alloyId4);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    try {
-        require("specs/labels")($);
-    } catch (e) {
-        Ti.API.warn("no unit tests found for labels.js");
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-709/specs/index.js b/test/apps/testing/ALOY-709/specs/index.js
index 8489906a0..5b325d600 100644
--- a/test/apps/testing/ALOY-709/specs/index.js
+++ b/test/apps/testing/ALOY-709/specs/index.js
@@ -24,7 +24,7 @@ module.exports = function($) {
 			style: {
 				color: '#a00',
 				font: {
-					fontSize: OS_MOBILEWEB ? '48px' : '48dp',
+					fontSize: '48dp',
 					fontWeight: 'bold'
 				},
 				height: Ti.UI.SIZE,
diff --git a/test/apps/testing/ALOY-713/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-713/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 04335ace4..000000000
--- a/test/apps/testing/ALOY-713/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,129 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId30(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId30.opts || {};
-        var models = __alloyId29.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId2 = models[i];
-            __alloyId2.__transform = {};
-            var __alloyId4 = Ti.UI.createTableViewRow({
-                height: "200"
-            });
-            rows.push(__alloyId4);
-            var __alloyId6 = Ti.UI.createLabel({
-                width: Ti.UI.SIZE,
-                height: Ti.UI.SIZE,
-                color: "#000",
-                text: "first",
-                align: "left",
-                left: "10"
-            });
-            __alloyId4.add(__alloyId6);
-            var __alloyId9 = [];
-            var __alloyId13 = {
-                title: "TAB1"
-            };
-            __alloyId9.push(__alloyId13);
-            var __alloyId14 = {
-                title: "undefined" != typeof __alloyId2.__transform["fourth"] ? __alloyId2.__transform["fourth"] : __alloyId2.get("fourth")
-            };
-            __alloyId9.push(__alloyId14);
-            var __alloyId15 = {
-                title: "TAB3"
-            };
-            __alloyId9.push(__alloyId15);
-            var __alloyId16 = Ti.UI.iOS.createTabbedBar({
-                labels: __alloyId9,
-                left: "50",
-                top: "10"
-            });
-            __alloyId4.add(__alloyId16);
-            var __alloyId18 = Ti.UI.createTableViewRow({});
-            rows.push(__alloyId18);
-            var __alloyId20 = Ti.UI.createLabel({
-                width: Ti.UI.SIZE,
-                height: Ti.UI.SIZE,
-                color: "#000",
-                text: "second"
-            });
-            __alloyId18.add(__alloyId20);
-            var __alloyId22 = Ti.UI.createTableViewRow({});
-            rows.push(__alloyId22);
-            var __alloyId24 = Ti.UI.createLabel({
-                width: Ti.UI.SIZE,
-                height: Ti.UI.SIZE,
-                color: "#000",
-                text: "third"
-            });
-            __alloyId22.add(__alloyId24);
-            var __alloyId26 = Ti.UI.createTableViewRow({});
-            rows.push(__alloyId26);
-            var __alloyId28 = Ti.UI.createLabel({
-                width: Ti.UI.SIZE,
-                height: Ti.UI.SIZE,
-                color: "#000",
-                text: "fourth"
-            });
-            __alloyId26.add(__alloyId28);
-        }
-        $.__views.__alloyId1.setData(rows);
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        layout: "horizontal",
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createView({
-        backgroundColor: "white",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createTableView({
-        top: "10",
-        separatorColor: "#ffffff",
-        height: "600",
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId0.add($.__views.__alloyId1);
-    var __alloyId29 = Alloy.Collections["feed"] || feed;
-    __alloyId29.on("fetch destroy change add remove reset", __alloyId30);
-    exports.destroy = function() {
-        __alloyId29.off("fetch destroy change add remove reset", __alloyId30);
-    };
-    _.extend($, $.__views);
-    $.index.open();
-    Alloy.Collections.feed.trigger("change");
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-713/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-713/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index d17a62b2c..000000000
--- a/test/apps/testing/ALOY-713/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,123 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId30(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId30.opts || {};
-        var models = __alloyId29.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId2 = models[i];
-            __alloyId2.__transform = _.isFunction(__alloyId2.transform) ? __alloyId2.transform() : __alloyId2.toJSON();
-            var __alloyId4 = Ti.UI.createTableViewRow({
-                height: 200
-            });
-            rows.push(__alloyId4);
-            var __alloyId6 = Ti.UI.createLabel({
-                width: Ti.UI.SIZE,
-                height: Ti.UI.SIZE,
-                color: "#000",
-                text: "first",
-                align: "left",
-                left: 10
-            });
-            __alloyId4.add(__alloyId6);
-            var __alloyId9 = [];
-            var __alloyId13 = {
-                title: "TAB1"
-            };
-            __alloyId9.push(__alloyId13);
-            var __alloyId14 = {
-                title: __alloyId2.__transform.fourth
-            };
-            __alloyId9.push(__alloyId14);
-            var __alloyId15 = {
-                title: "TAB3"
-            };
-            __alloyId9.push(__alloyId15);
-            var __alloyId16 = Ti.UI.iOS.createTabbedBar({
-                labels: __alloyId9,
-                left: 50,
-                top: 10
-            });
-            __alloyId4.add(__alloyId16);
-            var __alloyId18 = Ti.UI.createTableViewRow({});
-            rows.push(__alloyId18);
-            var __alloyId20 = Ti.UI.createLabel({
-                width: Ti.UI.SIZE,
-                height: Ti.UI.SIZE,
-                color: "#000",
-                text: "second"
-            });
-            __alloyId18.add(__alloyId20);
-            var __alloyId22 = Ti.UI.createTableViewRow({});
-            rows.push(__alloyId22);
-            var __alloyId24 = Ti.UI.createLabel({
-                width: Ti.UI.SIZE,
-                height: Ti.UI.SIZE,
-                color: "#000",
-                text: "third"
-            });
-            __alloyId22.add(__alloyId24);
-            var __alloyId26 = Ti.UI.createTableViewRow({});
-            rows.push(__alloyId26);
-            var __alloyId28 = Ti.UI.createLabel({
-                width: Ti.UI.SIZE,
-                height: Ti.UI.SIZE,
-                color: "#000",
-                text: "fourth"
-            });
-            __alloyId26.add(__alloyId28);
-        }
-        $.__views.__alloyId1.setData(rows);
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        layout: "horizontal",
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createView({
-        backgroundColor: "white",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createTableView({
-        top: 10,
-        separatorColor: "#ffffff",
-        height: 600,
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId0.add($.__views.__alloyId1);
-    var __alloyId29 = Alloy.Collections["feed"] || feed;
-    __alloyId29.on("fetch destroy change add remove reset", __alloyId30);
-    exports.destroy = function() {
-        __alloyId29 && __alloyId29.off("fetch destroy change add remove reset", __alloyId30);
-    };
-    _.extend($, $.__views);
-    $.index.open();
-    Alloy.Collections.feed.trigger("change");
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-714/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-714/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index a123344ee..000000000
--- a/test/apps/testing/ALOY-714/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,68 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doLeftClick() {
-        alert("Left button clicked");
-    }
-    function doRightClick() {
-        alert("Right button clicked");
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.__alloyId0 = Ti.UI.createWindow({
-        title: "Proxy Shorthands",
-        id: "__alloyId0"
-    });
-    $.__views.__alloyId2 = Ti.UI.createButton({
-        title: "Left",
-        id: "__alloyId2"
-    });
-    doLeftClick ? $.__views.__alloyId2.addEventListener("click", doLeftClick) : __defers["$.__views.__alloyId2!click!doLeftClick"] = true;
-    $.__views.__alloyId0.leftNavButton = $.__views.__alloyId2;
-    $.__views.__alloyId3 = Ti.UI.createButton({
-        title: "Right",
-        id: "__alloyId3"
-    });
-    $.__views.__alloyId0.rightNavButton = $.__views.__alloyId3;
-    doRightClick ? $.__views.__alloyId3.addEventListener("click", doRightClick) : __defers["$.__views.__alloyId3!click!doRightClick"] = true;
-    $.__views.index = Ti.UI.iOS.createNavigationWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        window: $.__views.__alloyId0,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.__alloyId2!click!doLeftClick"] && $.__views.__alloyId2.addEventListener("click", doLeftClick);
-    __defers["$.__views.__alloyId3!click!doRightClick"] && $.__views.__alloyId3.addEventListener("click", doRightClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-714/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-714/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index b7239dfe4..000000000
--- a/test/apps/testing/ALOY-714/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,62 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doLeftClick() {
-        alert("Left button clicked");
-    }
-    function doRightClick() {
-        alert("Right button clicked");
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.__alloyId0 = Ti.UI.createWindow({
-        title: "Proxy Shorthands",
-        id: "__alloyId0"
-    });
-    $.__views.__alloyId2 = Ti.UI.createButton({
-        title: "Left",
-        id: "__alloyId2"
-    });
-    doLeftClick ? $.addListener($.__views.__alloyId2, "click", doLeftClick) : __defers["$.__views.__alloyId2!click!doLeftClick"] = true;
-    $.__views.__alloyId0.leftNavButton = $.__views.__alloyId2;
-    $.__views.__alloyId3 = Ti.UI.createButton({
-        title: "Right",
-        id: "__alloyId3"
-    });
-    $.__views.__alloyId0.rightNavButton = $.__views.__alloyId3;
-    doRightClick ? $.addListener($.__views.__alloyId3, "click", doRightClick) : __defers["$.__views.__alloyId3!click!doRightClick"] = true;
-    $.__views.index = Ti.UI.iOS.createNavigationWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        window: $.__views.__alloyId0,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.__alloyId2!click!doLeftClick"] && $.addListener($.__views.__alloyId2, "click", doLeftClick);
-    __defers["$.__views.__alloyId3!click!doRightClick"] && $.addListener($.__views.__alloyId3, "click", doRightClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-716/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-716/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 30e4cd5eb..000000000
--- a/test/apps/testing/ALOY-716/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,109 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId11(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId11.opts || {};
-        var models = __alloyId10.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId1 = models[i];
-            __alloyId1.__transform = doUpper(__alloyId1);
-            var __alloyId3 = Ti.UI.createTableViewRow({
-                backgroundColor: "#efefef",
-                height: "60dp"
-            });
-            rows.push(__alloyId3);
-            var __alloyId5 = Ti.UI.createLabel({
-                right: "68dp",
-                textAlign: "left",
-                height: Ti.UI.SIZE,
-                top: "3dp",
-                left: "10dp",
-                color: "#181818",
-                font: {
-                    fontSize: "28dp",
-                    fontWeight: "bold"
-                },
-                text: "undefined" != typeof __alloyId1.__transform["title"] ? __alloyId1.__transform["title"] : __alloyId1.get("title")
-            });
-            __alloyId3.add(__alloyId5);
-            var __alloyId7 = Ti.UI.createLabel({
-                right: "68dp",
-                textAlign: "left",
-                height: Ti.UI.SIZE,
-                bottom: "5dp",
-                left: "15dp",
-                color: "#777",
-                font: {
-                    fontSize: "16dp",
-                    fontWeight: "normal"
-                },
-                text: "undefined" != typeof __alloyId1.__transform["subtitle"] ? __alloyId1.__transform["subtitle"] : __alloyId1.get("subtitle")
-            });
-            __alloyId3.add(__alloyId7);
-            var __alloyId9 = Ti.UI.createImageView({
-                right: "10dp",
-                height: "48dp",
-                width: "48dp",
-                image: "undefined" != typeof __alloyId1.__transform["image"] ? __alloyId1.__transform["image"] : __alloyId1.get("image")
-            });
-            __alloyId3.add(__alloyId9);
-        }
-        $.__views.__alloyId0.setData(rows);
-    }
-    function doUpper(model) {
-        var transform = model.toJSON();
-        transform.title = transform.title.toUpperCase();
-        Ti.API.info(">>> transforming the title");
-        return transform;
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#efefef",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createTableView({
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    var __alloyId10 = Alloy.Collections["collection"] || collection;
-    __alloyId10.on("fetch destroy change add remove reset", __alloyId11);
-    exports.destroy = function() {
-        __alloyId10.off("fetch destroy change add remove reset", __alloyId11);
-    };
-    _.extend($, $.__views);
-    Alloy.Collections.collection.trigger("change");
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-716/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-716/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 8b11e21e6..000000000
--- a/test/apps/testing/ALOY-716/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,103 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId11(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId11.opts || {};
-        var models = __alloyId10.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId1 = models[i];
-            __alloyId1.__transform = doUpper(__alloyId1);
-            var __alloyId3 = Ti.UI.createTableViewRow({
-                backgroundColor: "#efefef",
-                height: "60dp"
-            });
-            rows.push(__alloyId3);
-            var __alloyId5 = Ti.UI.createLabel({
-                right: "68dp",
-                textAlign: "left",
-                height: Ti.UI.SIZE,
-                top: "3dp",
-                left: "10dp",
-                color: "#181818",
-                font: {
-                    fontSize: "28dp",
-                    fontWeight: "bold"
-                },
-                text: "	" + __alloyId1.__transform.title
-            });
-            __alloyId3.add(__alloyId5);
-            var __alloyId7 = Ti.UI.createLabel({
-                right: "68dp",
-                textAlign: "left",
-                height: Ti.UI.SIZE,
-                bottom: "5dp",
-                left: "15dp",
-                color: "#777",
-                font: {
-                    fontSize: "16dp",
-                    fontWeight: "normal"
-                },
-                text: "		  " + __alloyId1.__transform.subtitle
-            });
-            __alloyId3.add(__alloyId7);
-            var __alloyId9 = Ti.UI.createImageView({
-                right: "10dp",
-                height: "48dp",
-                width: "48dp",
-                image: __alloyId1.__transform.image
-            });
-            __alloyId3.add(__alloyId9);
-        }
-        $.__views.__alloyId0.setData(rows);
-    }
-    function doUpper(model) {
-        var transform = model.toJSON();
-        transform.title = transform.title.toUpperCase();
-        Ti.API.info(">>> transforming the title");
-        return transform;
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#efefef",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createTableView({
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    var __alloyId10 = Alloy.Collections["collection"] || collection;
-    __alloyId10.on("fetch destroy change add remove reset", __alloyId11);
-    exports.destroy = function() {
-        __alloyId10 && __alloyId10.off("fetch destroy change add remove reset", __alloyId11);
-    };
-    _.extend($, $.__views);
-    Alloy.Collections.collection.trigger("change");
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-717/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-717/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index c5b3e28af..000000000
--- a/test/apps/testing/ALOY-717/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,96 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function changeClasses() {
-        var c = $.tester.classes[0];
-        if (c) {
-            Ti.API.info('Removing class "' + c + '"');
-            $.removeClass($.tester, c);
-        } else {
-            Ti.API.info("adding classes: " + JSON.stringify(classes));
-            $.addClass($.tester, classes);
-        }
-        $.tester.text = JSON.stringify($.tester.classes);
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        apiName: "Ti.UI.Window",
-        id: "index",
-        classes: []
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.tester = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        textAlign: "center",
-        apiName: "Ti.UI.Label",
-        id: "tester",
-        classes: []
-    });
-    $.__views.index.add($.__views.tester);
-    $.__views.behind = Ti.UI.createView({
-        height: "100dp",
-        width: "100dp",
-        backgroundColor: "#0f0",
-        zIndex: 10,
-        apiName: "Ti.UI.View",
-        id: "behind",
-        classes: []
-    });
-    $.__views.index.add($.__views.behind);
-    $.__views.changer = Ti.UI.createLabel({
-        height: "50dp",
-        width: Ti.UI.FILL,
-        textAlign: "center",
-        backgroundColor: "#006",
-        color: "#fff",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        bottom: 0,
-        text: "change classes",
-        apiName: "Ti.UI.Label",
-        id: "changer",
-        classes: []
-    });
-    $.__views.index.add($.__views.changer);
-    changeClasses ? $.__views.changer.addEventListener("click", changeClasses) : __defers["$.__views.changer!click!changeClasses"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var classes = [ "transform", "opacity", "bgGradient", "greenBg", "red", "shadow", "huge", "right", "zIndex" ];
-    changeClasses();
-    $.index.open();
-    __defers["$.__views.changer!click!changeClasses"] && $.__views.changer.addEventListener("click", changeClasses);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-717/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-717/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 99a6c52a0..000000000
--- a/test/apps/testing/ALOY-717/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,90 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function changeClasses(e) {
-        var c = $.tester.classes[0];
-        if (c) {
-            Ti.API.info('Removing class "' + c + '"');
-            $.removeClass($.tester, c);
-        } else {
-            Ti.API.info("adding classes: " + JSON.stringify(classes));
-            $.addClass($.tester, classes);
-        }
-        $.tester.text = JSON.stringify($.tester.classes);
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        apiName: "Ti.UI.Window",
-        id: "index",
-        classes: []
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.tester = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        textAlign: "center",
-        apiName: "Ti.UI.Label",
-        id: "tester",
-        classes: []
-    });
-    $.__views.index.add($.__views.tester);
-    $.__views.behind = Ti.UI.createView({
-        height: "100dp",
-        width: "100dp",
-        backgroundColor: "#0f0",
-        zIndex: 10,
-        apiName: "Ti.UI.View",
-        id: "behind",
-        classes: []
-    });
-    $.__views.index.add($.__views.behind);
-    $.__views.changer = Ti.UI.createLabel({
-        height: "50dp",
-        width: Ti.UI.FILL,
-        textAlign: "center",
-        backgroundColor: "#006",
-        color: "#fff",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        bottom: 0,
-        text: "change classes",
-        apiName: "Ti.UI.Label",
-        id: "changer",
-        classes: []
-    });
-    $.__views.index.add($.__views.changer);
-    changeClasses ? $.addListener($.__views.changer, "click", changeClasses) : __defers["$.__views.changer!click!changeClasses"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var classes = [ "transform", "opacity", "bgGradient", "greenBg", "red", "shadow", "huge", "right", "zIndex" ];
-    changeClasses();
-    $.index.open();
-    __defers["$.__views.changer!click!changeClasses"] && $.addListener($.__views.changer, "click", changeClasses);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-720/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-720/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 4ed851174..000000000
--- a/test/apps/testing/ALOY-720/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.info.text = "This app supported on Android, MobileWeb, and iOS only.";
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-720/_generated/blackberry/alloy/widgets/alloy.button/controllers/widget.js b/test/apps/testing/ALOY-720/_generated/blackberry/alloy/widgets/alloy.button/controllers/widget.js
deleted file mode 100644
index 357ed0744..000000000
--- a/test/apps/testing/ALOY-720/_generated/blackberry/alloy/widgets/alloy.button/controllers/widget.js
+++ /dev/null
@@ -1,38 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "alloy.button/" + s : s.substring(0, index) + "/alloy.button/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("alloy.button");
-    this.__widgetId = "alloy.button";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    $.button.title = args.title || "click me";
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-720/_generated/blackberry/alloy/widgets/alloy.button/styles/widget.js b/test/apps/testing/ALOY-720/_generated/blackberry/alloy/widgets/alloy.button/styles/widget.js
deleted file mode 100644
index 4fc7d5264..000000000
--- a/test/apps/testing/ALOY-720/_generated/blackberry/alloy/widgets/alloy.button/styles/widget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "alloy.button/" + s : s.substring(0, index) + "/alloy.button/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-720/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-720/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 18943c11a..000000000
--- a/test/apps/testing/ALOY-720/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,71 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doSave(e) {
-        alert("save");
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        modal: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId1 = Ti.UI.createWindow({
-        title: "MobileWeb",
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId3 = Alloy.createWidget("alloy.button", "widget", {
-        title: "MW",
-        id: "__alloyId3"
-    });
-    doSave ? $.__views.__alloyId3.on("click", doSave) : __defers["$.__views.__alloyId3!click!doSave"] = true;
-    $.__views.__alloyId1.rightNavButton = $.__views.__alloyId3.getViewEx({
-        recurse: true
-    });
-    $.__views.info = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: "center",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        id: "info"
-    });
-    $.__views.__alloyId1.add($.__views.info);
-    $.__views.__alloyId0 = Ti.UI.MobileWeb.createNavigationGroup({
-        window: $.__views.__alloyId1,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.info.text = 'Click the rightNavButton to "save"';
-    $.index.open();
-    __defers["$.__views.__alloyId3!click!doSave"] && $.__views.__alloyId3.on("click", doSave);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-720/_generated/mobileweb/alloy/widgets/alloy.button/controllers/widget.js b/test/apps/testing/ALOY-720/_generated/mobileweb/alloy/widgets/alloy.button/controllers/widget.js
deleted file mode 100644
index 351dc8def..000000000
--- a/test/apps/testing/ALOY-720/_generated/mobileweb/alloy/widgets/alloy.button/controllers/widget.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "alloy.button/" + s : s.substring(0, index) + "/alloy.button/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick(e) {
-        $.trigger("click", e);
-    }
-    new (require("/alloy/widget"))("alloy.button");
-    this.__widgetId = "alloy.button";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.button = Ti.UI.createButton({
-        id: "button"
-    });
-    $.__views.button && $.addTopLevelView($.__views.button);
-    doClick ? $.addListener($.__views.button, "click", doClick) : __defers["$.__views.button!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    $.button.title = args.title || "click me";
-    __defers["$.__views.button!click!doClick"] && $.addListener($.__views.button, "click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-720/_generated/mobileweb/alloy/widgets/alloy.button/styles/widget.js b/test/apps/testing/ALOY-720/_generated/mobileweb/alloy/widgets/alloy.button/styles/widget.js
deleted file mode 100644
index 4fc7d5264..000000000
--- a/test/apps/testing/ALOY-720/_generated/mobileweb/alloy/widgets/alloy.button/styles/widget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "alloy.button/" + s : s.substring(0, index) + "/alloy.button/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-720/controllers/index.js b/test/apps/testing/ALOY-720/controllers/index.js
index 27358cb2d..14e3a78f7 100644
--- a/test/apps/testing/ALOY-720/controllers/index.js
+++ b/test/apps/testing/ALOY-720/controllers/index.js
@@ -2,12 +2,10 @@ function doSave(e) {
 	alert('save');
 }
 
-if (OS_IOS || OS_MOBILEWEB) {
+if (OS_IOS) {
 	$.info.text = 'Click the rightNavButton to "save"';
 } else if (OS_ANDROID) {
 	$.info.text = 'Click the menu button to "save"';
-} else {
-	$.info.text = 'This app supported on Android, MobileWeb, and iOS only.';
 }
 
 $.index.open();
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-720/views/index.xml b/test/apps/testing/ALOY-720/views/index.xml
index 94b257c07..536d5484a 100644
--- a/test/apps/testing/ALOY-720/views/index.xml
+++ b/test/apps/testing/ALOY-720/views/index.xml
@@ -15,17 +15,4 @@
 
 		<Label id="info"/>
 	</Window>
-
-	<Window platform="mobileweb">
-		<NavigationGroup>
-			<Window title="MobileWeb">
-			<RightNavButton>
-				<Widget src="alloy.button" title="MW" onClick="doSave"/>
-			</RightNavButton>
-			<Label id="info"/>
-			</Window>
-		</NavigationGroup>
-	</Window>
-
-
 </Alloy>
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-720/widgets/alloy.button/views/widget.xml b/test/apps/testing/ALOY-720/widgets/alloy.button/views/widget.xml
index 45c7508b9..f839b02bd 100644
--- a/test/apps/testing/ALOY-720/widgets/alloy.button/views/widget.xml
+++ b/test/apps/testing/ALOY-720/widgets/alloy.button/views/widget.xml
@@ -1,4 +1,4 @@
 <Alloy>
-    <Button id="button" onClick="doClick" platform="ios,mobileweb"/>
+    <Button id="button" onClick="doClick" platform="ios"/>
     <MenuItem id="button" onClick="doClick" platform="android"/>
 </Alloy>
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-721/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-721/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 35bcd514c..000000000
--- a/test/apps/testing/ALOY-721/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,134 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function resetClasses() {
-        var theClass = classes[index++];
-        $.resetClass($.tester, theClass);
-        $.currentClasses.text = JSON.stringify(theClass);
-        index >= classes.length && (index = 0);
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#ECF0F1",
-        fullscreen: false,
-        navBarHidden: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        textAlign: "center",
-        left: null,
-        right: null,
-        height: "50dp",
-        width: Ti.UI.FILL,
-        shadowOffset: {
-            x: 0,
-            y: 1
-        },
-        backgroundColor: "#E74C3C",
-        color: "#ECF0F1",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        shadowColor: "#888",
-        top: 0,
-        text: "resetStyle()",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.tester = Ti.UI.createLabel({
-        textAlign: "center",
-        left: null,
-        right: null,
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        shadowOffset: {
-            x: 0,
-            y: 0
-        },
-        text: "click me to reset classes",
-        apiName: "Ti.UI.Label",
-        id: "tester",
-        classes: []
-    });
-    $.__views.index.add($.__views.tester);
-    resetClasses ? $.__views.tester.addEventListener("click", resetClasses) : __defers["$.__views.tester!click!resetClasses"] = true;
-    $.__views.currentClassesHeader = Ti.UI.createLabel({
-        textAlign: "center",
-        left: null,
-        right: null,
-        height: "34dp",
-        width: Ti.UI.FILL,
-        shadowOffset: {
-            x: 0,
-            y: 1
-        },
-        backgroundColor: "#E74C3C",
-        color: "#ECF0F1",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        shadowColor: "#888",
-        bottom: "50dp",
-        text: "current classes",
-        id: "currentClassesHeader"
-    });
-    $.__views.index.add($.__views.currentClassesHeader);
-    $.__views.currentClasses = Ti.UI.createLabel({
-        textAlign: "center",
-        left: null,
-        right: null,
-        height: "50dp",
-        width: Ti.UI.FILL,
-        shadowOffset: {
-            x: 0,
-            y: 0
-        },
-        backgroundColor: "#2980B9",
-        color: "#ECF0F1",
-        font: {
-            fontSize: "20dp",
-            fontWeight: "bold"
-        },
-        bottom: 0,
-        id: "currentClasses"
-    });
-    $.__views.index.add($.__views.currentClasses);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var index = 0;
-    var classes = [ [ "darkblue", "medium" ], [ "darkblue", "medium", "red" ], [ "lightblue", "huge" ], "red small", [ "darkblue", "medium", "left" ], "lightblue small right", "red huge crazyshadow" ];
-    resetClasses();
-    $.index.open();
-    __defers["$.__views.tester!click!resetClasses"] && $.__views.tester.addEventListener("click", resetClasses);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-721/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-721/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 447c55d60..000000000
--- a/test/apps/testing/ALOY-721/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,128 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function resetClasses(e) {
-        var theClass = classes[index++];
-        $.resetClass($.tester, theClass);
-        $.currentClasses.text = JSON.stringify(theClass);
-        index >= classes.length && (index = 0);
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#ECF0F1",
-        fullscreen: false,
-        navBarHidden: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        textAlign: "center",
-        left: null,
-        right: null,
-        height: "50dp",
-        width: Ti.UI.FILL,
-        shadowOffset: {
-            x: 0,
-            y: 1
-        },
-        backgroundColor: "#E74C3C",
-        color: "#ECF0F1",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        shadowColor: "#888",
-        top: 0,
-        text: "resetStyle()",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.tester = Ti.UI.createLabel({
-        textAlign: "center",
-        left: null,
-        right: null,
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        shadowOffset: {
-            x: 0,
-            y: 0
-        },
-        text: "click me to reset classes",
-        apiName: "Ti.UI.Label",
-        id: "tester",
-        classes: []
-    });
-    $.__views.index.add($.__views.tester);
-    resetClasses ? $.addListener($.__views.tester, "click", resetClasses) : __defers["$.__views.tester!click!resetClasses"] = true;
-    $.__views.currentClassesHeader = Ti.UI.createLabel({
-        textAlign: "center",
-        left: null,
-        right: null,
-        height: "34dp",
-        width: Ti.UI.FILL,
-        shadowOffset: {
-            x: 0,
-            y: 1
-        },
-        backgroundColor: "#E74C3C",
-        color: "#ECF0F1",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        shadowColor: "#888",
-        bottom: "50dp",
-        text: "current classes",
-        id: "currentClassesHeader"
-    });
-    $.__views.index.add($.__views.currentClassesHeader);
-    $.__views.currentClasses = Ti.UI.createLabel({
-        textAlign: "center",
-        left: null,
-        right: null,
-        height: "50dp",
-        width: Ti.UI.FILL,
-        shadowOffset: {
-            x: 0,
-            y: 0
-        },
-        backgroundColor: "#2980B9",
-        color: "#ECF0F1",
-        font: {
-            fontSize: "20dp",
-            fontWeight: "bold"
-        },
-        bottom: 0,
-        id: "currentClasses"
-    });
-    $.__views.index.add($.__views.currentClasses);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var index = 0;
-    var classes = [ [ "darkblue", "medium" ], [ "darkblue", "medium", "red" ], [ "lightblue", "huge" ], "red small", [ "darkblue", "medium", "left" ], "lightblue small right", "red huge crazyshadow" ];
-    resetClasses();
-    $.index.open();
-    __defers["$.__views.tester!click!resetClasses"] && $.addListener($.__views.tester, "click", resetClasses);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-724/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-724/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 6090ca3b8..000000000
--- a/test/apps/testing/ALOY-724/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,122 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function setCurrentTab(e) {
-        currentTab = e.index + 1;
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createTabGroup({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.__alloyId1 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        modal: false,
-        title: "window 1",
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        color: "#111",
-        textAlign: "center",
-        font: {
-            fontSize: "48dp",
-            fontWeight: "bold"
-        },
-        text: "Label 1",
-        id: "__alloyId2"
-    });
-    $.__views.__alloyId1.add($.__views.__alloyId2);
-    $.__views.__alloyId0 = Ti.UI.createTab({
-        window: $.__views.__alloyId1,
-        title: "tab 1",
-        id: "__alloyId0"
-    });
-    $.__views.index.addTab($.__views.__alloyId0);
-    $.__views.__alloyId4 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        modal: false,
-        title: "window 2",
-        id: "__alloyId4"
-    });
-    $.__views.__alloyId5 = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        color: "#111",
-        textAlign: "center",
-        font: {
-            fontSize: "48dp",
-            fontWeight: "bold"
-        },
-        text: "Label 2",
-        id: "__alloyId5"
-    });
-    $.__views.__alloyId4.add($.__views.__alloyId5);
-    $.__views.__alloyId3 = Ti.UI.createTab({
-        window: $.__views.__alloyId4,
-        title: "tab 2",
-        id: "__alloyId3"
-    });
-    $.__views.index.addTab($.__views.__alloyId3);
-    $.__views.__alloyId7 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        modal: false,
-        title: "window 3",
-        id: "__alloyId7"
-    });
-    $.__views.__alloyId8 = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        color: "#111",
-        textAlign: "center",
-        font: {
-            fontSize: "48dp",
-            fontWeight: "bold"
-        },
-        text: "Label 3",
-        id: "__alloyId8"
-    });
-    $.__views.__alloyId7.add($.__views.__alloyId8);
-    $.__views.__alloyId6 = Ti.UI.createTab({
-        window: $.__views.__alloyId7,
-        title: "tab 3",
-        id: "__alloyId6"
-    });
-    $.__views.index.addTab($.__views.__alloyId6);
-    $.__views.index && $.addTopLevelView($.__views.index);
-    setCurrentTab ? $.__views.index.addEventListener("focus", setCurrentTab) : __defers["$.__views.index!focus!setCurrentTab"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var currentTab;
-    $.index.open();
-    __defers["$.__views.index!focus!setCurrentTab"] && $.__views.index.addEventListener("focus", setCurrentTab);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-724/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-724/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index da895b13f..000000000
--- a/test/apps/testing/ALOY-724/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,118 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function setCurrentTab(e) {
-        currentTab = e.index + 1;
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    var __alloyId0 = [];
-    $.__views.__alloyId2 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        modal: false,
-        title: "window 1",
-        id: "__alloyId2"
-    });
-    $.__views.__alloyId3 = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        color: "#111",
-        textAlign: "center",
-        font: {
-            fontSize: "48dp",
-            fontWeight: "bold"
-        },
-        text: "Label 1",
-        id: "__alloyId3"
-    });
-    $.__views.__alloyId2.add($.__views.__alloyId3);
-    $.__views.__alloyId1 = Ti.UI.createTab({
-        window: $.__views.__alloyId2,
-        title: "tab 1",
-        id: "__alloyId1"
-    });
-    __alloyId0.push($.__views.__alloyId1);
-    $.__views.__alloyId5 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        modal: false,
-        title: "window 2",
-        id: "__alloyId5"
-    });
-    $.__views.__alloyId6 = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        color: "#111",
-        textAlign: "center",
-        font: {
-            fontSize: "48dp",
-            fontWeight: "bold"
-        },
-        text: "Label 2",
-        id: "__alloyId6"
-    });
-    $.__views.__alloyId5.add($.__views.__alloyId6);
-    $.__views.__alloyId4 = Ti.UI.createTab({
-        window: $.__views.__alloyId5,
-        title: "tab 2",
-        id: "__alloyId4"
-    });
-    __alloyId0.push($.__views.__alloyId4);
-    $.__views.__alloyId8 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        modal: false,
-        title: "window 3",
-        id: "__alloyId8"
-    });
-    $.__views.__alloyId9 = Ti.UI.createLabel({
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        color: "#111",
-        textAlign: "center",
-        font: {
-            fontSize: "48dp",
-            fontWeight: "bold"
-        },
-        text: "Label 3",
-        id: "__alloyId9"
-    });
-    $.__views.__alloyId8.add($.__views.__alloyId9);
-    $.__views.__alloyId7 = Ti.UI.createTab({
-        window: $.__views.__alloyId8,
-        title: "tab 3",
-        id: "__alloyId7"
-    });
-    __alloyId0.push($.__views.__alloyId7);
-    $.__views.index = Ti.UI.createTabGroup({
-        backgroundColor: "#fff",
-        tabs: __alloyId0,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    setCurrentTab ? $.addListener($.__views.index, "focus", setCurrentTab) : __defers["$.__views.index!focus!setCurrentTab"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var currentTab;
-    $.index.open();
-    __defers["$.__views.index!focus!setCurrentTab"] && $.addListener($.__views.index, "focus", setCurrentTab);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-727/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-727/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index a0b35c3b2..000000000
--- a/test/apps/testing/ALOY-727/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,64 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function showOptions() {
-        $.options.show();
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId1 = [];
-    __alloyId1.push("button 1");
-    __alloyId1.push("button 2");
-    $.__views.options = Ti.UI.createOptionDialog({
-        buttonNames: __alloyId1,
-        id: "options",
-        title: "App Options",
-        destructive: "3",
-        cancel: "2"
-    });
-    $.__views.__alloyId4 = Ti.UI.createButton({
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        title: "options",
-        id: "__alloyId4"
-    });
-    $.__views.index.add($.__views.__alloyId4);
-    showOptions ? $.__views.__alloyId4.addEventListener("click", showOptions) : __defers["$.__views.__alloyId4!click!showOptions"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.avLabel.text = "This is an androidView";
-    $.index.open();
-    __defers["$.__views.__alloyId4!click!showOptions"] && $.__views.__alloyId4.addEventListener("click", showOptions);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-727/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-727/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index b5fb8bfca..000000000
--- a/test/apps/testing/ALOY-727/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,58 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function showOptions(e) {
-        $.options.show();
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId1 = [];
-    __alloyId1.push("button 1");
-    __alloyId1.push("button 2");
-    $.__views.options = Ti.UI.createOptionDialog({
-        buttonNames: __alloyId1,
-        id: "options",
-        title: "App Options",
-        destructive: 3,
-        cancel: 2
-    });
-    $.__views.__alloyId4 = Ti.UI.createButton({
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        title: "options",
-        id: "__alloyId4"
-    });
-    $.__views.index.add($.__views.__alloyId4);
-    showOptions ? $.addListener($.__views.__alloyId4, "click", showOptions) : __defers["$.__views.__alloyId4!click!showOptions"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.avLabel.text = "This is an androidView";
-    $.index.open();
-    __defers["$.__views.__alloyId4!click!showOptions"] && $.addListener($.__views.__alloyId4, "click", showOptions);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-728/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-728/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index b01a2646e..000000000
--- a/test/apps/testing/ALOY-728/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        text: L("tester", "nothing assigned yet"),
-        color: "#000",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    Ti.Locale.getString("foo");
-    Titanium.Locale.getString("foo1good");
-    L("found_me");
-    var foo = "tooooooo";
-    Titanium.Locale.getString(foo);
-    L("hi" + foo + "there");
-    L("OMG****");
-    L("foo%ipod");
-    Ti.Locale.getString("123badvalue");
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-728/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-728/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 2c52b9bb6..000000000
--- a/test/apps/testing/ALOY-728/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        text: L("tester", "nothing assigned yet"),
-        color: "#000",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    Ti.Locale.getString("foo");
-    Titanium.Locale.getString("foo1good");
-    L("found_me");
-    var foo = "tooooooo";
-    Titanium.Locale.getString(foo);
-    L("hi" + foo + "there");
-    L("OMG****");
-    L("foo%ipod");
-    Ti.Locale.getString("123badvalue");
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-731/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-731/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index ee1d5d97c..000000000
--- a/test/apps/testing/ALOY-731/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,65 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createTextField({
-        top: "10dp",
-        left: "15dp",
-        right: "15dp",
-        height: "40dp",
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        hintText: "I clear on edit",
-        clearOnEdit: true,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createTextField({
-        top: "10dp",
-        left: "15dp",
-        right: "15dp",
-        height: "40dp",
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        hintText: "I don't clear on edit",
-        clearOnEdit: false,
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-731/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-731/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 515316220..000000000
--- a/test/apps/testing/ALOY-731/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,59 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createTextField({
-        top: "10dp",
-        left: "15dp",
-        right: "15dp",
-        height: "40dp",
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        hintText: "I clear on edit",
-        clearOnEdit: true,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createTextField({
-        top: "10dp",
-        left: "15dp",
-        right: "15dp",
-        height: "40dp",
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        hintText: "I don't clear on edit",
-        clearOnEdit: false,
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-734/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-734/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 2fdc61332..000000000
--- a/test/apps/testing/ALOY-734/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "This test app is only supported on iOS",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-734/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-734/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index f2db5db6e..000000000
--- a/test/apps/testing/ALOY-734/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "This test app is only supported on iOS",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-750/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-750/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index c89aa0051..000000000
--- a/test/apps/testing/ALOY-750/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,50 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createTextField({
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        color: "#000",
-        width: 250,
-        height: 60,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-750/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-750/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index f7af10c49..000000000
--- a/test/apps/testing/ALOY-750/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,44 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createTextField({
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        color: "#000",
-        width: 250,
-        height: 60,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-752/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-752/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index c1d833d7e..000000000
--- a/test/apps/testing/ALOY-752/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,53 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.lbl = Ti.UI.createLabel({
-        fontStyle: "italic",
-        font: {
-            fontStyle: "italic",
-            fontSize: 30,
-            fontWeight: "bold"
-        },
-        text: "This is a label",
-        id: "lbl"
-    });
-    $.__views.index.add($.__views.lbl);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-752/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-752/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index abeef7da0..000000000
--- a/test/apps/testing/ALOY-752/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.lbl = Ti.UI.createLabel({
-        fontStyle: "italic",
-        font: {
-            fontStyle: "italic",
-            fontSize: 30,
-            fontWeight: "bold"
-        },
-        text: "This is a label",
-        id: "lbl"
-    });
-    $.__views.index.add($.__views.lbl);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-753/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-753/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 4c5c1072a..000000000
--- a/test/apps/testing/ALOY-753/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    var personCol = Alloy.createCollection("user");
-    personCol.on("reset", function() {
-        alert("reset");
-    });
-    personCol.fetch();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-753/_generated/blackberry/alloy/models/User.js b/test/apps/testing/ALOY-753/_generated/blackberry/alloy/models/User.js
deleted file mode 100644
index b5eb27303..000000000
--- a/test/apps/testing/ALOY-753/_generated/blackberry/alloy/models/User.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        adapter: {
-            type: "properties",
-            collection_name: "user"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("user", exports.definition, []);
-
-collection = Alloy.C("user", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-753/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-753/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index ade4b7585..000000000
--- a/test/apps/testing/ALOY-753/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    var personCol = Alloy.createCollection("user");
-    personCol.on("reset", function() {
-        alert("reset");
-    });
-    personCol.fetch();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-753/_generated/mobileweb/alloy/models/User.js b/test/apps/testing/ALOY-753/_generated/mobileweb/alloy/models/User.js
deleted file mode 100644
index e7fb2435f..000000000
--- a/test/apps/testing/ALOY-753/_generated/mobileweb/alloy/models/User.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        adapter: {
-            type: "properties",
-            collection_name: "user"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("user", exports.definition, []);
-
-collection = Alloy.C("user", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-754/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-754/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 49883b65d..000000000
--- a/test/apps/testing/ALOY-754/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function showAlert() {
-        Ti.API.debug(JSON.stringify(Alloy.CFG, null, "	"));
-        alert("Alloy.CFG.mainConfig = " + Alloy.CFG.mainConfig);
-        alert("Alloy.CFG.bothConfig = " + Alloy.CFG.bothConfig);
-        alert("Alloy.CFG.themeConfig = " + Alloy.CFG.themeConfig);
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.b = Ti.UI.createButton({
-        width: "50%",
-        height: Ti.UI.SIZE,
-        randomProp: "OK",
-        mainConfig: Alloy.CFG.mainConfig,
-        bothConfig: Alloy.CFG.bothConfig,
-        themeConfig: Alloy.CFG.themeConfig,
-        title: "click me",
-        id: "b"
-    });
-    $.__views.index.add($.__views.b);
-    showAlert ? $.__views.b.addEventListener("click", showAlert) : __defers["$.__views.b!click!showAlert"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    require("specs/index")($);
-    __defers["$.__views.b!click!showAlert"] && $.__views.b.addEventListener("click", showAlert);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-754/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-754/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 49bb2c064..000000000
--- a/test/apps/testing/ALOY-754/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function showAlert(e) {
-        Ti.API.debug(JSON.stringify(Alloy.CFG, null, "	"));
-        alert("Alloy.CFG.mainConfig = " + Alloy.CFG.mainConfig);
-        alert("Alloy.CFG.bothConfig = " + Alloy.CFG.bothConfig);
-        alert("Alloy.CFG.themeConfig = " + Alloy.CFG.themeConfig);
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.b = Ti.UI.createButton({
-        width: "50%",
-        height: Ti.UI.SIZE,
-        randomProp: "OK",
-        mainConfig: Alloy.CFG.mainConfig,
-        bothConfig: Alloy.CFG.bothConfig,
-        themeConfig: Alloy.CFG.themeConfig,
-        title: "click me",
-        id: "b"
-    });
-    $.__views.index.add($.__views.b);
-    showAlert ? $.addListener($.__views.b, "click", showAlert) : __defers["$.__views.b!click!showAlert"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    require("specs/index")($);
-    __defers["$.__views.b!click!showAlert"] && $.addListener($.__views.b, "click", showAlert);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-754/config.json b/test/apps/testing/ALOY-754/config.json
index 6bfd648dc..ab1fc935b 100755
--- a/test/apps/testing/ALOY-754/config.json
+++ b/test/apps/testing/ALOY-754/config.json
@@ -8,20 +8,10 @@
         "bothConfig": "main:android",
         "theme": "android"
     },
-    "os:blackberry": {
-        "mainConfig": "main:blackberry",
-        "bothConfig": "main:blackberry",
-        "theme": "blackberry"
-    },
     "os:ios": {
         "mainConfig": "main:ios",
         "bothConfig": "main:ios",
         "theme": "ios"
     },
-    "os:mobileweb": {
-        "mainConfig": "main:mobileweb",
-        "bothConfig": "main:mobileweb",
-        "theme": "mobileweb"
-    },
     "dependencies": {}
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-754/themes/blackberry/config.json b/test/apps/testing/ALOY-754/themes/blackberry/config.json
deleted file mode 100755
index f5599caa7..000000000
--- a/test/apps/testing/ALOY-754/themes/blackberry/config.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "global": {
-        "bothConfig": "theme:blackberry",
-        "themeConfig": "theme:blackberry"
-    },
-    "dependencies": {}
-}
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-754/themes/mobileweb/config.json b/test/apps/testing/ALOY-754/themes/mobileweb/config.json
deleted file mode 100755
index ea3edd0ec..000000000
--- a/test/apps/testing/ALOY-754/themes/mobileweb/config.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "global": {
-        "bothConfig": "theme:mobileweb",
-        "themeConfig": "theme:mobileweb"
-    },
-    "dependencies": {}
-}
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-784/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-784/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index ea1f8183d..000000000
--- a/test/apps/testing/ALOY-784/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick() {
-        alert("label clicked");
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        title: "My Test App",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#fff",
-        text: "Hello, World",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    doClick ? $.__views.label.addEventListener("click", doClick) : __defers["$.__views.label!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.label!click!doClick"] && $.__views.label.addEventListener("click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-784/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-784/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index c1a3dae4b..000000000
--- a/test/apps/testing/ALOY-784/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick() {
-        alert("label clicked");
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        title: "My Test App",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#fff",
-        text: "Hello, World",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    doClick ? $.addListener($.__views.label, "click", doClick) : __defers["$.__views.label!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.label!click!doClick"] && $.addListener($.__views.label, "click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-787/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-787/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 21d0aaba1..000000000
--- a/test/apps/testing/ALOY-787/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId1 = Alloy.createWidget("my.widget", "widget", {
-        id: "__alloyId1",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId1.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-787/_generated/blackberry/alloy/widgets/my.widget/controllers/other.js b/test/apps/testing/ALOY-787/_generated/blackberry/alloy/widgets/my.widget/controllers/other.js
deleted file mode 100644
index e192ba526..000000000
--- a/test/apps/testing/ALOY-787/_generated/blackberry/alloy/widgets/my.widget/controllers/other.js
+++ /dev/null
@@ -1,45 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "my.widget/" + s : s.substring(0, index) + "/my.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("my.widget");
-    this.__widgetId = "my.widget";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "other";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.other = Ti.UI.createView({
-        id: "other"
-    });
-    $.__views.other && $.addTopLevelView($.__views.other);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "my.widget loaded",
-        id: "__alloyId0"
-    });
-    $.__views.other.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-787/_generated/blackberry/alloy/widgets/my.widget/controllers/widget.js b/test/apps/testing/ALOY-787/_generated/blackberry/alloy/widgets/my.widget/controllers/widget.js
deleted file mode 100644
index e05f6dd30..000000000
--- a/test/apps/testing/ALOY-787/_generated/blackberry/alloy/widgets/my.widget/controllers/widget.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "my.widget/" + s : s.substring(0, index) + "/my.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("my.widget");
-    this.__widgetId = "my.widget";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        var __parentSymbol = __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Alloy.createWidget("my.widget", "other", {
-        id: "widget",
-        __parentSymbol: __parentSymbol
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-787/_generated/blackberry/alloy/widgets/my.widget/styles/other.js b/test/apps/testing/ALOY-787/_generated/blackberry/alloy/widgets/my.widget/styles/other.js
deleted file mode 100644
index 64ef58f70..000000000
--- a/test/apps/testing/ALOY-787/_generated/blackberry/alloy/widgets/my.widget/styles/other.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "my.widget/" + s : s.substring(0, index) + "/my.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-787/_generated/blackberry/alloy/widgets/my.widget/styles/widget.js b/test/apps/testing/ALOY-787/_generated/blackberry/alloy/widgets/my.widget/styles/widget.js
deleted file mode 100644
index e397e7c8d..000000000
--- a/test/apps/testing/ALOY-787/_generated/blackberry/alloy/widgets/my.widget/styles/widget.js
+++ /dev/null
@@ -1,20 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "my.widget/" + s : s.substring(0, index) + "/my.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0002,
-    key: "Label",
-    style: {
-        color: "#000",
-        font: {
-            fontSize: 18,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-787/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-787/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index bd65f73b6..000000000
--- a/test/apps/testing/ALOY-787/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId1 = Alloy.createWidget("my.widget", "widget", {
-        id: "__alloyId1",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId1.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-787/_generated/mobileweb/alloy/widgets/my.widget/controllers/other.js b/test/apps/testing/ALOY-787/_generated/mobileweb/alloy/widgets/my.widget/controllers/other.js
deleted file mode 100644
index e14a85ba2..000000000
--- a/test/apps/testing/ALOY-787/_generated/mobileweb/alloy/widgets/my.widget/controllers/other.js
+++ /dev/null
@@ -1,45 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "my.widget/" + s : s.substring(0, index) + "/my.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("my.widget");
-    this.__widgetId = "my.widget";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "other";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.other = Ti.UI.createView({
-        id: "other"
-    });
-    $.__views.other && $.addTopLevelView($.__views.other);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "my.widget loaded",
-        id: "__alloyId0"
-    });
-    $.__views.other.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-787/_generated/mobileweb/alloy/widgets/my.widget/controllers/widget.js b/test/apps/testing/ALOY-787/_generated/mobileweb/alloy/widgets/my.widget/controllers/widget.js
deleted file mode 100644
index 460fb3ded..000000000
--- a/test/apps/testing/ALOY-787/_generated/mobileweb/alloy/widgets/my.widget/controllers/widget.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "my.widget/" + s : s.substring(0, index) + "/my.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("my.widget");
-    this.__widgetId = "my.widget";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        var __parentSymbol = __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Alloy.createWidget("my.widget", "other", {
-        id: "widget",
-        __parentSymbol: __parentSymbol
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-787/_generated/mobileweb/alloy/widgets/my.widget/styles/other.js b/test/apps/testing/ALOY-787/_generated/mobileweb/alloy/widgets/my.widget/styles/other.js
deleted file mode 100644
index 64ef58f70..000000000
--- a/test/apps/testing/ALOY-787/_generated/mobileweb/alloy/widgets/my.widget/styles/other.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "my.widget/" + s : s.substring(0, index) + "/my.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-787/_generated/mobileweb/alloy/widgets/my.widget/styles/widget.js b/test/apps/testing/ALOY-787/_generated/mobileweb/alloy/widgets/my.widget/styles/widget.js
deleted file mode 100644
index 178e35bd2..000000000
--- a/test/apps/testing/ALOY-787/_generated/mobileweb/alloy/widgets/my.widget/styles/widget.js
+++ /dev/null
@@ -1,20 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "my.widget/" + s : s.substring(0, index) + "/my.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "Label",
-    style: {
-        color: "#000",
-        font: {
-            fontSize: 18,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-787/config.json b/test/apps/testing/ALOY-787/config.json
index f16d72ed0..beecdd678 100644
--- a/test/apps/testing/ALOY-787/config.json
+++ b/test/apps/testing/ALOY-787/config.json
@@ -4,9 +4,7 @@
     "env:test": {},
     "env:production": {},
     "os:android": {},
-    "os:blackberry": {},
     "os:ios": {},
-    "os:mobileweb": {},
     "dependencies": {
         "my.widget": "1.0"
     }
diff --git a/test/apps/testing/ALOY-787/widgets/my.widget/widget.json b/test/apps/testing/ALOY-787/widgets/my.widget/widget.json
index d92a5db4c..bc9976d76 100644
--- a/test/apps/testing/ALOY-787/widgets/my.widget/widget.json
+++ b/test/apps/testing/ALOY-787/widgets/my.widget/widget.json
@@ -9,5 +9,5 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"2.1",
 	"tags":"",
-	"platforms":"android,blackberry,ios,mobileweb"
+	"platforms":"android,ios"
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-793/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-793/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index f44f5bd50..000000000
--- a/test/apps/testing/ALOY-793/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,176 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        top: 30,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "14dp"
-        },
-        left: 30,
-        top: 50,
-        text: "In TSS",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.topLabel0 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "no  slash",
-        id: "topLabel0"
-    });
-    $.__views.index.add($.__views.topLabel0);
-    $.__views.topLabel1 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "one  slash, ignored",
-        id: "topLabel1"
-    });
-    $.__views.index.add($.__views.topLabel1);
-    $.__views.topLabel2 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "two \\ slashes, should see 1 slash",
-        id: "topLabel2"
-    });
-    $.__views.index.add($.__views.topLabel2);
-    $.__views.topLabel3 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "look here ❤",
-        id: "topLabel3"
-    });
-    $.__views.index.add($.__views.topLabel3);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "14dp"
-        },
-        left: 30,
-        top: 50,
-        text: "In XML",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "NO SLASH",
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "ONE  SLASH, IGNORED",
-        id: "__alloyId3"
-    });
-    $.__views.index.add($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "TWO \\ SLASHES, 1 SLASH APPEARS",
-        id: "__alloyId4"
-    });
-    $.__views.index.add($.__views.__alloyId4);
-    $.__views.__alloyId5 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "LOOK HERE ❤",
-        id: "__alloyId5"
-    });
-    $.__views.index.add($.__views.__alloyId5);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-793/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-793/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index eb96541a5..000000000
--- a/test/apps/testing/ALOY-793/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,170 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        top: 30,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "14dp"
-        },
-        left: 30,
-        top: 50,
-        text: "In TSS",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.topLabel0 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "no  slash",
-        id: "topLabel0"
-    });
-    $.__views.index.add($.__views.topLabel0);
-    $.__views.topLabel1 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "one  slash, ignored",
-        id: "topLabel1"
-    });
-    $.__views.index.add($.__views.topLabel1);
-    $.__views.topLabel2 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "two \\ slashes, should see 1 slash",
-        id: "topLabel2"
-    });
-    $.__views.index.add($.__views.topLabel2);
-    $.__views.topLabel3 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "look here ❤",
-        id: "topLabel3"
-    });
-    $.__views.index.add($.__views.topLabel3);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "14dp"
-        },
-        left: 30,
-        top: 50,
-        text: "In XML",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "NO SLASH",
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "ONE  SLASH, IGNORED",
-        id: "__alloyId3"
-    });
-    $.__views.index.add($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "TWO \\ SLASHES, 1 SLASH APPEARS",
-        id: "__alloyId4"
-    });
-    $.__views.index.add($.__views.__alloyId4);
-    $.__views.__alloyId5 = Ti.UI.createLabel({
-        width: Ti.UI.FILL,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        font: {
-            fontSize: "12dp"
-        },
-        left: 30,
-        text: "LOOK HERE ❤",
-        id: "__alloyId5"
-    });
-    $.__views.index.add($.__views.__alloyId5);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-798/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-798/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 8828797d9..000000000
--- a/test/apps/testing/ALOY-798/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-798/_generated/blackberry/alloy/widgets/com.appcelerator.loading/controllers/widget.js b/test/apps/testing/ALOY-798/_generated/blackberry/alloy/widgets/com.appcelerator.loading/controllers/widget.js
deleted file mode 100644
index ed83cfb8c..000000000
--- a/test/apps/testing/ALOY-798/_generated/blackberry/alloy/widgets/com.appcelerator.loading/controllers/widget.js
+++ /dev/null
@@ -1,52 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.appcelerator.loading/" + s : s.substring(0, index) + "/com.appcelerator.loading/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("com.appcelerator.loading");
-    this.__widgetId = "com.appcelerator.loading";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.loading = Ti.UI.createImageView({
-        height: 20,
-        width: 20,
-        images: [ "/images/com.appcelerator.loading/00.png", "/images/com.appcelerator.loading/01.png", "/images/com.appcelerator.loading/02.png", "/images/com.appcelerator.loading/03.png", "/images/com.appcelerator.loading/04.png", "/images/com.appcelerator.loading/05.png", "/images/com.appcelerator.loading/06.png", "/images/com.appcelerator.loading/07.png", "/images/com.appcelerator.loading/08.png", "/images/com.appcelerator.loading/09.png", "/images/com.appcelerator.loading/10.png", "/images/com.appcelerator.loading/11.png" ],
-        id: "loading"
-    });
-    $.__views.loading && $.addTopLevelView($.__views.loading);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    for (var k in args) {
-        if ("id" === k || /^(?:__|#|$)/.test(k)) continue;
-        $.loading[k] = args[k];
-    }
-    $.loading.start();
-    exports.setOpacity = function(opacity) {
-        $.loading.opacity = opacity;
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-798/_generated/blackberry/alloy/widgets/com.appcelerator.loading/styles/widget.js b/test/apps/testing/ALOY-798/_generated/blackberry/alloy/widgets/com.appcelerator.loading/styles/widget.js
deleted file mode 100644
index c853055fd..000000000
--- a/test/apps/testing/ALOY-798/_generated/blackberry/alloy/widgets/com.appcelerator.loading/styles/widget.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.appcelerator.loading/" + s : s.substring(0, index) + "/com.appcelerator.loading/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isId: true,
-    priority: 100000.0002,
-    key: "loading",
-    style: {
-        height: 20,
-        width: 20,
-        images: [ "/images/com.appcelerator.loading/00.png", "/images/com.appcelerator.loading/01.png", "/images/com.appcelerator.loading/02.png", "/images/com.appcelerator.loading/03.png", "/images/com.appcelerator.loading/04.png", "/images/com.appcelerator.loading/05.png", "/images/com.appcelerator.loading/06.png", "/images/com.appcelerator.loading/07.png", "/images/com.appcelerator.loading/08.png", "/images/com.appcelerator.loading/09.png", "/images/com.appcelerator.loading/10.png", "/images/com.appcelerator.loading/11.png" ]
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-798/_generated/ios/alloy/widgets/com.appcelerator.loading/controllers/widget.js b/test/apps/testing/ALOY-798/_generated/ios/alloy/widgets/com.appcelerator.loading/controllers/widget.js
index 4aa29c3b2..5c7fd0678 100644
--- a/test/apps/testing/ALOY-798/_generated/ios/alloy/widgets/com.appcelerator.loading/controllers/widget.js
+++ b/test/apps/testing/ALOY-798/_generated/ios/alloy/widgets/com.appcelerator.loading/controllers/widget.js
@@ -40,7 +40,6 @@ function Controller() {
         if ("id" === k || /^(?:__|#|$)/.test(k)) continue;
         $.loading[k] = args[k];
     }
-    "mobileweb" === Ti.Platform.osname && ($.loading.duration = 100);
     $.loading.start();
     exports.setOpacity = function(opacity) {
         $.loading.opacity = opacity;
diff --git a/test/apps/testing/ALOY-798/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-798/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index f3df35efd..000000000
--- a/test/apps/testing/ALOY-798/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-798/_generated/mobileweb/alloy/widgets/com.appcelerator.loading/controllers/widget.js b/test/apps/testing/ALOY-798/_generated/mobileweb/alloy/widgets/com.appcelerator.loading/controllers/widget.js
deleted file mode 100644
index 548981562..000000000
--- a/test/apps/testing/ALOY-798/_generated/mobileweb/alloy/widgets/com.appcelerator.loading/controllers/widget.js
+++ /dev/null
@@ -1,53 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.appcelerator.loading/" + s : s.substring(0, index) + "/com.appcelerator.loading/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("com.appcelerator.loading");
-    this.__widgetId = "com.appcelerator.loading";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.loading = Ti.UI.createImageView({
-        height: 20,
-        width: 20,
-        images: [ "/images/com.appcelerator.loading/00.png", "/images/com.appcelerator.loading/01.png", "/images/com.appcelerator.loading/02.png", "/images/com.appcelerator.loading/03.png", "/images/com.appcelerator.loading/04.png", "/images/com.appcelerator.loading/05.png", "/images/com.appcelerator.loading/06.png", "/images/com.appcelerator.loading/07.png", "/images/com.appcelerator.loading/08.png", "/images/com.appcelerator.loading/09.png", "/images/com.appcelerator.loading/10.png", "/images/com.appcelerator.loading/11.png" ],
-        id: "loading"
-    });
-    $.__views.loading && $.addTopLevelView($.__views.loading);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    for (var k in args) {
-        if ("id" === k || /^(?:__|#|$)/.test(k)) continue;
-        $.loading[k] = args[k];
-    }
-    $.loading.duration = 100;
-    $.loading.start();
-    exports.setOpacity = function(opacity) {
-        $.loading.opacity = opacity;
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-798/_generated/mobileweb/alloy/widgets/com.appcelerator.loading/styles/widget.js b/test/apps/testing/ALOY-798/_generated/mobileweb/alloy/widgets/com.appcelerator.loading/styles/widget.js
deleted file mode 100644
index e29be59e1..000000000
--- a/test/apps/testing/ALOY-798/_generated/mobileweb/alloy/widgets/com.appcelerator.loading/styles/widget.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.appcelerator.loading/" + s : s.substring(0, index) + "/com.appcelerator.loading/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isId: true,
-    priority: 100000.0001,
-    key: "loading",
-    style: {
-        height: 20,
-        width: 20,
-        images: [ "/images/com.appcelerator.loading/00.png", "/images/com.appcelerator.loading/01.png", "/images/com.appcelerator.loading/02.png", "/images/com.appcelerator.loading/03.png", "/images/com.appcelerator.loading/04.png", "/images/com.appcelerator.loading/05.png", "/images/com.appcelerator.loading/06.png", "/images/com.appcelerator.loading/07.png", "/images/com.appcelerator.loading/08.png", "/images/com.appcelerator.loading/09.png", "/images/com.appcelerator.loading/10.png", "/images/com.appcelerator.loading/11.png" ]
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/00.png b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/00.png
deleted file mode 100755
index 59bf1852a..000000000
Binary files a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/00.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/01.png b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/01.png
deleted file mode 100755
index 18d97ebcf..000000000
Binary files a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/01.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/02.png b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/02.png
deleted file mode 100755
index f82763003..000000000
Binary files a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/02.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/03.png b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/03.png
deleted file mode 100755
index 151437c85..000000000
Binary files a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/03.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/04.png b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/04.png
deleted file mode 100755
index 7fa3db031..000000000
Binary files a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/04.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/05.png b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/05.png
deleted file mode 100755
index 36b1a1c28..000000000
Binary files a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/05.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/06.png b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/06.png
deleted file mode 100755
index 8303b1506..000000000
Binary files a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/06.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/07.png b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/07.png
deleted file mode 100755
index 47f60b7e1..000000000
Binary files a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/07.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/08.png b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/08.png
deleted file mode 100755
index 39a1a7207..000000000
Binary files a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/08.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/09.png b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/09.png
deleted file mode 100755
index d9f10f2d4..000000000
Binary files a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/09.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/10.png b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/10.png
deleted file mode 100755
index 38e08e44c..000000000
Binary files a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/10.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/11.png b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/11.png
deleted file mode 100755
index b673bf58b..000000000
Binary files a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/11.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/spinner.png b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/spinner.png
deleted file mode 100755
index da6aec5f7..000000000
Binary files a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/assets/mobileweb/images/spinner.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/controllers/widget.js b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/controllers/widget.js
index 19565412f..34faa23a2 100755
--- a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/controllers/widget.js
+++ b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/controllers/widget.js
@@ -50,9 +50,6 @@ for (var k in args) {
 	$.loading[k] = args[k];
 }
 
-if (Ti.Platform.osname === 'mobileweb') {
-    $.loading.duration = 100;
-}
 $.loading.start();
 
 /**
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/widget.json b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/widget.json
index 9fa6a6944..5137aa3b2 100755
--- a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/widget.json
+++ b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/widget.json
@@ -9,6 +9,6 @@
 	"min-alloy-version": "0.1.16",
 	"min-titanium-version":"2.0",
 	"tags":"utility,loading,progress",
-	"platforms":"android,ios,mobileweb",
+	"platforms":"android,ios",
 	"dependencies": {}
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-799/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-799/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 64e24f78c..000000000
--- a/test/apps/testing/ALOY-799/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,58 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Alloy.createWidget("widget1", "widget", {
-        id: "__alloyId0",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId0.setParent($.__views.index);
-    $.__views.__alloyId1 = Alloy.createWidget("widget2", "widget", {
-        id: "__alloyId1",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId1.setParent($.__views.index);
-    $.__views.__alloyId2 = Alloy.createController("widget", {
-        id: "__alloyId2",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId2.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-799/_generated/blackberry/alloy/controllers/widget.js b/test/apps/testing/ALOY-799/_generated/blackberry/alloy/controllers/widget.js
deleted file mode 100644
index a2a61afea..000000000
--- a/test/apps/testing/ALOY-799/_generated/blackberry/alloy/controllers/widget.js
+++ /dev/null
@@ -1,44 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createLabel({
-        text: "I'm a controller",
-        backgroundColor: "#005",
-        color: "#fff",
-        height: "70dp",
-        width: "200dp",
-        top: "50dp",
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-799/_generated/blackberry/alloy/widgets/widget1/controllers/widget.js b/test/apps/testing/ALOY-799/_generated/blackberry/alloy/widgets/widget1/controllers/widget.js
deleted file mode 100644
index 83951293b..000000000
--- a/test/apps/testing/ALOY-799/_generated/blackberry/alloy/widgets/widget1/controllers/widget.js
+++ /dev/null
@@ -1,46 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "widget1/" + s : s.substring(0, index) + "/widget1/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("widget1");
-    this.__widgetId = "widget1";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createLabel({
-        text: "I'm widget #1",
-        backgroundColor: "#a00",
-        color: "#fff",
-        height: "70dp",
-        width: "200dp",
-        top: "50dp",
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-799/_generated/blackberry/alloy/widgets/widget1/styles/widget.js b/test/apps/testing/ALOY-799/_generated/blackberry/alloy/widgets/widget1/styles/widget.js
deleted file mode 100644
index 07697e921..000000000
--- a/test/apps/testing/ALOY-799/_generated/blackberry/alloy/widgets/widget1/styles/widget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "widget1/" + s : s.substring(0, index) + "/widget1/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-799/_generated/blackberry/alloy/widgets/widget2/controllers/widget.js b/test/apps/testing/ALOY-799/_generated/blackberry/alloy/widgets/widget2/controllers/widget.js
deleted file mode 100644
index 3bcb0a141..000000000
--- a/test/apps/testing/ALOY-799/_generated/blackberry/alloy/widgets/widget2/controllers/widget.js
+++ /dev/null
@@ -1,46 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "widget2/" + s : s.substring(0, index) + "/widget2/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("widget2");
-    this.__widgetId = "widget2";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createLabel({
-        text: "I'm widget #2",
-        backgroundColor: "#050",
-        color: "#fff",
-        height: "70dp",
-        width: "200dp",
-        top: "50dp",
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-799/_generated/blackberry/alloy/widgets/widget2/styles/widget.js b/test/apps/testing/ALOY-799/_generated/blackberry/alloy/widgets/widget2/styles/widget.js
deleted file mode 100644
index d91dcf700..000000000
--- a/test/apps/testing/ALOY-799/_generated/blackberry/alloy/widgets/widget2/styles/widget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "widget2/" + s : s.substring(0, index) + "/widget2/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index da915a3d0..000000000
--- a/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,52 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Alloy.createWidget("widget1", "widget", {
-        id: "__alloyId0",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId0.setParent($.__views.index);
-    $.__views.__alloyId1 = Alloy.createWidget("widget2", "widget", {
-        id: "__alloyId1",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId1.setParent($.__views.index);
-    $.__views.__alloyId2 = Alloy.createController("widget", {
-        id: "__alloyId2",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId2.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/controllers/widget.js b/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/controllers/widget.js
deleted file mode 100644
index 7ab361a39..000000000
--- a/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/controllers/widget.js
+++ /dev/null
@@ -1,38 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createLabel({
-        text: "I'm a controller",
-        backgroundColor: "#005",
-        color: "#fff",
-        height: "70dp",
-        width: "200dp",
-        top: "50dp",
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/widgets/widget1/controllers/widget.js b/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/widgets/widget1/controllers/widget.js
deleted file mode 100644
index 68049ebb8..000000000
--- a/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/widgets/widget1/controllers/widget.js
+++ /dev/null
@@ -1,46 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "widget1/" + s : s.substring(0, index) + "/widget1/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("widget1");
-    this.__widgetId = "widget1";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createLabel({
-        text: "I'm widget #1",
-        backgroundColor: "#a00",
-        color: "#fff",
-        height: "70dp",
-        width: "200dp",
-        top: "50dp",
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/widgets/widget1/styles/widget.js b/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/widgets/widget1/styles/widget.js
deleted file mode 100644
index 07697e921..000000000
--- a/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/widgets/widget1/styles/widget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "widget1/" + s : s.substring(0, index) + "/widget1/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/widgets/widget2/controllers/widget.js b/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/widgets/widget2/controllers/widget.js
deleted file mode 100644
index 7edf5ef74..000000000
--- a/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/widgets/widget2/controllers/widget.js
+++ /dev/null
@@ -1,46 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "widget2/" + s : s.substring(0, index) + "/widget2/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("widget2");
-    this.__widgetId = "widget2";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createLabel({
-        text: "I'm widget #2",
-        backgroundColor: "#050",
-        color: "#fff",
-        height: "70dp",
-        width: "200dp",
-        top: "50dp",
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/widgets/widget2/styles/widget.js b/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/widgets/widget2/styles/widget.js
deleted file mode 100644
index d91dcf700..000000000
--- a/test/apps/testing/ALOY-799/_generated/mobileweb/alloy/widgets/widget2/styles/widget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "widget2/" + s : s.substring(0, index) + "/widget2/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-800/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-800/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index b5e366255..000000000
--- a/test/apps/testing/ALOY-800/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,71 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId0 = [];
-    $.__views.__alloyId1 = Ti.Map.createAnnotation({
-        latitude: 37.389569,
-        longitude: -122.050212,
-        title: "XML Annotation",
-        id: "__alloyId1"
-    });
-    __alloyId0.push($.__views.__alloyId1);
-    $.__views.annotation2 = Ti.Map.createAnnotation({
-        title: "TSS Annotation",
-        latitude: 37.392,
-        longitude: -122.061,
-        id: "annotation2"
-    });
-    __alloyId0.push($.__views.annotation2);
-    $.__views.map = (require("ti.map").createView || Ti.UI.createView)({
-        userLocation: false,
-        mapType: Alloy.Globals.Map.SATELLITE_TYPE,
-        animate: true,
-        region: {
-            latitude: 37.38,
-            latitudeDelta: .2,
-            longitude: -122.05,
-            longitudeDelta: .2
-        },
-        annotations: __alloyId0,
-        id: "map"
-    });
-    $.__views.index.add($.__views.map);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-800/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-800/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 25e9ed1ff..000000000
--- a/test/apps/testing/ALOY-800/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,65 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId0 = [];
-    $.__views.__alloyId1 = Ti.Map.createAnnotation({
-        latitude: 37.389569,
-        longitude: -122.050212,
-        title: "XML Annotation",
-        id: "__alloyId1"
-    });
-    __alloyId0.push($.__views.__alloyId1);
-    $.__views.annotation2 = Ti.Map.createAnnotation({
-        title: "TSS Annotation",
-        latitude: 37.392,
-        longitude: -122.061,
-        id: "annotation2"
-    });
-    __alloyId0.push($.__views.annotation2);
-    $.__views.map = (require("ti.map").createView || Ti.UI.createView)({
-        userLocation: false,
-        mapType: Alloy.Globals.Map.SATELLITE_TYPE,
-        animate: true,
-        region: {
-            latitude: 37.38,
-            latitudeDelta: .2,
-            longitude: -122.05,
-            longitudeDelta: .2
-        },
-        annotations: __alloyId0,
-        id: "map"
-    });
-    $.__views.index.add($.__views.map);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-813/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-813/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 6f1a8c9f3..000000000
--- a/test/apps/testing/ALOY-813/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        layout: "vertical",
-        modal: "false",
-        exitOnClose: "true",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        top: "20",
-        text: "❤☺\nnext line",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        text: "❤☺\nnext line",
-        top: "20",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    $.__views.code = Ti.UI.createLabel({
-        text: "❤☺\nnext line",
-        top: "20",
-        id: "code"
-    });
-    $.__views.index.add($.__views.code);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-813/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-813/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 5512172fb..000000000
--- a/test/apps/testing/ALOY-813/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        layout: "vertical",
-        modal: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        top: 20,
-        text: "❤☺\nnext line",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        text: "❤☺\nnext line",
-        top: 20,
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    $.__views.code = Ti.UI.createLabel({
-        text: "❤☺\nnext line",
-        top: 20,
-        id: "code"
-    });
-    $.__views.index.add($.__views.code);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-817/_generated/blackberry/alloy/controllers/empty.js b/test/apps/testing/ALOY-817/_generated/blackberry/alloy/controllers/empty.js
deleted file mode 100644
index eb9f485f1..000000000
--- a/test/apps/testing/ALOY-817/_generated/blackberry/alloy/controllers/empty.js
+++ /dev/null
@@ -1,51 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function buttonClick(e) {
-        e.cancelBubble = true;
-        Ti.API.info("button clicked");
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "empty";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.empty = Ti.UI.createButton({
-        title: "useless button",
-        bottom: "50",
-        id: "empty"
-    });
-    $.__views.empty && $.addTopLevelView($.__views.empty);
-    buttonClick ? $.__views.empty.addEventListener("click", buttonClick) : __defers["$.__views.empty!click!buttonClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.empty.fireEvent("click");
-    setTimeout(function() {
-        $.trigger("init");
-    }, 2e3);
-    __defers["$.__views.empty!click!buttonClick"] && $.__views.empty.addEventListener("click", buttonClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-817/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-817/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index a3419de3b..000000000
--- a/test/apps/testing/ALOY-817/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,89 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function mapClick() {
-        Ti.API.info("map clicked");
-    }
-    function windowClick() {
-        Ti.API.info("window clicked");
-    }
-    function modelChange() {
-        Ti.API.info("model change");
-    }
-    function anotherModelChange() {
-        Ti.API.info("another model change");
-    }
-    function collectionChange() {
-        Ti.API.info("collection change");
-    }
-    function emptyInit() {
-        Ti.API.info("empty controller init");
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    Alloy.Collections.instance("empty");
-    Alloy.Models.instance("empty");
-    $.anotherModel = Alloy.createModel("empty");
-    collectionChange ? Alloy.Collections.empty.on("change", collectionChange) : __defers["Alloy.Collections.empty!change!collectionChange"] = true;
-    modelChange ? Alloy.Models.empty.on("change", modelChange) : __defers["Alloy.Models.empty!change!modelChange"] = true;
-    anotherModelChange ? $.anotherModel.on("change", anotherModelChange) : __defers["$.anotherModel!change!anotherModelChange"] = true;
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    windowClick ? $.__views.index.addEventListener("click", windowClick) : __defers["$.__views.index!click!windowClick"] = true;
-    $.__views.map2 = Alloy.Globals.Map.createView({
-        id: "map2"
-    });
-    $.__views.index.add($.__views.map2);
-    mapClick ? $.__views.map2.addEventListener("click", mapClick) : __defers["$.__views.map2!click!mapClick"] = true;
-    $.__views.__alloyId4 = Alloy.createController("empty", {
-        id: "__alloyId4",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId4.setParent($.__views.index);
-    emptyInit ? $.__views.__alloyId4.on("init", emptyInit) : __defers["$.__views.__alloyId4!init!emptyInit"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    $.map2.fireEvent("click");
-    Alloy.Collections.empty.trigger("change");
-    Alloy.Models.empty.trigger("change");
-    $.anotherModel.trigger("change");
-    __defers["Alloy.Collections.empty!change!collectionChange"] && Alloy.Collections.empty.on("change", collectionChange);
-    __defers["Alloy.Models.empty!change!modelChange"] && Alloy.Models.empty.on("change", modelChange);
-    __defers["$.anotherModel!change!anotherModelChange"] && $.anotherModel.on("change", anotherModelChange);
-    __defers["$.__views.index!click!windowClick"] && $.__views.index.addEventListener("click", windowClick);
-    __defers["$.__views.map2!click!mapClick"] && $.__views.map2.addEventListener("click", mapClick);
-    __defers["$.__views.__alloyId4!init!emptyInit"] && $.__views.__alloyId4.on("init", emptyInit);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-817/_generated/blackberry/alloy/models/Empty.js b/test/apps/testing/ALOY-817/_generated/blackberry/alloy/models/Empty.js
deleted file mode 100644
index e49eb284a..000000000
--- a/test/apps/testing/ALOY-817/_generated/blackberry/alloy/models/Empty.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {},
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("empty", exports.definition, []);
-
-collection = Alloy.C("empty", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-817/_generated/mobileweb/alloy/controllers/empty.js b/test/apps/testing/ALOY-817/_generated/mobileweb/alloy/controllers/empty.js
deleted file mode 100644
index 665fab942..000000000
--- a/test/apps/testing/ALOY-817/_generated/mobileweb/alloy/controllers/empty.js
+++ /dev/null
@@ -1,45 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function buttonClick(e) {
-        e.cancelBubble = true;
-        Ti.API.info("button clicked");
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "empty";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.empty = Ti.UI.createButton({
-        title: "useless button",
-        bottom: 50,
-        id: "empty"
-    });
-    $.__views.empty && $.addTopLevelView($.__views.empty);
-    buttonClick ? $.addListener($.__views.empty, "click", buttonClick) : __defers["$.__views.empty!click!buttonClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.empty.fireEvent("click");
-    setTimeout(function() {
-        $.trigger("init");
-    }, 2e3);
-    __defers["$.__views.empty!click!buttonClick"] && $.addListener($.__views.empty, "click", buttonClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-817/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-817/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 39ece0c38..000000000
--- a/test/apps/testing/ALOY-817/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,83 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function mapClick(e) {
-        Ti.API.info("map clicked");
-    }
-    function windowClick(e) {
-        Ti.API.info("window clicked");
-    }
-    function modelChange(e) {
-        Ti.API.info("model change");
-    }
-    function anotherModelChange(e) {
-        Ti.API.info("another model change");
-    }
-    function collectionChange(e) {
-        Ti.API.info("collection change");
-    }
-    function emptyInit(e) {
-        Ti.API.info("empty controller init");
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    Alloy.Collections.instance("empty");
-    Alloy.Models.instance("empty");
-    $.anotherModel = Alloy.createModel("empty");
-    collectionChange ? Alloy.Collections.empty.on("change", collectionChange) : __defers["Alloy.Collections.empty!change!collectionChange"] = true;
-    modelChange ? Alloy.Models.empty.on("change", modelChange) : __defers["Alloy.Models.empty!change!modelChange"] = true;
-    anotherModelChange ? $.anotherModel.on("change", anotherModelChange) : __defers["$.anotherModel!change!anotherModelChange"] = true;
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    windowClick ? $.addListener($.__views.index, "click", windowClick) : __defers["$.__views.index!click!windowClick"] = true;
-    $.__views.map2 = Alloy.Globals.Map.createView({
-        id: "map2"
-    });
-    $.__views.index.add($.__views.map2);
-    mapClick ? $.addListener($.__views.map2, "click", mapClick) : __defers["$.__views.map2!click!mapClick"] = true;
-    $.__views.__alloyId4 = Alloy.createController("empty", {
-        id: "__alloyId4",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId4.setParent($.__views.index);
-    emptyInit ? $.__views.__alloyId4.on("init", emptyInit) : __defers["$.__views.__alloyId4!init!emptyInit"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    $.map2.fireEvent("click");
-    Alloy.Collections.empty.trigger("change");
-    Alloy.Models.empty.trigger("change");
-    $.anotherModel.trigger("change");
-    __defers["Alloy.Collections.empty!change!collectionChange"] && Alloy.Collections.empty.on("change", collectionChange);
-    __defers["Alloy.Models.empty!change!modelChange"] && Alloy.Models.empty.on("change", modelChange);
-    __defers["$.anotherModel!change!anotherModelChange"] && $.anotherModel.on("change", anotherModelChange);
-    __defers["$.__views.index!click!windowClick"] && $.addListener($.__views.index, "click", windowClick);
-    __defers["$.__views.map2!click!mapClick"] && $.addListener($.__views.map2, "click", mapClick);
-    __defers["$.__views.__alloyId4!init!emptyInit"] && $.__views.__alloyId4.on("init", emptyInit);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-817/_generated/mobileweb/alloy/models/Empty.js b/test/apps/testing/ALOY-817/_generated/mobileweb/alloy/models/Empty.js
deleted file mode 100644
index d8628e614..000000000
--- a/test/apps/testing/ALOY-817/_generated/mobileweb/alloy/models/Empty.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {},
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("empty", exports.definition, []);
-
-collection = Alloy.C("empty", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-818/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-818/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index d77b21aaf..000000000
--- a/test/apps/testing/ALOY-818/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "This app is only supported on iPad",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-818/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-818/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index d77b21aaf..000000000
--- a/test/apps/testing/ALOY-818/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "This app is only supported on iPad",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-822/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-822/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index a25d79776..000000000
--- a/test/apps/testing/ALOY-822/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        modal: void 0,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-822/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-822/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 0c802f1e4..000000000
--- a/test/apps/testing/ALOY-822/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,37 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        modal: void 0,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-826/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-826/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index a1ad29bb3..000000000
--- a/test/apps/testing/ALOY-826/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,81 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId4 = [];
-    $.__views.__alloyId5 = {
-        properties: {
-            title: "One",
-            id: "__alloyId5"
-        }
-    };
-    __alloyId4.push($.__views.__alloyId5);
-    $.__views.__alloyId6 = {
-        properties: {
-            title: "Two",
-            id: "__alloyId6"
-        }
-    };
-    __alloyId4.push($.__views.__alloyId6);
-    $.__views.__alloyId7 = {
-        properties: {
-            title: "Three",
-            id: "__alloyId7"
-        }
-    };
-    __alloyId4.push($.__views.__alloyId7);
-    $.__views.__alloyId2 = Ti.UI.createListSection({
-        id: "__alloyId2"
-    });
-    $.__views.__alloyId2.items = __alloyId4;
-    var __alloyId8 = [];
-    __alloyId8.push($.__views.__alloyId2);
-    $.__views.__alloyId10 = Alloy.createController("section", {
-        id: "__alloyId10"
-    });
-    __alloyId8.push($.__views.__alloyId10.getViewEx({
-        recurse: true
-    }));
-    $.__views.__alloyId0 = Ti.UI.createListView({
-        sections: __alloyId8,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-826/_generated/blackberry/alloy/controllers/section.js b/test/apps/testing/ALOY-826/_generated/blackberry/alloy/controllers/section.js
deleted file mode 100644
index 4e4486984..000000000
--- a/test/apps/testing/ALOY-826/_generated/blackberry/alloy/controllers/section.js
+++ /dev/null
@@ -1,47 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "section";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __alloyId13 = [];
-    $.__views.__alloyId14 = {
-        properties: {
-            title: "Required",
-            id: "__alloyId14"
-        }
-    };
-    __alloyId13.push($.__views.__alloyId14);
-    $.__views.section = Ti.UI.createListSection({
-        id: "section"
-    });
-    $.__views.section.items = __alloyId13;
-    $.__views.section && $.addTopLevelView($.__views.section);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-826/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-826/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 8e5775bcc..000000000
--- a/test/apps/testing/ALOY-826/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,75 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId4 = [];
-    $.__views.__alloyId5 = {
-        properties: {
-            title: "One",
-            id: "__alloyId5"
-        }
-    };
-    __alloyId4.push($.__views.__alloyId5);
-    $.__views.__alloyId6 = {
-        properties: {
-            title: "Two",
-            id: "__alloyId6"
-        }
-    };
-    __alloyId4.push($.__views.__alloyId6);
-    $.__views.__alloyId7 = {
-        properties: {
-            title: "Three",
-            id: "__alloyId7"
-        }
-    };
-    __alloyId4.push($.__views.__alloyId7);
-    $.__views.__alloyId2 = Ti.UI.createListSection({
-        id: "__alloyId2"
-    });
-    $.__views.__alloyId2.items = __alloyId4;
-    var __alloyId8 = [];
-    __alloyId8.push($.__views.__alloyId2);
-    $.__views.__alloyId10 = Alloy.createController("section", {
-        id: "__alloyId10"
-    });
-    __alloyId8.push($.__views.__alloyId10.getViewEx({
-        recurse: true
-    }));
-    $.__views.__alloyId0 = Ti.UI.createListView({
-        sections: __alloyId8,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-826/_generated/mobileweb/alloy/controllers/section.js b/test/apps/testing/ALOY-826/_generated/mobileweb/alloy/controllers/section.js
deleted file mode 100644
index 96d3392b8..000000000
--- a/test/apps/testing/ALOY-826/_generated/mobileweb/alloy/controllers/section.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "section";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __alloyId13 = [];
-    $.__views.__alloyId14 = {
-        properties: {
-            title: "Required",
-            id: "__alloyId14"
-        }
-    };
-    __alloyId13.push($.__views.__alloyId14);
-    $.__views.section = Ti.UI.createListSection({
-        id: "section"
-    });
-    $.__views.section.items = __alloyId13;
-    $.__views.section && $.addTopLevelView($.__views.section);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-829/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-829/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 26ab2ed78..000000000
--- a/test/apps/testing/ALOY-829/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,98 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId6(e) {
-        if (e && e.fromAdapter) return;
-        var opts = __alloyId6.opts || {};
-        var models = __alloyId5.models;
-        var len = models.length;
-        var __alloyId1 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId2 = models[i];
-            __alloyId2.__transform = {};
-            var __alloyId4 = {
-                properties: {
-                    title: "undefined" != typeof __alloyId2.__transform["name"] ? __alloyId2.__transform["name"] : __alloyId2.get("name"),
-                    modelId: "undefined" != typeof __alloyId2.__transform["id"] ? __alloyId2.__transform["id"] : __alloyId2.get("id")
-                }
-            };
-            __alloyId1.push(__alloyId4);
-        }
-        opts.animation ? $.__views.section.setItems(__alloyId1, opts.animation) : $.__views.section.setItems(__alloyId1);
-    }
-    function green(str) {
-        return "" + str + "";
-    }
-    function red(str) {
-        return "" + str + "";
-    }
-    function showInfo(e) {
-        var modelId = e.section.getItemAt(e.itemIndex).properties.modelId;
-        var model = Alloy.createModel("info");
-        model.fetch({
-            id: modelId
-        });
-        var pass = JSON.stringify(model.attributes) === JSON.stringify({
-            id: modelId,
-            info: "info " + modelId
-        });
-        Ti.API.info('Assert single info model returned with "{id:' + modelId + '}": ' + (pass ? green("OK") : red("FAIL")));
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.section = Ti.UI.createListSection({
-        id: "section"
-    });
-    var __alloyId5 = Alloy.Collections["name"] || name;
-    __alloyId5.on("fetch destroy change add remove reset", __alloyId6);
-    var __alloyId7 = [];
-    __alloyId7.push($.__views.section);
-    $.__views.__alloyId0 = Ti.UI.createListView({
-        sections: __alloyId7,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    showInfo ? $.__views.__alloyId0.addEventListener("itemclick", showInfo) : __defers["$.__views.__alloyId0!itemclick!showInfo"] = true;
-    exports.destroy = function() {
-        __alloyId5.off("fetch destroy change add remove reset", __alloyId6);
-    };
-    _.extend($, $.__views);
-    var names = Alloy.Collections.name;
-    names.fetch();
-    $.index.open();
-    __defers["$.__views.__alloyId0!itemclick!showInfo"] && $.__views.__alloyId0.addEventListener("itemclick", showInfo);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-829/_generated/blackberry/alloy/models/Info.js b/test/apps/testing/ALOY-829/_generated/blackberry/alloy/models/Info.js
deleted file mode 100644
index 6df42cc81..000000000
--- a/test/apps/testing/ALOY-829/_generated/blackberry/alloy/models/Info.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            id: "INTEGER PRIMARY KEY AUTOINCREMENT",
-            info: "TEXT"
-        },
-        adapter: {
-            type: "sql",
-            db_name: "info",
-            collection_name: "info",
-            idAttribute: "id"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("info", exports.definition, []);
-
-collection = Alloy.C("info", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-829/_generated/blackberry/alloy/models/Name.js b/test/apps/testing/ALOY-829/_generated/blackberry/alloy/models/Name.js
deleted file mode 100644
index cfc406c15..000000000
--- a/test/apps/testing/ALOY-829/_generated/blackberry/alloy/models/Name.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            id: "INTEGER PRIMARY KEY AUTOINCREMENT",
-            name: "TEXT"
-        },
-        adapter: {
-            type: "sql",
-            db_name: "name",
-            collection_name: "name",
-            idAttribute: "id"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("name", exports.definition, []);
-
-collection = Alloy.C("name", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-829/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-829/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index a545fd195..000000000
--- a/test/apps/testing/ALOY-829/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,92 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId6(e) {
-        if (e && e.fromAdapter) return;
-        var opts = __alloyId6.opts || {};
-        var models = __alloyId5.models;
-        var len = models.length;
-        var __alloyId1 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId2 = models[i];
-            __alloyId2.__transform = _.isFunction(__alloyId2.transform) ? __alloyId2.transform() : __alloyId2.toJSON();
-            var __alloyId4 = {
-                properties: {
-                    title: __alloyId2.__transform.name,
-                    modelId: __alloyId2.__transform.id
-                }
-            };
-            __alloyId1.push(__alloyId4);
-        }
-        opts.animation ? $.__views.section.setItems(__alloyId1, opts.animation) : $.__views.section.setItems(__alloyId1);
-    }
-    function green(str) {
-        return "" + str + "";
-    }
-    function red(str) {
-        return "" + str + "";
-    }
-    function showInfo(e) {
-        var modelId = e.section.getItemAt(e.itemIndex).properties.modelId;
-        var model = Alloy.createModel("info");
-        model.fetch({
-            id: modelId
-        });
-        var pass = JSON.stringify(model.attributes) === JSON.stringify({
-            id: modelId,
-            info: "info " + modelId
-        });
-        Ti.API.info('Assert single info model returned with "{id:' + modelId + '}": ' + (pass ? green("OK") : red("FAIL")));
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.section = Ti.UI.createListSection({
-        id: "section"
-    });
-    var __alloyId5 = Alloy.Collections["name"] || name;
-    __alloyId5.on("fetch destroy change add remove reset", __alloyId6);
-    var __alloyId7 = [];
-    __alloyId7.push($.__views.section);
-    $.__views.__alloyId0 = Ti.UI.createListView({
-        sections: __alloyId7,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    showInfo ? $.addListener($.__views.__alloyId0, "itemclick", showInfo) : __defers["$.__views.__alloyId0!itemclick!showInfo"] = true;
-    exports.destroy = function() {
-        __alloyId5 && __alloyId5.off("fetch destroy change add remove reset", __alloyId6);
-    };
-    _.extend($, $.__views);
-    var names = Alloy.Collections.name;
-    names.fetch();
-    $.index.open();
-    __defers["$.__views.__alloyId0!itemclick!showInfo"] && $.addListener($.__views.__alloyId0, "itemclick", showInfo);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-829/_generated/mobileweb/alloy/models/Info.js b/test/apps/testing/ALOY-829/_generated/mobileweb/alloy/models/Info.js
deleted file mode 100644
index f5f0726a8..000000000
--- a/test/apps/testing/ALOY-829/_generated/mobileweb/alloy/models/Info.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            id: "INTEGER PRIMARY KEY AUTOINCREMENT",
-            info: "TEXT"
-        },
-        adapter: {
-            type: "sql",
-            db_name: "info",
-            collection_name: "info",
-            idAttribute: "id"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("info", exports.definition, []);
-
-collection = Alloy.C("info", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-829/_generated/mobileweb/alloy/models/Name.js b/test/apps/testing/ALOY-829/_generated/mobileweb/alloy/models/Name.js
deleted file mode 100644
index db14c8d1f..000000000
--- a/test/apps/testing/ALOY-829/_generated/mobileweb/alloy/models/Name.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            id: "INTEGER PRIMARY KEY AUTOINCREMENT",
-            name: "TEXT"
-        },
-        adapter: {
-            type: "sql",
-            db_name: "name",
-            collection_name: "name",
-            idAttribute: "id"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("name", exports.definition, []);
-
-collection = Alloy.C("name", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-833/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-833/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index b04ecaadb..000000000
--- a/test/apps/testing/ALOY-833/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId8 = [];
-    $.__views.__alloyId9 = Alloy.createWidget("tony.section", "widget", {
-        id: "__alloyId9"
-    });
-    __alloyId8.push($.__views.__alloyId9.getViewEx({
-        recurse: true
-    }));
-    $.__views.__alloyId5 = Ti.UI.createTableView({
-        data: __alloyId8,
-        id: "__alloyId5"
-    });
-    $.__views.index.add($.__views.__alloyId5);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-833/_generated/blackberry/alloy/widgets/tony.section/controllers/widget.js b/test/apps/testing/ALOY-833/_generated/blackberry/alloy/widgets/tony.section/controllers/widget.js
deleted file mode 100644
index 359c77f35..000000000
--- a/test/apps/testing/ALOY-833/_generated/blackberry/alloy/widgets/tony.section/controllers/widget.js
+++ /dev/null
@@ -1,65 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "tony.section/" + s : s.substring(0, index) + "/tony.section/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("tony.section");
-    this.__widgetId = "tony.section";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createTableViewSection({
-        id: "widget"
-    });
-    $.__views.__alloyId0 = Ti.UI.createTableViewRow({
-        title: "row 1",
-        id: "__alloyId0"
-    });
-    $.__views.widget.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createTableViewRow({
-        title: "row 2",
-        id: "__alloyId1"
-    });
-    $.__views.widget.add($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createTableViewRow({
-        title: "row 3",
-        id: "__alloyId2"
-    });
-    $.__views.widget.add($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createTableViewRow({
-        title: "row 4",
-        id: "__alloyId3"
-    });
-    $.__views.widget.add($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createTableViewRow({
-        title: "row 5",
-        id: "__alloyId4"
-    });
-    $.__views.widget.add($.__views.__alloyId4);
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-833/_generated/blackberry/alloy/widgets/tony.section/styles/widget.js b/test/apps/testing/ALOY-833/_generated/blackberry/alloy/widgets/tony.section/styles/widget.js
deleted file mode 100644
index 007dcc6a5..000000000
--- a/test/apps/testing/ALOY-833/_generated/blackberry/alloy/widgets/tony.section/styles/widget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "tony.section/" + s : s.substring(0, index) + "/tony.section/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-833/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-833/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index fc3510e3e..000000000
--- a/test/apps/testing/ALOY-833/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId8 = [];
-    $.__views.__alloyId9 = Alloy.createWidget("tony.section", "widget", {
-        id: "__alloyId9"
-    });
-    __alloyId8.push($.__views.__alloyId9.getViewEx({
-        recurse: true
-    }));
-    $.__views.__alloyId5 = Ti.UI.createTableView({
-        data: __alloyId8,
-        id: "__alloyId5"
-    });
-    $.__views.index.add($.__views.__alloyId5);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-833/_generated/mobileweb/alloy/widgets/tony.section/controllers/widget.js b/test/apps/testing/ALOY-833/_generated/mobileweb/alloy/widgets/tony.section/controllers/widget.js
deleted file mode 100644
index 98855f4d1..000000000
--- a/test/apps/testing/ALOY-833/_generated/mobileweb/alloy/widgets/tony.section/controllers/widget.js
+++ /dev/null
@@ -1,65 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "tony.section/" + s : s.substring(0, index) + "/tony.section/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("tony.section");
-    this.__widgetId = "tony.section";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createTableViewSection({
-        id: "widget"
-    });
-    $.__views.__alloyId0 = Ti.UI.createTableViewRow({
-        title: "row 1",
-        id: "__alloyId0"
-    });
-    $.__views.widget.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createTableViewRow({
-        title: "row 2",
-        id: "__alloyId1"
-    });
-    $.__views.widget.add($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createTableViewRow({
-        title: "row 3",
-        id: "__alloyId2"
-    });
-    $.__views.widget.add($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createTableViewRow({
-        title: "row 4",
-        id: "__alloyId3"
-    });
-    $.__views.widget.add($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createTableViewRow({
-        title: "row 5",
-        id: "__alloyId4"
-    });
-    $.__views.widget.add($.__views.__alloyId4);
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-833/_generated/mobileweb/alloy/widgets/tony.section/styles/widget.js b/test/apps/testing/ALOY-833/_generated/mobileweb/alloy/widgets/tony.section/styles/widget.js
deleted file mode 100644
index 007dcc6a5..000000000
--- a/test/apps/testing/ALOY-833/_generated/mobileweb/alloy/widgets/tony.section/styles/widget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "tony.section/" + s : s.substring(0, index) + "/tony.section/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-834/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-834/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 4b3d73ed6..000000000
--- a/test/apps/testing/ALOY-834/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,74 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doOnOpen() {
-        Ti.API.info("doOnOpen");
-    }
-    function doOnFocus() {
-        Ti.API.info("doOnFocus");
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.ScheduleGroup = Ti.UI.createTabGroup({
-        id: "ScheduleGroup",
-        activeTabIconTint: "yellow",
-        tabsBackgroundSelectedColor: "yellow"
-    });
-    $.__views.__alloyId1 = Ti.UI.createWindow({
-        title: "tab 1",
-        backgroundColor: "#fff",
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId0 = Ti.UI.createTab({
-        window: $.__views.__alloyId1,
-        title: "tab 1",
-        id: "__alloyId0"
-    });
-    $.__views.ScheduleGroup.addTab($.__views.__alloyId0);
-    $.__views.__alloyId3 = Ti.UI.createWindow({
-        title: "tab 2",
-        backgroundColor: "#fff",
-        id: "__alloyId3"
-    });
-    $.__views.__alloyId2 = Ti.UI.createTab({
-        window: $.__views.__alloyId3,
-        title: "tab 2",
-        id: "__alloyId2"
-    });
-    $.__views.ScheduleGroup.addTab($.__views.__alloyId2);
-    $.__views.ScheduleGroup && $.addTopLevelView($.__views.ScheduleGroup);
-    doOnOpen ? $.__views.ScheduleGroup.addEventListener("open", doOnOpen) : __defers["$.__views.ScheduleGroup!open!doOnOpen"] = true;
-    doOnFocus ? $.__views.ScheduleGroup.addEventListener("focus", doOnFocus) : __defers["$.__views.ScheduleGroup!focus!doOnFocus"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.ScheduleGroup.open();
-    __defers["$.__views.ScheduleGroup!open!doOnOpen"] && $.__views.ScheduleGroup.addEventListener("open", doOnOpen);
-    __defers["$.__views.ScheduleGroup!focus!doOnFocus"] && $.__views.ScheduleGroup.addEventListener("focus", doOnFocus);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-834/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-834/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index daa7422cb..000000000
--- a/test/apps/testing/ALOY-834/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,70 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doOnOpen() {
-        Ti.API.info("doOnOpen");
-    }
-    function doOnFocus() {
-        Ti.API.info("doOnFocus");
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    var __alloyId0 = [];
-    $.__views.__alloyId2 = Ti.UI.createWindow({
-        title: "tab 1",
-        backgroundColor: "#fff",
-        id: "__alloyId2"
-    });
-    $.__views.__alloyId1 = Ti.UI.createTab({
-        window: $.__views.__alloyId2,
-        title: "tab 1",
-        id: "__alloyId1"
-    });
-    __alloyId0.push($.__views.__alloyId1);
-    $.__views.__alloyId4 = Ti.UI.createWindow({
-        title: "tab 2",
-        backgroundColor: "#fff",
-        id: "__alloyId4"
-    });
-    $.__views.__alloyId3 = Ti.UI.createTab({
-        window: $.__views.__alloyId4,
-        title: "tab 2",
-        id: "__alloyId3"
-    });
-    __alloyId0.push($.__views.__alloyId3);
-    $.__views.ScheduleGroup = Ti.UI.createTabGroup({
-        tabs: __alloyId0,
-        id: "ScheduleGroup",
-        activeTabIconTint: "yellow",
-        tabsBackgroundSelectedColor: "yellow"
-    });
-    $.__views.ScheduleGroup && $.addTopLevelView($.__views.ScheduleGroup);
-    doOnOpen ? $.addListener($.__views.ScheduleGroup, "open", doOnOpen) : __defers["$.__views.ScheduleGroup!open!doOnOpen"] = true;
-    doOnFocus ? $.addListener($.__views.ScheduleGroup, "focus", doOnFocus) : __defers["$.__views.ScheduleGroup!focus!doOnFocus"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.ScheduleGroup.open();
-    __defers["$.__views.ScheduleGroup!open!doOnOpen"] && $.addListener($.__views.ScheduleGroup, "open", doOnOpen);
-    __defers["$.__views.ScheduleGroup!focus!doOnFocus"] && $.addListener($.__views.ScheduleGroup, "focus", doOnFocus);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-837/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-837/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 129c194a6..000000000
--- a/test/apps/testing/ALOY-837/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,53 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "black",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createButton({
-        title: "",
-        backgroundColor: "white",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        text: "Pellentesque habitant",
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId0.add($.__views.__alloyId1);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-837/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-837/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 3af7a67dc..000000000
--- a/test/apps/testing/ALOY-837/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "black",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createButton({
-        title: "",
-        backgroundColor: "white",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        text: "Pellentesque habitant",
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId0.add($.__views.__alloyId1);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-838/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-838/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index c424db12e..000000000
--- a/test/apps/testing/ALOY-838/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick() {
-        alert("Check console output");
-        Ti.API.debug(JSON.stringify(Alloy.CFG, null, "	"));
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.button = Ti.UI.createButton({
-        title: Alloy.CFG.button,
-        osOnly: Alloy.CFG.osOnly,
-        envOnly: Alloy.CFG.envOnly,
-        id: "button"
-    });
-    $.__views.index.add($.__views.button);
-    doClick ? $.__views.button.addEventListener("click", doClick) : __defers["$.__views.button!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    require("specs/index")($);
-    __defers["$.__views.button!click!doClick"] && $.__views.button.addEventListener("click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-838/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-838/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index ac0816282..000000000
--- a/test/apps/testing/ALOY-838/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,49 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick(e) {
-        alert("Check console output");
-        Ti.API.debug(JSON.stringify(Alloy.CFG, null, "	"));
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.button = Ti.UI.createButton({
-        title: Alloy.CFG.button,
-        osOnly: Alloy.CFG.osOnly,
-        envOnly: Alloy.CFG.envOnly,
-        id: "button"
-    });
-    $.__views.index.add($.__views.button);
-    doClick ? $.addListener($.__views.button, "click", doClick) : __defers["$.__views.button!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    require("specs/index")($);
-    __defers["$.__views.button!click!doClick"] && $.addListener($.__views.button, "click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-838/config.json b/test/apps/testing/ALOY-838/config.json
index 0d5f9b561..5c5023115 100644
--- a/test/apps/testing/ALOY-838/config.json
+++ b/test/apps/testing/ALOY-838/config.json
@@ -18,18 +18,10 @@
 	"os:android": {
         "button": "os:android",
         "osOnly": "android"
-    },
-	"os:blackberry": {
-        "button": "os:blackberry",
-        "osOnly": "blackberry"
     },
 	"os:ios": {
         "button": "os:ios",
         "osOnly": "ios"
-    },
-	"os:mobileweb": {
-        "button": "os:mobileweb",
-        "osOnly": "mobileweb"
     },
     "os:ios env:development": {
         "button": "os:ios env:development"
diff --git a/test/apps/testing/ALOY-839/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-839/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index f35c18ab2..000000000
--- a/test/apps/testing/ALOY-839/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.lbl = Ti.UI.createLabel({
-        text: "This is a label",
-        id: "lbl"
-    });
-    $.__views.index.add($.__views.lbl);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-839/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-839/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 0886827a8..000000000
--- a/test/apps/testing/ALOY-839/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.lbl = Ti.UI.createLabel({
-        text: "This is a label",
-        id: "lbl"
-    });
-    $.__views.index.add($.__views.lbl);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-842/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-842/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 4fa915adf..000000000
--- a/test/apps/testing/ALOY-842/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    require("specs/index")($);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-842/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-842/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 9ad10e711..000000000
--- a/test/apps/testing/ALOY-842/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,37 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    require("specs/index")($);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-846/_generated/blackberry/alloy/controllers/detailWin.js b/test/apps/testing/ALOY-846/_generated/blackberry/alloy/controllers/detailWin.js
deleted file mode 100644
index 115d88533..000000000
--- a/test/apps/testing/ALOY-846/_generated/blackberry/alloy/controllers/detailWin.js
+++ /dev/null
@@ -1,45 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "detailWin";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.detailWin = Ti.UI.createWindow({
-        id: "detailWin",
-        title: "test 2 title"
-    });
-    $.__views.detailWin && $.addTopLevelView($.__views.detailWin);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        color: "#000",
-        text: "Detail Window",
-        id: "__alloyId0"
-    });
-    $.__views.detailWin.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-846/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-846/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 76004dc04..000000000
--- a/test/apps/testing/ALOY-846/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,67 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createTabGroup({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.__alloyId1 = Ti.UI.createTab({
-        window: void 0,
-        title: "Tab 1",
-        icon: "KS_nav_ui.png",
-        id: "__alloyId1"
-    });
-    $.__views.index.addTab($.__views.__alloyId1);
-    $.__views.__alloyId3 = Ti.UI.createWindow({
-        title: "Tab 2",
-        id: "__alloyId3"
-    });
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        color: "#000",
-        text: "I am Window 2",
-        id: "__alloyId4"
-    });
-    $.__views.__alloyId3.add($.__views.__alloyId4);
-    $.__views.__alloyId2 = Ti.UI.createTab({
-        window: $.__views.__alloyId3,
-        title: "Tab 2",
-        icon: "KS_nav_views.png",
-        id: "__alloyId2"
-    });
-    $.__views.index.addTab($.__views.__alloyId2);
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    Alloy.Globals.detail_navGroup = $.detail_navGroup;
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-846/_generated/blackberry/alloy/controllers/testwindow.js b/test/apps/testing/ALOY-846/_generated/blackberry/alloy/controllers/testwindow.js
deleted file mode 100644
index 98e9781ae..000000000
--- a/test/apps/testing/ALOY-846/_generated/blackberry/alloy/controllers/testwindow.js
+++ /dev/null
@@ -1,49 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "testwindow";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.testwin = Ti.UI.createWindow({
-        id: "testwin"
-    });
-    $.__views.testwin && $.addTopLevelView($.__views.testwin);
-    $.__views.__alloyId5 = Ti.UI.createLabel({
-        color: "#000",
-        text: "Label",
-        id: "__alloyId5"
-    });
-    $.__views.testwin.add($.__views.__alloyId5);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.testwin.addEventListener("click", function() {
-        Alloy.Globals.detail_navGroup.open(Alloy.createController("detailWin").getView(), {
-            animated: true
-        });
-    });
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-846/_generated/mobileweb/alloy/controllers/detailWin.js b/test/apps/testing/ALOY-846/_generated/mobileweb/alloy/controllers/detailWin.js
deleted file mode 100644
index 40d9cd0de..000000000
--- a/test/apps/testing/ALOY-846/_generated/mobileweb/alloy/controllers/detailWin.js
+++ /dev/null
@@ -1,39 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "detailWin";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.detailWin = Ti.UI.createWindow({
-        id: "detailWin",
-        title: "test 2 title"
-    });
-    $.__views.detailWin && $.addTopLevelView($.__views.detailWin);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        color: "#000",
-        text: "Detail Window",
-        id: "__alloyId0"
-    });
-    $.__views.detailWin.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-846/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-846/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index e699d0b73..000000000
--- a/test/apps/testing/ALOY-846/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __alloyId1 = [];
-    $.__views.__alloyId3 = Ti.UI.createWindow({
-        title: "Tab 2",
-        id: "__alloyId3"
-    });
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        color: "#000",
-        text: "I am Window 2",
-        id: "__alloyId4"
-    });
-    $.__views.__alloyId3.add($.__views.__alloyId4);
-    $.__views.__alloyId2 = Ti.UI.createTab({
-        window: $.__views.__alloyId3,
-        title: "Tab 2",
-        icon: "KS_nav_views.png",
-        id: "__alloyId2"
-    });
-    __alloyId1.push($.__views.__alloyId2);
-    $.__views.index = Ti.UI.createTabGroup({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        tabs: __alloyId1,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    Alloy.Globals.detail_navGroup = $.detail_navGroup;
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-846/_generated/mobileweb/alloy/controllers/testwindow.js b/test/apps/testing/ALOY-846/_generated/mobileweb/alloy/controllers/testwindow.js
deleted file mode 100644
index ffc998d6e..000000000
--- a/test/apps/testing/ALOY-846/_generated/mobileweb/alloy/controllers/testwindow.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "testwindow";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.testwin = Ti.UI.createWindow({
-        id: "testwin"
-    });
-    $.__views.testwin && $.addTopLevelView($.__views.testwin);
-    $.__views.__alloyId5 = Ti.UI.createLabel({
-        color: "#000",
-        text: "Label",
-        id: "__alloyId5"
-    });
-    $.__views.testwin.add($.__views.__alloyId5);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.testwin.addEventListener("click", function() {
-        Alloy.Globals.detail_navGroup.open(Alloy.createController("detailWin").getView(), {
-            animated: true
-        });
-    });
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-858/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-858/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index b720486b0..000000000
--- a/test/apps/testing/ALOY-858/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,81 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        top: "30dp",
-        color: "#222",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        left: 20,
-        textid: "hello_world",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createLabel({
-        top: "30dp",
-        color: "#222",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        left: 20,
-        textid: "mytheme__hello_world",
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createImageView({
-        image: "/images/a.png",
-        id: "__alloyId3"
-    });
-    $.__views.index.add($.__views.__alloyId3);
-    $.__views.widget_random = Alloy.createWidget("com.random.widget", "widget", {
-        id: "widget_random",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.widget_random.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-858/_generated/blackberry/alloy/widgets/com.random.widget/controllers/widget.js b/test/apps/testing/ALOY-858/_generated/blackberry/alloy/widgets/com.random.widget/controllers/widget.js
deleted file mode 100644
index faa407b11..000000000
--- a/test/apps/testing/ALOY-858/_generated/blackberry/alloy/widgets/com.random.widget/controllers/widget.js
+++ /dev/null
@@ -1,64 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.random.widget/" + s : s.substring(0, index) + "/com.random.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("com.random.widget");
-    this.__widgetId = "com.random.widget";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.header = Ti.UI.createLabel({
-        top: "20dp",
-        color: "gray",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        right: 20,
-        text: "This is com.random.widget",
-        id: "header"
-    });
-    $.__views.header && $.addTopLevelView($.__views.header);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        top: "5dp",
-        color: "gray",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        right: 20,
-        text: L("random__welcome"),
-        id: "__alloyId0"
-    });
-    $.__views.__alloyId0 && $.addTopLevelView($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-858/_generated/blackberry/alloy/widgets/com.random.widget/styles/widget.js b/test/apps/testing/ALOY-858/_generated/blackberry/alloy/widgets/com.random.widget/styles/widget.js
deleted file mode 100644
index 7c524b755..000000000
--- a/test/apps/testing/ALOY-858/_generated/blackberry/alloy/widgets/com.random.widget/styles/widget.js
+++ /dev/null
@@ -1,29 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.random.widget/" + s : s.substring(0, index) + "/com.random.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0002,
-    key: "Label",
-    style: {
-        top: "5dp",
-        color: "gray",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        right: 20
-    }
-}, {
-    isId: true,
-    priority: 100000.0003,
-    key: "header",
-    style: {
-        top: "20dp"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-858/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-858/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index ec9756bdb..000000000
--- a/test/apps/testing/ALOY-858/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,75 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        top: "30dp",
-        color: "#222",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        left: 20,
-        textid: "hello_world",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        top: "30dp",
-        color: "#222",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        left: 20,
-        textid: "mytheme__hello_world",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createImageView({
-        image: "/images/a.png",
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    $.__views.widget_random = Alloy.createWidget("com.random.widget", "widget", {
-        id: "widget_random",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.widget_random.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-858/_generated/mobileweb/alloy/widgets/com.random.widget/controllers/widget.js b/test/apps/testing/ALOY-858/_generated/mobileweb/alloy/widgets/com.random.widget/controllers/widget.js
deleted file mode 100644
index ccc5d062b..000000000
--- a/test/apps/testing/ALOY-858/_generated/mobileweb/alloy/widgets/com.random.widget/controllers/widget.js
+++ /dev/null
@@ -1,64 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.random.widget/" + s : s.substring(0, index) + "/com.random.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("com.random.widget");
-    this.__widgetId = "com.random.widget";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.header = Ti.UI.createLabel({
-        top: "20dp",
-        color: "gray",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        right: 20,
-        text: "This is com.random.widget",
-        id: "header"
-    });
-    $.__views.header && $.addTopLevelView($.__views.header);
-    $.__views.widget = Ti.UI.createLabel({
-        top: "5dp",
-        color: "gray",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        right: 20,
-        text: L("random__welcome"),
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-858/_generated/mobileweb/alloy/widgets/com.random.widget/styles/widget.js b/test/apps/testing/ALOY-858/_generated/mobileweb/alloy/widgets/com.random.widget/styles/widget.js
deleted file mode 100644
index 03be5f925..000000000
--- a/test/apps/testing/ALOY-858/_generated/mobileweb/alloy/widgets/com.random.widget/styles/widget.js
+++ /dev/null
@@ -1,29 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.random.widget/" + s : s.substring(0, index) + "/com.random.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "Label",
-    style: {
-        top: "5dp",
-        color: "gray",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        right: 20
-    }
-}, {
-    isId: true,
-    priority: 100000.0002,
-    key: "header",
-    style: {
-        top: "20dp"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-858/config.json b/test/apps/testing/ALOY-858/config.json
index c5c05af4b..2a0e4ebf3 100644
--- a/test/apps/testing/ALOY-858/config.json
+++ b/test/apps/testing/ALOY-858/config.json
@@ -6,9 +6,7 @@
 	"env:test": {},
 	"env:production": {},
 	"os:android": {},
-	"os:blackberry": {},
 	"os:ios": {},
-	"os:mobileweb": {},
 	"dependencies": {
 		"com.random.widget": "1.0"
 	}
diff --git a/test/apps/testing/ALOY-858/widgets/com.random.widget/widget.json b/test/apps/testing/ALOY-858/widgets/com.random.widget/widget.json
index 77b9b12cd..faad8fdfa 100644
--- a/test/apps/testing/ALOY-858/widgets/com.random.widget/widget.json
+++ b/test/apps/testing/ALOY-858/widgets/com.random.widget/widget.json
@@ -9,5 +9,5 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"2.1",
 	"tags":"",
-	"platforms":"android,blackberry,ios,mobileweb"
+	"platforms":"android,blackberry,ios"
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-86/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-86/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index ce52c7ca8..000000000
--- a/test/apps/testing/ALOY-86/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId3 = [];
-    $.__views.__alloyId4 = Alloy.createWidget("classic", "widget", {
-        id: "__alloyId4"
-    });
-    __alloyId3.push($.__views.__alloyId4.getViewEx({
-        recurse: true
-    }));
-    $.__views.__alloyId7 = Alloy.createWidget("npm", "widget", {
-        id: "__alloyId7"
-    });
-    __alloyId3.push($.__views.__alloyId7.getViewEx({
-        recurse: true
-    }));
-    $.__views.__alloyId0 = Ti.UI.createTableView({
-        top: 20,
-        data: __alloyId3,
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-86/_generated/mobileweb/alloy/widgets/classic/controllers/widget.js b/test/apps/testing/ALOY-86/_generated/mobileweb/alloy/widgets/classic/controllers/widget.js
deleted file mode 100644
index 1d635f7f1..000000000
--- a/test/apps/testing/ALOY-86/_generated/mobileweb/alloy/widgets/classic/controllers/widget.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "classic/" + s : s.substring(0, index) + "/classic/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("classic");
-    this.__widgetId = "classic";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createTableViewRow({
-        title: "I'm the classic widget",
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-86/_generated/mobileweb/alloy/widgets/classic/styles/widget.js b/test/apps/testing/ALOY-86/_generated/mobileweb/alloy/widgets/classic/styles/widget.js
deleted file mode 100644
index 9778ea270..000000000
--- a/test/apps/testing/ALOY-86/_generated/mobileweb/alloy/widgets/classic/styles/widget.js
+++ /dev/null
@@ -1,14 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "classic/" + s : s.substring(0, index) + "/classic/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "Label",
-    style: {
-        top: 20
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-86/_generated/mobileweb/alloy/widgets/npm/controllers/widget.js b/test/apps/testing/ALOY-86/_generated/mobileweb/alloy/widgets/npm/controllers/widget.js
deleted file mode 100644
index 1d1da8349..000000000
--- a/test/apps/testing/ALOY-86/_generated/mobileweb/alloy/widgets/npm/controllers/widget.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "npm/" + s : s.substring(0, index) + "/npm/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("npm");
-    this.__widgetId = "npm";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createTableViewRow({
-        title: "I'm the NPM widget",
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-86/_generated/mobileweb/alloy/widgets/npm/styles/widget.js b/test/apps/testing/ALOY-86/_generated/mobileweb/alloy/widgets/npm/styles/widget.js
deleted file mode 100644
index b091452a9..000000000
--- a/test/apps/testing/ALOY-86/_generated/mobileweb/alloy/widgets/npm/styles/widget.js
+++ /dev/null
@@ -1,14 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "npm/" + s : s.substring(0, index) + "/npm/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0002,
-    key: "Label",
-    style: {
-        top: 20
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-868/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-868/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index cda8cde23..000000000
--- a/test/apps/testing/ALOY-868/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,53 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createTabGroup({
-        id: "index"
-    });
-    $.__views.index = Ti.UI.createWindow({
-        id: "index",
-        backgroundColor: "#fff"
-    });
-    $.__views.__alloyId1 = Alloy.createController("next", {
-        id: "__alloyId1",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId1.setParent($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createTab({
-        window: $.__views.index,
-        id: "__alloyId0"
-    });
-    $.__views.index.addTab($.__views.__alloyId0);
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-868/_generated/blackberry/alloy/controllers/next.js b/test/apps/testing/ALOY-868/_generated/blackberry/alloy/controllers/next.js
deleted file mode 100644
index 6172914e6..000000000
--- a/test/apps/testing/ALOY-868/_generated/blackberry/alloy/controllers/next.js
+++ /dev/null
@@ -1,37 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "next";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        var __parentSymbol = __processArg(arguments[0], "__parentSymbol");
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.next = Alloy.createController("next2", {
-        id: "next",
-        __parentSymbol: __parentSymbol
-    });
-    $.__views.next && $.addTopLevelView($.__views.next);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-868/_generated/blackberry/alloy/controllers/next2.js b/test/apps/testing/ALOY-868/_generated/blackberry/alloy/controllers/next2.js
deleted file mode 100644
index e90b2d9ea..000000000
--- a/test/apps/testing/ALOY-868/_generated/blackberry/alloy/controllers/next2.js
+++ /dev/null
@@ -1,34 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "next2";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-868/_generated/ios/alloy/controllers/next2.js b/test/apps/testing/ALOY-868/_generated/ios/alloy/controllers/next2.js
index 0a3a5012f..b5fa8aa36 100644
--- a/test/apps/testing/ALOY-868/_generated/ios/alloy/controllers/next2.js
+++ b/test/apps/testing/ALOY-868/_generated/ios/alloy/controllers/next2.js
@@ -25,7 +25,7 @@ function Controller() {
         font: {
             fontSize: "16dp"
         },
-        text: "ios/mobileweb - hi there",
+        text: "ios - hi there",
         id: "__alloyId3"
     });
     __parentSymbol.titleControl = $.__views.__alloyId3;
diff --git a/test/apps/testing/ALOY-868/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-868/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index dc32c4d23..000000000
--- a/test/apps/testing/ALOY-868/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,49 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __alloyId0 = [];
-    $.__views.index = Ti.UI.createWindow({
-        id: "index",
-        backgroundColor: "#fff"
-    });
-    $.__views.__alloyId2 = Alloy.createController("next", {
-        id: "__alloyId2",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId2.setParent($.__views.index);
-    $.__views.__alloyId1 = Ti.UI.createTab({
-        window: $.__views.index,
-        id: "__alloyId1"
-    });
-    __alloyId0.push($.__views.__alloyId1);
-    $.__views.index = Ti.UI.createTabGroup({
-        tabs: __alloyId0,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-868/_generated/mobileweb/alloy/controllers/next.js b/test/apps/testing/ALOY-868/_generated/mobileweb/alloy/controllers/next.js
deleted file mode 100644
index 6aea00166..000000000
--- a/test/apps/testing/ALOY-868/_generated/mobileweb/alloy/controllers/next.js
+++ /dev/null
@@ -1,33 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "next";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        var __parentSymbol = __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.next = Alloy.createController("next2", {
-        id: "next",
-        __parentSymbol: __parentSymbol
-    });
-    $.__views.next && $.addTopLevelView($.__views.next);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-868/_generated/mobileweb/alloy/controllers/next2.js b/test/apps/testing/ALOY-868/_generated/mobileweb/alloy/controllers/next2.js
deleted file mode 100644
index 0a3a5012f..000000000
--- a/test/apps/testing/ALOY-868/_generated/mobileweb/alloy/controllers/next2.js
+++ /dev/null
@@ -1,40 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "next2";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        var __parentSymbol = __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.__alloyId3 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "black",
-        font: {
-            fontSize: "16dp"
-        },
-        text: "ios/mobileweb - hi there",
-        id: "__alloyId3"
-    });
-    __parentSymbol.titleControl = $.__views.__alloyId3;
-    $.__views.next2 && $.addTopLevelView($.__views.next2);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-868/views/next2.xml b/test/apps/testing/ALOY-868/views/next2.xml
index c6afafdcb..c631b8cc6 100644
--- a/test/apps/testing/ALOY-868/views/next2.xml
+++ b/test/apps/testing/ALOY-868/views/next2.xml
@@ -1,6 +1,6 @@
 <Alloy>
-	<TitleControl platform="ios,mobileweb">
-		<Label>ios/mobileweb - hi there</Label>
+	<TitleControl platform="ios">
+		<Label>ios - hi there</Label>
 	</TitleControl>
 	<Label platform="android">android - hi there</Label>
 </Alloy>
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-871/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-871/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index ce061808e..000000000
--- a/test/apps/testing/ALOY-871/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,144 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        layout: "vertical",
-        backgroundColor: "white",
-        top: 20,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.title1 = Ti.UI.createLabel(function() {
-        var o = {};
-        _.extend(o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && _.extend(o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        _.extend(o, {
-            color: "blue"
-        });
-        Alloy.Globals.someProperty && _.extend(o, {
-            text: "Overriding platform with custom TSS"
-        });
-        _.extend(o, {
-            id: "title1"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title1);
-    $.__views.title2 = Ti.UI.createLabel(function() {
-        var o = {};
-        _.extend(o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && _.extend(o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        _.extend(o, {
-            color: "blue",
-            id: "title2"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title2);
-    $.__views.title3 = Ti.UI.createLabel(function() {
-        var o = {};
-        _.extend(o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && _.extend(o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        _.extend(o, {
-            color: "blue",
-            text: "You should see this for label 3",
-            id: "title3"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title3);
-    $.__views.title4 = Ti.UI.createLabel(function() {
-        var o = {};
-        _.extend(o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && _.extend(o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        _.extend(o, {
-            id: "title4"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title4);
-    if (Alloy.Globals.someProperty) {
-        $.__views.title5 = Ti.UI.createLabel(function() {
-            var o = {};
-            _.extend(o, {
-                top: 10,
-                text: "Default label text",
-                font: {
-                    fontSize: "14dp"
-                }
-            });
-            Alloy.Globals.someProperty && _.extend(o, {
-                text: "Custom TSS: Alloy.Globals.someProperty==true"
-            });
-            _.extend(o, {
-                color: "blue",
-                id: "title5"
-            });
-            return o;
-        }());
-        $.__views.index.add($.__views.title5);
-    }
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-871/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-871/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index f23327e9b..000000000
--- a/test/apps/testing/ALOY-871/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,143 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        layout: "vertical",
-        backgroundColor: "white",
-        top: 20,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.title1 = Ti.UI.createLabel(function() {
-        var o = {};
-        Alloy.deepExtend(true, o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && Alloy.deepExtend(true, o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        Alloy.deepExtend(true, o, {
-            color: "blue"
-        });
-        Alloy.Globals.someProperty && Alloy.deepExtend(true, o, {
-            text: "Overriding platform with custom TSS"
-        });
-        Alloy.deepExtend(true, o, {
-            id: "title1"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title1);
-    $.__views.title2 = Ti.UI.createLabel(function() {
-        var o = {};
-        Alloy.deepExtend(true, o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && Alloy.deepExtend(true, o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        Alloy.deepExtend(true, o, {
-            color: "blue"
-        });
-        Alloy.Globals.someProperty && Alloy.deepExtend(true, o, {
-            text: "Platform: MobileWeb, Alloy.Globals.someProperty==true"
-        });
-        Alloy.deepExtend(true, o, {
-            id: "title2"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title2);
-    $.__views.title3 = Ti.UI.createLabel(function() {
-        var o = {};
-        Alloy.deepExtend(true, o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && Alloy.deepExtend(true, o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        Alloy.deepExtend(true, o, {
-            color: "blue",
-            text: "You should see this for label 3",
-            id: "title3"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title3);
-    $.__views.title4 = Ti.UI.createLabel(function() {
-        var o = {};
-        Alloy.deepExtend(true, o, {
-            top: 10,
-            text: "Default label text",
-            font: {
-                fontSize: "14dp"
-            }
-        });
-        Alloy.Globals.someProperty && Alloy.deepExtend(true, o, {
-            text: "Custom TSS: Alloy.Globals.someProperty==true"
-        });
-        Alloy.deepExtend(true, o, {
-            id: "title4"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.title4);
-    if (Alloy.Globals.someProperty) {
-        $.__views.title5 = Ti.UI.createLabel(function() {
-            var o = {};
-            Alloy.deepExtend(true, o, {
-                top: 10,
-                text: "Default label text",
-                font: {
-                    fontSize: "14dp"
-                }
-            });
-            Alloy.Globals.someProperty && Alloy.deepExtend(true, o, {
-                text: "Custom TSS: Alloy.Globals.someProperty==true"
-            });
-            Alloy.deepExtend(true, o, {
-                color: "blue",
-                id: "title5"
-            });
-            return o;
-        }());
-        $.__views.index.add($.__views.title5);
-    }
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-871/styles/index.tss b/test/apps/testing/ALOY-871/styles/index.tss
index 23582a2e7..206defaa7 100644
--- a/test/apps/testing/ALOY-871/styles/index.tss
+++ b/test/apps/testing/ALOY-871/styles/index.tss
@@ -37,9 +37,6 @@
 "#title2[platform=ios if=Alloy.Globals.someProperty]": {
 	text: "Platform: iOS, Alloy.Globals.someProperty==true"
 }
-"#title2[platform=mobileweb if=Alloy.Globals.someProperty]": {
-	text: "Platform: MobileWeb, Alloy.Globals.someProperty==true"
-}
 
 /* ID selector overrides other selectors if platform is iOS */
 "#title3":{
diff --git a/test/apps/testing/ALOY-874/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-874/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 2e9596ac5..000000000
--- a/test/apps/testing/ALOY-874/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,165 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId13(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId13.opts || {};
-        var models = __alloyId12.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId9 = models[i];
-            __alloyId9.__transform = {};
-            var __alloyId11 = Ti.UI.createTableViewRow({
-                title: "undefined" != typeof __alloyId9.__transform["title"] ? __alloyId9.__transform["title"] : __alloyId9.get("title")
-            });
-            rows.push(__alloyId11);
-        }
-        $.__views.__alloyId2.setData(rows);
-    }
-    function __alloyId29(e) {
-        if (e && e.fromAdapter) return;
-        var opts = __alloyId29.opts || {};
-        var models = __alloyId28.models;
-        var len = models.length;
-        var __alloyId18 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId25 = models[i];
-            __alloyId25.__transform = {};
-            var __alloyId27 = {
-                properties: {
-                    title: "undefined" != typeof __alloyId25.__transform["title"] ? __alloyId25.__transform["title"] : __alloyId25.get("title")
-                }
-            };
-            __alloyId18.push(__alloyId27);
-        }
-        opts.animation ? $.__views.__alloyId17.setItems(__alloyId18, opts.animation) : $.__views.__alloyId17.setItems(__alloyId18);
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.test = Alloy.createCollection("test");
-    $.__views.index = Ti.UI.createTabGroup({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.__alloyId1 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        title: "table",
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId4 = Ti.UI.createView({
-        height: "60",
-        id: "__alloyId4"
-    });
-    $.__views.__alloyId5 = Ti.UI.createLabel({
-        text: "Header",
-        id: "__alloyId5"
-    });
-    $.__views.__alloyId4.add($.__views.__alloyId5);
-    $.__views.__alloyId7 = Ti.UI.createView({
-        height: "60",
-        id: "__alloyId7"
-    });
-    $.__views.__alloyId8 = Ti.UI.createLabel({
-        text: "Footer",
-        id: "__alloyId8"
-    });
-    $.__views.__alloyId7.add($.__views.__alloyId8);
-    $.__views.__alloyId2 = Ti.UI.createTableView({
-        headerView: $.__views.__alloyId4,
-        footerView: $.__views.__alloyId7,
-        id: "__alloyId2"
-    });
-    $.__views.__alloyId1.add($.__views.__alloyId2);
-    var __alloyId12 = Alloy.Collections["$.test"] || $.test;
-    __alloyId12.on("fetch destroy change add remove reset", __alloyId13);
-    $.__views.__alloyId0 = Ti.UI.createTab({
-        window: $.__views.__alloyId1,
-        title: "table",
-        id: "__alloyId0"
-    });
-    $.__views.index.addTab($.__views.__alloyId0);
-    $.__views.__alloyId15 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        title: "list",
-        id: "__alloyId15"
-    });
-    $.__views.__alloyId20 = Ti.UI.createView({
-        height: "60",
-        id: "__alloyId20"
-    });
-    $.__views.__alloyId21 = Ti.UI.createLabel({
-        text: "Header",
-        id: "__alloyId21"
-    });
-    $.__views.__alloyId20.add($.__views.__alloyId21);
-    $.__views.__alloyId23 = Ti.UI.createView({
-        height: "60",
-        id: "__alloyId23"
-    });
-    $.__views.__alloyId24 = Ti.UI.createLabel({
-        text: "Footer",
-        id: "__alloyId24"
-    });
-    $.__views.__alloyId23.add($.__views.__alloyId24);
-    $.__views.__alloyId17 = Ti.UI.createListSection({
-        headerView: $.__views.__alloyId20,
-        footerView: $.__views.__alloyId23,
-        id: "__alloyId17"
-    });
-    var __alloyId28 = Alloy.Collections["$.test"] || $.test;
-    __alloyId28.on("fetch destroy change add remove reset", __alloyId29);
-    var __alloyId30 = [];
-    __alloyId30.push($.__views.__alloyId17);
-    $.__views.__alloyId16 = Ti.UI.createListView({
-        sections: __alloyId30,
-        id: "__alloyId16"
-    });
-    $.__views.__alloyId15.add($.__views.__alloyId16);
-    $.__views.__alloyId14 = Ti.UI.createTab({
-        window: $.__views.__alloyId15,
-        title: "list",
-        id: "__alloyId14"
-    });
-    $.__views.index.addTab($.__views.__alloyId14);
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {
-        __alloyId12.off("fetch destroy change add remove reset", __alloyId13);
-        __alloyId28.off("fetch destroy change add remove reset", __alloyId29);
-    };
-    _.extend($, $.__views);
-    $.index.open();
-    $.test.add({
-        title: "this is my row"
-    });
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-874/_generated/blackberry/alloy/models/Test.js b/test/apps/testing/ALOY-874/_generated/blackberry/alloy/models/Test.js
deleted file mode 100644
index 9f5e71b09..000000000
--- a/test/apps/testing/ALOY-874/_generated/blackberry/alloy/models/Test.js
+++ /dev/null
@@ -1,25 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            title: "String"
-        },
-        adapter: {
-            type: "properties",
-            collection_name: "test"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("test", exports.definition, []);
-
-collection = Alloy.C("test", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-874/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-874/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 44777c40c..000000000
--- a/test/apps/testing/ALOY-874/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,161 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId14(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId14.opts || {};
-        var models = __alloyId13.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId10 = models[i];
-            __alloyId10.__transform = _.isFunction(__alloyId10.transform) ? __alloyId10.transform() : __alloyId10.toJSON();
-            var __alloyId12 = Ti.UI.createTableViewRow({
-                title: __alloyId10.__transform.title
-            });
-            rows.push(__alloyId12);
-        }
-        $.__views.__alloyId3.setData(rows);
-    }
-    function __alloyId30(e) {
-        if (e && e.fromAdapter) return;
-        var opts = __alloyId30.opts || {};
-        var models = __alloyId29.models;
-        var len = models.length;
-        var __alloyId19 = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId26 = models[i];
-            __alloyId26.__transform = _.isFunction(__alloyId26.transform) ? __alloyId26.transform() : __alloyId26.toJSON();
-            var __alloyId28 = {
-                properties: {
-                    title: __alloyId26.__transform.title
-                }
-            };
-            __alloyId19.push(__alloyId28);
-        }
-        opts.animation ? $.__views.__alloyId18.setItems(__alloyId19, opts.animation) : $.__views.__alloyId18.setItems(__alloyId19);
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.test = Alloy.createCollection("test");
-    var __alloyId0 = [];
-    $.__views.__alloyId2 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        title: "table",
-        id: "__alloyId2"
-    });
-    $.__views.__alloyId5 = Ti.UI.createView({
-        height: 60,
-        id: "__alloyId5"
-    });
-    $.__views.__alloyId6 = Ti.UI.createLabel({
-        text: "Header",
-        id: "__alloyId6"
-    });
-    $.__views.__alloyId5.add($.__views.__alloyId6);
-    $.__views.__alloyId8 = Ti.UI.createView({
-        height: 60,
-        id: "__alloyId8"
-    });
-    $.__views.__alloyId9 = Ti.UI.createLabel({
-        text: "Footer",
-        id: "__alloyId9"
-    });
-    $.__views.__alloyId8.add($.__views.__alloyId9);
-    $.__views.__alloyId3 = Ti.UI.createTableView({
-        headerView: $.__views.__alloyId5,
-        footerView: $.__views.__alloyId8,
-        id: "__alloyId3"
-    });
-    $.__views.__alloyId2.add($.__views.__alloyId3);
-    var __alloyId13 = Alloy.Collections["$.test"] || $.test;
-    __alloyId13.on("fetch destroy change add remove reset", __alloyId14);
-    $.__views.__alloyId1 = Ti.UI.createTab({
-        window: $.__views.__alloyId2,
-        title: "table",
-        id: "__alloyId1"
-    });
-    __alloyId0.push($.__views.__alloyId1);
-    $.__views.__alloyId16 = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        title: "list",
-        id: "__alloyId16"
-    });
-    $.__views.__alloyId21 = Ti.UI.createView({
-        height: 60,
-        id: "__alloyId21"
-    });
-    $.__views.__alloyId22 = Ti.UI.createLabel({
-        text: "Header",
-        id: "__alloyId22"
-    });
-    $.__views.__alloyId21.add($.__views.__alloyId22);
-    $.__views.__alloyId24 = Ti.UI.createView({
-        height: 60,
-        id: "__alloyId24"
-    });
-    $.__views.__alloyId25 = Ti.UI.createLabel({
-        text: "Footer",
-        id: "__alloyId25"
-    });
-    $.__views.__alloyId24.add($.__views.__alloyId25);
-    $.__views.__alloyId18 = Ti.UI.createListSection({
-        headerView: $.__views.__alloyId21,
-        footerView: $.__views.__alloyId24,
-        id: "__alloyId18"
-    });
-    var __alloyId29 = Alloy.Collections["$.test"] || $.test;
-    __alloyId29.on("fetch destroy change add remove reset", __alloyId30);
-    var __alloyId31 = [];
-    __alloyId31.push($.__views.__alloyId18);
-    $.__views.__alloyId17 = Ti.UI.createListView({
-        sections: __alloyId31,
-        id: "__alloyId17"
-    });
-    $.__views.__alloyId16.add($.__views.__alloyId17);
-    $.__views.__alloyId15 = Ti.UI.createTab({
-        window: $.__views.__alloyId16,
-        title: "list",
-        id: "__alloyId15"
-    });
-    __alloyId0.push($.__views.__alloyId15);
-    $.__views.index = Ti.UI.createTabGroup({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        tabs: __alloyId0,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {
-        __alloyId13 && __alloyId13.off("fetch destroy change add remove reset", __alloyId14);
-        __alloyId29 && __alloyId29.off("fetch destroy change add remove reset", __alloyId30);
-    };
-    _.extend($, $.__views);
-    $.index.open();
-    $.test.add({
-        title: "this is my row"
-    });
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-874/_generated/mobileweb/alloy/models/Test.js b/test/apps/testing/ALOY-874/_generated/mobileweb/alloy/models/Test.js
deleted file mode 100644
index b48ef94b6..000000000
--- a/test/apps/testing/ALOY-874/_generated/mobileweb/alloy/models/Test.js
+++ /dev/null
@@ -1,25 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            title: "String"
-        },
-        adapter: {
-            type: "properties",
-            collection_name: "test"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("test", exports.definition, []);
-
-collection = Alloy.C("test", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-884/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-884/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 8828797d9..000000000
--- a/test/apps/testing/ALOY-884/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-884/_generated/blackberry/alloy/widgets/com.foo.widget/controllers/image.js b/test/apps/testing/ALOY-884/_generated/blackberry/alloy/widgets/com.foo.widget/controllers/image.js
deleted file mode 100644
index 1f4b3625a..000000000
--- a/test/apps/testing/ALOY-884/_generated/blackberry/alloy/widgets/com.foo.widget/controllers/image.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.foo.widget/" + s : s.substring(0, index) + "/com.foo.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("com.foo.widget");
-    this.__widgetId = "com.foo.widget";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "image";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.image = Ti.UI.createImageView({
-        image: "/com.foo.widget/back.jpg",
-        height: Ti.UI.FILL,
-        width: Ti.UI.FILL,
-        id: "image"
-    });
-    $.__views.image && $.addTopLevelView($.__views.image);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-884/_generated/blackberry/alloy/widgets/com.foo.widget/controllers/widget.js b/test/apps/testing/ALOY-884/_generated/blackberry/alloy/widgets/com.foo.widget/controllers/widget.js
deleted file mode 100644
index e7ea38e2d..000000000
--- a/test/apps/testing/ALOY-884/_generated/blackberry/alloy/widgets/com.foo.widget/controllers/widget.js
+++ /dev/null
@@ -1,92 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.foo.widget/" + s : s.substring(0, index) + "/com.foo.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("com.foo.widget");
-    this.__widgetId = "com.foo.widget";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createView({
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    $.__views.t = Ti.UI.createLabel({
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        text: "Click a button to display something",
-        color: "red",
-        id: "t"
-    });
-    $.__views.widget.add($.__views.t);
-    $.__views.hl = Ti.UI.createView({
-        layout: "horizontal",
-        width: Ti.UI.FILL,
-        height: "100",
-        id: "hl"
-    });
-    $.__views.widget.add($.__views.hl);
-    $.__views.a = Ti.UI.createButton({
-        title: "A",
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        id: "a"
-    });
-    $.__views.hl.add($.__views.a);
-    $.__views.b = Ti.UI.createButton({
-        title: "B",
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        id: "b"
-    });
-    $.__views.hl.add($.__views.b);
-    $.__views.c = Ti.UI.createButton({
-        title: "C",
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        id: "c"
-    });
-    $.__views.hl.add($.__views.c);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.a.addEventListener("click", function() {
-        $.t.text = "You clicked A";
-    });
-    $.b.addEventListener("click", function() {
-        $.t.text = "You clicked B";
-    });
-    $.c.addEventListener("click", function() {
-        $.t.text = "You clicked C";
-    });
-    exports.setText = function(text) {
-        $.t.text = text;
-    };
-    exports.getText = function() {
-        return $.t.text;
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-884/_generated/blackberry/alloy/widgets/com.foo.widget/styles/image.js b/test/apps/testing/ALOY-884/_generated/blackberry/alloy/widgets/com.foo.widget/styles/image.js
deleted file mode 100644
index 26f81a86f..000000000
--- a/test/apps/testing/ALOY-884/_generated/blackberry/alloy/widgets/com.foo.widget/styles/image.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.foo.widget/" + s : s.substring(0, index) + "/com.foo.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-884/_generated/blackberry/alloy/widgets/com.foo.widget/styles/widget.js b/test/apps/testing/ALOY-884/_generated/blackberry/alloy/widgets/com.foo.widget/styles/widget.js
deleted file mode 100644
index 2187b6e7e..000000000
--- a/test/apps/testing/ALOY-884/_generated/blackberry/alloy/widgets/com.foo.widget/styles/widget.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.foo.widget/" + s : s.substring(0, index) + "/com.foo.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isId: true,
-    priority: 100000.0002,
-    key: "t",
-    style: {
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        text: "Click a button to display something",
-        color: "red"
-    }
-}, {
-    isId: true,
-    priority: 100000.0003,
-    key: "hl",
-    style: {
-        layout: "horizontal",
-        width: Ti.UI.FILL,
-        height: "100"
-    }
-}, {
-    isId: true,
-    priority: 100000.0004,
-    key: "a",
-    style: {
-        title: "A",
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE
-    }
-}, {
-    isId: true,
-    priority: 100000.0005,
-    key: "b",
-    style: {
-        title: "B",
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE
-    }
-}, {
-    isId: true,
-    priority: 100000.0006,
-    key: "c",
-    style: {
-        title: "C",
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-884/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-884/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index f3df35efd..000000000
--- a/test/apps/testing/ALOY-884/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-884/_generated/mobileweb/alloy/widgets/com.foo.widget/controllers/image.js b/test/apps/testing/ALOY-884/_generated/mobileweb/alloy/widgets/com.foo.widget/controllers/image.js
deleted file mode 100644
index a18a542e9..000000000
--- a/test/apps/testing/ALOY-884/_generated/mobileweb/alloy/widgets/com.foo.widget/controllers/image.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.foo.widget/" + s : s.substring(0, index) + "/com.foo.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("com.foo.widget");
-    this.__widgetId = "com.foo.widget";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "image";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.image = Ti.UI.createImageView({
-        image: "/com.foo.widget/back.jpg",
-        height: Ti.UI.FILL,
-        width: Ti.UI.FILL,
-        id: "image"
-    });
-    $.__views.image && $.addTopLevelView($.__views.image);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-884/_generated/mobileweb/alloy/widgets/com.foo.widget/controllers/widget.js b/test/apps/testing/ALOY-884/_generated/mobileweb/alloy/widgets/com.foo.widget/controllers/widget.js
deleted file mode 100644
index 89eec370b..000000000
--- a/test/apps/testing/ALOY-884/_generated/mobileweb/alloy/widgets/com.foo.widget/controllers/widget.js
+++ /dev/null
@@ -1,92 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.foo.widget/" + s : s.substring(0, index) + "/com.foo.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("com.foo.widget");
-    this.__widgetId = "com.foo.widget";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createView({
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    $.__views.t = Ti.UI.createLabel({
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        text: "Click a button to display something",
-        color: "red",
-        id: "t"
-    });
-    $.__views.widget.add($.__views.t);
-    $.__views.hl = Ti.UI.createView({
-        layout: "horizontal",
-        width: Ti.UI.FILL,
-        height: "100",
-        id: "hl"
-    });
-    $.__views.widget.add($.__views.hl);
-    $.__views.a = Ti.UI.createButton({
-        title: "A",
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        id: "a"
-    });
-    $.__views.hl.add($.__views.a);
-    $.__views.b = Ti.UI.createButton({
-        title: "B",
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        id: "b"
-    });
-    $.__views.hl.add($.__views.b);
-    $.__views.c = Ti.UI.createButton({
-        title: "C",
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        id: "c"
-    });
-    $.__views.hl.add($.__views.c);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.a.addEventListener("click", function() {
-        $.t.text = "You clicked A";
-    });
-    $.b.addEventListener("click", function() {
-        $.t.text = "You clicked B";
-    });
-    $.c.addEventListener("click", function() {
-        $.t.text = "You clicked C";
-    });
-    exports.setText = function(text) {
-        $.t.text = text;
-    };
-    exports.getText = function() {
-        return $.t.text;
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-884/_generated/mobileweb/alloy/widgets/com.foo.widget/styles/image.js b/test/apps/testing/ALOY-884/_generated/mobileweb/alloy/widgets/com.foo.widget/styles/image.js
deleted file mode 100644
index 26f81a86f..000000000
--- a/test/apps/testing/ALOY-884/_generated/mobileweb/alloy/widgets/com.foo.widget/styles/image.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.foo.widget/" + s : s.substring(0, index) + "/com.foo.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-884/_generated/mobileweb/alloy/widgets/com.foo.widget/styles/widget.js b/test/apps/testing/ALOY-884/_generated/mobileweb/alloy/widgets/com.foo.widget/styles/widget.js
deleted file mode 100644
index 628fd7e5d..000000000
--- a/test/apps/testing/ALOY-884/_generated/mobileweb/alloy/widgets/com.foo.widget/styles/widget.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.foo.widget/" + s : s.substring(0, index) + "/com.foo.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isId: true,
-    priority: 100000.0001,
-    key: "t",
-    style: {
-        textAlign: Ti.UI.TEXT_ALIGNMENT_LEFT,
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        text: "Click a button to display something",
-        color: "red"
-    }
-}, {
-    isId: true,
-    priority: 100000.0002,
-    key: "hl",
-    style: {
-        layout: "horizontal",
-        width: Ti.UI.FILL,
-        height: "100"
-    }
-}, {
-    isId: true,
-    priority: 100000.0003,
-    key: "a",
-    style: {
-        title: "A",
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE
-    }
-}, {
-    isId: true,
-    priority: 100000.0004,
-    key: "b",
-    style: {
-        title: "B",
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE
-    }
-}, {
-    isId: true,
-    priority: 100000.0005,
-    key: "c",
-    style: {
-        title: "C",
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-895/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-895/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index db88e781d..000000000
--- a/test/apps/testing/ALOY-895/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,118 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId13(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId13.opts || {};
-        var models = __alloyId12.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId5 = models[i];
-            __alloyId5.__transform = {};
-            var __alloyId7 = Ti.UI.createTableViewRow({});
-            rows.push(__alloyId7);
-            var __alloyId9 = Ti.UI.createLabel({
-                left: 5,
-                text: "undefined" != typeof __alloyId5.__transform["name"] ? __alloyId5.__transform["name"] : __alloyId5.get("name")
-            });
-            __alloyId7.add(__alloyId9);
-            var __alloyId11 = Ti.UI.createSwitch({
-                right: 5,
-                value: "undefined" != typeof __alloyId5.__transform["status"] ? __alloyId5.__transform["status"] : __alloyId5.get("status")
-            });
-            __alloyId7.add(__alloyId11);
-        }
-        $.__views.table.setData(rows);
-    }
-    function toggleState() {
-        _.each(Alloy.Collections.heroes.models, function(model) {
-            model.set("status", Math.random() > .5);
-        });
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    Alloy.Collections.instance("heroes");
-    $.__views.__alloyId2 = Ti.UI.createWindow({
-        title: "data switches",
-        id: "__alloyId2"
-    });
-    $.__views.__alloyId4 = Ti.UI.createButton({
-        title: "toggle",
-        id: "__alloyId4"
-    });
-    toggleState ? $.__views.__alloyId4.addEventListener("click", toggleState) : __defers["$.__views.__alloyId4!click!toggleState"] = true;
-    $.__views.__alloyId2.rightNavButton = $.__views.__alloyId4;
-    $.__views.table = Ti.UI.createTableView({
-        id: "table",
-        top: "20"
-    });
-    $.__views.__alloyId2.add($.__views.table);
-    var __alloyId12 = Alloy.Collections["heroes"] || heroes;
-    __alloyId12.on("fetch destroy change add remove reset", __alloyId13);
-    $.__views.index = Ti.UI.iOS.createNavigationWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        window: $.__views.__alloyId2,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {
-        __alloyId12.off("fetch destroy change add remove reset", __alloyId13);
-    };
-    _.extend($, $.__views);
-    if (!Ti.App.Properties.hasProperty("seeded")) {
-        Alloy.Collections.heroes.reset([ {
-            name: "Superman",
-            status: false
-        }, {
-            name: "Batman",
-            status: true
-        }, {
-            name: "Spiderman",
-            status: false
-        }, {
-            name: "Wonder Woman",
-            status: true
-        }, {
-            name: "Tony Lukasavage",
-            status: false
-        } ]);
-        Alloy.Collections.heroes.each(function(_m) {
-            _m.save();
-        });
-        Ti.App.Properties.setString("seeded", "yuppers");
-        Alloy.Collections.heroes.fetch();
-    }
-    Alloy.Collections.heroes.fetch();
-    $.index.open();
-    __defers["$.__views.__alloyId4!click!toggleState"] && $.__views.__alloyId4.addEventListener("click", toggleState);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-895/_generated/blackberry/alloy/models/Heroes.js b/test/apps/testing/ALOY-895/_generated/blackberry/alloy/models/Heroes.js
deleted file mode 100644
index b89ba1ac7..000000000
--- a/test/apps/testing/ALOY-895/_generated/blackberry/alloy/models/Heroes.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            name: "text",
-            status: "integer"
-        },
-        defaults: {
-            name: "",
-            captured: 0
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "heroes"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("heroes", exports.definition, []);
-
-collection = Alloy.C("heroes", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-895/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-895/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index a672489a0..000000000
--- a/test/apps/testing/ALOY-895/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,112 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function __alloyId13(e) {
-        if (e && e.fromAdapter) return;
-        __alloyId13.opts || {};
-        var models = __alloyId12.models;
-        var len = models.length;
-        var rows = [];
-        for (var i = 0; len > i; i++) {
-            var __alloyId5 = models[i];
-            __alloyId5.__transform = _.isFunction(__alloyId5.transform) ? __alloyId5.transform() : __alloyId5.toJSON();
-            var __alloyId7 = Ti.UI.createTableViewRow({});
-            rows.push(__alloyId7);
-            var __alloyId9 = Ti.UI.createLabel({
-                left: 5,
-                text: __alloyId5.__transform.name
-            });
-            __alloyId7.add(__alloyId9);
-            var __alloyId11 = Ti.UI.createSwitch({
-                right: 5,
-                value: __alloyId5.__transform.status
-            });
-            __alloyId7.add(__alloyId11);
-        }
-        $.__views.table.setData(rows);
-    }
-    function toggleState() {
-        _.each(Alloy.Collections.heroes.models, function(model) {
-            model.set("status", Math.random() > .5);
-        });
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    Alloy.Collections.instance("heroes");
-    $.__views.__alloyId2 = Ti.UI.createWindow({
-        title: "data switches",
-        id: "__alloyId2"
-    });
-    $.__views.__alloyId4 = Ti.UI.createButton({
-        title: "toggle",
-        id: "__alloyId4"
-    });
-    toggleState ? $.addListener($.__views.__alloyId4, "click", toggleState) : __defers["$.__views.__alloyId4!click!toggleState"] = true;
-    $.__views.__alloyId2.rightNavButton = $.__views.__alloyId4;
-    $.__views.table = Ti.UI.createTableView({
-        id: "table",
-        top: 20
-    });
-    $.__views.__alloyId2.add($.__views.table);
-    var __alloyId12 = Alloy.Collections["heroes"] || heroes;
-    __alloyId12.on("fetch destroy change add remove reset", __alloyId13);
-    $.__views.index = Ti.UI.iOS.createNavigationWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        window: $.__views.__alloyId2,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {
-        __alloyId12 && __alloyId12.off("fetch destroy change add remove reset", __alloyId13);
-    };
-    _.extend($, $.__views);
-    if (!Ti.App.Properties.hasProperty("seeded")) {
-        Alloy.Collections.heroes.reset([ {
-            name: "Superman",
-            status: false
-        }, {
-            name: "Batman",
-            status: true
-        }, {
-            name: "Spiderman",
-            status: false
-        }, {
-            name: "Wonder Woman",
-            status: true
-        }, {
-            name: "Tony Lukasavage",
-            status: false
-        } ]);
-        Alloy.Collections.heroes.each(function(_m) {
-            _m.save();
-        });
-        Ti.App.Properties.setString("seeded", "yuppers");
-        Alloy.Collections.heroes.fetch();
-    }
-    Alloy.Collections.heroes.fetch();
-    $.index.open();
-    __defers["$.__views.__alloyId4!click!toggleState"] && $.addListener($.__views.__alloyId4, "click", toggleState);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-895/_generated/mobileweb/alloy/models/Heroes.js b/test/apps/testing/ALOY-895/_generated/mobileweb/alloy/models/Heroes.js
deleted file mode 100644
index 35c311d0e..000000000
--- a/test/apps/testing/ALOY-895/_generated/mobileweb/alloy/models/Heroes.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            name: "text",
-            status: "integer"
-        },
-        defaults: {
-            name: "",
-            captured: 0
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "heroes"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("heroes", exports.definition, []);
-
-collection = Alloy.C("heroes", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-897/_generated/blackberry/alloy/controllers/LandingPage.js b/test/apps/testing/ALOY-897/_generated/blackberry/alloy/controllers/LandingPage.js
deleted file mode 100644
index c9c16d5a9..000000000
--- a/test/apps/testing/ALOY-897/_generated/blackberry/alloy/controllers/LandingPage.js
+++ /dev/null
@@ -1,58 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function closeWindow() {
-        $.landingPageWindow.close();
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "LandingPage";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.landingPageWindow = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "landingPageWindow"
-    });
-    $.__views.landingPageWindow && $.addTopLevelView($.__views.landingPageWindow);
-    $.__views.__alloyId0 = Alloy.createController("middle", {
-        id: "__alloyId0",
-        __parentSymbol: $.__views.landingPageWindow
-    });
-    $.__views.__alloyId0.setParent($.__views.landingPageWindow);
-    $.__views.__alloyId1 = Ti.UI.createButton({
-        top: 200,
-        width: 200,
-        height: 50,
-        title: "CLOSE WINDOW",
-        id: "__alloyId1"
-    });
-    $.__views.landingPageWindow.add($.__views.__alloyId1);
-    closeWindow ? $.__views.__alloyId1.addEventListener("click", closeWindow) : __defers["$.__views.__alloyId1!click!closeWindow"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    __defers["$.__views.__alloyId1!click!closeWindow"] && $.__views.__alloyId1.addEventListener("click", closeWindow);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-897/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-897/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 4f1ed056a..000000000
--- a/test/apps/testing/ALOY-897/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,57 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function openWindow() {
-        Alloy.createController("LandingPage").getView().open({
-            animated: true,
-            modal: true
-        });
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId2 = Ti.UI.createButton({
-        top: 200,
-        width: 200,
-        height: 50,
-        title: "OPEN WINDOW",
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    openWindow ? $.__views.__alloyId2.addEventListener("click", openWindow) : __defers["$.__views.__alloyId2!click!openWindow"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.__alloyId2!click!openWindow"] && $.__views.__alloyId2.addEventListener("click", openWindow);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-897/_generated/blackberry/alloy/controllers/middle.js b/test/apps/testing/ALOY-897/_generated/blackberry/alloy/controllers/middle.js
deleted file mode 100644
index 66a54170c..000000000
--- a/test/apps/testing/ALOY-897/_generated/blackberry/alloy/controllers/middle.js
+++ /dev/null
@@ -1,38 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "middle";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        var __parentSymbol = __processArg(arguments[0], "__parentSymbol");
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.loading = Alloy.createWidget("test", "widget", {
-        id: "loading",
-        opacity: "0.5",
-        __parentSymbol: __parentSymbol
-    });
-    $.__views.loading && $.addTopLevelView($.__views.loading);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-897/_generated/blackberry/alloy/widgets/test/controllers/widget.js b/test/apps/testing/ALOY-897/_generated/blackberry/alloy/widgets/test/controllers/widget.js
deleted file mode 100644
index b3edf0dd6..000000000
--- a/test/apps/testing/ALOY-897/_generated/blackberry/alloy/widgets/test/controllers/widget.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "test/" + s : s.substring(0, index) + "/test/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("test");
-    this.__widgetId = "test";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.loading = Ti.UI.createView({
-        height: "50dp",
-        width: "50dp",
-        id: "loading",
-        backgroundColor: "#a00"
-    });
-    $.__views.loading && $.addTopLevelView($.__views.loading);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    for (var k in args) {
-        Ti.API.info("key: " + k);
-        $.loading[k] = args[k];
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-897/_generated/blackberry/alloy/widgets/test/styles/widget.js b/test/apps/testing/ALOY-897/_generated/blackberry/alloy/widgets/test/styles/widget.js
deleted file mode 100644
index 3df3a023f..000000000
--- a/test/apps/testing/ALOY-897/_generated/blackberry/alloy/widgets/test/styles/widget.js
+++ /dev/null
@@ -1,31 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "test/" + s : s.substring(0, index) + "/test/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "Window",
-    style: {
-        backgroundColor: "#fff"
-    }
-}, {
-    isApi: true,
-    priority: 1000.0002,
-    key: "Button",
-    style: {
-        top: 200,
-        width: 200,
-        height: 50
-    }
-}, {
-    isId: true,
-    priority: 100000.0002,
-    key: "loading",
-    style: {
-        height: 20,
-        width: 20
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-897/_generated/mobileweb/alloy/controllers/LandingPage.js b/test/apps/testing/ALOY-897/_generated/mobileweb/alloy/controllers/LandingPage.js
deleted file mode 100644
index bd2f4c8ca..000000000
--- a/test/apps/testing/ALOY-897/_generated/mobileweb/alloy/controllers/LandingPage.js
+++ /dev/null
@@ -1,52 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function closeWindow() {
-        $.landingPageWindow.close();
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "LandingPage";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.landingPageWindow = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "landingPageWindow"
-    });
-    $.__views.landingPageWindow && $.addTopLevelView($.__views.landingPageWindow);
-    $.__views.__alloyId0 = Alloy.createController("middle", {
-        id: "__alloyId0",
-        __parentSymbol: $.__views.landingPageWindow
-    });
-    $.__views.__alloyId0.setParent($.__views.landingPageWindow);
-    $.__views.__alloyId1 = Ti.UI.createButton({
-        top: 200,
-        width: 200,
-        height: 50,
-        title: "CLOSE WINDOW",
-        id: "__alloyId1"
-    });
-    $.__views.landingPageWindow.add($.__views.__alloyId1);
-    closeWindow ? $.addListener($.__views.__alloyId1, "click", closeWindow) : __defers["$.__views.__alloyId1!click!closeWindow"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    __defers["$.__views.__alloyId1!click!closeWindow"] && $.addListener($.__views.__alloyId1, "click", closeWindow);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-897/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-897/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index cd1da86ff..000000000
--- a/test/apps/testing/ALOY-897/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,51 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function openWindow() {
-        Alloy.createController("LandingPage").getView().open({
-            animated: true,
-            modal: true
-        });
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId2 = Ti.UI.createButton({
-        top: 200,
-        width: 200,
-        height: 50,
-        title: "OPEN WINDOW",
-        id: "__alloyId2"
-    });
-    $.__views.index.add($.__views.__alloyId2);
-    openWindow ? $.addListener($.__views.__alloyId2, "click", openWindow) : __defers["$.__views.__alloyId2!click!openWindow"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.__alloyId2!click!openWindow"] && $.addListener($.__views.__alloyId2, "click", openWindow);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-897/_generated/mobileweb/alloy/controllers/middle.js b/test/apps/testing/ALOY-897/_generated/mobileweb/alloy/controllers/middle.js
deleted file mode 100644
index c7dc078cc..000000000
--- a/test/apps/testing/ALOY-897/_generated/mobileweb/alloy/controllers/middle.js
+++ /dev/null
@@ -1,34 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "middle";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        var __parentSymbol = __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.loading = Alloy.createWidget("test", "widget", {
-        id: "loading",
-        opacity: .5,
-        __parentSymbol: __parentSymbol
-    });
-    $.__views.loading && $.addTopLevelView($.__views.loading);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-897/_generated/mobileweb/alloy/widgets/test/controllers/widget.js b/test/apps/testing/ALOY-897/_generated/mobileweb/alloy/widgets/test/controllers/widget.js
deleted file mode 100644
index 344c78056..000000000
--- a/test/apps/testing/ALOY-897/_generated/mobileweb/alloy/widgets/test/controllers/widget.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "test/" + s : s.substring(0, index) + "/test/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("test");
-    this.__widgetId = "test";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.loading = Ti.UI.createView({
-        height: "50dp",
-        width: "50dp",
-        id: "loading",
-        backgroundColor: "#a00"
-    });
-    $.__views.loading && $.addTopLevelView($.__views.loading);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    for (var k in args) {
-        Ti.API.info("key: " + k);
-        $.loading[k] = args[k];
-    }
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-897/_generated/mobileweb/alloy/widgets/test/styles/widget.js b/test/apps/testing/ALOY-897/_generated/mobileweb/alloy/widgets/test/styles/widget.js
deleted file mode 100644
index 542adb91d..000000000
--- a/test/apps/testing/ALOY-897/_generated/mobileweb/alloy/widgets/test/styles/widget.js
+++ /dev/null
@@ -1,31 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "test/" + s : s.substring(0, index) + "/test/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "Window",
-    style: {
-        backgroundColor: "#fff"
-    }
-}, {
-    isApi: true,
-    priority: 1000.0002,
-    key: "Button",
-    style: {
-        top: 200,
-        width: 200,
-        height: 50
-    }
-}, {
-    isId: true,
-    priority: 100000.0003,
-    key: "loading",
-    style: {
-        height: 20,
-        width: 20
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-897/widgets/test/widget.json b/test/apps/testing/ALOY-897/widgets/test/widget.json
index c7d52cf6f..291f15a1b 100644
--- a/test/apps/testing/ALOY-897/widgets/test/widget.json
+++ b/test/apps/testing/ALOY-897/widgets/test/widget.json
@@ -9,5 +9,5 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"2.1",
 	"tags":"",
-	"platforms":"android,blackberry,ios,mobileweb"
+	"platforms":"android,ios"
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-898/_generated/blackberry/alloy/controllers/LandingPage.js b/test/apps/testing/ALOY-898/_generated/blackberry/alloy/controllers/LandingPage.js
deleted file mode 100644
index addb531bf..000000000
--- a/test/apps/testing/ALOY-898/_generated/blackberry/alloy/controllers/LandingPage.js
+++ /dev/null
@@ -1,59 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function closeWindow() {
-        $.landingPageWindow.close();
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "LandingPage";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.landingPageWindow = Ti.UI.createWindow({
-        backgroundColor: "#000",
-        id: "landingPageWindow"
-    });
-    $.__views.landingPageWindow && $.addTopLevelView($.__views.landingPageWindow);
-    $.__views.loading = Alloy.createWidget("com.appcelerator.loading", "widget", {
-        id: "loading",
-        opacity: "1",
-        __parentSymbol: $.__views.landingPageWindow
-    });
-    $.__views.loading.setParent($.__views.landingPageWindow);
-    $.__views.__alloyId0 = Ti.UI.createButton({
-        top: 200,
-        width: 200,
-        height: 50,
-        title: "CLOSE WINDOW",
-        id: "__alloyId0"
-    });
-    $.__views.landingPageWindow.add($.__views.__alloyId0);
-    closeWindow ? $.__views.__alloyId0.addEventListener("click", closeWindow) : __defers["$.__views.__alloyId0!click!closeWindow"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    __defers["$.__views.__alloyId0!click!closeWindow"] && $.__views.__alloyId0.addEventListener("click", closeWindow);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-898/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-898/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index a0dbfe9ff..000000000
--- a/test/apps/testing/ALOY-898/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,57 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function openWindow() {
-        Alloy.createController("LandingPage").getView().open({
-            animated: true,
-            modal: true
-        });
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId1 = Ti.UI.createButton({
-        top: 200,
-        width: 200,
-        height: 50,
-        title: "OPEN WINDOW",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    openWindow ? $.__views.__alloyId1.addEventListener("click", openWindow) : __defers["$.__views.__alloyId1!click!openWindow"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.__alloyId1!click!openWindow"] && $.__views.__alloyId1.addEventListener("click", openWindow);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-898/_generated/blackberry/alloy/widgets/com.appcelerator.loading/controllers/widget.js b/test/apps/testing/ALOY-898/_generated/blackberry/alloy/widgets/com.appcelerator.loading/controllers/widget.js
deleted file mode 100644
index ed83cfb8c..000000000
--- a/test/apps/testing/ALOY-898/_generated/blackberry/alloy/widgets/com.appcelerator.loading/controllers/widget.js
+++ /dev/null
@@ -1,52 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.appcelerator.loading/" + s : s.substring(0, index) + "/com.appcelerator.loading/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("com.appcelerator.loading");
-    this.__widgetId = "com.appcelerator.loading";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.loading = Ti.UI.createImageView({
-        height: 20,
-        width: 20,
-        images: [ "/images/com.appcelerator.loading/00.png", "/images/com.appcelerator.loading/01.png", "/images/com.appcelerator.loading/02.png", "/images/com.appcelerator.loading/03.png", "/images/com.appcelerator.loading/04.png", "/images/com.appcelerator.loading/05.png", "/images/com.appcelerator.loading/06.png", "/images/com.appcelerator.loading/07.png", "/images/com.appcelerator.loading/08.png", "/images/com.appcelerator.loading/09.png", "/images/com.appcelerator.loading/10.png", "/images/com.appcelerator.loading/11.png" ],
-        id: "loading"
-    });
-    $.__views.loading && $.addTopLevelView($.__views.loading);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    for (var k in args) {
-        if ("id" === k || /^(?:__|#|$)/.test(k)) continue;
-        $.loading[k] = args[k];
-    }
-    $.loading.start();
-    exports.setOpacity = function(opacity) {
-        $.loading.opacity = opacity;
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-898/_generated/blackberry/alloy/widgets/com.appcelerator.loading/styles/widget.js b/test/apps/testing/ALOY-898/_generated/blackberry/alloy/widgets/com.appcelerator.loading/styles/widget.js
deleted file mode 100644
index 13c27d21f..000000000
--- a/test/apps/testing/ALOY-898/_generated/blackberry/alloy/widgets/com.appcelerator.loading/styles/widget.js
+++ /dev/null
@@ -1,39 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.appcelerator.loading/" + s : s.substring(0, index) + "/com.appcelerator.loading/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "Window",
-    style: {
-        backgroundColor: "#000"
-    }
-}, {
-    isApi: true,
-    priority: 1000.0002,
-    key: "Button",
-    style: {
-        top: 200,
-        width: 200,
-        height: 50
-    }
-}, {
-    isId: true,
-    priority: 100000.0002,
-    key: "loading",
-    style: {
-        height: 20,
-        width: 20,
-        images: [ "/images/com.appcelerator.loading/00.png", "/images/com.appcelerator.loading/01.png", "/images/com.appcelerator.loading/02.png", "/images/com.appcelerator.loading/03.png", "/images/com.appcelerator.loading/04.png", "/images/com.appcelerator.loading/05.png", "/images/com.appcelerator.loading/06.png", "/images/com.appcelerator.loading/07.png", "/images/com.appcelerator.loading/08.png", "/images/com.appcelerator.loading/09.png", "/images/com.appcelerator.loading/10.png", "/images/com.appcelerator.loading/11.png" ]
-    }
-}, {
-    isId: true,
-    priority: 100000.0003,
-    key: "index",
-    style: {
-        backgroundColor: "#fff"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-898/_generated/ios/alloy/widgets/com.appcelerator.loading/controllers/widget.js b/test/apps/testing/ALOY-898/_generated/ios/alloy/widgets/com.appcelerator.loading/controllers/widget.js
index 4aa29c3b2..5c7fd0678 100644
--- a/test/apps/testing/ALOY-898/_generated/ios/alloy/widgets/com.appcelerator.loading/controllers/widget.js
+++ b/test/apps/testing/ALOY-898/_generated/ios/alloy/widgets/com.appcelerator.loading/controllers/widget.js
@@ -40,7 +40,6 @@ function Controller() {
         if ("id" === k || /^(?:__|#|$)/.test(k)) continue;
         $.loading[k] = args[k];
     }
-    "mobileweb" === Ti.Platform.osname && ($.loading.duration = 100);
     $.loading.start();
     exports.setOpacity = function(opacity) {
         $.loading.opacity = opacity;
diff --git a/test/apps/testing/ALOY-898/_generated/mobileweb/alloy/controllers/LandingPage.js b/test/apps/testing/ALOY-898/_generated/mobileweb/alloy/controllers/LandingPage.js
deleted file mode 100644
index c9422c61f..000000000
--- a/test/apps/testing/ALOY-898/_generated/mobileweb/alloy/controllers/LandingPage.js
+++ /dev/null
@@ -1,53 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function closeWindow() {
-        $.landingPageWindow.close();
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "LandingPage";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.landingPageWindow = Ti.UI.createWindow({
-        backgroundColor: "#000",
-        id: "landingPageWindow"
-    });
-    $.__views.landingPageWindow && $.addTopLevelView($.__views.landingPageWindow);
-    $.__views.loading = Alloy.createWidget("com.appcelerator.loading", "widget", {
-        id: "loading",
-        opacity: 1,
-        __parentSymbol: $.__views.landingPageWindow
-    });
-    $.__views.loading.setParent($.__views.landingPageWindow);
-    $.__views.__alloyId0 = Ti.UI.createButton({
-        top: 200,
-        width: 200,
-        height: 50,
-        title: "CLOSE WINDOW",
-        id: "__alloyId0"
-    });
-    $.__views.landingPageWindow.add($.__views.__alloyId0);
-    closeWindow ? $.addListener($.__views.__alloyId0, "click", closeWindow) : __defers["$.__views.__alloyId0!click!closeWindow"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    __defers["$.__views.__alloyId0!click!closeWindow"] && $.addListener($.__views.__alloyId0, "click", closeWindow);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-898/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-898/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 9553cd262..000000000
--- a/test/apps/testing/ALOY-898/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,51 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function openWindow() {
-        Alloy.createController("LandingPage").getView().open({
-            animated: true,
-            modal: true
-        });
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId1 = Ti.UI.createButton({
-        top: 200,
-        width: 200,
-        height: 50,
-        title: "OPEN WINDOW",
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    openWindow ? $.addListener($.__views.__alloyId1, "click", openWindow) : __defers["$.__views.__alloyId1!click!openWindow"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.__alloyId1!click!openWindow"] && $.addListener($.__views.__alloyId1, "click", openWindow);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-898/_generated/mobileweb/alloy/widgets/com.appcelerator.loading/controllers/widget.js b/test/apps/testing/ALOY-898/_generated/mobileweb/alloy/widgets/com.appcelerator.loading/controllers/widget.js
deleted file mode 100644
index 548981562..000000000
--- a/test/apps/testing/ALOY-898/_generated/mobileweb/alloy/widgets/com.appcelerator.loading/controllers/widget.js
+++ /dev/null
@@ -1,53 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.appcelerator.loading/" + s : s.substring(0, index) + "/com.appcelerator.loading/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("com.appcelerator.loading");
-    this.__widgetId = "com.appcelerator.loading";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.loading = Ti.UI.createImageView({
-        height: 20,
-        width: 20,
-        images: [ "/images/com.appcelerator.loading/00.png", "/images/com.appcelerator.loading/01.png", "/images/com.appcelerator.loading/02.png", "/images/com.appcelerator.loading/03.png", "/images/com.appcelerator.loading/04.png", "/images/com.appcelerator.loading/05.png", "/images/com.appcelerator.loading/06.png", "/images/com.appcelerator.loading/07.png", "/images/com.appcelerator.loading/08.png", "/images/com.appcelerator.loading/09.png", "/images/com.appcelerator.loading/10.png", "/images/com.appcelerator.loading/11.png" ],
-        id: "loading"
-    });
-    $.__views.loading && $.addTopLevelView($.__views.loading);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    for (var k in args) {
-        if ("id" === k || /^(?:__|#|$)/.test(k)) continue;
-        $.loading[k] = args[k];
-    }
-    $.loading.duration = 100;
-    $.loading.start();
-    exports.setOpacity = function(opacity) {
-        $.loading.opacity = opacity;
-    };
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-898/_generated/mobileweb/alloy/widgets/com.appcelerator.loading/styles/widget.js b/test/apps/testing/ALOY-898/_generated/mobileweb/alloy/widgets/com.appcelerator.loading/styles/widget.js
deleted file mode 100644
index d15b78f90..000000000
--- a/test/apps/testing/ALOY-898/_generated/mobileweb/alloy/widgets/com.appcelerator.loading/styles/widget.js
+++ /dev/null
@@ -1,39 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.appcelerator.loading/" + s : s.substring(0, index) + "/com.appcelerator.loading/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "Window",
-    style: {
-        backgroundColor: "#000"
-    }
-}, {
-    isApi: true,
-    priority: 1000.0002,
-    key: "Button",
-    style: {
-        top: 200,
-        width: 200,
-        height: 50
-    }
-}, {
-    isId: true,
-    priority: 100000.0003,
-    key: "index",
-    style: {
-        backgroundColor: "#fff"
-    }
-}, {
-    isId: true,
-    priority: 100000.0004,
-    key: "loading",
-    style: {
-        height: 20,
-        width: 20,
-        images: [ "/images/com.appcelerator.loading/00.png", "/images/com.appcelerator.loading/01.png", "/images/com.appcelerator.loading/02.png", "/images/com.appcelerator.loading/03.png", "/images/com.appcelerator.loading/04.png", "/images/com.appcelerator.loading/05.png", "/images/com.appcelerator.loading/06.png", "/images/com.appcelerator.loading/07.png", "/images/com.appcelerator.loading/08.png", "/images/com.appcelerator.loading/09.png", "/images/com.appcelerator.loading/10.png", "/images/com.appcelerator.loading/11.png" ]
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/00.png b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/00.png
deleted file mode 100755
index 59bf1852a..000000000
Binary files a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/00.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/01.png b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/01.png
deleted file mode 100755
index 18d97ebcf..000000000
Binary files a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/01.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/02.png b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/02.png
deleted file mode 100755
index f82763003..000000000
Binary files a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/02.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/03.png b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/03.png
deleted file mode 100755
index 151437c85..000000000
Binary files a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/03.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/04.png b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/04.png
deleted file mode 100755
index 7fa3db031..000000000
Binary files a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/04.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/05.png b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/05.png
deleted file mode 100755
index 36b1a1c28..000000000
Binary files a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/05.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/06.png b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/06.png
deleted file mode 100755
index 8303b1506..000000000
Binary files a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/06.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/07.png b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/07.png
deleted file mode 100755
index 47f60b7e1..000000000
Binary files a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/07.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/08.png b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/08.png
deleted file mode 100755
index 39a1a7207..000000000
Binary files a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/08.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/09.png b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/09.png
deleted file mode 100755
index d9f10f2d4..000000000
Binary files a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/09.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/10.png b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/10.png
deleted file mode 100755
index 38e08e44c..000000000
Binary files a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/10.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/11.png b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/11.png
deleted file mode 100755
index b673bf58b..000000000
Binary files a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/11.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/spinner.png b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/spinner.png
deleted file mode 100755
index da6aec5f7..000000000
Binary files a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/assets/mobileweb/images/spinner.png and /dev/null differ
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/controllers/widget.js b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/controllers/widget.js
index 19565412f..34faa23a2 100755
--- a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/controllers/widget.js
+++ b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/controllers/widget.js
@@ -50,9 +50,6 @@ for (var k in args) {
 	$.loading[k] = args[k];
 }
 
-if (Ti.Platform.osname === 'mobileweb') {
-    $.loading.duration = 100;
-}
 $.loading.start();
 
 /**
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/widget.json b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/widget.json
index 9fa6a6944..5137aa3b2 100755
--- a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/widget.json
+++ b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/widget.json
@@ -9,6 +9,6 @@
 	"min-alloy-version": "0.1.16",
 	"min-titanium-version":"2.0",
 	"tags":"utility,loading,progress",
-	"platforms":"android,ios,mobileweb",
+	"platforms":"android,ios",
 	"dependencies": {}
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-900/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-900/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index cae4fbff6..000000000
--- a/test/apps/testing/ALOY-900/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    Alloy.createCollection("weather");
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-900/_generated/blackberry/alloy/models/Weather.js b/test/apps/testing/ALOY-900/_generated/blackberry/alloy/models/Weather.js
deleted file mode 100644
index b87ea383d..000000000
--- a/test/apps/testing/ALOY-900/_generated/blackberry/alloy/models/Weather.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            city: "text",
-            id: "integer"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "cities",
-            db_file: "/weather.sqlite",
-            idAttribute: "id"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("weather", exports.definition, [ function(migration) {
-    migration.name = "weather";
-    migration.id = "201403121234567";
-    migration.up = function(migrator) {
-        migrator.db.execute("CREATE TABLE IF NOT EXISTS weather (city TEXT, id INTEGER NOT NULL, bogusField TEXT);");
-    };
-    migration.down = function(db) {
-        db.dropTable("weather");
-    };
-} ]);
-
-collection = Alloy.C("weather", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-900/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-900/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index ce3099f34..000000000
--- a/test/apps/testing/ALOY-900/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,37 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    Alloy.createCollection("weather");
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-900/_generated/mobileweb/alloy/models/Weather.js b/test/apps/testing/ALOY-900/_generated/mobileweb/alloy/models/Weather.js
deleted file mode 100644
index 5f0cafe49..000000000
--- a/test/apps/testing/ALOY-900/_generated/mobileweb/alloy/models/Weather.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            city: "text",
-            id: "integer"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "cities",
-            db_file: "/weather.sqlite",
-            idAttribute: "id"
-        }
-    },
-    extendModel: function(Model) {
-        _.extend(Model.prototype, {});
-        return Model;
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("weather", exports.definition, [ function(migration) {
-    migration.name = "weather";
-    migration.id = "201403121234567";
-    migration.up = function(migrator) {
-        migrator.db.execute("CREATE TABLE IF NOT EXISTS weather (city TEXT, id INTEGER NOT NULL, bogusField TEXT);");
-    };
-    migration.down = function(db) {
-        db.dropTable("weather");
-    };
-} ]);
-
-collection = Alloy.C("weather", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-910/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-910/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index fc6c9f42a..000000000
--- a/test/apps/testing/ALOY-910/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,111 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function openList() {
-        $.listWin.open();
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.ptr = Ti.UI.createRefreshControl({
-        id: "ptr",
-        tintColor: "#008"
-    });
-    var __alloyId0 = [];
-    $.__views.__alloyId1 = Ti.UI.createTableViewRow({
-        title: "tableview",
-        id: "__alloyId1"
-    });
-    __alloyId0.push($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createTableViewRow({
-        title: "drag down to show refreshControl",
-        id: "__alloyId2"
-    });
-    __alloyId0.push($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createTableViewRow({
-        title: "click here to open listview",
-        id: "__alloyId3"
-    });
-    __alloyId0.push($.__views.__alloyId3);
-    openList ? $.__views.__alloyId3.addEventListener("click", openList) : __defers["$.__views.__alloyId3!click!openList"] = true;
-    $.__views.jobList = Ti.UI.createTableView({
-        data: __alloyId0,
-        refreshControl: $.__views.ptr,
-        id: "jobList"
-    });
-    $.__views.index.add($.__views.jobList);
-    $.__views.listWin = Ti.UI.createWindow({
-        id: "listWin"
-    });
-    $.__views.listWin && $.addTopLevelView($.__views.listWin);
-    $.__views.ptr = Ti.UI.createRefreshControl({
-        id: "ptr",
-        tintColor: "#800"
-    });
-    var __alloyId6 = [];
-    $.__views.__alloyId7 = {
-        properties: {
-            title: "listview",
-            id: "__alloyId7"
-        }
-    };
-    __alloyId6.push($.__views.__alloyId7);
-    $.__views.__alloyId8 = {
-        properties: {
-            title: "drag down to show refreshControl",
-            id: "__alloyId8"
-        }
-    };
-    __alloyId6.push($.__views.__alloyId8);
-    $.__views.__alloyId4 = Ti.UI.createListSection({
-        id: "__alloyId4"
-    });
-    $.__views.__alloyId4.items = __alloyId6;
-    var __alloyId9 = [];
-    __alloyId9.push($.__views.__alloyId4);
-    $.__views.jobList = Ti.UI.createListView({
-        sections: __alloyId9,
-        refreshControl: $.__views.ptr,
-        id: "jobList"
-    });
-    $.__views.listWin.add($.__views.jobList);
-    openList ? $.__views.jobList.addEventListener("click", openList) : __defers["$.__views.jobList!click!openList"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.__alloyId3!click!openList"] && $.__views.__alloyId3.addEventListener("click", openList);
-    __defers["$.__views.jobList!click!openList"] && $.__views.jobList.addEventListener("click", openList);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-910/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-910/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index aff6324c7..000000000
--- a/test/apps/testing/ALOY-910/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,105 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function openList() {
-        $.listWin.open();
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.ptr = Ti.UI.createRefreshControl({
-        id: "ptr",
-        tintColor: "#008"
-    });
-    var __alloyId0 = [];
-    $.__views.__alloyId1 = Ti.UI.createTableViewRow({
-        title: "tableview",
-        id: "__alloyId1"
-    });
-    __alloyId0.push($.__views.__alloyId1);
-    $.__views.__alloyId2 = Ti.UI.createTableViewRow({
-        title: "drag down to show refreshControl",
-        id: "__alloyId2"
-    });
-    __alloyId0.push($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createTableViewRow({
-        title: "click here to open listview",
-        id: "__alloyId3"
-    });
-    __alloyId0.push($.__views.__alloyId3);
-    openList ? $.addListener($.__views.__alloyId3, "click", openList) : __defers["$.__views.__alloyId3!click!openList"] = true;
-    $.__views.jobList = Ti.UI.createTableView({
-        data: __alloyId0,
-        refreshControl: $.__views.ptr,
-        id: "jobList"
-    });
-    $.__views.index.add($.__views.jobList);
-    $.__views.listWin = Ti.UI.createWindow({
-        id: "listWin"
-    });
-    $.__views.listWin && $.addTopLevelView($.__views.listWin);
-    $.__views.ptr = Ti.UI.createRefreshControl({
-        id: "ptr",
-        tintColor: "#800"
-    });
-    var __alloyId6 = [];
-    $.__views.__alloyId7 = {
-        properties: {
-            title: "listview",
-            id: "__alloyId7"
-        }
-    };
-    __alloyId6.push($.__views.__alloyId7);
-    $.__views.__alloyId8 = {
-        properties: {
-            title: "drag down to show refreshControl",
-            id: "__alloyId8"
-        }
-    };
-    __alloyId6.push($.__views.__alloyId8);
-    $.__views.__alloyId4 = Ti.UI.createListSection({
-        id: "__alloyId4"
-    });
-    $.__views.__alloyId4.items = __alloyId6;
-    var __alloyId9 = [];
-    __alloyId9.push($.__views.__alloyId4);
-    $.__views.jobList = Ti.UI.createListView({
-        sections: __alloyId9,
-        refreshControl: $.__views.ptr,
-        id: "jobList"
-    });
-    $.__views.listWin.add($.__views.jobList);
-    openList ? $.addListener($.__views.jobList, "click", openList) : __defers["$.__views.jobList!click!openList"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.__alloyId3!click!openList"] && $.addListener($.__views.__alloyId3, "click", openList);
-    __defers["$.__views.jobList!click!openList"] && $.addListener($.__views.jobList, "click", openList);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-911/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-911/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 944455924..000000000
--- a/test/apps/testing/ALOY-911/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,158 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick() {
-        alert("I was clicked");
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.headerView = Ti.UI.createLabel({
-        backgroundColor: "#3498db",
-        height: "50dp",
-        width: Ti.UI.FILL,
-        color: "#fff",
-        font: {
-            fontSize: "32dp",
-            fontWeight: "bold"
-        },
-        textAlign: "center",
-        text: "header view",
-        id: "headerView"
-    });
-    var __alloyId1 = [];
-    $.__views.__alloyId2 = Ti.UI.createTableViewRow({
-        id: "__alloyId2"
-    });
-    __alloyId1.push($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createLabel({
-        left: "15dp",
-        height: "46dp",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        color: "#2c3e50",
-        text: "row 1",
-        id: "__alloyId3"
-    });
-    $.__views.__alloyId2.add($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createTableViewRow({
-        id: "__alloyId4"
-    });
-    __alloyId1.push($.__views.__alloyId4);
-    $.__views.__alloyId5 = Ti.UI.createLabel({
-        left: "15dp",
-        height: "46dp",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        color: "#2c3e50",
-        text: "row 2",
-        id: "__alloyId5"
-    });
-    $.__views.__alloyId4.add($.__views.__alloyId5);
-    $.__views.__alloyId6 = Ti.UI.createTableViewRow({
-        id: "__alloyId6"
-    });
-    __alloyId1.push($.__views.__alloyId6);
-    $.__views.__alloyId7 = Ti.UI.createLabel({
-        left: "15dp",
-        height: "46dp",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        color: "#2c3e50",
-        text: "row 3",
-        id: "__alloyId7"
-    });
-    $.__views.__alloyId6.add($.__views.__alloyId7);
-    $.__views.__alloyId8 = Ti.UI.createTableViewRow({
-        id: "__alloyId8"
-    });
-    __alloyId1.push($.__views.__alloyId8);
-    $.__views.__alloyId9 = Ti.UI.createLabel({
-        left: "15dp",
-        height: "46dp",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        color: "#2c3e50",
-        text: "row 4",
-        id: "__alloyId9"
-    });
-    $.__views.__alloyId8.add($.__views.__alloyId9);
-    $.__views.table = Ti.UI.createTableView({
-        top: 0,
-        bottom: "100dp",
-        separatorColor: "#95a5a6",
-        data: __alloyId1,
-        headerView: $.__views.headerView,
-        touchEnabled: true,
-        id: "table"
-    });
-    $.__views.index.add($.__views.table);
-    doClick ? $.__views.table.addEventListener("click", doClick) : __defers["$.__views.table!click!doClick"] = true;
-    $.__views.untouchable = Ti.UI.createView({
-        height: "100dp",
-        backgroundColor: "red",
-        bottom: 0,
-        touchEnabled: false,
-        id: "untouchable"
-    });
-    $.__views.index.add($.__views.untouchable);
-    doClick ? $.__views.untouchable.addEventListener("click", doClick) : __defers["$.__views.untouchable!click!doClick"] = true;
-    $.__views.untouchableLabel = Ti.UI.createLabel({
-        font: {
-            fontSize: "24dp",
-            fontWeight: "normal"
-        },
-        color: "#fff",
-        textAlign: "center",
-        text: "i won't respond to clicks",
-        touchEnabled: false,
-        id: "untouchableLabel"
-    });
-    $.__views.untouchable.add($.__views.untouchableLabel);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.table!click!doClick"] && $.__views.table.addEventListener("click", doClick);
-    __defers["$.__views.untouchable!click!doClick"] && $.__views.untouchable.addEventListener("click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-911/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-911/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 411337aaa..000000000
--- a/test/apps/testing/ALOY-911/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,152 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick() {
-        alert("I was clicked");
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.headerView = Ti.UI.createLabel({
-        backgroundColor: "#3498db",
-        height: "50dp",
-        width: Ti.UI.FILL,
-        color: "#fff",
-        font: {
-            fontSize: "32dp",
-            fontWeight: "bold"
-        },
-        textAlign: "center",
-        text: "header view",
-        id: "headerView"
-    });
-    var __alloyId1 = [];
-    $.__views.__alloyId2 = Ti.UI.createTableViewRow({
-        id: "__alloyId2"
-    });
-    __alloyId1.push($.__views.__alloyId2);
-    $.__views.__alloyId3 = Ti.UI.createLabel({
-        left: "15dp",
-        height: "46dp",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        color: "#2c3e50",
-        text: "row 1",
-        id: "__alloyId3"
-    });
-    $.__views.__alloyId2.add($.__views.__alloyId3);
-    $.__views.__alloyId4 = Ti.UI.createTableViewRow({
-        id: "__alloyId4"
-    });
-    __alloyId1.push($.__views.__alloyId4);
-    $.__views.__alloyId5 = Ti.UI.createLabel({
-        left: "15dp",
-        height: "46dp",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        color: "#2c3e50",
-        text: "row 2",
-        id: "__alloyId5"
-    });
-    $.__views.__alloyId4.add($.__views.__alloyId5);
-    $.__views.__alloyId6 = Ti.UI.createTableViewRow({
-        id: "__alloyId6"
-    });
-    __alloyId1.push($.__views.__alloyId6);
-    $.__views.__alloyId7 = Ti.UI.createLabel({
-        left: "15dp",
-        height: "46dp",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        color: "#2c3e50",
-        text: "row 3",
-        id: "__alloyId7"
-    });
-    $.__views.__alloyId6.add($.__views.__alloyId7);
-    $.__views.__alloyId8 = Ti.UI.createTableViewRow({
-        id: "__alloyId8"
-    });
-    __alloyId1.push($.__views.__alloyId8);
-    $.__views.__alloyId9 = Ti.UI.createLabel({
-        left: "15dp",
-        height: "46dp",
-        font: {
-            fontSize: "24dp",
-            fontWeight: "bold"
-        },
-        color: "#2c3e50",
-        text: "row 4",
-        id: "__alloyId9"
-    });
-    $.__views.__alloyId8.add($.__views.__alloyId9);
-    $.__views.table = Ti.UI.createTableView({
-        top: 0,
-        bottom: "100dp",
-        separatorColor: "#95a5a6",
-        data: __alloyId1,
-        headerView: $.__views.headerView,
-        touchEnabled: true,
-        id: "table"
-    });
-    $.__views.index.add($.__views.table);
-    doClick ? $.addListener($.__views.table, "click", doClick) : __defers["$.__views.table!click!doClick"] = true;
-    $.__views.untouchable = Ti.UI.createView({
-        height: "100dp",
-        backgroundColor: "red",
-        bottom: 0,
-        touchEnabled: false,
-        id: "untouchable"
-    });
-    $.__views.index.add($.__views.untouchable);
-    doClick ? $.addListener($.__views.untouchable, "click", doClick) : __defers["$.__views.untouchable!click!doClick"] = true;
-    $.__views.untouchableLabel = Ti.UI.createLabel({
-        font: {
-            fontSize: "24dp",
-            fontWeight: "normal"
-        },
-        color: "#fff",
-        textAlign: "center",
-        text: "i won't respond to clicks",
-        touchEnabled: false,
-        id: "untouchableLabel"
-    });
-    $.__views.untouchable.add($.__views.untouchableLabel);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.table!click!doClick"] && $.addListener($.__views.table, "click", doClick);
-    __defers["$.__views.untouchable!click!doClick"] && $.addListener($.__views.untouchable, "click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-912/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-912/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 5c7c8bdc0..000000000
--- a/test/apps/testing/ALOY-912/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,57 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    Alloy.isTablet && ($.__views.__alloyId2 = Ti.UI.createLabel({
-        text: "Text",
-        id: "__alloyId2"
-    }));
-    $.__views.__alloyId0 = Ti.UI.createTableView(function() {
-        var o = {};
-        Alloy.isTablet && _.extend(o, {
-            headerView: $.__views.__alloyId2
-        });
-        _.extend(o, {
-            id: "__alloyId0"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-912/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-912/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 3be4fcb64..000000000
--- a/test/apps/testing/ALOY-912/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,51 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    Alloy.isTablet && ($.__views.__alloyId2 = Ti.UI.createLabel({
-        text: "Text",
-        id: "__alloyId2"
-    }));
-    $.__views.__alloyId0 = Ti.UI.createTableView(function() {
-        var o = {};
-        Alloy.isTablet && Alloy.deepExtend(true, o, {
-            headerView: $.__views.__alloyId2
-        });
-        Alloy.deepExtend(true, o, {
-            id: "__alloyId0"
-        });
-        return o;
-    }());
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-913/_generated/blackberry/alloy/controllers/add.js b/test/apps/testing/ALOY-913/_generated/blackberry/alloy/controllers/add.js
deleted file mode 100644
index 23f2d406d..000000000
--- a/test/apps/testing/ALOY-913/_generated/blackberry/alloy/controllers/add.js
+++ /dev/null
@@ -1,95 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function addItem() {
-        var todos = Alloy.Collections.todo;
-        var task = Alloy.createModel("Todo", {
-            item: $.itemField.value,
-            done: 0
-        });
-        todos.add(task);
-        task.save();
-        todos.fetch();
-        closeWindow();
-    }
-    function focusTextField() {
-        $.itemField.focus();
-    }
-    function closeKeyboard(e) {
-        e.source.blur();
-    }
-    function closeWindow() {
-        $.addWin.close();
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "add";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.addWin = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        layout: "vertical",
-        barColor: "#a00",
-        id: "addWin",
-        title: "Add Item",
-        modal: "true"
-    });
-    $.__views.addWin && $.addTopLevelView($.__views.addWin);
-    focusTextField ? $.__views.addWin.addEventListener("open", focusTextField) : __defers["$.__views.addWin!open!focusTextField"] = true;
-    $.__views.itemField = Ti.UI.createTextField({
-        width: "90%",
-        top: "25dp",
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        returnKeyType: Ti.UI.RETURNKEY_DONE,
-        id: "itemField",
-        hintText: "What do you need to do?"
-    });
-    $.__views.addWin.add($.__views.itemField);
-    closeKeyboard ? $.__views.itemField.addEventListener("return", closeKeyboard) : __defers["$.__views.itemField!return!closeKeyboard"] = true;
-    $.__views.__alloyId0 = Ti.UI.createButton({
-        width: "50%",
-        top: "20dp",
-        title: "Add Item",
-        id: "__alloyId0"
-    });
-    $.__views.addWin.add($.__views.__alloyId0);
-    addItem ? $.__views.__alloyId0.addEventListener("click", addItem) : __defers["$.__views.__alloyId0!click!addItem"] = true;
-    $.__views.__alloyId1 = Ti.UI.createButton({
-        width: "50%",
-        top: "20dp",
-        title: "Cancel",
-        id: "__alloyId1"
-    });
-    $.__views.addWin.add($.__views.__alloyId1);
-    closeWindow ? $.__views.__alloyId1.addEventListener("click", closeWindow) : __defers["$.__views.__alloyId1!click!closeWindow"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    __defers["$.__views.addWin!open!focusTextField"] && $.__views.addWin.addEventListener("open", focusTextField);
-    __defers["$.__views.itemField!return!closeKeyboard"] && $.__views.itemField.addEventListener("return", closeKeyboard);
-    __defers["$.__views.__alloyId0!click!addItem"] && $.__views.__alloyId0.addEventListener("click", addItem);
-    __defers["$.__views.__alloyId1!click!closeWindow"] && $.__views.__alloyId1.addEventListener("click", closeWindow);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-913/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-913/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 2069ba575..000000000
--- a/test/apps/testing/ALOY-913/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var todos = Alloy.Collections.todo;
-    var INDEXES = {
-        All: 0,
-        Active: 1,
-        Done: 2
-    };
-    INDEXES["All"];
-    $.todoWin.open();
-    todos && todos.fetch();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-913/_generated/blackberry/alloy/models/Todo.js b/test/apps/testing/ALOY-913/_generated/blackberry/alloy/models/Todo.js
deleted file mode 100644
index f15e8734e..000000000
--- a/test/apps/testing/ALOY-913/_generated/blackberry/alloy/models/Todo.js
+++ /dev/null
@@ -1,27 +0,0 @@
-var Alloy = require("alloy"), _ = require("alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            item: "text",
-            done: "integer",
-            date_completed: "text"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "todo"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("todo", exports.definition, []);
-
-collection = Alloy.C("todo", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-913/_generated/mobileweb/alloy/controllers/add.js b/test/apps/testing/ALOY-913/_generated/mobileweb/alloy/controllers/add.js
deleted file mode 100644
index 4ecee7aad..000000000
--- a/test/apps/testing/ALOY-913/_generated/mobileweb/alloy/controllers/add.js
+++ /dev/null
@@ -1,89 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function addItem() {
-        var todos = Alloy.Collections.todo;
-        var task = Alloy.createModel("Todo", {
-            item: $.itemField.value,
-            done: 0
-        });
-        todos.add(task);
-        task.save();
-        todos.fetch();
-        closeWindow();
-    }
-    function focusTextField() {
-        $.itemField.focus();
-    }
-    function closeKeyboard(e) {
-        e.source.blur();
-    }
-    function closeWindow() {
-        $.addWin.close();
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "add";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.addWin = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        layout: "vertical",
-        barColor: "#a00",
-        id: "addWin",
-        title: "Add Item",
-        modal: true
-    });
-    $.__views.addWin && $.addTopLevelView($.__views.addWin);
-    focusTextField ? $.addListener($.__views.addWin, "open", focusTextField) : __defers["$.__views.addWin!open!focusTextField"] = true;
-    $.__views.itemField = Ti.UI.createTextField({
-        width: "90%",
-        top: "25dp",
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        returnKeyType: Ti.UI.RETURNKEY_DONE,
-        id: "itemField",
-        hintText: "What do you need to do?"
-    });
-    $.__views.addWin.add($.__views.itemField);
-    closeKeyboard ? $.addListener($.__views.itemField, "return", closeKeyboard) : __defers["$.__views.itemField!return!closeKeyboard"] = true;
-    $.__views.__alloyId0 = Ti.UI.createButton({
-        width: "50%",
-        top: "20dp",
-        title: "Add Item",
-        id: "__alloyId0"
-    });
-    $.__views.addWin.add($.__views.__alloyId0);
-    addItem ? $.addListener($.__views.__alloyId0, "click", addItem) : __defers["$.__views.__alloyId0!click!addItem"] = true;
-    $.__views.__alloyId1 = Ti.UI.createButton({
-        width: "50%",
-        top: "20dp",
-        title: "Cancel",
-        id: "__alloyId1"
-    });
-    $.__views.addWin.add($.__views.__alloyId1);
-    closeWindow ? $.addListener($.__views.__alloyId1, "click", closeWindow) : __defers["$.__views.__alloyId1!click!closeWindow"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    __defers["$.__views.addWin!open!focusTextField"] && $.addListener($.__views.addWin, "open", focusTextField);
-    __defers["$.__views.itemField!return!closeKeyboard"] && $.addListener($.__views.itemField, "return", closeKeyboard);
-    __defers["$.__views.__alloyId0!click!addItem"] && $.addListener($.__views.__alloyId0, "click", addItem);
-    __defers["$.__views.__alloyId1!click!closeWindow"] && $.addListener($.__views.__alloyId1, "click", closeWindow);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-913/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-913/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 231683047..000000000
--- a/test/apps/testing/ALOY-913/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,37 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var todos = Alloy.Collections.todo;
-    var INDEXES = {
-        All: 0,
-        Active: 1,
-        Done: 2
-    };
-    INDEXES["All"];
-    $.todoWin.open();
-    todos && todos.fetch();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-913/_generated/mobileweb/alloy/models/Todo.js b/test/apps/testing/ALOY-913/_generated/mobileweb/alloy/models/Todo.js
deleted file mode 100644
index e13f529fc..000000000
--- a/test/apps/testing/ALOY-913/_generated/mobileweb/alloy/models/Todo.js
+++ /dev/null
@@ -1,27 +0,0 @@
-var Alloy = require("/alloy"), _ = require("/alloy/underscore")._, model, collection;
-
-exports.definition = {
-    config: {
-        columns: {
-            item: "text",
-            done: "integer",
-            date_completed: "text"
-        },
-        adapter: {
-            type: "sql",
-            collection_name: "todo"
-        }
-    },
-    extendCollection: function(Collection) {
-        _.extend(Collection.prototype, {});
-        return Collection;
-    }
-};
-
-model = Alloy.M("todo", exports.definition, []);
-
-collection = Alloy.C("todo", exports.definition, model);
-
-exports.Model = model;
-
-exports.Collection = collection;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-916/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-916/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 0f8a26cd2..000000000
--- a/test/apps/testing/ALOY-916/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createImageView({
-        image: "/appc.png",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-916/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-916/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 50839a1b0..000000000
--- a/test/apps/testing/ALOY-916/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createImageView({
-        image: "/appc.png",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-920/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-920/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 411698dae..000000000
--- a/test/apps/testing/ALOY-920/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var should = require("should");
-    should.exist(123);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-920/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-920/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index cd74e7d0b..000000000
--- a/test/apps/testing/ALOY-920/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var should = require("should");
-    should.exist(123);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-922/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-922/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 792a1ed1a..000000000
--- a/test/apps/testing/ALOY-922/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,93 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function TFUpdate() {}
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.settingsWin = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "settingsWin",
-        title: "Settings",
-        tabBarHidden: "true"
-    });
-    $.__views.settingsWin && $.addTopLevelView($.__views.settingsWin);
-    var __alloyId0 = {};
-    var __alloyId2 = [];
-    var __alloyId3 = {
-        type: "Ti.UI.TextField",
-        bindId: "textfield",
-        properties: {
-            bindId: "textfield",
-            autocorrect: "false",
-            hintText: "User name / e-mail address"
-        },
-        events: {
-            change: TFUpdate
-        }
-    };
-    __alloyId2.push(__alloyId3);
-    var __alloyId1 = {
-        properties: {
-            name: "inputTemplate"
-        },
-        childTemplates: __alloyId2
-    };
-    __alloyId0["inputTemplate"] = __alloyId1;
-    var __alloyId5 = [];
-    $.__views.__alloyId6 = {
-        template: "inputTemplate",
-        textfield: {
-            value: ""
-        },
-        properties: {
-            id: "__alloyId6"
-        }
-    };
-    __alloyId5.push($.__views.__alloyId6);
-    $.__views.idSection = Ti.UI.createListSection({
-        headerTitle: "Login Id",
-        id: "idSection"
-    });
-    $.__views.idSection.items = __alloyId5;
-    var __alloyId7 = [];
-    __alloyId7.push($.__views.idSection);
-    $.__views.listView = Ti.UI.createListView({
-        sections: __alloyId7,
-        templates: __alloyId0,
-        id: "listView",
-        defaultItemTemplate: "template",
-        allowsSelection: "false"
-    });
-    $.__views.settingsWin.add($.__views.listView);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.settingsWin.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-922/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-922/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index eaea58b68..000000000
--- a/test/apps/testing/ALOY-922/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,87 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function TFUpdate() {}
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.settingsWin = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "settingsWin",
-        title: "Settings",
-        tabBarHidden: true
-    });
-    $.__views.settingsWin && $.addTopLevelView($.__views.settingsWin);
-    var __alloyId0 = {};
-    var __alloyId2 = [];
-    var __alloyId3 = {
-        type: "Ti.UI.TextField",
-        bindId: "textfield",
-        properties: {
-            bindId: "textfield",
-            autocorrect: false,
-            hintText: "User name / e-mail address"
-        },
-        events: {
-            change: TFUpdate
-        }
-    };
-    __alloyId2.push(__alloyId3);
-    var __alloyId1 = {
-        properties: {
-            name: "inputTemplate"
-        },
-        childTemplates: __alloyId2
-    };
-    __alloyId0["inputTemplate"] = __alloyId1;
-    var __alloyId5 = [];
-    $.__views.__alloyId6 = {
-        template: "inputTemplate",
-        textfield: {
-            value: ""
-        },
-        properties: {
-            id: "__alloyId6"
-        }
-    };
-    __alloyId5.push($.__views.__alloyId6);
-    $.__views.idSection = Ti.UI.createListSection({
-        headerTitle: "Login Id",
-        id: "idSection"
-    });
-    $.__views.idSection.items = __alloyId5;
-    var __alloyId7 = [];
-    __alloyId7.push($.__views.idSection);
-    $.__views.listView = Ti.UI.createListView({
-        sections: __alloyId7,
-        templates: __alloyId0,
-        id: "listView",
-        defaultItemTemplate: "template",
-        allowsSelection: false
-    });
-    $.__views.settingsWin.add($.__views.listView);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.settingsWin.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-923/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-923/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 78d647b86..000000000
--- a/test/apps/testing/ALOY-923/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,49 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        top: Alloy.Globals.winTop,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "This app is supported on iOS only.",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-923/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-923/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index c4c4c52c5..000000000
--- a/test/apps/testing/ALOY-923/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        top: Alloy.Globals.winTop,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "This app is supported on iOS only.",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-923/views/index.xml b/test/apps/testing/ALOY-923/views/index.xml
index 383752aa9..2410b4802 100644
--- a/test/apps/testing/ALOY-923/views/index.xml
+++ b/test/apps/testing/ALOY-923/views/index.xml
@@ -15,6 +15,6 @@
 				<ListItem template="inputTemplate" textfield:value=""/>
 			</ListSection>
 		</ListView>
-		<Label platform="android,mobileweb">This app is supported on iOS only.</Label>
+		<Label platform="android">This app is supported on iOS only.</Label>
 	</Window>
 </Alloy>
diff --git a/test/apps/testing/ALOY-927/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-927/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 9a6e9435a..000000000
--- a/test/apps/testing/ALOY-927/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,108 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        title: "Keyboard Types",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.scrolly = Ti.UI.createScrollView({
-        layout: "vertical",
-        id: "scrolly"
-    });
-    $.__views.index.add($.__views.scrolly);
-    $.__views.normal = Ti.UI.createTextField({
-        top: 40,
-        width: "85%",
-        height: "40dp",
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        keyboardType: Ti.UI.KEYBOARD_DEFAULT,
-        returnKeyType: Ti.UI.RETURNKEY_DEFAULT,
-        autocorrect: true,
-        autocapitalization: Ti.UI.TEXT_AUTOCAPITALIZATION_WORDS,
-        hintText: "default",
-        id: "normal"
-    });
-    $.__views.scrolly.add($.__views.normal);
-    $.__views.numeric = Ti.UI.createTextField({
-        top: 40,
-        width: "85%",
-        height: "40dp",
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        hintText: "numbers_punctuation / done",
-        id: "numeric",
-        keyboardType: Ti.UI.KEYBOARD_NUMBERS_PUNCTUATION,
-        returnKeyType: Ti.UI.RETURNKEY_DONE
-    });
-    $.__views.scrolly.add($.__views.numeric);
-    $.__views.web = Ti.UI.createTextField({
-        top: 40,
-        width: "85%",
-        height: "40dp",
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        hintText: "url / go",
-        id: "web",
-        keyboardType: Ti.UI.KEYBOARD_URL,
-        returnKeyType: Ti.UI.RETURNKEY_GO
-    });
-    $.__views.scrolly.add($.__views.web);
-    $.__views.password = Ti.UI.createTextField({
-        top: 40,
-        width: "85%",
-        height: "40dp",
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        keyboardType: Ti.UI.KEYBOARD_DEFAULT,
-        hintText: "password",
-        passwordMask: true,
-        autocorrect: false,
-        autocapitalization: Ti.UI.TEXT_AUTOCAPITALIZATION_NONE,
-        id: "password"
-    });
-    $.__views.scrolly.add($.__views.password);
-    $.__views.textarea = Ti.UI.createTextArea({
-        top: 40,
-        width: "85%",
-        height: "40dp",
-        borderWidth: 1,
-        borderColor: "#999",
-        keyboardType: Ti.UI.KEYBOARD_NUMBERS_PUNCTUATION,
-        returnKeyType: Ti.UI.RETURNKEY_SEND,
-        id: "textarea",
-        autocapitalization: Ti.UI.TEXT_AUTOCAPITALIZATION_ALL
-    });
-    $.__views.scrolly.add($.__views.textarea);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-927/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-927/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index d4da6a5bf..000000000
--- a/test/apps/testing/ALOY-927/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,102 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        title: "Keyboard Types",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.scrolly = Ti.UI.createScrollView({
-        layout: "vertical",
-        id: "scrolly"
-    });
-    $.__views.index.add($.__views.scrolly);
-    $.__views.normal = Ti.UI.createTextField({
-        top: 40,
-        width: "85%",
-        height: "40dp",
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        keyboardType: Ti.UI.KEYBOARD_DEFAULT,
-        returnKeyType: Ti.UI.RETURNKEY_DEFAULT,
-        autocorrect: true,
-        autocapitalization: Ti.UI.TEXT_AUTOCAPITALIZATION_WORDS,
-        hintText: "default",
-        id: "normal"
-    });
-    $.__views.scrolly.add($.__views.normal);
-    $.__views.numeric = Ti.UI.createTextField({
-        top: 40,
-        width: "85%",
-        height: "40dp",
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        hintText: "numbers_punctuation / done",
-        id: "numeric",
-        keyboardType: Ti.UI.KEYBOARD_NUMBERS_PUNCTUATION,
-        returnKeyType: Ti.UI.RETURNKEY_DONE
-    });
-    $.__views.scrolly.add($.__views.numeric);
-    $.__views.web = Ti.UI.createTextField({
-        top: 40,
-        width: "85%",
-        height: "40dp",
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        hintText: "url / go",
-        id: "web",
-        keyboardType: Ti.UI.KEYBOARD_URL,
-        returnKeyType: Ti.UI.RETURNKEY_GO
-    });
-    $.__views.scrolly.add($.__views.web);
-    $.__views.password = Ti.UI.createTextField({
-        top: 40,
-        width: "85%",
-        height: "40dp",
-        borderStyle: Ti.UI.INPUT_BORDERSTYLE_ROUNDED,
-        keyboardType: Ti.UI.KEYBOARD_DEFAULT,
-        hintText: "password",
-        passwordMask: true,
-        autocorrect: false,
-        autocapitalization: Ti.UI.TEXT_AUTOCAPITALIZATION_NONE,
-        id: "password"
-    });
-    $.__views.scrolly.add($.__views.password);
-    $.__views.textarea = Ti.UI.createTextArea({
-        top: 40,
-        width: "85%",
-        height: "40dp",
-        borderWidth: 1,
-        borderColor: "#999",
-        keyboardType: Ti.UI.KEYBOARD_NUMBERS_PUNCTUATION,
-        returnKeyType: Ti.UI.RETURNKEY_SEND,
-        id: "textarea",
-        autocapitalization: Ti.UI.TEXT_AUTOCAPITALIZATION_ALL
-    });
-    $.__views.scrolly.add($.__views.textarea);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-929/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-929/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 6bc624bfd..000000000
--- a/test/apps/testing/ALOY-929/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Alloy.createWidget("test.widget", "widget", {
-        id: "__alloyId0",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId0.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-929/_generated/blackberry/alloy/widgets/test.widget/controllers/widget.js b/test/apps/testing/ALOY-929/_generated/blackberry/alloy/widgets/test.widget/controllers/widget.js
deleted file mode 100644
index b2073e9da..000000000
--- a/test/apps/testing/ALOY-929/_generated/blackberry/alloy/widgets/test.widget/controllers/widget.js
+++ /dev/null
@@ -1,38 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "test.widget/" + s : s.substring(0, index) + "/test.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("test.widget");
-    this.__widgetId = "test.widget";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    Ti.API.info(args.children);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-929/_generated/blackberry/alloy/widgets/test.widget/styles/widget.js b/test/apps/testing/ALOY-929/_generated/blackberry/alloy/widgets/test.widget/styles/widget.js
deleted file mode 100644
index 857007204..000000000
--- a/test/apps/testing/ALOY-929/_generated/blackberry/alloy/widgets/test.widget/styles/widget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "test.widget/" + s : s.substring(0, index) + "/test.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-929/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-929/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 0cabe7362..000000000
--- a/test/apps/testing/ALOY-929/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Alloy.createWidget("test.widget", "widget", {
-        id: "__alloyId0",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId0.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-929/_generated/mobileweb/alloy/widgets/test.widget/controllers/widget.js b/test/apps/testing/ALOY-929/_generated/mobileweb/alloy/widgets/test.widget/controllers/widget.js
deleted file mode 100644
index 9234b96cb..000000000
--- a/test/apps/testing/ALOY-929/_generated/mobileweb/alloy/widgets/test.widget/controllers/widget.js
+++ /dev/null
@@ -1,38 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "test.widget/" + s : s.substring(0, index) + "/test.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("test.widget");
-    this.__widgetId = "test.widget";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var args = arguments[0] || {};
-    Ti.API.info(args.children);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-929/_generated/mobileweb/alloy/widgets/test.widget/styles/widget.js b/test/apps/testing/ALOY-929/_generated/mobileweb/alloy/widgets/test.widget/styles/widget.js
deleted file mode 100644
index 857007204..000000000
--- a/test/apps/testing/ALOY-929/_generated/mobileweb/alloy/widgets/test.widget/styles/widget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "test.widget/" + s : s.substring(0, index) + "/test.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-934/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-934/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 503c11710..000000000
--- a/test/apps/testing/ALOY-934/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,64 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function showOptions() {
-        $.dialog.show();
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId1 = [];
-    __alloyId1.push("Confirm");
-    __alloyId1.push("Cancel");
-    var __alloyId6 = [];
-    __alloyId6.push("Help");
-    $.__views.dialog = Ti.UI.createOptionDialog({
-        options: __alloyId1,
-        buttonNames: __alloyId6,
-        id: "dialog",
-        title: "Delete File?"
-    });
-    $.__views.__alloyId9 = Ti.UI.createLabel({
-        text: "Click for OptionDialog",
-        id: "__alloyId9"
-    });
-    $.__views.index.add($.__views.__alloyId9);
-    showOptions ? $.__views.__alloyId9.addEventListener("click", showOptions) : __defers["$.__views.__alloyId9!click!showOptions"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.__alloyId9!click!showOptions"] && $.__views.__alloyId9.addEventListener("click", showOptions);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-934/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-934/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 6973a33af..000000000
--- a/test/apps/testing/ALOY-934/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,58 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function showOptions() {
-        $.dialog.show();
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    var __alloyId1 = [];
-    __alloyId1.push("Confirm");
-    __alloyId1.push("Cancel");
-    var __alloyId6 = [];
-    __alloyId6.push("Help");
-    $.__views.dialog = Ti.UI.createOptionDialog({
-        options: __alloyId1,
-        buttonNames: __alloyId6,
-        id: "dialog",
-        title: "Delete File?"
-    });
-    $.__views.__alloyId9 = Ti.UI.createLabel({
-        text: "Click for OptionDialog",
-        id: "__alloyId9"
-    });
-    $.__views.index.add($.__views.__alloyId9);
-    showOptions ? $.addListener($.__views.__alloyId9, "click", showOptions) : __defers["$.__views.__alloyId9!click!showOptions"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.__alloyId9!click!showOptions"] && $.addListener($.__views.__alloyId9, "click", showOptions);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-937/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-937/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 49e8e0250..000000000
--- a/test/apps/testing/ALOY-937/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick() {
-        alert($.label.text);
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "Hello, World",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    doClick ? $.__views.label.addEventListener("click", doClick) : __defers["$.__views.label!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.label!click!doClick"] && $.__views.label.addEventListener("click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-937/_generated/blackberry/alloy/widgets/foo/controllers/widget.js b/test/apps/testing/ALOY-937/_generated/blackberry/alloy/widgets/foo/controllers/widget.js
deleted file mode 100644
index 00ad4b751..000000000
--- a/test/apps/testing/ALOY-937/_generated/blackberry/alloy/widgets/foo/controllers/widget.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "foo/" + s : s.substring(0, index) + "/foo/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("foo");
-    this.__widgetId = "foo";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createLabel({
-        color: "#000",
-        font: {
-            fontSize: 18,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        text: "I'm the default widget",
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-937/_generated/blackberry/alloy/widgets/foo/styles/widget.js b/test/apps/testing/ALOY-937/_generated/blackberry/alloy/widgets/foo/styles/widget.js
deleted file mode 100644
index dd881678e..000000000
--- a/test/apps/testing/ALOY-937/_generated/blackberry/alloy/widgets/foo/styles/widget.js
+++ /dev/null
@@ -1,20 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "foo/" + s : s.substring(0, index) + "/foo/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0002,
-    key: "Label",
-    style: {
-        color: "#000",
-        font: {
-            fontSize: 18,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-937/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-937/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 052cf27c2..000000000
--- a/test/apps/testing/ALOY-937/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick(e) {
-        alert($.label.text);
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "Hello, World",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    doClick ? $.addListener($.__views.label, "click", doClick) : __defers["$.__views.label!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.label!click!doClick"] && $.addListener($.__views.label, "click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-937/_generated/mobileweb/alloy/widgets/foo/controllers/widget.js b/test/apps/testing/ALOY-937/_generated/mobileweb/alloy/widgets/foo/controllers/widget.js
deleted file mode 100644
index fb8d0260d..000000000
--- a/test/apps/testing/ALOY-937/_generated/mobileweb/alloy/widgets/foo/controllers/widget.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "foo/" + s : s.substring(0, index) + "/foo/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("foo");
-    this.__widgetId = "foo";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.widget = Ti.UI.createLabel({
-        color: "#000",
-        font: {
-            fontSize: 18,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        text: "I'm the default widget",
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-937/_generated/mobileweb/alloy/widgets/foo/styles/widget.js b/test/apps/testing/ALOY-937/_generated/mobileweb/alloy/widgets/foo/styles/widget.js
deleted file mode 100644
index a815ef892..000000000
--- a/test/apps/testing/ALOY-937/_generated/mobileweb/alloy/widgets/foo/styles/widget.js
+++ /dev/null
@@ -1,20 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "foo/" + s : s.substring(0, index) + "/foo/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "Label",
-    style: {
-        color: "#000",
-        font: {
-            fontSize: 18,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-937/config.json b/test/apps/testing/ALOY-937/config.json
index 0aa32d166..a91b80a4d 100644
--- a/test/apps/testing/ALOY-937/config.json
+++ b/test/apps/testing/ALOY-937/config.json
@@ -4,9 +4,7 @@
     "env:test": {},
     "env:production": {},
     "os:android": {},
-    "os:blackberry": {},
     "os:ios": {},
-    "os:mobileweb": {},
     "dependencies": {
         "foo": "1.0"
     }
diff --git a/test/apps/testing/ALOY-937/widgets/foo/widget.json b/test/apps/testing/ALOY-937/widgets/foo/widget.json
index c5b0716c3..bef57c8f5 100644
--- a/test/apps/testing/ALOY-937/widgets/foo/widget.json
+++ b/test/apps/testing/ALOY-937/widgets/foo/widget.json
@@ -9,5 +9,5 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"2.1",
 	"tags":"",
-	"platforms":"android,blackberry,ios,mobileweb"
+	"platforms":"android,ios"
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-938/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-938/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index b22df2abf..000000000
--- a/test/apps/testing/ALOY-938/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,52 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow(function() {
-        var o = {};
-        Alloy.isHandheld && _.extend(o, {
-            title: "Handheld"
-        });
-        Alloy.isHandheld && _.extend(o, {
-            title: "Handheld"
-        });
-        _.extend(o, {
-            backgroundColor: "#fff",
-            fullscreen: false,
-            exitOnClose: true,
-            id: "index"
-        });
-        return o;
-    }());
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-938/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-938/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 42b72842f..000000000
--- a/test/apps/testing/ALOY-938/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,46 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow(function() {
-        var o = {};
-        Alloy.isHandheld && Alloy.deepExtend(true, o, {
-            title: "Handheld"
-        });
-        Alloy.isHandheld && Alloy.deepExtend(true, o, {
-            title: "Handheld"
-        });
-        Alloy.deepExtend(true, o, {
-            backgroundColor: "#fff",
-            fullscreen: false,
-            exitOnClose: true,
-            id: "index"
-        });
-        return o;
-    }());
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-949/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-949/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 9f2f226b7..000000000
--- a/test/apps/testing/ALOY-949/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,78 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function changeNothing() {
-        dialogs.confirm({
-            callback: changeWithExports
-        });
-    }
-    function changeWithExports() {
-        dialogs.title = "Confirm (exports)";
-        dialogs.message = "For real?";
-        dialogs.buttonNames = [ "Naaah", "Fo shizzle" ];
-        dialogs.confirm({
-            callback: changeWithArgs
-        });
-    }
-    function changeWithArgs() {
-        dialogs.confirm({
-            title: "Confirm (args.buttonNames)",
-            message: "Are the args.buttonNames working?",
-            buttonNames: [ "Nope", "Yup" ],
-            callback: changeWithArgsAgain
-        });
-    }
-    function changeWithArgsAgain() {
-        dialogs.confirm({
-            title: "Confirm (args.no:Neh & args.yes:Yeah)",
-            message: "Are the args.no & args.yes taking precedence?",
-            buttonNames: [ "Nope", "Yup" ],
-            no: "Neh",
-            yes: "Yeah",
-            callback: shouldUseExportsAgainByDefault
-        });
-    }
-    function shouldUseExportsAgainByDefault() {
-        dialogs.confirm();
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var dialogs = require("alloy/dialogs");
-    $.index.open();
-    changeNothing();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-949/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-949/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 348e38808..000000000
--- a/test/apps/testing/ALOY-949/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,72 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function changeNothing() {
-        dialogs.confirm({
-            callback: changeWithExports
-        });
-    }
-    function changeWithExports() {
-        dialogs.title = "Confirm (exports)";
-        dialogs.message = "For real?";
-        dialogs.buttonNames = [ "Naaah", "Fo shizzle" ];
-        dialogs.confirm({
-            callback: changeWithArgs
-        });
-    }
-    function changeWithArgs() {
-        dialogs.confirm({
-            title: "Confirm (args.buttonNames)",
-            message: "Are the args.buttonNames working?",
-            buttonNames: [ "Nope", "Yup" ],
-            callback: changeWithArgsAgain
-        });
-    }
-    function changeWithArgsAgain() {
-        dialogs.confirm({
-            title: "Confirm (args.no:Neh & args.yes:Yeah)",
-            message: "Are the args.no & args.yes taking precedence?",
-            buttonNames: [ "Nope", "Yup" ],
-            no: "Neh",
-            yes: "Yeah",
-            callback: shouldUseExportsAgainByDefault
-        });
-    }
-    function shouldUseExportsAgainByDefault() {
-        dialogs.confirm();
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var dialogs = require("alloy/dialogs");
-    $.index.open();
-    changeNothing();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-963/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-963/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 1db6bab8a..000000000
--- a/test/apps/testing/ALOY-963/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,59 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick() {
-        vendorLib.popup();
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = (require("specialView").createSpecialView || Ti.UI.createSpecialView)({
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    doClick ? $.__views.__alloyId0.addEventListener("click", doClick) : __defers["$.__views.__alloyId0!click!doClick"] = true;
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "Click Me!",
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId0.add($.__views.__alloyId1);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var vendorLib = require("greeting");
-    $.index.open();
-    __defers["$.__views.__alloyId0!click!doClick"] && $.__views.__alloyId0.addEventListener("click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-963/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-963/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 06f1633ae..000000000
--- a/test/apps/testing/ALOY-963/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,53 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick(e) {
-        vendorLib.popup();
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = (require("specialView").createSpecialView || Ti.UI.createSpecialView)({
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    doClick ? $.addListener($.__views.__alloyId0, "click", doClick) : __defers["$.__views.__alloyId0!click!doClick"] = true;
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#000",
-        text: "Click Me!",
-        id: "__alloyId1"
-    });
-    $.__views.__alloyId0.add($.__views.__alloyId1);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    var vendorLib = require("greeting");
-    $.index.open();
-    __defers["$.__views.__alloyId0!click!doClick"] && $.addListener($.__views.__alloyId0, "click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-967/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-967/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 7fa5c12e8..000000000
--- a/test/apps/testing/ALOY-967/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,67 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        top: "30dp",
-        color: "#222",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        left: 20,
-        text: L("hello_world"),
-        id: "__alloyId1"
-    });
-    $.__views.index.add($.__views.__alloyId1);
-    $.__views.widget_lang = Alloy.createWidget("com.language.widget", "widget", {
-        id: "widget_lang",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.widget_lang.setParent($.__views.index);
-    $.__views.widget_random = Alloy.createWidget("com.random.widget", "widget", {
-        id: "widget_random",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.widget_random.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-967/_generated/blackberry/alloy/widgets/com.language.widget/controllers/widget.js b/test/apps/testing/ALOY-967/_generated/blackberry/alloy/widgets/com.language.widget/controllers/widget.js
deleted file mode 100644
index b88ad879a..000000000
--- a/test/apps/testing/ALOY-967/_generated/blackberry/alloy/widgets/com.language.widget/controllers/widget.js
+++ /dev/null
@@ -1,62 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.language.widget/" + s : s.substring(0, index) + "/com.language.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("com.language.widget");
-    this.__widgetId = "com.language.widget";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.header = Ti.UI.createLabel({
-        top: "30dp",
-        color: "#000",
-        font: {
-            fontSize: 13,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        text: "This is com.language.widget",
-        id: "header"
-    });
-    $.__views.header && $.addTopLevelView($.__views.header);
-    $.__views.myLabel = Ti.UI.createLabel({
-        top: "5dp",
-        color: "#000",
-        font: {
-            fontSize: 13,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        text: L("language__intro_text"),
-        id: "myLabel"
-    });
-    $.__views.myLabel && $.addTopLevelView($.__views.myLabel);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-967/_generated/blackberry/alloy/widgets/com.language.widget/styles/widget.js b/test/apps/testing/ALOY-967/_generated/blackberry/alloy/widgets/com.language.widget/styles/widget.js
deleted file mode 100644
index 1c192b185..000000000
--- a/test/apps/testing/ALOY-967/_generated/blackberry/alloy/widgets/com.language.widget/styles/widget.js
+++ /dev/null
@@ -1,35 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.language.widget/" + s : s.substring(0, index) + "/com.language.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0002,
-    key: "Label",
-    style: {
-        top: "5dp",
-        color: "#000",
-        font: {
-            fontSize: 13,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE
-    }
-}, {
-    isId: true,
-    priority: 100000.0003,
-    key: "header",
-    style: {
-        top: "30dp"
-    }
-}, {
-    isId: true,
-    priority: 100000.0004,
-    key: "myLabel",
-    style: {
-        text: L("language__intro_text")
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-967/_generated/blackberry/alloy/widgets/com.random.widget/controllers/widget.js b/test/apps/testing/ALOY-967/_generated/blackberry/alloy/widgets/com.random.widget/controllers/widget.js
deleted file mode 100644
index faa407b11..000000000
--- a/test/apps/testing/ALOY-967/_generated/blackberry/alloy/widgets/com.random.widget/controllers/widget.js
+++ /dev/null
@@ -1,64 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.random.widget/" + s : s.substring(0, index) + "/com.random.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("alloy/widget"))("com.random.widget");
-    this.__widgetId = "com.random.widget";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.header = Ti.UI.createLabel({
-        top: "20dp",
-        color: "gray",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        right: 20,
-        text: "This is com.random.widget",
-        id: "header"
-    });
-    $.__views.header && $.addTopLevelView($.__views.header);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        top: "5dp",
-        color: "gray",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        right: 20,
-        text: L("random__welcome"),
-        id: "__alloyId0"
-    });
-    $.__views.__alloyId0 && $.addTopLevelView($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-967/_generated/blackberry/alloy/widgets/com.random.widget/styles/widget.js b/test/apps/testing/ALOY-967/_generated/blackberry/alloy/widgets/com.random.widget/styles/widget.js
deleted file mode 100644
index 2965cd1bb..000000000
--- a/test/apps/testing/ALOY-967/_generated/blackberry/alloy/widgets/com.random.widget/styles/widget.js
+++ /dev/null
@@ -1,29 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.random.widget/" + s : s.substring(0, index) + "/com.random.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0005,
-    key: "Label",
-    style: {
-        top: "5dp",
-        color: "gray",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        right: 20
-    }
-}, {
-    isId: true,
-    priority: 100000.0006,
-    key: "header",
-    style: {
-        top: "20dp"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-967/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-967/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 4504777d3..000000000
--- a/test/apps/testing/ALOY-967/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        top: "30dp",
-        color: "#222",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        left: 20,
-        text: L("hello_world"),
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    $.__views.widget_lang = Alloy.createWidget("com.language.widget", "widget", {
-        id: "widget_lang",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.widget_lang.setParent($.__views.index);
-    $.__views.widget_random = Alloy.createWidget("com.random.widget", "widget", {
-        id: "widget_random",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.widget_random.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-967/_generated/mobileweb/alloy/widgets/com.language.widget/controllers/widget.js b/test/apps/testing/ALOY-967/_generated/mobileweb/alloy/widgets/com.language.widget/controllers/widget.js
deleted file mode 100644
index 169465da5..000000000
--- a/test/apps/testing/ALOY-967/_generated/mobileweb/alloy/widgets/com.language.widget/controllers/widget.js
+++ /dev/null
@@ -1,62 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.language.widget/" + s : s.substring(0, index) + "/com.language.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("com.language.widget");
-    this.__widgetId = "com.language.widget";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.header = Ti.UI.createLabel({
-        top: "30dp",
-        color: "#000",
-        font: {
-            fontSize: 13,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        text: "This is com.language.widget",
-        id: "header"
-    });
-    $.__views.header && $.addTopLevelView($.__views.header);
-    $.__views.myLabel = Ti.UI.createLabel({
-        top: "5dp",
-        color: "#000",
-        font: {
-            fontSize: 13,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        text: L("language__intro_text"),
-        id: "myLabel"
-    });
-    $.__views.myLabel && $.addTopLevelView($.__views.myLabel);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-967/_generated/mobileweb/alloy/widgets/com.language.widget/styles/widget.js b/test/apps/testing/ALOY-967/_generated/mobileweb/alloy/widgets/com.language.widget/styles/widget.js
deleted file mode 100644
index ec8ced136..000000000
--- a/test/apps/testing/ALOY-967/_generated/mobileweb/alloy/widgets/com.language.widget/styles/widget.js
+++ /dev/null
@@ -1,35 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.language.widget/" + s : s.substring(0, index) + "/com.language.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0001,
-    key: "Label",
-    style: {
-        top: "5dp",
-        color: "#000",
-        font: {
-            fontSize: 13,
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE
-    }
-}, {
-    isId: true,
-    priority: 100000.0002,
-    key: "header",
-    style: {
-        top: "30dp"
-    }
-}, {
-    isId: true,
-    priority: 100000.0003,
-    key: "myLabel",
-    style: {
-        text: L("language__intro_text")
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-967/_generated/mobileweb/alloy/widgets/com.random.widget/controllers/widget.js b/test/apps/testing/ALOY-967/_generated/mobileweb/alloy/widgets/com.random.widget/controllers/widget.js
deleted file mode 100644
index ccc5d062b..000000000
--- a/test/apps/testing/ALOY-967/_generated/mobileweb/alloy/widgets/com.random.widget/controllers/widget.js
+++ /dev/null
@@ -1,64 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.random.widget/" + s : s.substring(0, index) + "/com.random.widget/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    new (require("/alloy/widget"))("com.random.widget");
-    this.__widgetId = "com.random.widget";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.header = Ti.UI.createLabel({
-        top: "20dp",
-        color: "gray",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        right: 20,
-        text: "This is com.random.widget",
-        id: "header"
-    });
-    $.__views.header && $.addTopLevelView($.__views.header);
-    $.__views.widget = Ti.UI.createLabel({
-        top: "5dp",
-        color: "gray",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        right: 20,
-        text: L("random__welcome"),
-        id: "widget"
-    });
-    $.__views.widget && $.addTopLevelView($.__views.widget);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-967/_generated/mobileweb/alloy/widgets/com.random.widget/styles/widget.js b/test/apps/testing/ALOY-967/_generated/mobileweb/alloy/widgets/com.random.widget/styles/widget.js
deleted file mode 100644
index 725a93db9..000000000
--- a/test/apps/testing/ALOY-967/_generated/mobileweb/alloy/widgets/com.random.widget/styles/widget.js
+++ /dev/null
@@ -1,29 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.random.widget/" + s : s.substring(0, index) + "/com.random.widget/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isApi: true,
-    priority: 1000.0004,
-    key: "Label",
-    style: {
-        top: "5dp",
-        color: "gray",
-        font: {
-            fontSize: "12dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        right: 20
-    }
-}, {
-    isId: true,
-    priority: 100000.0005,
-    key: "header",
-    style: {
-        top: "20dp"
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-967/config.json b/test/apps/testing/ALOY-967/config.json
index 926ead735..095a47e22 100644
--- a/test/apps/testing/ALOY-967/config.json
+++ b/test/apps/testing/ALOY-967/config.json
@@ -4,9 +4,7 @@
     "env:test": {},
     "env:production": {},
     "os:android": {},
-    "os:blackberry": {},
     "os:ios": {},
-    "os:mobileweb": {},
     "dependencies": {
         "com.language.widget": "1.0",
         "com.random.widget": "1.0"
diff --git a/test/apps/testing/ALOY-967/widgets/com.language.widget/widget.json b/test/apps/testing/ALOY-967/widgets/com.language.widget/widget.json
index bfc439e5f..2c6ba1f46 100644
--- a/test/apps/testing/ALOY-967/widgets/com.language.widget/widget.json
+++ b/test/apps/testing/ALOY-967/widgets/com.language.widget/widget.json
@@ -9,5 +9,5 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"2.1",
 	"tags":"",
-	"platforms":"android,blackberry,ios,mobileweb,tizen"
+	"platforms":"android,ios"
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-967/widgets/com.random.widget/widget.json b/test/apps/testing/ALOY-967/widgets/com.random.widget/widget.json
index 77b9b12cd..8b85f051a 100644
--- a/test/apps/testing/ALOY-967/widgets/com.random.widget/widget.json
+++ b/test/apps/testing/ALOY-967/widgets/com.random.widget/widget.json
@@ -9,5 +9,5 @@
 	"min-alloy-version": "1.0",
 	"min-titanium-version":"2.1",
 	"tags":"",
-	"platforms":"android,blackberry,ios,mobileweb"
+	"platforms":"android,ios"
 }
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-981/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-981/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 482081878..000000000
--- a/test/apps/testing/ALOY-981/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,40 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-981/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-981/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 52e359dfd..000000000
--- a/test/apps/testing/ALOY-981/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,34 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "white",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-983/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-983/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 2ba8655b6..000000000
--- a/test/apps/testing/ALOY-983/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,86 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function openPopover() {
-        var popover = Alloy.createController("popover").getView();
-        popover.show({
-            view: $.button1
-        });
-    }
-    function openPopoverWin() {
-        var popover = Alloy.createController("popover_win").getView();
-        popover.show({
-            view: $.button2
-        });
-    }
-    function openPopoverNavWin() {
-        var popover = Alloy.createController("popover_navwin").getView();
-        popover.show({
-            view: $.button3
-        });
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.button1 = Ti.UI.createButton({
-        title: "Show View-based Popover",
-        id: "button1",
-        top: "250"
-    });
-    $.__views.index.add($.__views.button1);
-    openPopover ? $.__views.button1.addEventListener("click", openPopover) : __defers["$.__views.button1!click!openPopover"] = true;
-    $.__views.button2 = Ti.UI.createButton({
-        title: "Show Window-based Popover",
-        id: "button2",
-        top: "50"
-    });
-    $.__views.index.add($.__views.button2);
-    openPopoverWin ? $.__views.button2.addEventListener("click", openPopoverWin) : __defers["$.__views.button2!click!openPopoverWin"] = true;
-    $.__views.button3 = Ti.UI.createButton({
-        title: "Show NavigationWindow-based Popover",
-        id: "button3",
-        top: "50"
-    });
-    $.__views.index.add($.__views.button3);
-    openPopoverNavWin ? $.__views.button3.addEventListener("click", openPopoverNavWin) : __defers["$.__views.button3!click!openPopoverNavWin"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.button1!click!openPopover"] && $.__views.button1.addEventListener("click", openPopover);
-    __defers["$.__views.button2!click!openPopoverWin"] && $.__views.button2.addEventListener("click", openPopoverWin);
-    __defers["$.__views.button3!click!openPopoverNavWin"] && $.__views.button3.addEventListener("click", openPopoverNavWin);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-983/_generated/blackberry/alloy/controllers/popover.js b/test/apps/testing/ALOY-983/_generated/blackberry/alloy/controllers/popover.js
deleted file mode 100644
index a2c6f283a..000000000
--- a/test/apps/testing/ALOY-983/_generated/blackberry/alloy/controllers/popover.js
+++ /dev/null
@@ -1,52 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "popover";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.popover = Ti.UI.iPad.createPopover({
-        id: "popover",
-        height: "100",
-        width: "250"
-    });
-    $.__views.popover && $.addTopLevelView($.__views.popover);
-    $.__views.popView = Ti.UI.createView({
-        id: "popView",
-        backgroundColor: "green",
-        height: "100",
-        width: "250"
-    });
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        text: "Popover with a View",
-        id: "__alloyId1"
-    });
-    $.__views.popView.add($.__views.__alloyId1);
-    $.__views.popover.contentView = $.__views.popView;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-983/_generated/blackberry/alloy/controllers/popover_navwin.js b/test/apps/testing/ALOY-983/_generated/blackberry/alloy/controllers/popover_navwin.js
deleted file mode 100644
index 9e8c0f523..000000000
--- a/test/apps/testing/ALOY-983/_generated/blackberry/alloy/controllers/popover_navwin.js
+++ /dev/null
@@ -1,57 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "popover_navwin";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.popover = Ti.UI.iPad.createPopover({
-        id: "popover",
-        height: "100",
-        width: "250"
-    });
-    $.__views.popover && $.addTopLevelView($.__views.popover);
-    $.__views.__alloyId3 = Ti.UI.createWindow({
-        title: "Navigation Window",
-        id: "__alloyId3"
-    });
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        text: "Popover with a NavigationWindow",
-        id: "__alloyId4"
-    });
-    $.__views.__alloyId3.add($.__views.__alloyId4);
-    $.__views.popViewNavWin = Ti.UI.iOS.createNavigationWindow({
-        window: $.__views.__alloyId3,
-        id: "popViewNavWin",
-        backgroundColor: "green",
-        height: "300",
-        width: "250"
-    });
-    $.__views.popover.contentView = $.__views.popViewNavWin;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-983/_generated/blackberry/alloy/controllers/popover_win.js b/test/apps/testing/ALOY-983/_generated/blackberry/alloy/controllers/popover_win.js
deleted file mode 100644
index 693c71969..000000000
--- a/test/apps/testing/ALOY-983/_generated/blackberry/alloy/controllers/popover_win.js
+++ /dev/null
@@ -1,52 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "popover_win";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.popover = Ti.UI.iPad.createPopover({
-        id: "popover",
-        height: "100",
-        width: "250"
-    });
-    $.__views.popover && $.addTopLevelView($.__views.popover);
-    $.__views.popViewWin = Ti.UI.createWindow({
-        id: "popViewWin",
-        backgroundColor: "green",
-        height: "100",
-        width: "250"
-    });
-    $.__views.__alloyId6 = Ti.UI.createLabel({
-        text: "Popover with a Window",
-        id: "__alloyId6"
-    });
-    $.__views.popViewWin.add($.__views.__alloyId6);
-    $.__views.popover.contentView = $.__views.popViewWin;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-983/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-983/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 5bf158417..000000000
--- a/test/apps/testing/ALOY-983/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,80 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function openPopover() {
-        var popover = Alloy.createController("popover").getView();
-        popover.show({
-            view: $.button1
-        });
-    }
-    function openPopoverWin() {
-        var popover = Alloy.createController("popover_win").getView();
-        popover.show({
-            view: $.button2
-        });
-    }
-    function openPopoverNavWin() {
-        var popover = Alloy.createController("popover_navwin").getView();
-        popover.show({
-            view: $.button3
-        });
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        layout: "vertical",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.button1 = Ti.UI.createButton({
-        title: "Show View-based Popover",
-        id: "button1",
-        top: 250
-    });
-    $.__views.index.add($.__views.button1);
-    openPopover ? $.addListener($.__views.button1, "click", openPopover) : __defers["$.__views.button1!click!openPopover"] = true;
-    $.__views.button2 = Ti.UI.createButton({
-        title: "Show Window-based Popover",
-        id: "button2",
-        top: 50
-    });
-    $.__views.index.add($.__views.button2);
-    openPopoverWin ? $.addListener($.__views.button2, "click", openPopoverWin) : __defers["$.__views.button2!click!openPopoverWin"] = true;
-    $.__views.button3 = Ti.UI.createButton({
-        title: "Show NavigationWindow-based Popover",
-        id: "button3",
-        top: 50
-    });
-    $.__views.index.add($.__views.button3);
-    openPopoverNavWin ? $.addListener($.__views.button3, "click", openPopoverNavWin) : __defers["$.__views.button3!click!openPopoverNavWin"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.button1!click!openPopover"] && $.addListener($.__views.button1, "click", openPopover);
-    __defers["$.__views.button2!click!openPopoverWin"] && $.addListener($.__views.button2, "click", openPopoverWin);
-    __defers["$.__views.button3!click!openPopoverNavWin"] && $.addListener($.__views.button3, "click", openPopoverNavWin);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-983/_generated/mobileweb/alloy/controllers/popover.js b/test/apps/testing/ALOY-983/_generated/mobileweb/alloy/controllers/popover.js
deleted file mode 100644
index a3f7bd254..000000000
--- a/test/apps/testing/ALOY-983/_generated/mobileweb/alloy/controllers/popover.js
+++ /dev/null
@@ -1,46 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "popover";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.popover = Ti.UI.iPad.createPopover({
-        id: "popover",
-        height: 100,
-        width: 250
-    });
-    $.__views.popover && $.addTopLevelView($.__views.popover);
-    $.__views.popView = Ti.UI.createView({
-        id: "popView",
-        backgroundColor: "green",
-        height: 100,
-        width: 250
-    });
-    $.__views.__alloyId1 = Ti.UI.createLabel({
-        text: "Popover with a View",
-        id: "__alloyId1"
-    });
-    $.__views.popView.add($.__views.__alloyId1);
-    $.__views.popover.contentView = $.__views.popView;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-983/_generated/mobileweb/alloy/controllers/popover_navwin.js b/test/apps/testing/ALOY-983/_generated/mobileweb/alloy/controllers/popover_navwin.js
deleted file mode 100644
index 43ae81702..000000000
--- a/test/apps/testing/ALOY-983/_generated/mobileweb/alloy/controllers/popover_navwin.js
+++ /dev/null
@@ -1,51 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "popover_navwin";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.popover = Ti.UI.iPad.createPopover({
-        id: "popover",
-        height: 100,
-        width: 250
-    });
-    $.__views.popover && $.addTopLevelView($.__views.popover);
-    $.__views.__alloyId3 = Ti.UI.createWindow({
-        title: "Navigation Window",
-        id: "__alloyId3"
-    });
-    $.__views.__alloyId4 = Ti.UI.createLabel({
-        text: "Popover with a NavigationWindow",
-        id: "__alloyId4"
-    });
-    $.__views.__alloyId3.add($.__views.__alloyId4);
-    $.__views.popViewNavWin = Ti.UI.iOS.createNavigationWindow({
-        window: $.__views.__alloyId3,
-        id: "popViewNavWin",
-        backgroundColor: "green",
-        height: 300,
-        width: 250
-    });
-    $.__views.popover.contentView = $.__views.popViewNavWin;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-983/_generated/mobileweb/alloy/controllers/popover_win.js b/test/apps/testing/ALOY-983/_generated/mobileweb/alloy/controllers/popover_win.js
deleted file mode 100644
index ad089b69a..000000000
--- a/test/apps/testing/ALOY-983/_generated/mobileweb/alloy/controllers/popover_win.js
+++ /dev/null
@@ -1,46 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "popover_win";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.popover = Ti.UI.iPad.createPopover({
-        id: "popover",
-        height: 100,
-        width: 250
-    });
-    $.__views.popover && $.addTopLevelView($.__views.popover);
-    $.__views.popViewWin = Ti.UI.createWindow({
-        id: "popViewWin",
-        backgroundColor: "green",
-        height: 100,
-        width: 250
-    });
-    $.__views.__alloyId6 = Ti.UI.createLabel({
-        text: "Popover with a Window",
-        id: "__alloyId6"
-    });
-    $.__views.popViewWin.add($.__views.__alloyId6);
-    $.__views.popover.contentView = $.__views.popViewWin;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-984/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-984/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 77fd4c6d7..000000000
--- a/test/apps/testing/ALOY-984/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "This example is meant for iOS only",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-984/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-984/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 6801a4184..000000000
--- a/test/apps/testing/ALOY-984/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        text: "This example is meant for iOS only",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-984/views/index.xml b/test/apps/testing/ALOY-984/views/index.xml
index 8488c37e7..86131c896 100644
--- a/test/apps/testing/ALOY-984/views/index.xml
+++ b/test/apps/testing/ALOY-984/views/index.xml
@@ -14,7 +14,7 @@
             <Label text="The window should have three colored views on the left, and three buttons on the right, of the NavigationBar."/>
         </Window>
     </NavigationWindow>
-	<Window platform="android,mobileweb">
+	<Window platform="android">
 		<Label text="This example is meant for iOS only"/>
 	</Window>
 </Alloy>
diff --git a/test/apps/testing/ALOY-991/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-991/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 1135e0e8f..000000000
--- a/test/apps/testing/ALOY-991/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick() {
-        alert("label clicked");
-    }
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        title: "ALOY-991",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#fff",
-        text: "Hello! Click Me!",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    doClick ? $.__views.label.addEventListener("click", doClick) : __defers["$.__views.label!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.label!click!doClick"] && $.__views.label.addEventListener("click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-991/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-991/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 5e3d470a5..000000000
--- a/test/apps/testing/ALOY-991/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function doClick() {
-        alert("label clicked");
-    }
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.index = Ti.UI.createWindow({
-        title: "ALOY-991",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        width: Ti.UI.SIZE,
-        height: Ti.UI.SIZE,
-        color: "#fff",
-        text: "Hello! Click Me!",
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    doClick ? $.addListener($.__views.label, "click", doClick) : __defers["$.__views.label!click!doClick"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    __defers["$.__views.label!click!doClick"] && $.addListener($.__views.label, "click", doClick);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-994/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-994/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index aaecb487c..000000000
--- a/test/apps/testing/ALOY-994/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#000",
-        modal: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        color: "#fff",
-        font: {
-            fontSize: "18dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        text: "ActionBar/Menu only supported on Android",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-994/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-994/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index f03ace0bc..000000000
--- a/test/apps/testing/ALOY-994/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#000",
-        modal: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        color: "#fff",
-        font: {
-            fontSize: "18dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        text: "ActionBar/Menu only supported on Android",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-994b/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/ALOY-994b/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index f022ed055..000000000
--- a/test/apps/testing/ALOY-994b/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        color: "#fff",
-        font: {
-            fontSize: "18dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        text: "ActionBar/Menu only supported on Android",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/ALOY-994b/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/ALOY-994b/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 9f42af948..000000000
--- a/test/apps/testing/ALOY-994b/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        fullscreen: false,
-        exitOnClose: true,
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createLabel({
-        color: "#fff",
-        font: {
-            fontSize: "18dp",
-            fontWeight: "bold"
-        },
-        height: Ti.UI.SIZE,
-        width: Ti.UI.SIZE,
-        text: "ActionBar/Menu only supported on Android",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/backbone/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/backbone/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 8af372f9f..000000000
--- a/test/apps/testing/backbone/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,45 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createWebView({
-        url: "/test.html",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/backbone/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/backbone/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 444b2ec84..000000000
--- a/test/apps/testing/backbone/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,39 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createWebView({
-        url: "/test.html",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/grammar/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/grammar/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index e034be190..000000000
--- a/test/apps/testing/grammar/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,60 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        backgroundColor: "black",
-        text: L(Alloy.CFG.someText, Alloy.CFG.someText),
-        height: Ti.UI.SIZE,
-        font: {
-            fontSize: 24,
-            fontWeight: "bold"
-        },
-        width: Ti.UI.SIZE,
-        color: "red",
-        top: 10,
-        textAlign: Titanium.UI.TEXT_ALIGNMENT_LEFT,
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    $.__views.__alloyId0 = Alloy.createWidget("com.test.hellobutton", "widget", {
-        id: "__alloyId0",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId0.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/grammar/_generated/blackberry/alloy/widgets/com.test.hellobutton/controllers/widget.js b/test/apps/testing/grammar/_generated/blackberry/alloy/widgets/com.test.hellobutton/controllers/widget.js
deleted file mode 100644
index ad071a660..000000000
--- a/test/apps/testing/grammar/_generated/blackberry/alloy/widgets/com.test.hellobutton/controllers/widget.js
+++ /dev/null
@@ -1,49 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.test.hellobutton/" + s : s.substring(0, index) + "/com.test.hellobutton/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function sayHello() {
-        require(WPATH("hello")).sayHello();
-    }
-    new (require("alloy/widget"))("com.test.hellobutton");
-    this.__widgetId = "com.test.hellobutton";
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.helloButton = Ti.UI.createButton({
-        backgroundImage: WPATH("hello.png"),
-        height: 135,
-        width: 233,
-        id: "helloButton"
-    });
-    $.__views.helloButton && $.addTopLevelView($.__views.helloButton);
-    sayHello ? $.__views.helloButton.addEventListener("click", sayHello) : __defers["$.__views.helloButton!click!sayHello"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    __defers["$.__views.helloButton!click!sayHello"] && $.__views.helloButton.addEventListener("click", sayHello);
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/grammar/_generated/blackberry/alloy/widgets/com.test.hellobutton/styles/widget.js b/test/apps/testing/grammar/_generated/blackberry/alloy/widgets/com.test.hellobutton/styles/widget.js
deleted file mode 100644
index 5eade53a3..000000000
--- a/test/apps/testing/grammar/_generated/blackberry/alloy/widgets/com.test.hellobutton/styles/widget.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.test.hellobutton/" + s : s.substring(0, index) + "/com.test.hellobutton/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isId: true,
-    priority: 100000.0002,
-    key: "helloButton",
-    style: {
-        backgroundImage: WPATH("hello.png"),
-        height: 135,
-        width: 233
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/grammar/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/grammar/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index 1587470f3..000000000
--- a/test/apps/testing/grammar/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.label = Ti.UI.createLabel({
-        backgroundColor: "black",
-        text: L(Alloy.CFG.someText, Alloy.CFG.someText),
-        height: Ti.UI.SIZE,
-        font: {
-            fontSize: 24,
-            fontWeight: "bold"
-        },
-        width: Ti.UI.SIZE,
-        color: "red",
-        top: 10,
-        textAlign: Titanium.UI.TEXT_ALIGNMENT_LEFT,
-        id: "label"
-    });
-    $.__views.index.add($.__views.label);
-    $.__views.__alloyId0 = Alloy.createWidget("com.test.hellobutton", "widget", {
-        id: "__alloyId0",
-        __parentSymbol: $.__views.index
-    });
-    $.__views.__alloyId0.setParent($.__views.index);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/grammar/_generated/mobileweb/alloy/widgets/com.test.hellobutton/controllers/widget.js b/test/apps/testing/grammar/_generated/mobileweb/alloy/widgets/com.test.hellobutton/controllers/widget.js
deleted file mode 100644
index 1a41877f9..000000000
--- a/test/apps/testing/grammar/_generated/mobileweb/alloy/widgets/com.test.hellobutton/controllers/widget.js
+++ /dev/null
@@ -1,49 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.test.hellobutton/" + s : s.substring(0, index) + "/com.test.hellobutton/" + s.substring(index + 1);
-    return path;
-}
-
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    function sayHello() {
-        require(WPATH("hello")).sayHello();
-    }
-    new (require("/alloy/widget"))("com.test.hellobutton");
-    this.__widgetId = "com.test.hellobutton";
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "widget";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    var __defers = {};
-    $.__views.helloButton = Ti.UI.createButton({
-        backgroundImage: WPATH("hello.png"),
-        height: 135,
-        width: 233,
-        id: "helloButton"
-    });
-    $.__views.helloButton && $.addTopLevelView($.__views.helloButton);
-    sayHello ? $.addListener($.__views.helloButton, "click", sayHello) : __defers["$.__views.helloButton!click!sayHello"] = true;
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    __defers["$.__views.helloButton!click!sayHello"] && $.addListener($.__views.helloButton, "click", sayHello);
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/grammar/_generated/mobileweb/alloy/widgets/com.test.hellobutton/styles/widget.js b/test/apps/testing/grammar/_generated/mobileweb/alloy/widgets/com.test.hellobutton/styles/widget.js
deleted file mode 100644
index cf749d9aa..000000000
--- a/test/apps/testing/grammar/_generated/mobileweb/alloy/widgets/com.test.hellobutton/styles/widget.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function WPATH(s) {
-    var index = s.lastIndexOf("/");
-    var path = -1 === index ? "com.test.hellobutton/" + s : s.substring(0, index) + "/com.test.hellobutton/" + s.substring(index + 1);
-    return path;
-}
-
-module.exports = [ {
-    isId: true,
-    priority: 100000.0001,
-    key: "helloButton",
-    style: {
-        backgroundImage: WPATH("hello.png"),
-        height: 135,
-        width: 233
-    }
-} ];
\ No newline at end of file
diff --git a/test/apps/testing/grammar/widgets/com.test.hellobutton/widget.json b/test/apps/testing/grammar/widgets/com.test.hellobutton/widget.json
index 55ce11375..6447327f5 100644
--- a/test/apps/testing/grammar/widgets/com.test.hellobutton/widget.json
+++ b/test/apps/testing/grammar/widgets/com.test.hellobutton/widget.json
@@ -9,6 +9,6 @@
 	"min-alloy-version": "0.2.35",
 	"min-titanium-version":"2.1",
 	"tags":"",
-	"platforms":"android,ios,mobileweb",
+	"platforms":"android,ios",
 	"dependencies": {}
 }
\ No newline at end of file
diff --git a/test/apps/testing/underscore/_generated/blackberry/alloy/controllers/index.js b/test/apps/testing/underscore/_generated/blackberry/alloy/controllers/index.js
deleted file mode 100644
index 63927a126..000000000
--- a/test/apps/testing/underscore/_generated/blackberry/alloy/controllers/index.js
+++ /dev/null
@@ -1,45 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        {
-            __processArg(arguments[0], "__parentSymbol");
-        }
-        {
-            __processArg(arguments[0], "$model");
-        }
-        {
-            __processArg(arguments[0], "__itemTemplate");
-        }
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createWebView({
-        url: "/index.html",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/apps/testing/underscore/_generated/mobileweb/alloy/controllers/index.js b/test/apps/testing/underscore/_generated/mobileweb/alloy/controllers/index.js
deleted file mode 100644
index f6fb14634..000000000
--- a/test/apps/testing/underscore/_generated/mobileweb/alloy/controllers/index.js
+++ /dev/null
@@ -1,39 +0,0 @@
-function __processArg(obj, key) {
-    var arg = null;
-    if (obj) {
-        arg = obj[key] || null;
-        delete obj[key];
-    }
-    return arg;
-}
-
-function Controller() {
-    require("/alloy/controllers/BaseController").apply(this, Array.prototype.slice.call(arguments));
-    this.__controllerPath = "index";
-    this.args = arguments[0] || {};
-    if (arguments[0]) {
-        __processArg(arguments[0], "__parentSymbol");
-        __processArg(arguments[0], "$model");
-        __processArg(arguments[0], "__itemTemplate");
-    }
-    var $ = this;
-    var exports = {};
-    $.__views.index = Ti.UI.createWindow({
-        backgroundColor: "#fff",
-        id: "index"
-    });
-    $.__views.index && $.addTopLevelView($.__views.index);
-    $.__views.__alloyId0 = Ti.UI.createWebView({
-        url: "/index.html",
-        id: "__alloyId0"
-    });
-    $.__views.index.add($.__views.__alloyId0);
-    exports.destroy = function() {};
-    _.extend($, $.__views);
-    $.index.open();
-    _.extend($, exports);
-}
-
-var Alloy = require("/alloy"), Backbone = Alloy.Backbone, _ = Alloy._;
-
-module.exports = Controller;
\ No newline at end of file
diff --git a/test/lib/testUtils.js b/test/lib/testUtils.js
index f1addacd9..d9d9ca4e0 100644
--- a/test/lib/testUtils.js
+++ b/test/lib/testUtils.js
@@ -5,9 +5,11 @@ var exec = require('child_process').exec,
 	path = require('path'),
 	JsDiff = require('diff'),
 	_ = require('lodash'),
-	babylon = require('@babel/parser'),
-	U = require('../../Alloy/utils'),
-	styler = require('../../Alloy/commands/compile/styler');
+	babylon = require('@babel/parser');
+
+const styler = require('alloy-compiler/lib/styler');
+const { utils: U } = require('alloy-utils');
+
 
 var alloyRoot = path.join(__dirname,'..','..');
 var IS_WIN = /^win/i.test(os.platform());
diff --git a/test/projects/HarnessTemplate/tiapp.xml b/test/projects/HarnessTemplate/tiapp.xml
index e85a0669a..d3c52c54b 100644
--- a/test/projects/HarnessTemplate/tiapp.xml
+++ b/test/projects/HarnessTemplate/tiapp.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ti:app xmlns:ti="http://ti.appcelerator.org">
     <deployment-targets>
-        <target device="mobileweb">true</target>
         <target device="iphone">true</target>
         <target device="ipad">true</target>
         <target device="android">true</target>
-        <target device="blackberry">true</target>
         <target device="windows">true</target>
     </deployment-targets>
     <id>com.appcelerator.AlloyHarness</id>
@@ -67,14 +65,6 @@
             </application>
         </manifest>
     </android>
-    <mobileweb>
-        <precache/>
-        <splash>
-            <enabled>true</enabled>
-            <inline-css-images>true</inline-css-images>
-        </splash>
-        <theme>default</theme>
-    </mobileweb>
     <windows>
         <!-- Add Windows specific nodes, such as orientation handling, here -->
     </windows>
@@ -82,6 +72,5 @@
         <module platform="iphone">ti.paint</module>
         <module platform="android">ti.map</module>
         <module platform="iphone">ti.map</module>
-        <module platform="windows">ti.map</module>
     </modules>
 </ti:app>
diff --git a/test/specs/alloy.js b/test/specs/alloy.js
index 13714e850..bf6ac2909 100644
--- a/test/specs/alloy.js
+++ b/test/specs/alloy.js
@@ -1,10 +1,7 @@
-var fs = require('fs'),
-	path = require('path'),
-	TU = require('../lib/testUtils'),
-	U = require('../../Alloy/utils'),
-	CONST = require('../../Alloy/common/constants');
+const { constants: CONST, utils: U } = require('alloy-utils');
+const stripAnsi = require('strip-ansi');
 
-var TIMEOUT_DEFAULT = 1000;
+var TU = require('../lib/testUtils');
 
 // The alloy command test suite
 describe('alloy', function() {
@@ -15,7 +12,7 @@ describe('alloy', function() {
 	it('displays help when it receives no arguments', function() {
 		TU.asyncExecTest('alloy', {
 			test: function() {
-				expect(U.stripColors(this.output.stdout)).toMatch(
+				expect(stripAnsi(this.output.stdout)).toMatch(
 					/Usage\:\s+alloy\s+COMMAND\s+\[ARGS\]\s+\[OPTIONS\]/);
 			}
 		});
diff --git a/test/specs/compile.js b/test/specs/compile.js
index 891f6cecb..e9211dacf 100644
--- a/test/specs/compile.js
+++ b/test/specs/compile.js
@@ -1,15 +1,11 @@
 var fs = require('fs'),
 	walkSync = require('walk-sync'),
 	path = require('path'),
-	os = require('os'),
-	colors = require('colors'),
-	exec = require('child_process').exec,
 	TU = require('../lib/testUtils'),
-	CONST = require('../../Alloy/common/constants'),
-	_ = require('lodash'),
-	tiapp = require('../../Alloy/tiapp'),
-	platforms = require('../../platforms/index'),
-	sep = process.platform !== 'win32' ? '/' : '\\';
+	platforms = require('../../platforms'),
+	_ = require('lodash');
+
+const { constants: CONST } = require('alloy-utils');
 
 var TIMEOUT_COMPILE = process.platform !== 'win32' ? 10000 : 20000;
 var TIMEOUT_PREP = process.platform !== 'win32' ? 10000 : 30000;
diff --git a/test/specs/compilefile.js b/test/specs/compilefile.js
index c50658494..c354cb249 100644
--- a/test/specs/compilefile.js
+++ b/test/specs/compilefile.js
@@ -1,17 +1,12 @@
 var fs = require('fs-extra'),
 	chmodr = require('chmodr'),
 	path = require('path'),
-	DOMParser = require('xmldom').DOMParser,
 	TU = require('../lib/testUtils'),
-	CONST = require('../../Alloy/common/constants'),
-	platforms = require('../../platforms/index'),
+	platforms = require('../../platforms'),
 	_ = require('lodash');
 
-var TIMEOUT_DEFAULT = 2000;
 var TIMEOUT_COMPILE = process.platform !== 'win32' ? 10000 : 20000;
 var TIMEOUT_PREP = process.platform !== 'win32' ? 10000 : 30000;
-var GEN_FOLDER = '_generated';
-var TEST_FOLDER = 'testing';
 
 var alloyRoot = path.join(__dirname,'..','..');
 var Harness = path.join(alloyRoot,'test','projects','Harness');
@@ -36,7 +31,7 @@ describe('alloy selective compile', function() {
 			});
 	});
 
-	_.each(platforms, function(platform,k) {
+	_.each(platforms, function(platform, k) {
 		if (process.platform !== 'win32' && platform.platform === 'blackberry') {
 			return;
 		}
diff --git a/test/specs/copy.js b/test/specs/copy.js
index f1b6329cc..e108d8324 100644
--- a/test/specs/copy.js
+++ b/test/specs/copy.js
@@ -3,7 +3,6 @@ var path = require('path'),
 	TU = require('../lib/testUtils');
 
 var alloyRoot = path.join(__dirname,'..','..');
-var templatePath = path.join(alloyRoot,'Alloy','template');
 var Harness = path.join(alloyRoot,'test','projects','Harness');
 
 describe('alloy copy', function() {
diff --git a/test/specs/generate.js b/test/specs/generate.js
index 2bd746c70..fc7925a46 100644
--- a/test/specs/generate.js
+++ b/test/specs/generate.js
@@ -1,14 +1,12 @@
 var fs = require('fs'),
 	path = require('path'),
 	os = require('os'),
-	exec = require('child_process').exec,
 	DOMParser = require('xmldom').DOMParser,
 	TU = require('../lib/testUtils'),
-	U = require('../../Alloy/utils'),
-	CU = require('../../Alloy/commands/compile/compilerUtils'),
-	CONST = require('../../Alloy/common/constants'),
 	_ = require('lodash');
 
+const { constants: CONST } = require('alloy-utils');
+
 var alloyRoot = path.join(__dirname,'..','..');
 var templatePath = path.join(alloyRoot,'Alloy','template');
 var Harness = path.join(alloyRoot,'test','projects','Harness');
diff --git a/test/specs/install.js b/test/specs/install.js
index d47b9dda2..979f598da 100644
--- a/test/specs/install.js
+++ b/test/specs/install.js
@@ -1,7 +1,8 @@
 var fs = require('fs'),
 	path = require('path'),
-	TU = require('../lib/testUtils'),
-	CONST = require('../../Alloy/common/constants');
+	TU = require('../lib/testUtils');
+
+	const { constants: CONST } = require('alloy-utils');
 
 var TIMEOUT_DEFAULT = 5000;
 
diff --git a/test/specs/move.js b/test/specs/move.js
index da22b96e6..7c98659d5 100644
--- a/test/specs/move.js
+++ b/test/specs/move.js
@@ -3,7 +3,6 @@ var path = require('path'),
 	TU = require('../lib/testUtils');
 
 var alloyRoot = path.join(__dirname,'..','..');
-var templatePath = path.join(alloyRoot,'Alloy','template');
 var Harness = path.join(alloyRoot,'test','projects','Harness');
 
 describe('alloy move', function() {
diff --git a/test/specs/new.js b/test/specs/new.js
index bc92d4bda..c684d1efd 100644
--- a/test/specs/new.js
+++ b/test/specs/new.js
@@ -3,11 +3,9 @@ var fs = require('fs-extra'),
 	path = require('path'),
 	DOMParser = require('xmldom').DOMParser,
 	TU = require('../lib/testUtils'),
-	CONST = require('../../Alloy/common/constants'),
 	_ = require('lodash');
 
 var TIMEOUT_DEFAULT = 2000;
-var PLATFORMS = CONST.PLATFORMS;
 
 var alloyRoot = path.join(__dirname,'..','..');
 var Harness = path.join(alloyRoot,'test','projects','Harness');
@@ -57,7 +55,6 @@ var TO_BE_CREATED = [
 	path.join('app','assets'),
 	path.join('app','assets','android'),
 	path.join('app','assets','iphone'),
-	path.join('app','assets','mobileweb'),
 	path.join('plugins'),
 	path.join('plugins','ti.alloy'),
 	path.join('plugins','ti.alloy','plugin.py'),
diff --git a/test/specs/optimizer.js b/test/specs/optimizer.js
deleted file mode 100644
index d129ec4ac..000000000
--- a/test/specs/optimizer.js
+++ /dev/null
@@ -1,158 +0,0 @@
-var fs = require('fs'),
-	path = require('path'),
-	colors = require('colors'),
-	TU = require('../lib/testUtils'),
-	CONST = require('../../Alloy/common/constants'),
-	_ = require('lodash'),
-	sourceMapper = require('../../Alloy/commands/compile/sourceMapper'),
-	babylon = require('@babel/parser'),
-	babel = require('@babel/core');
-
-var tests = [
-	// make sure we didn't break normal conditionals and assigments
-	['var test = {\n  a: 0,\n  b:0,\n  c:  0};\ntest.b = 1', 'var test = {\n  a: 0,\n  b: 0,\n  c: 0 };\ntest.b = 1;'],
-	['var a = Ti.Platform.name', 'var a = "<%= name %>";'],
-	['var a = Titanium.Platform.name', 'var a = "<%= name %>";'],
-	['var a = Ti.Platform.name=="<%= name %>" ? 1 : 0', 'var a = "<%= name %>" == "<%= name %>" ? 1 : 0;'],
-	['var a = Ti.Platform.name=="<%= name %>",\nb', 'var a = "<%= name %>" == "<%= name %>",\nb;'],
-	['var a = Ti.Platform.name=="<%= name %>",\nb,\nc = 2', 'var a = "<%= name %>" == "<%= name %>",\nb,\nc = 2;'],
-	['var a = Ti.Platform.name=="<%= name %>"', 'var a = "<%= name %>" == "<%= name %>";'],
-	['var a,\nb = Ti.Platform.name=="<%= name %>",\nc = 2;', 'var a,\nb = "<%= name %>" == "<%= name %>",\nc = 2;'],
-	['var a = "<%= name %>"==Ti.Platform.name ? 1 : 0', 'var a = "<%= name %>" == "<%= name %>" ? 1 : 0;'],
-	['var a = "<%= name %>"==Ti.Platform.name,\nb', 'var a = "<%= name %>" == "<%= name %>",\nb;'],
-	['var a = "<%= name %>"==Ti.Platform.name,\nb,\nc = 2', 'var a = "<%= name %>" == "<%= name %>",\nb,\nc = 2;'],
-	['var a = "<%= name %>"==Ti.Platform.name', 'var a = "<%= name %>" == "<%= name %>";'],
-	['var a,\nb = "<%= name %>"==Ti.Platform.name,\nc = 2;', 'var a,\nb = "<%= name %>" == "<%= name %>",\nc = 2;'],
-	['var a = "1"', 'var a = "1";'],
-	['var a = true', 'var a = true;'],
-	['var a = 1', 'var a = 1;'],
-	['var a', 'var a;'],
-	['var a = {}', 'var a = {};'],
-	['var a = new Object', 'var a = new Object();'],
-	['var a = new Object()', 'var a = new Object();'],
-	['var a = Ti.Platform.name', 'var a = "<%= name %>";'],
-	['var a = Ti.Platform.osname', 'var a = "android";', ['android']],
-	['var a = Ti.Platform.osname', 'var a = "mobileweb";', ['mobileweb']],
-	['var a = Ti.Platform.osname', 'var a = "blackberry";', ['blackberry']],
-	['var a,\nb = 1,\nc = 2;', 'var a,\nb = 1,\nc = 2;'],
-	['var a = 1;', 'var a = 1;'],
-	['var a =+1;', 'var a = +1;'],
-	['var a =1+1;', 'var a = 1 + 1;'],
-	['var a = 1.0;', 'var a = 1.0;'],
-	['var a = 1.02;', 'var a = 1.02;'],
-	['var a = -1.02;', 'var a = -1.02;'],
-	['var a = false', 'var a = false;'],
-	['var a = true ? 1 : 0;', 'var a = true ? 1 : 0;'],
-	["var num = isNaN(amount) || amount === '' || amount === null ? 0.00 : amount;", 'var num = isNaN(amount) || amount === \'\' || amount === null ? 0.00 : amount;'],
-
-	// TODO: Revisit all "var a,a=2;" expecteds once ALOY-540 is resolved
-
-	// make sure we didn't break normal if conditions
-	['if (true) {\n  var a = 1;\n} else {\n  var a = 2;\n}', "if (true) {\n  var a = 1;\n} else {\n  var a = 2;\n}"],
-
-	// check platform conditionals (if/else)
-	["if (Titanium.Platform.name === '<%= name %>') {\n  var a = 1;\n} else {\n  var a = 2;\n}", "if (\"<%= name %>\" === '<%= name %>') {\n  var a = 1;\n} else {\n  var a = 2;\n}"],
-	["if (Titanium.Platform.name !== '<%= name %>') {\n  var a = 1;\n} else {\n  var a = 2;\n}", "if (\"<%= name %>\" !== '<%= name %>') {\n  var a = 1;\n} else {\n  var a = 2;\n}"],
-	["if (Titanium.Platform['name'] == '<%= name %>') {\n  var a = 1;\n} else {\n  var a = 2;\n}", "if (\"<%= name %>\" == '<%= name %>') {\n  var a = 1;\n} else {\n  var a = 2;\n}"],
-	["if (Titanium.Platform.name !== '<%= name %>') {\n  var a = 1;\n} else {\n  var a = 2;\n}", "if (\"<%= name %>\" !== '<%= name %>') {\n  var a = 1;\n} else {\n  var a = 2;\n}"],
-	["if (Titanium.Platform['name'] !== '<%= name %>') {\n  var a = 1;\n} else {\n  var a = 2;\n}", "if (\"<%= name %>\" !== '<%= name %>') {\n  var a = 1;\n} else {\n  var a = 2;\n}"],
-
-	// check platform conditional assignments
-	["var platform = Ti.Platform['name'] === '<%= name %>'", "var platform = \"<%= name %>\" === '<%= name %>';"],
-	["var platform = Ti.Platform[\"name\"] === '<%= name %>'", "var platform = \"<%= name %>\" === '<%= name %>';"],
-	["var platform = Ti.Platform.name === '<%= name %>'", "var platform = \"<%= name %>\" === '<%= name %>';"],
-	["var platform = (Ti.Platform.name === '<%= name %>') ? 1 : 0", "var platform = \"<%= name %>\" === '<%= name %>' ? 1 : 0;"],
-	["var platform = (Ti.Platform.name === '<%= name %>') ? true : false", "var platform = \"<%= name %>\" === '<%= name %>' ? true : false;"],
-
-	// check identities
-	["var a = Ti.Platform.name === Titanium.Platform.name","var a = \"<%= name %>\" === \"<%= name %>\";"],
-
-	// shouldn't attempt to process anything other than strings
-	["if (Ti.Platform.name === couldBeAnything()) {\n  var a = 1;\n} else {\n  var a = 2;\n}","if (\"<%= name %>\" === couldBeAnything()) {\n  var a = 1;\n} else {\n  var a = 2;\n}"],
-	["if (Ti.Platform.name === some.Other.Value) {\n  var a = 1;\n} else {\n  var a = 2;\n}","if (\"<%= name %>\" === some.Other.Value) {\n  var a = 1;\n} else {\n  var a = 2;\n}"],
-	["if (Ti.Platform.name !== aVariable) {\n  var a = 1;\n} else {\n  var a = 2;\n}","if (\"<%= name %>\" !== aVariable) {\n  var a = 1;\n} else {\n  var a = 2;\n}"],
-
-	// properly handles conditionals without curly braces
-	["if (Ti.Platform.name === '<%= name %>') var a = 1; else var a = 2;", "if (\"<%= name %>\" === '<%= name %>') var a = 1;else var a = 2;"],
-	["if (Ti.Platform.name !== '<%= name %>') var a = 1; else var a = 2;", "if (\"<%= name %>\" !== '<%= name %>') var a = 1;else var a = 2;"],
-	["if ('<%= name %>' === Ti.Platform.name) var a = 1; else var a = 2;", "if ('<%= name %>' === \"<%= name %>\") var a = 1;else var a = 2;"],
-	["if ('<%= name %>' !== Ti.Platform.name) var a = 1; else var a = 2;", "if ('<%= name %>' !== \"<%= name %>\") var a = 1;else var a = 2;"],
-
-	// works if Ti.Platform.* is on the left or right hand side
-	["if ('<%= name %>' === Ti.Platform.name) {\n  var a = 1;\n} else {\n  a = 2;\n}", "if ('<%= name %>' === \"<%= name %>\") {\n  var a = 1;\n} else {\n  a = 2;\n}"],
-
-	['var a = OS_IOS', 'var a = true;', ['ios']],
-	['var a = OS_ANDROID', 'var a = true;', ['android']]
-];
-
-// Prepare each platform with values we can swap out at compile time.
-// This means less walks over the native bridge, which means better performance.
-var platforms = {};
-var platformsDir = path.join(__dirname,'..','..','platforms');
-_.each(CONST.PLATFORMS, function(p) {
-	platforms[p] = require(path.join(platformsDir,p,'index'));
-});
-
-// The alloy command test suite
-describe('optimizer.js', function() {
-	_.each(tests, function(test, index) {
-		describe('test #' + (index+1), function() {
-			_.each(platforms, function(platformObj, platform) {
-				describe('[' + platform + ']', function() {
-					var ast, code,
-						testContent = _.template(test[0])(platforms[platform]),
-						prefix = pad(platform);
-
-					it(prefix + testContent.blue, function() {
-						expect(true).toBe(true);
-					});
-
-					it(prefix + 'parses AST with babylon', function() {
-						var parseFunction = function() {
-							ast = babylon.parse(testContent);
-						};
-						expect(parseFunction).not.toThrow();
-					});
-
-					it(prefix + 'optimizes code via Babel and our custom plugins', function() {
-						// execute the squeeze to remove dead code, always performed
-						// as the last step of JS file processing. The unit testing here
-						// uses the same settings as the Alloy compile process.
-						var squeezeFunction = function() {
-							var options = _.extend(_.clone(sourceMapper.OPTIONS_OUTPUT), {
-								plugins: [['./Alloy/commands/compile/ast/optimizer-plugin', {platform: platform}]]
-							});
-							var result = babel.transformFromAstSync(ast, null, options);
-							ast = result.ast;
-							code = result.code.replace(/\s*$/,'');
-						};
-						expect(squeezeFunction).not.toThrow();
-					});
-
-					it(prefix + 'generated code matches expected code', function() {
-						var passFor = test[2];
-						var expected = _.template(test[1])(platforms[platform]);
-						if (!passFor || _.includes(passFor, platform)) {
-							expect(code).toBe(expected);
-						} else {
-							expect(code).not.toBe(expected);
-						}
-					});
-				});
-			});
-		});
-	});
-});
-
-// helper functions
-function notPlatform(platform) {
-	return _.reject(CONST.PLATFORMS, function(p) { return p === platform; } );
-}
-
-function pad(string) {
-	var ret = '';
-	for (var i = 0; i < 10 - string.length; i++) {
-		ret += ' ';
-	}
-	return ret;
-}
diff --git a/test/specs/remove.js b/test/specs/remove.js
index 7fa9a825a..e9f96b68d 100644
--- a/test/specs/remove.js
+++ b/test/specs/remove.js
@@ -3,7 +3,6 @@ var path = require('path'),
 	TU = require('../lib/testUtils');
 
 var alloyRoot = path.join(__dirname,'..','..');
-var templatePath = path.join(alloyRoot,'Alloy','template');
 var Harness = path.join(alloyRoot,'test','projects','Harness');
 
 describe('alloy remove', function() {