===================================================================
--- original.js
+++ change.js
@@ -1168,23 +1168,26 @@
 		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
 		fishGraphics.rotation = self.rotation;
 	};
 });
-var AquariumEnvironment = Container.expand(function () {
+var AquariumEnvironmentManager = Container.expand(function () {
 	var self = Container.call(this);
-	var aquariumGraphics = self.createAsset('aquarium', 'Aquarium Background', 0, 0);
-	aquariumGraphics.width = 2048 * 1.3 * 1.08;
-	aquariumGraphics.height = 2732 * 1.3 * 1.08;
-	aquariumGraphics.x = (2048 - aquariumGraphics.width) / 2;
-	aquariumGraphics.y = (2732 - aquariumGraphics.height) / 2;
-	self.addChild(aquariumGraphics);
-	var waterGraphics = self.createAsset('water', 'Water Graphics', 0, 0);
-	waterGraphics.width = 2048 / 3 * 2 * 1.08 * 1.15;
-	waterGraphics.height = 2732 / 3 * 1.26 * 1.15;
-	waterGraphics.x = (2048 - waterGraphics.width) / 2;
-	waterGraphics.y = (2732 - waterGraphics.height) / 2 - 150;
-	waterGraphics.alpha = 0.7;
-	self.addChild(waterGraphics);
+	self.createEnvironment = function () {
+		var aquariumGraphics = self.createAsset('aquarium', 'Aquarium Background', 0, 0);
+		aquariumGraphics.width = 2048 * 1.3 * 1.08;
+		aquariumGraphics.height = 2732 * 1.3 * 1.08;
+		aquariumGraphics.x = (2048 - aquariumGraphics.width) / 2;
+		aquariumGraphics.y = (2732 - aquariumGraphics.height) / 2;
+		self.addChild(aquariumGraphics);
+		var waterGraphics = self.createAsset('water', 'Water Graphics', 0, 0);
+		waterGraphics.width = 2048 / 3 * 2 * 1.08 * 1.15;
+		waterGraphics.height = 2732 / 3 * 1.26 * 1.15;
+		waterGraphics.x = (2048 - waterGraphics.width) / 2;
+		waterGraphics.y = (2732 - waterGraphics.height) / 2 - 150;
+		waterGraphics.alpha = 0.7;
+		self.addChild(waterGraphics);
+	};
+	return self;
 });
 var Aquarium = Container.expand(function () {
 	var self = Container.call(this);
 	self.getWaterBounds = function () {
@@ -1614,16 +1617,16 @@
 		self.hide();
 	});
 	return self;
 });
-var FishSpawner = Container.expand(function () {
+var FishManager = Container.expand(function () {
 	var self = Container.call(this);
-	var fishTypes = [Fish, KoiFish, Goldfish, GuppyFish, BettaFish, Angelfish, Clownfish, Pufferfish, Surgeonfish];
-	this.spawnFish = function (aquarium) {
-		var fishes = [];
-		for (var i = 0; i < fishTypes.length; i++) {
+	self.fishTypes = [Fish, KoiFish, Goldfish, GuppyFish, BettaFish, Angelfish, Clownfish, Pufferfish, Surgeonfish];
+	self.fishes = [];
+	self.spawnFish = function (aquarium) {
+		for (var i = 0; i < self.fishTypes.length; i++) {
 			for (var j = 0; j < 1; j++) {
-				var fish = new fishTypes[i]();
+				var fish = new self.fishTypes[i]();
 				if (typeof fish.move === 'function') {
 					var waterBounds = aquarium.getWaterBounds();
 					var waterWidth = waterBounds.right - waterBounds.left;
 					var waterHeight = waterBounds.bottom - waterBounds.top;
@@ -1635,15 +1638,16 @@
 					var distanceX = Math.random() * maxDistanceX;
 					var distanceY = Math.random() * maxDistanceY;
 					fish.x = waterCenterX + distanceX * Math.cos(angle);
 					fish.y = waterCenterY + distanceY * Math.sin(angle);
-					fishes.push(fish);
+					self.fishes.push(fish);
 					self.addChild(fish);
 				}
 			}
 		}
-		return fishes;
 	};
+	self.manageFish = function () {};
+	return self;
 });
 var MentorFish = Fish.expand(function () {
 	var self = Fish.call(this) || this;
 	self.intelligenceBoostRate = 1;
@@ -1682,14 +1686,13 @@
 	return nearbyFish;
 };
 var Game = Container.expand(function () {
 	var self = Container.call(this);
-	var aquarium = self.addChild(new Aquarium());
+	var aquariumEnvironmentManager = self.addChild(new AquariumEnvironmentManager());
+	aquariumEnvironmentManager.createEnvironment();
+	var fishManager = self.addChild(new FishManager());
+	fishManager.spawnFish(aquariumEnvironmentManager);
 	LK.stageContainer.setBackgroundColor(0x008080);
-	var fishSpawner = self.addChild(new FishSpawner());
-	var fishes = fishSpawner.spawnFish(aquarium);
 	LK.on('tick', function () {
-		for (var i = 0; i < fishes.length; i++) {
-			fishes[i].move();
-		}
+		fishManager.manageFish();
 	});
 });