diff --git a/.bowerrc b/.bowerrc
index 1f15d09..cbc1879 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,3 +1,3 @@
 {
-    "directory": "src/vendor/"
-}
+    "directory": "out/vendor/"
+}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index f4eee7e..a4a5d19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 .*
 /coverage
 /node_modules
-/src/vendor
-/src/build.*
+/out/vendor
+/out/build.*
 /graphics/**/*.blend?*
 *.log
diff --git a/src/assets/images/battle/action-active.png b/out/assets/images/battle/action-active.png
similarity index 100%
rename from src/assets/images/battle/action-active.png
rename to out/assets/images/battle/action-active.png
diff --git a/src/assets/images/battle/action-fading.png b/out/assets/images/battle/action-fading.png
similarity index 100%
rename from src/assets/images/battle/action-fading.png
rename to out/assets/images/battle/action-fading.png
diff --git a/src/assets/images/battle/action-inactive.png b/out/assets/images/battle/action-inactive.png
similarity index 100%
rename from src/assets/images/battle/action-inactive.png
rename to out/assets/images/battle/action-inactive.png
diff --git a/src/assets/images/battle/action-tooltip.png b/out/assets/images/battle/action-tooltip.png
similarity index 100%
rename from src/assets/images/battle/action-tooltip.png
rename to out/assets/images/battle/action-tooltip.png
diff --git a/src/assets/images/battle/actionbar-cancel.png b/out/assets/images/battle/actionbar-cancel.png
similarity index 100%
rename from src/assets/images/battle/actionbar-cancel.png
rename to out/assets/images/battle/actionbar-cancel.png
diff --git a/src/assets/images/battle/actionbar.png b/out/assets/images/battle/actionbar.png
similarity index 100%
rename from src/assets/images/battle/actionbar.png
rename to out/assets/images/battle/actionbar.png
diff --git a/src/assets/images/battle/actionpointsempty.png b/out/assets/images/battle/actionpointsempty.png
similarity index 100%
rename from src/assets/images/battle/actionpointsempty.png
rename to out/assets/images/battle/actionpointsempty.png
diff --git a/src/assets/images/battle/actionpointsfull.png b/out/assets/images/battle/actionpointsfull.png
similarity index 100%
rename from src/assets/images/battle/actionpointsfull.png
rename to out/assets/images/battle/actionpointsfull.png
diff --git a/src/assets/images/battle/actionpointspart.png b/out/assets/images/battle/actionpointspart.png
similarity index 100%
rename from src/assets/images/battle/actionpointspart.png
rename to out/assets/images/battle/actionpointspart.png
diff --git a/src/assets/images/battle/actions/endturn.png b/out/assets/images/battle/actions/endturn.png
similarity index 100%
rename from src/assets/images/battle/actions/endturn.png
rename to out/assets/images/battle/actions/endturn.png
diff --git a/src/assets/images/battle/actions/fire-gatlinggun.png b/out/assets/images/battle/actions/fire-gatlinggun.png
similarity index 100%
rename from src/assets/images/battle/actions/fire-gatlinggun.png
rename to out/assets/images/battle/actions/fire-gatlinggun.png
diff --git a/src/assets/images/battle/actions/move.png b/out/assets/images/battle/actions/move.png
similarity index 100%
rename from src/assets/images/battle/actions/move.png
rename to out/assets/images/battle/actions/move.png
diff --git a/src/assets/images/battle/arena/background.png b/out/assets/images/battle/arena/background.png
similarity index 100%
rename from src/assets/images/battle/arena/background.png
rename to out/assets/images/battle/arena/background.png
diff --git a/src/assets/images/battle/arena/shipspritehover.png b/out/assets/images/battle/arena/shipspritehover.png
similarity index 100%
rename from src/assets/images/battle/arena/shipspritehover.png
rename to out/assets/images/battle/arena/shipspritehover.png
diff --git a/src/assets/images/battle/arena/shipspriteplaying.png b/out/assets/images/battle/arena/shipspriteplaying.png
similarity index 100%
rename from src/assets/images/battle/arena/shipspriteplaying.png
rename to out/assets/images/battle/arena/shipspriteplaying.png
diff --git a/src/assets/images/battle/background.jpg b/out/assets/images/battle/background.jpg
similarity index 100%
rename from src/assets/images/battle/background.jpg
rename to out/assets/images/battle/background.jpg
diff --git a/src/assets/images/battle/shiplist-base.png b/out/assets/images/battle/shiplist-base.png
similarity index 100%
rename from src/assets/images/battle/shiplist-base.png
rename to out/assets/images/battle/shiplist-base.png
diff --git a/src/assets/images/battle/shiplist-enemy.png b/out/assets/images/battle/shiplist-enemy.png
similarity index 100%
rename from src/assets/images/battle/shiplist-enemy.png
rename to out/assets/images/battle/shiplist-enemy.png
diff --git a/src/assets/images/battle/shiplist-hull-empty.png b/out/assets/images/battle/shiplist-hull-empty.png
similarity index 100%
rename from src/assets/images/battle/shiplist-hull-empty.png
rename to out/assets/images/battle/shiplist-hull-empty.png
diff --git a/src/assets/images/battle/shiplist-hull-full.png b/out/assets/images/battle/shiplist-hull-full.png
similarity index 100%
rename from src/assets/images/battle/shiplist-hull-full.png
rename to out/assets/images/battle/shiplist-hull-full.png
diff --git a/src/assets/images/battle/shiplist-normal.png b/out/assets/images/battle/shiplist-normal.png
similarity index 100%
rename from src/assets/images/battle/shiplist-normal.png
rename to out/assets/images/battle/shiplist-normal.png
diff --git a/src/assets/images/battle/shiplist-own.png b/out/assets/images/battle/shiplist-own.png
similarity index 100%
rename from src/assets/images/battle/shiplist-own.png
rename to out/assets/images/battle/shiplist-own.png
diff --git a/src/assets/images/battle/shiplist-playing.png b/out/assets/images/battle/shiplist-playing.png
similarity index 100%
rename from src/assets/images/battle/shiplist-playing.png
rename to out/assets/images/battle/shiplist-playing.png
diff --git a/src/assets/images/battle/shiplist-shield-empty.png b/out/assets/images/battle/shiplist-shield-empty.png
similarity index 100%
rename from src/assets/images/battle/shiplist-shield-empty.png
rename to out/assets/images/battle/shiplist-shield-empty.png
diff --git a/src/assets/images/battle/shiplist-shield-full.png b/out/assets/images/battle/shiplist-shield-full.png
similarity index 100%
rename from src/assets/images/battle/shiplist-shield-full.png
rename to out/assets/images/battle/shiplist-shield-full.png
diff --git a/src/assets/images/battle/waiting.png b/out/assets/images/battle/waiting.png
similarity index 100%
rename from src/assets/images/battle/waiting.png
rename to out/assets/images/battle/waiting.png
diff --git a/src/assets/images/battle/weapon/bullet.png b/out/assets/images/battle/weapon/bullet.png
similarity index 100%
rename from src/assets/images/battle/weapon/bullet.png
rename to out/assets/images/battle/weapon/bullet.png
diff --git a/src/assets/images/common/standard-bar-background.png b/out/assets/images/common/standard-bar-background.png
similarity index 100%
rename from src/assets/images/common/standard-bar-background.png
rename to out/assets/images/common/standard-bar-background.png
diff --git a/src/assets/images/common/standard-bar-foreground.png b/out/assets/images/common/standard-bar-foreground.png
similarity index 100%
rename from src/assets/images/common/standard-bar-foreground.png
rename to out/assets/images/common/standard-bar-foreground.png
diff --git a/src/assets/images/map/button-back.png b/out/assets/images/map/button-back.png
similarity index 100%
rename from src/assets/images/map/button-back.png
rename to out/assets/images/map/button-back.png
diff --git a/src/assets/images/map/button-jump.png b/out/assets/images/map/button-jump.png
similarity index 100%
rename from src/assets/images/map/button-jump.png
rename to out/assets/images/map/button-jump.png
diff --git a/src/assets/images/map/fleet-icon.png b/out/assets/images/map/fleet-icon.png
similarity index 100%
rename from src/assets/images/map/fleet-icon.png
rename to out/assets/images/map/fleet-icon.png
diff --git a/src/assets/images/map/planet-icon.png b/out/assets/images/map/planet-icon.png
similarity index 100%
rename from src/assets/images/map/planet-icon.png
rename to out/assets/images/map/planet-icon.png
diff --git a/src/assets/images/map/star-icon.png b/out/assets/images/map/star-icon.png
similarity index 100%
rename from src/assets/images/map/star-icon.png
rename to out/assets/images/map/star-icon.png
diff --git a/src/assets/images/map/warp-icon.png b/out/assets/images/map/warp-icon.png
similarity index 100%
rename from src/assets/images/map/warp-icon.png
rename to out/assets/images/map/warp-icon.png
diff --git a/src/assets/images/menu/button.png b/out/assets/images/menu/button.png
similarity index 100%
rename from src/assets/images/menu/button.png
rename to out/assets/images/menu/button.png
diff --git a/src/assets/images/preloader.gif b/out/assets/images/preloader.gif
similarity index 100%
rename from src/assets/images/preloader.gif
rename to out/assets/images/preloader.gif
diff --git a/src/assets/images/ship/scout/portrait.png b/out/assets/images/ship/scout/portrait.png
similarity index 100%
rename from src/assets/images/ship/scout/portrait.png
rename to out/assets/images/ship/scout/portrait.png
diff --git a/src/assets/images/ship/scout/sprite.png b/out/assets/images/ship/scout/sprite.png
similarity index 100%
rename from src/assets/images/ship/scout/sprite.png
rename to out/assets/images/ship/scout/sprite.png
diff --git a/src/assets/images/ship/whirlwind/portrait.png b/out/assets/images/ship/whirlwind/portrait.png
similarity index 100%
rename from src/assets/images/ship/whirlwind/portrait.png
rename to out/assets/images/ship/whirlwind/portrait.png
diff --git a/src/assets/images/ship/whirlwind/sprite.png b/out/assets/images/ship/whirlwind/sprite.png
similarity index 100%
rename from src/assets/images/ship/whirlwind/sprite.png
rename to out/assets/images/ship/whirlwind/sprite.png
diff --git a/src/assets/sounds/battle/ship-change.wav b/out/assets/sounds/battle/ship-change.wav
similarity index 100%
rename from src/assets/sounds/battle/ship-change.wav
rename to out/assets/sounds/battle/ship-change.wav
diff --git a/src/assets/sounds/battle/weapon-bullets.wav b/out/assets/sounds/battle/weapon-bullets.wav
similarity index 100%
rename from src/assets/sounds/battle/weapon-bullets.wav
rename to out/assets/sounds/battle/weapon-bullets.wav
diff --git a/src/assets/sounds/music/full-on.mp3 b/out/assets/sounds/music/full-on.mp3
similarity index 100%
rename from src/assets/sounds/music/full-on.mp3
rename to out/assets/sounds/music/full-on.mp3
diff --git a/src/assets/sounds/music/walking-along.mp3 b/out/assets/sounds/music/walking-along.mp3
similarity index 100%
rename from src/assets/sounds/music/walking-along.mp3
rename to out/assets/sounds/music/walking-along.mp3
diff --git a/src/index.html b/out/index.html
similarity index 100%
rename from src/index.html
rename to out/index.html
diff --git a/package.json b/package.json
index ee0f296..561ec02 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,10 @@
   "description": "A tactical RPG set in space",
   "main": "src/build.js",
   "scripts": {
+    "deps": "bower install",
     "build": "tsc -p .",
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "jasmine",
+    "cover": "istanbul cover node_modules/jasmine/bin/jasmine.js && remap-istanbul -i coverage/coverage.json -o coverage -t html",
     "serve": "simple-server out 8012"
   },
   "repository": {
@@ -17,7 +19,9 @@
   "devDependencies": {
     "bower": "^1.7.9",
     "jasmine": "^2.5.2",
+    "istanbul": "0.4",
+    "remap-istanbul": "0.6",
     "simple-server": "^1.0.1",
     "typescript": "^2.0.6"
   }
-}
+}
\ No newline at end of file
diff --git a/spec/support/jasmine.json b/spec/support/jasmine.json
new file mode 100755
index 0000000..bbc3274
--- /dev/null
+++ b/spec/support/jasmine.json
@@ -0,0 +1,9 @@
+{
+  "spec_dir": ".",
+  "spec_files": [
+    "out/build.js"
+  ],
+  "helpers": [],
+  "stopSpecOnExpectationFailure": false,
+  "random": false
+}
\ No newline at end of file
diff --git a/src/app/GameUI.ts b/src/GameUI.ts
similarity index 100%
rename from src/app/GameUI.ts
rename to src/GameUI.ts
diff --git a/src/app/definitions/jasmine.d.ts b/src/definitions/jasmine.d.ts
similarity index 100%
rename from src/app/definitions/jasmine.d.ts
rename to src/definitions/jasmine.d.ts
diff --git a/src/app/definitions/p2.d.ts b/src/definitions/p2.d.ts
similarity index 100%
rename from src/app/definitions/p2.d.ts
rename to src/definitions/p2.d.ts
diff --git a/src/app/definitions/phaser.d.ts b/src/definitions/phaser.d.ts
similarity index 100%
rename from src/app/definitions/phaser.d.ts
rename to src/definitions/phaser.d.ts
diff --git a/src/app/definitions/pixi.d.ts b/src/definitions/pixi.d.ts
similarity index 100%
rename from src/app/definitions/pixi.d.ts
rename to src/definitions/pixi.d.ts
diff --git a/src/app/game/Attribute.ts b/src/game/Attribute.ts
similarity index 100%
rename from src/app/game/Attribute.ts
rename to src/game/Attribute.ts
diff --git a/src/app/game/AttributeCollection.ts b/src/game/AttributeCollection.ts
similarity index 100%
rename from src/app/game/AttributeCollection.ts
rename to src/game/AttributeCollection.ts
diff --git a/src/app/game/Battle.ts b/src/game/Battle.ts
similarity index 100%
rename from src/app/game/Battle.ts
rename to src/game/Battle.ts
diff --git a/src/app/game/BattleLog.ts b/src/game/BattleLog.ts
similarity index 100%
rename from src/app/game/BattleLog.ts
rename to src/game/BattleLog.ts
diff --git a/src/app/game/BattleOutcome.ts b/src/game/BattleOutcome.ts
similarity index 100%
rename from src/app/game/BattleOutcome.ts
rename to src/game/BattleOutcome.ts
diff --git a/src/app/game/EffectTemplate.ts b/src/game/EffectTemplate.ts
similarity index 100%
rename from src/app/game/EffectTemplate.ts
rename to src/game/EffectTemplate.ts
diff --git a/src/app/game/Equipment.ts b/src/game/Equipment.ts
similarity index 100%
rename from src/app/game/Equipment.ts
rename to src/game/Equipment.ts
diff --git a/src/app/game/Fleet.ts b/src/game/Fleet.ts
similarity index 100%
rename from src/app/game/Fleet.ts
rename to src/game/Fleet.ts
diff --git a/src/app/game/FleetGenerator.ts b/src/game/FleetGenerator.ts
similarity index 100%
rename from src/app/game/FleetGenerator.ts
rename to src/game/FleetGenerator.ts
diff --git a/src/app/game/GameSession.ts b/src/game/GameSession.ts
similarity index 100%
rename from src/app/game/GameSession.ts
rename to src/game/GameSession.ts
diff --git a/src/app/game/LootGenerator.ts b/src/game/LootGenerator.ts
similarity index 100%
rename from src/app/game/LootGenerator.ts
rename to src/game/LootGenerator.ts
diff --git a/src/app/game/LootTemplate.ts b/src/game/LootTemplate.ts
similarity index 100%
rename from src/app/game/LootTemplate.ts
rename to src/game/LootTemplate.ts
diff --git a/src/app/game/NameGenerator.ts b/src/game/NameGenerator.ts
similarity index 100%
rename from src/app/game/NameGenerator.ts
rename to src/game/NameGenerator.ts
diff --git a/src/app/game/Player.ts b/src/game/Player.ts
similarity index 100%
rename from src/app/game/Player.ts
rename to src/game/Player.ts
diff --git a/src/app/game/RandomGenerator.ts b/src/game/RandomGenerator.ts
similarity index 100%
rename from src/app/game/RandomGenerator.ts
rename to src/game/RandomGenerator.ts
diff --git a/src/app/game/Range.ts b/src/game/Range.ts
similarity index 100%
rename from src/app/game/Range.ts
rename to src/game/Range.ts
diff --git a/src/app/game/Serializable.ts b/src/game/Serializable.ts
similarity index 100%
rename from src/app/game/Serializable.ts
rename to src/game/Serializable.ts
diff --git a/src/app/game/Serializer.ts b/src/game/Serializer.ts
similarity index 100%
rename from src/app/game/Serializer.ts
rename to src/game/Serializer.ts
diff --git a/src/app/game/Ship.ts b/src/game/Ship.ts
similarity index 100%
rename from src/app/game/Ship.ts
rename to src/game/Ship.ts
diff --git a/src/app/game/ShipGenerator.ts b/src/game/ShipGenerator.ts
similarity index 100%
rename from src/app/game/ShipGenerator.ts
rename to src/game/ShipGenerator.ts
diff --git a/src/app/game/ShipModel.ts b/src/game/ShipModel.ts
similarity index 100%
rename from src/app/game/ShipModel.ts
rename to src/game/ShipModel.ts
diff --git a/src/app/game/Slot.ts b/src/game/Slot.ts
similarity index 100%
rename from src/app/game/Slot.ts
rename to src/game/Slot.ts
diff --git a/src/app/game/Star.ts b/src/game/Star.ts
similarity index 100%
rename from src/app/game/Star.ts
rename to src/game/Star.ts
diff --git a/src/app/game/StarLink.ts b/src/game/StarLink.ts
similarity index 100%
rename from src/app/game/StarLink.ts
rename to src/game/StarLink.ts
diff --git a/src/app/game/StarLocation.ts b/src/game/StarLocation.ts
similarity index 100%
rename from src/app/game/StarLocation.ts
rename to src/game/StarLocation.ts
diff --git a/src/app/game/Target.ts b/src/game/Target.ts
similarity index 100%
rename from src/app/game/Target.ts
rename to src/game/Target.ts
diff --git a/src/app/game/TestTools.ts b/src/game/TestTools.ts
similarity index 100%
rename from src/app/game/TestTools.ts
rename to src/game/TestTools.ts
diff --git a/src/app/game/Tools.ts b/src/game/Tools.ts
similarity index 100%
rename from src/app/game/Tools.ts
rename to src/game/Tools.ts
diff --git a/src/app/game/Universe.ts b/src/game/Universe.ts
similarity index 100%
rename from src/app/game/Universe.ts
rename to src/game/Universe.ts
diff --git a/src/app/game/actions/BaseAction.ts b/src/game/actions/BaseAction.ts
similarity index 100%
rename from src/app/game/actions/BaseAction.ts
rename to src/game/actions/BaseAction.ts
diff --git a/src/app/game/actions/EndTurnAction.ts b/src/game/actions/EndTurnAction.ts
similarity index 100%
rename from src/app/game/actions/EndTurnAction.ts
rename to src/game/actions/EndTurnAction.ts
diff --git a/src/app/game/actions/FireWeaponAction.ts b/src/game/actions/FireWeaponAction.ts
similarity index 100%
rename from src/app/game/actions/FireWeaponAction.ts
rename to src/game/actions/FireWeaponAction.ts
diff --git a/src/app/game/actions/MoveAction.ts b/src/game/actions/MoveAction.ts
similarity index 100%
rename from src/app/game/actions/MoveAction.ts
rename to src/game/actions/MoveAction.ts
diff --git a/src/app/game/ai/AbstractAI.ts b/src/game/ai/AbstractAI.ts
similarity index 100%
rename from src/app/game/ai/AbstractAI.ts
rename to src/game/ai/AbstractAI.ts
diff --git a/src/app/game/ai/BullyAI.ts b/src/game/ai/BullyAI.ts
similarity index 100%
rename from src/app/game/ai/BullyAI.ts
rename to src/game/ai/BullyAI.ts
diff --git a/src/app/game/ai/Maneuver.ts b/src/game/ai/Maneuver.ts
similarity index 100%
rename from src/app/game/ai/Maneuver.ts
rename to src/game/ai/Maneuver.ts
diff --git a/src/app/game/ai/ManeuverSequence.ts b/src/game/ai/ManeuverSequence.ts
similarity index 100%
rename from src/app/game/ai/ManeuverSequence.ts
rename to src/game/ai/ManeuverSequence.ts
diff --git a/src/app/game/ai/specs/BullyAI.spec.ts b/src/game/ai/specs/BullyAI.spec.ts
similarity index 100%
rename from src/app/game/ai/specs/BullyAI.spec.ts
rename to src/game/ai/specs/BullyAI.spec.ts
diff --git a/src/app/game/effects/AttributeLimitEffect.ts b/src/game/effects/AttributeLimitEffect.ts
similarity index 100%
rename from src/app/game/effects/AttributeLimitEffect.ts
rename to src/game/effects/AttributeLimitEffect.ts
diff --git a/src/app/game/effects/AttributeMaxEffect.ts b/src/game/effects/AttributeMaxEffect.ts
similarity index 100%
rename from src/app/game/effects/AttributeMaxEffect.ts
rename to src/game/effects/AttributeMaxEffect.ts
diff --git a/src/app/game/effects/AttributeValueEffect.ts b/src/game/effects/AttributeValueEffect.ts
similarity index 100%
rename from src/app/game/effects/AttributeValueEffect.ts
rename to src/game/effects/AttributeValueEffect.ts
diff --git a/src/app/game/effects/BaseEffect.ts b/src/game/effects/BaseEffect.ts
similarity index 100%
rename from src/app/game/effects/BaseEffect.ts
rename to src/game/effects/BaseEffect.ts
diff --git a/src/app/game/effects/DamageEffect.ts b/src/game/effects/DamageEffect.ts
similarity index 100%
rename from src/app/game/effects/DamageEffect.ts
rename to src/game/effects/DamageEffect.ts
diff --git a/src/app/game/effects/TemporaryEffect.ts b/src/game/effects/TemporaryEffect.ts
similarity index 100%
rename from src/app/game/effects/TemporaryEffect.ts
rename to src/game/effects/TemporaryEffect.ts
diff --git a/src/app/game/equipments/AbstractWeapon.ts b/src/game/equipments/AbstractWeapon.ts
similarity index 100%
rename from src/app/game/equipments/AbstractWeapon.ts
rename to src/game/equipments/AbstractWeapon.ts
diff --git a/src/app/game/equipments/BasicForceField.ts b/src/game/equipments/BasicForceField.ts
similarity index 100%
rename from src/app/game/equipments/BasicForceField.ts
rename to src/game/equipments/BasicForceField.ts
diff --git a/src/app/game/equipments/BasicPowerCore.ts b/src/game/equipments/BasicPowerCore.ts
similarity index 100%
rename from src/app/game/equipments/BasicPowerCore.ts
rename to src/game/equipments/BasicPowerCore.ts
diff --git a/src/app/game/equipments/ConventionalEngine.ts b/src/game/equipments/ConventionalEngine.ts
similarity index 100%
rename from src/app/game/equipments/ConventionalEngine.ts
rename to src/game/equipments/ConventionalEngine.ts
diff --git a/src/app/game/equipments/EnergyDepleter.ts b/src/game/equipments/EnergyDepleter.ts
similarity index 100%
rename from src/app/game/equipments/EnergyDepleter.ts
rename to src/game/equipments/EnergyDepleter.ts
diff --git a/src/app/game/equipments/GatlingGun.ts b/src/game/equipments/GatlingGun.ts
similarity index 100%
rename from src/app/game/equipments/GatlingGun.ts
rename to src/game/equipments/GatlingGun.ts
diff --git a/src/app/game/equipments/IronHull.ts b/src/game/equipments/IronHull.ts
similarity index 100%
rename from src/app/game/equipments/IronHull.ts
rename to src/game/equipments/IronHull.ts
diff --git a/src/app/game/equipments/SubMunitionMissile.ts b/src/game/equipments/SubMunitionMissile.ts
similarity index 100%
rename from src/app/game/equipments/SubMunitionMissile.ts
rename to src/game/equipments/SubMunitionMissile.ts
diff --git a/src/app/game/equipments/specs/EnergyDepleter.spec.ts b/src/game/equipments/specs/EnergyDepleter.spec.ts
similarity index 100%
rename from src/app/game/equipments/specs/EnergyDepleter.spec.ts
rename to src/game/equipments/specs/EnergyDepleter.spec.ts
diff --git a/src/app/game/equipments/specs/SubMunitionMissile.spec.ts b/src/game/equipments/specs/SubMunitionMissile.spec.ts
similarity index 100%
rename from src/app/game/equipments/specs/SubMunitionMissile.spec.ts
rename to src/game/equipments/specs/SubMunitionMissile.spec.ts
diff --git a/src/app/game/events/AttributeChangeEvent.ts b/src/game/events/AttributeChangeEvent.ts
similarity index 100%
rename from src/app/game/events/AttributeChangeEvent.ts
rename to src/game/events/AttributeChangeEvent.ts
diff --git a/src/app/game/events/BaseLogEvent.ts b/src/game/events/BaseLogEvent.ts
similarity index 100%
rename from src/app/game/events/BaseLogEvent.ts
rename to src/game/events/BaseLogEvent.ts
diff --git a/src/app/game/events/DamageEvent.ts b/src/game/events/DamageEvent.ts
similarity index 100%
rename from src/app/game/events/DamageEvent.ts
rename to src/game/events/DamageEvent.ts
diff --git a/src/app/game/events/DeathEvent.ts b/src/game/events/DeathEvent.ts
similarity index 100%
rename from src/app/game/events/DeathEvent.ts
rename to src/game/events/DeathEvent.ts
diff --git a/src/app/game/events/EffectAddedEvent.ts b/src/game/events/EffectAddedEvent.ts
similarity index 100%
rename from src/app/game/events/EffectAddedEvent.ts
rename to src/game/events/EffectAddedEvent.ts
diff --git a/src/app/game/events/EffectDurationChangedEvent.ts b/src/game/events/EffectDurationChangedEvent.ts
similarity index 100%
rename from src/app/game/events/EffectDurationChangedEvent.ts
rename to src/game/events/EffectDurationChangedEvent.ts
diff --git a/src/app/game/events/EffectRemovedEvent.ts b/src/game/events/EffectRemovedEvent.ts
similarity index 100%
rename from src/app/game/events/EffectRemovedEvent.ts
rename to src/game/events/EffectRemovedEvent.ts
diff --git a/src/app/game/events/EndBattleEvent.ts b/src/game/events/EndBattleEvent.ts
similarity index 100%
rename from src/app/game/events/EndBattleEvent.ts
rename to src/game/events/EndBattleEvent.ts
diff --git a/src/app/game/events/FireEvent.ts b/src/game/events/FireEvent.ts
similarity index 100%
rename from src/app/game/events/FireEvent.ts
rename to src/game/events/FireEvent.ts
diff --git a/src/app/game/events/MoveEvent.ts b/src/game/events/MoveEvent.ts
similarity index 100%
rename from src/app/game/events/MoveEvent.ts
rename to src/game/events/MoveEvent.ts
diff --git a/src/app/game/events/ShipChangeEvent.ts b/src/game/events/ShipChangeEvent.ts
similarity index 100%
rename from src/app/game/events/ShipChangeEvent.ts
rename to src/game/events/ShipChangeEvent.ts
diff --git a/src/app/game/specs/AbstractWeapon.spec.ts b/src/game/specs/AbstractWeapon.spec.ts
similarity index 100%
rename from src/app/game/specs/AbstractWeapon.spec.ts
rename to src/game/specs/AbstractWeapon.spec.ts
diff --git a/src/app/game/specs/Attribute.spec.ts b/src/game/specs/Attribute.spec.ts
similarity index 100%
rename from src/app/game/specs/Attribute.spec.ts
rename to src/game/specs/Attribute.spec.ts
diff --git a/src/app/game/specs/AttributeCollection.spec.ts b/src/game/specs/AttributeCollection.spec.ts
similarity index 100%
rename from src/app/game/specs/AttributeCollection.spec.ts
rename to src/game/specs/AttributeCollection.spec.ts
diff --git a/src/app/game/specs/BaseAction.spec.ts b/src/game/specs/BaseAction.spec.ts
similarity index 100%
rename from src/app/game/specs/BaseAction.spec.ts
rename to src/game/specs/BaseAction.spec.ts
diff --git a/src/app/game/specs/Battle.spec.ts b/src/game/specs/Battle.spec.ts
similarity index 100%
rename from src/app/game/specs/Battle.spec.ts
rename to src/game/specs/Battle.spec.ts
diff --git a/src/app/game/specs/BattleLog.spec.ts b/src/game/specs/BattleLog.spec.ts
similarity index 100%
rename from src/app/game/specs/BattleLog.spec.ts
rename to src/game/specs/BattleLog.spec.ts
diff --git a/src/app/game/specs/BattleOutcome.spec.ts b/src/game/specs/BattleOutcome.spec.ts
similarity index 100%
rename from src/app/game/specs/BattleOutcome.spec.ts
rename to src/game/specs/BattleOutcome.spec.ts
diff --git a/src/app/game/specs/EffectTemplate.spec.ts b/src/game/specs/EffectTemplate.spec.ts
similarity index 100%
rename from src/app/game/specs/EffectTemplate.spec.ts
rename to src/game/specs/EffectTemplate.spec.ts
diff --git a/src/app/game/specs/EndTurnAction.spec.ts b/src/game/specs/EndTurnAction.spec.ts
similarity index 100%
rename from src/app/game/specs/EndTurnAction.spec.ts
rename to src/game/specs/EndTurnAction.spec.ts
diff --git a/src/app/game/specs/Equipment.spec.ts b/src/game/specs/Equipment.spec.ts
similarity index 100%
rename from src/app/game/specs/Equipment.spec.ts
rename to src/game/specs/Equipment.spec.ts
diff --git a/src/app/game/specs/Fleet.spec.ts b/src/game/specs/Fleet.spec.ts
similarity index 100%
rename from src/app/game/specs/Fleet.spec.ts
rename to src/game/specs/Fleet.spec.ts
diff --git a/src/app/game/specs/GameSession.spec.ts b/src/game/specs/GameSession.spec.ts
similarity index 100%
rename from src/app/game/specs/GameSession.spec.ts
rename to src/game/specs/GameSession.spec.ts
diff --git a/src/app/game/specs/LootGenerator.spec.ts b/src/game/specs/LootGenerator.spec.ts
similarity index 100%
rename from src/app/game/specs/LootGenerator.spec.ts
rename to src/game/specs/LootGenerator.spec.ts
diff --git a/src/app/game/specs/LootTemplate.spec.ts b/src/game/specs/LootTemplate.spec.ts
similarity index 100%
rename from src/app/game/specs/LootTemplate.spec.ts
rename to src/game/specs/LootTemplate.spec.ts
diff --git a/src/app/game/specs/MoveAction.spec.ts b/src/game/specs/MoveAction.spec.ts
similarity index 100%
rename from src/app/game/specs/MoveAction.spec.ts
rename to src/game/specs/MoveAction.spec.ts
diff --git a/src/app/game/specs/NameGenerator.spec.ts b/src/game/specs/NameGenerator.spec.ts
similarity index 100%
rename from src/app/game/specs/NameGenerator.spec.ts
rename to src/game/specs/NameGenerator.spec.ts
diff --git a/src/app/game/specs/Range.spec.ts b/src/game/specs/Range.spec.ts
similarity index 100%
rename from src/app/game/specs/Range.spec.ts
rename to src/game/specs/Range.spec.ts
diff --git a/src/app/game/specs/Serializer.spec.ts b/src/game/specs/Serializer.spec.ts
similarity index 100%
rename from src/app/game/specs/Serializer.spec.ts
rename to src/game/specs/Serializer.spec.ts
diff --git a/src/app/game/specs/Ship.spec.ts b/src/game/specs/Ship.spec.ts
similarity index 100%
rename from src/app/game/specs/Ship.spec.ts
rename to src/game/specs/Ship.spec.ts
diff --git a/src/app/game/specs/ShipGenerator.spec.ts b/src/game/specs/ShipGenerator.spec.ts
similarity index 100%
rename from src/app/game/specs/ShipGenerator.spec.ts
rename to src/game/specs/ShipGenerator.spec.ts
diff --git a/src/app/game/specs/Slot.spec.ts b/src/game/specs/Slot.spec.ts
similarity index 100%
rename from src/app/game/specs/Slot.spec.ts
rename to src/game/specs/Slot.spec.ts
diff --git a/src/app/game/specs/Star.spec.ts b/src/game/specs/Star.spec.ts
similarity index 100%
rename from src/app/game/specs/Star.spec.ts
rename to src/game/specs/Star.spec.ts
diff --git a/src/app/game/specs/StarLink.spec.ts b/src/game/specs/StarLink.spec.ts
similarity index 100%
rename from src/app/game/specs/StarLink.spec.ts
rename to src/game/specs/StarLink.spec.ts
diff --git a/src/app/game/specs/StarLocation.spec.ts b/src/game/specs/StarLocation.spec.ts
similarity index 100%
rename from src/app/game/specs/StarLocation.spec.ts
rename to src/game/specs/StarLocation.spec.ts
diff --git a/src/app/game/specs/Target.spec.ts b/src/game/specs/Target.spec.ts
similarity index 100%
rename from src/app/game/specs/Target.spec.ts
rename to src/game/specs/Target.spec.ts
diff --git a/src/app/game/specs/Tools.spec.ts b/src/game/specs/Tools.spec.ts
similarity index 100%
rename from src/app/game/specs/Tools.spec.ts
rename to src/game/specs/Tools.spec.ts
diff --git a/src/app/game/specs/Universe.spec.ts b/src/game/specs/Universe.spec.ts
similarity index 100%
rename from src/app/game/specs/Universe.spec.ts
rename to src/game/specs/Universe.spec.ts
diff --git a/src/app/view/BaseView.ts b/src/view/BaseView.ts
similarity index 100%
rename from src/app/view/BaseView.ts
rename to src/view/BaseView.ts
diff --git a/src/app/view/Boot.ts b/src/view/Boot.ts
similarity index 100%
rename from src/app/view/Boot.ts
rename to src/view/Boot.ts
diff --git a/src/app/view/MainMenu.ts b/src/view/MainMenu.ts
similarity index 100%
rename from src/app/view/MainMenu.ts
rename to src/view/MainMenu.ts
diff --git a/src/app/view/Preload.ts b/src/view/Preload.ts
similarity index 100%
rename from src/app/view/Preload.ts
rename to src/view/Preload.ts
diff --git a/src/app/view/Router.ts b/src/view/Router.ts
similarity index 100%
rename from src/app/view/Router.ts
rename to src/view/Router.ts
diff --git a/src/app/view/battle/ActionBar.ts b/src/view/battle/ActionBar.ts
similarity index 100%
rename from src/app/view/battle/ActionBar.ts
rename to src/view/battle/ActionBar.ts
diff --git a/src/app/view/battle/ActionIcon.ts b/src/view/battle/ActionIcon.ts
similarity index 100%
rename from src/app/view/battle/ActionIcon.ts
rename to src/view/battle/ActionIcon.ts
diff --git a/src/app/view/battle/ActionTooltip.ts b/src/view/battle/ActionTooltip.ts
similarity index 100%
rename from src/app/view/battle/ActionTooltip.ts
rename to src/view/battle/ActionTooltip.ts
diff --git a/src/app/view/battle/Arena.ts b/src/view/battle/Arena.ts
similarity index 100%
rename from src/app/view/battle/Arena.ts
rename to src/view/battle/Arena.ts
diff --git a/src/app/view/battle/ArenaShip.ts b/src/view/battle/ArenaShip.ts
similarity index 100%
rename from src/app/view/battle/ArenaShip.ts
rename to src/view/battle/ArenaShip.ts
diff --git a/src/app/view/battle/BattleView.ts b/src/view/battle/BattleView.ts
similarity index 100%
rename from src/app/view/battle/BattleView.ts
rename to src/view/battle/BattleView.ts
diff --git a/src/app/view/battle/EffectDisplay.ts b/src/view/battle/EffectDisplay.ts
similarity index 100%
rename from src/app/view/battle/EffectDisplay.ts
rename to src/view/battle/EffectDisplay.ts
diff --git a/src/app/view/battle/LogProcessor.ts b/src/view/battle/LogProcessor.ts
similarity index 100%
rename from src/app/view/battle/LogProcessor.ts
rename to src/view/battle/LogProcessor.ts
diff --git a/src/app/view/battle/RangeHint.ts b/src/view/battle/RangeHint.ts
similarity index 100%
rename from src/app/view/battle/RangeHint.ts
rename to src/view/battle/RangeHint.ts
diff --git a/src/app/view/battle/ShipList.ts b/src/view/battle/ShipList.ts
similarity index 100%
rename from src/app/view/battle/ShipList.ts
rename to src/view/battle/ShipList.ts
diff --git a/src/app/view/battle/ShipListItem.ts b/src/view/battle/ShipListItem.ts
similarity index 100%
rename from src/app/view/battle/ShipListItem.ts
rename to src/view/battle/ShipListItem.ts
diff --git a/src/app/view/battle/Targetting.ts b/src/view/battle/Targetting.ts
similarity index 100%
rename from src/app/view/battle/Targetting.ts
rename to src/view/battle/Targetting.ts
diff --git a/src/app/view/battle/WeaponEffect.ts b/src/view/battle/WeaponEffect.ts
similarity index 100%
rename from src/app/view/battle/WeaponEffect.ts
rename to src/view/battle/WeaponEffect.ts
diff --git a/src/app/view/common/Animation.ts b/src/view/common/Animation.ts
similarity index 100%
rename from src/app/view/common/Animation.ts
rename to src/view/common/Animation.ts
diff --git a/src/app/view/common/Audio.ts b/src/view/common/Audio.ts
similarity index 100%
rename from src/app/view/common/Audio.ts
rename to src/view/common/Audio.ts
diff --git a/src/app/view/common/InputManager.ts b/src/view/common/InputManager.ts
similarity index 100%
rename from src/app/view/common/InputManager.ts
rename to src/view/common/InputManager.ts
diff --git a/src/app/view/common/Messages.ts b/src/view/common/Messages.ts
similarity index 100%
rename from src/app/view/common/Messages.ts
rename to src/view/common/Messages.ts
diff --git a/src/app/view/common/Tools.ts b/src/view/common/Tools.ts
similarity index 100%
rename from src/app/view/common/Tools.ts
rename to src/view/common/Tools.ts
diff --git a/src/app/view/common/ValueBar.ts b/src/view/common/ValueBar.ts
similarity index 100%
rename from src/app/view/common/ValueBar.ts
rename to src/view/common/ValueBar.ts
diff --git a/src/app/view/map/StarSystemView.ts b/src/view/map/StarSystemView.ts
similarity index 100%
rename from src/app/view/map/StarSystemView.ts
rename to src/view/map/StarSystemView.ts
diff --git a/src/app/view/map/UniverseMapView.ts b/src/view/map/UniverseMapView.ts
similarity index 100%
rename from src/app/view/map/UniverseMapView.ts
rename to src/view/map/UniverseMapView.ts
diff --git a/src/app/view/specs/ActionBar.spec.ts b/src/view/specs/ActionBar.spec.ts
similarity index 100%
rename from src/app/view/specs/ActionBar.spec.ts
rename to src/view/specs/ActionBar.spec.ts
diff --git a/src/app/view/specs/BattleView.spec.ts b/src/view/specs/BattleView.spec.ts
similarity index 100%
rename from src/app/view/specs/BattleView.spec.ts
rename to src/view/specs/BattleView.spec.ts
diff --git a/src/app/view/specs/ShipList.spec.ts b/src/view/specs/ShipList.spec.ts
similarity index 100%
rename from src/app/view/specs/ShipList.spec.ts
rename to src/view/specs/ShipList.spec.ts
diff --git a/src/app/view/specs/Targetting.spec.ts b/src/view/specs/Targetting.spec.ts
similarity index 100%
rename from src/app/view/specs/Targetting.spec.ts
rename to src/view/specs/Targetting.spec.ts
diff --git a/src/app/view/specs/TestGame.ts b/src/view/specs/TestGame.ts
similarity index 100%
rename from src/app/view/specs/TestGame.ts
rename to src/view/specs/TestGame.ts
diff --git a/src/app/view/specs/Tools.spec.ts b/src/view/specs/Tools.spec.ts
similarity index 100%
rename from src/app/view/specs/Tools.spec.ts
rename to src/view/specs/Tools.spec.ts
diff --git a/src/app/view/specs/ValueBar.spec.ts b/src/view/specs/ValueBar.spec.ts
similarity index 100%
rename from src/app/view/specs/ValueBar.spec.ts
rename to src/view/specs/ValueBar.spec.ts
diff --git a/tsconfig.json b/tsconfig.json
index 8ad86c3..8208920 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,16 +8,14 @@
         "noImplicitReturns": true,
         "removeComments": true,
         "preserveConstEnums": true,
-        "out": "src/build.js",
+        "out": "out/build.js",
         "strictNullChecks": false,
         "sourceMap": true,
         "target": "es5"
     },
     "exclude": [
         "out",
-        "src/vendor",
         "coverage",
         "node_modules"
     ]
-}
-
+}
\ No newline at end of file