Index: c/com/medievaltech/advancewars/AppState.java
===================================================================
--- src/com/medievaltech/advancewars/AppState.java	(revision bdd63ba42e11abecb0d2eebfe085ea638cd9a080)
+++ 	(revision )
@@ -1,9 +1,0 @@
-package com.medievaltech.advancewars;
-
-public enum AppState {
-	LOSE,
-	PAUSE,
-	READY,
-	RUNNING,
-	WIN
-}
Index: src/com/medievaltech/advancewars/Game.java
===================================================================
--- src/com/medievaltech/advancewars/Game.java	(revision bdd63ba42e11abecb0d2eebfe085ea638cd9a080)
+++ src/com/medievaltech/advancewars/Game.java	(revision 379005b098510fbba83457f758bd80713406b8a5)
@@ -2,6 +2,4 @@
 
 import java.io.*;
-
-import com.medievaltech.advancewars.GameView.DrawingThread;
 
 import android.app.Activity;
@@ -13,10 +11,11 @@
 import android.widget.TextView;
 
+import com.medievaltech.advancewars.GameView.*;
+import com.medievaltech.advancewars.Enum.*;
+
 public class Game extends Activity {
 	private static final int MENU_SAVE = 1;
 	private static final int MENU_MAIN = 2;
     private static final int MENU_EXIT = 3;
-    
-    public enum State{BUST, ACTIVE, DOUBLEDOWN};
 
     /** A handle to the thread that's actually running the animation. */
Index: c/com/medievaltech/advancewars/GameState.java
===================================================================
--- src/com/medievaltech/advancewars/GameState.java	(revision bdd63ba42e11abecb0d2eebfe085ea638cd9a080)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package com.medievaltech.advancewars;
-
-public enum GameState {
-	MAIN_MENU,
-	BATTLE_MAP
-}
Index: src/com/medievaltech/advancewars/GameView.java
===================================================================
--- src/com/medievaltech/advancewars/GameView.java	(revision bdd63ba42e11abecb0d2eebfe085ea638cd9a080)
+++ src/com/medievaltech/advancewars/GameView.java	(revision 379005b098510fbba83457f758bd80713406b8a5)
@@ -3,5 +3,5 @@
 import java.io.*;
 
-import com.medievaltech.advancewars.Tile.TerrainType;
+import com.medievaltech.advancewars.Enum.*;
 import com.medievaltech.unit.*;
 import com.medievaltech.gui.*;
@@ -20,10 +20,4 @@
         public AppState mAppState;
         public GameState mGameState;
-
-        /*
-         * UI constants (i.e. the speed & fuel bars)
-         */
-        public static final int UI_BAR = 100; // width of the bar(s)
-        public static final int UI_BAR_HEIGHT = 10; // height of the bar(s)
 
         /*
Index: src/com/medievaltech/advancewars/Map.java
===================================================================
--- src/com/medievaltech/advancewars/Map.java	(revision bdd63ba42e11abecb0d2eebfe085ea638cd9a080)
+++ src/com/medievaltech/advancewars/Map.java	(revision 379005b098510fbba83457f758bd80713406b8a5)
@@ -3,8 +3,7 @@
 import java.io.*;
 
+import android.graphics.*;
+
 import com.medievaltech.unit.Unit;
-
-
-import android.graphics.*;
 
 public class Map {
Index: src/com/medievaltech/advancewars/Tile.java
===================================================================
--- src/com/medievaltech/advancewars/Tile.java	(revision bdd63ba42e11abecb0d2eebfe085ea638cd9a080)
+++ src/com/medievaltech/advancewars/Tile.java	(revision 379005b098510fbba83457f758bd80713406b8a5)
@@ -1,5 +1,3 @@
 package com.medievaltech.advancewars;
-
-import com.medievaltech.unit.Unit;
 
 import android.graphics.Canvas;
@@ -7,10 +5,8 @@
 import android.graphics.Point;
 
+import com.medievaltech.unit.*;
+import com.medievaltech.advancewars.Enum.*;
+
 public class Tile {
-	public enum TerrainType
-	{
-		LAND, SEA
-	}
-	
 	TerrainType type;
 	public double moveCoefficent;