diff --git a/src/sillysagiri/KeyCode.java b/src/sillysagiri/KeyCode.java
deleted file mode 100644
index 6a07f75..0000000
--- a/src/sillysagiri/KeyCode.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package sillysagiri;
-
-public class KeyCode {
-    public static final int NONE = -3422;
-
-    public static final int UP = -1;
-    public static final int DOWN = -2;
-    public static final int LEFT = -3;
-    public static final int RIGHT = -4;
-
-    public static final int KEY_0 = 48;
-    public static final int KEY_1 = 49;
-    public static final int KEY_2 = 50;
-    public static final int KEY_3 = 51;
-    public static final int KEY_4 = 52;
-    public static final int KEY_5 = 53;
-    public static final int KEY_6 = 54;
-    public static final int KEY_7 = 55;
-    public static final int KEY_8 = 56;
-    public static final int KEY_9 = 57;
-
-    public static final int KEY_STAR = 42;
-    public static final int KEY_POUND = 35;
-
-    public static final int CENTER = -5;
-
-    public static final int[] LEFT_SOFT_KEY = { -6, -202, -21, 21, -11, 105, -20};
-    public static final int[] RIGHT_SOFT_KEY = {-7, -203, -22, 22,      106, -21};
-}
diff --git a/src/sillysagiri/Sagiri.java b/src/sillysagiri/Sagiri.java
index c8e413e..3b9be41 100644
--- a/src/sillysagiri/Sagiri.java
+++ b/src/sillysagiri/Sagiri.java
@@ -4,6 +4,32 @@ import javax.microedition.lcdui.Graphics;
 
 public class Sagiri 
 {
+  public static final int KEY_NONE = -3422;
+
+  public static final int KEY_UP = -1;
+  public static final int KEY_DOWN = -2;
+  public static final int KEY_LEFT = -3;
+  public static final int KEY_RIGHT = -4;
+
+  public static final int KEY_0 = 48;
+  public static final int KEY_1 = 49;
+  public static final int KEY_2 = 50;
+  public static final int KEY_3 = 51;
+  public static final int KEY_4 = 52;
+  public static final int KEY_5 = 53;
+  public static final int KEY_6 = 54;
+  public static final int KEY_7 = 55;
+  public static final int KEY_8 = 56;
+  public static final int KEY_9 = 57;
+
+  public static final int KEY_STAR = 42;
+  public static final int KEY_POUND = 35;
+
+  public static final int KEY_CENTER = -5;
+
+  public static final int[] KEY_LEFT_SOFT = { -6, -202, -21, 21, -11, 105, -20};
+  public static final int[] KEY_RIGHT_SOFT = {-7, -203, -22, 22,      106, -21};
+  
   public final static int TOUCH_NONE = 0;
   public final static int TOUCH_BEGIN = 1;
   public final static int TOUCH_END = 2;
@@ -13,7 +39,7 @@ public class Sagiri
 
   public Input input;
 
-  public int fps = 10;
+  public int fps = 20;
 
   private Scene _scene_current = null;
   public long time_begin = 0;