From afd14947876d65736312a2956e77f2aa2a6bf7a8 Mon Sep 17 00:00:00 2001
From: eugue <eug.sun@gmail.com>
Date: Tue, 11 Jan 2011 19:36:22 -0500
Subject: deleted code of the android app. Modified some code for mobile
 testing.

---
 LightInstallation.py                               |    2 +-
 layouts/50PixelStrip.xml                           |    2 +-
 mobileapp/.classpath                               |    7 -
 mobileapp/.project                                 |   33 -
 mobileapp/.settings/org.eclipse.jdt.core.prefs     |    5 -
 mobileapp/AndroidManifest.xml                      |   43 -
 mobileapp/default.properties                       |   11 -
 mobileapp/gen/smoots/udesign/main/R.java           |   67 -
 mobileapp/res/drawable-hdpi/icon.png               |  Bin 4147 -> 0 bytes
 mobileapp/res/drawable-ldpi/icon.png               |  Bin 1723 -> 0 bytes
 mobileapp/res/drawable-mdpi/icon.png               |  Bin 2574 -> 0 bytes
 mobileapp/res/drawable/earthrise.png               |  Bin 39333 -> 0 bytes
 mobileapp/res/drawable/ic_tab_canvas.xml           |    8 -
 mobileapp/res/drawable/ic_tab_interactions.xml     |    8 -
 mobileapp/res/drawable/ic_tab_settings.xml         |    8 -
 mobileapp/res/drawable/test_icon_selected.png      |  Bin 1127 -> 0 bytes
 mobileapp/res/drawable/test_icon_unselected.png    |  Bin 791 -> 0 bytes
 mobileapp/res/layout/accelerometer.xml             |   79 -
 mobileapp/res/layout/canvaslo.xml                  |   19 -
 mobileapp/res/layout/interactions.xml              |    6 -
 mobileapp/res/layout/interactions_item.xml         |    7 -
 mobileapp/res/layout/main.xml                      |   21 -
 mobileapp/res/layout/settings.xml                  |   65 -
 mobileapp/res/menu/canvas_menu.xml                 |   18 -
 mobileapp/res/raw/dd2.mp3                          |  Bin 497371 -> 0 bytes
 mobileapp/res/values/strings.xml                   |   22 -
 mobileapp/src/org/json/CDL.java                    |  279 ----
 mobileapp/src/org/json/Cookie.java                 |  169 ---
 mobileapp/src/org/json/CookieList.java             |   90 --
 mobileapp/src/org/json/HTTP.java                   |  163 --
 mobileapp/src/org/json/HTTPTokener.java            |   77 -
 mobileapp/src/org/json/JSONArray.java              |  918 ------------
 mobileapp/src/org/json/JSONException.java          |   31 -
 mobileapp/src/org/json/JSONML.java                 |  455 ------
 mobileapp/src/org/json/JSONObject.java             | 1584 --------------------
 mobileapp/src/org/json/JSONString.java             |   18 -
 mobileapp/src/org/json/JSONStringer.java           |   78 -
 mobileapp/src/org/json/JSONTokener.java            |  435 ------
 mobileapp/src/org/json/JSONWriter.java             |  323 ----
 mobileapp/src/org/json/Test.java                   |  678 ---------
 mobileapp/src/org/json/XML.java                    |  441 ------
 mobileapp/src/org/json/XMLTokener.java             |  365 -----
 .../accelerometer/AccelerometerListener.java       |   16 -
 .../accelerometer/AccelerometerManager.java        |  178 ---
 .../src/smoots/udesign/canvas/CanvasActivity.java  |  269 ----
 .../src/smoots/udesign/canvas/CanvasView.java      |  422 ------
 .../udesign/canvas/VirtualCanvasActivity.java      |  313 ----
 .../udesign/colorpicker/ColorPickerDialog.java     |   42 -
 .../udesign/colorpicker/ColorPickerListener.java   |    5 -
 .../udesign/colorpicker/ColorPickerView.java       |  187 ---
 mobileapp/src/smoots/udesign/io/ClientReader.java  |   74 -
 mobileapp/src/smoots/udesign/io/ClientWriter.java  |   71 -
 .../smoots/udesign/main/InteractionsActivity.java  |   33 -
 .../src/smoots/udesign/main/UDesignTabWidget.java  |   43 -
 .../src/smoots/udesign/packet/.svn/all-wcprops     |   53 -
 mobileapp/src/smoots/udesign/packet/.svn/entries   |  300 ----
 .../.svn/text-base/CSActionType.java.svn-base      |   10 -
 .../text-base/ClientToServerPacket.java.svn-base   |  236 ---
 .../ClientToServerPacketTest.java.svn-base         |   76 -
 .../packet/.svn/text-base/Packet.java.svn-base     |   14 -
 .../.svn/text-base/SCActionType.java.svn-base      |   10 -
 .../text-base/ServerToClientPacket.java.svn-base   |  222 ---
 .../ServerToClientPacketTest.java.svn-base         |   88 --
 .../.svn/text-base/UnaryAction.java.svn-base       |   10 -
 .../src/smoots/udesign/packet/MotionType.java      |   11 -
 mobileapp/src/smoots/udesign/packet/Packet.java    |   12 -
 .../smoots/udesign/packet/PhoneToServerPacket.java |   25 -
 .../settings/OnSettingsChangedListener.java        |    8 -
 .../smoots/udesign/settings/SettingsDialog.java    |   45 -
 .../src/smoots/udesign/util/PhoneDebugger.java     |   23 -
 70 files changed, 2 insertions(+), 9329 deletions(-)
 delete mode 100755 mobileapp/.classpath
 delete mode 100755 mobileapp/.project
 delete mode 100755 mobileapp/.settings/org.eclipse.jdt.core.prefs
 delete mode 100755 mobileapp/AndroidManifest.xml
 delete mode 100755 mobileapp/default.properties
 delete mode 100755 mobileapp/gen/smoots/udesign/main/R.java
 delete mode 100755 mobileapp/res/drawable-hdpi/icon.png
 delete mode 100755 mobileapp/res/drawable-ldpi/icon.png
 delete mode 100755 mobileapp/res/drawable-mdpi/icon.png
 delete mode 100755 mobileapp/res/drawable/earthrise.png
 delete mode 100755 mobileapp/res/drawable/ic_tab_canvas.xml
 delete mode 100755 mobileapp/res/drawable/ic_tab_interactions.xml
 delete mode 100755 mobileapp/res/drawable/ic_tab_settings.xml
 delete mode 100755 mobileapp/res/drawable/test_icon_selected.png
 delete mode 100755 mobileapp/res/drawable/test_icon_unselected.png
 delete mode 100755 mobileapp/res/layout/accelerometer.xml
 delete mode 100755 mobileapp/res/layout/canvaslo.xml
 delete mode 100755 mobileapp/res/layout/interactions.xml
 delete mode 100755 mobileapp/res/layout/interactions_item.xml
 delete mode 100755 mobileapp/res/layout/main.xml
 delete mode 100755 mobileapp/res/layout/settings.xml
 delete mode 100755 mobileapp/res/menu/canvas_menu.xml
 delete mode 100755 mobileapp/res/raw/dd2.mp3
 delete mode 100755 mobileapp/res/values/strings.xml
 delete mode 100755 mobileapp/src/org/json/CDL.java
 delete mode 100755 mobileapp/src/org/json/Cookie.java
 delete mode 100755 mobileapp/src/org/json/CookieList.java
 delete mode 100755 mobileapp/src/org/json/HTTP.java
 delete mode 100755 mobileapp/src/org/json/HTTPTokener.java
 delete mode 100755 mobileapp/src/org/json/JSONArray.java
 delete mode 100755 mobileapp/src/org/json/JSONException.java
 delete mode 100755 mobileapp/src/org/json/JSONML.java
 delete mode 100755 mobileapp/src/org/json/JSONObject.java
 delete mode 100755 mobileapp/src/org/json/JSONString.java
 delete mode 100755 mobileapp/src/org/json/JSONStringer.java
 delete mode 100755 mobileapp/src/org/json/JSONTokener.java
 delete mode 100755 mobileapp/src/org/json/JSONWriter.java
 delete mode 100755 mobileapp/src/org/json/Test.java
 delete mode 100755 mobileapp/src/org/json/XML.java
 delete mode 100755 mobileapp/src/org/json/XMLTokener.java
 delete mode 100755 mobileapp/src/smoots/udesign/accelerometer/AccelerometerListener.java
 delete mode 100755 mobileapp/src/smoots/udesign/accelerometer/AccelerometerManager.java
 delete mode 100755 mobileapp/src/smoots/udesign/canvas/CanvasActivity.java
 delete mode 100755 mobileapp/src/smoots/udesign/canvas/CanvasView.java
 delete mode 100755 mobileapp/src/smoots/udesign/canvas/VirtualCanvasActivity.java
 delete mode 100755 mobileapp/src/smoots/udesign/colorpicker/ColorPickerDialog.java
 delete mode 100755 mobileapp/src/smoots/udesign/colorpicker/ColorPickerListener.java
 delete mode 100755 mobileapp/src/smoots/udesign/colorpicker/ColorPickerView.java
 delete mode 100755 mobileapp/src/smoots/udesign/io/ClientReader.java
 delete mode 100755 mobileapp/src/smoots/udesign/io/ClientWriter.java
 delete mode 100755 mobileapp/src/smoots/udesign/main/InteractionsActivity.java
 delete mode 100755 mobileapp/src/smoots/udesign/main/UDesignTabWidget.java
 delete mode 100755 mobileapp/src/smoots/udesign/packet/.svn/all-wcprops
 delete mode 100755 mobileapp/src/smoots/udesign/packet/.svn/entries
 delete mode 100755 mobileapp/src/smoots/udesign/packet/.svn/text-base/CSActionType.java.svn-base
 delete mode 100755 mobileapp/src/smoots/udesign/packet/.svn/text-base/ClientToServerPacket.java.svn-base
 delete mode 100755 mobileapp/src/smoots/udesign/packet/.svn/text-base/ClientToServerPacketTest.java.svn-base
 delete mode 100755 mobileapp/src/smoots/udesign/packet/.svn/text-base/Packet.java.svn-base
 delete mode 100755 mobileapp/src/smoots/udesign/packet/.svn/text-base/SCActionType.java.svn-base
 delete mode 100755 mobileapp/src/smoots/udesign/packet/.svn/text-base/ServerToClientPacket.java.svn-base
 delete mode 100755 mobileapp/src/smoots/udesign/packet/.svn/text-base/ServerToClientPacketTest.java.svn-base
 delete mode 100755 mobileapp/src/smoots/udesign/packet/.svn/text-base/UnaryAction.java.svn-base
 delete mode 100755 mobileapp/src/smoots/udesign/packet/MotionType.java
 delete mode 100755 mobileapp/src/smoots/udesign/packet/Packet.java
 delete mode 100755 mobileapp/src/smoots/udesign/packet/PhoneToServerPacket.java
 delete mode 100755 mobileapp/src/smoots/udesign/settings/OnSettingsChangedListener.java
 delete mode 100755 mobileapp/src/smoots/udesign/settings/SettingsDialog.java
 delete mode 100755 mobileapp/src/smoots/udesign/util/PhoneDebugger.java

diff --git a/LightInstallation.py b/LightInstallation.py
index aaedcf2..54c8bdc 100644
--- a/LightInstallation.py
+++ b/LightInstallation.py
@@ -121,7 +121,7 @@ class LightInstallation:
         lastLoopTime = clock.time()
         refreshInterval = 30
         runCount = 200 
-        while runCount > 0:
+        while 1:
             runCount -= 1
             loopStart = clock.time()
             responses = self.evaluateBehaviors() #inputs are all queued when they
diff --git a/layouts/50PixelStrip.xml b/layouts/50PixelStrip.xml
index 11fa5e1..beabb97 100644
--- a/layouts/50PixelStrip.xml
+++ b/layouts/50PixelStrip.xml
@@ -3,6 +3,6 @@
     <Args>
         <pixelToPixelSpacing>4</pixelToPixelSpacing>
         <spacing>4</spacing> 
-        <numPixels>500</numPixels>
+        <numPixels>50</numPixels>
     </Args>
 </PixelStrip>
diff --git a/mobileapp/.classpath b/mobileapp/.classpath
deleted file mode 100755
index 6e9239f..0000000
--- a/mobileapp/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/mobileapp/.project b/mobileapp/.project
deleted file mode 100755
index 83af6f0..0000000
--- a/mobileapp/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>UDesignMobile</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/mobileapp/.settings/org.eclipse.jdt.core.prefs b/mobileapp/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index 246daa3..0000000
--- a/mobileapp/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sun Oct 24 20:03:38 EDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/mobileapp/AndroidManifest.xml b/mobileapp/AndroidManifest.xml
deleted file mode 100755
index 6fc7f03..0000000
--- a/mobileapp/AndroidManifest.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="smoots.udesign.main"
-    android:versionCode="1"
-    android:versionName="1.0">
-	
-	<uses-permission android:name="android.permission.INTERNET" /> 
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission>
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
-	<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"></uses-permission>
-	<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"></uses-permission>
-	<uses-permission android:name="android.permission.WRITE_APN_SETTINGS" ></uses-permission>
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" ></uses-permission>
-   
-    <application android:icon="@drawable/icon" android:label="@string/app_name">
-    
-        <activity android:name=".UDesignTabWidget"
-                  android:label="@string/app_name"
-                  android:screenOrientation="portrait"
-                  android:theme="@android:style/Theme.NoTitleBar">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".CanvasActivity"
-                  android:label="@string/tab_canvas_name">
-        </activity>
-        
-        <activity android:name=".VirtualCanvasActivity"
-                  android:label="@string/tab_canvas_name">
-        </activity>
-                
-        <activity android:name=".InteractionsActivity"
-                  android:label="@string/tab_interactions_name">
-        </activity>
-        
-    </application>
-
-
-</manifest>
diff --git a/mobileapp/default.properties b/mobileapp/default.properties
deleted file mode 100755
index 9d135cb..0000000
--- a/mobileapp/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
-# This file must be checked in Version Control Systems.
-# 
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-7
diff --git a/mobileapp/gen/smoots/udesign/main/R.java b/mobileapp/gen/smoots/udesign/main/R.java
deleted file mode 100755
index 11cb050..0000000
--- a/mobileapp/gen/smoots/udesign/main/R.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package smoots.udesign.main;
-
-public final class R {
-    public static final class array {
-        public static final int interactions_array=0x7f060000;
-    }
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int earthrise=0x7f020000;
-        public static final int ic_tab_canvas=0x7f020001;
-        public static final int ic_tab_interactions=0x7f020002;
-        public static final int ic_tab_settings=0x7f020003;
-        public static final int icon=0x7f020004;
-        public static final int test_icon_selected=0x7f020005;
-        public static final int test_icon_unselected=0x7f020006;
-    }
-    public static final class id {
-        public static final int canvas_view=0x7f080006;
-        public static final int color_button=0x7f080004;
-        public static final int color_picker=0x7f08000a;
-        public static final int send=0x7f08000c;
-        public static final int settings=0x7f08000b;
-        public static final int settings_ip=0x7f080007;
-        public static final int settings_ok=0x7f080009;
-        public static final int settings_port=0x7f080008;
-        public static final int status_text=0x7f080005;
-        public static final int txtSendStatus=0x7f080003;
-        public static final int x=0x7f080000;
-        public static final int y=0x7f080001;
-        public static final int z=0x7f080002;
-    }
-    public static final class layout {
-        public static final int accelerometer=0x7f030000;
-        public static final int canvaslo=0x7f030001;
-        public static final int interactions=0x7f030002;
-        public static final int interactions_item=0x7f030003;
-        public static final int main=0x7f030004;
-        public static final int settings=0x7f030005;
-    }
-    public static final class menu {
-        public static final int canvas_menu=0x7f070000;
-    }
-    public static final class raw {
-        public static final int dd2=0x7f040000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f050001;
-        public static final int hello=0x7f050000;
-        public static final int menu_color_picker=0x7f050006;
-        public static final int menu_effect_picker=0x7f050007;
-        public static final int menu_send=0x7f050009;
-        public static final int menu_settings=0x7f050008;
-        public static final int settings_ok=0x7f05000a;
-        public static final int tab_canvas_name=0x7f050002;
-        public static final int tab_color_name=0x7f050003;
-        public static final int tab_interactions_name=0x7f050004;
-        public static final int tab_settings_name=0x7f050005;
-    }
-}
diff --git a/mobileapp/res/drawable-hdpi/icon.png b/mobileapp/res/drawable-hdpi/icon.png
deleted file mode 100755
index 8074c4c..0000000
Binary files a/mobileapp/res/drawable-hdpi/icon.png and /dev/null differ
diff --git a/mobileapp/res/drawable-ldpi/icon.png b/mobileapp/res/drawable-ldpi/icon.png
deleted file mode 100755
index 1095584..0000000
Binary files a/mobileapp/res/drawable-ldpi/icon.png and /dev/null differ
diff --git a/mobileapp/res/drawable-mdpi/icon.png b/mobileapp/res/drawable-mdpi/icon.png
deleted file mode 100755
index a07c69f..0000000
Binary files a/mobileapp/res/drawable-mdpi/icon.png and /dev/null differ
diff --git a/mobileapp/res/drawable/earthrise.png b/mobileapp/res/drawable/earthrise.png
deleted file mode 100755
index e2ecdc5..0000000
Binary files a/mobileapp/res/drawable/earthrise.png and /dev/null differ
diff --git a/mobileapp/res/drawable/ic_tab_canvas.xml b/mobileapp/res/drawable/ic_tab_canvas.xml
deleted file mode 100755
index a3f5735..0000000
--- a/mobileapp/res/drawable/ic_tab_canvas.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- When selected, use grey -->
-    <item android:drawable="@drawable/test_icon_selected"
-          android:state_selected="true" />
-    <!-- When not selected, use white-->
-    <item android:drawable="@drawable/test_icon_unselected" />
-</selector>
\ No newline at end of file
diff --git a/mobileapp/res/drawable/ic_tab_interactions.xml b/mobileapp/res/drawable/ic_tab_interactions.xml
deleted file mode 100755
index a3f5735..0000000
--- a/mobileapp/res/drawable/ic_tab_interactions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- When selected, use grey -->
-    <item android:drawable="@drawable/test_icon_selected"
-          android:state_selected="true" />
-    <!-- When not selected, use white-->
-    <item android:drawable="@drawable/test_icon_unselected" />
-</selector>
\ No newline at end of file
diff --git a/mobileapp/res/drawable/ic_tab_settings.xml b/mobileapp/res/drawable/ic_tab_settings.xml
deleted file mode 100755
index a3f5735..0000000
--- a/mobileapp/res/drawable/ic_tab_settings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- When selected, use grey -->
-    <item android:drawable="@drawable/test_icon_selected"
-          android:state_selected="true" />
-    <!-- When not selected, use white-->
-    <item android:drawable="@drawable/test_icon_unselected" />
-</selector>
\ No newline at end of file
diff --git a/mobileapp/res/drawable/test_icon_selected.png b/mobileapp/res/drawable/test_icon_selected.png
deleted file mode 100755
index 3b010d5..0000000
Binary files a/mobileapp/res/drawable/test_icon_selected.png and /dev/null differ
diff --git a/mobileapp/res/drawable/test_icon_unselected.png b/mobileapp/res/drawable/test_icon_unselected.png
deleted file mode 100755
index 9baa30e..0000000
Binary files a/mobileapp/res/drawable/test_icon_unselected.png and /dev/null differ
diff --git a/mobileapp/res/layout/accelerometer.xml b/mobileapp/res/layout/accelerometer.xml
deleted file mode 100755
index a124b0c..0000000
--- a/mobileapp/res/layout/accelerometer.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-    
-    <TableLayout
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:stretchColumns="0|1"
-    	android:layout_gravity="center_vertical|center_horizontal">
-    
-    	<TableRow>
-			<TextView 
-			    android:layout_width="wrap_content" 
-			    android:layout_height="wrap_content" 
-			    android:gravity="right"
-			    android:text="X : "/>
-			<TextView 
-				android:id="@+id/x"
-			    android:layout_width="wrap_content" 
-			    android:layout_height="wrap_content" 
-			    android:text="not supported"/>
-    	</TableRow>
-    
-    	<TableRow>
-			<TextView 
-			    android:layout_width="wrap_content" 
-			    android:layout_height="wrap_content" 
-			    android:gravity="right"
-			    android:text="Y : "/>
-			<TextView 
-				android:id="@+id/y"
-			    android:layout_width="wrap_content" 
-			    android:layout_height="wrap_content" 
-			    android:text="not supported"/>
-    	</TableRow>
-    
-    	<TableRow>
-			<TextView 
-			    android:layout_width="wrap_content" 
-			    android:layout_height="wrap_content" 
-			    android:gravity="right"
-			    android:text="Z : "/>
-			<TextView 
-				android:id="@+id/z"
-			    android:layout_width="wrap_content" 
-			    android:layout_height="wrap_content" 
-			    android:text="not supported"/>
-    	</TableRow>
-    	
-    	<TableRow>
-	    	<TextView 
-				    android:layout_width="wrap_content" 
-				    android:layout_height="wrap_content" 
-				    android:gravity="right"
-				    android:text="Status : "/>
-	    	<TextView 
-					android:id="@+id/txtSendStatus"
-				    android:layout_width="wrap_content" 
-				    android:layout_height="wrap_content" 
-				    android:text="ready"/>
-    	</TableRow>
-    	
-    </TableLayout>
-    
-    <LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content">
-
-		<Button 
-			android:id="@+id/color_button"
-			android:text="Color" 
-			android:layout_width="fill_parent" 
-			android:layout_height="wrap_content">
-		</Button>
-	</LinearLayout>
-	
-</merge>
\ No newline at end of file
diff --git a/mobileapp/res/layout/canvaslo.xml b/mobileapp/res/layout/canvaslo.xml
deleted file mode 100755
index 192e878..0000000
--- a/mobileapp/res/layout/canvaslo.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content">
- 
-	<TextView
-		android:id="@+id/status_text" 
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="Ready"
-		android:textColor="@android:color/white" />
-
-    <smoots.udesign.virtual.CanvasView
-		android:id="@+id/canvas_view"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"/>
-
-</FrameLayout>
diff --git a/mobileapp/res/layout/interactions.xml b/mobileapp/res/layout/interactions.xml
deleted file mode 100755
index f737e99..0000000
--- a/mobileapp/res/layout/interactions.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content">
-</LinearLayout>
diff --git a/mobileapp/res/layout/interactions_item.xml b/mobileapp/res/layout/interactions_item.xml
deleted file mode 100755
index bb17e2a..0000000
--- a/mobileapp/res/layout/interactions_item.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:padding="10dp"
-	android:textSize="16sp" >
-</TextView>
\ No newline at end of file
diff --git a/mobileapp/res/layout/main.xml b/mobileapp/res/layout/main.xml
deleted file mode 100755
index 1d0e21b..0000000
--- a/mobileapp/res/layout/main.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/tabhost"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:padding="5dp">
-        <TabWidget
-            android:id="@android:id/tabs"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content" />
-        <FrameLayout
-            android:id="@android:id/tabcontent"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:padding="5dp" />
-    </LinearLayout>
-</TabHost>
\ No newline at end of file
diff --git a/mobileapp/res/layout/settings.xml b/mobileapp/res/layout/settings.xml
deleted file mode 100755
index 64e02e3..0000000
--- a/mobileapp/res/layout/settings.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" >
-    
-    <TableLayout
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:stretchColumns="0|1"
-    	android:layout_gravity="center_vertical|center_horizontal">
-    
-    	<TableRow>
-			<TextView 
-			    android:layout_width="wrap_content" 
-			    android:layout_height="wrap_content" 
-			    android:gravity="right"
-			    android:text="IP : "/>
-		    <EditText
-		        android:id="@+id/settings_ip"
-		        android:width="200dip"
-		        android:layout_height="wrap_content"
-		        android:layout_width="wrap_content"
-		        android:scrollHorizontally="true"
-		        android:autoText="false"
-		        android:capitalize="none"
-		        android:gravity="fill_horizontal"
-		        android:singleLine="True"
-		        android:textAppearance="?android:attr/textAppearanceMedium" />
-    	</TableRow>
-    
-    	<TableRow>
-			<TextView 
-			    android:layout_width="wrap_content" 
-			    android:layout_height="wrap_content" 
-			    android:gravity="right"
-			    android:text="Port : "/>
-		    <EditText
-		        android:id="@+id/settings_port"
-		        android:inputType="number"
-		        android:width="50dip"
-		        android:layout_height="wrap_content"
-		        android:layout_width="wrap_content"
-		        android:scrollHorizontally="true"
-		        android:autoText="false"
-		        android:singleLine="True"
-		        android:textAppearance="?android:attr/textAppearanceMedium" />
-    	</TableRow>
-    
-    	<TableRow>
-    		<TextView 
-			    android:layout_width="wrap_content" 
-			    android:layout_height="wrap_content" 
-			    android:gravity="right"
-			    android:text=""/>
-    		<Button
-    			android:layout_width="wrap_content" 
-			    android:layout_height="wrap_content"
-    			android:id="@+id/settings_ok"
-    			android:gravity="fill"
-    			android:text="@string/settings_ok" />
-    	</TableRow>
-    </TableLayout>
-    
-</merge>
\ No newline at end of file
diff --git a/mobileapp/res/menu/canvas_menu.xml b/mobileapp/res/menu/canvas_menu.xml
deleted file mode 100755
index fdb5c78..0000000
--- a/mobileapp/res/menu/canvas_menu.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@+id/color_picker"
-	      android:icon="@drawable/test_icon_selected"
-	      android:title="@string/menu_color_picker" />
-<!-- 	
-	<item android:id="@+id/effect_picker"
-	      android:icon="@drawable/test_icon_selected"
-	      android:title="@string/menu_effect_picker" />
--->
-
-	<item android:id="@+id/settings"
-	      android:icon="@drawable/test_icon_selected"
-	      android:title="@string/menu_settings" />
-	<item android:id="@+id/send"
-	      android:icon="@drawable/test_icon_selected"
-	      android:title="@string/menu_send" />
-</menu>
\ No newline at end of file
diff --git a/mobileapp/res/raw/dd2.mp3 b/mobileapp/res/raw/dd2.mp3
deleted file mode 100755
index e5ee4cf..0000000
Binary files a/mobileapp/res/raw/dd2.mp3 and /dev/null differ
diff --git a/mobileapp/res/values/strings.xml b/mobileapp/res/values/strings.xml
deleted file mode 100755
index 5165c68..0000000
--- a/mobileapp/res/values/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="hello">Hello World, UDesign!</string>
-    <string name="app_name">UDesign</string>
-    <string name="tab_canvas_name">Canvas</string>
-    <string name="tab_color_name">Color</string>
-    <string name="tab_interactions_name">Interactions</string>
-    <string name="tab_settings_name">Settings</string>
-    <string name="menu_color_picker">Color Picker</string>
-    <string name="menu_effect_picker">Effect Picker</string>
-    <string name="menu_settings">Settings</string>
-    <string name="menu_send">Send</string>
-    
-    <string name="settings_ok">OK</string>
-    
-	<string-array name="interactions_array">
-		<item>Accelerometer Test</item>
-		<item>Follow the Light</item>
-		<item>Phone Blade</item>
-		<item>Pixel Mover</item>
-	</string-array>
-</resources>
diff --git a/mobileapp/src/org/json/CDL.java b/mobileapp/src/org/json/CDL.java
deleted file mode 100755
index d76dd68..0000000
--- a/mobileapp/src/org/json/CDL.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package org.json;
-
-/*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-/**
- * This provides static methods to convert comma delimited text into a
- * JSONArray, and to covert a JSONArray into comma delimited text. Comma
- * delimited text is a very popular format for data interchange. It is
- * understood by most database, spreadsheet, and organizer programs.
- * <p>
- * Each row of text represents a row in a table or a data record. Each row
- * ends with a NEWLINE character. Each row contains one or more values.
- * Values are separated by commas. A value can contain any character except
- * for comma, unless is is wrapped in single quotes or double quotes.
- * <p>
- * The first row usually contains the names of the columns.
- * <p>
- * A comma delimited list can be converted into a JSONArray of JSONObjects.
- * The names for the elements in the JSONObjects can be taken from the names
- * in the first row.
- * @author JSON.org
- * @version 2009-09-11
- */
-public class CDL {
-
-    /**
-     * Get the next value. The value can be wrapped in quotes. The value can
-     * be empty.
-     * @param x A JSONTokener of the source text.
-     * @return The value string, or null if empty.
-     * @throws JSONException if the quoted string is badly formed.
-     */
-    private static String getValue(JSONTokener x) throws JSONException {
-        char c;
-        char q;
-        StringBuffer sb;
-        do {
-            c = x.next();
-        } while (c == ' ' || c == '\t');
-        switch (c) {
-        case 0:
-            return null;
-        case '"':
-        case '\'':
-        	q = c;
-        	sb = new StringBuffer();
-        	for (;;) {
-        		c = x.next();
-        		if (c == q) {
-        			break;
-        		}
-                if (c == 0 || c == '\n' || c == '\r') {
-                    throw x.syntaxError("Missing close quote '" + q + "'.");
-                }
-                sb.append(c);
-        	}
-            return sb.toString();
-        case ',':
-            x.back();
-            return "";
-        default:
-            x.back();
-            return x.nextTo(',');
-        }
-    }
-
-    /**
-     * Produce a JSONArray of strings from a row of comma delimited values.
-     * @param x A JSONTokener of the source text.
-     * @return A JSONArray of strings.
-     * @throws JSONException
-     */
-    public static JSONArray rowToJSONArray(JSONTokener x) throws JSONException {
-        JSONArray ja = new JSONArray();
-        for (;;) {
-            String value = getValue(x);
-            char c = x.next();
-            if (value == null || 
-            		(ja.length() == 0 && value.length() == 0 && c != ',')) {
-                return null;
-            }
-            ja.put(value);
-            for (;;) {                
-                if (c == ',') {
-                    break;
-                }
-                if (c != ' ') {
-                    if (c == '\n' || c == '\r' || c == 0) {
-                        return ja;
-                    }
-                    throw x.syntaxError("Bad character '" + c + "' (" +
-                            (int)c + ").");
-                }
-                c = x.next();
-            }
-        }
-    }
-
-    /**
-     * Produce a JSONObject from a row of comma delimited text, using a
-     * parallel JSONArray of strings to provides the names of the elements.
-     * @param names A JSONArray of names. This is commonly obtained from the
-     *  first row of a comma delimited text file using the rowToJSONArray
-     *  method.
-     * @param x A JSONTokener of the source text.
-     * @return A JSONObject combining the names and values.
-     * @throws JSONException
-     */
-    public static JSONObject rowToJSONObject(JSONArray names, JSONTokener x)
-            throws JSONException {
-        JSONArray ja = rowToJSONArray(x);
-        return ja != null ? ja.toJSONObject(names) :  null;
-    }
-
-    /**
-     * Produce a JSONArray of JSONObjects from a comma delimited text string,
-     * using the first row as a source of names.
-     * @param string The comma delimited text.
-     * @return A JSONArray of JSONObjects.
-     * @throws JSONException
-     */
-    public static JSONArray toJSONArray(String string) throws JSONException {
-        return toJSONArray(new JSONTokener(string));
-    }
-
-    /**
-     * Produce a JSONArray of JSONObjects from a comma delimited text string,
-     * using the first row as a source of names.
-     * @param x The JSONTokener containing the comma delimited text.
-     * @return A JSONArray of JSONObjects.
-     * @throws JSONException
-     */
-    public static JSONArray toJSONArray(JSONTokener x) throws JSONException {
-        return toJSONArray(rowToJSONArray(x), x);
-    }
-
-    /**
-     * Produce a JSONArray of JSONObjects from a comma delimited text string
-     * using a supplied JSONArray as the source of element names.
-     * @param names A JSONArray of strings.
-     * @param string The comma delimited text.
-     * @return A JSONArray of JSONObjects.
-     * @throws JSONException
-     */
-    public static JSONArray toJSONArray(JSONArray names, String string)
-            throws JSONException {
-        return toJSONArray(names, new JSONTokener(string));
-    }
-
-    /**
-     * Produce a JSONArray of JSONObjects from a comma delimited text string
-     * using a supplied JSONArray as the source of element names.
-     * @param names A JSONArray of strings.
-     * @param x A JSONTokener of the source text.
-     * @return A JSONArray of JSONObjects.
-     * @throws JSONException
-     */
-    public static JSONArray toJSONArray(JSONArray names, JSONTokener x)
-            throws JSONException {
-        if (names == null || names.length() == 0) {
-            return null;
-        }
-        JSONArray ja = new JSONArray();
-        for (;;) {
-            JSONObject jo = rowToJSONObject(names, x);
-            if (jo == null) {
-                break;
-            }
-            ja.put(jo);
-        }
-        if (ja.length() == 0) {
-            return null;
-        }
-        return ja;
-    }
-
-
-    /**
-     * Produce a comma delimited text row from a JSONArray. Values containing
-     * the comma character will be quoted. Troublesome characters may be 
-     * removed.
-     * @param ja A JSONArray of strings.
-     * @return A string ending in NEWLINE.
-     */
-    public static String rowToString(JSONArray ja) {
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < ja.length(); i += 1) {
-            if (i > 0) {
-                sb.append(',');
-            }
-            Object o = ja.opt(i);
-            if (o != null) {
-                String s = o.toString();
-                if (s.length() > 0 && (s.indexOf(',') >= 0 || s.indexOf('\n') >= 0 || 
-                		s.indexOf('\r') >= 0 || s.indexOf(0) >= 0 || 
-                		s.charAt(0) == '"')) {
-                    sb.append('"');
-                	int length = s.length();
-                	for (int j = 0; j < length; j += 1) {
-                		char c = s.charAt(j);
-                		if (c >= ' ' && c != '"') {
-                			sb.append(c);
-                		}
-                    }
-                    sb.append('"');
-                } else {
-                    sb.append(s);
-                }
-            }
-        }
-        sb.append('\n');
-        return sb.toString();
-    }
-
-    /**
-     * Produce a comma delimited text from a JSONArray of JSONObjects. The
-     * first row will be a list of names obtained by inspecting the first
-     * JSONObject.
-     * @param ja A JSONArray of JSONObjects.
-     * @return A comma delimited text.
-     * @throws JSONException
-     */
-    public static String toString(JSONArray ja) throws JSONException {
-        JSONObject jo = ja.optJSONObject(0);
-        if (jo != null) {
-            JSONArray names = jo.names();
-            if (names != null) {
-                return rowToString(names) + toString(names, ja);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Produce a comma delimited text from a JSONArray of JSONObjects using
-     * a provided list of names. The list of names is not included in the
-     * output.
-     * @param names A JSONArray of strings.
-     * @param ja A JSONArray of JSONObjects.
-     * @return A comma delimited text.
-     * @throws JSONException
-     */
-    public static String toString(JSONArray names, JSONArray ja)
-            throws JSONException {
-        if (names == null || names.length() == 0) {
-            return null;
-        }
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < ja.length(); i += 1) {
-            JSONObject jo = ja.optJSONObject(i);
-            if (jo != null) {
-                sb.append(rowToString(jo.toJSONArray(names)));
-            }
-        }
-        return sb.toString();
-    }
-}
diff --git a/mobileapp/src/org/json/Cookie.java b/mobileapp/src/org/json/Cookie.java
deleted file mode 100755
index 85b992e..0000000
--- a/mobileapp/src/org/json/Cookie.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.json;
-
-/*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-/**
- * Convert a web browser cookie specification to a JSONObject and back.
- * JSON and Cookies are both notations for name/value pairs.
- * @author JSON.org
- * @version 2008-09-18
- */
-public class Cookie {
-
-    /**
-     * Produce a copy of a string in which the characters '+', '%', '=', ';'
-     * and control characters are replaced with "%hh". This is a gentle form
-     * of URL encoding, attempting to cause as little distortion to the
-     * string as possible. The characters '=' and ';' are meta characters in
-     * cookies. By convention, they are escaped using the URL-encoding. This is
-     * only a convention, not a standard. Often, cookies are expected to have
-     * encoded values. We encode '=' and ';' because we must. We encode '%' and
-     * '+' because they are meta characters in URL encoding.
-     * @param string The source string.
-     * @return       The escaped result.
-     */
-    public static String escape(String string) {
-        char         c;
-        String       s = string.trim();
-        StringBuffer sb = new StringBuffer();
-        int          len = s.length();
-        for (int i = 0; i < len; i += 1) {
-            c = s.charAt(i);
-            if (c < ' ' || c == '+' || c == '%' || c == '=' || c == ';') {
-                sb.append('%');
-                sb.append(Character.forDigit((char)((c >>> 4) & 0x0f), 16));
-                sb.append(Character.forDigit((char)(c & 0x0f), 16));
-            } else {
-                sb.append(c);
-            }
-        }
-        return sb.toString();
-    }
-
-
-    /**
-     * Convert a cookie specification string into a JSONObject. The string
-     * will contain a name value pair separated by '='. The name and the value
-     * will be unescaped, possibly converting '+' and '%' sequences. The
-     * cookie properties may follow, separated by ';', also represented as
-     * name=value (except the secure property, which does not have a value).
-     * The name will be stored under the key "name", and the value will be
-     * stored under the key "value". This method does not do checking or
-     * validation of the parameters. It only converts the cookie string into
-     * a JSONObject.
-     * @param string The cookie specification string.
-     * @return A JSONObject containing "name", "value", and possibly other
-     *  members.
-     * @throws JSONException
-     */
-    public static JSONObject toJSONObject(String string) throws JSONException {
-        String         n;
-        JSONObject     o = new JSONObject();
-        Object         v;
-        JSONTokener x = new JSONTokener(string);
-        o.put("name", x.nextTo('='));
-        x.next('=');
-        o.put("value", x.nextTo(';'));
-        x.next();
-        while (x.more()) {
-            n = unescape(x.nextTo("=;"));
-            if (x.next() != '=') {
-                if (n.equals("secure")) {
-                    v = Boolean.TRUE;
-                } else {
-                    throw x.syntaxError("Missing '=' in cookie parameter.");
-                }
-            } else {
-                v = unescape(x.nextTo(';'));
-                x.next();
-            }
-            o.put(n, v);
-        }
-        return o;
-    }
-
-
-    /**
-     * Convert a JSONObject into a cookie specification string. The JSONObject
-     * must contain "name" and "value" members.
-     * If the JSONObject contains "expires", "domain", "path", or "secure"
-     * members, they will be appended to the cookie specification string.
-     * All other members are ignored.
-     * @param o A JSONObject
-     * @return A cookie specification string
-     * @throws JSONException
-     */
-    public static String toString(JSONObject o) throws JSONException {
-        StringBuffer sb = new StringBuffer();
-
-        sb.append(escape(o.getString("name")));
-        sb.append("=");
-        sb.append(escape(o.getString("value")));
-        if (o.has("expires")) {
-            sb.append(";expires=");
-            sb.append(o.getString("expires"));
-        }
-        if (o.has("domain")) {
-            sb.append(";domain=");
-            sb.append(escape(o.getString("domain")));
-        }
-        if (o.has("path")) {
-            sb.append(";path=");
-            sb.append(escape(o.getString("path")));
-        }
-        if (o.optBoolean("secure")) {
-            sb.append(";secure");
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Convert <code>%</code><i>hh</i> sequences to single characters, and
-     * convert plus to space.
-     * @param s A string that may contain
-     *      <code>+</code>&nbsp;<small>(plus)</small> and
-     *      <code>%</code><i>hh</i> sequences.
-     * @return The unescaped string.
-     */
-    public static String unescape(String s) {
-        int len = s.length();
-        StringBuffer b = new StringBuffer();
-        for (int i = 0; i < len; ++i) {
-            char c = s.charAt(i);
-            if (c == '+') {
-                c = ' ';
-            } else if (c == '%' && i + 2 < len) {
-                int d = JSONTokener.dehexchar(s.charAt(i + 1));
-                int e = JSONTokener.dehexchar(s.charAt(i + 2));
-                if (d >= 0 && e >= 0) {
-                    c = (char)(d * 16 + e);
-                    i += 2;
-                }
-            }
-            b.append(c);
-        }
-        return b.toString();
-    }
-}
diff --git a/mobileapp/src/org/json/CookieList.java b/mobileapp/src/org/json/CookieList.java
deleted file mode 100755
index 8f651f5..0000000
--- a/mobileapp/src/org/json/CookieList.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.json;
-
-/*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-import java.util.Iterator;
-
-/**
- * Convert a web browser cookie list string to a JSONObject and back.
- * @author JSON.org
- * @version 2008-09-18
- */
-public class CookieList {
-
-    /**
-     * Convert a cookie list into a JSONObject. A cookie list is a sequence
-     * of name/value pairs. The names are separated from the values by '='.
-     * The pairs are separated by ';'. The names and the values
-     * will be unescaped, possibly converting '+' and '%' sequences.
-     *
-     * To add a cookie to a cooklist,
-     * cookielistJSONObject.put(cookieJSONObject.getString("name"),
-     *     cookieJSONObject.getString("value"));
-     * @param string  A cookie list string
-     * @return A JSONObject
-     * @throws JSONException
-     */
-    public static JSONObject toJSONObject(String string) throws JSONException {
-        JSONObject o = new JSONObject();
-        JSONTokener x = new JSONTokener(string);
-        while (x.more()) {
-            String name = Cookie.unescape(x.nextTo('='));
-            x.next('=');
-            o.put(name, Cookie.unescape(x.nextTo(';')));
-            x.next();
-        }
-        return o;
-    }
-
-
-    /**
-     * Convert a JSONObject into a cookie list. A cookie list is a sequence
-     * of name/value pairs. The names are separated from the values by '='.
-     * The pairs are separated by ';'. The characters '%', '+', '=', and ';'
-     * in the names and values are replaced by "%hh".
-     * @param o A JSONObject
-     * @return A cookie list string
-     * @throws JSONException
-     */
-    public static String toString(JSONObject o) throws JSONException {
-        boolean      b = false;
-        Iterator     keys = o.keys();
-        String       s;
-        StringBuffer sb = new StringBuffer();
-        while (keys.hasNext()) {
-            s = keys.next().toString();
-            if (!o.isNull(s)) {
-                if (b) {
-                    sb.append(';');
-                }
-                sb.append(Cookie.escape(s));
-                sb.append("=");
-                sb.append(Cookie.escape(o.getString(s)));
-                b = true;
-            }
-        }
-        return sb.toString();
-    }
-}
diff --git a/mobileapp/src/org/json/HTTP.java b/mobileapp/src/org/json/HTTP.java
deleted file mode 100755
index 6624708..0000000
--- a/mobileapp/src/org/json/HTTP.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package org.json;
-
-/*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-import java.util.Iterator;
-
-/**
- * Convert an HTTP header to a JSONObject and back.
- * @author JSON.org
- * @version 2008-09-18
- */
-public class HTTP {
-
-    /** Carriage return/line feed. */
-    public static final String CRLF = "\r\n";
-
-    /**
-     * Convert an HTTP header string into a JSONObject. It can be a request
-     * header or a response header. A request header will contain
-     * <pre>{
-     *    Method: "POST" (for example),
-     *    "Request-URI": "/" (for example),
-     *    "HTTP-Version": "HTTP/1.1" (for example)
-     * }</pre>
-     * A response header will contain
-     * <pre>{
-     *    "HTTP-Version": "HTTP/1.1" (for example),
-     *    "Status-Code": "200" (for example),
-     *    "Reason-Phrase": "OK" (for example)
-     * }</pre>
-     * In addition, the other parameters in the header will be captured, using
-     * the HTTP field names as JSON names, so that <pre>
-     *    Date: Sun, 26 May 2002 18:06:04 GMT
-     *    Cookie: Q=q2=PPEAsg--; B=677gi6ouf29bn&b=2&f=s
-     *    Cache-Control: no-cache</pre>
-     * become
-     * <pre>{...
-     *    Date: "Sun, 26 May 2002 18:06:04 GMT",
-     *    Cookie: "Q=q2=PPEAsg--; B=677gi6ouf29bn&b=2&f=s",
-     *    "Cache-Control": "no-cache",
-     * ...}</pre>
-     * It does no further checking or conversion. It does not parse dates.
-     * It does not do '%' transforms on URLs.
-     * @param string An HTTP header string.
-     * @return A JSONObject containing the elements and attributes
-     * of the XML string.
-     * @throws JSONException
-     */
-    public static JSONObject toJSONObject(String string) throws JSONException {
-        JSONObject     o = new JSONObject();
-        HTTPTokener    x = new HTTPTokener(string);
-        String         t;
-
-        t = x.nextToken();
-        if (t.toUpperCase().startsWith("HTTP")) {
-
-// Response
-
-            o.put("HTTP-Version", t);
-            o.put("Status-Code", x.nextToken());
-            o.put("Reason-Phrase", x.nextTo('\0'));
-            x.next();
-
-        } else {
-
-// Request
-
-            o.put("Method", t);
-            o.put("Request-URI", x.nextToken());
-            o.put("HTTP-Version", x.nextToken());
-        }
-
-// Fields
-
-        while (x.more()) {
-            String name = x.nextTo(':');
-            x.next(':');
-            o.put(name, x.nextTo('\0'));
-            x.next();
-        }
-        return o;
-    }
-
-
-    /**
-     * Convert a JSONObject into an HTTP header. A request header must contain
-     * <pre>{
-     *    Method: "POST" (for example),
-     *    "Request-URI": "/" (for example),
-     *    "HTTP-Version": "HTTP/1.1" (for example)
-     * }</pre>
-     * A response header must contain
-     * <pre>{
-     *    "HTTP-Version": "HTTP/1.1" (for example),
-     *    "Status-Code": "200" (for example),
-     *    "Reason-Phrase": "OK" (for example)
-     * }</pre>
-     * Any other members of the JSONObject will be output as HTTP fields.
-     * The result will end with two CRLF pairs.
-     * @param o A JSONObject
-     * @return An HTTP header string.
-     * @throws JSONException if the object does not contain enough
-     *  information.
-     */
-    public static String toString(JSONObject o) throws JSONException {
-        Iterator     keys = o.keys();
-        String       s;
-        StringBuffer sb = new StringBuffer();
-        if (o.has("Status-Code") && o.has("Reason-Phrase")) {
-            sb.append(o.getString("HTTP-Version"));
-            sb.append(' ');
-            sb.append(o.getString("Status-Code"));
-            sb.append(' ');
-            sb.append(o.getString("Reason-Phrase"));
-        } else if (o.has("Method") && o.has("Request-URI")) {
-            sb.append(o.getString("Method"));
-            sb.append(' ');
-            sb.append('"');
-            sb.append(o.getString("Request-URI"));
-            sb.append('"');
-            sb.append(' ');
-            sb.append(o.getString("HTTP-Version"));
-        } else {
-            throw new JSONException("Not enough material for an HTTP header.");
-        }
-        sb.append(CRLF);
-        while (keys.hasNext()) {
-            s = keys.next().toString();
-            if (!s.equals("HTTP-Version")      && !s.equals("Status-Code") &&
-                    !s.equals("Reason-Phrase") && !s.equals("Method") &&
-                    !s.equals("Request-URI")   && !o.isNull(s)) {
-                sb.append(s);
-                sb.append(": ");
-                sb.append(o.getString(s));
-                sb.append(CRLF);
-            }
-        }
-        sb.append(CRLF);
-        return sb.toString();
-    }
-}
diff --git a/mobileapp/src/org/json/HTTPTokener.java b/mobileapp/src/org/json/HTTPTokener.java
deleted file mode 100755
index 410a77c..0000000
--- a/mobileapp/src/org/json/HTTPTokener.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.json;
-
-/*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-/**
- * The HTTPTokener extends the JSONTokener to provide additional methods
- * for the parsing of HTTP headers.
- * @author JSON.org
- * @version 2008-09-18
- */
-public class HTTPTokener extends JSONTokener {
-
-    /**
-     * Construct an HTTPTokener from a string.
-     * @param s A source string.
-     */
-    public HTTPTokener(String s) {
-        super(s);
-    }
-
-
-    /**
-     * Get the next token or string. This is used in parsing HTTP headers.
-     * @throws JSONException
-     * @return A String.
-     */
-    public String nextToken() throws JSONException {
-        char c;
-        char q;
-        StringBuffer sb = new StringBuffer();
-        do {
-            c = next();
-        } while (Character.isWhitespace(c));
-        if (c == '"' || c == '\'') {
-            q = c;
-            for (;;) {
-                c = next();
-                if (c < ' ') {
-                    throw syntaxError("Unterminated string.");
-                }
-                if (c == q) {
-                    return sb.toString();
-                }
-                sb.append(c);
-            }
-        } 
-        for (;;) {
-            if (c == 0 || Character.isWhitespace(c)) {
-                return sb.toString();
-            }
-            sb.append(c);
-            c = next();
-        }
-    }
-}
diff --git a/mobileapp/src/org/json/JSONArray.java b/mobileapp/src/org/json/JSONArray.java
deleted file mode 100755
index 5cc6f71..0000000
--- a/mobileapp/src/org/json/JSONArray.java
+++ /dev/null
@@ -1,918 +0,0 @@
-package org.json;
-
-/*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-import java.io.IOException;
-import java.io.Writer;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * A JSONArray is an ordered sequence of values. Its external text form is a
- * string wrapped in square brackets with commas separating the values. The
- * internal form is an object having <code>get</code> and <code>opt</code>
- * methods for accessing the values by index, and <code>put</code> methods for
- * adding or replacing values. The values can be any of these types:
- * <code>Boolean</code>, <code>JSONArray</code>, <code>JSONObject</code>,
- * <code>Number</code>, <code>String</code>, or the
- * <code>JSONObject.NULL object</code>.
- * <p>
- * The constructor can convert a JSON text into a Java object. The
- * <code>toString</code> method converts to JSON text.
- * <p>
- * A <code>get</code> method returns a value if one can be found, and throws an
- * exception if one cannot be found. An <code>opt</code> method returns a
- * default value instead of throwing an exception, and so is useful for
- * obtaining optional values.
- * <p>
- * The generic <code>get()</code> and <code>opt()</code> methods return an
- * object which you can cast or query for type. There are also typed
- * <code>get</code> and <code>opt</code> methods that do type checking and type
- * coercion for you.
- * <p>
- * The texts produced by the <code>toString</code> methods strictly conform to
- * JSON syntax rules. The constructors are more forgiving in the texts they will
- * accept:
- * <ul>
- * <li>An extra <code>,</code>&nbsp;<small>(comma)</small> may appear just
- *     before the closing bracket.</li>
- * <li>The <code>null</code> value will be inserted when there
- *     is <code>,</code>&nbsp;<small>(comma)</small> elision.</li>
- * <li>Strings may be quoted with <code>'</code>&nbsp;<small>(single
- *     quote)</small>.</li>
- * <li>Strings do not need to be quoted at all if they do not begin with a quote
- *     or single quote, and if they do not contain leading or trailing spaces,
- *     and if they do not contain any of these characters:
- *     <code>{ } [ ] / \ : , = ; #</code> and if they do not look like numbers
- *     and if they are not the reserved words <code>true</code>,
- *     <code>false</code>, or <code>null</code>.</li>
- * <li>Values can be separated by <code>;</code> <small>(semicolon)</small> as
- *     well as by <code>,</code> <small>(comma)</small>.</li>
- * <li>Numbers may have the 
- *     <code>0x-</code> <small>(hex)</small> prefix.</li>
- * </ul>
-
- * @author JSON.org
- * @version 2009-04-14
- */
-public class JSONArray {
-
-
-    /**
-     * The arrayList where the JSONArray's properties are kept.
-     */
-    private ArrayList myArrayList;
-
-
-    /**
-     * Construct an empty JSONArray.
-     */
-    public JSONArray() {
-        this.myArrayList = new ArrayList();
-    }
-
-    /**
-     * Construct a JSONArray from a JSONTokener.
-     * @param x A JSONTokener
-     * @throws JSONException If there is a syntax error.
-     */
-    public JSONArray(JSONTokener x) throws JSONException {
-        this();
-        char c = x.nextClean();
-        char q;
-        if (c == '[') {
-            q = ']';
-        } else if (c == '(') {
-            q = ')';
-        } else {
-            throw x.syntaxError("A JSONArray text must start with '['");
-        }
-        if (x.nextClean() == ']') {
-            return;
-        }
-        x.back();
-        for (;;) {
-            if (x.nextClean() == ',') {
-                x.back();
-                this.myArrayList.add(null);
-            } else {
-                x.back();
-                this.myArrayList.add(x.nextValue());
-            }
-            c = x.nextClean();
-            switch (c) {
-            case ';':
-            case ',':
-                if (x.nextClean() == ']') {
-                    return;
-                }
-                x.back();
-                break;
-            case ']':
-            case ')':
-                if (q != c) {
-                    throw x.syntaxError("Expected a '" + new Character(q) + "'");
-                }
-                return;
-            default:
-                throw x.syntaxError("Expected a ',' or ']'");
-            }
-        }
-    }
-
-
-    /**
-     * Construct a JSONArray from a source JSON text.
-     * @param source     A string that begins with
-     * <code>[</code>&nbsp;<small>(left bracket)</small>
-     *  and ends with <code>]</code>&nbsp;<small>(right bracket)</small>.
-     *  @throws JSONException If there is a syntax error.
-     */
-    public JSONArray(String source) throws JSONException {
-        this(new JSONTokener(source));
-    }
-
-
-    /**
-     * Construct a JSONArray from a Collection.
-     * @param collection     A Collection.
-     */
-    public JSONArray(Collection collection) {
-		this.myArrayList = new ArrayList();
-		if (collection != null) {
-			Iterator iter = collection.iterator();
-			while (iter.hasNext()) {
-			    Object o = iter.next();
-                this.myArrayList.add(JSONObject.wrap(o));  
-			}
-		}
-    }
-
-    
-    /**
-     * Construct a JSONArray from an array
-     * @throws JSONException If not an array.
-     */
-    public JSONArray(Object array) throws JSONException {
-        this();
-        if (array.getClass().isArray()) {
-            int length = Array.getLength(array);
-            for (int i = 0; i < length; i += 1) {
-                this.put(JSONObject.wrap(Array.get(array, i)));
-            }
-        } else {
-            throw new JSONException(
-"JSONArray initial value should be a string or collection or array.");
-        }
-    }
-
-     
-    /**
-     * Get the object value associated with an index.
-     * @param index
-     *  The index must be between 0 and length() - 1.
-     * @return An object value.
-     * @throws JSONException If there is no value for the index.
-     */
-    public Object get(int index) throws JSONException {
-        Object o = opt(index);
-        if (o == null) {
-            throw new JSONException("JSONArray[" + index + "] not found.");
-        }
-        return o;
-    }
-
-
-    /**
-     * Get the boolean value associated with an index.
-     * The string values "true" and "false" are converted to boolean.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return      The truth.
-     * @throws JSONException If there is no value for the index or if the
-     *  value is not convertable to boolean.
-     */
-    public boolean getBoolean(int index) throws JSONException {
-        Object o = get(index);
-        if (o.equals(Boolean.FALSE) ||
-                (o instanceof String &&
-                ((String)o).equalsIgnoreCase("false"))) {
-            return false;
-        } else if (o.equals(Boolean.TRUE) ||
-                (o instanceof String &&
-                ((String)o).equalsIgnoreCase("true"))) {
-            return true;
-        }
-        throw new JSONException("JSONArray[" + index + "] is not a Boolean.");
-    }
-
-
-    /**
-     * Get the double value associated with an index.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return      The value.
-     * @throws   JSONException If the key is not found or if the value cannot
-     *  be converted to a number.
-     */
-    public double getDouble(int index) throws JSONException {
-        Object o = get(index);
-        try {
-            return o instanceof Number ?
-                ((Number)o).doubleValue() :
-                Double.valueOf((String)o).doubleValue();
-        } catch (Exception e) {
-            throw new JSONException("JSONArray[" + index +
-                "] is not a number.");
-        }
-    }
-
-
-    /**
-     * Get the int value associated with an index.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return      The value.
-     * @throws   JSONException If the key is not found or if the value cannot
-     *  be converted to a number.
-     *  if the value cannot be converted to a number.
-     */
-    public int getInt(int index) throws JSONException {
-        Object o = get(index);
-        return o instanceof Number ?
-                ((Number)o).intValue() : (int)getDouble(index);
-    }
-
-
-    /**
-     * Get the JSONArray associated with an index.
-     * @param index The index must be between 0 and length() - 1.
-     * @return      A JSONArray value.
-     * @throws JSONException If there is no value for the index. or if the
-     * value is not a JSONArray
-     */
-    public JSONArray getJSONArray(int index) throws JSONException {
-        Object o = get(index);
-        if (o instanceof JSONArray) {
-            return (JSONArray)o;
-        }
-        throw new JSONException("JSONArray[" + index +
-                "] is not a JSONArray.");
-    }
-
-
-    /**
-     * Get the JSONObject associated with an index.
-     * @param index subscript
-     * @return      A JSONObject value.
-     * @throws JSONException If there is no value for the index or if the
-     * value is not a JSONObject
-     */
-    public JSONObject getJSONObject(int index) throws JSONException {
-        Object o = get(index);
-        if (o instanceof JSONObject) {
-            return (JSONObject)o;
-        }
-        throw new JSONException("JSONArray[" + index +
-            "] is not a JSONObject.");
-    }
-
-
-    /**
-     * Get the long value associated with an index.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return      The value.
-     * @throws   JSONException If the key is not found or if the value cannot
-     *  be converted to a number.
-     */
-    public long getLong(int index) throws JSONException {
-        Object o = get(index);
-        return o instanceof Number ?
-                ((Number)o).longValue() : (long)getDouble(index);
-    }
-
-
-    /**
-     * Get the string associated with an index.
-     * @param index The index must be between 0 and length() - 1.
-     * @return      A string value.
-     * @throws JSONException If there is no value for the index.
-     */
-    public String getString(int index) throws JSONException {
-        return get(index).toString();
-    }
-
-
-    /**
-     * Determine if the value is null.
-     * @param index The index must be between 0 and length() - 1.
-     * @return true if the value at the index is null, or if there is no value.
-     */
-    public boolean isNull(int index) {
-        return JSONObject.NULL.equals(opt(index));
-    }
-
-
-    /**
-     * Make a string from the contents of this JSONArray. The
-     * <code>separator</code> string is inserted between each element.
-     * Warning: This method assumes that the data structure is acyclical.
-     * @param separator A string that will be inserted between the elements.
-     * @return a string.
-     * @throws JSONException If the array contains an invalid number.
-     */
-    public String join(String separator) throws JSONException {
-        int len = length();
-        StringBuffer sb = new StringBuffer();
-
-        for (int i = 0; i < len; i += 1) {
-            if (i > 0) {
-                sb.append(separator);
-            }
-            sb.append(JSONObject.valueToString(this.myArrayList.get(i)));
-        }
-        return sb.toString();
-    }
-
-
-    /**
-     * Get the number of elements in the JSONArray, included nulls.
-     *
-     * @return The length (or size).
-     */
-    public int length() {
-        return this.myArrayList.size();
-    }
-
-
-    /**
-     * Get the optional object value associated with an index.
-     * @param index The index must be between 0 and length() - 1.
-     * @return      An object value, or null if there is no
-     *              object at that index.
-     */
-    public Object opt(int index) {
-        return (index < 0 || index >= length()) ?
-            null : this.myArrayList.get(index);
-    }
-
-
-    /**
-     * Get the optional boolean value associated with an index.
-     * It returns false if there is no value at that index,
-     * or if the value is not Boolean.TRUE or the String "true".
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return      The truth.
-     */
-    public boolean optBoolean(int index)  {
-        return optBoolean(index, false);
-    }
-
-
-    /**
-     * Get the optional boolean value associated with an index.
-     * It returns the defaultValue if there is no value at that index or if
-     * it is not a Boolean or the String "true" or "false" (case insensitive).
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @param defaultValue     A boolean default.
-     * @return      The truth.
-     */
-    public boolean optBoolean(int index, boolean defaultValue)  {
-        try {
-            return getBoolean(index);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-
-    /**
-     * Get the optional double value associated with an index.
-     * NaN is returned if there is no value for the index,
-     * or if the value is not a number and cannot be converted to a number.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return      The value.
-     */
-    public double optDouble(int index) {
-        return optDouble(index, Double.NaN);
-    }
-
-
-    /**
-     * Get the optional double value associated with an index.
-     * The defaultValue is returned if there is no value for the index,
-     * or if the value is not a number and cannot be converted to a number.
-     *
-     * @param index subscript
-     * @param defaultValue     The default value.
-     * @return      The value.
-     */
-    public double optDouble(int index, double defaultValue) {
-        try {
-            return getDouble(index);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-
-    /**
-     * Get the optional int value associated with an index.
-     * Zero is returned if there is no value for the index,
-     * or if the value is not a number and cannot be converted to a number.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return      The value.
-     */
-    public int optInt(int index) {
-        return optInt(index, 0);
-    }
-
-
-    /**
-     * Get the optional int value associated with an index.
-     * The defaultValue is returned if there is no value for the index,
-     * or if the value is not a number and cannot be converted to a number.
-     * @param index The index must be between 0 and length() - 1.
-     * @param defaultValue     The default value.
-     * @return      The value.
-     */
-    public int optInt(int index, int defaultValue) {
-        try {
-            return getInt(index);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-
-    /**
-     * Get the optional JSONArray associated with an index.
-     * @param index subscript
-     * @return      A JSONArray value, or null if the index has no value,
-     * or if the value is not a JSONArray.
-     */
-    public JSONArray optJSONArray(int index) {
-        Object o = opt(index);
-        return o instanceof JSONArray ? (JSONArray)o : null;
-    }
-
-
-    /**
-     * Get the optional JSONObject associated with an index.
-     * Null is returned if the key is not found, or null if the index has
-     * no value, or if the value is not a JSONObject.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return      A JSONObject value.
-     */
-    public JSONObject optJSONObject(int index) {
-        Object o = opt(index);
-        return o instanceof JSONObject ? (JSONObject)o : null;
-    }
-
-
-    /**
-     * Get the optional long value associated with an index.
-     * Zero is returned if there is no value for the index,
-     * or if the value is not a number and cannot be converted to a number.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return      The value.
-     */
-    public long optLong(int index) {
-        return optLong(index, 0);
-    }
-
-
-    /**
-     * Get the optional long value associated with an index.
-     * The defaultValue is returned if there is no value for the index,
-     * or if the value is not a number and cannot be converted to a number.
-     * @param index The index must be between 0 and length() - 1.
-     * @param defaultValue     The default value.
-     * @return      The value.
-     */
-    public long optLong(int index, long defaultValue) {
-        try {
-            return getLong(index);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-
-    /**
-     * Get the optional string value associated with an index. It returns an
-     * empty string if there is no value at that index. If the value
-     * is not a string and is not null, then it is coverted to a string.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return      A String value.
-     */
-    public String optString(int index) {
-        return optString(index, "");
-    }
-
-
-    /**
-     * Get the optional string associated with an index.
-     * The defaultValue is returned if the key is not found.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @param defaultValue     The default value.
-     * @return      A String value.
-     */
-    public String optString(int index, String defaultValue) {
-        Object o = opt(index);
-        return o != null ? o.toString() : defaultValue;
-    }
-
-
-    /**
-     * Append a boolean value. This increases the array's length by one.
-     *
-     * @param value A boolean value.
-     * @return this.
-     */
-    public JSONArray put(boolean value) {
-        put(value ? Boolean.TRUE : Boolean.FALSE);
-        return this;
-    }
-
-
-    /**
-     * Put a value in the JSONArray, where the value will be a
-     * JSONArray which is produced from a Collection.
-     * @param value A Collection value.
-     * @return      this.
-     */
-    public JSONArray put(Collection value) {
-        put(new JSONArray(value));
-        return this;
-    }
-
-
-    /**
-     * Append a double value. This increases the array's length by one.
-     *
-     * @param value A double value.
-     * @throws JSONException if the value is not finite.
-     * @return this.
-     */
-    public JSONArray put(double value) throws JSONException {
-        Double d = new Double(value);
-        JSONObject.testValidity(d);
-        put(d);
-        return this;
-    }
-
-
-    /**
-     * Append an int value. This increases the array's length by one.
-     *
-     * @param value An int value.
-     * @return this.
-     */
-    public JSONArray put(int value) {
-        put(new Integer(value));
-        return this;
-    }
-
-
-    /**
-     * Append an long value. This increases the array's length by one.
-     *
-     * @param value A long value.
-     * @return this.
-     */
-    public JSONArray put(long value) {
-        put(new Long(value));
-        return this;
-    }
-
-
-    /**
-     * Put a value in the JSONArray, where the value will be a
-     * JSONObject which is produced from a Map.
-     * @param value A Map value.
-     * @return      this.
-     */
-    public JSONArray put(Map value) {
-        put(new JSONObject(value));
-        return this;
-    }
-
-
-    /**
-     * Append an object value. This increases the array's length by one.
-     * @param value An object value.  The value should be a
-     *  Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
-     *  JSONObject.NULL object.
-     * @return this.
-     */
-    public JSONArray put(Object value) {
-        this.myArrayList.add(value);
-        return this;
-    }
-
-
-    /**
-     * Put or replace a boolean value in the JSONArray. If the index is greater
-     * than the length of the JSONArray, then null elements will be added as
-     * necessary to pad it out.
-     * @param index The subscript.
-     * @param value A boolean value.
-     * @return this.
-     * @throws JSONException If the index is negative.
-     */
-    public JSONArray put(int index, boolean value) throws JSONException {
-        put(index, value ? Boolean.TRUE : Boolean.FALSE);
-        return this;
-    }
-
-
-    /**
-     * Put a value in the JSONArray, where the value will be a
-     * JSONArray which is produced from a Collection.
-     * @param index The subscript.
-     * @param value A Collection value.
-     * @return      this.
-     * @throws JSONException If the index is negative or if the value is
-     * not finite.
-     */
-    public JSONArray put(int index, Collection value) throws JSONException {
-        put(index, new JSONArray(value));
-        return this;
-    }
-
-
-    /**
-     * Put or replace a double value. If the index is greater than the length of
-     *  the JSONArray, then null elements will be added as necessary to pad
-     *  it out.
-     * @param index The subscript.
-     * @param value A double value.
-     * @return this.
-     * @throws JSONException If the index is negative or if the value is
-     * not finite.
-     */
-    public JSONArray put(int index, double value) throws JSONException {
-        put(index, new Double(value));
-        return this;
-    }
-
-
-    /**
-     * Put or replace an int value. If the index is greater than the length of
-     *  the JSONArray, then null elements will be added as necessary to pad
-     *  it out.
-     * @param index The subscript.
-     * @param value An int value.
-     * @return this.
-     * @throws JSONException If the index is negative.
-     */
-    public JSONArray put(int index, int value) throws JSONException {
-        put(index, new Integer(value));
-        return this;
-    }
-
-
-    /**
-     * Put or replace a long value. If the index is greater than the length of
-     *  the JSONArray, then null elements will be added as necessary to pad
-     *  it out.
-     * @param index The subscript.
-     * @param value A long value.
-     * @return this.
-     * @throws JSONException If the index is negative.
-     */
-    public JSONArray put(int index, long value) throws JSONException {
-        put(index, new Long(value));
-        return this;
-    }
-
-
-    /**
-     * Put a value in the JSONArray, where the value will be a
-     * JSONObject which is produced from a Map.
-     * @param index The subscript.
-     * @param value The Map value.
-     * @return      this.
-     * @throws JSONException If the index is negative or if the the value is
-     *  an invalid number.
-     */
-    public JSONArray put(int index, Map value) throws JSONException {
-        put(index, new JSONObject(value));
-        return this;
-    }
-
-
-    /**
-     * Put or replace an object value in the JSONArray. If the index is greater
-     *  than the length of the JSONArray, then null elements will be added as
-     *  necessary to pad it out.
-     * @param index The subscript.
-     * @param value The value to put into the array. The value should be a
-     *  Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
-     *  JSONObject.NULL object.
-     * @return this.
-     * @throws JSONException If the index is negative or if the the value is
-     *  an invalid number.
-     */
-    public JSONArray put(int index, Object value) throws JSONException {
-        JSONObject.testValidity(value);
-        if (index < 0) {
-            throw new JSONException("JSONArray[" + index + "] not found.");
-        }
-        if (index < length()) {
-            this.myArrayList.set(index, value);
-        } else {
-            while (index != length()) {
-                put(JSONObject.NULL);
-            }
-            put(value);
-        }
-        return this;
-    }
-    
-    
-    /**
-     * Remove an index and close the hole.
-     * @param index The index of the element to be removed.
-     * @return The value that was associated with the index,
-     * or null if there was no value.
-     */
-    public Object remove(int index) {
-    	Object o = opt(index);
-        this.myArrayList.remove(index);
-        return o;
-    }
-
-
-    /**
-     * Produce a JSONObject by combining a JSONArray of names with the values
-     * of this JSONArray.
-     * @param names A JSONArray containing a list of key strings. These will be
-     * paired with the values.
-     * @return A JSONObject, or null if there are no names or if this JSONArray
-     * has no values.
-     * @throws JSONException If any of the names are null.
-     */
-    public JSONObject toJSONObject(JSONArray names) throws JSONException {
-        if (names == null || names.length() == 0 || length() == 0) {
-            return null;
-        }
-        JSONObject jo = new JSONObject();
-        for (int i = 0; i < names.length(); i += 1) {
-            jo.put(names.getString(i), this.opt(i));
-        }
-        return jo;
-    }
-
-
-    /**
-     * Make a JSON text of this JSONArray. For compactness, no
-     * unnecessary whitespace is added. If it is not possible to produce a
-     * syntactically correct JSON text then null will be returned instead. This
-     * could occur if the array contains an invalid number.
-     * <p>
-     * Warning: This method assumes that the data structure is acyclical.
-     *
-     * @return a printable, displayable, transmittable
-     *  representation of the array.
-     */
-    public String toString() {
-        try {
-            return '[' + join(",") + ']';
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-
-    /**
-     * Make a prettyprinted JSON text of this JSONArray.
-     * Warning: This method assumes that the data structure is acyclical.
-     * @param indentFactor The number of spaces to add to each level of
-     *  indentation.
-     * @return a printable, displayable, transmittable
-     *  representation of the object, beginning
-     *  with <code>[</code>&nbsp;<small>(left bracket)</small> and ending
-     *  with <code>]</code>&nbsp;<small>(right bracket)</small>.
-     * @throws JSONException
-     */
-    public String toString(int indentFactor) throws JSONException {
-        return toString(indentFactor, 0);
-    }
-
-
-    /**
-     * Make a prettyprinted JSON text of this JSONArray.
-     * Warning: This method assumes that the data structure is acyclical.
-     * @param indentFactor The number of spaces to add to each level of
-     *  indentation.
-     * @param indent The indention of the top level.
-     * @return a printable, displayable, transmittable
-     *  representation of the array.
-     * @throws JSONException
-     */
-    String toString(int indentFactor, int indent) throws JSONException {
-        int len = length();
-        if (len == 0) {
-            return "[]";
-        }
-        int i;
-        StringBuffer sb = new StringBuffer("[");
-        if (len == 1) {
-            sb.append(JSONObject.valueToString(this.myArrayList.get(0),
-                    indentFactor, indent));
-        } else {
-            int newindent = indent + indentFactor;
-            sb.append('\n');
-            for (i = 0; i < len; i += 1) {
-                if (i > 0) {
-                    sb.append(",\n");
-                }
-                for (int j = 0; j < newindent; j += 1) {
-                    sb.append(' ');
-                }
-                sb.append(JSONObject.valueToString(this.myArrayList.get(i),
-                        indentFactor, newindent));
-            }
-            sb.append('\n');
-            for (i = 0; i < indent; i += 1) {
-                sb.append(' ');
-            }
-        }
-        sb.append(']');
-        return sb.toString();
-    }
-
-
-    /**
-     * Write the contents of the JSONArray as JSON text to a writer.
-     * For compactness, no whitespace is added.
-     * <p>
-     * Warning: This method assumes that the data structure is acyclical.
-     *
-     * @return The writer.
-     * @throws JSONException
-     */
-    public Writer write(Writer writer) throws JSONException {
-        try {
-            boolean b = false;
-            int     len = length();
-
-            writer.write('[');
-
-            for (int i = 0; i < len; i += 1) {
-                if (b) {
-                    writer.write(',');
-                }
-                Object v = this.myArrayList.get(i);
-                if (v instanceof JSONObject) {
-                    ((JSONObject)v).write(writer);
-                } else if (v instanceof JSONArray) {
-                    ((JSONArray)v).write(writer);
-                } else {
-                    writer.write(JSONObject.valueToString(v));
-                }
-                b = true;
-            }
-            writer.write(']');
-            return writer;
-        } catch (IOException e) {
-           throw new JSONException(e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/mobileapp/src/org/json/JSONException.java b/mobileapp/src/org/json/JSONException.java
deleted file mode 100755
index 45e3b8d..0000000
--- a/mobileapp/src/org/json/JSONException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.json;
-
-/**
- * The JSONException is thrown by the JSON.org classes when things are amiss.
- * @author JSON.org
- * @version 2008-09-18
- */
-public class JSONException extends Exception {
-    /**
-	 * 
-	 */
-	private static final long serialVersionUID = 0;
-	private Throwable cause;
-
-    /**
-     * Constructs a JSONException with an explanatory message.
-     * @param message Detail about the reason for the exception.
-     */
-    public JSONException(String message) {
-        super(message);
-    }
-
-    public JSONException(Throwable t) {
-        super(t.getMessage());
-        this.cause = t;
-    }
-
-    public Throwable getCause() {
-        return this.cause;
-    }
-}
diff --git a/mobileapp/src/org/json/JSONML.java b/mobileapp/src/org/json/JSONML.java
deleted file mode 100755
index 1337182..0000000
--- a/mobileapp/src/org/json/JSONML.java
+++ /dev/null
@@ -1,455 +0,0 @@
-package org.json;
-
-/*
-Copyright (c) 2008 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-import java.util.Iterator;
-
-
-/**
- * This provides static methods to convert an XML text into a JSONArray or 
- * JSONObject, and to covert a JSONArray or JSONObject into an XML text using 
- * the JsonML transform.
- * @author JSON.org
- * @version 2010-02-12
- */
-public class JSONML {
-		
-    /**
-     * Parse XML values and store them in a JSONArray.
-     * @param x       The XMLTokener containing the source string.
-     * @param arrayForm true if array form, false if object form.
-     * @param ja      The JSONArray that is containing the current tag or null
-     *     if we are at the outermost level.
-     * @return A JSONArray if the value is the outermost tag, otherwise null.
-     * @throws JSONException
-     */
-    private static Object parse(XMLTokener x, boolean arrayForm, 
-    		JSONArray ja) throws JSONException {
-        String     attribute;
-        char       c;
-        String	   closeTag = null;
-        int        i;
-        JSONArray  newja = null;
-        JSONObject newjo = null;
-        Object     token;
-        String	   tagName = null;
-        
-// Test for and skip past these forms:
-//      <!-- ... -->
-//      <![  ... ]]>
-//      <!   ...   >
-//      <?   ...  ?>
-        
-        while (true) {
-        	token = x.nextContent();
-    		if (token == XML.LT) {
-    			token = x.nextToken();
-    			if (token instanceof Character) {
-			        if (token == XML.SLASH) {
-
-// Close tag </
-
-			        	token = x.nextToken();
-			        	if (!(token instanceof String)) {
-			        		throw new JSONException(
-			        				"Expected a closing name instead of '" + 
-			        				token + "'.");
-			        	}
-			            if (x.nextToken() != XML.GT) {
-			                throw x.syntaxError("Misshaped close tag");
-			            }
-			            return token;
-			        } else if (token == XML.BANG) {
-        		
-// <!
-        	
-			            c = x.next();
-			            if (c == '-') {
-			                if (x.next() == '-') {
-			                    x.skipPast("-->");
-			                }
-			                x.back();
-			            } else if (c == '[') {
-			                token = x.nextToken();
-			                if (token.equals("CDATA") && x.next() == '[') {
-			                	if (ja != null) {
-			                		ja.put(x.nextCDATA());
-			                	}
-			                } else {
-			                	throw x.syntaxError("Expected 'CDATA['");
-			                }
-			            } else {
-				            i = 1;
-				            do {
-				                token = x.nextMeta();
-				                if (token == null) {
-				                    throw x.syntaxError("Missing '>' after '<!'.");
-				                } else if (token == XML.LT) {
-				                    i += 1;
-				                } else if (token == XML.GT) {
-				                    i -= 1;
-				                }
-				            } while (i > 0);
-			            }
-			        } else if (token == XML.QUEST) {
-
-// <?
-
-			        	x.skipPast("?>");
-			        } else {
-			            throw x.syntaxError("Misshaped tag");
-			        }
-
-// Open tag <
-
-		        } else {
-		        	if (!(token instanceof String)) {
-			            throw x.syntaxError("Bad tagName '" + token + "'.");		        		
-		        	}
-		        	tagName = (String)token;
-		            newja = new JSONArray();		
-		            newjo = new JSONObject();
-		        	if (arrayForm) {
-			            newja.put(tagName);
-			            if (ja != null) {
-			            	ja.put(newja);
-			            }
-			        } else {
-		        		newjo.put("tagName", tagName);
-		        		if (ja != null) {
-			            	ja.put(newjo);
-			            }
-			        }
-		            token = null;
-		            for (;;) {
-		                if (token == null) {
-		                    token = x.nextToken();
-		                }
-		                if (token == null) {
-		                	throw x.syntaxError("Misshaped tag");
-		                }
-		                if (!(token instanceof String)) {
-		                	break;
-		                }
-
-//		              attribute = value
-
-	                    attribute = (String)token;
-			        	if (!arrayForm && (attribute == "tagName" || attribute == "childNode")) {
-                            throw x.syntaxError("Reserved attribute.");			        		
-			        	}
-	                    token = x.nextToken();
-	                    if (token == XML.EQ) {
-	                        token = x.nextToken();
-	                        if (!(token instanceof String)) {
-	                            throw x.syntaxError("Missing value");
-	                        }
-	                        newjo.accumulate(attribute, JSONObject.stringToValue((String)token));
-	                        token = null;
-	                    } else {
-	                    	newjo.accumulate(attribute, "");
-	                    }
-		            }
-                    if (arrayForm && newjo.length() > 0) {
-                    	newja.put(newjo);
-                    }
-
-// Empty tag <.../>
-
-	                if (token == XML.SLASH) {
-	                    if (x.nextToken() != XML.GT) {
-	                        throw x.syntaxError("Misshaped tag");
-	                    }
-	                    if (ja == null) {
-	                    	if (arrayForm) {
-	                    		return newja;
-	                    	} else {
-	                    		return newjo;
-	                    	}
-	                    }
-
-// Content, between <...> and </...>
-
-	                } else {
-	                	if (token != XML.GT) {
-	                		throw x.syntaxError("Misshaped tag");
-	                	}
-	                	closeTag = (String)parse(x, arrayForm, newja);
-	                	if (closeTag != null) {
-		                	if (!closeTag.equals(tagName)) {
-		                		throw x.syntaxError("Mismatched '" + tagName + 
-		                				"' and '" + closeTag + "'");
-					        }
-		                	tagName = null;
-		            		if (!arrayForm && newja.length() > 0) {
-		            			newjo.put("childNodes", newja);
-		            		}
-		                	if (ja == null) {
-		                    	if (arrayForm) {
-		                    		return newja;
-		                    	} else {
-		                    		return newjo;
-		                    	}
-		                	}
-	                	}
-                	}
-	            }
-		    } else {
-		    	if (ja != null) {
-		    		ja.put(token instanceof String ? 
-		    				JSONObject.stringToValue((String)token) : token);
-		    	}
-		    }
-        }
-    }
-
-
-    /**
-     * Convert a well-formed (but not necessarily valid) XML string into a
-     * JSONArray using the JsonML transform. Each XML tag is represented as
-     * a JSONArray in which the first element is the tag name. If the tag has
-     * attributes, then the second element will be JSONObject containing the
-     * name/value pairs. If the tag contains children, then strings and
-     * JSONArrays will represent the child tags.
-     * Comments, prologs, DTDs, and <code>&lt;[ [ ]]></code> are ignored.
-     * @param string The source string.
-     * @return A JSONArray containing the structured data from the XML string.
-     * @throws JSONException
-     */
-    public static JSONArray toJSONArray(String string) throws JSONException {
-    	return toJSONArray(new XMLTokener(string));
-    }
-
-
-    /**
-     * Convert a well-formed (but not necessarily valid) XML string into a
-     * JSONArray using the JsonML transform. Each XML tag is represented as
-     * a JSONArray in which the first element is the tag name. If the tag has
-     * attributes, then the second element will be JSONObject containing the
-     * name/value pairs. If the tag contains children, then strings and
-     * JSONArrays will represent the child content and tags.
-     * Comments, prologs, DTDs, and <code>&lt;[ [ ]]></code> are ignored.
-     * @param x An XMLTokener.
-     * @return A JSONArray containing the structured data from the XML string.
-     * @throws JSONException
-     */
-    public static JSONArray toJSONArray(XMLTokener x) throws JSONException {
-    	return (JSONArray)parse(x, true, null);
-    }
-
-
-    
-    /**
-     * Convert a well-formed (but not necessarily valid) XML string into a
-     * JSONObject using the JsonML transform. Each XML tag is represented as
-     * a JSONObject with a "tagName" property. If the tag has attributes, then 
-     * the attributes will be in the JSONObject as properties. If the tag 
-     * contains children, the object will have a "childNodes" property which 
-     * will be an array of strings and JsonML JSONObjects.
-
-     * Comments, prologs, DTDs, and <code>&lt;[ [ ]]></code> are ignored.
-     * @param x An XMLTokener of the XML source text.
-     * @return A JSONObject containing the structured data from the XML string.
-     * @throws JSONException
-     */
-    public static JSONObject toJSONObject(XMLTokener x) throws JSONException {
-       	return (JSONObject)parse(x, false, null);
-    }
-    /**
-     * Convert a well-formed (but not necessarily valid) XML string into a
-     * JSONObject using the JsonML transform. Each XML tag is represented as
-     * a JSONObject with a "tagName" property. If the tag has attributes, then 
-     * the attributes will be in the JSONObject as properties. If the tag 
-     * contains children, the object will have a "childNodes" property which 
-     * will be an array of strings and JsonML JSONObjects.
-
-     * Comments, prologs, DTDs, and <code>&lt;[ [ ]]></code> are ignored.
-     * @param string The XML source text.
-     * @return A JSONObject containing the structured data from the XML string.
-     * @throws JSONException
-     */
-    public static JSONObject toJSONObject(String string) throws JSONException {
-    	return toJSONObject(new XMLTokener(string));
-    }
-
-
-    /**
-     * Reverse the JSONML transformation, making an XML text from a JSONArray.
-     * @param ja A JSONArray.
-     * @return An XML string.
-     * @throws JSONException
-     */
-    public static String toString(JSONArray ja) throws JSONException {
-    	Object		 e;
-    	int			 i;
-    	JSONObject   jo;
-    	String       k;
-	    Iterator     keys;
-	    int			 length;
-    	StringBuffer sb = new StringBuffer();
-	    String       tagName;
-	    String       v;
-	    
-// Emit <tagName	    
-    	
-    	tagName = ja.getString(0);
-		XML.noSpace(tagName);
-		tagName = XML.escape(tagName);
-		sb.append('<');
-		sb.append(tagName);
-		
-		e = ja.opt(1);
-		if (e instanceof JSONObject) {
-			i = 2;
-			jo = (JSONObject)e;
-			
-// Emit the attributes
-			
-	        keys = jo.keys();
-	        while (keys.hasNext()) {
-	            k = keys.next().toString();
-            	XML.noSpace(k);
-	            v = jo.optString(k);
-	            if (v != null) {
-		            sb.append(' ');
-		            sb.append(XML.escape(k));
-		            sb.append('=');
-		            sb.append('"');
-		            sb.append(XML.escape(v));
-		            sb.append('"');
-	            }
-	        }  
-		} else {
-			i = 1;
-		}
-	     	
-//Emit content in body
-	    	
-		length = ja.length();
-		if (i >= length) {
-	        sb.append('/');
-	        sb.append('>');
-		} else {
-	        sb.append('>');
-			do {
-			    e = ja.get(i);
-			    i += 1;
-			    if (e != null) {
-			    	if (e instanceof String) {
-			    		sb.append(XML.escape(e.toString()));
-					} else if (e instanceof JSONObject) {
-						sb.append(toString((JSONObject)e));
-					} else if (e instanceof JSONArray) {
-						sb.append(toString((JSONArray)e));
-					}
-			    }
-			} while (i < length);
-			sb.append('<');
-	        sb.append('/');
-			sb.append(tagName);
-	        sb.append('>');
-	    }
-        return sb.toString();
-    }
-    
-    /**
-     * Reverse the JSONML transformation, making an XML text from a JSONObject.
-     * The JSONObject must contain a "tagName" property. If it has children, 
-     * then it must have a "childNodes" property containing an array of objects. 
-     * The other properties are attributes with string values.
-     * @param jo A JSONObject.
-     * @return An XML string.
-     * @throws JSONException
-     */
-	public static String toString(JSONObject jo) throws JSONException {
-	    StringBuffer sb = new StringBuffer();
-	    Object		 e;
-	    int          i;
-	    JSONArray    ja;
-	    String       k;
-	    Iterator     keys;
-	    int          len;
-	    String       tagName;
-	    String       v;
-	
-//Emit <tagName
-	
-		tagName = jo.optString("tagName");
-		if (tagName == null) {
-			return XML.escape(jo.toString());
-		}
-		XML.noSpace(tagName);
-		tagName = XML.escape(tagName);
-		sb.append('<');
-		sb.append(tagName);
-	
-//Emit the attributes
-	
-        keys = jo.keys();
-        while (keys.hasNext()) {
-            k = keys.next().toString();
-            if (!k.equals("tagName") && !k.equals("childNodes")) {
-            	XML.noSpace(k);
-	            v = jo.optString(k);
-	            if (v != null) {
-		            sb.append(' ');
-		            sb.append(XML.escape(k));
-		            sb.append('=');
-		            sb.append('"');
-		            sb.append(XML.escape(v));
-		            sb.append('"');
-	            }
-            }
-        }    
-		     	
-//Emit content in body
-	
-		ja = jo.optJSONArray("childNodes");
-		if (ja == null) {
-	        sb.append('/');
-	        sb.append('>');
-		} else {
-	        sb.append('>');
-			len = ja.length();
-			for (i = 0; i < len; i += 1) {
-			    e = ja.get(i);
-			    if (e != null) {
-			    	if (e instanceof String) {
-			    		sb.append(XML.escape(e.toString()));
-					} else if (e instanceof JSONObject) {
-						sb.append(toString((JSONObject)e));
-					} else if (e instanceof JSONArray) {
-						sb.append(toString((JSONArray)e));
-					}
-			    }
-			}
-			sb.append('<');
-	        sb.append('/');
-			sb.append(tagName);
-	        sb.append('>');
-	    }
-        return sb.toString();
-    }
-}
\ No newline at end of file
diff --git a/mobileapp/src/org/json/JSONObject.java b/mobileapp/src/org/json/JSONObject.java
deleted file mode 100755
index e34a752..0000000
--- a/mobileapp/src/org/json/JSONObject.java
+++ /dev/null
@@ -1,1584 +0,0 @@
-package org.json;
-
-/*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-import java.io.IOException;
-import java.io.Writer;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeSet;
-
-/**
- * A JSONObject is an unordered collection of name/value pairs. Its
- * external form is a string wrapped in curly braces with colons between the
- * names and values, and commas between the values and names. The internal form
- * is an object having <code>get</code> and <code>opt</code> methods for
- * accessing the values by name, and <code>put</code> methods for adding or
- * replacing values by name. The values can be any of these types:
- * <code>Boolean</code>, <code>JSONArray</code>, <code>JSONObject</code>,
- * <code>Number</code>, <code>String</code>, or the <code>JSONObject.NULL</code>
- * object. A JSONObject constructor can be used to convert an external form
- * JSON text into an internal form whose values can be retrieved with the
- * <code>get</code> and <code>opt</code> methods, or to convert values into a
- * JSON text using the <code>put</code> and <code>toString</code> methods.
- * A <code>get</code> method returns a value if one can be found, and throws an
- * exception if one cannot be found. An <code>opt</code> method returns a
- * default value instead of throwing an exception, and so is useful for
- * obtaining optional values.
- * <p>
- * The generic <code>get()</code> and <code>opt()</code> methods return an
- * object, which you can cast or query for type. There are also typed
- * <code>get</code> and <code>opt</code> methods that do type checking and type
- * coercion for you.
- * <p>
- * The <code>put</code> methods adds values to an object. For example, <pre>
- *     myString = new JSONObject().put("JSON", "Hello, World!").toString();</pre>
- * produces the string <code>{"JSON": "Hello, World"}</code>.
- * <p>
- * The texts produced by the <code>toString</code> methods strictly conform to
- * the JSON syntax rules.
- * The constructors are more forgiving in the texts they will accept:
- * <ul>
- * <li>An extra <code>,</code>&nbsp;<small>(comma)</small> may appear just
- *     before the closing brace.</li>
- * <li>Strings may be quoted with <code>'</code>&nbsp;<small>(single
- *     quote)</small>.</li>
- * <li>Strings do not need to be quoted at all if they do not begin with a quote
- *     or single quote, and if they do not contain leading or trailing spaces,
- *     and if they do not contain any of these characters:
- *     <code>{ } [ ] / \ : , = ; #</code> and if they do not look like numbers
- *     and if they are not the reserved words <code>true</code>,
- *     <code>false</code>, or <code>null</code>.</li>
- * <li>Keys can be followed by <code>=</code> or <code>=></code> as well as
- *     by <code>:</code>.</li>
- * <li>Values can be followed by <code>;</code> <small>(semicolon)</small> as
- *     well as by <code>,</code> <small>(comma)</small>.</li>
- * <li>Numbers may have the <code>0x-</code> <small>(hex)</small> prefix.</li>
- * </ul>
- * @author JSON.org
- * @version 2010-05-17
- */
-public class JSONObject {
-
-    /**
-     * JSONObject.NULL is equivalent to the value that JavaScript calls null,
-     * whilst Java's null is equivalent to the value that JavaScript calls
-     * undefined.
-     */
-     private static final class Null {
-
-        /**
-         * There is only intended to be a single instance of the NULL object,
-         * so the clone method returns itself.
-         * @return     NULL.
-         */
-        protected final Object clone() {
-            return this;
-        }
-
-
-        /**
-         * A Null object is equal to the null value and to itself.
-         * @param object    An object to test for nullness.
-         * @return true if the object parameter is the JSONObject.NULL object
-         *  or null.
-         */
-        public boolean equals(Object object) {
-            return object == null || object == this;
-        }
-
-
-        /**
-         * Get the "null" string value.
-         * @return The string "null".
-         */
-        public String toString() {
-            return "null";
-        }
-    }
-
-
-    /**
-     * The map where the JSONObject's properties are kept.
-     */
-    private Map map;
-
-
-    /**
-     * It is sometimes more convenient and less ambiguous to have a
-     * <code>NULL</code> object than to use Java's <code>null</code> value.
-     * <code>JSONObject.NULL.equals(null)</code> returns <code>true</code>.
-     * <code>JSONObject.NULL.toString()</code> returns <code>"null"</code>.
-     */
-    public static final Object NULL = new Null();
-
-
-    /**
-     * Construct an empty JSONObject.
-     */
-    public JSONObject() {
-        this.map = new HashMap();
-    }
-
-
-    /**
-     * Construct a JSONObject from a subset of another JSONObject.
-     * An array of strings is used to identify the keys that should be copied.
-     * Missing keys are ignored.
-     * @param jo A JSONObject.
-     * @param names An array of strings.
-     * @throws JSONException 
-     * @exception JSONException If a value is a non-finite number or if a name is duplicated.
-     */
-    public JSONObject(JSONObject jo, String[] names) {
-        this();
-        for (int i = 0; i < names.length; i += 1) {
-        	try {
-        		putOnce(names[i], jo.opt(names[i]));
-        	} catch (Exception ignore) {
-        	}
-        }
-    }
-
-
-    /**
-     * Construct a JSONObject from a JSONTokener.
-     * @param x A JSONTokener object containing the source string.
-     * @throws JSONException If there is a syntax error in the source string
-     *  or a duplicated key.
-     */
-    public JSONObject(JSONTokener x) throws JSONException {
-        this();
-        char c;
-        String key;
-
-        if (x.nextClean() != '{') {
-            throw x.syntaxError("A JSONObject text must begin with '{'");
-        }
-        for (;;) {
-            c = x.nextClean();
-            switch (c) {
-            case 0:
-                throw x.syntaxError("A JSONObject text must end with '}'");
-            case '}':
-                return;
-            default:
-                x.back();
-                key = x.nextValue().toString();
-            }
-
-            /*
-             * The key is followed by ':'. We will also tolerate '=' or '=>'.
-             */
-
-            c = x.nextClean();
-            if (c == '=') {
-                if (x.next() != '>') {
-                    x.back();
-                }
-            } else if (c != ':') {
-                throw x.syntaxError("Expected a ':' after a key");
-            }
-            putOnce(key, x.nextValue());
-
-            /*
-             * Pairs are separated by ','. We will also tolerate ';'.
-             */
-
-            switch (x.nextClean()) {
-            case ';':
-            case ',':
-                if (x.nextClean() == '}') {
-                    return;
-                }
-                x.back();
-                break;
-            case '}':
-                return;
-            default:
-                throw x.syntaxError("Expected a ',' or '}'");
-            }
-        }
-    }
-
-
-    /**
-     * Construct a JSONObject from a Map.
-     *
-     * @param map A map object that can be used to initialize the contents of
-     *  the JSONObject.
-     * @throws JSONException 
-     */
-    public JSONObject(Map map) {
-        this.map = new HashMap();
-        if (map != null) {
-            Iterator i = map.entrySet().iterator();
-            while (i.hasNext()) {
-                Map.Entry e = (Map.Entry)i.next();
-                this.map.put(e.getKey(), wrap(e.getValue()));
-            }
-        }
-    }
-
-
-    /**
-     * Construct a JSONObject from an Object using bean getters.
-     * It reflects on all of the public methods of the object.
-     * For each of the methods with no parameters and a name starting
-     * with <code>"get"</code> or <code>"is"</code> followed by an uppercase letter,
-     * the method is invoked, and a key and the value returned from the getter method
-     * are put into the new JSONObject.
-     *
-     * The key is formed by removing the <code>"get"</code> or <code>"is"</code> prefix.
-     * If the second remaining character is not upper case, then the first
-     * character is converted to lower case.
-     *
-     * For example, if an object has a method named <code>"getName"</code>, and
-     * if the result of calling <code>object.getName()</code> is <code>"Larry Fine"</code>,
-     * then the JSONObject will contain <code>"name": "Larry Fine"</code>.
-     *
-     * @param bean An object that has getter methods that should be used
-     * to make a JSONObject.
-     */
-    public JSONObject(Object bean) {
-        this();
-        populateMap(bean);
-    }
-
-
-    /**
-     * Construct a JSONObject from an Object, using reflection to find the
-     * public members. The resulting JSONObject's keys will be the strings
-     * from the names array, and the values will be the field values associated
-     * with those keys in the object. If a key is not found or not visible,
-     * then it will not be copied into the new JSONObject.
-     * @param object An object that has fields that should be used to make a
-     * JSONObject.
-     * @param names An array of strings, the names of the fields to be obtained
-     * from the object.
-     */
-    public JSONObject(Object object, String names[]) {
-        this();
-        Class c = object.getClass();
-        for (int i = 0; i < names.length; i += 1) {
-            String name = names[i];
-            try {
-                putOpt(name, c.getField(name).get(object));
-            } catch (Exception ignore) {
-            }
-        }
-    }
-
-
-    /**
-     * Construct a JSONObject from a source JSON text string.
-     * This is the most commonly used JSONObject constructor.
-     * @param source    A string beginning
-     *  with <code>{</code>&nbsp;<small>(left brace)</small> and ending
-     *  with <code>}</code>&nbsp;<small>(right brace)</small>.
-     * @exception JSONException If there is a syntax error in the source
-     *  string or a duplicated key.
-     */
-    public JSONObject(String source) throws JSONException {
-        this(new JSONTokener(source));
-    }
-
-
-    /**
-     * Accumulate values under a key. It is similar to the put method except
-     * that if there is already an object stored under the key then a
-     * JSONArray is stored under the key to hold all of the accumulated values.
-     * If there is already a JSONArray, then the new value is appended to it.
-     * In contrast, the put method replaces the previous value.
-     * @param key   A key string.
-     * @param value An object to be accumulated under the key.
-     * @return this.
-     * @throws JSONException If the value is an invalid number
-     *  or if the key is null.
-     */
-    public JSONObject accumulate(String key, Object value)
-            throws JSONException {
-        testValidity(value);
-        Object o = opt(key);
-        if (o == null) {
-            put(key, value instanceof JSONArray ?
-                    new JSONArray().put(value) :
-                    value);
-        } else if (o instanceof JSONArray) {
-            ((JSONArray)o).put(value);
-        } else {
-            put(key, new JSONArray().put(o).put(value));
-        }
-        return this;
-    }
-
-
-    /**
-     * Append values to the array under a key. If the key does not exist in the
-     * JSONObject, then the key is put in the JSONObject with its value being a
-     * JSONArray containing the value parameter. If the key was already
-     * associated with a JSONArray, then the value parameter is appended to it.
-     * @param key   A key string.
-     * @param value An object to be accumulated under the key.
-     * @return this.
-     * @throws JSONException If the key is null or if the current value
-     *  associated with the key is not a JSONArray.
-     */
-    public JSONObject append(String key, Object value) throws JSONException {
-        testValidity(value);
-        Object o = opt(key);
-        if (o == null) {
-            put(key, new JSONArray().put(value));
-        } else if (o instanceof JSONArray) {
-            put(key, ((JSONArray)o).put(value));
-        } else {
-            throw new JSONException("JSONObject[" + key +
-                    "] is not a JSONArray.");
-        }
-        return this;
-    }
-
-
-    /**
-     * Produce a string from a double. The string "null" will be returned if
-     * the number is not finite.
-     * @param  d A double.
-     * @return A String.
-     */
-    static public String doubleToString(double d) {
-        if (Double.isInfinite(d) || Double.isNaN(d)) {
-            return "null";
-        }
-
-// Shave off trailing zeros and decimal point, if possible.
-
-        String s = Double.toString(d);
-        if (s.indexOf('.') > 0 && s.indexOf('e') < 0 && s.indexOf('E') < 0) {
-            while (s.endsWith("0")) {
-                s = s.substring(0, s.length() - 1);
-            }
-            if (s.endsWith(".")) {
-                s = s.substring(0, s.length() - 1);
-            }
-        }
-        return s;
-    }
-
-
-    /**
-     * Get the value object associated with a key.
-     *
-     * @param key   A key string.
-     * @return      The object associated with the key.
-     * @throws   JSONException if the key is not found.
-     */
-    public Object get(String key) throws JSONException {
-        Object o = opt(key);
-        if (o == null) {
-            throw new JSONException("JSONObject[" + quote(key) +
-                    "] not found.");
-        }
-        return o;
-    }
-
-
-    /**
-     * Get the boolean value associated with a key.
-     *
-     * @param key   A key string.
-     * @return      The truth.
-     * @throws   JSONException
-     *  if the value is not a Boolean or the String "true" or "false".
-     */
-    public boolean getBoolean(String key) throws JSONException {
-        Object o = get(key);
-        if (o.equals(Boolean.FALSE) ||
-                (o instanceof String &&
-                ((String)o).equalsIgnoreCase("false"))) {
-            return false;
-        } else if (o.equals(Boolean.TRUE) ||
-                (o instanceof String &&
-                ((String)o).equalsIgnoreCase("true"))) {
-            return true;
-        }
-        throw new JSONException("JSONObject[" + quote(key) +
-                "] is not a Boolean.");
-    }
-
-
-    /**
-     * Get the double value associated with a key.
-     * @param key   A key string.
-     * @return      The numeric value.
-     * @throws JSONException if the key is not found or
-     *  if the value is not a Number object and cannot be converted to a number.
-     */
-    public double getDouble(String key) throws JSONException {
-        Object o = get(key);
-        try {
-            return o instanceof Number ?
-                ((Number)o).doubleValue() :
-                Double.valueOf((String)o).doubleValue();
-        } catch (Exception e) {
-            throw new JSONException("JSONObject[" + quote(key) +
-                "] is not a number.");
-        }
-    }
-
-
-    /**
-     * Get the int value associated with a key. 
-     *
-     * @param key   A key string.
-     * @return      The integer value.
-     * @throws   JSONException if the key is not found or if the value cannot
-     *  be converted to an integer.
-     */
-    public int getInt(String key) throws JSONException {
-        Object o = get(key);
-        try {
-            return o instanceof Number ?
-                ((Number)o).intValue() :
-                Integer.parseInt((String)o);
-        } catch (Exception e) {
-            throw new JSONException("JSONObject[" + quote(key) +
-                "] is not an int.");
-        }
-    }
-
-
-    /**
-     * Get the JSONArray value associated with a key.
-     *
-     * @param key   A key string.
-     * @return      A JSONArray which is the value.
-     * @throws   JSONException if the key is not found or
-     *  if the value is not a JSONArray.
-     */
-    public JSONArray getJSONArray(String key) throws JSONException {
-        Object o = get(key);
-        if (o instanceof JSONArray) {
-            return (JSONArray)o;
-        }
-        throw new JSONException("JSONObject[" + quote(key) +
-                "] is not a JSONArray.");
-    }
-
-
-    /**
-     * Get the JSONObject value associated with a key.
-     *
-     * @param key   A key string.
-     * @return      A JSONObject which is the value.
-     * @throws   JSONException if the key is not found or
-     *  if the value is not a JSONObject.
-     */
-    public JSONObject getJSONObject(String key) throws JSONException {
-        Object o = get(key);
-        if (o instanceof JSONObject) {
-            return (JSONObject)o;
-        }
-        throw new JSONException("JSONObject[" + quote(key) +
-                "] is not a JSONObject.");
-    }
-
-
-    /**
-     * Get the long value associated with a key. 
-     *
-     * @param key   A key string.
-     * @return      The long value.
-     * @throws   JSONException if the key is not found or if the value cannot
-     *  be converted to a long.
-     */
-    public long getLong(String key) throws JSONException {
-        Object o = get(key);
-        try {
-            return o instanceof Number ?
-                ((Number)o).longValue() :
-                Long.parseLong((String)o);
-        } catch (Exception e) {
-            throw new JSONException("JSONObject[" + quote(key) +
-                "] is not a long.");
-        }
-    }
-
-
-    /**
-     * Get an array of field names from a JSONObject.
-     *
-     * @return An array of field names, or null if there are no names.
-     */
-    public static String[] getNames(JSONObject jo) {
-        int length = jo.length();
-        if (length == 0) {
-            return null;
-        }
-        Iterator i = jo.keys();
-        String[] names = new String[length];
-        int j = 0;
-        while (i.hasNext()) {
-            names[j] = (String)i.next();
-            j += 1;
-        }
-        return names;
-    }
-
-
-    /**
-     * Get an array of field names from an Object.
-     *
-     * @return An array of field names, or null if there are no names.
-     */
-    public static String[] getNames(Object object) {
-        if (object == null) {
-            return null;
-        }
-        Class klass = object.getClass();
-        Field[] fields = klass.getFields();
-        int length = fields.length;
-        if (length == 0) {
-            return null;
-        }
-        String[] names = new String[length];
-        for (int i = 0; i < length; i += 1) {
-            names[i] = fields[i].getName();
-        }
-        return names;
-    }
-
-
-    /**
-     * Get the string associated with a key.
-     *
-     * @param key   A key string.
-     * @return      A string which is the value.
-     * @throws   JSONException if the key is not found.
-     */
-    public String getString(String key) throws JSONException {
-        return get(key).toString();
-    }
-
-
-    /**
-     * Determine if the JSONObject contains a specific key.
-     * @param key   A key string.
-     * @return      true if the key exists in the JSONObject.
-     */
-    public boolean has(String key) {
-        return this.map.containsKey(key);
-    }
-    
-    
-    /**
-     * Increment a property of a JSONObject. If there is no such property,
-     * create one with a value of 1. If there is such a property, and if
-     * it is an Integer, Long, Double, or Float, then add one to it.
-     * @param key  A key string.
-     * @return this.
-     * @throws JSONException If there is already a property with this name
-     * that is not an Integer, Long, Double, or Float.
-     */
-    public JSONObject increment(String key) throws JSONException {
-    	Object value = opt(key);
-    	if (value == null) {
-    		put(key, 1);
-    	} else {
-    		if (value instanceof Integer) {
-    			put(key, ((Integer)value).intValue() + 1);
-    		} else if (value instanceof Long) {
-    			put(key, ((Long)value).longValue() + 1);    			
-    		} else if (value instanceof Double) {
-	    		put(key, ((Double)value).doubleValue() + 1);    			
-    		} else if (value instanceof Float) {
-	    		put(key, ((Float)value).floatValue() + 1);    			
-		    } else {
-		    	throw new JSONException("Unable to increment [" + key + "].");
-		    }
-	    }
-    	return this;
-    }
-
-
-    /**
-     * Determine if the value associated with the key is null or if there is
-     *  no value.
-     * @param key   A key string.
-     * @return      true if there is no value associated with the key or if
-     *  the value is the JSONObject.NULL object.
-     */
-    public boolean isNull(String key) {
-        return JSONObject.NULL.equals(opt(key));
-    }
-
-
-    /**
-     * Get an enumeration of the keys of the JSONObject.
-     *
-     * @return An iterator of the keys.
-     */
-    public Iterator keys() {
-        return this.map.keySet().iterator();
-    }
-
-
-    /**
-     * Get the number of keys stored in the JSONObject.
-     *
-     * @return The number of keys in the JSONObject.
-     */
-    public int length() {
-        return this.map.size();
-    }
-
-
-    /**
-     * Produce a JSONArray containing the names of the elements of this
-     * JSONObject.
-     * @return A JSONArray containing the key strings, or null if the JSONObject
-     * is empty.
-     */
-    public JSONArray names() {
-        JSONArray ja = new JSONArray();
-        Iterator  keys = keys();
-        while (keys.hasNext()) {
-            ja.put(keys.next());
-        }
-        return ja.length() == 0 ? null : ja;
-    }
-
-    /**
-     * Produce a string from a Number.
-     * @param  n A Number
-     * @return A String.
-     * @throws JSONException If n is a non-finite number.
-     */
-    static public String numberToString(Number n)
-            throws JSONException {
-        if (n == null) {
-            throw new JSONException("Null pointer");
-        }
-        testValidity(n);
-
-// Shave off trailing zeros and decimal point, if possible.
-
-        String s = n.toString();
-        if (s.indexOf('.') > 0 && s.indexOf('e') < 0 && s.indexOf('E') < 0) {
-            while (s.endsWith("0")) {
-                s = s.substring(0, s.length() - 1);
-            }
-            if (s.endsWith(".")) {
-                s = s.substring(0, s.length() - 1);
-            }
-        }
-        return s;
-    }
-
-
-    /**
-     * Get an optional value associated with a key.
-     * @param key   A key string.
-     * @return      An object which is the value, or null if there is no value.
-     */
-    public Object opt(String key) {
-        return key == null ? null : this.map.get(key);
-    }
-
-
-    /**
-     * Get an optional boolean associated with a key.
-     * It returns false if there is no such key, or if the value is not
-     * Boolean.TRUE or the String "true".
-     *
-     * @param key   A key string.
-     * @return      The truth.
-     */
-    public boolean optBoolean(String key) {
-        return optBoolean(key, false);
-    }
-
-
-    /**
-     * Get an optional boolean associated with a key.
-     * It returns the defaultValue if there is no such key, or if it is not
-     * a Boolean or the String "true" or "false" (case insensitive).
-     *
-     * @param key              A key string.
-     * @param defaultValue     The default.
-     * @return      The truth.
-     */
-    public boolean optBoolean(String key, boolean defaultValue) {
-        try {
-            return getBoolean(key);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-
-    /**
-     * Get an optional double associated with a key,
-     * or NaN if there is no such key or if its value is not a number.
-     * If the value is a string, an attempt will be made to evaluate it as
-     * a number.
-     *
-     * @param key   A string which is the key.
-     * @return      An object which is the value.
-     */
-    public double optDouble(String key) {
-        return optDouble(key, Double.NaN);
-    }
-
-
-    /**
-     * Get an optional double associated with a key, or the
-     * defaultValue if there is no such key or if its value is not a number.
-     * If the value is a string, an attempt will be made to evaluate it as
-     * a number.
-     *
-     * @param key   A key string.
-     * @param defaultValue     The default.
-     * @return      An object which is the value.
-     */
-    public double optDouble(String key, double defaultValue) {
-        try {
-            Object o = opt(key);
-            return o instanceof Number ? ((Number)o).doubleValue() :
-                new Double((String)o).doubleValue();
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-
-    /**
-     * Get an optional int value associated with a key,
-     * or zero if there is no such key or if the value is not a number.
-     * If the value is a string, an attempt will be made to evaluate it as
-     * a number.
-     *
-     * @param key   A key string.
-     * @return      An object which is the value.
-     */
-    public int optInt(String key) {
-        return optInt(key, 0);
-    }
-
-
-    /**
-     * Get an optional int value associated with a key,
-     * or the default if there is no such key or if the value is not a number.
-     * If the value is a string, an attempt will be made to evaluate it as
-     * a number.
-     *
-     * @param key   A key string.
-     * @param defaultValue     The default.
-     * @return      An object which is the value.
-     */
-    public int optInt(String key, int defaultValue) {
-        try {
-            return getInt(key);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-
-    /**
-     * Get an optional JSONArray associated with a key.
-     * It returns null if there is no such key, or if its value is not a
-     * JSONArray.
-     *
-     * @param key   A key string.
-     * @return      A JSONArray which is the value.
-     */
-    public JSONArray optJSONArray(String key) {
-        Object o = opt(key);
-        return o instanceof JSONArray ? (JSONArray)o : null;
-    }
-
-
-    /**
-     * Get an optional JSONObject associated with a key.
-     * It returns null if there is no such key, or if its value is not a
-     * JSONObject.
-     *
-     * @param key   A key string.
-     * @return      A JSONObject which is the value.
-     */
-    public JSONObject optJSONObject(String key) {
-        Object o = opt(key);
-        return o instanceof JSONObject ? (JSONObject)o : null;
-    }
-
-
-    /**
-     * Get an optional long value associated with a key,
-     * or zero if there is no such key or if the value is not a number.
-     * If the value is a string, an attempt will be made to evaluate it as
-     * a number.
-     *
-     * @param key   A key string.
-     * @return      An object which is the value.
-     */
-    public long optLong(String key) {
-        return optLong(key, 0);
-    }
-
-
-    /**
-     * Get an optional long value associated with a key,
-     * or the default if there is no such key or if the value is not a number.
-     * If the value is a string, an attempt will be made to evaluate it as
-     * a number.
-     *
-     * @param key   A key string.
-     * @param defaultValue     The default.
-     * @return      An object which is the value.
-     */
-    public long optLong(String key, long defaultValue) {
-        try {
-            return getLong(key);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-
-    /**
-     * Get an optional string associated with a key.
-     * It returns an empty string if there is no such key. If the value is not
-     * a string and is not null, then it is coverted to a string.
-     *
-     * @param key   A key string.
-     * @return      A string which is the value.
-     */
-    public String optString(String key) {
-        return optString(key, "");
-    }
-
-
-    /**
-     * Get an optional string associated with a key.
-     * It returns the defaultValue if there is no such key.
-     *
-     * @param key   A key string.
-     * @param defaultValue     The default.
-     * @return      A string which is the value.
-     */
-    public String optString(String key, String defaultValue) {
-        Object o = opt(key);
-        return o != null ? o.toString() : defaultValue;
-    }
-
-
-    private void populateMap(Object bean) {
-        Class klass = bean.getClass();
-
-// If klass is a System class then set includeSuperClass to false. 
-
-        boolean includeSuperClass = klass.getClassLoader() != null;
-
-        Method[] methods = (includeSuperClass) ?
-                klass.getMethods() : klass.getDeclaredMethods();
-        for (int i = 0; i < methods.length; i += 1) {
-            try {
-                Method method = methods[i];
-                if (Modifier.isPublic(method.getModifiers())) {
-                    String name = method.getName();
-                    String key = "";
-                    if (name.startsWith("get")) {
-                    	if (name.equals("getClass") || 
-                    			name.equals("getDeclaringClass")) {
-                    		key = "";
-                    	} else {
-                    		key = name.substring(3);
-                    	}
-                    } else if (name.startsWith("is")) {
-                        key = name.substring(2);
-                    }
-                    if (key.length() > 0 &&
-                            Character.isUpperCase(key.charAt(0)) &&
-                            method.getParameterTypes().length == 0) {
-                        if (key.length() == 1) {
-                            key = key.toLowerCase();
-                        } else if (!Character.isUpperCase(key.charAt(1))) {
-                            key = key.substring(0, 1).toLowerCase() +
-                                key.substring(1);
-                        }
-
-                        Object result = method.invoke(bean, (Object[])null);
-
-                        map.put(key, wrap(result));
-                    }
-                }
-            } catch (Exception ignore) {
-            }
-        }
-    }
-
-
-    /**
-     * Put a key/boolean pair in the JSONObject.
-     *
-     * @param key   A key string.
-     * @param value A boolean which is the value.
-     * @return this.
-     * @throws JSONException If the key is null.
-     */
-    public JSONObject put(String key, boolean value) throws JSONException {
-        put(key, value ? Boolean.TRUE : Boolean.FALSE);
-        return this;
-    }
-
-
-    /**
-     * Put a key/value pair in the JSONObject, where the value will be a
-     * JSONArray which is produced from a Collection.
-     * @param key   A key string.
-     * @param value A Collection value.
-     * @return      this.
-     * @throws JSONException
-     */
-    public JSONObject put(String key, Collection value) throws JSONException {
-        put(key, new JSONArray(value));
-        return this;
-    }
-
-
-    /**
-     * Put a key/double pair in the JSONObject.
-     *
-     * @param key   A key string.
-     * @param value A double which is the value.
-     * @return this.
-     * @throws JSONException If the key is null or if the number is invalid.
-     */
-    public JSONObject put(String key, double value) throws JSONException {
-        put(key, new Double(value));
-        return this;
-    }
-
-
-    /**
-     * Put a key/int pair in the JSONObject.
-     *
-     * @param key   A key string.
-     * @param value An int which is the value.
-     * @return this.
-     * @throws JSONException If the key is null.
-     */
-    public JSONObject put(String key, int value) throws JSONException {
-        put(key, new Integer(value));
-        return this;
-    }
-
-
-    /**
-     * Put a key/long pair in the JSONObject.
-     *
-     * @param key   A key string.
-     * @param value A long which is the value.
-     * @return this.
-     * @throws JSONException If the key is null.
-     */
-    public JSONObject put(String key, long value) throws JSONException {
-        put(key, new Long(value));
-        return this;
-    }
-
-
-    /**
-     * Put a key/value pair in the JSONObject, where the value will be a
-     * JSONObject which is produced from a Map.
-     * @param key   A key string.
-     * @param value A Map value.
-     * @return      this.
-     * @throws JSONException
-     */
-    public JSONObject put(String key, Map value) throws JSONException {
-        put(key, new JSONObject(value));
-        return this;
-    }
-
-
-    /**
-     * Put a key/value pair in the JSONObject. If the value is null,
-     * then the key will be removed from the JSONObject if it is present.
-     * @param key   A key string.
-     * @param value An object which is the value. It should be of one of these
-     *  types: Boolean, Double, Integer, JSONArray, JSONObject, Long, String,
-     *  or the JSONObject.NULL object.
-     * @return this.
-     * @throws JSONException If the value is non-finite number
-     *  or if the key is null.
-     */
-    public JSONObject put(String key, Object value) throws JSONException {
-        if (key == null) {
-            throw new JSONException("Null key.");
-        }
-        if (value != null) {
-            testValidity(value);
-            this.map.put(key, value);
-        } else {
-            remove(key);
-        }
-        return this;
-    }
-
-
-    /**
-     * Put a key/value pair in the JSONObject, but only if the key and the
-     * value are both non-null, and only if there is not already a member
-     * with that name.
-     * @param key
-     * @param value
-     * @return his.
-     * @throws JSONException if the key is a duplicate
-     */
-    public JSONObject putOnce(String key, Object value) throws JSONException {
-        if (key != null && value != null) {
-            if (opt(key) != null) {
-                throw new JSONException("Duplicate key \"" + key + "\"");
-            }
-            put(key, value);
-        }
-        return this;
-    }
-
-
-    /**
-     * Put a key/value pair in the JSONObject, but only if the
-     * key and the value are both non-null.
-     * @param key   A key string.
-     * @param value An object which is the value. It should be of one of these
-     *  types: Boolean, Double, Integer, JSONArray, JSONObject, Long, String,
-     *  or the JSONObject.NULL object.
-     * @return this.
-     * @throws JSONException If the value is a non-finite number.
-     */
-    public JSONObject putOpt(String key, Object value) throws JSONException {
-        if (key != null && value != null) {
-            put(key, value);
-        }
-        return this;
-    }
-
-
-    /**
-     * Produce a string in double quotes with backslash sequences in all the
-     * right places. A backslash will be inserted within </, allowing JSON
-     * text to be delivered in HTML. In JSON text, a string cannot contain a
-     * control character or an unescaped quote or backslash.
-     * @param string A String
-     * @return  A String correctly formatted for insertion in a JSON text.
-     */
-    public static String quote(String string) {
-        if (string == null || string.length() == 0) {
-            return "\"\"";
-        }
-
-        char         b;
-        char         c = 0;
-        int          i;
-        int          len = string.length();
-        StringBuffer sb = new StringBuffer(len + 4);
-        String       t;
-
-        sb.append('"');
-        for (i = 0; i < len; i += 1) {
-            b = c;
-            c = string.charAt(i);
-            switch (c) {
-            case '\\':
-            case '"':
-                sb.append('\\');
-                sb.append(c);
-                break;
-            case '/':
-                if (b == '<') {
-                    sb.append('\\');
-                }
-                sb.append(c);
-                break;
-            case '\b':
-                sb.append("\\b");
-                break;
-            case '\t':
-                sb.append("\\t");
-                break;
-            case '\n':
-                sb.append("\\n");
-                break;
-            case '\f':
-                sb.append("\\f");
-                break;
-            case '\r':
-                sb.append("\\r");
-                break;
-            default:
-                if (c < ' ' || (c >= '\u0080' && c < '\u00a0') ||
-                               (c >= '\u2000' && c < '\u2100')) {
-                    t = "000" + Integer.toHexString(c);
-                    sb.append("\\u" + t.substring(t.length() - 4));
-                } else {
-                    sb.append(c);
-                }
-            }
-        }
-        sb.append('"');
-        return sb.toString();
-    }
-
-    /**
-     * Remove a name and its value, if present.
-     * @param key The name to be removed.
-     * @return The value that was associated with the name,
-     * or null if there was no value.
-     */
-    public Object remove(String key) {
-        return this.map.remove(key);
-    }
-
-    /**
-     * Get an enumeration of the keys of the JSONObject.
-     * The keys will be sorted alphabetically.
-     *
-     * @return An iterator of the keys.
-     */
-    public Iterator sortedKeys() {
-      return new TreeSet(this.map.keySet()).iterator();
-    }
-
-    /**
-     * Try to convert a string into a number, boolean, or null. If the string
-     * can't be converted, return the string.
-     * @param s A String.
-     * @return A simple JSON value.
-     */
-    static public Object stringToValue(String s) {
-        if (s.equals("")) {
-            return s;
-        }
-        if (s.equalsIgnoreCase("true")) {
-            return Boolean.TRUE;
-        }
-        if (s.equalsIgnoreCase("false")) {
-            return Boolean.FALSE;
-        }
-        if (s.equalsIgnoreCase("null")) {
-            return JSONObject.NULL;
-        }
-
-        /*
-         * If it might be a number, try converting it. 
-         * We support the non-standard 0x- convention. 
-         * If a number cannot be produced, then the value will just
-         * be a string. Note that the 0x-, plus, and implied string
-         * conventions are non-standard. A JSON parser may accept
-         * non-JSON forms as long as it accepts all correct JSON forms.
-         */
-
-        char b = s.charAt(0);
-        if ((b >= '0' && b <= '9') || b == '.' || b == '-' || b == '+') {
-            if (b == '0' && s.length() > 2 &&
-                        (s.charAt(1) == 'x' || s.charAt(1) == 'X')) {
-                try {
-                    return new Integer(Integer.parseInt(s.substring(2), 16));
-                } catch (Exception ignore) {
-                }
-            }
-            try {
-                if (s.indexOf('.') > -1 || 
-                		s.indexOf('e') > -1 || s.indexOf('E') > -1) {
-                    return Double.valueOf(s);
-                } else {
-                    Long myLong = new Long(s);
-                    if (myLong.longValue() == myLong.intValue()) {
-                        return new Integer(myLong.intValue());
-                    } else {
-                        return myLong;
-                    }
-                }
-            }  catch (Exception ignore) {
-            }
-        }
-        return s;
-    }
-
-
-    /**
-     * Throw an exception if the object is an NaN or infinite number.
-     * @param o The object to test.
-     * @throws JSONException If o is a non-finite number.
-     */
-    static void testValidity(Object o) throws JSONException {
-        if (o != null) {
-            if (o instanceof Double) {
-                if (((Double)o).isInfinite() || ((Double)o).isNaN()) {
-                    throw new JSONException(
-                        "JSON does not allow non-finite numbers.");
-                }
-            } else if (o instanceof Float) {
-                if (((Float)o).isInfinite() || ((Float)o).isNaN()) {
-                    throw new JSONException(
-                        "JSON does not allow non-finite numbers.");
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Produce a JSONArray containing the values of the members of this
-     * JSONObject.
-     * @param names A JSONArray containing a list of key strings. This
-     * determines the sequence of the values in the result.
-     * @return A JSONArray of values.
-     * @throws JSONException If any of the values are non-finite numbers.
-     */
-    public JSONArray toJSONArray(JSONArray names) throws JSONException {
-        if (names == null || names.length() == 0) {
-            return null;
-        }
-        JSONArray ja = new JSONArray();
-        for (int i = 0; i < names.length(); i += 1) {
-            ja.put(this.opt(names.getString(i)));
-        }
-        return ja;
-    }
-
-    /**
-     * Make a JSON text of this JSONObject. For compactness, no whitespace
-     * is added. If this would not result in a syntactically correct JSON text,
-     * then null will be returned instead.
-     * <p>
-     * Warning: This method assumes that the data structure is acyclical.
-     *
-     * @return a printable, displayable, portable, transmittable
-     *  representation of the object, beginning
-     *  with <code>{</code>&nbsp;<small>(left brace)</small> and ending
-     *  with <code>}</code>&nbsp;<small>(right brace)</small>.
-     */
-    public String toString() {
-        try {
-            Iterator     keys = keys();
-            StringBuffer sb = new StringBuffer("{");
-
-            while (keys.hasNext()) {
-                if (sb.length() > 1) {
-                    sb.append(',');
-                }
-                Object o = keys.next();
-                sb.append(quote(o.toString()));
-                sb.append(':');
-                sb.append(valueToString(this.map.get(o)));
-            }
-            sb.append('}');
-            return sb.toString();
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-
-    /**
-     * Make a prettyprinted JSON text of this JSONObject.
-     * <p>
-     * Warning: This method assumes that the data structure is acyclical.
-     * @param indentFactor The number of spaces to add to each level of
-     *  indentation.
-     * @return a printable, displayable, portable, transmittable
-     *  representation of the object, beginning
-     *  with <code>{</code>&nbsp;<small>(left brace)</small> and ending
-     *  with <code>}</code>&nbsp;<small>(right brace)</small>.
-     * @throws JSONException If the object contains an invalid number.
-     */
-    public String toString(int indentFactor) throws JSONException {
-        return toString(indentFactor, 0);
-    }
-
-
-    /**
-     * Make a prettyprinted JSON text of this JSONObject.
-     * <p>
-     * Warning: This method assumes that the data structure is acyclical.
-     * @param indentFactor The number of spaces to add to each level of
-     *  indentation.
-     * @param indent The indentation of the top level.
-     * @return a printable, displayable, transmittable
-     *  representation of the object, beginning
-     *  with <code>{</code>&nbsp;<small>(left brace)</small> and ending
-     *  with <code>}</code>&nbsp;<small>(right brace)</small>.
-     * @throws JSONException If the object contains an invalid number.
-     */
-    String toString(int indentFactor, int indent) throws JSONException {
-        int j;
-        int n = length();
-        if (n == 0) {
-            return "{}";
-        }
-        Iterator     keys = sortedKeys();
-        StringBuffer sb = new StringBuffer("{");
-        int          newindent = indent + indentFactor;
-        Object       o;
-        if (n == 1) {
-            o = keys.next();
-            sb.append(quote(o.toString()));
-            sb.append(": ");
-            sb.append(valueToString(this.map.get(o), indentFactor,
-                    indent));
-        } else {
-            while (keys.hasNext()) {
-                o = keys.next();
-                if (sb.length() > 1) {
-                    sb.append(",\n");
-                } else {
-                    sb.append('\n');
-                }
-                for (j = 0; j < newindent; j += 1) {
-                    sb.append(' ');
-                }
-                sb.append(quote(o.toString()));
-                sb.append(": ");
-                sb.append(valueToString(this.map.get(o), indentFactor,
-                        newindent));
-            }
-            if (sb.length() > 1) {
-                sb.append('\n');
-                for (j = 0; j < indent; j += 1) {
-                    sb.append(' ');
-                }
-            }
-        }
-        sb.append('}');
-        return sb.toString();
-    }
-
-
-    /**
-     * Make a JSON text of an Object value. If the object has an
-     * value.toJSONString() method, then that method will be used to produce
-     * the JSON text. The method is required to produce a strictly
-     * conforming text. If the object does not contain a toJSONString
-     * method (which is the most common case), then a text will be
-     * produced by other means. If the value is an array or Collection,
-     * then a JSONArray will be made from it and its toJSONString method
-     * will be called. If the value is a MAP, then a JSONObject will be made
-     * from it and its toJSONString method will be called. Otherwise, the
-     * value's toString method will be called, and the result will be quoted.
-     *
-     * <p>
-     * Warning: This method assumes that the data structure is acyclical.
-     * @param value The value to be serialized.
-     * @return a printable, displayable, transmittable
-     *  representation of the object, beginning
-     *  with <code>{</code>&nbsp;<small>(left brace)</small> and ending
-     *  with <code>}</code>&nbsp;<small>(right brace)</small>.
-     * @throws JSONException If the value is or contains an invalid number.
-     */
-    static String valueToString(Object value) throws JSONException {
-        if (value == null || value.equals(null)) {
-            return "null";
-        }
-        if (value instanceof JSONString) {
-            Object o;
-            try {
-                o = ((JSONString)value).toJSONString();
-            } catch (Exception e) {
-                throw new JSONException(e);
-            }
-            if (o instanceof String) {
-                return (String)o;
-            }
-            throw new JSONException("Bad value from toJSONString: " + o);
-        }
-        if (value instanceof Number) {
-            return numberToString((Number) value);
-        }
-        if (value instanceof Boolean || value instanceof JSONObject ||
-                value instanceof JSONArray) {
-            return value.toString();
-        }
-        if (value instanceof Map) {
-            return new JSONObject((Map)value).toString();
-        }
-        if (value instanceof Collection) {
-            return new JSONArray((Collection)value).toString();
-        }
-        if (value.getClass().isArray()) {
-            return new JSONArray(value).toString();
-        }
-        return quote(value.toString());
-    }
-
-
-    /**
-     * Make a prettyprinted JSON text of an object value.
-     * <p>
-     * Warning: This method assumes that the data structure is acyclical.
-     * @param value The value to be serialized.
-     * @param indentFactor The number of spaces to add to each level of
-     *  indentation.
-     * @param indent The indentation of the top level.
-     * @return a printable, displayable, transmittable
-     *  representation of the object, beginning
-     *  with <code>{</code>&nbsp;<small>(left brace)</small> and ending
-     *  with <code>}</code>&nbsp;<small>(right brace)</small>.
-     * @throws JSONException If the object contains an invalid number.
-     */
-     static String valueToString(Object value, int indentFactor, int indent)
-            throws JSONException {
-        if (value == null || value.equals(null)) {
-            return "null";
-        }
-        try {
-            if (value instanceof JSONString) {
-                Object o = ((JSONString)value).toJSONString();
-                if (o instanceof String) {
-                    return (String)o;
-                }
-            }
-        } catch (Exception ignore) {
-        }
-        if (value instanceof Number) {
-            return numberToString((Number) value);
-        }
-        if (value instanceof Boolean) {
-            return value.toString();
-        }
-        if (value instanceof JSONObject) {
-            return ((JSONObject)value).toString(indentFactor, indent);
-        }
-        if (value instanceof JSONArray) {
-            return ((JSONArray)value).toString(indentFactor, indent);
-        }
-        if (value instanceof Map) {
-            return new JSONObject((Map)value).toString(indentFactor, indent);
-        }
-        if (value instanceof Collection) {
-            return new JSONArray((Collection)value).toString(indentFactor, indent);
-        }
-        if (value.getClass().isArray()) {
-            return new JSONArray(value).toString(indentFactor, indent);
-        }
-        return quote(value.toString());
-    }
-
-
-     /**
-      * Wrap an object, if necessary. If the object is null, return the NULL 
-      * object. If it is an array or collection, wrap it in a JSONArray. If 
-      * it is a map, wrap it in a JSONObject. If it is a standard property 
-      * (Double, String, et al) then it is already wrapped. Otherwise, if it 
-      * comes from one of the java packages, turn it into a string. And if 
-      * it doesn't, try to wrap it in a JSONObject. If the wrapping fails,
-      * then null is returned.
-      *
-      * @param object The object to wrap
-      * @return The wrapped value
-      */
-     static Object wrap(Object object) {
-         try {
-             if (object == null) {
-                 return NULL;
-             }
-             if (object instanceof JSONObject || object instanceof JSONArray || 
-            		 NULL.equals(object)      || object instanceof JSONString || 
-            		 object instanceof Byte   || object instanceof Character ||
-                     object instanceof Short  || object instanceof Integer   ||
-                     object instanceof Long   || object instanceof Boolean   || 
-                     object instanceof Float  || object instanceof Double    ||
-                     object instanceof String) {
-                 return object;
-             }
-             
-             if (object instanceof Collection) {
-                 return new JSONArray((Collection)object);
-             }
-             if (object.getClass().isArray()) {
-                 return new JSONArray(object);
-             }
-             if (object instanceof Map) {
-                 return new JSONObject((Map)object);
-             }
-             Package objectPackage = object.getClass().getPackage();
-             String objectPackageName = ( objectPackage != null ? objectPackage.getName() : "" );
-             if (objectPackageName.startsWith("java.") ||
-            		 objectPackageName.startsWith("javax.") ||
-            		 object.getClass().getClassLoader() == null) {
-                 return object.toString();
-             }
-             return new JSONObject(object);
-         } catch(Exception exception) {
-             return null;
-         }
-     }
-
-     
-     /**
-      * Write the contents of the JSONObject as JSON text to a writer.
-      * For compactness, no whitespace is added.
-      * <p>
-      * Warning: This method assumes that the data structure is acyclical.
-      *
-      * @return The writer.
-      * @throws JSONException
-      */
-     public Writer write(Writer writer) throws JSONException {
-        try {
-            boolean  b = false;
-            Iterator keys = keys();
-            writer.write('{');
-
-            while (keys.hasNext()) {
-                if (b) {
-                    writer.write(',');
-                }
-                Object k = keys.next();
-                writer.write(quote(k.toString()));
-                writer.write(':');
-                Object v = this.map.get(k);
-                if (v instanceof JSONObject) {
-                    ((JSONObject)v).write(writer);
-                } else if (v instanceof JSONArray) {
-                    ((JSONArray)v).write(writer);
-                } else {
-                    writer.write(valueToString(v));
-                }
-                b = true;
-            }
-            writer.write('}');
-            return writer;
-        } catch (IOException exception) {
-            throw new JSONException(exception);
-        }
-     }
-}
\ No newline at end of file
diff --git a/mobileapp/src/org/json/JSONString.java b/mobileapp/src/org/json/JSONString.java
deleted file mode 100755
index 17f4384..0000000
--- a/mobileapp/src/org/json/JSONString.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.json;
-/**
- * The <code>JSONString</code> interface allows a <code>toJSONString()</code> 
- * method so that a class can change the behavior of 
- * <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>,
- * and <code>JSONWriter.value(</code>Object<code>)</code>. The 
- * <code>toJSONString</code> method will be used instead of the default behavior 
- * of using the Object's <code>toString()</code> method and quoting the result.
- */
-public interface JSONString {
-	/**
-	 * The <code>toJSONString</code> method allows a class to produce its own JSON 
-	 * serialization. 
-	 * 
-	 * @return A strictly syntactically correct JSON text.
-	 */
-	public String toJSONString();
-}
diff --git a/mobileapp/src/org/json/JSONStringer.java b/mobileapp/src/org/json/JSONStringer.java
deleted file mode 100755
index 25c2e5d..0000000
--- a/mobileapp/src/org/json/JSONStringer.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.json;
-
-/*
-Copyright (c) 2006 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-import java.io.StringWriter;
-
-/**
- * JSONStringer provides a quick and convenient way of producing JSON text.
- * The texts produced strictly conform to JSON syntax rules. No whitespace is
- * added, so the results are ready for transmission or storage. Each instance of
- * JSONStringer can produce one JSON text.
- * <p>
- * A JSONStringer instance provides a <code>value</code> method for appending
- * values to the
- * text, and a <code>key</code>
- * method for adding keys before values in objects. There are <code>array</code>
- * and <code>endArray</code> methods that make and bound array values, and
- * <code>object</code> and <code>endObject</code> methods which make and bound
- * object values. All of these methods return the JSONWriter instance,
- * permitting cascade style. For example, <pre>
- * myString = new JSONStringer()
- *     .object()
- *         .key("JSON")
- *         .value("Hello, World!")
- *     .endObject()
- *     .toString();</pre> which produces the string <pre>
- * {"JSON":"Hello, World!"}</pre>
- * <p>
- * The first method called must be <code>array</code> or <code>object</code>.
- * There are no methods for adding commas or colons. JSONStringer adds them for
- * you. Objects and arrays can be nested up to 20 levels deep.
- * <p>
- * This can sometimes be easier than using a JSONObject to build a string.
- * @author JSON.org
- * @version 2008-09-18
- */
-public class JSONStringer extends JSONWriter {
-    /**
-     * Make a fresh JSONStringer. It can be used to build one JSON text.
-     */
-    public JSONStringer() {
-        super(new StringWriter());
-    }
-
-    /**
-     * Return the JSON text. This method is used to obtain the product of the
-     * JSONStringer instance. It will return <code>null</code> if there was a
-     * problem in the construction of the JSON text (such as the calls to
-     * <code>array</code> were not properly balanced with calls to
-     * <code>endArray</code>).
-     * @return The JSON text.
-     */
-    public String toString() {
-        return this.mode == 'd' ? this.writer.toString() : null;
-    }
-}
diff --git a/mobileapp/src/org/json/JSONTokener.java b/mobileapp/src/org/json/JSONTokener.java
deleted file mode 100755
index fe52f31..0000000
--- a/mobileapp/src/org/json/JSONTokener.java
+++ /dev/null
@@ -1,435 +0,0 @@
-package org.json;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-
-/*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-/**
- * A JSONTokener takes a source string and extracts characters and tokens from
- * it. It is used by the JSONObject and JSONArray constructors to parse
- * JSON source strings.
- * @author JSON.org
- * @version 2010-02-02
- */
-public class JSONTokener {
-
-    private int 	character;
-	private boolean eof;
-    private int 	index;
-    private int 	line;
-    private char 	previous;
-    private Reader 	reader;
-    private boolean usePrevious;
-
-
-    /**
-     * Construct a JSONTokener from a reader.
-     *
-     * @param reader     A reader.
-     */
-    public JSONTokener(Reader reader) {
-        this.reader = reader.markSupported() ? 
-        		reader : new BufferedReader(reader);
-        this.eof = false;
-        this.usePrevious = false;
-        this.previous = 0;
-        this.index = 0;
-        this.character = 1;
-        this.line = 1;
-    }
-
-
-    /**
-     * Construct a JSONTokener from a string.
-     *
-     * @param s     A source string.
-     */
-    public JSONTokener(String s) {
-        this(new StringReader(s));
-    }
-
-
-    /**
-     * Back up one character. This provides a sort of lookahead capability,
-     * so that you can test for a digit or letter before attempting to parse
-     * the next number or identifier.
-     */
-    public void back() throws JSONException {
-        if (usePrevious || index <= 0) {
-            throw new JSONException("Stepping back two steps is not supported");
-        }
-        this.index -= 1;
-        this.character -= 1;
-        this.usePrevious = true;
-        this.eof = false;
-    }
-
-
-    /**
-     * Get the hex value of a character (base16).
-     * @param c A character between '0' and '9' or between 'A' and 'F' or
-     * between 'a' and 'f'.
-     * @return  An int between 0 and 15, or -1 if c was not a hex digit.
-     */
-    public static int dehexchar(char c) {
-        if (c >= '0' && c <= '9') {
-            return c - '0';
-        }
-        if (c >= 'A' && c <= 'F') {
-            return c - ('A' - 10);
-        }
-        if (c >= 'a' && c <= 'f') {
-            return c - ('a' - 10);
-        }
-        return -1;
-    }
-    
-    public boolean end() {
-    	return eof && !usePrevious;    	
-    }
-
-
-    /**
-     * Determine if the source string still contains characters that next()
-     * can consume.
-     * @return true if not yet at the end of the source.
-     */
-    public boolean more() throws JSONException {
-        next();
-        if (end()) {
-            return false;
-        } 
-        back();
-        return true;
-    }
-
-
-    /**
-     * Get the next character in the source string.
-     *
-     * @return The next character, or 0 if past the end of the source string.
-     */
-    public char next() throws JSONException {
-        int c;
-        if (this.usePrevious) {
-        	this.usePrevious = false;
-            c = this.previous;
-        } else {
-	        try {
-	            c = this.reader.read();
-	        } catch (IOException exception) {
-	            throw new JSONException(exception);
-	        }
-	
-	        if (c <= 0) { // End of stream
-	        	this.eof = true;
-	        	c = 0;
-	        } 
-        }
-    	this.index += 1;
-    	if (this.previous == '\r') {
-    		this.line += 1;
-    		this.character = c == '\n' ? 0 : 1;
-    	} else if (c == '\n') {
-    		this.line += 1;
-    		this.character = 0;
-    	} else {
-    		this.character += 1;
-    	}
-    	this.previous = (char) c;
-        return this.previous;
-    }
-
-
-    /**
-     * Consume the next character, and check that it matches a specified
-     * character.
-     * @param c The character to match.
-     * @return The character.
-     * @throws JSONException if the character does not match.
-     */
-    public char next(char c) throws JSONException {
-        char n = next();
-        if (n != c) {
-            throw syntaxError("Expected '" + c + "' and instead saw '" +
-                    n + "'");
-        }
-        return n;
-    }
-
-
-    /**
-     * Get the next n characters.
-     *
-     * @param n     The number of characters to take.
-     * @return      A string of n characters.
-     * @throws JSONException
-     *   Substring bounds error if there are not
-     *   n characters remaining in the source string.
-     */
-     public String next(int n) throws JSONException {
-         if (n == 0) {
-             return "";
-         }
-
-         char[] buffer = new char[n];
-         int pos = 0;
-
-         while (pos < n) {
-             buffer[pos] = next();
-             if (end()) {
-                 throw syntaxError("Substring bounds error");                 
-             }
-             pos += 1;
-         }
-         return new String(buffer);
-     }
-
-
-    /**
-     * Get the next char in the string, skipping whitespace.
-     * @throws JSONException
-     * @return  A character, or 0 if there are no more characters.
-     */
-    public char nextClean() throws JSONException {
-        for (;;) {
-            char c = next();
-            if (c == 0 || c > ' ') {
-                return c;
-            }
-        }
-    }
-
-
-    /**
-     * Return the characters up to the next close quote character.
-     * Backslash processing is done. The formal JSON format does not
-     * allow strings in single quotes, but an implementation is allowed to
-     * accept them.
-     * @param quote The quoting character, either
-     *      <code>"</code>&nbsp;<small>(double quote)</small> or
-     *      <code>'</code>&nbsp;<small>(single quote)</small>.
-     * @return      A String.
-     * @throws JSONException Unterminated string.
-     */
-    public String nextString(char quote) throws JSONException {
-        char c;
-        StringBuffer sb = new StringBuffer();
-        for (;;) {
-            c = next();
-            switch (c) {
-            case 0:
-            case '\n':
-            case '\r':
-                throw syntaxError("Unterminated string");
-            case '\\':
-                c = next();
-                switch (c) {
-                case 'b':
-                    sb.append('\b');
-                    break;
-                case 't':
-                    sb.append('\t');
-                    break;
-                case 'n':
-                    sb.append('\n');
-                    break;
-                case 'f':
-                    sb.append('\f');
-                    break;
-                case 'r':
-                    sb.append('\r');
-                    break;
-                case 'u':
-                    sb.append((char)Integer.parseInt(next(4), 16));
-                    break;
-                case '"':
-                case '\'':
-                case '\\':
-                case '/':
-                	sb.append(c);
-                	break;
-                default:
-                    throw syntaxError("Illegal escape.");
-                }
-                break;
-            default:
-                if (c == quote) {
-                    return sb.toString();
-                }
-                sb.append(c);
-            }
-        }
-    }
-
-
-    /**
-     * Get the text up but not including the specified character or the
-     * end of line, whichever comes first.
-     * @param  d A delimiter character.
-     * @return   A string.
-     */
-    public String nextTo(char d) throws JSONException {
-        StringBuffer sb = new StringBuffer();
-        for (;;) {
-            char c = next();
-            if (c == d || c == 0 || c == '\n' || c == '\r') {
-                if (c != 0) {
-                    back();
-                }
-                return sb.toString().trim();
-            }
-            sb.append(c);
-        }
-    }
-
-
-    /**
-     * Get the text up but not including one of the specified delimiter
-     * characters or the end of line, whichever comes first.
-     * @param delimiters A set of delimiter characters.
-     * @return A string, trimmed.
-     */
-    public String nextTo(String delimiters) throws JSONException {
-        char c;
-        StringBuffer sb = new StringBuffer();
-        for (;;) {
-            c = next();
-            if (delimiters.indexOf(c) >= 0 || c == 0 ||
-                    c == '\n' || c == '\r') {
-                if (c != 0) {
-                    back();
-                }
-                return sb.toString().trim();
-            }
-            sb.append(c);
-        }
-    }
-
-
-    /**
-     * Get the next value. The value can be a Boolean, Double, Integer,
-     * JSONArray, JSONObject, Long, or String, or the JSONObject.NULL object.
-     * @throws JSONException If syntax error.
-     *
-     * @return An object.
-     */
-    public Object nextValue() throws JSONException {
-        char c = nextClean();
-        String s;
-
-        switch (c) {
-            case '"':
-            case '\'':
-                return nextString(c);
-            case '{':
-                back();
-                return new JSONObject(this);
-            case '[':
-            case '(':
-                back();
-                return new JSONArray(this);
-        }
-
-        /*
-         * Handle unquoted text. This could be the values true, false, or
-         * null, or it can be a number. An implementation (such as this one)
-         * is allowed to also accept non-standard forms.
-         *
-         * Accumulate characters until we reach the end of the text or a
-         * formatting character.
-         */
-
-        StringBuffer sb = new StringBuffer();
-        while (c >= ' ' && ",:]}/\\\"[{;=#".indexOf(c) < 0) {
-            sb.append(c);
-            c = next();
-        }
-        back();
-
-        s = sb.toString().trim();
-        if (s.equals("")) {
-            throw syntaxError("Missing value");
-        }
-        return JSONObject.stringToValue(s);
-    }
-
-
-    /**
-     * Skip characters until the next character is the requested character.
-     * If the requested character is not found, no characters are skipped.
-     * @param to A character to skip to.
-     * @return The requested character, or zero if the requested character
-     * is not found.
-     */
-    public char skipTo(char to) throws JSONException {
-        char c;
-        try {
-            int startIndex = this.index;
-            int startCharacter = this.character;
-            int startLine = this.line;
-            reader.mark(Integer.MAX_VALUE);
-            do {
-                c = next();
-                if (c == 0) {
-                    reader.reset();
-                    this.index = startIndex;
-                    this.character = startCharacter;
-                    this.line = startLine;
-                    return c;
-                }
-            } while (c != to);
-        } catch (IOException exc) {
-            throw new JSONException(exc);
-        }
-
-        back();
-        return c;
-    }
-    
-
-    /**
-     * Make a JSONException to signal a syntax error.
-     *
-     * @param message The error message.
-     * @return  A JSONException object, suitable for throwing
-     */
-    public JSONException syntaxError(String message) {
-        return new JSONException(message + toString());
-    }
-
-
-    /**
-     * Make a printable string of this JSONTokener.
-     *
-     * @return " at {index} [character {character} line {line}]"
-     */
-    public String toString() {
-        return " at " + index + " [character " + this.character + " line " + this.line + "]";
-    }
-}
\ No newline at end of file
diff --git a/mobileapp/src/org/json/JSONWriter.java b/mobileapp/src/org/json/JSONWriter.java
deleted file mode 100755
index 3622a5b..0000000
--- a/mobileapp/src/org/json/JSONWriter.java
+++ /dev/null
@@ -1,323 +0,0 @@
-package org.json;
-
-import java.io.IOException;
-import java.io.Writer;
-
-/*
-Copyright (c) 2006 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-/**
- * JSONWriter provides a quick and convenient way of producing JSON text.
- * The texts produced strictly conform to JSON syntax rules. No whitespace is
- * added, so the results are ready for transmission or storage. Each instance of
- * JSONWriter can produce one JSON text.
- * <p>
- * A JSONWriter instance provides a <code>value</code> method for appending
- * values to the
- * text, and a <code>key</code>
- * method for adding keys before values in objects. There are <code>array</code>
- * and <code>endArray</code> methods that make and bound array values, and
- * <code>object</code> and <code>endObject</code> methods which make and bound
- * object values. All of these methods return the JSONWriter instance,
- * permitting a cascade style. For example, <pre>
- * new JSONWriter(myWriter)
- *     .object()
- *         .key("JSON")
- *         .value("Hello, World!")
- *     .endObject();</pre> which writes <pre>
- * {"JSON":"Hello, World!"}</pre>
- * <p>
- * The first method called must be <code>array</code> or <code>object</code>.
- * There are no methods for adding commas or colons. JSONWriter adds them for
- * you. Objects and arrays can be nested up to 20 levels deep.
- * <p>
- * This can sometimes be easier than using a JSONObject to build a string.
- * @author JSON.org
- * @version 2010-03-11
- */
-public class JSONWriter {
-    private static final int maxdepth = 20;
-
-    /**
-     * The comma flag determines if a comma should be output before the next
-     * value.
-     */
-    private boolean comma;
-
-    /**
-     * The current mode. Values:
-     * 'a' (array),
-     * 'd' (done),
-     * 'i' (initial),
-     * 'k' (key),
-     * 'o' (object).
-     */
-    protected char mode;
-
-    /**
-     * The object/array stack.
-     */
-    private JSONObject stack[];
-
-    /**
-     * The stack top index. A value of 0 indicates that the stack is empty.
-     */
-    private int top;
-
-    /**
-     * The writer that will receive the output.
-     */
-    protected Writer writer;
-
-    /**
-     * Make a fresh JSONWriter. It can be used to build one JSON text.
-     */
-    public JSONWriter(Writer w) {
-        this.comma = false;
-        this.mode = 'i';
-        this.stack = new JSONObject[maxdepth];
-        this.top = 0;
-        this.writer = w;
-    }
-
-    /**
-     * Append a value.
-     * @param s A string value.
-     * @return this
-     * @throws JSONException If the value is out of sequence.
-     */
-    private JSONWriter append(String s) throws JSONException {
-        if (s == null) {
-            throw new JSONException("Null pointer");
-        }
-        if (this.mode == 'o' || this.mode == 'a') {
-            try {
-                if (this.comma && this.mode == 'a') {
-                    this.writer.write(',');
-                }
-                this.writer.write(s);
-            } catch (IOException e) {
-                throw new JSONException(e);
-            }
-            if (this.mode == 'o') {
-                this.mode = 'k';
-            }
-            this.comma = true;
-            return this;
-        }
-        throw new JSONException("Value out of sequence.");
-    }
-
-    /**
-     * Begin appending a new array. All values until the balancing
-     * <code>endArray</code> will be appended to this array. The
-     * <code>endArray</code> method must be called to mark the array's end.
-     * @return this
-     * @throws JSONException If the nesting is too deep, or if the object is
-     * started in the wrong place (for example as a key or after the end of the
-     * outermost array or object).
-     */
-    public JSONWriter array() throws JSONException {
-        if (this.mode == 'i' || this.mode == 'o' || this.mode == 'a') {
-            this.push(null);
-            this.append("[");
-            this.comma = false;
-            return this;
-        }
-        throw new JSONException("Misplaced array.");
-    }
-
-    /**
-     * End something.
-     * @param m Mode
-     * @param c Closing character
-     * @return this
-     * @throws JSONException If unbalanced.
-     */
-    private JSONWriter end(char m, char c) throws JSONException {
-        if (this.mode != m) {
-            throw new JSONException(m == 'a' ? "Misplaced endArray." : 
-            		"Misplaced endObject.");
-        }
-        this.pop(m);
-        try {
-            this.writer.write(c);
-        } catch (IOException e) {
-            throw new JSONException(e);
-        }
-        this.comma = true;
-        return this;
-    }
-
-    /**
-     * End an array. This method most be called to balance calls to
-     * <code>array</code>.
-     * @return this
-     * @throws JSONException If incorrectly nested.
-     */
-    public JSONWriter endArray() throws JSONException {
-        return this.end('a', ']');
-    }
-
-    /**
-     * End an object. This method most be called to balance calls to
-     * <code>object</code>.
-     * @return this
-     * @throws JSONException If incorrectly nested.
-     */
-    public JSONWriter endObject() throws JSONException {
-        return this.end('k', '}');
-    }
-
-    /**
-     * Append a key. The key will be associated with the next value. In an
-     * object, every value must be preceded by a key.
-     * @param s A key string.
-     * @return this
-     * @throws JSONException If the key is out of place. For example, keys
-     *  do not belong in arrays or if the key is null.
-     */
-    public JSONWriter key(String s) throws JSONException {
-        if (s == null) {
-            throw new JSONException("Null key.");
-        }
-        if (this.mode == 'k') {
-            try {
-                stack[top - 1].putOnce(s, Boolean.TRUE);
-                if (this.comma) {
-                    this.writer.write(',');
-                }
-                this.writer.write(JSONObject.quote(s));
-                this.writer.write(':');
-                this.comma = false;
-                this.mode = 'o';
-                return this;
-            } catch (IOException e) {
-                throw new JSONException(e);
-            }
-        }
-        throw new JSONException("Misplaced key.");
-    }
-
-
-    /**
-     * Begin appending a new object. All keys and values until the balancing
-     * <code>endObject</code> will be appended to this object. The
-     * <code>endObject</code> method must be called to mark the object's end.
-     * @return this
-     * @throws JSONException If the nesting is too deep, or if the object is
-     * started in the wrong place (for example as a key or after the end of the
-     * outermost array or object).
-     */
-    public JSONWriter object() throws JSONException {
-        if (this.mode == 'i') {
-            this.mode = 'o';
-        }
-        if (this.mode == 'o' || this.mode == 'a') {
-            this.append("{");
-            this.push(new JSONObject());
-            this.comma = false;
-            return this;
-        }
-        throw new JSONException("Misplaced object.");
-
-    }
-
-
-    /**
-     * Pop an array or object scope.
-     * @param c The scope to close.
-     * @throws JSONException If nesting is wrong.
-     */
-    private void pop(char c) throws JSONException {
-        if (this.top <= 0) {
-            throw new JSONException("Nesting error.");
-        }
-        char m = this.stack[this.top - 1] == null ? 'a' : 'k';
-        if (m != c) {
-            throw new JSONException("Nesting error.");
-        }
-        this.top -= 1;
-        this.mode = this.top == 0 ? 'd' : this.stack[this.top - 1] == null ? 'a' : 'k';
-    }
-
-    /**
-     * Push an array or object scope.
-     * @param c The scope to open.
-     * @throws JSONException If nesting is too deep.
-     */
-    private void push(JSONObject jo) throws JSONException {
-        if (this.top >= maxdepth) {
-            throw new JSONException("Nesting too deep.");
-        }
-        this.stack[this.top] = jo;
-        this.mode = jo == null ? 'a' : 'k';
-        this.top += 1;
-    }
-
-
-    /**
-     * Append either the value <code>true</code> or the value
-     * <code>false</code>.
-     * @param b A boolean.
-     * @return this
-     * @throws JSONException
-     */
-    public JSONWriter value(boolean b) throws JSONException {
-        return this.append(b ? "true" : "false");
-    }
-
-    /**
-     * Append a double value.
-     * @param d A double.
-     * @return this
-     * @throws JSONException If the number is not finite.
-     */
-    public JSONWriter value(double d) throws JSONException {
-        return this.value(new Double(d));
-    }
-
-    /**
-     * Append a long value.
-     * @param l A long.
-     * @return this
-     * @throws JSONException
-     */
-    public JSONWriter value(long l) throws JSONException {
-        return this.append(Long.toString(l));
-    }
-
-
-    /**
-     * Append an object value.
-     * @param o The object to append. It can be null, or a Boolean, Number,
-     *   String, JSONObject, or JSONArray, or an object with a toJSONString()
-     *   method.
-     * @return this
-     * @throws JSONException If the value is out of sequence.
-     */
-    public JSONWriter value(Object o) throws JSONException {
-        return this.append(JSONObject.valueToString(o));
-    }
-}
diff --git a/mobileapp/src/org/json/Test.java b/mobileapp/src/org/json/Test.java
deleted file mode 100755
index 8cbb22a..0000000
--- a/mobileapp/src/org/json/Test.java
+++ /dev/null
@@ -1,678 +0,0 @@
-package org.json;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.io.StringWriter;
-
-/**
- * Test class. This file is not formally a member of the org.json library.
- * It is just a casual test tool.
- */
-public class Test {
-	
-    /**
-     * Entry point.
-     * @param args
-     */
-    public static void main(String args[]) {
-        Iterator it;
-        JSONArray a;
-        JSONObject j;
-        JSONStringer jj;
-        Object o;
-        String s;
-        
-/** 
- *  Obj is a typical class that implements JSONString. It also
- *  provides some beanie methods that can be used to 
- *  construct a JSONObject. It also demonstrates constructing
- *  a JSONObject with an array of names.
- */
-        class Obj implements JSONString {
-        	public String aString;
-        	public double aNumber;
-        	public boolean aBoolean;
-        	
-            public Obj(String string, double n, boolean b) {
-                this.aString = string;
-                this.aNumber = n;
-                this.aBoolean = b;
-            }
-            
-            public double getNumber() {
-            	return this.aNumber;
-            }
-            
-            public String getString() {
-            	return this.aString;
-            }
-            
-            public boolean isBoolean() {
-            	return this.aBoolean;
-            }
-            
-            public String getBENT() {
-            	return "All uppercase key";
-            }
-            
-            public String getX() {
-            	return "x";
-            }
-            
-            public String toJSONString() {
-            	return "{" + JSONObject.quote(this.aString) + ":" + 
-            	JSONObject.doubleToString(this.aNumber) + "}";
-            }            
-            public String toString() {
-            	return this.getString() + " " + this.getNumber() + " " + 
-            			this.isBoolean() + "." + this.getBENT() + " " + this.getX();
-            }
-        }      
-        
-
-    	Obj obj = new Obj("A beany object", 42, true);
-        
-        try {     
-            s = "[0.1]";
-            a = new JSONArray(s);
-            System.out.println(a.toString());
-            System.out.println("");
-            
-            j = XML.toJSONObject("<![CDATA[This is a collection of test patterns and examples for org.json.]]>  Ignore the stuff past the end.  ");
-            System.out.println(j.toString());
-            System.out.println("");
-            
-            j = new JSONObject();
-            o = null;
-            j.put("booga", o);
-            j.put("wooga", JSONObject.NULL);
-            System.out.println(j.toString());
-            System.out.println("");
-           
-            j = new JSONObject();
-            j.increment("two");
-            j.increment("two");
-            System.out.println(j.toString());
-            System.out.println("");
-            
-            
-            s = "<test><blank></blank><empty/></test>";
-            j = XML.toJSONObject(s);
-            System.out.println(j.toString(2));
-            System.out.println(XML.toString(j));
-            System.out.println("");
-
-            s = "{     \"list of lists\" : [         [1, 2, 3],         [4, 5, 6],     ] }";
-            j = new JSONObject(s);
-            System.out.println(j.toString(4));
-            System.out.println(XML.toString(j));
-                    
-            s = "<recipe name=\"bread\" prep_time=\"5 mins\" cook_time=\"3 hours\"> <title>Basic bread</title> <ingredient amount=\"8\" unit=\"dL\">Flour</ingredient> <ingredient amount=\"10\" unit=\"grams\">Yeast</ingredient> <ingredient amount=\"4\" unit=\"dL\" state=\"warm\">Water</ingredient> <ingredient amount=\"1\" unit=\"teaspoon\">Salt</ingredient> <instructions> <step>Mix all ingredients together.</step> <step>Knead thoroughly.</step> <step>Cover with a cloth, and leave for one hour in warm room.</step> <step>Knead again.</step> <step>Place in a bread baking tin.</step> <step>Cover with a cloth, and leave for one hour in warm room.</step> <step>Bake in the oven at 180(degrees)C for 30 minutes.</step> </instructions> </recipe> ";
-            j = XML.toJSONObject(s);
-            System.out.println(j.toString(4));
-            System.out.println();
-            
-            j = JSONML.toJSONObject(s);
-            System.out.println(j.toString());
-            System.out.println(JSONML.toString(j));
-            System.out.println();
-            
-            a = JSONML.toJSONArray(s);
-            System.out.println(a.toString(4));
-            System.out.println(JSONML.toString(a));
-            System.out.println();
-            
-            s = "<div id=\"demo\" class=\"JSONML\"><p>JSONML is a transformation between <b>JSON</b> and <b>XML</b> that preserves ordering of document features.</p><p>JSONML can work with JSON arrays or JSON objects.</p><p>Three<br/>little<br/>words</p></div>";
-            j = JSONML.toJSONObject(s);
-            System.out.println(j.toString(4));
-            System.out.println(JSONML.toString(j));
-            System.out.println();
-            
-            a = JSONML.toJSONArray(s);
-            System.out.println(a.toString(4));
-            System.out.println(JSONML.toString(a));
-            System.out.println();
-            
-            s = "<person created=\"2006-11-11T19:23\" modified=\"2006-12-31T23:59\">\n <firstName>Robert</firstName>\n <lastName>Smith</lastName>\n <address type=\"home\">\n <street>12345 Sixth Ave</street>\n <city>Anytown</city>\n <state>CA</state>\n <postalCode>98765-4321</postalCode>\n </address>\n </person>";
-            j = XML.toJSONObject(s);
-            System.out.println(j.toString(4));
-            
-            j = new JSONObject(obj);
-            System.out.println(j.toString());
-            
-            s = "{ \"entity\": { \"imageURL\": \"\", \"name\": \"IXXXXXXXXXXXXX\", \"id\": 12336, \"ratingCount\": null, \"averageRating\": null } }";
-            j = new JSONObject(s);
-            System.out.println(j.toString(2));
-
-            jj = new JSONStringer();
-            s = jj
-	            .object()
-	                .key("single")
-	                .value("MARIE HAA'S")
-	                .key("Johnny")
-	                .value("MARIE HAA\\'S")
-	                .key("foo")
-	                .value("bar")
-	                .key("baz")
-	                .array()
-	                    .object()
-	                        .key("quux")
-	                        .value("Thanks, Josh!")
-	                    .endObject()
-	                .endArray()
-	                .key("obj keys")
-	                .value(JSONObject.getNames(obj))
-	            .endObject()
-            .toString();
-            System.out.println(s);
-
-            System.out.println(new JSONStringer()
-                .object()
-                	.key("a")
-                	.array()
-                		.array()
-                			.array()
-                				.value("b")
-                            .endArray()
-                        .endArray()
-                    .endArray()
-                .endObject()
-                .toString());
-
-            jj = new JSONStringer();
-            jj.array();
-            jj.value(1);
-            jj.array();
-            jj.value(null);
-            jj.array();
-            jj.object();
-            jj.key("empty-array").array().endArray();
-            jj.key("answer").value(42);
-            jj.key("null").value(null);
-            jj.key("false").value(false);
-            jj.key("true").value(true);
-            jj.key("big").value(123456789e+88);
-            jj.key("small").value(123456789e-88);
-            jj.key("empty-object").object().endObject();
-            jj.key("long");
-            jj.value(9223372036854775807L);
-            jj.endObject();
-            jj.value("two");
-            jj.endArray();
-            jj.value(true);
-            jj.endArray();
-            jj.value(98.6);
-            jj.value(-100.0);
-            jj.object();
-            jj.endObject();
-            jj.object();
-            jj.key("one");
-            jj.value(1.00);
-            jj.endObject();
-            jj.value(obj);
-            jj.endArray();
-            System.out.println(jj.toString());
-
-            System.out.println(new JSONArray(jj.toString()).toString(4));
-
-        	int ar[] = {1, 2, 3};
-        	JSONArray ja = new JSONArray(ar);
-        	System.out.println(ja.toString());
-        	
-        	String sa[] = {"aString", "aNumber", "aBoolean"};            
-            j = new JSONObject(obj, sa);
-            j.put("Testing JSONString interface", obj);
-            System.out.println(j.toString(4));          
-            
-            j = new JSONObject("{slashes: '///', closetag: '</script>', backslash:'\\\\', ei: {quotes: '\"\\''},eo: {a: '\"quoted\"', b:\"don't\"}, quotes: [\"'\", '\"']}");
-            System.out.println(j.toString(2));
-            System.out.println(XML.toString(j));
-            System.out.println("");
-
-            j = new JSONObject(
-                "{foo: [true, false,9876543210,    0.0, 1.00000001,  1.000000000001, 1.00000000000000001," +
-                " .00000000000000001, 2.00, 0.1, 2e100, -32,[],{}, \"string\"], " +
-                "  to   : null, op : 'Good'," +
-                "ten:10} postfix comment");
-            j.put("String", "98.6");
-            j.put("JSONObject", new JSONObject());
-            j.put("JSONArray", new JSONArray());
-            j.put("int", 57);
-            j.put("double", 123456789012345678901234567890.);
-            j.put("true", true);
-            j.put("false", false);
-            j.put("null", JSONObject.NULL);
-            j.put("bool", "true");
-            j.put("zero", -0.0);
-            j.put("\\u2028", "\u2028");
-            j.put("\\u2029", "\u2029");
-            a = j.getJSONArray("foo");
-            a.put(666);
-            a.put(2001.99);
-            a.put("so \"fine\".");
-            a.put("so <fine>.");
-            a.put(true);
-            a.put(false);
-            a.put(new JSONArray());
-            a.put(new JSONObject());
-            j.put("keys", JSONObject.getNames(j));
-            System.out.println(j.toString(4));
-            System.out.println(XML.toString(j));
-
-            System.out.println("String: " + j.getDouble("String"));
-            System.out.println("  bool: " + j.getBoolean("bool"));
-            System.out.println("    to: " + j.getString("to"));
-            System.out.println("  true: " + j.getString("true"));
-            System.out.println("   foo: " + j.getJSONArray("foo"));
-            System.out.println("    op: " + j.getString("op"));
-            System.out.println("   ten: " + j.getInt("ten"));
-            System.out.println("  oops: " + j.optBoolean("oops"));
-
-            s = "<xml one = 1 two=' \"2\" '><five></five>First \u0009&lt;content&gt;<five></five> This is \"content\". <three>  3  </three>JSON does not preserve the sequencing of elements and contents.<three>  III  </three>  <three>  T H R E E</three><four/>Content text is an implied structure in XML. <six content=\"6\"/>JSON does not have implied structure:<seven>7</seven>everything is explicit.<![CDATA[CDATA blocks<are><supported>!]]></xml>";
-            j = XML.toJSONObject(s);
-            System.out.println(j.toString(2));
-            System.out.println(XML.toString(j));
-            System.out.println("");
-            
-            ja = JSONML.toJSONArray(s);
-            System.out.println(ja.toString(4));
-            System.out.println(JSONML.toString(ja));
-            System.out.println("");
-            
-            s = "<xml do='0'>uno<a re='1' mi='2'>dos<b fa='3'/>tres<c>true</c>quatro</a>cinqo<d>seis<e/></d></xml>";
-            ja = JSONML.toJSONArray(s);
-            System.out.println(ja.toString(4));
-            System.out.println(JSONML.toString(ja));
-            System.out.println("");
-
-            s = "<mapping><empty/>   <class name = \"Customer\">      <field name = \"ID\" type = \"string\">         <bind-xml name=\"ID\" node=\"attribute\"/>      </field>      <field name = \"FirstName\" type = \"FirstName\"/>      <field name = \"MI\" type = \"MI\"/>      <field name = \"LastName\" type = \"LastName\"/>   </class>   <class name = \"FirstName\">      <field name = \"text\">         <bind-xml name = \"text\" node = \"text\"/>      </field>   </class>   <class name = \"MI\">      <field name = \"text\">         <bind-xml name = \"text\" node = \"text\"/>      </field>   </class>   <class name = \"LastName\">      <field name = \"text\">         <bind-xml name = \"text\" node = \"text\"/>      </field>   </class></mapping>";
-            j = XML.toJSONObject(s);
-
-            System.out.println(j.toString(2));
-            System.out.println(XML.toString(j));
-            System.out.println("");
-            ja = JSONML.toJSONArray(s);
-            System.out.println(ja.toString(4));
-            System.out.println(JSONML.toString(ja));
-            System.out.println("");
-
-            j = XML.toJSONObject("<?xml version=\"1.0\" ?><Book Author=\"Anonymous\"><Title>Sample Book</Title><Chapter id=\"1\">This is chapter 1. It is not very long or interesting.</Chapter><Chapter id=\"2\">This is chapter 2. Although it is longer than chapter 1, it is not any more interesting.</Chapter></Book>");
-            System.out.println(j.toString(2));
-            System.out.println(XML.toString(j));
-            System.out.println("");
-
-            j = XML.toJSONObject("<!DOCTYPE bCard 'http://www.cs.caltech.edu/~adam/schemas/bCard'><bCard><?xml default bCard        firstname = ''        lastname  = '' company   = '' email = '' homepage  = ''?><bCard        firstname = 'Rohit'        lastname  = 'Khare'        company   = 'MCI'        email     = 'khare@mci.net'        homepage  = 'http://pest.w3.org/'/><bCard        firstname = 'Adam'        lastname  = 'Rifkin'        company   = 'Caltech Infospheres Project'        email     = 'adam@cs.caltech.edu'        homepage  = 'http://www.cs.caltech.edu/~adam/'/></bCard>");
-            System.out.println(j.toString(2));
-            System.out.println(XML.toString(j));
-            System.out.println("");
-
-            j = XML.toJSONObject("<?xml version=\"1.0\"?><customer>    <firstName>        <text>Fred</text>    </firstName>    <ID>fbs0001</ID>    <lastName> <text>Scerbo</text>    </lastName>    <MI>        <text>B</text>    </MI></customer>");
-            System.out.println(j.toString(2));
-            System.out.println(XML.toString(j));
-            System.out.println("");
-
-            j = XML.toJSONObject("<!ENTITY tp-address PUBLIC '-//ABC University::Special Collections Library//TEXT (titlepage: name and address)//EN' 'tpspcoll.sgm'><list type='simple'><head>Repository Address </head><item>Special Collections Library</item><item>ABC University</item><item>Main Library, 40 Circle Drive</item><item>Ourtown, Pennsylvania</item><item>17654 USA</item></list>");
-            System.out.println(j.toString());
-            System.out.println(XML.toString(j));
-            System.out.println("");
-
-            j = XML.toJSONObject("<test intertag status=ok><empty/>deluxe<blip sweet=true>&amp;&quot;toot&quot;&toot;&#x41;</blip><x>eks</x><w>bonus</w><w>bonus2</w></test>");
-            System.out.println(j.toString(2));
-            System.out.println(XML.toString(j));
-            System.out.println("");
-
-            j = HTTP.toJSONObject("GET / HTTP/1.0\nAccept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*\nAccept-Language: en-us\nUser-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows 98; Win 9x 4.90; T312461; Q312461)\nHost: www.nokko.com\nConnection: keep-alive\nAccept-encoding: gzip, deflate\n");
-            System.out.println(j.toString(2));
-            System.out.println(HTTP.toString(j));
-            System.out.println("");
-
-            j = HTTP.toJSONObject("HTTP/1.1 200 Oki Doki\nDate: Sun, 26 May 2002 17:38:52 GMT\nServer: Apache/1.3.23 (Unix) mod_perl/1.26\nKeep-Alive: timeout=15, max=100\nConnection: Keep-Alive\nTransfer-Encoding: chunked\nContent-Type: text/html\n");
-            System.out.println(j.toString(2));
-            System.out.println(HTTP.toString(j));
-            System.out.println("");
-
-            j = new JSONObject("{nix: null, nux: false, null: 'null', 'Request-URI': '/', Method: 'GET', 'HTTP-Version': 'HTTP/1.0'}");
-            System.out.println(j.toString(2));
-            System.out.println("isNull: " + j.isNull("nix"));
-            System.out.println("   has: " + j.has("nix"));
-            System.out.println(XML.toString(j));
-            System.out.println(HTTP.toString(j));
-            System.out.println("");
-
-            j = XML.toJSONObject("<?xml version='1.0' encoding='UTF-8'?>"+"\n\n"+"<SOAP-ENV:Envelope"+
-              " xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\""+
-              " xmlns:xsi=\"http://www.w3.org/1999/XMLSchema-instance\""+
-              " xmlns:xsd=\"http://www.w3.org/1999/XMLSchema\">"+
-              "<SOAP-ENV:Body><ns1:doGoogleSearch"+
-              " xmlns:ns1=\"urn:GoogleSearch\""+
-              " SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"+
-              "<key xsi:type=\"xsd:string\">GOOGLEKEY</key> <q"+
-              " xsi:type=\"xsd:string\">'+search+'</q> <start"+
-              " xsi:type=\"xsd:int\">0</start> <maxResults"+
-              " xsi:type=\"xsd:int\">10</maxResults> <filter"+
-              " xsi:type=\"xsd:boolean\">true</filter> <restrict"+
-              " xsi:type=\"xsd:string\"></restrict> <safeSearch"+
-              " xsi:type=\"xsd:boolean\">false</safeSearch> <lr"+
-              " xsi:type=\"xsd:string\"></lr> <ie"+
-              " xsi:type=\"xsd:string\">latin1</ie> <oe"+
-              " xsi:type=\"xsd:string\">latin1</oe>"+
-              "</ns1:doGoogleSearch>"+
-              "</SOAP-ENV:Body></SOAP-ENV:Envelope>");
-            System.out.println(j.toString(2));
-            System.out.println(XML.toString(j));
-            System.out.println("");
-
-            j = new JSONObject("{Envelope: {Body: {\"ns1:doGoogleSearch\": {oe: \"latin1\", filter: true, q: \"'+search+'\", key: \"GOOGLEKEY\", maxResults: 10, \"SOAP-ENV:encodingStyle\": \"http://schemas.xmlsoap.org/soap/encoding/\", start: 0, ie: \"latin1\", safeSearch:false, \"xmlns:ns1\": \"urn:GoogleSearch\"}}}}");
-            System.out.println(j.toString(2));
-            System.out.println(XML.toString(j));
-            System.out.println("");
-
-            j = CookieList.toJSONObject("  f%oo = b+l=ah  ; o;n%40e = t.wo ");
-            System.out.println(j.toString(2));
-            System.out.println(CookieList.toString(j));
-            System.out.println("");
-
-            j = Cookie.toJSONObject("f%oo=blah; secure ;expires = April 24, 2002");
-            System.out.println(j.toString(2));
-            System.out.println(Cookie.toString(j));
-            System.out.println("");
-
-            j = new JSONObject("{script: 'It is not allowed in HTML to send a close script tag in a string<script>because it confuses browsers</script>so we insert a backslash before the /'}");
-            System.out.println(j.toString());
-            System.out.println("");
-
-            JSONTokener jt = new JSONTokener("{op:'test', to:'session', pre:1}{op:'test', to:'session', pre:2}");
-            j = new JSONObject(jt);
-            System.out.println(j.toString());
-            System.out.println("pre: " + j.optInt("pre"));
-            int i = jt.skipTo('{');
-            System.out.println(i);
-            j = new JSONObject(jt);
-            System.out.println(j.toString());
-            System.out.println("");
-
-            a = CDL.toJSONArray("Comma delimited list test, '\"Strip\"Quotes', 'quote, comma', No quotes, 'Single Quotes', \"Double Quotes\"\n1,'2',\"3\"\n,'It is \"good,\"', \"It works.\"\n\n");
-
-            s = CDL.toString(a);
-            System.out.println(s);
-            System.out.println("");
-            System.out.println(a.toString(4));
-            System.out.println("");
-            a = CDL.toJSONArray(s);
-            System.out.println(a.toString(4));
-            System.out.println("");
-
-            a = new JSONArray(" [\"<escape>\", next is an implied null , , ok,] ");
-            System.out.println(a.toString());
-            System.out.println("");
-            System.out.println(XML.toString(a));
-            System.out.println("");
-
-            j = new JSONObject("{ fun => with non-standard forms ; forgiving => This package can be used to parse formats that are similar to but not stricting conforming to JSON; why=To make it easier to migrate existing data to JSON,one = [[1.00]]; uno=[[{1=>1}]];'+':+6e66 ;pluses=+++;empty = '' , 'double':0.666,true: TRUE, false: FALSE, null=NULL;[true] = [[!,@;*]]; string=>  o. k. ; \r oct=0666; hex=0x666; dec=666; o=0999; noh=0x0x}");
-            System.out.println(j.toString(4));
-            System.out.println("");
-            if (j.getBoolean("true") && !j.getBoolean("false")) {
-                System.out.println("It's all good");
-            }
-
-            System.out.println("");
-            j = new JSONObject(j, new String[]{"dec", "oct", "hex", "missing"});
-            System.out.println(j.toString(4));
-
-            System.out.println("");
-            System.out.println(new JSONStringer().array().value(a).value(j).endArray());
-
-            j = new JSONObject("{string: \"98.6\", long: 2147483648, int: 2147483647, longer: 9223372036854775807, double: 9223372036854775808}");
-            System.out.println(j.toString(4));
-
-            System.out.println("\ngetInt");
-            System.out.println("int    " + j.getInt("int"));
-            System.out.println("long   " + j.getInt("long"));
-            System.out.println("longer " + j.getInt("longer"));
-            //System.out.println("double " + j.getInt("double"));
-            //System.out.println("string " + j.getInt("string"));
-
-            System.out.println("\ngetLong");
-            System.out.println("int    " + j.getLong("int"));
-            System.out.println("long   " + j.getLong("long"));
-            System.out.println("longer " + j.getLong("longer"));
-            //System.out.println("double " + j.getLong("double"));
-            //System.out.println("string " + j.getLong("string"));
-
-            System.out.println("\ngetDouble");
-            System.out.println("int    " + j.getDouble("int"));
-            System.out.println("long   " + j.getDouble("long"));
-            System.out.println("longer " + j.getDouble("longer"));
-            System.out.println("double " + j.getDouble("double"));
-            System.out.println("string " + j.getDouble("string"));
-
-            j.put("good sized", 9223372036854775807L);
-            System.out.println(j.toString(4));
-
-            a = new JSONArray("[2147483647, 2147483648, 9223372036854775807, 9223372036854775808]");
-            System.out.println(a.toString(4));
-
-            System.out.println("\nKeys: ");
-            it = j.keys();
-            while (it.hasNext()) {
-                s = (String)it.next();
-                System.out.println(s + ": " + j.getString(s));
-            }
-
-
-            System.out.println("\naccumulate: ");
-            j = new JSONObject();
-            j.accumulate("stooge", "Curly");
-            j.accumulate("stooge", "Larry");
-            j.accumulate("stooge", "Moe");
-            a = j.getJSONArray("stooge");
-            a.put(5, "Shemp");
-            System.out.println(j.toString(4));
-
-            System.out.println("\nwrite:");
-            System.out.println(j.write(new StringWriter()));
-
-            s = "<xml empty><a></a><a>1</a><a>22</a><a>333</a></xml>";
-            j = XML.toJSONObject(s);
-            System.out.println(j.toString(4));
-            System.out.println(XML.toString(j));
-            
-            s = "<book><chapter>Content of the first chapter</chapter><chapter>Content of the second chapter      <chapter>Content of the first subchapter</chapter>      <chapter>Content of the second subchapter</chapter></chapter><chapter>Third Chapter</chapter></book>";
-            j = XML.toJSONObject(s);
-            System.out.println(j.toString(4));
-            System.out.println(XML.toString(j));
-            
-            a = JSONML.toJSONArray(s);
-            System.out.println(a.toString(4));
-            System.out.println(JSONML.toString(a));
-            
-            Collection c = null;
-            Map m = null;
-            
-            j = new JSONObject(m);
-            a = new JSONArray(c);
-            j.append("stooge", "Joe DeRita");
-            j.append("stooge", "Shemp");
-            j.accumulate("stooges", "Curly");
-            j.accumulate("stooges", "Larry");
-            j.accumulate("stooges", "Moe");
-            j.accumulate("stoogearray", j.get("stooges"));
-            j.put("map", m);
-            j.put("collection", c);
-            j.put("array", a);
-            a.put(m);
-            a.put(c);
-            System.out.println(j.toString(4));
-            
-            s = "{plist=Apple; AnimalSmells = { pig = piggish; lamb = lambish; worm = wormy; }; AnimalSounds = { pig = oink; lamb = baa; worm = baa;  Lisa = \"Why is the worm talking like a lamb?\" } ; AnimalColors = { pig = pink; lamb = black; worm = pink; } } "; 
-            j = new JSONObject(s);
-            System.out.println(j.toString(4));
-            
-            s = " (\"San Francisco\", \"New York\", \"Seoul\", \"London\", \"Seattle\", \"Shanghai\")";
-            a = new JSONArray(s);
-            System.out.println(a.toString());
-            
-            s = "<a ichi='1' ni='2'><b>The content of b</b> and <c san='3'>The content of c</c><d>do</d><e></e><d>re</d><f/><d>mi</d></a>";
-            j = XML.toJSONObject(s);
-
-            System.out.println(j.toString(2));
-            System.out.println(XML.toString(j));
-            System.out.println("");
-            ja = JSONML.toJSONArray(s);
-            System.out.println(ja.toString(4));
-            System.out.println(JSONML.toString(ja));
-            System.out.println("");
-            
-            s = "<Root><MsgType type=\"node\"><BatchType type=\"string\">111111111111111</BatchType></MsgType></Root>";
-            j = JSONML.toJSONObject(s);
-            System.out.println(j);
-            ja = JSONML.toJSONArray(s);
-            System.out.println(ja);
-          
-            
-            System.out.println("\nTesting Exceptions: ");
-
-            System.out.print("Exception: ");
-            try {
-                a = new JSONArray("[\n\r\n\r}");
-                System.out.println(a.toString());
-            } catch (Exception e) {
-                System.out.println(e);
-            }
-            
-            System.out.print("Exception: ");
-            try {
-                a = new JSONArray("<\n\r\n\r      ");
-                System.out.println(a.toString());
-            } catch (Exception e) {
-                System.out.println(e);
-            }
-            
-            System.out.print("Exception: ");
-            try {
-                a = new JSONArray();
-                a.put(Double.NEGATIVE_INFINITY);
-                a.put(Double.NaN);
-                System.out.println(a.toString());
-            } catch (Exception e) {
-                System.out.println(e);
-            }
-            System.out.print("Exception: ");
-            try {
-                System.out.println(j.getDouble("stooge"));
-            } catch (Exception e) {
-                System.out.println(e);
-            }
-            System.out.print("Exception: ");
-            try {
-                System.out.println(j.getDouble("howard"));
-            } catch (Exception e) {
-                System.out.println(e);
-            }
-            System.out.print("Exception: ");
-            try {
-                System.out.println(j.put(null, "howard"));
-            } catch (Exception e) {
-                System.out.println(e);
-            }
-            System.out.print("Exception: ");
-            try {
-                System.out.println(a.getDouble(0));
-            } catch (Exception e) {
-                System.out.println(e);
-            }
-            System.out.print("Exception: ");
-            try {
-                System.out.println(a.get(-1));
-            } catch (Exception e) {
-                System.out.println(e);
-            }
-            System.out.print("Exception: ");
-            try {
-                System.out.println(a.put(Double.NaN));
-            } catch (Exception e) {
-                System.out.println(e);
-            }
-            System.out.print("Exception: ");
-            try {
-            	j = XML.toJSONObject("<a><b>    ");
-            } catch (Exception e) {
-            	System.out.println(e);
-            }            
-            System.out.print("Exception: ");
-            try {
-            	j = XML.toJSONObject("<a></b>    ");
-            } catch (Exception e) {
-            	System.out.println(e);
-            }            
-            System.out.print("Exception: ");
-            try {
-            	j = XML.toJSONObject("<a></a    ");
-            } catch (Exception e) {
-            	System.out.println(e);
-            }
-            System.out.print("Exception: ");
-            try {            	
-            	ja = new JSONArray(new Object());
-            	System.out.println(ja.toString());
-            } catch (Exception e) {
-            	System.out.println(e);
-            }
-
-            System.out.print("Exception: ");
-            try {            	
-            	s = "[)";
-            	a = new JSONArray(s);
-            	System.out.println(a.toString());
-            } catch (Exception e) {
-            	System.out.println(e);
-            }
-
-            System.out.print("Exception: ");
-            try {            	
-                s = "<xml";
-                ja = JSONML.toJSONArray(s);
-                System.out.println(ja.toString(4));
-            } catch (Exception e) {
-            	System.out.println(e);
-            }
-
-            System.out.print("Exception: ");
-            try {            	
-                s = "<right></wrong>";
-                ja = JSONML.toJSONArray(s);
-                System.out.println(ja.toString(4));
-            } catch (Exception e) {
-            	System.out.println(e);
-            }
-
-            System.out.print("Exception: ");
-            try {            	
-                s = "{\"koda\": true, \"koda\": true}";
-                j = new JSONObject(s);
-                System.out.println(j.toString(4));
-            } catch (Exception e) {
-            	System.out.println(e);
-            }
-
-            System.out.print("Exception: ");
-            try {            	
-                jj = new JSONStringer();
-                s = jj
-    	            .object()
-    	                .key("bosanda")
-    	                .value("MARIE HAA'S")
-    	                .key("bosanda")
-    	                .value("MARIE HAA\\'S")
-    	            .endObject()
-    	            .toString();
-                System.out.println(j.toString(4));
-            } catch (Exception e) {
-            	System.out.println(e);
-            }
-        } catch (Exception e) {
-            System.out.println(e.toString());
-        }
-    }
-}
diff --git a/mobileapp/src/org/json/XML.java b/mobileapp/src/org/json/XML.java
deleted file mode 100755
index bef4693..0000000
--- a/mobileapp/src/org/json/XML.java
+++ /dev/null
@@ -1,441 +0,0 @@
-package org.json;
-
-/*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-import java.util.Iterator;
-
-
-/**
- * This provides static methods to convert an XML text into a JSONObject,
- * and to covert a JSONObject into an XML text.
- * @author JSON.org
- * @version 2010-04-08
- */
-public class XML {
-
-    /** The Character '&'. */
-    public static final Character AMP   = new Character('&');
-
-    /** The Character '''. */
-    public static final Character APOS  = new Character('\'');
-
-    /** The Character '!'. */
-    public static final Character BANG  = new Character('!');
-
-    /** The Character '='. */
-    public static final Character EQ    = new Character('=');
-
-    /** The Character '>'. */
-    public static final Character GT    = new Character('>');
-
-    /** The Character '<'. */
-    public static final Character LT    = new Character('<');
-
-    /** The Character '?'. */
-    public static final Character QUEST = new Character('?');
-
-    /** The Character '"'. */
-    public static final Character QUOT  = new Character('"');
-
-    /** The Character '/'. */
-    public static final Character SLASH = new Character('/');
-
-    /**
-     * Replace special characters with XML escapes:
-     * <pre>
-     * &amp; <small>(ampersand)</small> is replaced by &amp;amp;
-     * &lt; <small>(less than)</small> is replaced by &amp;lt;
-     * &gt; <small>(greater than)</small> is replaced by &amp;gt;
-     * &quot; <small>(double quote)</small> is replaced by &amp;quot;
-     * </pre>
-     * @param string The string to be escaped.
-     * @return The escaped string.
-     */
-    public static String escape(String string) {
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0, len = string.length(); i < len; i++) {
-            char c = string.charAt(i);
-            switch (c) {
-            case '&':
-                sb.append("&amp;");
-                break;
-            case '<':
-                sb.append("&lt;");
-                break;
-            case '>':
-                sb.append("&gt;");
-                break;
-            case '"':
-                sb.append("&quot;");
-                break;
-            default:
-                sb.append(c);
-            }
-        }
-        return sb.toString();
-    }
-    
-    /**
-     * Throw an exception if the string contains whitespace. 
-     * Whitespace is not allowed in tagNames and attributes.
-     * @param string
-     * @throws JSONException
-     */
-    public static void noSpace(String string) throws JSONException {
-    	int i, length = string.length();
-    	if (length == 0) {
-    		throw new JSONException("Empty string.");
-    	}
-    	for (i = 0; i < length; i += 1) {
-		    if (Character.isWhitespace(string.charAt(i))) {
-		    	throw new JSONException("'" + string + 
-		    			"' contains a space character.");
-		    }
-		}
-    }
-
-    /**
-     * Scan the content following the named tag, attaching it to the context.
-     * @param x       The XMLTokener containing the source string.
-     * @param context The JSONObject that will include the new material.
-     * @param name    The tag name.
-     * @return true if the close tag is processed.
-     * @throws JSONException
-     */
-    private static boolean parse(XMLTokener x, JSONObject context,
-                                 String name) throws JSONException {
-        char       c;
-        int        i;
-        String     n;
-        JSONObject o = null;
-        String     s;
-        Object     t;
-
-// Test for and skip past these forms:
-//      <!-- ... -->
-//      <!   ...   >
-//      <![  ... ]]>
-//      <?   ...  ?>
-// Report errors for these forms:
-//      <>
-//      <=
-//      <<
-
-        t = x.nextToken();
-
-// <!
-
-        if (t == BANG) {
-            c = x.next();
-            if (c == '-') {
-                if (x.next() == '-') {
-                    x.skipPast("-->");
-                    return false;
-                }
-                x.back();
-            } else if (c == '[') {
-                t = x.nextToken();
-                if (t.equals("CDATA")) {
-                    if (x.next() == '[') {
-                        s = x.nextCDATA();
-                        if (s.length() > 0) {
-                            context.accumulate("content", s);
-                        }
-                        return false;
-                    }
-                }
-                throw x.syntaxError("Expected 'CDATA['");
-            }
-            i = 1;
-            do {
-                t = x.nextMeta();
-                if (t == null) {
-                    throw x.syntaxError("Missing '>' after '<!'.");
-                } else if (t == LT) {
-                    i += 1;
-                } else if (t == GT) {
-                    i -= 1;
-                }
-            } while (i > 0);
-            return false;
-        } else if (t == QUEST) {
-
-// <?
-
-            x.skipPast("?>");
-            return false;
-        } else if (t == SLASH) {
-
-// Close tag </
-
-        	t = x.nextToken();
-            if (name == null) {
-                throw x.syntaxError("Mismatched close tag" + t);
-            }            
-            if (!t.equals(name)) {
-                throw x.syntaxError("Mismatched " + name + " and " + t);
-            }
-            if (x.nextToken() != GT) {
-                throw x.syntaxError("Misshaped close tag");
-            }
-            return true;
-
-        } else if (t instanceof Character) {
-            throw x.syntaxError("Misshaped tag");
-
-// Open tag <
-
-        } else {
-            n = (String)t;
-            t = null;
-            o = new JSONObject();
-            for (;;) {
-                if (t == null) {
-                    t = x.nextToken();
-                }
-
-// attribute = value
-
-                if (t instanceof String) {
-                    s = (String)t;
-                    t = x.nextToken();
-                    if (t == EQ) {
-                        t = x.nextToken();
-                        if (!(t instanceof String)) {
-                            throw x.syntaxError("Missing value");
-                        }
-                        o.accumulate(s, JSONObject.stringToValue((String)t));
-                        t = null;
-                    } else {
-                        o.accumulate(s, "");
-                    }
-
-// Empty tag <.../>
-
-                } else if (t == SLASH) {
-                    if (x.nextToken() != GT) {
-                        throw x.syntaxError("Misshaped tag");
-                    }
-                    if (o.length() > 0) {
-                        context.accumulate(n, o);
-                    } else {
-                    	context.accumulate(n, "");
-                    }
-                    return false;
-
-// Content, between <...> and </...>
-
-                } else if (t == GT) {
-                    for (;;) {
-                        t = x.nextContent();
-                        if (t == null) {
-                            if (n != null) {
-                                throw x.syntaxError("Unclosed tag " + n);
-                            }
-                            return false;
-                        } else if (t instanceof String) {
-                            s = (String)t;
-                            if (s.length() > 0) {
-                                o.accumulate("content", JSONObject.stringToValue(s));
-                            }
-
-// Nested element
-
-                        } else if (t == LT) {
-                            if (parse(x, o, n)) {
-                                if (o.length() == 0) {
-                                    context.accumulate(n, "");
-                                } else if (o.length() == 1 &&
-                                       o.opt("content") != null) {
-                                    context.accumulate(n, o.opt("content"));
-                                } else {
-                                    context.accumulate(n, o);
-                                }
-                                return false;
-                            }
-                        }
-                    }
-                } else {
-                    throw x.syntaxError("Misshaped tag");
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Convert a well-formed (but not necessarily valid) XML string into a
-     * JSONObject. Some information may be lost in this transformation
-     * because JSON is a data format and XML is a document format. XML uses
-     * elements, attributes, and content text, while JSON uses unordered
-     * collections of name/value pairs and arrays of values. JSON does not
-     * does not like to distinguish between elements and attributes.
-     * Sequences of similar elements are represented as JSONArrays. Content
-     * text may be placed in a "content" member. Comments, prologs, DTDs, and
-     * <code>&lt;[ [ ]]></code> are ignored.
-     * @param string The source string.
-     * @return A JSONObject containing the structured data from the XML string.
-     * @throws JSONException
-     */
-    public static JSONObject toJSONObject(String string) throws JSONException {
-        JSONObject o = new JSONObject();
-        XMLTokener x = new XMLTokener(string);
-        while (x.more() && x.skipPast("<")) {
-            parse(x, o, null);
-        }
-        return o;
-    }
-
-
-    /**
-     * Convert a JSONObject into a well-formed, element-normal XML string.
-     * @param o A JSONObject.
-     * @return  A string.
-     * @throws  JSONException
-     */
-    public static String toString(Object o) throws JSONException {
-        return toString(o, null);
-    }
-
-
-    /**
-     * Convert a JSONObject into a well-formed, element-normal XML string.
-     * @param o A JSONObject.
-     * @param tagName The optional name of the enclosing tag.
-     * @return A string.
-     * @throws JSONException
-     */
-    public static String toString(Object o, String tagName)
-            throws JSONException {
-        StringBuffer b = new StringBuffer();
-        int          i;
-        JSONArray    ja;
-        JSONObject   jo;
-        String       k;
-        Iterator     keys;
-        int          len;
-        String       s;
-        Object       v;
-        if (o instanceof JSONObject) {
-
-// Emit <tagName>
-
-            if (tagName != null) {
-                b.append('<');
-                b.append(tagName);
-                b.append('>');
-            }
-
-// Loop thru the keys.
-
-            jo = (JSONObject)o;
-            keys = jo.keys();
-            while (keys.hasNext()) {
-                k = keys.next().toString();
-                v = jo.opt(k);
-                if (v == null) {
-                	v = "";
-                }
-                if (v instanceof String) {
-                    s = (String)v;
-                } else {
-                    s = null;
-                }
-
-// Emit content in body
-
-                if (k.equals("content")) {
-                    if (v instanceof JSONArray) {
-                        ja = (JSONArray)v;
-                        len = ja.length();
-                        for (i = 0; i < len; i += 1) {
-                            if (i > 0) {
-                                b.append('\n');
-                            }
-                            b.append(escape(ja.get(i).toString()));
-                        }
-                    } else {
-                        b.append(escape(v.toString()));
-                    }
-
-// Emit an array of similar keys
-
-                } else if (v instanceof JSONArray) {
-                    ja = (JSONArray)v;
-                    len = ja.length();
-                    for (i = 0; i < len; i += 1) {
-                    	v = ja.get(i);
-                    	if (v instanceof JSONArray) {
-                            b.append('<');
-                            b.append(k);
-                            b.append('>');
-                    		b.append(toString(v));
-                            b.append("</");
-                            b.append(k);
-                            b.append('>');
-                    	} else {
-                    		b.append(toString(v, k));
-                    	}
-                    }
-                } else if (v.equals("")) {
-                    b.append('<');
-                    b.append(k);
-                    b.append("/>");
-
-// Emit a new tag <k>
-
-                } else {
-                    b.append(toString(v, k));
-                }
-            }
-            if (tagName != null) {
-
-// Emit the </tagname> close tag
-
-                b.append("</");
-                b.append(tagName);
-                b.append('>');
-            }
-            return b.toString();
-
-// XML does not have good support for arrays. If an array appears in a place
-// where XML is lacking, synthesize an <array> element.
-
-        } else if (o instanceof JSONArray) {
-            ja = (JSONArray)o;
-            len = ja.length();
-            for (i = 0; i < len; ++i) {
-            	v = ja.opt(i);
-                b.append(toString(v, (tagName == null) ? "array" : tagName));
-            }
-            return b.toString();
-        } else {
-            s = (o == null) ? "null" : escape(o.toString());
-            return (tagName == null) ? "\"" + s + "\"" :
-                (s.length() == 0) ? "<" + tagName + "/>" :
-                "<" + tagName + ">" + s + "</" + tagName + ">";
-        }
-    }
-}
\ No newline at end of file
diff --git a/mobileapp/src/org/json/XMLTokener.java b/mobileapp/src/org/json/XMLTokener.java
deleted file mode 100755
index 47ff3f2..0000000
--- a/mobileapp/src/org/json/XMLTokener.java
+++ /dev/null
@@ -1,365 +0,0 @@
-package org.json;
-
-/*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-/**
- * The XMLTokener extends the JSONTokener to provide additional methods
- * for the parsing of XML texts.
- * @author JSON.org
- * @version 2010-01-30
- */
-public class XMLTokener extends JSONTokener {
-
-
-   /** The table of entity values. It initially contains Character values for
-    * amp, apos, gt, lt, quot.
-    */
-   public static final java.util.HashMap entity;
-
-   static {
-       entity = new java.util.HashMap(8);
-       entity.put("amp",  XML.AMP);
-       entity.put("apos", XML.APOS);
-       entity.put("gt",   XML.GT);
-       entity.put("lt",   XML.LT);
-       entity.put("quot", XML.QUOT);
-   }
-
-    /**
-     * Construct an XMLTokener from a string.
-     * @param s A source string.
-     */
-    public XMLTokener(String s) {
-        super(s);
-    }
-
-    /**
-     * Get the text in the CDATA block.
-     * @return The string up to the <code>]]&gt;</code>.
-     * @throws JSONException If the <code>]]&gt;</code> is not found.
-     */
-    public String nextCDATA() throws JSONException {
-        char         c;
-        int          i;
-        StringBuffer sb = new StringBuffer();
-        for (;;) {
-            c = next();
-            if (end()) {
-                throw syntaxError("Unclosed CDATA");
-            }
-            sb.append(c);
-            i = sb.length() - 3;
-            if (i >= 0 && sb.charAt(i) == ']' &&
-                          sb.charAt(i + 1) == ']' && sb.charAt(i + 2) == '>') {
-                sb.setLength(i);
-                return sb.toString();
-            }
-        }
-    }
-
-
-    /**
-     * Get the next XML outer token, trimming whitespace. There are two kinds
-     * of tokens: the '<' character which begins a markup tag, and the content
-     * text between markup tags.
-     *
-     * @return  A string, or a '<' Character, or null if there is no more
-     * source text.
-     * @throws JSONException
-     */
-    public Object nextContent() throws JSONException {
-        char         c;
-        StringBuffer sb;
-        do {
-            c = next();
-        } while (Character.isWhitespace(c));
-        if (c == 0) {
-            return null;
-        }
-        if (c == '<') {
-            return XML.LT;
-        }
-        sb = new StringBuffer();
-        for (;;) {
-            if (c == '<' || c == 0) {
-                back();
-                return sb.toString().trim();
-            }
-            if (c == '&') {
-                sb.append(nextEntity(c));
-            } else {
-                sb.append(c);
-            }
-            c = next();
-        }
-    }
-
-
-    /**
-     * Return the next entity. These entities are translated to Characters:
-     *     <code>&amp;  &apos;  &gt;  &lt;  &quot;</code>.
-     * @param a An ampersand character.
-     * @return  A Character or an entity String if the entity is not recognized.
-     * @throws JSONException If missing ';' in XML entity.
-     */
-    public Object nextEntity(char a) throws JSONException {
-        StringBuffer sb = new StringBuffer();
-        for (;;) {
-            char c = next();
-            if (Character.isLetterOrDigit(c) || c == '#') {
-                sb.append(Character.toLowerCase(c));
-            } else if (c == ';') {
-                break;
-            } else {
-                throw syntaxError("Missing ';' in XML entity: &" + sb);
-            }
-        }
-        String s = sb.toString();
-        Object e = entity.get(s);
-        return e != null ? e : a + s + ";";
-    }
-
-
-    /**
-     * Returns the next XML meta token. This is used for skipping over <!...>
-     * and <?...?> structures.
-     * @return Syntax characters (<code>< > / = ! ?</code>) are returned as
-     *  Character, and strings and names are returned as Boolean. We don't care
-     *  what the values actually are.
-     * @throws JSONException If a string is not properly closed or if the XML
-     *  is badly structured.
-     */
-    public Object nextMeta() throws JSONException {
-        char c;
-        char q;
-        do {
-            c = next();
-        } while (Character.isWhitespace(c));
-        switch (c) {
-        case 0:
-            throw syntaxError("Misshaped meta tag");
-        case '<':
-            return XML.LT;
-        case '>':
-            return XML.GT;
-        case '/':
-            return XML.SLASH;
-        case '=':
-            return XML.EQ;
-        case '!':
-            return XML.BANG;
-        case '?':
-            return XML.QUEST;
-        case '"':
-        case '\'':
-            q = c;
-            for (;;) {
-                c = next();
-                if (c == 0) {
-                    throw syntaxError("Unterminated string");
-                }
-                if (c == q) {
-                    return Boolean.TRUE;
-                }
-            }
-        default:
-            for (;;) {
-                c = next();
-                if (Character.isWhitespace(c)) {
-                    return Boolean.TRUE;
-                }
-                switch (c) {
-                case 0:
-                case '<':
-                case '>':
-                case '/':
-                case '=':
-                case '!':
-                case '?':
-                case '"':
-                case '\'':
-                    back();
-                    return Boolean.TRUE;
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Get the next XML Token. These tokens are found inside of angle
-     * brackets. It may be one of these characters: <code>/ > = ! ?</code> or it
-     * may be a string wrapped in single quotes or double quotes, or it may be a
-     * name.
-     * @return a String or a Character.
-     * @throws JSONException If the XML is not well formed.
-     */
-    public Object nextToken() throws JSONException {
-        char c;
-        char q;
-        StringBuffer sb;
-        do {
-            c = next();
-        } while (Character.isWhitespace(c));
-        switch (c) {
-        case 0:
-            throw syntaxError("Misshaped element");
-        case '<':
-            throw syntaxError("Misplaced '<'");
-        case '>':
-            return XML.GT;
-        case '/':
-            return XML.SLASH;
-        case '=':
-            return XML.EQ;
-        case '!':
-            return XML.BANG;
-        case '?':
-            return XML.QUEST;
-
-// Quoted string
-
-        case '"':
-        case '\'':
-            q = c;
-            sb = new StringBuffer();
-            for (;;) {
-                c = next();
-                if (c == 0) {
-                    throw syntaxError("Unterminated string");
-                }
-                if (c == q) {
-                    return sb.toString();
-                }
-                if (c == '&') {
-                    sb.append(nextEntity(c));
-                } else {
-                    sb.append(c);
-                }
-            }
-        default:
-
-// Name
-
-            sb = new StringBuffer();
-            for (;;) {
-                sb.append(c);
-                c = next();
-                if (Character.isWhitespace(c)) {
-                    return sb.toString();
-                }
-                switch (c) {
-                case 0:
-                	return sb.toString();
-                case '>':
-                case '/':
-                case '=':
-                case '!':
-                case '?':
-                case '[':
-                case ']':
-                    back();
-                    return sb.toString();
-                case '<':
-                case '"':
-                case '\'':
-                    throw syntaxError("Bad character in a name");
-                }
-            }
-        }
-    }
-    
-    
-    /**
-     * Skip characters until past the requested string.
-     * If it is not found, we are left at the end of the source with a result of false.
-     * @param to A string to skip past.
-     * @throws JSONException
-     */
-    public boolean skipPast(String to) throws JSONException {
-    	boolean b;
-    	char c;
-    	int i;
-    	int j;
-    	int offset = 0;
-    	int n = to.length();
-        char[] circle = new char[n];
-        
-        /*
-         * First fill the circle buffer with as many characters as are in the
-         * to string. If we reach an early end, bail.
-         */
-        
-    	for (i = 0; i < n; i += 1) {
-    		c = next();
-    		if (c == 0) {
-    			return false;
-    		}
-    		circle[i] = c;
-    	}
-    	/*
-    	 * We will loop, possibly for all of the remaining characters.
-    	 */
-    	for (;;) {
-    		j = offset;
-    		b = true;
-    		/*
-    		 * Compare the circle buffer with the to string. 
-    		 */
-    		for (i = 0; i < n; i += 1) {
-    			if (circle[j] != to.charAt(i)) {
-    				b = false;
-    				break;
-    			}
-    			j += 1;
-    			if (j >= n) {
-    				j -= n;
-    			}
-    		}
-    		/*
-    		 * If we exit the loop with b intact, then victory is ours.
-    		 */
-    		if (b) {
-    			return true;
-    		}
-    		/*
-    		 * Get the next character. If there isn't one, then defeat is ours.
-    		 */
-    		c = next();
-    		if (c == 0) {
-    			return false;
-    		}
-    		/*
-    		 * Shove the character in the circle buffer and advance the 
-    		 * circle offset. The offset is mod n.
-    		 */
-    		circle[offset] = c;
-    		offset += 1;
-    		if (offset >= n) {
-    			offset -= n;
-    		}
-    	}
-    }
-}
diff --git a/mobileapp/src/smoots/udesign/accelerometer/AccelerometerListener.java b/mobileapp/src/smoots/udesign/accelerometer/AccelerometerListener.java
deleted file mode 100755
index e9beba6..0000000
--- a/mobileapp/src/smoots/udesign/accelerometer/AccelerometerListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package smoots.udesign.accelerometer;
-
-/**
- * An interface designating an Activity as an Accelerometer Listener, which
- * implements behaviors which happen as Accelerometer detects chagnes.
- * 
- * @author Sun
- * 
- */
-public interface AccelerometerListener {
-
-	public void onAccelerationChanged(float x, float y, float z);
-
-	public void onShake(float force);
-
-}
diff --git a/mobileapp/src/smoots/udesign/accelerometer/AccelerometerManager.java b/mobileapp/src/smoots/udesign/accelerometer/AccelerometerManager.java
deleted file mode 100755
index 2d5877c..0000000
--- a/mobileapp/src/smoots/udesign/accelerometer/AccelerometerManager.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package smoots.udesign.accelerometer;
-
-import java.util.List;
-
-import smoots.udesign.canvas.VirtualCanvasActivity;
-import android.content.Context;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-
-
-public class AccelerometerManager {
-	
-	/** Accuracy configuration */
-	private static float threshold 	= 5;
-	private static int interval 	= 1000;
-	
-	private static Sensor sensor;
-	private static SensorManager sensorManager;
-	// you could use an OrientationListener array instead
-	// if you plans to use more than one listener
-	private static AccelerometerListener listener;
-	
-	/** indicates whether or not Accelerometer Sensor is supported */
-	private static Boolean supported;
-	/** indicates whether or not Accelerometer Sensor is running */
-	private static boolean running = false;
-	
-	/**
-	 * Returns true if the manager is listening to orientation changes
-	 */
-	public static boolean isListening() {
-		return running;
-	}
-	
-	/**
-	 * Unregisters listeners
-	 */
-	public static void stopListening() {
-		running = false;
-		try {
-			if (sensorManager != null && sensorEventListener != null) {
-				sensorManager.unregisterListener(sensorEventListener);
-			}
-		} catch (Exception e) {}
-	}
-	
-	/**
-	 * Returns true if at least one Accelerometer sensor is available
-	 */
-	public static boolean isSupported() {
-		if (supported == null) {
-			if (VirtualCanvasActivity.getContext() != null) {
-				sensorManager = (SensorManager) VirtualCanvasActivity.getContext().
-						getSystemService(Context.SENSOR_SERVICE);
-				List<Sensor> sensors = sensorManager.getSensorList(
-						Sensor.TYPE_ACCELEROMETER);
-				supported = new Boolean(sensors.size() > 0);
-			} else {
-				supported = Boolean.FALSE;
-			}
-		}
-		return supported;
-	}
-
-	/**
-	 * Configure the listener for shaking
-	 * @param threshold
-	 * 			minimum acceleration variation for considering shaking
-	 * @param interval
-	 * 			minimum interval between to shake events
-	 */
-	public static void configure(int threshold, int interval) {
-		AccelerometerManager.threshold = threshold;
-		AccelerometerManager.interval = interval;
-	}
-
-	/**
-	 * Registers a listener and start listening
-	 * @param accelerometerListener
-	 * 			callback for accelerometer events
-	 */
-	public static void startListening(
-			AccelerometerListener accelerometerListener) {
-		sensorManager = (SensorManager) VirtualCanvasActivity.getContext().
-				getSystemService(Context.SENSOR_SERVICE);
-		List<Sensor> sensors = sensorManager.getSensorList(
-				Sensor.TYPE_ACCELEROMETER);
-		if (sensors.size() > 0) {
-			sensor = sensors.get(0);
-			running = sensorManager.registerListener(
-					sensorEventListener, sensor, 
-					SensorManager.SENSOR_DELAY_GAME);
-			listener = accelerometerListener;
-		}
-	}
-	
-	/**
-	 * Configures threshold and interval
-	 * And registers a listener and start listening
-	 * @param accelerometerListener
-	 * 			callback for accelerometer events
-	 * @param threshold
-	 * 			minimum acceleration variation for considering shaking
-	 * @param interval
-	 * 			minimum interval between to shake events
-	 */
-	public static void startListening(
-			AccelerometerListener accelerometerListener, 
-			int threshold, int interval) {
-		configure(threshold, interval);
-		startListening(accelerometerListener);
-	}
-
-	/**
-	 * The listener that listen to events from the accelerometer listener
-	 */
-	private static SensorEventListener sensorEventListener = 
-		new SensorEventListener() {
-
-		private long now = 0;
-		private long timeDiff = 0;
-		private long lastUpdate = 0;
-		private long lastShake = 0;
-		
-		private float x = 0;
-		private float y = 0;
-		private float z = 0;
-		private float lastX = 0;
-		private float lastY = 0;
-		private float lastZ = 0;
-		private float force = 0;
-		
-		public void onAccuracyChanged(Sensor sensor, int accuracy) {}
-		
-		public void onSensorChanged(SensorEvent event) {
-			// use the event timestamp as reference
-			// so the manager precision won't depends 
-			// on the AccelerometerListener implementation
-			// processing time
-			now = event.timestamp;
-			
-    		x = event.values[0];
-			y = event.values[1];
-			z = event.values[2];
-    		
-			// SHAKE THE PHONE
-			if (lastUpdate == 0) {
-    			lastUpdate = now;
-    			lastShake = now;
-    			lastX = x;
-    			lastY = y;
-    			lastZ = z;
-    		} else {
-    			timeDiff = now - lastUpdate;
-    			if (timeDiff > interval) {
-	    			force = Math.abs(x + y + z - lastX - lastY - lastZ) / timeDiff * 10000000;
-	    			if (force > threshold) {
-	    				if (now - lastShake >= interval) {
-	    					// trigger shake event
-	    					listener.onShake(force);
-	    				}
-	    				lastShake = now;
-	    			}
-	        		lastX = x;
-	        		lastY = y;
-	        		lastZ = z;
-	        		lastUpdate = now;
-    			}
-    		}
-    		// trigger change event
-    		listener.onAccelerationChanged(x, y, z);
-		}
-		
-	};
-
-}
diff --git a/mobileapp/src/smoots/udesign/canvas/CanvasActivity.java b/mobileapp/src/smoots/udesign/canvas/CanvasActivity.java
deleted file mode 100755
index a2a36c4..0000000
--- a/mobileapp/src/smoots/udesign/canvas/CanvasActivity.java
+++ /dev/null
@@ -1,269 +0,0 @@
-package smoots.udesign.canvas;
-
-import java.io.IOException;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import smoots.udesign.accelerometer.AccelerometerListener;
-import smoots.udesign.accelerometer.AccelerometerManager;
-import smoots.udesign.colorpicker.ColorPickerDialog;
-import smoots.udesign.colorpicker.ColorPickerListener;
-import smoots.udesign.io.ClientWriter;
-import smoots.udesign.main.R;
-import smoots.udesign.main.R.id;
-import smoots.udesign.main.R.layout;
-import smoots.udesign.main.R.menu;
-import smoots.udesign.packet.Packet;
-import smoots.udesign.packet.PhoneToServerPacket;
-import smoots.udesign.settings.OnSettingsChangedListener;
-import smoots.udesign.settings.SettingsDialog;
-import smoots.udesign.util.PhoneDebugger;
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class CanvasActivity extends Activity implements AccelerometerListener,
-		ColorPickerListener, OnSettingsChangedListener {
-	
-	private static String TAG = "Canvas Activity";		
-	private static Context CONTEXT;
-	//private static String DEFAULT_IP = "18.244.3.179";
-	private static String DEFAULT_IP = "18.111.31.22";
-	private int DEFAULT_PORT = 20120;
-
-	// ACCELEROMETER INFO
-	private HashMap<String, Float> sendData;
-
-	// SENDER INFO
-	private ClientWriter writerThread;
-	private String ipAddr;
-	private int port;
-	private BlockingQueue<Packet> packetQ;
-	private static TextView txtSendStatus;
-	private boolean isSending = false;
-	private long timeKeeper;
-	
-	// COLOR PICKER INFO
-	private static final String BRIGHTNESS_PREFERENCE_KEY = "brightness";
-	private static final String COLOR_PREFERENCE_KEY = "color";
-
-	// //////////////////////
-	// ACTIVITY ATTRIBUTES
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		initControls();
-	}
-
-	private void initControls() {
-		setContentView(R.layout.accelerometer);
-		CONTEXT = this;
-		this.ipAddr = DEFAULT_IP;
-		this.port = DEFAULT_PORT;
-		this.packetQ = new LinkedBlockingQueue<Packet>();
-
-		this.sendData = new HashMap<String, Float>();
-		this.sendData.put("color", (float) 0);
-
-		txtSendStatus = (TextView) findViewById(R.id.txtSendStatus);
-		this.timeKeeper = System.currentTimeMillis();
-	}
-
-	protected void onResume() {
-		super.onResume();
-		if (AccelerometerManager.isSupported()) {
-			AccelerometerManager.startListening(this);
-		}
-	}
-
-	protected void onDestroy() {
-		super.onDestroy();
-		if (AccelerometerManager.isListening()) {
-			AccelerometerManager.stopListening();
-		}
-	}
-
-	public boolean onCreateOptionsMenu(Menu menu) {
-		MenuInflater inflater = getMenuInflater();
-		inflater.inflate(R.menu.canvas_menu, menu);
-		return true;
-	}
-
-	public boolean onOptionsItemSelected(MenuItem item) {
-		// Handle item selection
-		switch (item.getItemId()) {
-		case R.id.send:
-			toggleSending();
-
-			/*
-			 * // pass Sending Intent to PacketSender Intent toPacketSender =
-			 * new Intent(this, PacketSenderService.class); //
-			 * toPacketSender.putExtra("ipAddr", this.ipAddr); //
-			 * toPacketSender.putExtra("port", this.port);
-			 * toPacketSender.putExtra("ipAddr", "18.244.6.28");
-			 * toPacketSender.putExtra("port", "20120"); if (!isSending) {
-			 * startService(toPacketSender); isSending = true; } else {
-			 * stopService(toPacketSender); isSending = false; }
-			 */
-			return true;
-
-		case R.id.color_picker:
-			int color = PreferenceManager.getDefaultSharedPreferences(
-					CanvasActivity.this).getInt(COLOR_PREFERENCE_KEY,
-					Color.WHITE);
-			new ColorPickerDialog(CanvasActivity.this, CanvasActivity.this,
-					color).show();
-			return true;
-
-//		case R.id.effect_picker:
-//			return true;
-
-		case R.id.settings:
-			new SettingsDialog(CanvasActivity.this, CanvasActivity.this).show();
-			return true;
-
-		default:
-			return super.onOptionsItemSelected(item);
-		}
-	}
-
-	// //////////////////////
-	// STATIC
-	public static Context getContext() {
-		return CONTEXT;
-	}
-
-	// //////////////////////
-	// HELPERS
-	private void toggleSending() {
-		Toast.makeText(this, this.ipAddr + ":" + Integer.toString(this.port), Toast.LENGTH_SHORT).show();
-		
-		if (!this.isSending) {
-			Log.d(TAG, "Start Sending");
-			Socket socket = null; 
-			try {
-				socket = new Socket(this.ipAddr, this.port);
-				this.writerThread = new ClientWriter(this.packetQ, socket);
-				this.writerThread.setRunning(true);
-				this.writerThread.start();
-				this.isSending = true;
-			} catch (UnknownHostException e) {
-				PhoneDebugger.debug(TAG, e);
-				Toast.makeText(this, "Socket Not Created", Toast.LENGTH_SHORT).show();
-			} catch (IOException e) {
-				PhoneDebugger.debug(TAG, e);
-				Toast.makeText(this, "Socket Not Created", Toast.LENGTH_SHORT).show();
-			}
-		} else {
-			Log.d(TAG, "Stop Sending");
-			
-			this.writerThread.setRunning(false);
-			this.writerThread.interrupt();
-			
-			Toast.makeText(this, "Writer stopped", Toast.LENGTH_SHORT).show();
-			this.isSending = false;
-		}
-		
-		// String serverAddr = "www.google.com";
-		// int serverPort =
-		// Integer.parseInt(((EditText)findViewById(R.id.settings_port)).getText().toString());
-
-		/*
-		 * String serverAddr = this.ipAddr; //String serverAddr =
-		 * ((EditText)findViewById(R.id.settings_ip)).getText().toString();
-		 * int serverPort = this.port; Toast.makeText(this, serverAddr,
-		 * Toast.LENGTH_LONG).show();
-		 * 
-		 * Socket socket = null; try { socket = new Socket(serverAddr,
-		 * serverPort); //socket = new Socket(serverAddr, 80); } catch
-		 * (Exception e) { printScr("Exception!"); printScr(e.getMessage());
-		 * printScr(e.getStackTrace().toString()); } printScr("connecting");
-		 * String message = new JSONObject(this.xyzPhonePos).toString();
-		 * printScr(message); try { PrintWriter out = new
-		 * PrintWriter(socket.getOutputStream(), true);
-		 * out.println(message); printScr("sent"); } catch (Exception e) {
-		 * printScr("exception occurs"); } finally {
-		 * printScr("close socket"); socket.close(); }
-		 */
-	}
-
-	/***
-	 * helper to add to status textview for mobile debugging.
-	 * 
-	 * @param message
-	 */
-	public static void printScr(String message) {
-		txtSendStatus.append("\n" + message);
-	}
-
-	// //////////////////////
-	// LISTENERS
-	/**
-	 * onAccelerationChanged callback function
-	 */
-	public void onAccelerationChanged(float x, float y, float z) {
-		Log.d(TAG, "accerleration changed to" + Float.toString(x) + ", " + Float.toString(y) + ", " + Float.toString(z));
-		this.sendData.put("xPos", x);
-		this.sendData.put("yPos", y);
-		this.sendData.put("zPos", z);
-		((TextView) findViewById(R.id.x)).setText(String.valueOf(x));
-		((TextView) findViewById(R.id.y)).setText(String.valueOf(y));
-		((TextView) findViewById(R.id.z)).setText(String.valueOf(z));
-		
-		if (this.isSending == true && System.currentTimeMillis() - this.timeKeeper > 500) {
-//			Toast.makeText(this, "Send" + Float.toString(x) + ", " + Float.toString(y) + ", " + Float.toString(z), Toast.LENGTH_SHORT).show();
-			this.timeKeeper = System.currentTimeMillis();
-			
-			this.packetQ.add(new PhoneToServerPacket(1, (int)x, (int)y, (int)z));
-		}
-	}
-
-	/**
-	 * onShake callback
-	 */
-	public void onShake(float force) {
-		Toast.makeText(this, "Phone shaked : " + force, Toast.LENGTH_LONG)
-				.show();
-	}
-
-	/**
-	 * onColorChanged callback function
-	 */
-	public void onColorChanged(int color) {
-		txtSendStatus.setText(Integer.toString(color));
-		this.sendData.put("color", (float) color);
-
-		Button colorBtn = (Button) findViewById(R.id.color_button);
-		colorBtn.getBackground()
-				.setColorFilter(color, PorterDuff.Mode.MULTIPLY);
-	}
-
-	/**
-	 * onSettingsChanged callback
-	 */
-	public void onSettingsChanged(String ipAddr, int port) {
-		this.ipAddr = ipAddr;
-		this.port = port;
-		
-		printScr("Set to " + this.ipAddr + ":" + Integer.toString(this.port) + "\n");
-	}
-	public String getCurrentIP() {
-		return this.ipAddr;
-	}
-	public int getCurrentPort() {
-		return this.port;
-	}
-
-}
\ No newline at end of file
diff --git a/mobileapp/src/smoots/udesign/canvas/CanvasView.java b/mobileapp/src/smoots/udesign/canvas/CanvasView.java
deleted file mode 100755
index 11d6b60..0000000
--- a/mobileapp/src/smoots/udesign/canvas/CanvasView.java
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package smoots.udesign.canvas;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.View;
-import android.widget.TextView;
-
-/**
- * a View that takes accelerometer input and draws for CanvasActivity
- */
-public class CanvasView extends SurfaceView implements SurfaceHolder.Callback {
-	public class CanvasThread extends Thread {
-		// ---------------------
-		// CONSTANTS
-		// ---------------------
-		public static final int PIXEL_RADIUS = 10;
-		public static final double TILT_THRESHOLD = 0.5;
-
-		public static final int STATE_PAUSE = 1;
-		public static final int STATE_RUNNING = 2;
-
-		// Bundle key constants
-		private static final String KEY_DX = "mDX";
-		private static final String KEY_DY = "mDY";
-		private static final String KEY_X = "mX";
-		private static final String KEY_Y = "mY";
-		private static final String KEY_COLOR = "mColor";
-
-		// ---------------------
-		// MEMBER FIELDS
-		// ---------------------
-		private Paint mPixelPaint;
-		private int mPixelColor = Color.WHITE;
-
-		// Position
-		private float CENTER_X;
-		private float CENTER_Y;
-		private float mX;
-		private float mY;
-		private boolean justStart = true; // if loop for the 1st time, determine
-		// the center of the canvas.
-		// Velocity
-		private float mDX;
-		private float mDY;
-
-		// Color
-		private int mColor;
-
-		// Canvas size, will be determined when view is started.
-		private int mCanvasHeight = 1;
-		private int mCanvasWidth = 1;
-
-		/** Message handler used by thread to interact with TextView */
-		private Handler mHandler;
-
-		/** Used to figure out elapsed time between frames */
-		private long mLastTime;
-
-		/** The state of the game. One of READY, RUNNING, PAUSE, LOSE, or WIN */
-		private int mMode;
-
-		/** Indicate whether the surface has been created & is ready to draw */
-		private boolean mRun = false;
-
-		/** Handle to the surface manager object we interact with */
-		private SurfaceHolder mSurfaceHolder;
-
-		public CanvasThread(SurfaceHolder surfaceHolder, Context context,
-				Handler handler) {
-			mContext = context;
-
-			// get handles to some important objects
-			this.mSurfaceHolder = surfaceHolder;
-			this.mHandler = handler;
-
-			mPixelPaint = new Paint();
-			mPixelPaint.setAntiAlias(true);
-			mPixelPaint.setStyle(Paint.Style.FILL);
-			mPixelPaint.setColor(Color.WHITE);
-
-			// initial show-up of lander (not yet playing)
-			this.mX = 0;
-			this.mY = 0;
-			this.mDX = 0;
-			this.mDY = 0;
-			this.mColor = Color.WHITE;
-		}
-
-		/**
-		 * Start the view. Set the pixel's initial position.
-		 */
-		public void doStart() {
-			synchronized (mSurfaceHolder) {
-				// pick the center location for the pixel.
-				this.mX = mCanvasWidth / 2;
-				this.mY = mCanvasHeight / 2;
-
-				this.mLastTime = System.currentTimeMillis() + 100;
-				setState(STATE_RUNNING);
-			}
-		}
-
-		/**
-		 * Save canvas state to the provided Bundle.
-		 * 
-		 * @return Bundle with current state
-		 */
-		public Bundle saveState(Bundle map) {
-			synchronized (mSurfaceHolder) {
-				if (map != null) {
-					map.putDouble(KEY_X, Double.valueOf(this.mX));
-					map.putDouble(KEY_Y, Double.valueOf(this.mY));
-					map.putDouble(KEY_DX, Double.valueOf(this.mDX));
-					map.putDouble(KEY_DY, Double.valueOf(this.mDY));
-					map.putInt(KEY_COLOR, this.mColor);
-				}
-			}
-			return map;
-		}
-
-		/**
-		 * Restores canvas state from the indicated Bundle.
-		 * 
-		 * @param savedState
-		 *            Bundle with the saved state
-		 */
-		public synchronized void restoreState(Bundle savedState) {
-			synchronized (mSurfaceHolder) {
-				setState(STATE_PAUSE);
-
-				this.mX = savedState.getFloat(KEY_X);
-				this.mY = savedState.getFloat(KEY_Y);
-				this.mDX = savedState.getFloat(KEY_DX);
-				this.mDY = savedState.getFloat(KEY_DY);
-				this.mColor = savedState.getInt("KEY_COLOR");
-			}
-		}
-
-		public void run() {
-			while (this.mRun) {
-				Canvas c = null;
-				try {
-					c = mSurfaceHolder.lockCanvas(null);
-					synchronized (mSurfaceHolder) {
-						if (mMode == STATE_RUNNING) {
-							updatePhysics();
-						}
-						doDraw(c);
-					}
-				} finally {
-					if (c != null) {
-						// keep states consistent.
-						mSurfaceHolder.unlockCanvasAndPost(c);
-					}
-				}
-			}
-		}
-
-		/**
-		 * Set the thread loop handler.
-		 * 
-		 * @param b whether the thread is running
-		 */
-		public void setRunning(boolean b) {
-			this.mRun = b;
-		}
-
-		public void setState(int mode) {
-			synchronized (mSurfaceHolder) {
-				setState(mode, null);
-			}
-		}
-
-		/**
-		 * Sets the canvas mode.
-		 * 
-		 * @param mode
-		 *            one of the STATE constants
-		 * @param message
-		 *            string to add to screen or null
-		 */
-		public void setState(int mode, CharSequence message) {
-			/*
-			 * This method optionally can cause a text message to be displayed
-			 * to the user when the mode changes. Since the View that actually
-			 * renders that text is part of the main View hierarchy and not
-			 * owned by this thread, we can't touch the state of that View.
-			 * Instead we use a Message + Handler to relay commands to the main
-			 * thread, which updates the user-text View.
-			 */
-			synchronized (mSurfaceHolder) {
-				mMode = mode;
-
-				if (mMode == STATE_RUNNING) {
-					Message msg = mHandler.obtainMessage();
-					Bundle b = new Bundle();
-					b.putString("text", "");
-					b.putInt("viz", View.INVISIBLE);
-					msg.setData(b);
-					mHandler.sendMessage(msg);
-				} else {
-					Resources res = mContext.getResources();
-					CharSequence str = "";
-
-					Message msg = mHandler.obtainMessage();
-					Bundle b = new Bundle();
-					b.putString("text", str.toString());
-					b.putInt("viz", View.VISIBLE);
-					msg.setData(b);
-					mHandler.sendMessage(msg);
-				}
-			}
-		}
-
-		/* Callback invoked when surface dimensions change. */
-		public void setSurfaceSize(int width, int height) {
-			// synchronized to make sure these all change atomically
-			synchronized (mSurfaceHolder) {
-				mCanvasWidth = width;
-				mCanvasHeight = height;
-			}
-		}
-		
-		/**
-		 * Pauses the animation.
-		 */
-		public void pause() {
-			synchronized (mSurfaceHolder) {
-				if (mMode == STATE_RUNNING)
-					setState(STATE_PAUSE);
-			}
-		}
-		
-		/**
-		 * Resumes from a pause.
-		 */
-		public void unpause() {
-			// Move the real time clock to now
-			synchronized (mSurfaceHolder) {
-				mLastTime = System.currentTimeMillis() + 100;
-			}
-			setState(STATE_RUNNING);
-		}
-
-		/**
-		 * Draws the pixel to the provided Canvas.
-		 */
-		private void doDraw(Canvas canvas) {
-			if (this.justStart) { // initialize pixel position
-				Log.d("Canvas", Integer.toString(canvas.getWidth()) + " by "
-						+ Integer.toString(canvas.getHeight()));
-				this.CENTER_X = canvas.getWidth() / 2;
-				this.CENTER_Y = canvas.getHeight() / 2;
-
-				this.mX = this.CENTER_X;
-				this.mY = this.CENTER_Y;
-
-				this.justStart = false;
-			}
-
-			// Draw the black background.
-			this.mPixelPaint.setColor(Color.BLACK);
-			canvas.drawPaint(mPixelPaint);
-
-			// Draw pixel.
-			this.mPixelPaint.setColor(this.mPixelColor);
-			canvas.drawCircle(this.mX, this.mY, PIXEL_RADIUS, this.mPixelPaint);
-		}
-
-		/**
-		 * Figures the lander state (x, y, fuel, ...) based on the passage of
-		 * realtime. Does not invalidate(). Called at the start of draw().
-		 * Detects the end-of-game and sets the UI to the next state.
-		 */
-		private void updatePhysics() {
-			long now = System.currentTimeMillis();
-
-			// Do nothing if mLastTime is in the future.
-			// This allows the game-start to delay the start of the physics
-			// by 100ms or whatever.
-			if (mLastTime > now)
-				return;
-
-			double elapsed = (now - mLastTime) / 1000.0;
-
-			/*
-			 * // Base accelerations -- 0 for x, gravity for y double ddx = 0.0;
-			 * double ddy = elapsed;
-			 * 
-			 * double dxOld = mDX; double dyOld = mDY;
-			 * 
-			 * // figure speeds for the end of the period mDX += ddx; mDY +=
-			 * ddy;
-			 * 
-			 * // figure position based on average speed during the period mX +=
-			 * elapsed * (mDX + dxOld) / 2; mY += elapsed * (mDY + dyOld) / 2;
-			 */
-
-			mLastTime = now;
-		}
-
-		public void updatePixelColor(int color) {
-			this.mPixelColor = color;
-		}
-
-		public void updatePixelVelocity(float x, float y, float z) {
-			this.mX = (float) (this.CENTER_X - x / 10. * this.CENTER_X);
-			this.mY = (float) (this.CENTER_Y + y / 10. * this.CENTER_Y);
-		}
-	}
-
-	/** Handle to application context */
-	private Context mContext;
-
-	/** Pointer to the text view to display "Paused.." etc. */
-	private TextView mStatusText;
-
-	/** The thread that actually draws the animation */
-	private CanvasThread thread;
-
-	public CanvasView(Context context, AttributeSet attrs) {
-		super(context, attrs);
-
-		// register our interest in hearing about changes to our surface
-		SurfaceHolder holder = getHolder();
-		holder.addCallback(this);
-
-		// create thread only; it's started in surfaceCreated()
-		thread = new CanvasThread(holder, context, new Handler() {
-			@Override
-			public void handleMessage(Message m) {
-				mStatusText.setVisibility(m.getData().getInt("viz"));
-				mStatusText.setText(m.getData().getString("text"));
-			}
-		});
-
-		setFocusable(true); // make sure we get key events
-	}
-
-	/**
-	 * Fetches the animation thread corresponding to this LunarView.
-	 * 
-	 * @return the animation thread
-	 */
-	public CanvasThread getThread() {
-		return thread;
-	}
-
-	/**
-	 * Standard window-focus override. Notice focus lost so we can pause on
-	 * focus lost. e.g. user switches to take a call.
-	 */
-	public void onWindowFocusChanged(boolean hasWindowFocus) {
-		if (!hasWindowFocus)
-			thread.pause();
-	}
-
-	/**
-	 * Installs a pointer to the text view used for messages.
-	 */
-	public void setTextView(TextView textView) {
-		mStatusText = textView;
-	}
-
-	/* Callback invoked when the surface dimensions change. */
-	public void surfaceChanged(SurfaceHolder holder, int format, int width,
-			int height) {
-		thread.setSurfaceSize(width, height);
-	}
-
-	/*
-	 * Callback invoked when the Surface has been created and is ready to be
-	 * used.
-	 */
-	public void surfaceCreated(SurfaceHolder holder) {
-		// start the thread here so that we don't busy-wait in run()
-		// waiting for the surface to be created
-		thread.setRunning(true);
-		thread.start();
-	}
-
-	/*
-	 * Callback invoked when the Surface has been destroyed. Thread needs to stop.
-	 */
-	public void surfaceDestroyed(SurfaceHolder holder) {
-		boolean retry = true;
-		thread.setRunning(false);
-		while (retry) {
-			try {
-				thread.join();
-				retry = false;
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-}
diff --git a/mobileapp/src/smoots/udesign/canvas/VirtualCanvasActivity.java b/mobileapp/src/smoots/udesign/canvas/VirtualCanvasActivity.java
deleted file mode 100755
index 8ba7508..0000000
--- a/mobileapp/src/smoots/udesign/canvas/VirtualCanvasActivity.java
+++ /dev/null
@@ -1,313 +0,0 @@
-package smoots.udesign.canvas;
-
-import java.io.IOException;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import smoots.udesign.accelerometer.AccelerometerListener;
-import smoots.udesign.accelerometer.AccelerometerManager;
-import smoots.udesign.canvas.CanvasView.CanvasThread;
-import smoots.udesign.colorpicker.ColorPickerDialog;
-import smoots.udesign.colorpicker.ColorPickerListener;
-import smoots.udesign.io.ClientWriter;
-import smoots.udesign.main.R;
-import smoots.udesign.main.R.id;
-import smoots.udesign.main.R.layout;
-import smoots.udesign.main.R.menu;
-import smoots.udesign.packet.MotionType;
-import smoots.udesign.packet.Packet;
-import smoots.udesign.packet.PhoneToServerPacket;
-import smoots.udesign.settings.OnSettingsChangedListener;
-import smoots.udesign.settings.SettingsDialog;
-import smoots.udesign.util.PhoneDebugger;
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class VirtualCanvasActivity extends Activity implements
-		AccelerometerListener, ColorPickerListener, OnSettingsChangedListener {
-
-	private static final String TAG = "VirtualCanvasActivity";
-	private static Context CONTEXT;
-	private static String DEFAULT_IP = "18.244.3.179";
-	// private static String DEFAULT_IP = "10.189.17.92";
-	private int DEFAULT_PORT = 20120;
-	private static final long TIME_INTERVAL_THRESHOLD = 500;
-
-	// ACCELEROMETER INFO
-	private HashMap<String, Float> sendData;
-
-	// SENDER INFO
-	private ClientWriter writerThread;
-	private String ipAddr;
-	private int port;
-	private BlockingQueue<Packet> packetQ;
-	private boolean isSending = false;
-	private long timeKeeper;
-
-	// COLOR PICKER INFO
-	private static final String BRIGHTNESS_PREFERENCE_KEY = "brightness";
-	private static final String COLOR_PREFERENCE_KEY = "color";
-
-	// VIRTUALIZATION VIEW AND THREAD
-	private CanvasThread mCanvasThread;
-	private CanvasView mCanvasView;
-
-	// -------------------------
-	// ACTIVITY ATTRIBUTES
-	// -------------------------
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		initControls();
-
-		if (savedInstanceState == null) {
-			// we were just launched: set up a new canvas
-			mCanvasThread.setState(CanvasThread.STATE_RUNNING);
-			Log.w(this.getClass().getName(), "SIS is null");
-		} else {
-			// resume a saved canvas
-			mCanvasThread.restoreState(savedInstanceState);
-			Log.w(this.getClass().getName(), "SIS is nonnull");
-		}
-	}
-
-	private void initControls() {
-		setContentView(R.layout.canvaslo);
-		CONTEXT = this;
-
-		this.mCanvasView = (CanvasView) findViewById(R.id.canvas_view);
-		this.mCanvasThread = mCanvasView.getThread();
-		this.mCanvasView.setTextView((TextView) findViewById(R.id.status_text));
-
-		this.ipAddr = DEFAULT_IP;
-		this.port = DEFAULT_PORT;
-		this.packetQ = new LinkedBlockingQueue<Packet>();
-
-		this.sendData = new HashMap<String, Float>();
-		this.sendData.put("color", (float) 0);
-
-		// txtSendStatus = (TextView) findViewById(R.id.txtSendStatus);
-		this.timeKeeper = System.currentTimeMillis();
-	}
-
-	protected void onPause() {
-		super.onPause();
-		this.mCanvasView.getThread().pause(); // pause canvas when Activity pauses
-	}
-
-	protected void onResume() {
-		super.onResume();
-		if (AccelerometerManager.isSupported()) {
-			AccelerometerManager.startListening(this);
-		}
-	}
-
-	protected void onDestroy() {
-		super.onDestroy();
-		if (AccelerometerManager.isListening()) {
-			AccelerometerManager.stopListening();
-		}
-	}
-
-	protected void onSaveInstanceState(Bundle outState) {
-		// just have the View's thread save its state into our Bundle
-		super.onSaveInstanceState(outState);
-		this.mCanvasThread.saveState(outState);
-		Log.w(this.getClass().getName(), "SaveInstanceState called");
-	}
-
-	public boolean onCreateOptionsMenu(Menu menu) {
-		MenuInflater inflater = getMenuInflater();
-		inflater.inflate(R.menu.canvas_menu, menu);
-		return true;
-	}
-
-	public boolean onOptionsItemSelected(MenuItem item) {
-		// Handle item selection
-		switch (item.getItemId()) {
-		case R.id.send:
-			toggleSending();
-
-			/*
-			 * // pass Sending Intent to PacketSender Intent toPacketSender =
-			 * new Intent(this, PacketSenderService.class); //
-			 * toPacketSender.putExtra("ipAddr", this.ipAddr); //
-			 * toPacketSender.putExtra("port", this.port);
-			 * toPacketSender.putExtra("ipAddr", "18.244.6.28");
-			 * toPacketSender.putExtra("port", "20120"); if (!isSending) {
-			 * startService(toPacketSender); isSending = true; } else {
-			 * stopService(toPacketSender); isSending = false; }
-			 */
-			return true;
-
-		case R.id.color_picker:
-			int color = PreferenceManager.getDefaultSharedPreferences(
-					VirtualCanvasActivity.this).getInt(COLOR_PREFERENCE_KEY,
-					Color.WHITE);
-			new ColorPickerDialog(VirtualCanvasActivity.this,
-					VirtualCanvasActivity.this, color).show();
-			return true;
-
-		// case R.id.effect_picker:
-		// return true;
-
-		case R.id.settings:
-			new SettingsDialog(VirtualCanvasActivity.this,
-					VirtualCanvasActivity.this).show();
-			return true;
-
-		default:
-			return super.onOptionsItemSelected(item);
-		}
-	}
-
-	// -------------------------
-	// STATIC
-	// -------------------------
-	public static Context getContext() {
-		return CONTEXT;
-	}
-
-	// -------------------------
-	// HELPERS
-	// -------------------------
-	private void toggleSending() {
-		// Toast.makeText(this, this.ipAddr + ":" + Integer.toString(this.port),
-		// Toast.LENGTH_SHORT).show();
-
-		if (!this.isSending) {
-			Log.d(TAG, "Start Sending");
-			Socket socket = null;
-			try {
-				socket = new Socket(this.ipAddr, this.port);
-				this.writerThread = new ClientWriter(this.packetQ, socket);
-				this.writerThread.setRunning(true);
-				this.writerThread.start();
-				this.isSending = true;
-			} catch (UnknownHostException e) {
-				PhoneDebugger.debug(TAG, e);
-				Toast.makeText(this, "Socket Not Created", Toast.LENGTH_SHORT)
-						.show();
-			} catch (IOException e) {
-				PhoneDebugger.debug(TAG, e);
-				Toast.makeText(this, "Socket Not Created", Toast.LENGTH_SHORT)
-						.show();
-			}
-		} else {
-			Log.d(TAG, "Stop Sending");
-
-			this.writerThread.setRunning(false);
-			this.writerThread.interrupt();
-
-			Toast.makeText(this, "Writer stopped", Toast.LENGTH_SHORT).show();
-			this.isSending = false;
-		}
-
-		// String serverAddr = "www.google.com";
-		// int serverPort =
-		// Integer.parseInt(((EditText)findViewById(R.id.settings_port)).getText().toString());
-
-		/*
-		 * String serverAddr = this.ipAddr; //String serverAddr =
-		 * ((EditText)findViewById(R.id.settings_ip)).getText().toString(); int
-		 * serverPort = this.port; Toast.makeText(this, serverAddr,
-		 * Toast.LENGTH_LONG).show();
-		 * 
-		 * Socket socket = null; try { socket = new Socket(serverAddr,
-		 * serverPort); //socket = new Socket(serverAddr, 80); } catch
-		 * (Exception e) { printScr("Exception!"); printScr(e.getMessage());
-		 * printScr(e.getStackTrace().toString()); } printScr("connecting");
-		 * String message = new JSONObject(this.xyzPhonePos).toString();
-		 * printScr(message); try { PrintWriter out = new
-		 * PrintWriter(socket.getOutputStream(), true); out.println(message);
-		 * printScr("sent"); } catch (Exception e) {
-		 * printScr("exception occurs"); } finally { printScr("close socket");
-		 * socket.close(); }
-		 */
-	}
-
-	// -------------------------
-	// LISTENERS
-	// -------------------------
-	/**
-	 * onAccelerationChanged callback function
-	 */
-	public void onAccelerationChanged(float x, float y, float z) {
-		Log.d(TAG, "accerleration changed to" + Float.toString(x) + ", "
-				+ Float.toString(y) + ", " + Float.toString(z));
-		this.sendData.put("xPos", x);
-		this.sendData.put("yPos", y);
-		this.sendData.put("zPos", z);
-		// ((TextView) findViewById(R.id.x)).setText(String.valueOf(x));
-		// ((TextView) findViewById(R.id.y)).setText(String.valueOf(y));
-		// ((TextView) findViewById(R.id.z)).setText(String.valueOf(z));
-
-		this.mCanvasThread.updatePixelVelocity(x, y, z);
-
-		if (this.isSending == true
-				&& System.currentTimeMillis() - this.timeKeeper > TIME_INTERVAL_THRESHOLD) {
-			// Toast.makeText(this, "Send" + Float.toString(x) + ", " +
-			// Float.toString(y) + ", " + Float.toString(z),
-			// Toast.LENGTH_SHORT).show();
-			this.timeKeeper = System.currentTimeMillis();
-			
-			this.packetQ.add(new PhoneToServerPacket(
-					MotionType.MOVE, 
-					this.sendData.get("xPos"), 
-					this.sendData.get("yPos"),
-					this.sendData.get("color"))
-			);
-		}
-	}
-
-	/**
-	 * onShake callback
-	 */
-	public void onShake(float force) {
-		Toast.makeText(this, "Phone shaked : " + force, Toast.LENGTH_LONG)
-				.show();
-
-		this.packetQ.add(new PhoneToServerPacket(2, 0, 0, this.sendData.get("color")));
-	}
-
-	/**
-	 * onColorChanged callback function
-	 */
-	public void onColorChanged(int color) {
-		// txtSendStatus.setText(Integer.toString(color));
-		this.sendData.put("color", (float) color);
-
-		this.mCanvasThread.updatePixelColor(color);
-		// Button colorBtn = (Button) findViewById(R.id.color_button);
-		// colorBtn.getBackground()
-		// .setColorFilter(color, PorterDuff.Mode.MULTIPLY);
-	}
-
-	/**
-	 * onSettingsChanged callback
-	 */
-	public void onSettingsChanged(String ipAddr, int port) {
-		this.ipAddr = ipAddr;
-		this.port = port;
-	}
-
-	public String getCurrentIP() {
-		return this.ipAddr;
-	}
-
-	public int getCurrentPort() {
-		return this.port;
-	}
-
-}
\ No newline at end of file
diff --git a/mobileapp/src/smoots/udesign/colorpicker/ColorPickerDialog.java b/mobileapp/src/smoots/udesign/colorpicker/ColorPickerDialog.java
deleted file mode 100755
index b390d2e..0000000
--- a/mobileapp/src/smoots/udesign/colorpicker/ColorPickerDialog.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package smoots.udesign.colorpicker;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.Gravity;
-import android.widget.LinearLayout;
-
-public class ColorPickerDialog extends Dialog {
-
-	private final ColorPickerListener mListener;
-	private final int mInitialColor;
-
-	public ColorPickerDialog(Context context, ColorPickerListener listener, int initialColor) {
-		super(context);
-
-		mListener = listener;
-		mInitialColor = initialColor;
-	}
-
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		ColorPickerListener l = new ColorPickerListener() {
-			public void onColorChanged(int color) {
-				mListener.onColorChanged(color);
-				dismiss();
-			}
-		};
-
-		LinearLayout layout = new LinearLayout(getContext());
-		layout.setOrientation(LinearLayout.VERTICAL);
-		layout.setGravity(Gravity.CENTER);
-		layout.setPadding(10, 10, 10, 10);
-		layout.addView(new ColorPickerView(getContext(), l, mInitialColor),
-				new LinearLayout.LayoutParams(
-						LinearLayout.LayoutParams.WRAP_CONTENT,
-						LinearLayout.LayoutParams.WRAP_CONTENT));
-
-		setContentView(layout);
-		setTitle("Pick a Color");
-	}
-}
diff --git a/mobileapp/src/smoots/udesign/colorpicker/ColorPickerListener.java b/mobileapp/src/smoots/udesign/colorpicker/ColorPickerListener.java
deleted file mode 100755
index fb5edbe..0000000
--- a/mobileapp/src/smoots/udesign/colorpicker/ColorPickerListener.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package smoots.udesign.colorpicker;
-
-public interface ColorPickerListener {
-	void onColorChanged(int color);
-}
diff --git a/mobileapp/src/smoots/udesign/colorpicker/ColorPickerView.java b/mobileapp/src/smoots/udesign/colorpicker/ColorPickerView.java
deleted file mode 100755
index f2dea98..0000000
--- a/mobileapp/src/smoots/udesign/colorpicker/ColorPickerView.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package smoots.udesign.colorpicker;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.graphics.Shader;
-import android.graphics.SweepGradient;
-import android.view.MotionEvent;
-import android.view.View;
-
-public class ColorPickerView extends View {
-	private final Paint mPaint;
-	private final Paint mCenterPaint;
-	private final int[] mColors;
-	private final ColorPickerListener mListener;
-
-	ColorPickerView(Context c, ColorPickerListener l, int color) {
-		super(c);
-		mListener = l;
-		mColors = new int[] { 0xFFFF0000, 0xFFFF00FF, 0xFF0000FF,
-				0xFF00FFFF, 0xFF00FF00, 0xFFFFFF00, 0xFFFF0000 };
-		Shader s = new SweepGradient(0, 0, mColors, null);
-
-		mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-		mPaint.setShader(s);
-		mPaint.setStyle(Paint.Style.STROKE);
-		mPaint.setStrokeWidth(32);
-
-		mCenterPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-		mCenterPaint.setColor(color);
-		mCenterPaint.setStrokeWidth(5);
-	}
-
-	private boolean mTrackingCenter;
-	private boolean mHighlightCenter;
-
-	@Override
-	protected void onDraw(Canvas canvas) {
-		float r = CENTER_X - mPaint.getStrokeWidth() * 0.5f;
-
-		canvas.translate(CENTER_X, CENTER_X);
-
-		canvas.drawOval(new RectF(-r, -r, r, r), mPaint);
-		canvas.drawCircle(0, 0, CENTER_RADIUS, mCenterPaint);
-
-		if (mTrackingCenter) {
-			int c = mCenterPaint.getColor();
-			mCenterPaint.setStyle(Paint.Style.STROKE);
-
-			if (mHighlightCenter) {
-				mCenterPaint.setAlpha(0xFF);
-			} else {
-				mCenterPaint.setAlpha(0x80);
-			}
-			canvas.drawCircle(0, 0, CENTER_RADIUS
-					+ mCenterPaint.getStrokeWidth(), mCenterPaint);
-
-			mCenterPaint.setStyle(Paint.Style.FILL);
-			mCenterPaint.setColor(c);
-		}
-	}
-
-	@Override
-	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-		setMeasuredDimension(CENTER_X * 2, CENTER_Y * 2);
-	}
-
-	private static final int CENTER_X = 100;
-	private static final int CENTER_Y = 100;
-	private static final int CENTER_RADIUS = 32;
-
-
-	private int ave(int s, int d, float p) {
-		return s + java.lang.Math.round(p * (d - s));
-	}
-
-	private int interpColor(int colors[], float unit) {
-		if (unit <= 0)
-			return colors[0];
-		if (unit >= 1)
-			return colors[colors.length - 1];
-
-		float p = unit * (colors.length - 1);
-		int i = (int) p;
-		p -= i;
-
-		// now p is just the fractional part [0...1) and i is the index
-		int c0 = colors[i];
-		int c1 = colors[i + 1];
-		int a = ave(Color.alpha(c0), Color.alpha(c1), p);
-		int r = ave(Color.red(c0), Color.red(c1), p);
-		int g = ave(Color.green(c0), Color.green(c1), p);
-		int b = ave(Color.blue(c0), Color.blue(c1), p);
-
-		return Color.argb(a, r, g, b);
-	}
-
-	/*
-
-	private int floatToByte(float x) {
-		int n = java.lang.Math.round(x);
-		return n;
-	}
-
-	private int pinToByte(int n) {
-		if (n < 0) {
-			n = 0;
-		} else if (n > 255) {
-			n = 255;
-		}
-		return n;
-	}
-
-	private int rotateColor(int color, float rad) {
-		float deg = rad * 180 / 3.1415927f;
-		int r = Color.red(color);
-		int g = Color.green(color);
-		int b = Color.blue(color);
-
-		ColorMatrix cm = new ColorMatrix();
-		ColorMatrix tmp = new ColorMatrix();
-
-		cm.setRGB2YUV();
-		tmp.setRotate(0, deg);
-		cm.postConcat(tmp);
-		tmp.setYUV2RGB();
-		cm.postConcat(tmp);
-
-		final float[] a = cm.getArray();
-
-		int ir = floatToByte(a[0] * r + a[1] * g + a[2] * b);
-		int ig = floatToByte(a[5] * r + a[6] * g + a[7] * b);
-		int ib = floatToByte(a[10] * r + a[11] * g + a[12] * b);
-
-		return Color.argb(Color.alpha(color), pinToByte(ir), pinToByte(ig),
-				pinToByte(ib));
-	}
-	*/
-
-	private static final float PI = 3.1415926f;
-
-	@Override
-	public boolean onTouchEvent(MotionEvent event) {
-		float x = event.getX() - CENTER_X;
-		float y = event.getY() - CENTER_Y;
-		boolean inCenter = java.lang.Math.sqrt(x * x + y * y) <= CENTER_RADIUS;
-
-		switch (event.getAction()) {
-		case MotionEvent.ACTION_DOWN:
-			mTrackingCenter = inCenter;
-			if (inCenter) {
-				mHighlightCenter = true;
-				invalidate();
-				break;
-			}
-		case MotionEvent.ACTION_MOVE:
-			if (mTrackingCenter) {
-				if (mHighlightCenter != inCenter) {
-					mHighlightCenter = inCenter;
-					invalidate();
-				}
-			} else {
-				float angle = (float) java.lang.Math.atan2(y, x);
-				// need to turn angle [-PI ... PI] into unit [0....1]
-				float unit = angle / (2 * PI);
-				if (unit < 0) {
-					unit += 1;
-				}
-				mCenterPaint.setColor(interpColor(mColors, unit));
-				invalidate();
-			}
-			break;
-		case MotionEvent.ACTION_UP:
-			if (mTrackingCenter) {
-				if (inCenter) {
-					mListener.onColorChanged(mCenterPaint.getColor());
-				}
-				mTrackingCenter = false; // so we draw w/o halo
-				invalidate();
-			}
-			break;
-		}
-		return true;
-	}
-}
diff --git a/mobileapp/src/smoots/udesign/io/ClientReader.java b/mobileapp/src/smoots/udesign/io/ClientReader.java
deleted file mode 100755
index 7f7cbcf..0000000
--- a/mobileapp/src/smoots/udesign/io/ClientReader.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package smoots.udesign.io;
-
-import java.io.IOException;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import smoots.udesign.accelerometer.AccelerometerListener;
-import smoots.udesign.accelerometer.AccelerometerManager;
-import smoots.udesign.packet.MotionType;
-import smoots.udesign.packet.Packet;
-import smoots.udesign.packet.PhoneToServerPacket;
-
-/**
- * ClientReader is in charge of receiving data from the view, parsing
- * the textual protocol into executable packets, and send the packets to the
- * processor. 1 per client.
- */
-public class ClientReader implements Runnable, AccelerometerListener {
-	private BlockingQueue<Packet> accPktQ;
-	private BlockingQueue<Packet> packetQ;
-	private boolean stopped;
-
-	/**
-	 * Initialize the queue of accelerometer data.
-	 * 
-	 * @param packetQ The queue of packets 
-	 */
-	public ClientReader(BlockingQueue<Packet> packetQ) {
-		this.accPktQ = new LinkedBlockingQueue<Packet>();
-		this.packetQ = packetQ;
-		
-//		if (AccelerometerManager.isSupported()) {
-			AccelerometerManager.startListening(this);
-//		}
-	}
-
-	/**
-	 * From the queue, extract a packet of Accelerometer data and forward it to the
-	 * processor, which will execute the packet accordingly.
-	 * 
-	 * @throws InterruptedException 
-	 */
-	public void forward() throws InterruptedException {
-		packetQ.add(accPktQ.take());
-	}
-
-	/**
-	 * runtime method, do the following actions in sequence:
-	 * 		receive -> forward.
-	 */
-	public void run() {
-		while (true) {
-			try {
-				Thread.sleep(1000);
-				forward(); // to the processor
-			} catch (InterruptedException e) {
-				break;
-			}
-		}
-	}
-
-	public void onAccelerationChanged(float x, float y, float z) {
-		// CHANGE ACCELEROMETER READINGS TO LIGHT LOCATIONS
-		// ...
-		
-		accPktQ.add(new PhoneToServerPacket(MotionType.MOVE, (int)x, (int)y, (int)z));
-	}
-
-	public void onShake(float force) {
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/mobileapp/src/smoots/udesign/io/ClientWriter.java b/mobileapp/src/smoots/udesign/io/ClientWriter.java
deleted file mode 100755
index e84d41a..0000000
--- a/mobileapp/src/smoots/udesign/io/ClientWriter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package smoots.udesign.io;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.Socket;
-import java.util.concurrent.BlockingQueue;
-
-import smoots.udesign.packet.Packet;
-import smoots.udesign.packet.PhoneToServerPacket;
-
-/**
- * A class in charge of taking packets from queue and parses them into JSON
- * formatted messages and - Send messages to the server.
- */
-public class ClientWriter extends Thread {
-	private static final String TAG = "ClientWriter";
-	private final PrintWriter out;
-	private BlockingQueue<Packet> packetQ;
-	private boolean mRun = false;
-
-	/**
-	 * Constructor that initializes: the output writer, and a packet queue for
-	 * sending data.
-	 * 
-	 * @param clientSocket
-	 *            the Socket the Client's going to use.
-	 * @throws IOException
-	 *             possible during socket i/o
-	 */
-	public ClientWriter(BlockingQueue<Packet> packetQ, Socket clientSocket)
-			throws IOException {
-		this.out = new PrintWriter(clientSocket.getOutputStream(), true);
-		this.packetQ = packetQ;
-	}
-
-	/**
-	 * Converting a packet into text form and send it to the server.
-	 */
-	public void send() {
-		Packet pac;
-		try {
-			pac = this.packetQ.take();
-			if (pac != null) {
-				this.out.println(pac.packetToText());
-			}
-			// this.out.println("gosgos1");
-		} catch (InterruptedException e) {
-			// PhoneDebugger.debug(TAG, e);
-		}
-	}
-
-	/**
-	 * Set the running status of the thread.
-	 * 
-	 * @param b
-	 *            If the thread is running
-	 */
-	public void setRunning(boolean b) {
-		this.mRun = b;
-	}
-
-	/**
-	 * runtime method, keep sending packets from the queue.
-	 */
-	public void run() {
-		while (this.mRun) {
-			this.send();
-		}
-		this.out.println("end");
-	}
-}
diff --git a/mobileapp/src/smoots/udesign/main/InteractionsActivity.java b/mobileapp/src/smoots/udesign/main/InteractionsActivity.java
deleted file mode 100755
index 1ae2016..0000000
--- a/mobileapp/src/smoots/udesign/main/InteractionsActivity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package smoots.udesign.main;
-
-import android.app.ListActivity;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-import android.widget.AdapterView.OnItemClickListener;
-
-public class InteractionsActivity extends ListActivity {
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		
-		String[] interactions_list = getResources().getStringArray(R.array.interactions_array);
-		setListAdapter(new ArrayAdapter<String>(this, R.layout.interactions_item,
-				interactions_list));
-
-		ListView lv = getListView();
-		lv.setTextFilterEnabled(true);
-
-		lv.setOnItemClickListener(new OnItemClickListener() {
-			public void onItemClick(AdapterView<?> parent, View view,
-					int position, long id) {
-				// When clicked, show a toast with the TextView text
-				Toast.makeText(getApplicationContext(),
-						((TextView) view).getText(), Toast.LENGTH_SHORT).show();
-			}
-		});
-	}
-}
\ No newline at end of file
diff --git a/mobileapp/src/smoots/udesign/main/UDesignTabWidget.java b/mobileapp/src/smoots/udesign/main/UDesignTabWidget.java
deleted file mode 100755
index 35425c1..0000000
--- a/mobileapp/src/smoots/udesign/main/UDesignTabWidget.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package smoots.udesign.main;
-
-import smoots.udesign.canvas.VirtualCanvasActivity;
-import android.app.TabActivity;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.widget.TabHost;
-
-public class UDesignTabWidget extends TabActivity {
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.main);
-
-		Resources res = getResources(); // Resource object to get Drawables
-		TabHost tabHost = getTabHost(); // The activity TabHost
-		TabHost.TabSpec spec; // Reusable TabSpec for each tab
-		Intent intent; // Reusable Intent for each tab
-
-		// Create an Intent to launch an Activity for the tab (to be reused)
-		intent = new Intent().setClass(this, VirtualCanvasActivity.class);
-		// Initialize a TabSpec for each tab and add it to the TabHost
-		spec = tabHost.newTabSpec("canvas").setIndicator("Canvas",
-				res.getDrawable(R.drawable.ic_tab_canvas)).setContent(intent);
-		tabHost.addTab(spec);
-
-		// Do the same for the other tabs
-		/*
-		 * intent = new Intent().setClass(this, ColorActivity.class); spec =
-		 * tabHost.newTabSpec("color").setIndicator("Color",
-		 * res.getDrawable(R.drawable.ic_tab_color)) .setContent(intent);
-		 * tabHost.addTab(spec);
-		 */
-
-		intent = new Intent().setClass(this, InteractionsActivity.class);
-		spec = tabHost.newTabSpec("interactions").setIndicator("Interactions",
-				res.getDrawable(R.drawable.ic_tab_interactions)).setContent(
-				intent);
-		tabHost.addTab(spec);
-
-		tabHost.setCurrentTab(0);
-	}
-}
\ No newline at end of file
diff --git a/mobileapp/src/smoots/udesign/packet/.svn/all-wcprops b/mobileapp/src/smoots/udesign/packet/.svn/all-wcprops
deleted file mode 100755
index e689471..0000000
--- a/mobileapp/src/smoots/udesign/packet/.svn/all-wcprops
+++ /dev/null
@@ -1,53 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 70
-/6.005/fa09/!svn/ver/13356/groups/guichat/suny-seojin-makif/src/packet
-END
-ClientToServerPacket.java
-K 25
-svn:wc:ra_dav:version-url
-V 96
-/6.005/fa09/!svn/ver/13337/groups/guichat/suny-seojin-makif/src/packet/ClientToServerPacket.java
-END
-ServerToClientPacket.java
-K 25
-svn:wc:ra_dav:version-url
-V 96
-/6.005/fa09/!svn/ver/13350/groups/guichat/suny-seojin-makif/src/packet/ServerToClientPacket.java
-END
-ClientToServerPacketTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 100
-/6.005/fa09/!svn/ver/13356/groups/guichat/suny-seojin-makif/src/packet/ClientToServerPacketTest.java
-END
-ServerToClientPacketTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 100
-/6.005/fa09/!svn/ver/13356/groups/guichat/suny-seojin-makif/src/packet/ServerToClientPacketTest.java
-END
-CSActionType.java
-K 25
-svn:wc:ra_dav:version-url
-V 88
-/6.005/fa09/!svn/ver/13352/groups/guichat/suny-seojin-makif/src/packet/CSActionType.java
-END
-SCActionType.java
-K 25
-svn:wc:ra_dav:version-url
-V 88
-/6.005/fa09/!svn/ver/13352/groups/guichat/suny-seojin-makif/src/packet/SCActionType.java
-END
-Packet.java
-K 25
-svn:wc:ra_dav:version-url
-V 82
-/6.005/fa09/!svn/ver/13350/groups/guichat/suny-seojin-makif/src/packet/Packet.java
-END
-UnaryAction.java
-K 25
-svn:wc:ra_dav:version-url
-V 87
-/6.005/fa09/!svn/ver/13352/groups/guichat/suny-seojin-makif/src/packet/UnaryAction.java
-END
diff --git a/mobileapp/src/smoots/udesign/packet/.svn/entries b/mobileapp/src/smoots/udesign/packet/.svn/entries
deleted file mode 100755
index 9f75960..0000000
--- a/mobileapp/src/smoots/udesign/packet/.svn/entries
+++ /dev/null
@@ -1,300 +0,0 @@
-10
-
-dir
-14707
-https://svn.csail.mit.edu/6.005/fa09/groups/guichat/suny-seojin-makif/src/packet
-https://svn.csail.mit.edu/6.005/fa09
-
-
-
-2009-12-08T00:54:41.304169Z
-13356
-seojin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7e8804c8-f901-4b4c-909e-cf0ac05cc91f
-
-ServerToClientPacket.java
-file
-
-
-
-
-2009-12-08T00:55:26.171875Z
-1cc2ae44e8d2a45722bf47464373f8f7
-2009-12-08T00:50:45.025999Z
-13350
-seojin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7453
-
-ClientToServerPacket.java
-file
-
-
-
-
-2009-12-08T00:55:26.156250Z
-237ea87832a5885ce3300d41896a6e48
-2009-12-08T00:36:47.476844Z
-13337
-seojin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8059
-
-ClientToServerPacketTest.java
-file
-
-
-
-
-2009-12-08T00:55:26.171875Z
-e06eb227a39619a3e87174860ac0bfc3
-2009-12-08T00:54:41.304169Z
-13356
-seojin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3111
-
-ServerToClientPacketTest.java
-file
-
-
-
-
-2009-12-08T00:55:26.171875Z
-ba9e3627cba6ce9cdd27c12d7364c377
-2009-12-08T00:54:41.304169Z
-13356
-seojin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3053
-
-CSActionType.java
-file
-
-
-
-
-2009-12-08T00:55:26.171875Z
-6702ab980365eab9549230a68598b571
-2009-12-08T00:52:26.453778Z
-13352
-seojin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-226
-
-SCActionType.java
-file
-
-
-
-
-2009-12-08T00:55:26.171875Z
-772ebaec83d411fe57b44f2888ff3898
-2009-12-08T00:52:26.453778Z
-13352
-seojin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-237
-
-Packet.java
-file
-
-
-
-
-2009-12-08T00:55:26.187500Z
-02feedecb041b722efa3b6eb51f9cb3e
-2009-12-08T00:50:45.025999Z
-13350
-seojin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-252
-
-UnaryAction.java
-file
-
-
-
-
-2009-12-08T00:55:26.187500Z
-cc4e1ef246138c0dd76470df83551f47
-2009-12-08T00:52:26.453778Z
-13352
-seojin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-194
-
diff --git a/mobileapp/src/smoots/udesign/packet/.svn/text-base/CSActionType.java.svn-base b/mobileapp/src/smoots/udesign/packet/.svn/text-base/CSActionType.java.svn-base
deleted file mode 100755
index f0d75e5..0000000
--- a/mobileapp/src/smoots/udesign/packet/.svn/text-base/CSActionType.java.svn-base
+++ /dev/null
@@ -1,10 +0,0 @@
-package packet;
-
-/**
- * Action types for Client to Server packet
- * @author seojin
- *
- */
-public enum CSActionType {
-	OpenConversation, ExitConversation, sendMessage, InviteUser, acceptInvitation, rejectInvitation
-}
diff --git a/mobileapp/src/smoots/udesign/packet/.svn/text-base/ClientToServerPacket.java.svn-base b/mobileapp/src/smoots/udesign/packet/.svn/text-base/ClientToServerPacket.java.svn-base
deleted file mode 100755
index b9fce4a..0000000
--- a/mobileapp/src/smoots/udesign/packet/.svn/text-base/ClientToServerPacket.java.svn-base
+++ /dev/null
@@ -1,236 +0,0 @@
-package packet;
-
-/**
- * Client to Server Packet data type including parser and toText converters.
- * @author seojin
- *
- */
-public class ClientToServerPacket implements Packet{
-	
-	/*	PROTOCOL
-	Packet ::= AdministrativePacket | ConversationalPacket
-	AdministrativePacket ::= (defaultID | clientID) \t unaryAction \t screenName?
-	ConversationalPacket ::= clientID \t actionType \t (ConversationID | clientID)  \n  (Message | inviteID)?
-	actionType ::= OpenConversation | ExitConversation | sendMessage | InviteUser | acceptInvitation | rejectInvitation
-	unaryAction ::= logIn | logOut | changeScreenName | requestWholeUserList
-	 **optional clientID(with choice of conversationID after actionType) only follows openConversation.
-	 **inviteID is for the invitation action. For invitation action, we have conversationID first and clientID to invite in next line. 
-	 **defaultID is only followed by logIn and screenName.
-	*/
-	
-	/**
-	 * Class for Admin type packet in Client to Server Packet
-	 */
-	public static class Admin extends ClientToServerPacket{
-		public final boolean isDefaultID; //if this is false, unaryAction should be logIn and have screenName after.
-		public final int senderID;
-		public final UnaryAction unaryAction;
-		public final String screenName;
-		public String host;
-		/**
-		 * Constructor for Admin packet.
-		 * @param senderID sender's client ID.
-		 * @param unaryAction unary action type for this packet.
-		 * @param screenName screenName of sender.
-		 */
-		public Admin(int senderID, UnaryAction unaryAction, String screenName){
-			this.isDefaultID = false;
-			this.unaryAction = unaryAction;
-			this.screenName = screenName;
-			this.senderID = senderID;
-		}
-		/**
-		 * Constructor for Admin packet.
-		 * @param isDefaultID set this as true if the sender doesn't know its ID yet.
-		 * @param unaryAction unary action type for this packet.
-		 * @param screenName screenName of sender.
-		 */
-		public Admin(boolean isDefaultID, UnaryAction unaryAction, String screenName){
-			this.isDefaultID = isDefaultID;
-			this.unaryAction = unaryAction;
-			this.screenName = screenName;
-			this.senderID = 0;
-		}
-		
-		/**
-		 * Constructor for Admin packet.
-		 * @param isDefaultID set this as true if the sender doesn't know its ID yet.
-		 * @param unaryAction unary action type for this packet.
-		 * @param host for user to designate the host. String host is handled at the processor when creating the socket. this is not sent through socket.
-		 * @param screenName screenName of sender.
-		 */
-		public Admin(boolean isDefaultID, UnaryAction unaryAction, String host, String screenName){
-			this.isDefaultID = isDefaultID;
-			this.unaryAction = unaryAction;
-			this.screenName = screenName;
-			this.host = host;
-			this.senderID = 0;
-		}
-		/**
-		 * Constructor for Admin packet.
-		 * @param senderID sender's client ID.
-		 * @param unaryAction unary action type for this packet.
-		 */
-		public Admin(int senderID, UnaryAction unaryAction){
-			this.isDefaultID = false;
-			this.unaryAction = unaryAction;
-			this.screenName = null;
-			this.senderID = senderID;
-		}
-	}
-	
-	/**
-	 * Class for Conversation type packet in Client to Server Packet
-	 * @author seojin
-	 */
-	public static class Conv extends ClientToServerPacket{
-		public final int senderID;
-		public final CSActionType action;
-		public final int receiverID; //either conversation or a client.
-		public final String message;
-		public final Integer inviteID;
-		/**
-		 * Constructor for Conv packet.
-		 * @param senderID	sender's client ID.
-		 * @param action	action type of this packet.
-		 * @param receiverID	it should be conversationID if it is for already existing conversation, or another clientID if it is to initiate conversation.
-		 * @param message	message
-		 */
-		public Conv(int senderID, CSActionType action, int receiverID, String message){
-			this.senderID = senderID;
-			this.action = action;
-			this.receiverID = receiverID;
-			this.message = message;	
-			this.inviteID = null;
-		}
-		/**
-		 * Constructor for Conv packet.
-		 * @param senderID	sender's client ID.
-		 * @param action	action type of this packet. (Here, invitation is suggested)
-		 * @param conversationID	conversationID of conversation of this packet about.
-		 * @param inviteID	another client ID to invite user to this conversation.
-		 */
-		public Conv(int senderID, CSActionType action, int conversationID, int inviteID){
-			this.senderID = senderID;
-			this.action = action;
-			this.receiverID = conversationID;
-			this.message = null;
-			this.inviteID = inviteID;
-		}
-		/**
-		 * Constructor for Conv packet.
-		 * @param senderID	sender's client ID.
-		 * @param action	action type of this packet.
-		 * @param receiverID	it should be conversationID if it is for already existing conversation, or another clientID if it is to initiate conversation.
-		 */
-		public Conv(int senderID, CSActionType action, int receiverID){
-			this.senderID = senderID;
-			this.action = action;
-			this.receiverID = receiverID;
-			this.message = null;
-			this.inviteID = null;
-		}
-	}
-	
-	
-	
-	/**
-	 * Will return either ClientToServerPacket.Admin or ClientToServerPacket.Conv.
-	 * You may use instanceof to figure out which one it is.
-	 * @param textFormat text format packet to be parsed into Packet.
-	 * @return parsed packet either ClientToServerPacket.Admin or ClientToServerPacket.Conv
-	 */
-	public static ClientToServerPacket parsePacket(String textFormat) {
-		System.out.println(textFormat);
-		String[] lines = textFormat.split("\n");
-		int nLine = Integer.parseInt(lines[0]);
-		String[] token = lines[1].split("\t");
-		if(token[0].equals("Admin")){
-			Admin res;
-			int senderID = Integer.parseInt(token[1]);
-			UnaryAction ua = UnaryAction.valueOf(token[2]);
-			if(ua == UnaryAction.changeScreenName || ua == UnaryAction.logIn){
-				String screenName = token[3];
-				if(senderID == 0){
-					res = new Admin(true, ua, screenName);
-				}else{
-					res = new Admin(senderID, ua, screenName);
-				}
-			}else{
-				res = new Admin(senderID, ua);				
-			}
-			return res;
-		}
-		else if(token[0].equals("Conv")){
-			Conv res;
-			int senderID = Integer.parseInt(token[1]);
-			CSActionType action = CSActionType.valueOf(token[2]);
-			int receiverID = Integer.parseInt(token[3]);
-			if(action == CSActionType.sendMessage){
-				String message = lines[2];
-				for(int i = 3; i < nLine; i++){
-					message += "\n" + lines[i];
-				}
-				res = new Conv(senderID, action, receiverID, message);
-			}else if(action == CSActionType.InviteUser){
-				int inviteID = Integer.parseInt(lines[2]);
-				res = new Conv(senderID, action, receiverID, inviteID);
-			}else{
-				res = new Conv(senderID, action, receiverID);
-			}
-			return res;
-		}else{
-			System.out.println("Error in format.");
-		}
-		return null;		
-	}
-	
-	/**
-	 * Count newline characters.
-	 * @param s string to count newline character.
-	 * @return number of newline characters in string s
-	 */
-	private static int countNewline(String s){
-		int count = 0;
-		for(int i = 0; i < s.length(); i++){
-			if(s.charAt(i) == '\n')
-				count++;
-		}
-		return count;
-	}
-	
-	@Override
-	public String packetToText(){
-		String res = "";
-		int nLine = 1;
-		if (this instanceof ClientToServerPacket.Admin){
-			Admin p = (Admin) this;
-			res += "Admin\t";
-			if(p.isDefaultID == true){
-				res += "0\t";
-			}else{
-				res += p.senderID + "\t";
-			}
-			res += p.unaryAction + "\t";
-			if(p.screenName != null){
-				res += p.screenName;
-			}
-			res += "\n";
-			nLine += 1;
-		}
-		else if(this instanceof Conv){
-			Conv p = (Conv) this;
-			res += "Conv\t";
-			res += p.senderID + "\t";
-			res += p.action + "\t";
-			res += p.receiverID + "\n";
-			if(p.action == CSActionType.sendMessage)
-				res += p.message + "\n";
-			else if(p.action == CSActionType.InviteUser)
-				res += p.inviteID + "\n";
-			nLine = 1 + countNewline(res); 
-		}
-		res = nLine + "\n" + res;
-		return res;
-	}
-}
diff --git a/mobileapp/src/smoots/udesign/packet/.svn/text-base/ClientToServerPacketTest.java.svn-base b/mobileapp/src/smoots/udesign/packet/.svn/text-base/ClientToServerPacketTest.java.svn-base
deleted file mode 100755
index 4c4ca95..0000000
--- a/mobileapp/src/smoots/udesign/packet/.svn/text-base/ClientToServerPacketTest.java.svn-base
+++ /dev/null
@@ -1,76 +0,0 @@
-package packet;
-
-import org.junit.Assert;
-import org.junit.Test;
-/**
- * JUnit test for ClientToServerPacket.
- * @author seojin
- *
- */
-public class ClientToServerPacketTest extends ClientToServerPacket{
-	
-	/* PROTOCOL to test
-	Packet ::= AdministrativePacket | ConversationalPacket
-	AdministrativePacket ::= (defaultID | clientID) \t unaryAction \t screenName?
-	ConversationalPacket ::= clientID \t actionType \t (ConversationID | clientID)  \n  Message?
-	actionType ::= OpenConversation | ExitConversation | sendMessage | InviteUser | acceptInvitation | rejectInvitation
-	unaryAction ::= logIn | logOut | changeScreenName | requestWholeUserList
-	 **optional clientID(with choice of conversationID after actionType) only follows openConversation and InviteUser.
-	 **defaultID is only followed by logIn and screenName.
-	 */
-	
-	/**
-	 * Testing for Admin type.
-	 */
-	@Test
-	public void AdminTest(){
-		Admin p;
-		ClientToServerPacket p2;
-		p = new Admin(true, UnaryAction.logIn, "seojin");
-		System.out.print(p.packetToText());
-		p2 = ClientToServerPacket.parsePacket(p.packetToText());
-		Assert.assertTrue(p.packetToText().equals(p2.packetToText()));
-		p = new Admin(12, UnaryAction.changeScreenName, "Seo Jin");
-		System.out.print(p.packetToText());
-		p2 = ClientToServerPacket.parsePacket(p.packetToText());
-		Assert.assertTrue(p.packetToText().equals(p2.packetToText()));
-		p = new Admin(12, UnaryAction.requestWholeUserList);
-		System.out.print(p.packetToText());
-		p2 = ClientToServerPacket.parsePacket(p.packetToText());
-		Assert.assertTrue(p.packetToText().equals(p2.packetToText()));
-		p = new Admin(12, UnaryAction.logOut);
-		System.out.print(p.packetToText());
-		p2 = ClientToServerPacket.parsePacket(p.packetToText());
-		Assert.assertTrue(p.packetToText().equals(p2.packetToText()));
-	}
-	/**
-	 * Testing for Conversation type.
-	 */
-	@Test
-	public void ConvTest(){
-		Conv p;
-		ClientToServerPacket p2;
-		p = new Conv(12, CSActionType.acceptInvitation, 1001);
-		System.out.print(p.packetToText());
-		p2 = ClientToServerPacket.parsePacket(p.packetToText());
-		Assert.assertTrue(p.packetToText().equals(p2.packetToText()));
-		p = new Conv(12, CSActionType.rejectInvitation, 1001);
-		System.out.print(p.packetToText());
-		p2 = ClientToServerPacket.parsePacket(p.packetToText());
-		Assert.assertTrue(p.packetToText().equals(p2.packetToText()));
-		p = new Conv(12, CSActionType.InviteUser, 1111, 13);
-		System.out.print(p.packetToText());
-		p2 = ClientToServerPacket.parsePacket(p.packetToText());
-		Assert.assertTrue(p.packetToText().equals(p2.packetToText()));
-		p = new Conv(12, CSActionType.ExitConversation, 1001);
-		System.out.print(p.packetToText());
-		p2 = ClientToServerPacket.parsePacket(p.packetToText());
-		Assert.assertTrue(p.packetToText().equals(p2.packetToText()));
-		p = new Conv(12, CSActionType.sendMessage, 1001, "hi all!!\nI am UJIN\thaha");
-		System.out.print(p.packetToText());
-		p2 = ClientToServerPacket.parsePacket(p.packetToText());
-		Assert.assertTrue(p.packetToText().equals(p2.packetToText()));
-		
-	}
-	
-}
diff --git a/mobileapp/src/smoots/udesign/packet/.svn/text-base/Packet.java.svn-base b/mobileapp/src/smoots/udesign/packet/.svn/text-base/Packet.java.svn-base
deleted file mode 100755
index 1b1a0cc..0000000
--- a/mobileapp/src/smoots/udesign/packet/.svn/text-base/Packet.java.svn-base
+++ /dev/null
@@ -1,14 +0,0 @@
-package packet;
-
-/**
- * Interface for Packet datatype.
- * @author seojin
- *
- */
-public interface Packet {
-	/**
-	 * Return text form packet that can be sent throgh socket.
-	 * @return text form packet
-	 */
-	public String packetToText();
-}
diff --git a/mobileapp/src/smoots/udesign/packet/.svn/text-base/SCActionType.java.svn-base b/mobileapp/src/smoots/udesign/packet/.svn/text-base/SCActionType.java.svn-base
deleted file mode 100755
index 7f31f8e..0000000
--- a/mobileapp/src/smoots/udesign/packet/.svn/text-base/SCActionType.java.svn-base
+++ /dev/null
@@ -1,10 +0,0 @@
-package packet;
-
-/**
- * Action types for Server to Client packet
- * @author seojin
- *
- */
-public enum SCActionType {
-	OthersJoinConversation, OthersExitConversation, Invitation, participantList, screenNameChange, sendMessage
-}
diff --git a/mobileapp/src/smoots/udesign/packet/.svn/text-base/ServerToClientPacket.java.svn-base b/mobileapp/src/smoots/udesign/packet/.svn/text-base/ServerToClientPacket.java.svn-base
deleted file mode 100755
index f391298..0000000
--- a/mobileapp/src/smoots/udesign/packet/.svn/text-base/ServerToClientPacket.java.svn-base
+++ /dev/null
@@ -1,222 +0,0 @@
-package packet;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import library.User;
-
-/**
- * Server to Client Packet data type including parser and toText converters.
- * @author seojin
- *
- */
-public class ServerToClientPacket implements Packet{
-	
-	/* -----------PROTOCOL-------------
-	Server to client
-	Packet ::= AdministrativePacket | ConversationalPacket
-	AdministrativePacket ::= acceptLogin | wholeUserList
-	acceptLogin ::= clientID
-	wholeUserList ::= (user \n)*
-	ConversationalPacket ::= ConversationID  \t  actionType  \t  clientID  \n  (Message | screenName | userList)?
-	actionType ::= OthersJoinConversation | OthersExitConversation | sendMessage | Invitation | participantList | screenNameChange
-	userList ::= (user \n)*
-	user ::= clientID \t screenName
-	 **clientID specifies who's source of event.
-	 **screenNameChange is followed by screenName
-	 **userList comes after Invitation.
-	*/
-
-	/**
-	 * Class for Administrative type packet in Server to Client Packet
-	 */
-	public static class Admin extends ServerToClientPacket{
-		/**
-		 * Class for AcceptLogin packet.
-		 */
-		public static class AcceptLogin extends Admin{
-			public final int clientID;
-			/**
-			 * Constructor for AcceptLogin.
-			 * @param clientID newly assigned clientID for this user. 
-			 */
-			public AcceptLogin(int clientID){
-				this.clientID = clientID;
-			}
-		}
-		/**
-		 * Class for WholeUserList packet
-		 */
-		public static class WholeUserList extends Admin{
-			public final List<User> userList;
-			/**
-			 * Constructor for WholeUserList.
-			 * @param userList total online user list.
-			 */
-			public WholeUserList(List<User> userList){
-				this.userList = Collections.unmodifiableList(userList);				
-			}
-		}
-	}
-	
-	/**
-	 * Class for Conversational type packet in Server to Client Packet
-	 * @author seojin
-	 */
-	public static class Conv extends ServerToClientPacket{
-		public final int conversationID;
-		public final SCActionType action;
-		public final int senderID;
-		public final String message;
-		public final String screenName;
-		public final List<User> userList;
-		/**
-		 * Constructor for Conv packet
-		 * @param conversationID	conversationID this conversation has.
-		 * @param action	action type of this packet
-		 * @param senderID	client ID of creator of action of this packet.
-		 * @param messageOrScreenName	Can be message or screenName according to action type.
-		 * @param isMessageNotScreenName	assign true if messageOrScreenName is message not screenName.
-		 */
-		public Conv(int conversationID, SCActionType action, int senderID, String messageOrScreenName, boolean isMessageNotScreenName){
-			this.conversationID = conversationID;
-			this.action = action;
-			this.senderID = senderID;
-			if (isMessageNotScreenName){
-				this.message = messageOrScreenName;
-				this.screenName = null;
-			}else{
-				this.message = null;
-				this.screenName = messageOrScreenName;
-			}
-			this.userList = null;
-		}
-		/**
-		 * Constructor for Conv packet
-		 * @param conversationID	conversationID this conversation has.
-		 * @param action	action type of this packet (suggested for invitation)
-		 * @param senderID	client ID of creator of action of this packet.
-		 * @param userList	list of users in conversation.
-		 */
-		public Conv(int conversationID, SCActionType action, int senderID, List<User> userList){
-			this.conversationID = conversationID;
-			this.action = action;
-			this.senderID = senderID;
-			this.message = null;
-			this.screenName = null;
-			this.userList = userList;
-		}
-	}
-	
-	/**
-	 * returns ServerToClientPacket.Admin.AcceptLogin | ServerToClientPacket.Admin.WholeUserList | ServerToClientPacket.Conv
-	 * You may use instanceof to figure out which one is right.
-	 * @param textFormat raw text of packet from socket. 
-	 */
-	public static ServerToClientPacket parsePacket(String textFormat) {
-		String[] lines = textFormat.split("\n");
-		int nLine = Integer.parseInt(lines[0]);
-		String[] token = lines[1].split("\t");
-		if(token[0].equals("Admin.AcceptLogin")){
-			Admin res;
-			int clientID = Integer.parseInt(token[1]);
-			res = new Admin.AcceptLogin(clientID);
-			return res;
-		}else if(token[0].equals("Admin.WholeUserList")){
-			Admin res;
-			List<User> ulist = new ArrayList<User>();
-			for(int i = 2; i < nLine; i++){
-				String[] userToken = lines[i].split("\t");
-				ulist.add(new User(Integer.parseInt(userToken[0]), userToken[1]));
-			}
-			res = new Admin.WholeUserList(ulist);
-			return res;
-		}
-		else if(token[0].equals("Conv")){
-			Conv res = null;
-			int conversationID = Integer.parseInt(token[1]);
-			SCActionType action = SCActionType.valueOf(token[2]);
-			int senderID = Integer.parseInt(token[3]);
-			if(action == SCActionType.Invitation || action == SCActionType.participantList ){
-				List<User> ulist = new ArrayList<User>();
-				for(int i = 2; i < nLine; i++){
-					String[] userToken = lines[i].split("\t");
-					ulist.add(new User(Integer.parseInt(userToken[0]), userToken[1]));
-				}
-				res = new Conv(conversationID, action, senderID, ulist);
-			}else if(action == SCActionType.screenNameChange || action == SCActionType.OthersJoinConversation ||action == SCActionType.OthersExitConversation){
-				String screenName = lines[2];
-				res = new Conv(conversationID, action, senderID, screenName, false);
-			}else if(action == SCActionType.sendMessage){
-				String message = lines[2];
-				for(int i = 3; i < nLine; i++){
-					message += "\n" + lines[i];
-				}
-				res = new Conv(conversationID, action, senderID, message, true);				
-			}
-			return res;
-		}
-		return null;
-	}
-	
-	/**
-	 * Count newline characters.
-	 * @param s string to count newline character.
-	 * @return number of newline characters in string s
-	 */
-	private static int countNewline(String s){
-		int count = 0;
-		for(int i = 0; i < s.length(); i++){
-			if(s.charAt(i) == '\n')
-				count++;
-		}
-		return count;
-	}
-	
-	@Override
-	public String packetToText() {
-		String res = "";
-		int nLine = 1;
-		if (this instanceof Admin){
-			if(this instanceof Admin.AcceptLogin){
-				Admin.AcceptLogin p = (Admin.AcceptLogin) this;
-				res += "Admin.AcceptLogin\t";
-				res += p.clientID + "\n";
-				nLine += 1;
-			}else if(this instanceof Admin.WholeUserList){
-				Admin.WholeUserList p = (Admin.WholeUserList) this;
-				res += "Admin.WholeUserList\n";
-				nLine += 1;
-				for (User u : p.userList){
-					res += u.ID + "\t" + u.getScreenName() + "\n";
-					nLine += 1;
-				}
-			}
-		}
-		else if(this instanceof Conv){
-			Conv p = (Conv) this;
-			res += "Conv\t";
-			res += p.conversationID + "\t";
-			res += p.action + "\t";
-			res += p.senderID + "\n";
-			nLine += 1;
-			if(p.action == SCActionType.Invitation || p.action == SCActionType.participantList){
-				for (User u : p.userList){
-					res += u.ID + "\t" + u.getScreenName() + "\n";
-					nLine += 1;
-				}
-			}else if(p.action == SCActionType.screenNameChange || p.action == SCActionType.OthersJoinConversation ||p.action == SCActionType.OthersExitConversation){
-				assert p.screenName != null;
-				res += p.screenName + "\n";
-				nLine += 1;
-			}else if(p.action == SCActionType.sendMessage){
-				res += p.message + "\n";
-				nLine += countNewline(p.message) + 1;				
-			} 
-		}
-		res = nLine + "\n" + res;
-		System.out.print(res);
-		return res;
-	}
-}
diff --git a/mobileapp/src/smoots/udesign/packet/.svn/text-base/ServerToClientPacketTest.java.svn-base b/mobileapp/src/smoots/udesign/packet/.svn/text-base/ServerToClientPacketTest.java.svn-base
deleted file mode 100755
index 85c36f0..0000000
--- a/mobileapp/src/smoots/udesign/packet/.svn/text-base/ServerToClientPacketTest.java.svn-base
+++ /dev/null
@@ -1,88 +0,0 @@
-package packet;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import library.User;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * JUnit test for ServerToClientPacket.
- * @author seojin
- *
- */
-public class ServerToClientPacketTest extends ServerToClientPacket{
-	
-	/* PROTOCOL TO Test
-	Server to client
-	Packet ::= AdministrativePacket | ConversationalPacket
-	AdministrativePacket ::= acceptLogin | wholeUserList
-	acceptLogin ::= clientID
-	wholeUserList ::= (user \n)*
-	ConversationalPacket ::= ConversationID  \t  actionType  \t  clientID  \n  (Message | screenName | userList)?
-	actionType ::= OthersOpenConversation | OthersExitConversation | sendMessage | Invitation | screenNameChange
-	userList ::= (user \n)*
-	user ::= clientID \t screenName
-	**clientID specifies who's source of event.
-	**screenNameChange is followed by screenName
-	**userList comes after Invitation.
-	 */
-	/**
-	 * Admin type packet test
-	 */
-	@Test
-	public void AdminTest(){
-		Admin.AcceptLogin p;
-		Admin.WholeUserList pp;
-		ServerToClientPacket p2;
-		p = new Admin.AcceptLogin(111);
-		System.out.print(p.packetToText());
-		p2 = ServerToClientPacket.parsePacket(p.packetToText());
-		Assert.assertTrue(p.packetToText().equals(p2.packetToText()));
-		List<User> uList = new ArrayList<User>();
-		uList.add(new User(212, "Eugene"));
-		uList.add(new User(213, "Mehmet"));
-		pp = new Admin.WholeUserList(uList);
-		System.out.print(pp.packetToText());
-		p2 = ServerToClientPacket.parsePacket(pp.packetToText());
-		Assert.assertTrue(pp.packetToText().equals(p2.packetToText()));
-		
-	}
-	/**
-	 * Conversation type Test.
-	 */
-	@Test
-	public void ConvTest(){
-		Conv p;
-		ServerToClientPacket p2;
-		List<User> uList = new ArrayList<User>();
-		uList.add(new User(212, "Eugene"));
-		p = new Conv(1111, SCActionType.Invitation, 212, uList);
-		System.out.print(p.packetToText());
-		p2 = ServerToClientPacket.parsePacket(p.packetToText());
-		Assert.assertTrue(p.packetToText().equals(p2.packetToText()));
-
-		p = new Conv(1111, SCActionType.screenNameChange, 212, "Egin", false);
-		System.out.print(p.packetToText());
-		p2 = ServerToClientPacket.parsePacket(p.packetToText());
-		Assert.assertTrue(p.packetToText().equals(p2.packetToText()));
-		
-		p = new Conv(1111, SCActionType.sendMessage, 212, "HI all of u guys !! \nhihihi", true);
-		System.out.print(p.packetToText());
-		p2 = ServerToClientPacket.parsePacket(p.packetToText());
-		Assert.assertTrue(p.packetToText().equals(p2.packetToText()));
-		
-		p = new Conv(1111, SCActionType.OthersJoinConversation, 212, "Egin", false);
-		System.out.print(p.packetToText());
-		p2 = ServerToClientPacket.parsePacket(p.packetToText());
-		Assert.assertTrue(p.packetToText().equals(p2.packetToText()));
-		
-		p = new Conv(1111, SCActionType.OthersExitConversation, 212, "Egin", false);
-		System.out.print(p.packetToText());
-		p2 = ServerToClientPacket.parsePacket(p.packetToText());
-		Assert.assertTrue(p.packetToText().equals(p2.packetToText()));
-		
-	}
-}
diff --git a/mobileapp/src/smoots/udesign/packet/.svn/text-base/UnaryAction.java.svn-base b/mobileapp/src/smoots/udesign/packet/.svn/text-base/UnaryAction.java.svn-base
deleted file mode 100755
index 026cb32..0000000
--- a/mobileapp/src/smoots/udesign/packet/.svn/text-base/UnaryAction.java.svn-base
+++ /dev/null
@@ -1,10 +0,0 @@
-package packet;
-
-/**
- * Unary Action Type for Client to Server Admin packet
- * @author seojin
- *
- */
-public enum UnaryAction {
-	logIn, logOut, changeScreenName, requestWholeUserList
-}
diff --git a/mobileapp/src/smoots/udesign/packet/MotionType.java b/mobileapp/src/smoots/udesign/packet/MotionType.java
deleted file mode 100755
index 8c26ae7..0000000
--- a/mobileapp/src/smoots/udesign/packet/MotionType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package smoots.udesign.packet;
-
-/**
- * Wrapper class containing types of motions one can do with the phone.
- */
-public class MotionType {
-	public static int MOVE = 1;
-	public static int SHAKE = 2;
-	public static int ROTATE = 3;
-	public static int SLASH = 4;
-}
\ No newline at end of file
diff --git a/mobileapp/src/smoots/udesign/packet/Packet.java b/mobileapp/src/smoots/udesign/packet/Packet.java
deleted file mode 100755
index a28216b..0000000
--- a/mobileapp/src/smoots/udesign/packet/Packet.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package smoots.udesign.packet;
-
-/**
- * Interface for the Packet that contains phone input to the server. 
- */
-public interface Packet {
-	/**
-	 * Return JSON formatted packet that can be sent through socket.
-	 * @return JSON formatted packet
-	 */
-	public String packetToText();
-}
diff --git a/mobileapp/src/smoots/udesign/packet/PhoneToServerPacket.java b/mobileapp/src/smoots/udesign/packet/PhoneToServerPacket.java
deleted file mode 100755
index f677034..0000000
--- a/mobileapp/src/smoots/udesign/packet/PhoneToServerPacket.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package smoots.udesign.packet;
-
-import java.util.HashMap;
-
-import org.json.JSONObject;
-
-/**
- * Packet object from phone to the server.
- */
-public class PhoneToServerPacket implements Packet {
-	private HashMap<String, Float> packetMap;
-	
-	public PhoneToServerPacket(int type, float x, float y, float color) {
-		this.packetMap = new HashMap<String, Float>();
-		this.packetMap.put("type", (float) type);
-		this.packetMap.put("x", x);
-		this.packetMap.put("y", y);
-		this.packetMap.put("color", color);
-	}
-	
-	public String packetToText() {
-		return new JSONObject(this.packetMap).toString();
-	}
-	
-}
diff --git a/mobileapp/src/smoots/udesign/settings/OnSettingsChangedListener.java b/mobileapp/src/smoots/udesign/settings/OnSettingsChangedListener.java
deleted file mode 100755
index cf88ec1..0000000
--- a/mobileapp/src/smoots/udesign/settings/OnSettingsChangedListener.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package smoots.udesign.settings;
-
-public interface OnSettingsChangedListener {
-	String getCurrentIP();
-	int getCurrentPort();
-	
-	void onSettingsChanged(String ipAddr, int port);
-}
diff --git a/mobileapp/src/smoots/udesign/settings/SettingsDialog.java b/mobileapp/src/smoots/udesign/settings/SettingsDialog.java
deleted file mode 100755
index 190315b..0000000
--- a/mobileapp/src/smoots/udesign/settings/SettingsDialog.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package smoots.udesign.settings;
-
-import smoots.udesign.main.R;
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-
-public class SettingsDialog extends Dialog {
-
-	private final OnSettingsChangedListener mListener;
-	private Button okButton;
-
-	public SettingsDialog(Context context, OnSettingsChangedListener listener) {
-		super(context);
-
-		mListener = listener;
-	}
-
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		setContentView(R.layout.settings);
-		setTitle("Host Settings");
-		
-		// PREPARE IP AND PORT.
-		((EditText) findViewById(R.id.settings_ip)).setText(mListener.getCurrentIP());
-		((EditText) findViewById(R.id.settings_port)).setText(Integer.toString(mListener.getCurrentPort()));
-		
-		// PREPARE BUTTON
-		this.okButton = (Button) this.findViewById(R.id.settings_ok);
-		this.okButton.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
-				String ipAddr = ((EditText) findViewById(R.id.settings_ip)).getText().toString();
-				int port = Integer.parseInt(((EditText) findViewById(R.id.settings_port)).getText().toString());
-				
-				mListener.onSettingsChanged(ipAddr, port);
-				dismiss();
-			}
-		});
-	}
-
-}
diff --git a/mobileapp/src/smoots/udesign/util/PhoneDebugger.java b/mobileapp/src/smoots/udesign/util/PhoneDebugger.java
deleted file mode 100755
index 5458ead..0000000
--- a/mobileapp/src/smoots/udesign/util/PhoneDebugger.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package smoots.udesign.util;
-
-import android.util.Log;
-
-/**
- * Util Class for the purpose of debugging.
- *
- * @author Sun
- */
-public class PhoneDebugger {	
-	private static boolean DEBUG = true;
-	
-	/**
-	 * Add the error exception to the Android log
-	 * @param tag Tag for the log
-	 * @param e Exception error
-	 */
-	public static void debug(String tag, Exception e) {
-		if (DEBUG == true) {
-			Log.d(tag, e.getMessage());
-		}
-	}
-}
-- 
cgit v1.2.3