diff --git a/Demo/Demo.cs b/Demo/Demo.cs
index 3513a186..10e6f504 100644
--- a/Demo/Demo.cs
+++ b/Demo/Demo.cs
@@ -1,168 +1,137 @@
 using System;
+using QBox.Conf;
 using QBox.Auth;
-using QBox.RS;
 using QBox.FileOp;
 using QBox.RPC;
 using QBox.Util;
+using QBox.IO;
+using QBox.RS;
 
 namespace QBox.Demo
 {
     public class Demo
     {
-        public static string bucketName;
-        public static string key;
+        public static string localBucket;
+        public static string localKey;
         public static string localFile;
-        public static string bigkey;
-        public static string bigFile;
+        public static string localLargeKey;
+        public static string localLargeFile;
         public static string DEMO_DOMAIN;
-        public static Client conn;
-        public static RSService rs;
 
         public static void Main()
         {
             Config.ACCESS_KEY = "<Please apply your access key>";
             Config.SECRET_KEY = "<Dont send your secret key to anyone>";
 
-            bucketName = "yourbucket";
-            DEMO_DOMAIN = bucketName + ".qiniudn.com";
-            key = "gogopher.jpg";
+            localBucket = "yourbucket";
+            DEMO_DOMAIN = localBucket + ".qiniudn.com";
+            localKey = "gogopher.jpg";
             localFile = "Resource/gogopher.jpg";
-            bigkey = key;
-            bigFile = localFile;
-
-            conn = new DigestAuthClient();
-            rs = new RSService(conn, bucketName);
 
-            MkBucket();
-            RSClientPutFile();
-            RSClientPutFileWithCRC32();
-            Get(key);
-            ResumablePutFile();
-            Stat(bigkey);
-            Delete(key);
-            Drop();
-
-            MkBucket();
+            PutFile(localBucket, localKey, localFile);
+            ResumablePutFile(localBucket, localKey, localFile);
+            FileManage();
+            MakeGetToken();
             ImageOps();
 
-            MakeDownloadToken();
-
             Console.ReadLine();
         }
 
-        public static void MkBucket()
+        public static void PutFile(string bucket, string key, string fname)
         {
-            Console.WriteLine("\n===> RSService.MkBucket");
-            CallRet callRet = rs.MkBucket();
-            PrintRet(callRet);
-        }
-
-        public static void RSClientPutFile()
-        {
-            Console.WriteLine("\n===> RSClient Generate UpToken");
-            var authPolicy = new AuthPolicy(bucketName, 3600);
-            string upToken = authPolicy.MakeAuthTokenString();
+            Console.WriteLine("\n===>PutFile: Generate UpToken");
+            var policy = new PutPolicy(bucket, 3600);
+            string upToken = policy.Token();
             Console.WriteLine("upToken: " + upToken);
 
-            Console.WriteLine("\n===> RSClient.PutFileWithUpToken");
-            PutFileRet putFileRet = RSClient.PutFileWithUpToken(upToken, bucketName, key, null, localFile, null, "key=<key>");
-            PrintRet(putFileRet);
-            if (putFileRet.OK)
+            Console.WriteLine("\n===> PutFile {0}:{1} fname:{2}", bucket, key, fname);
+            PutExtra extra = new PutExtra { Bucket = bucket };
+            PutRet ret = IOClient.PutFile(upToken, key, fname, extra);
+            PrintRet(ret);
+            if (ret.OK)
             {
-                Console.WriteLine("Hash: " + putFileRet.Hash);
+                Console.WriteLine("Hash: " + ret.Hash);
             }
             else
             {
-                Console.WriteLine("Failed to RSClient.PutFileWithUpToken");
+                Console.WriteLine("Failed to PutFile");
             }
         }
 
-        public static void RSClientPutFileWithCRC32()
+        public static void ResumablePutFile(string bucket, string key, string fname)
         {
-            Console.WriteLine("\n===> RSClientPutFileWithCRC32 Generate CRC32");
-            UInt32 crc = CRC32.CheckSumFile(localFile);
-            Console.WriteLine("CRC32: " + crc.ToString());
-
-            Console.WriteLine("\n===> RSClientPutFileWithCRC32 Generate UpToken");
-            var authPolicy = new AuthPolicy(bucketName, 3600);
-            string upToken = authPolicy.MakeAuthTokenString();
+            Console.WriteLine("\n===> ResumablePutFile: Generate UpToken");
+            var policy = new PutPolicy(localBucket, 3600);
+            string upToken = policy.Token();
             Console.WriteLine("upToken: " + upToken);
 
-            Console.WriteLine("\n===> RSClient.PutFileWithUpToken(CRC32)");
-            PutFileRet putFileRet = RSClient.PutFileWithUpToken(upToken, bucketName, key, null, localFile, null, "key=<key>", crc);
-            PrintRet(putFileRet);
-            if (putFileRet.OK)
+            Console.WriteLine("\n===> ResumablePutFile {0}:{1} fname:{2}", bucket, key, fname);
+            PutExtra extra = new PutExtra { Bucket = bucket };
+            PutRet ret = IOClient.ResumablePutFile(upToken, key, fname, extra);
+            if (ret.OK)
             {
-                Console.WriteLine("Hash: " + putFileRet.Hash);
+                Console.WriteLine("Hash: " + ret.Hash);
             }
             else
             {
-                Console.WriteLine("Failed to RSClient.PutFileWithUpToken(CRC32)");
+                Console.WriteLine("Failed to ResumablePutFile");
             }
         }
 
-        public static void ResumablePutFile()
+        public static void FileManage()
         {
-            Console.WriteLine("\n===> ResumablePut.PutFile");
-            var authPolicy = new AuthPolicy(bucketName, 3600);
-            string upToken = authPolicy.MakeAuthTokenString();
-            PutAuthClient client = new PutAuthClient(upToken);
-            PutFileRet putFileRet = ResumablePut.PutFile(client, bucketName, bigkey, null, bigFile, null, "key=<key>");
-            PrintRet(putFileRet);
-            if (putFileRet.OK)
-            {
-                Console.WriteLine("Hash: " + putFileRet.Hash);
-            }
-            else
-            {
-                Console.WriteLine("Failed to ResumablePut.PutFile");
-            }
+            Stat(localBucket, localKey);
+            Copy(localBucket, localKey, localBucket, "copy.jpg");
+            Stat(localBucket, "copy.jpg");
+            Move(localBucket, "copy.jpg", localBucket, "move.jpg");
+            Stat(localBucket, "move.jpg");
+            Delete(localBucket, "move.jpg");
         }
 
-        public static void Get(string key)
+        public static void Move(string bucketSrc, string keySrc, string bucketDest, string keyDest)
         {
-            Console.WriteLine("\n===> RSService.Get");
-            GetRet getRet = rs.Get(key, "attName");
-            PrintRet(getRet);
-            if (getRet.OK)
+            Console.WriteLine("\n===> Move {0}:{1} To {2}:{3}", 
+                bucketSrc, keySrc, bucketDest, keyDest);
+            RSClient client = new RSClient();
+            CallRet ret = client.Move(bucketSrc, keySrc, bucketDest, keyDest);
+            if (ret.OK)
             {
-                Console.WriteLine("Hash: " + getRet.Hash);
-                Console.WriteLine("FileSize: " + getRet.FileSize);
-                Console.WriteLine("MimeType: " + getRet.MimeType);
-                Console.WriteLine("Url: " + getRet.Url);
+                Console.WriteLine("Move OK");
             }
             else
             {
-                Console.WriteLine("Failed to Get");
+                Console.WriteLine("Failed to Move");
             }
+        }
 
-            Console.WriteLine("\n===> RSService.GetIfNotModified");
-            getRet = rs.GetIfNotModified(key, "attName", getRet.Hash);
-            PrintRet(getRet);
-            if (getRet.OK)
+        public static void Copy(string bucketSrc, string keySrc, string bucketDest, string keyDest)
+        {
+            Console.WriteLine("\n===> Copy {0}:{1} To {2}:{3}",
+                bucketSrc, keySrc, bucketDest, keyDest);
+            RSClient client = new RSClient();
+            CallRet ret = client.Copy(bucketSrc, keySrc, bucketDest, keyDest);
+            if (ret.OK)
             {
-                Console.WriteLine("Hash: " + getRet.Hash);
-                Console.WriteLine("FileSize: " + getRet.FileSize);
-                Console.WriteLine("MimeType: " + getRet.MimeType);
-                Console.WriteLine("Url: " + getRet.Url);
+                Console.WriteLine("Copy OK");
             }
             else
             {
-                Console.WriteLine("Failed to GetIfNotModified");
+                Console.WriteLine("Failed to Copy");
             }
         }
 
-        public static void Stat(string key)
+        public static void Stat(string bucket, string key)
         {
-            Console.WriteLine("\n===> RSService.Stat");
-            StatRet statRet = rs.Stat(key);
-            PrintRet(statRet);
-            if (statRet.OK)
+            Console.WriteLine("\n===> Stat {0}:{1}", bucket, key);
+            RSClient client = new RSClient();
+            Entry entry = client.Stat(bucket, key);
+            if (entry.OK)
             {
-                Console.WriteLine("Hash: " + statRet.Hash);
-                Console.WriteLine("FileSize: " + statRet.FileSize);
-                Console.WriteLine("PutTime: " + statRet.PutTime);
-                Console.WriteLine("MimeType: " + statRet.MimeType);
+                Console.WriteLine("Hash: " + entry.Hash);
+                Console.WriteLine("Fsize: " + entry.Fsize);
+                Console.WriteLine("PutTime: " + entry.PutTime);
+                Console.WriteLine("MimeType: " + entry.MimeType);
+                Console.WriteLine("Customer: " + entry.Customer);
             }
             else
             {
@@ -170,42 +139,37 @@ public static void Stat(string key)
             }
         }
 
-        public static void Delete(string key)
+        public static void Delete(string bucket, string key)
         {
-            Console.WriteLine("\n===> RSService.Delete");
-            CallRet deleteRet = rs.Delete(key);
-            PrintRet(deleteRet);
-            if (!deleteRet.OK)
+            Console.WriteLine("\n===> Delete {0}:{1}", bucket, key);
+            RSClient client = new RSClient();
+            CallRet ret = client.Delete(bucket, key);
+            if (ret.OK)
             {
-                Console.WriteLine("Failed to Delete");
+                Console.WriteLine("Delete OK");
             }
-        }
-
-        public static void Drop()
-        {
-            Console.WriteLine("\n===> RSService.Drop");
-            CallRet dropRet = rs.Drop();
-            PrintRet(dropRet);
-            if (!dropRet.OK)
+            else
             {
-                Console.WriteLine("Failed to Drop");
+                Console.WriteLine("Failed to Delete");
             }
         }
 
-        public static void MakeDownloadToken()
+        public static void MakeGetToken()
         {
-            Console.WriteLine("\n===> Auth.MakeDownloadToken");
+            Console.WriteLine("\n===> GetPolicy Token");
             string pattern = "*/*";
-            var downloadPolicy = new DownloadPolicy(pattern, 3600);
-            string dnToken = downloadPolicy.MakeAuthTokenString();
-            Console.WriteLine("dnToken: " + dnToken);
+            var policy = new GetPolicy(pattern, 3600);
+            string getToken = policy.Token();
+            Console.WriteLine("GetToken: " + getToken);
         }
 
         public static void ImageOps()
         {
+            string host = "http://" + DEMO_DOMAIN + "/" + localKey;
+
             Console.WriteLine("\n===> FileOp.ImageInfo");
-            ImageInfoRet infoRet = ImageOp.ImageInfo("http://" + DEMO_DOMAIN + "/" + key);
-            PrintRet(infoRet);
+            string imageInfoURL = ImageInfo.MakeRequest(host);
+            ImageInfoRet infoRet = ImageInfo.Call(imageInfoURL);
             if (infoRet.OK)
             {
                 Console.WriteLine("Format: " + infoRet.Format);
@@ -218,75 +182,37 @@ public static void ImageOps()
                 Console.WriteLine("Failed to ImageInfo");
             }
 
-            Console.WriteLine("\n===> FileOp.ImageExif");
-            CallRet exifRet = ImageOp.ImageExif("http://" + DEMO_DOMAIN + "/" + key);
-            PrintRet(exifRet);
-            if (!exifRet.OK)
+            Console.WriteLine("\n===> FileOp.Exif");
+            string exifURL = Exif.MakeRequest(host);
+            ExifRet exifRet = Exif.Call(exifURL);
+            if (exifRet.OK)
             {
-                Console.WriteLine("Failed to ImageExif");
-            }
-
-            Console.WriteLine("\n===> FileOp.ImageViewUrl");
-            ImageViewSpec viewSpec = new ImageViewSpec{Mode = 0, Width = 200, Height= 200};
-            string viewUrl = ImageOp.ImageViewUrl("http://" + DEMO_DOMAIN + "/" + key, viewSpec);
-            Console.WriteLine("ImageViewUrl 1:" + viewUrl);
-            viewSpec.Quality = 1;
-            viewSpec.Format = "gif";
-            viewUrl = ImageOp.ImageViewUrl("http://" + DEMO_DOMAIN + "/" + key, viewSpec);
-            Console.WriteLine("ImageViewUrl 2:" + viewUrl);
-            viewSpec.Quality = 90;
-            viewSpec.Sharpen = 10;
-            viewSpec.Format = "png";
-            viewUrl = ImageOp.ImageViewUrl("http://" + DEMO_DOMAIN + "/" + key, viewSpec);
-            Console.WriteLine("ImageViewUrl 3:" + viewUrl);
-
-            Console.WriteLine("\n===> FileOp.ImageMogrifyUrl");
-            ImageMogrifySpec mogrSpec = new ImageMogrifySpec {
-                Thumbnail = "!50x50r", Gravity = "center", Rotate = 90,
-                Crop = "!50x50", Quality = 80, AutoOrient = true
-            };
-            string mogrUrl = ImageOp.ImageMogrifyUrl("http://" + DEMO_DOMAIN + "/" + key, mogrSpec);
-            Console.WriteLine("ImageMogrifyUrl:" + mogrUrl);
-
-            Console.WriteLine("\n===> Get");
-            GetRet getRet = rs.Get(key, "save-as");
-            PrintRet(getRet);
-            if (getRet.OK)
-            {
-                Console.WriteLine("Hash: " + getRet.Hash);
-                Console.WriteLine("FileSize: " + getRet.FileSize);
-                Console.WriteLine("MimeType: " + getRet.MimeType);
-                Console.WriteLine("Url: " + getRet.Url);
+                Console.WriteLine("ApertureValue.val: " + exifRet["ApertureValue"].val);
+                Console.WriteLine("ApertureValue.type: " + exifRet["ApertureValue"].type.ToString());
+                Console.WriteLine("ExifInfo: " + exifRet.ToString());
             }
             else
             {
-                Console.WriteLine("Failed to Get");
-            }
-            Console.WriteLine("\n===> FileOp.ImageMogrifySaveAs");
-            PutFileRet saveAsRet = rs.ImageMogrifySaveAs(getRet.Url, mogrSpec, key + ".mogr-save-as");
-            PrintRet(saveAsRet);
-            if (saveAsRet.OK)
-            {
-                Console.WriteLine("Hash: " + saveAsRet.Hash);
-            }
-            else
-            {
-                Console.WriteLine("Failed to ImageMogrifySaveAs");
-            }
-            Console.WriteLine("\n===> Get");
-            getRet = rs.Get(key + ".mogr-save-as", "mogr-save-as.jpg");
-            PrintRet(getRet);
-            if (getRet.OK)
-            {
-                Console.WriteLine("Hash: " + getRet.Hash);
-                Console.WriteLine("FileSize: " + getRet.FileSize);
-                Console.WriteLine("MimeType: " + getRet.MimeType);
-                Console.WriteLine("Url: " + getRet.Url);
+                Console.WriteLine("Failed to ImageExif");
             }
-            else
+
+            Console.WriteLine("\n===> FileOp.ImageView");
+            ImageView imageView = new ImageView { Mode = 0, Width = 200, Height = 200, Quality = 90, Format = "gif" };
+            string viewUrl = imageView.MakeRequest(host);
+            Console.WriteLine("ImageViewURL:" + viewUrl);
+
+            Console.WriteLine("\n===> FileOp.ImageMogrify");
+            ImageMogrify imageMogr = new ImageMogrify
             {
-                Console.WriteLine("Failed to Get");
-            }
+                Thumbnail = "!50x50r",
+                Gravity = "center",
+                Rotate = 90,
+                Crop = "!50x50",
+                Quality = 80,
+                AutoOrient = true
+            };
+            string mogrUrl = imageMogr.MakeRequest(host);
+            Console.WriteLine("ImageMogrifyURL:" + mogrUrl);
         }
 
         public static void PrintRet(CallRet callRet)
diff --git a/Demo/Demo.csproj b/Demo/Demo.csproj
index abb28ab4..f1e9da2a 100644
--- a/Demo/Demo.csproj
+++ b/Demo/Demo.csproj
@@ -11,7 +11,8 @@
     <RootNamespace>Demo</RootNamespace>
     <AssemblyName>Demo</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -41,6 +42,9 @@
   <ItemGroup>
     <Compile Include="Demo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\QBox\QBox.csproj">
       <Project>{1C8C9909-57ED-44E4-81A5-0904E96FA00E}</Project>
@@ -48,7 +52,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System" />
+    <None Include="app.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Demo/app.config b/Demo/app.config
new file mode 100644
index 00000000..e3656033
--- /dev/null
+++ b/Demo/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/QBox/Auth/AuthToken.cs b/QBox/Auth/AuthToken.cs
index ecc02b75..dde06335 100644
--- a/QBox/Auth/AuthToken.cs
+++ b/QBox/Auth/AuthToken.cs
@@ -2,7 +2,7 @@
 using System.Text;
 using System.IO;
 using System.Security.Cryptography;
-using QBox.RS;
+using QBox.Conf;
 using QBox.Util;
 
 namespace QBox.Auth
@@ -11,35 +11,33 @@ public static class AuthToken
     {
         public static byte[] Make(string scope)
         {
-            Encoding encoding = Encoding.ASCII;
-            byte[] accessKey = encoding.GetBytes(Config.ACCESS_KEY);
-            byte[] secretKey = encoding.GetBytes(Config.SECRET_KEY);
-            byte[] upToken = null;
+            byte[] accessKey = Config.Encoding.GetBytes(Config.ACCESS_KEY);
+            byte[] secretKey = Config.Encoding.GetBytes(Config.SECRET_KEY);
+            byte[] token = null;
             try
             {
-                byte[] policyBase64 = encoding.GetBytes(Base64UrlSafe.Encode(scope));
-                byte[] digestBase64 = null;
+                byte[] encodedScope = Config.Encoding.GetBytes(Base64URLSafe.Encode(scope));
+                byte[] digestScope = null;
                 using (HMACSHA1 hmac = new HMACSHA1(secretKey))
                 {
-                    byte[] digest = hmac.ComputeHash(policyBase64);
-                    digestBase64 = encoding.GetBytes(Base64UrlSafe.Encode(digest));
+                    byte[] digest = hmac.ComputeHash(encodedScope);
+                    digestScope = Config.Encoding.GetBytes(Base64URLSafe.Encode(digest));
                 }
                 using (MemoryStream buffer = new MemoryStream())
                 {
                     buffer.Write(accessKey, 0, accessKey.Length);
                     buffer.WriteByte((byte)':');
-                    buffer.Write(digestBase64, 0, digestBase64.Length);
+                    buffer.Write(digestScope, 0, digestScope.Length);
                     buffer.WriteByte((byte)':');
-                    buffer.Write(policyBase64, 0, policyBase64.Length);
-                    upToken = buffer.ToArray();
+                    buffer.Write(encodedScope, 0, encodedScope.Length);
+                    token = buffer.ToArray();
                 }
             }
             catch (Exception e)
             {
                 Console.WriteLine(e.ToString());
             }
-            return upToken;
+            return token;
         }
-        
     }
 }
diff --git a/QBox/Auth/DownloadPolicy.cs b/QBox/Auth/GetPolicy.cs
similarity index 58%
rename from QBox/Auth/DownloadPolicy.cs
rename to QBox/Auth/GetPolicy.cs
index 219a152a..03ac9835 100644
--- a/QBox/Auth/DownloadPolicy.cs
+++ b/QBox/Auth/GetPolicy.cs
@@ -1,43 +1,40 @@
-using System;
-using System.Text;
-using System.IO;
-using System.Security.Cryptography;
-using LitJson;
-using QBox.RS;
-using QBox.Util;
-
-namespace QBox.Auth
-{
-    public class DownloadPolicy
-    {
-        public string Pattern { get; set; }
-        public long Deadline { get; set; }
-
-        public DownloadPolicy(string pattern, long expires)
-        {
-            Pattern = pattern;
-            DateTime begin = new DateTime(1970, 1, 1);
-            DateTime now = DateTime.Now;
-            TimeSpan interval = new TimeSpan(now.Ticks - begin.Ticks);
-            Deadline = (long)interval.TotalSeconds + expires;
-        }
-
-        public string Marshal()
-        {
-            JsonData data = new JsonData();
-            data["S"] = Pattern;
-            data["E"] = Deadline;
-            return data.ToJson();
-        }
-
-        public byte[] MakeAuthToken()
-        {
-            return AuthToken.Make(Marshal());
-        }
-
-        public string MakeAuthTokenString()
-        {
-            return Encoding.ASCII.GetString(MakeAuthToken());
-        }
-    }
-}
+using System;
+using System.Text;
+using System.IO;
+using System.Collections.Generic;
+using System.Web.Script.Serialization;
+using System.Security.Cryptography;
+using QBox.Util;
+using QBox.Conf;
+
+namespace QBox.Auth
+{
+    public class GetPolicy
+    {
+        public string Pattern { get; set; }
+        public long Deadline { get; set; }
+
+        public GetPolicy(string pattern, long expires)
+        {
+            Pattern = pattern;
+            DateTime begin = new DateTime(1970, 1, 1);
+            DateTime now = DateTime.Now;
+            TimeSpan interval = new TimeSpan(now.Ticks - begin.Ticks);
+            Deadline = (long)interval.TotalSeconds + expires;
+        }
+
+        public string Marshal()
+        {
+            var data = new Dictionary<string, dynamic>();
+            data["S"] = Pattern;
+            data["E"] = Deadline;
+            var jss = new JavaScriptSerializer();
+            return jss.Serialize(data);
+        }
+
+        public string Token()
+        {
+            return Config.Encoding.GetString(AuthToken.Make(Marshal()));
+        }
+    }
+}
diff --git a/QBox/Auth/AuthPolicy.cs b/QBox/Auth/PutPolicy.cs
similarity index 54%
rename from QBox/Auth/AuthPolicy.cs
rename to QBox/Auth/PutPolicy.cs
index 1bd4a9c6..8e793adb 100644
--- a/QBox/Auth/AuthPolicy.cs
+++ b/QBox/Auth/PutPolicy.cs
@@ -1,58 +1,61 @@
-using System;
-using System.Text;
-using System.IO;
-using LitJson;
-using System.Security.Cryptography;
-using QBox.RS;
-using QBox.Util;
-
-namespace QBox.Auth
-{
-    public class AuthPolicy
-    {
-        public string Scope { get; set; }
-        public long Deadline { get; set; }
-        public string CallbackUrl { get; set; }
-        public string CallbackBodyType { get; set; }
-        public bool Escape { get; set; }
-        public string AsyncOps { get; set; }
-        public string ReturnBody { get; set; }
-
-        public AuthPolicy(string scope, long expires)
-        {
-            Scope = scope;
-            DateTime begin = new DateTime(1970, 1, 1);
-            DateTime now = DateTime.Now;
-            TimeSpan interval = new TimeSpan(now.Ticks - begin.Ticks);
-            Deadline = (long)interval.TotalSeconds + expires;
-        }
-
-        public string Marshal()
-        {
-            JsonData data = new JsonData();
-            data["scope"] = Scope;
-            data["deadline"] = Deadline;
-            if (!String.IsNullOrEmpty(CallbackUrl))
-                data["callbackUrl"] = CallbackUrl;
-            if (!String.IsNullOrEmpty(CallbackBodyType))
-                data["callbackBodyType"] = CallbackBodyType;
-            if (Escape)
-                data["escape"] = 1;
-            if (!String.IsNullOrEmpty(AsyncOps))
-                data["asyncOps"] = AsyncOps;
-            if (!String.IsNullOrEmpty(ReturnBody))
-                data["returnBody"] = ReturnBody;
-            return data.ToJson();
-        }
-
-        public byte[] MakeAuthToken()
-        {
-            return AuthToken.Make(Marshal());
-        }
-
-        public string MakeAuthTokenString()
-        {
-            return Encoding.ASCII.GetString(MakeAuthToken());
-        }
-    }
-}
+using System;
+using System.Text;
+using System.IO;
+using System.Collections.Generic;
+using System.Web.Script.Serialization;
+using System.Security.Cryptography;
+using QBox.Util;
+using QBox.Conf;
+
+namespace QBox.Auth
+{
+    public class PutPolicy
+    {
+        public string Scope { get; set; }
+        public string CallbackUrl { get; set; }
+        public string CallbackBodyType { get; set; }
+        public string Customer { get; set; }
+        public string AsyncOps { get; set; }
+        public string ReturnBody { get; set; }
+        public UInt32 Expires { get; set; }
+        public UInt16 Escape { get; set; }
+        public UInt16 DetectMime { get; set; }
+
+        public PutPolicy(string scope, UInt32 expires)
+        {
+            Scope = scope;
+            DateTime begin = new DateTime(1970, 1, 1);
+            DateTime now = DateTime.Now;
+            TimeSpan interval = new TimeSpan(now.Ticks - begin.Ticks);
+            Expires = (UInt32)interval.TotalSeconds + expires;
+        }
+
+        public string Marshal()
+        {
+            var data = new Dictionary<string,dynamic>();
+            data["scope"] = Scope;
+            data["deadline"] = Expires;
+            if (!String.IsNullOrEmpty(CallbackUrl))
+                data["callbackUrl"] = CallbackUrl;
+            if (!String.IsNullOrEmpty(CallbackBodyType))
+                data["callbackBodyType"] = CallbackBodyType;
+            if (!String.IsNullOrEmpty(AsyncOps))
+                data["asyncOps"] = AsyncOps;
+            if (!String.IsNullOrEmpty(ReturnBody))
+                data["returnBody"] = ReturnBody;
+            if (!String.IsNullOrEmpty(Customer))
+                data["customer"] = Customer;
+            if (Escape != 0)
+                data["escape"] = Escape;
+            if (DetectMime != 0)
+                data["detectMime"] = DetectMime;
+            var jss = new JavaScriptSerializer();
+            return jss.Serialize(data);
+        }
+
+        public string Token()
+        {
+            return Config.Encoding.GetString(AuthToken.Make(Marshal()));
+        }
+    }
+}
diff --git a/QBox/Auth/DigestAuthClient.cs b/QBox/Auth/QBoxAuthClient.cs
similarity index 77%
rename from QBox/Auth/DigestAuthClient.cs
rename to QBox/Auth/QBoxAuthClient.cs
index e156c270..eaba7c2f 100644
--- a/QBox/Auth/DigestAuthClient.cs
+++ b/QBox/Auth/QBoxAuthClient.cs
@@ -1,43 +1,43 @@
-using System;
-using System.Text;
-using System.Net;
-using System.IO;
-using System.Security.Cryptography;
-using QBox.Util;
-using QBox.RPC;
-using QBox.RS;
-
-namespace QBox.Auth
-{
-    public class DigestAuthClient : Client
-    {
-        public override void SetAuth(HttpWebRequest request, Stream body)
-        {
-            byte[] secretKey = Encoding.ASCII.GetBytes(Config.SECRET_KEY);
-            using (HMACSHA1 hmac = new HMACSHA1(secretKey))
-            {
-                string pathAndQuery = request.Address.PathAndQuery;
-                byte[] pathAndQueryBytes = Encoding.ASCII.GetBytes(pathAndQuery);
-                using (MemoryStream buffer = new MemoryStream())
-                {
-                    buffer.Write(pathAndQueryBytes, 0, pathAndQueryBytes.Length);
-                    buffer.WriteByte((byte)'\n');
-                    if (request.ContentType == "application/x-www-form-urlencoded" && body != null)
-                    {
-                        if (!body.CanSeek)
-                        {
-                            throw new Exception("stream can not seek");
-                        }
-                        StreamUtil.Copy(body, buffer);
-                        body.Seek(0, SeekOrigin.Begin);
-                    }
-                    byte[] digest = hmac.ComputeHash(buffer.ToArray());
-                    string digestBase64 = Base64UrlSafe.Encode(digest);
-
-                    string authHead = "QBox " + Config.ACCESS_KEY + ":" + digestBase64;
-                    request.Headers.Add("Authorization", authHead);
-                }
-            }
-        }
-    }
-}
+using System;
+using System.Text;
+using System.Net;
+using System.IO;
+using System.Security.Cryptography;
+using QBox.Util;
+using QBox.RPC;
+using QBox.Conf;
+
+namespace QBox.Auth
+{
+    public class QBoxAuthClient : Client
+    {
+        public override void SetAuth(HttpWebRequest request, Stream body)
+        {
+            byte[] secretKey = Config.Encoding.GetBytes(Config.SECRET_KEY);
+            using (HMACSHA1 hmac = new HMACSHA1(secretKey))
+            {
+                string pathAndQuery = request.Address.PathAndQuery;
+                byte[] pathAndQueryBytes = Config.Encoding.GetBytes(pathAndQuery);
+                using (MemoryStream buffer = new MemoryStream())
+                {
+                    buffer.Write(pathAndQueryBytes, 0, pathAndQueryBytes.Length);
+                    buffer.WriteByte((byte)'\n');
+                    if (request.ContentType == "application/x-www-form-urlencoded" && body != null)
+                    {
+                        if (!body.CanSeek)
+                        {
+                            throw new Exception("stream can not seek");
+                        }
+                        Util.IO.Copy(body, buffer);
+                        body.Seek(0, SeekOrigin.Begin);
+                    }
+                    byte[] digest = hmac.ComputeHash(buffer.ToArray());
+                    string digestBase64 = Base64URLSafe.Encode(digest);
+
+                    string authHead = "QBox " + Config.ACCESS_KEY + ":" + digestBase64;
+                    request.Headers.Add("Authorization", authHead);
+                }
+            }
+        }
+    }
+}
diff --git a/QBox/RS/Config.cs b/QBox/Conf/Config.cs
similarity index 57%
rename from QBox/RS/Config.cs
rename to QBox/Conf/Config.cs
index f40d7fd3..6c53f8b1 100644
--- a/QBox/RS/Config.cs
+++ b/QBox/Conf/Config.cs
@@ -1,16 +1,16 @@
-using System;
-
-namespace QBox.RS
-{
-    public class Config
-    {
-        public static string ACCESS_KEY = "<Please apply your access key>";
-        public static string SECRET_KEY = "<Dont send your secret key to anyone>";
-
-        public static string IO_HOST = "http://iovip.qbox.me";
-        public static string RS_HOST = "http://rs.qbox.me:10100";
-        public static string UP_HOST = "http://up.qbox.me";
-
-        public static int PUT_RETRY_TIMES = 3;
-    }
-}
+using System;
+using System.Text;
+
+namespace QBox.Conf
+{
+    public class Config
+    {
+        public static string ACCESS_KEY = "<Please apply your access key>";
+        public static string SECRET_KEY = "<Dont send your secret key to anyone>";
+
+        public static string RS_HOST = "http://rs.qbox.me";
+        public static string UP_HOST = "http://up.qbox.me";
+
+        public static Encoding Encoding = Encoding.UTF8;
+    }
+}
diff --git a/QBox/FileOp/Exif.cs b/QBox/FileOp/Exif.cs
new file mode 100644
index 00000000..7735d0ca
--- /dev/null
+++ b/QBox/FileOp/Exif.cs
@@ -0,0 +1,19 @@
+using System;
+using QBox.RPC;
+
+namespace QBox.FileOp
+{
+    public static class Exif
+    {
+        public static string MakeRequest(string url)
+        {
+            return url + "?exif";
+        }
+
+        public static ExifRet Call(string url)
+        {
+            CallRet callRet = FileOpClient.Get(url);
+            return new ExifRet(callRet);
+        }
+    }
+}
diff --git a/QBox/FileOp/ExifRet.cs b/QBox/FileOp/ExifRet.cs
new file mode 100644
index 00000000..492c540f
--- /dev/null
+++ b/QBox/FileOp/ExifRet.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Web.Script.Serialization;
+using QBox.RPC;
+
+namespace QBox.FileOp
+{
+    public class ExifValType
+    {
+        public string val { get; set; }
+        public int type { get; set; }
+    }
+
+    public class ExifRet : CallRet
+    {
+        private Dictionary<string, ExifValType> dict;
+
+        public ExifValType this[string key]
+        {
+            get
+            {
+                return dict[key];
+            }
+        }
+
+        public ExifRet(CallRet ret)
+            : base(ret)
+        {
+            if (!String.IsNullOrEmpty(Response))
+            {
+                try
+                {
+                    Unmarshal(Response);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.ToString());
+                    this.Exception = e;
+                }
+            }
+        }
+
+        private void Unmarshal(string json)
+        {
+            var jss = new JavaScriptSerializer();
+            dict = jss.Deserialize<Dictionary<string, ExifValType>>(json);
+        }
+
+        public override string ToString()
+        {
+            var jss = new JavaScriptSerializer();
+            return jss.Serialize(dict);
+        }
+    }
+}
diff --git a/QBox/FileOp/FileOpClient.cs b/QBox/FileOp/FileOpClient.cs
index 55fc1c5c..4353d2ea 100644
--- a/QBox/FileOp/FileOpClient.cs
+++ b/QBox/FileOp/FileOpClient.cs
@@ -5,11 +5,11 @@
 
 namespace QBox.FileOp
 {
-    public static class FileOpClient
+    static class FileOpClient
     {
         public static CallRet Get(string url)
         {
-            Console.WriteLine("Client.Get ==> URL: " + url);
+            Console.WriteLine("FopClient.Get ==> URL: " + url);
             try
             {
                 HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
diff --git a/QBox/FileOp/ImageInfo.cs b/QBox/FileOp/ImageInfo.cs
new file mode 100644
index 00000000..ff9250cd
--- /dev/null
+++ b/QBox/FileOp/ImageInfo.cs
@@ -0,0 +1,19 @@
+using System;
+using QBox.RPC;
+
+namespace QBox.FileOp
+{
+    public static class ImageInfo
+    {
+        public static string MakeRequest(string url)
+        {
+            return url + "?imageInfo";
+        }
+
+        public static ImageInfoRet Call(string url)
+        {
+            CallRet callRet = FileOpClient.Get(url);
+            return new ImageInfoRet(callRet);
+        }
+    }
+}
diff --git a/QBox/FileOp/ImageInfoRet.cs b/QBox/FileOp/ImageInfoRet.cs
index d83afee5..64fef2d8 100644
--- a/QBox/FileOp/ImageInfoRet.cs
+++ b/QBox/FileOp/ImageInfoRet.cs
@@ -1,14 +1,15 @@
 using System;
-using LitJson;
+using System.Collections.Generic;
+using System.Web.Script.Serialization;
 using QBox.RPC;
 
 namespace QBox.FileOp
 {
     public class ImageInfoRet : CallRet
     {
-        public string Format { get; private set; }
         public int Width { get; private set; }
         public int Height { get; private set; }
+        public string Format { get; private set; }
         public string ColorModel { get; private set; }
 
         public ImageInfoRet(CallRet ret)
@@ -30,11 +31,12 @@ public ImageInfoRet(CallRet ret)
 
         private void Unmarshal(string json)
         {
-            JsonData data = JsonMapper.ToObject(json);
-            Format = (string)data["format"];
-            Width = (int)data["width"];
-            Height = (int)data["height"];
-            ColorModel = (string)data["colorModel"];
+            var jss = new JavaScriptSerializer();
+            var dict = jss.Deserialize<Dictionary<string, dynamic>>(json);
+            Format = (string)dict["format"];
+            Width = (int)dict["width"];
+            Height = (int)dict["height"];
+            ColorModel = (string)dict["colorModel"];
         }
     }
 }
diff --git a/QBox/FileOp/ImageMogrifySpec.cs b/QBox/FileOp/ImageMogrify.cs
similarity index 87%
rename from QBox/FileOp/ImageMogrifySpec.cs
rename to QBox/FileOp/ImageMogrify.cs
index 338f26e7..042ac749 100644
--- a/QBox/FileOp/ImageMogrifySpec.cs
+++ b/QBox/FileOp/ImageMogrify.cs
@@ -1,35 +1,35 @@
-using System;
-
-namespace QBox.FileOp
-{
-    public class ImageMogrifySpec
-    {
-        public string Thumbnail { get; set; }
-        public string Gravity { get; set; }
-        public string Crop { get; set; }
-        public int Quality { get; set; }
-        public int Rotate { get; set; }
-        public string Format { get; set; }
-        public bool AutoOrient { get; set; }
-
-        public string MakeSpecString()
-        {
-            string spec = "?imageMogr";
-            if (!String.IsNullOrEmpty(Thumbnail))
-                spec += "/thumbnail/" + Thumbnail;
-            if (!String.IsNullOrEmpty(Gravity))
-                spec += "/gravity/" + Gravity;
-            if (!String.IsNullOrEmpty(Crop))
-                spec += "/crop/" + Crop;
-            if (Quality != 0)
-                spec += "/quality/" + Quality.ToString();
-            if (Rotate != 0)
-                spec += "/rotate/" + Rotate.ToString();
-            if (!String.IsNullOrEmpty(Format))
-                spec += "/format/" + Format;
-            if (AutoOrient)
-                spec += "/auto-orient";
-            return spec;
-        }
-    }
-}
+using System;
+
+namespace QBox.FileOp
+{
+    public class ImageMogrify
+    {
+        public string Thumbnail { get; set; }
+        public string Gravity { get; set; }
+        public string Crop { get; set; }
+        public int Quality { get; set; }
+        public int Rotate { get; set; }
+        public string Format { get; set; }
+        public bool AutoOrient { get; set; }
+
+        public string MakeRequest(string url)
+        {
+            string spec = url + "?imageMogr";
+            if (AutoOrient)
+                spec += "/auto-orient";
+            if (!String.IsNullOrEmpty(Thumbnail))
+                spec += "/thumbnail/" + Thumbnail;
+            if (!String.IsNullOrEmpty(Gravity))
+                spec += "/gravity/" + Gravity;
+            if (!String.IsNullOrEmpty(Crop))
+                spec += "/crop/" + Crop;
+            if (Quality != 0)
+                spec += "/quality/" + Quality.ToString();
+            if (Rotate != 0)
+                spec += "/rotate/" + Rotate.ToString();
+            if (!String.IsNullOrEmpty(Format))
+                spec += "/format/" + Format;
+            return spec;
+        }
+    }
+}
diff --git a/QBox/FileOp/ImageOp.cs b/QBox/FileOp/ImageOp.cs
deleted file mode 100644
index 7fccb45f..00000000
--- a/QBox/FileOp/ImageOp.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using QBox.RPC;
-
-namespace QBox.FileOp
-{
-    public static class ImageOp
-    {
-        public static ImageInfoRet ImageInfo(string url)
-        {
-            CallRet callRet = FileOpClient.Get(url + "?imageInfo");
-            return new ImageInfoRet(callRet);
-        }
-
-        public static CallRet ImageExif(string url)
-        {
-            return FileOpClient.Get(url + "?exif");
-        }
-
-        public static string ImageViewUrl(string url, ImageViewSpec spec)
-        {
-            return url + spec.MakeSpecString();
-        }
-
-        public static string ImageMogrifyUrl(string url, ImageMogrifySpec spec)
-        {
-            return url + spec.MakeSpecString();
-        }
-    }
-}
diff --git a/QBox/FileOp/ImageViewSpec.cs b/QBox/FileOp/ImageView.cs
similarity index 69%
rename from QBox/FileOp/ImageViewSpec.cs
rename to QBox/FileOp/ImageView.cs
index df05bd28..8b63e283 100644
--- a/QBox/FileOp/ImageViewSpec.cs
+++ b/QBox/FileOp/ImageView.cs
@@ -1,30 +1,27 @@
-using System;
-
-namespace QBox.FileOp
-{
-    public class ImageViewSpec
-    {
-        public int Mode { get; set; }
-        public int Width { get; set; }
-        public int Height { get; set; }
-        public int Quality { get; set; }
-        public string Format { get; set; }
-        public int Sharpen { get; set; }
-
-        public string MakeSpecString()
-        {
-            string spec = "?imageView/" + Mode.ToString();
-            if (Width != 0)
-                spec += "/w/" + Width.ToString();
-            if (Height != 0)
-                spec += "/h/" + Height.ToString();
-            if (Quality != 0)
-                spec += "/q/" + Quality.ToString();
-            if (!String.IsNullOrEmpty(Format))
-                spec += "/format/" + Format;
-            if (Sharpen != 0)
-                spec += "/sharpen/" + Sharpen;
-            return spec;
-        }
-    }
-}
+using System;
+
+namespace QBox.FileOp
+{
+    public class ImageView
+    {
+        public int Mode { get; set; }
+        public int Width { get; set; }
+        public int Height { get; set; }
+        public int Quality { get; set; }
+        public string Format { get; set; }
+
+        public string MakeRequest(string url)
+        {
+            string spec = url + "?imageView/" + Mode.ToString();
+            if (Width != 0)
+                spec += "/w/" + Width.ToString();
+            if (Height != 0)
+                spec += "/h/" + Height.ToString();
+            if (Quality != 0)
+                spec += "/q/" + Quality.ToString();
+            if (!String.IsNullOrEmpty(Format))
+                spec += "/format/" + Format;
+            return spec;
+        }
+    }
+}
diff --git a/QBox/RS/FileParameter.cs b/QBox/IO/FileParameter.cs
similarity index 70%
rename from QBox/RS/FileParameter.cs
rename to QBox/IO/FileParameter.cs
index 5de705ce..893bfa2e 100644
--- a/QBox/RS/FileParameter.cs
+++ b/QBox/IO/FileParameter.cs
@@ -1,16 +1,19 @@
-using System;
-
-namespace QBox.RS
-{
-    public class FileParameter
-    {
-        public string FileName { get; set; }
-        public string MimeType { get; set; }
-
-        public FileParameter(string fname, string mimeType)
-        {
-            FileName = fname;
-            MimeType = mimeType;
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace QBox.IO
+{
+    class FileParameter
+    {
+        public string FileName { get; set; }
+        public string MimeType { get; set; }
+
+        public FileParameter(string fname, string mimeType)
+        {
+            FileName = fname;
+            MimeType = mimeType;
+        }
+    }
+}
diff --git a/QBox/IO/IOClient.cs b/QBox/IO/IOClient.cs
new file mode 100644
index 00000000..4c19a746
--- /dev/null
+++ b/QBox/IO/IOClient.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using QBox.Conf;
+using QBox.Auth;
+using QBox.RPC;
+using QBox.Util;
+
+namespace QBox.IO
+{
+    public class IOClient
+    {
+        public static PutRet PutFile(string upToken, string key, string localFile, PutExtra extra)
+        {
+            string entryURI = extra.Bucket + ":" + key;
+            string action = "/rs-put/" + Base64URLSafe.Encode(entryURI);
+            if (!String.IsNullOrEmpty(extra.MimeType))
+            {
+                action += "/mimeType/" + Base64URLSafe.Encode(extra.MimeType);
+            }
+            if (!String.IsNullOrEmpty(extra.CustomMeta))
+            {
+                action += "/meta/" + Base64URLSafe.Encode(extra.CustomMeta);
+            }
+            if (extra.Crc32 >= 0)
+            {
+                action += "/crc32/" + extra.Crc32.ToString();
+            }
+
+            try
+            {
+                var postParams = new Dictionary<string, object>();
+                postParams["auth"] = upToken;
+                postParams["action"] = action;
+                postParams["file"] = new FileParameter(localFile, extra.MimeType);
+                if (!String.IsNullOrEmpty(extra.CallbackParams))
+                    postParams["params"] = extra.CallbackParams;
+                CallRet callRet = MultiPart.Post(Config.UP_HOST + "/upload", postParams);
+                return new PutRet(callRet);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+                return new PutRet(new CallRet(HttpStatusCode.BadRequest, e));
+            }
+        }
+
+        public static PutRet ResumablePutFile(string upToken, string key, string localFile, PutExtra extra)
+        {
+            PutAuthClient client = new PutAuthClient(upToken);
+            return ResumablePut.PutFile(client, extra.Bucket, key, extra.MimeType, localFile, 
+                extra.CustomMeta, extra.CallbackParams);
+        }
+    }
+}
diff --git a/QBox/RS/MultiPartFormDataPost.cs b/QBox/IO/MultiPart.cs
similarity index 82%
rename from QBox/RS/MultiPartFormDataPost.cs
rename to QBox/IO/MultiPart.cs
index 400f2c95..57083440 100644
--- a/QBox/RS/MultiPartFormDataPost.cs
+++ b/QBox/IO/MultiPart.cs
@@ -1,122 +1,132 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Net;
-using QBox.Util;
-using QBox.RPC;
-
-namespace QBox.RS
-{
-    public static class MultiPartFormDataPost
-    {
-        public static Encoding encoding = Encoding.ASCII;
-
-        private static long GetContentLength(Dictionary<string, object> postParams, string boundary)
-        {
-            long length = 0;
-            bool needsCLRF = false;
-            foreach (var param in postParams)
-            {
-                if (needsCLRF)
-                    length += encoding.GetByteCount("\r\n");
-
-                needsCLRF = true;
-
-                if (param.Value is FileParameter)
-                {
-                    FileParameter fileToUpload = (FileParameter)param.Value;
-
-                    string headfmt = "--{0}\r\nContent-Disposition: form-data; name=\"{1}\"; filename=\"{2}\";\r\nContent-Type: {3}\r\n\r\n";
-                    string header = string.Format(headfmt, boundary, param.Key,
-                        fileToUpload.FileName ?? param.Key,
-                        fileToUpload.MimeType ?? "application/octet-stream");
-
-                    length += encoding.GetByteCount(header);
-                    using (FileStream fs = File.OpenRead(fileToUpload.FileName))
-                    {
-                        length += fs.Length;
-                    }
-                }
-                else
-                {
-                    string headfmt = "--{0}\r\nContent-Disposition: form-data; name=\"{1}\"\r\n\r\n{2}";
-                    string partData = string.Format(headfmt, boundary, param.Key, param.Value);
-                    length += encoding.GetByteCount(partData);
-                }
-            }
-
-            string footer = "\r\n--" + boundary + "--\r\n";
-            length += encoding.GetByteCount(footer);
-            return length;
-        }
-
-        private static void WriteBody(Dictionary<string, object> postParams, string boundary, Stream body)
-        {
-            bool needsCLRF = false;
-            foreach (var param in postParams)
-            {
-                if (needsCLRF)
-                    body.Write(encoding.GetBytes("\r\n"), 0, encoding.GetByteCount("\r\n"));
-
-                needsCLRF = true;
-
-                if (param.Value is FileParameter)
-                {
-                    FileParameter fileToUpload = (FileParameter)param.Value;
-
-                    string headfmt = "--{0}\r\nContent-Disposition: form-data; name=\"{1}\"; filename=\"{2}\";\r\nContent-Type: {3}\r\n\r\n";
-                    string header = string.Format(headfmt, boundary, param.Key,
-                        fileToUpload.FileName ?? param.Key,
-                        fileToUpload.MimeType ?? "application/octet-stream");
-
-                    body.Write(encoding.GetBytes(header), 0, encoding.GetByteCount(header));
-                    using (FileStream fs = File.OpenRead(fileToUpload.FileName))
-                    {
-                        StreamUtil.Copy(fs, body);
-                    }
-                }
-                else
-                {
-                    string headfmt = "--{0}\r\nContent-Disposition: form-data; name=\"{1}\"\r\n\r\n{2}";
-                    string partData = string.Format(headfmt, boundary, param.Key, param.Value);
-                    body.Write(encoding.GetBytes(partData), 0, encoding.GetByteCount(partData));
-                }
-            }
-
-            string footer = "\r\n--" + boundary + "--\r\n";
-            body.Write(encoding.GetBytes(footer), 0, encoding.GetByteCount(footer));
-        }
-
-        public static CallRet Post(string url, Dictionary<string, object> postParams)
-        {
-            Console.WriteLine("URL: " + url);
-            string boundary = String.Format("----------{0:N}", Guid.NewGuid());
-            string contentType = "multipart/form-data; boundary=" + boundary;
-
-            Stream requestStream = null;
-            HttpWebResponse response = null;
-            try
-            {
-                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
-                request.Method = "POST";
-                request.ContentType = contentType;
-                request.ContentLength = GetContentLength(postParams, boundary);
-                requestStream = request.GetRequestStream();
-                WriteBody(postParams, boundary, requestStream);
-                response = request.GetResponse() as HttpWebResponse;
-                return Client.HandleResult(response);
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-                return new CallRet(HttpStatusCode.BadRequest, e);
-            }
-            finally
-            {
-                requestStream.Close();
-                response.Close();
-            }
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Net;
+using QBox.RPC;
+using QBox.Conf;
+
+namespace QBox.IO
+{
+    static class MultiPart
+    {
+        public static Encoding encoding = Config.Encoding;
+
+        public static string RandomBoundary()
+        {
+            return String.Format("----------{0:N}", Guid.NewGuid());
+        }
+
+        public static string FormDataContentType(string boundary)
+        {
+            return "multipart/form-data; boundary=" + boundary;
+        }
+
+        public static long ContentLength(Dictionary<string, object> postParams, string boundary)
+        {
+            long length = 0;
+            bool needsCLRF = false;
+            foreach (var param in postParams)
+            {
+                if (needsCLRF)
+                    length += encoding.GetByteCount("\r\n");
+
+                needsCLRF = true;
+
+                if (param.Value is FileParameter)
+                {
+                    FileParameter fileToUpload = (FileParameter)param.Value;
+
+                    string headfmt = "--{0}\r\nContent-Disposition: form-data; name=\"{1}\"; filename=\"{2}\";\r\nContent-Type: {3}\r\n\r\n";
+                    string header = string.Format(headfmt, boundary, param.Key,
+                        fileToUpload.FileName ?? param.Key,
+                        fileToUpload.MimeType ?? "application/octet-stream");
+
+                    length += encoding.GetByteCount(header);
+                    using (FileStream fs = File.OpenRead(fileToUpload.FileName))
+                    {
+                        length += fs.Length;
+                    }
+                }
+                else
+                {
+                    string headfmt = "--{0}\r\nContent-Disposition: form-data; name=\"{1}\"\r\n\r\n{2}";
+                    string partData = string.Format(headfmt, boundary, param.Key, param.Value);
+                    length += encoding.GetByteCount(partData);
+                }
+            }
+
+            string footer = "\r\n--" + boundary + "--\r\n";
+            length += encoding.GetByteCount(footer);
+            return length;
+        }
+
+        public static void WriteBody(Dictionary<string, object> postParams, string boundary, Stream body)
+        {
+            bool needsCLRF = false;
+            foreach (var param in postParams)
+            {
+                if (needsCLRF)
+                    body.Write(encoding.GetBytes("\r\n"), 0, encoding.GetByteCount("\r\n"));
+
+                needsCLRF = true;
+
+                if (param.Value is FileParameter)
+                {
+                    FileParameter fileToUpload = (FileParameter)param.Value;
+
+                    string headfmt = "--{0}\r\nContent-Disposition: form-data; name=\"{1}\"; filename=\"{2}\";\r\nContent-Type: {3}\r\n\r\n";
+                    string header = string.Format(headfmt, boundary, param.Key,
+                        fileToUpload.FileName ?? param.Key,
+                        fileToUpload.MimeType ?? "application/octet-stream");
+
+                    body.Write(encoding.GetBytes(header), 0, encoding.GetByteCount(header));
+                    using (FileStream fs = File.OpenRead(fileToUpload.FileName))
+                    {
+                        fs.CopyTo(body);
+                    }
+                }
+                else
+                {
+                    string headfmt = "--{0}\r\nContent-Disposition: form-data; name=\"{1}\"\r\n\r\n{2}";
+                    string partData = string.Format(headfmt, boundary, param.Key, param.Value);
+                    body.Write(encoding.GetBytes(partData), 0, encoding.GetByteCount(partData));
+                }
+            }
+
+            string footer = "\r\n--" + boundary + "--\r\n";
+            body.Write(encoding.GetBytes(footer), 0, encoding.GetByteCount(footer));
+        }
+
+        public static CallRet Post(string url, Dictionary<string, object> postParams)
+        {
+            Console.WriteLine("URL: " + url);
+            string boundary = RandomBoundary();
+            string contentType = FormDataContentType(boundary);
+
+            Stream requestStream = null;
+            HttpWebResponse response = null;
+            try
+            {
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
+                request.Method = "POST";
+                request.ContentType = contentType;
+                request.ContentLength = ContentLength(postParams, boundary);
+                requestStream = request.GetRequestStream();
+                WriteBody(postParams, boundary, requestStream);
+                response = request.GetResponse() as HttpWebResponse;
+                return RPC.Client.HandleResult(response);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+                return new CallRet(HttpStatusCode.BadRequest, e);
+            }
+            finally
+            {
+                requestStream.Close();
+                response.Close();
+            }
+        }
+    }
+}
diff --git a/QBox/IO/PutExtra.cs b/QBox/IO/PutExtra.cs
new file mode 100644
index 00000000..4898cef9
--- /dev/null
+++ b/QBox/IO/PutExtra.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace QBox.IO
+{
+    public class PutExtra
+    {
+        public string CallbackParams { get; set; }
+        public string Bucket { get; set; }
+        public string CustomMeta { get; set; }
+        public string MimeType { get; set; }
+        public Int64 Crc32 { get; set; }
+
+        public PutExtra()
+        {
+            Crc32 = -1;
+        }
+
+        public PutExtra(string bucket, string mimeType, string callbackParams)
+        {
+            Bucket = bucket;
+            MimeType = mimeType;
+            CallbackParams = callbackParams;
+            Crc32 = -1;
+        }
+    }
+}
diff --git a/QBox/RS/PutFileRet.cs b/QBox/IO/PutRet.cs
similarity index 62%
rename from QBox/RS/PutFileRet.cs
rename to QBox/IO/PutRet.cs
index eaba1389..6f13ede8 100644
--- a/QBox/RS/PutFileRet.cs
+++ b/QBox/IO/PutRet.cs
@@ -1,34 +1,36 @@
-using System;
-using LitJson;
-using QBox.RPC;
-
-namespace QBox.RS
-{
-    public class PutFileRet : CallRet
-    {
-        public string Hash { get; private set; }
-
-        public PutFileRet(CallRet ret)
-            : base(ret)
-        {
-            if (!String.IsNullOrEmpty(Response))
-            {
-                try
-                {
-                    Unmarshal(Response);
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine(e.ToString());
-                    this.Exception = e;
-                }
-            }
-        }
-
-        private void Unmarshal(string json)
-        {
-            JsonData data = JsonMapper.ToObject(json);
-            Hash = (string)data["hash"];
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Web.Script.Serialization;
+using QBox.RPC;
+
+namespace QBox.IO
+{
+    public class PutRet : CallRet
+    {
+        public string Hash { get; private set; }
+
+        public PutRet(CallRet ret)
+            : base(ret)
+        {
+            if (!String.IsNullOrEmpty(Response))
+            {
+                try
+                {
+                    Unmarshal(Response);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.ToString());
+                    this.Exception = e;
+                }
+            }
+        }
+
+        private void Unmarshal(string json)
+        {
+            var jss = new JavaScriptSerializer();
+            var dict = jss.Deserialize<Dictionary<string, dynamic>>(json);
+            Hash = (string)dict["hash"];
+        }
+    }
+}
diff --git a/QBox/RS/ResumablePut.cs b/QBox/IO/ResumablePut.cs
similarity index 76%
rename from QBox/RS/ResumablePut.cs
rename to QBox/IO/ResumablePut.cs
index a74bfaa6..4b78c2e8 100644
--- a/QBox/RS/ResumablePut.cs
+++ b/QBox/IO/ResumablePut.cs
@@ -1,96 +1,98 @@
-using System;
-using System.IO;
-using System.Text;
-using QBox.Util;
-using QBox.RPC;
-
-namespace QBox.RS
-{
-    public static class ResumablePut
-    {
-        private static int ChunkBits = 22;
-        private static long ChunkSize = 1 << ChunkBits;
-
-        public static ResumablePutFileRet Mkblock(string host, Client client, Stream body, long length)
-        {
-            string url = host + "/mkblk/" + Convert.ToString(length);
-            CallRet callRet = client.CallWithBinary(url, "application/octet-stream", body, length);
-            return new ResumablePutFileRet(callRet);
-        }
-
-        public static PutFileRet Mkfile(string host, Client client, string entryURI, long fsize, 
-            string customMeta, string callbackParam, string[] ctxs)
-        {
-            string url = host + "/rs-mkfile/" + Base64UrlSafe.Encode(entryURI) + 
-                "/fsize/" + Convert.ToString(fsize);
-            if (!String.IsNullOrEmpty(callbackParam))
-            {
-                url += "/params/" + Base64UrlSafe.Encode(callbackParam);
-            }
-            if (!String.IsNullOrEmpty(customMeta))
-            {
-                url += "/meta/" + Base64UrlSafe.Encode(customMeta);
-            }
-
-            using (Stream body = new MemoryStream())
-            {
-                for (int i = 0; i < ctxs.Length; i++)
-                {
-                    byte[] bctx = Encoding.ASCII.GetBytes(ctxs[i]);
-                    body.Write(bctx, 0, bctx.Length);
-                    if (i != ctxs.Length-1)
-                    {
-                        body.WriteByte((byte)',');
-                    }
-                }
-                body.Seek(0, SeekOrigin.Begin);
-                CallRet ret= client.CallWithBinary(url, "text/plain", body, body.Length);
-                return new PutFileRet(ret);
-            }
-        }
-
-        public static PutFileRet PutFile(
-            Client client, string tableName, string key, string mimeType, 
-            string localFile, string customMeta, string callbackParam)
-        {
-            long fsize = 0;
-            string[] ctxs = null;
-            string host = Config.UP_HOST;
-            using (FileStream fs = File.OpenRead(localFile))
-            {
-                fsize = fs.Length;
-                int chunkCnt = (int)((fsize + (ChunkSize - 1)) >> ChunkBits);
-                long chunkSize = ChunkSize;
-                ctxs = new string[chunkCnt];
-                Console.WriteLine("ResumablePut ==> fsize: {0}, chunkCnt: {1}", fsize, chunkCnt);
-                for (int i = 0; i < chunkCnt; i++)
-                {
-                    if (i == chunkCnt - 1)
-                    {
-                        chunkSize = fsize - (i << ChunkBits);
-                    }
-                    ResumablePutFileRet ret = null;
-                    for (int retry = 0; retry < Config.PUT_RETRY_TIMES; retry++)
-                    {
-                        fs.Seek(i * ChunkSize, SeekOrigin.Begin);
-                        ret = Mkblock(host, client, fs, chunkSize);
-                        if (ret.OK)
-                        {
-                            ctxs[i] = ret.Ctx;
-                            host = ret.Host;
-                            break;
-                        }
-                    }
-                    if (!ret.OK)
-                    {
-                        Console.WriteLine(ret.Exception.ToString());
-                        return new PutFileRet(new CallRet(ret));
-                    }
-                }
-            }
-
-            string entryURI = tableName + ":" + key;
-            return Mkfile(host, client, entryURI, fsize, customMeta, callbackParam, ctxs);
-        }
-    }
-}
+using System;
+using System.IO;
+using System.Text;
+using QBox.Conf;
+using QBox.Util;
+using QBox.RPC;
+
+namespace QBox.IO
+{
+    static class ResumablePut
+    {
+        private static int ChunkBits = 22;
+        private static long ChunkSize = 1 << ChunkBits;
+        private static int PutRetryTimes = 3;
+
+        public static ResumablePutRet Mkblock(string host, Client client, Stream body, long length)
+        {
+            string url = host + "/mkblk/" + Convert.ToString(length);
+            CallRet callRet = client.CallWithBinary(url, "application/octet-stream", body, length);
+            return new ResumablePutRet(callRet);
+        }
+
+        public static PutRet Mkfile(string host, Client client, string entryURI, long fsize, 
+            string customMeta, string callbackParam, string[] ctxs)
+        {
+            string url = host + "/rs-mkfile/" + Base64URLSafe.Encode(entryURI) + 
+                "/fsize/" + Convert.ToString(fsize);
+            if (!String.IsNullOrEmpty(callbackParam))
+            {
+                url += "/params/" + Base64URLSafe.Encode(callbackParam);
+            }
+            if (!String.IsNullOrEmpty(customMeta))
+            {
+                url += "/meta/" + Base64URLSafe.Encode(customMeta);
+            }
+
+            using (Stream body = new MemoryStream())
+            {
+                for (int i = 0; i < ctxs.Length; i++)
+                {
+                    byte[] bctx = Encoding.ASCII.GetBytes(ctxs[i]);
+                    body.Write(bctx, 0, bctx.Length);
+                    if (i != ctxs.Length-1)
+                    {
+                        body.WriteByte((byte)',');
+                    }
+                }
+                body.Seek(0, SeekOrigin.Begin);
+                CallRet ret= client.CallWithBinary(url, "text/plain", body, body.Length);
+                return new PutRet(ret);
+            }
+        }
+
+        public static PutRet PutFile(
+            Client client, string tableName, string key, string mimeType, 
+            string localFile, string customMeta, string callbackParam)
+        {
+            long fsize = 0;
+            string[] ctxs = null;
+            string host = Config.UP_HOST;
+            using (FileStream fs = File.OpenRead(localFile))
+            {
+                fsize = fs.Length;
+                int chunkCnt = (int)((fsize + (ChunkSize - 1)) >> ChunkBits);
+                long chunkSize = ChunkSize;
+                ctxs = new string[chunkCnt];
+                Console.WriteLine("ResumablePut ==> fsize: {0}, chunkCnt: {1}", fsize, chunkCnt);
+                for (int i = 0; i < chunkCnt; i++)
+                {
+                    if (i == chunkCnt - 1)
+                    {
+                        chunkSize = fsize - (i << ChunkBits);
+                    }
+                    ResumablePutRet ret = null;
+                    for (int retry = 0; retry < PutRetryTimes; retry++)
+                    {
+                        fs.Seek(i * ChunkSize, SeekOrigin.Begin);
+                        ret = Mkblock(host, client, fs, chunkSize);
+                        if (ret.OK)
+                        {
+                            ctxs[i] = ret.Ctx;
+                            host = ret.Host;
+                            break;
+                        }
+                    }
+                    if (!ret.OK)
+                    {
+                        Console.WriteLine(ret.Exception.ToString());
+                        return new PutRet(new CallRet(ret));
+                    }
+                }
+            }
+
+            string entryURI = tableName + ":" + key;
+            return Mkfile(host, client, entryURI, fsize, customMeta, callbackParam, ctxs);
+        }
+    }
+}
diff --git a/QBox/RS/ResumablePutFileRet.cs b/QBox/IO/ResumablePutRet.cs
similarity index 60%
rename from QBox/RS/ResumablePutFileRet.cs
rename to QBox/IO/ResumablePutRet.cs
index 5140712a..b94a39e1 100644
--- a/QBox/RS/ResumablePutFileRet.cs
+++ b/QBox/IO/ResumablePutRet.cs
@@ -1,38 +1,40 @@
-using System;
-using LitJson;
-using QBox.RPC;
-
-namespace QBox.RS
-{
-    public class ResumablePutFileRet : CallRet
-    {
-        public string Ctx { get; private set; }
-        public string Checksum { get; private set; }
-        public string Host { get; private set; }
-
-        public ResumablePutFileRet(CallRet ret)
-            : base(ret)
-        {
-            if (!String.IsNullOrEmpty(Response))
-            {
-                try
-                {
-                    Unmarshal(Response);
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine(e.ToString());
-                    this.Exception = e;
-                }
-            }
-        }
-
-        private void Unmarshal(string json)
-        {
-            JsonData data = JsonMapper.ToObject(json);
-            Ctx = (string)data["ctx"];
-            Checksum = (string)data["checksum"];
-            Host = (string)data["host"];
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Web.Script.Serialization;
+using QBox.RPC;
+
+namespace QBox.IO
+{
+    class ResumablePutRet : CallRet
+    {
+        public string Ctx { get; private set; }
+        public string Checksum { get; private set; }
+        public string Host { get; private set; }
+
+        public ResumablePutRet(CallRet ret)
+            : base(ret)
+        {
+            if (!String.IsNullOrEmpty(Response))
+            {
+                try
+                {
+                    Unmarshal(Response);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.ToString());
+                    this.Exception = e;
+                }
+            }
+        }
+
+        private void Unmarshal(string json)
+        {
+            var jss = new JavaScriptSerializer();
+            var dict = jss.Deserialize<Dictionary<string, dynamic>>(json);
+            Ctx = (string)dict["ctx"];
+            Checksum = (string)dict["checksum"];
+            Host = (string)dict["host"];
+        }
+    }
+}
diff --git a/QBox/Json/IJsonWrapper.cs b/QBox/Json/IJsonWrapper.cs
deleted file mode 100644
index 2acebede..00000000
--- a/QBox/Json/IJsonWrapper.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-#region Header
-/**
- * IJsonWrapper.cs
- *   Interface that represents a type capable of handling all kinds of JSON
- *   data. This is mainly used when mapping objects through JsonMapper, and
- *   it's implemented by JsonData.
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-using System.Collections;
-using System.Collections.Specialized;
-
-
-namespace LitJson
-{
-    public enum JsonType
-    {
-        None,
-
-        Object,
-        Array,
-        String,
-        Int,
-        Long,
-        Double,
-        Boolean
-    }
-
-    public interface IJsonWrapper : IList, IOrderedDictionary
-    {
-        bool IsArray   { get; }
-        bool IsBoolean { get; }
-        bool IsDouble  { get; }
-        bool IsInt     { get; }
-        bool IsLong    { get; }
-        bool IsObject  { get; }
-        bool IsString  { get; }
-
-        bool     GetBoolean ();
-        double   GetDouble ();
-        int      GetInt ();
-        JsonType GetJsonType ();
-        long     GetLong ();
-        string   GetString ();
-
-        void SetBoolean  (bool val);
-        void SetDouble   (double val);
-        void SetInt      (int val);
-        void SetJsonType (JsonType type);
-        void SetLong     (long val);
-        void SetString   (string val);
-
-        string ToJson ();
-        void   ToJson (JsonWriter writer);
-    }
-}
diff --git a/QBox/Json/JsonData.cs b/QBox/Json/JsonData.cs
deleted file mode 100644
index b0ca03cc..00000000
--- a/QBox/Json/JsonData.cs
+++ /dev/null
@@ -1,993 +0,0 @@
-#region Header
-/**
- * JsonData.cs
- *   Generic type to hold JSON data (objects, arrays, and so on). This is
- *   the default type returned by JsonMapper.ToObject().
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.IO;
-
-
-namespace LitJson
-{
-    public class JsonData : IJsonWrapper, IEquatable<JsonData>
-    {
-        #region Fields
-        private IList<JsonData>               inst_array;
-        private bool                          inst_boolean;
-        private double                        inst_double;
-        private int                           inst_int;
-        private long                          inst_long;
-        private IDictionary<string, JsonData> inst_object;
-        private string                        inst_string;
-        private string                        json;
-        private JsonType                      type;
-
-        // Used to implement the IOrderedDictionary interface
-        private IList<KeyValuePair<string, JsonData>> object_list;
-        #endregion
-
-
-        #region Properties
-        public int Count {
-            get { return EnsureCollection ().Count; }
-        }
-
-        public bool IsArray {
-            get { return type == JsonType.Array; }
-        }
-
-        public bool IsBoolean {
-            get { return type == JsonType.Boolean; }
-        }
-
-        public bool IsDouble {
-            get { return type == JsonType.Double; }
-        }
-
-        public bool IsInt {
-            get { return type == JsonType.Int; }
-        }
-
-        public bool IsLong {
-            get { return type == JsonType.Long; }
-        }
-
-        public bool IsObject {
-            get { return type == JsonType.Object; }
-        }
-
-        public bool IsString {
-            get { return type == JsonType.String; }
-        }
-        #endregion
-
-
-        #region ICollection Properties
-        int ICollection.Count {
-            get {
-                return Count;
-            }
-        }
-
-        bool ICollection.IsSynchronized {
-            get {
-                return EnsureCollection ().IsSynchronized;
-            }
-        }
-
-        object ICollection.SyncRoot {
-            get {
-                return EnsureCollection ().SyncRoot;
-            }
-        }
-        #endregion
-
-
-        #region IDictionary Properties
-        bool IDictionary.IsFixedSize {
-            get {
-                return EnsureDictionary ().IsFixedSize;
-            }
-        }
-
-        bool IDictionary.IsReadOnly {
-            get {
-                return EnsureDictionary ().IsReadOnly;
-            }
-        }
-
-        ICollection IDictionary.Keys {
-            get {
-                EnsureDictionary ();
-                IList<string> keys = new List<string> ();
-
-                foreach (KeyValuePair<string, JsonData> entry in
-                         object_list) {
-                    keys.Add (entry.Key);
-                }
-
-                return (ICollection) keys;
-            }
-        }
-
-        ICollection IDictionary.Values {
-            get {
-                EnsureDictionary ();
-                IList<JsonData> values = new List<JsonData> ();
-
-                foreach (KeyValuePair<string, JsonData> entry in
-                         object_list) {
-                    values.Add (entry.Value);
-                }
-
-                return (ICollection) values;
-            }
-        }
-        #endregion
-
-
-
-        #region IJsonWrapper Properties
-        bool IJsonWrapper.IsArray {
-            get { return IsArray; }
-        }
-
-        bool IJsonWrapper.IsBoolean {
-            get { return IsBoolean; }
-        }
-
-        bool IJsonWrapper.IsDouble {
-            get { return IsDouble; }
-        }
-
-        bool IJsonWrapper.IsInt {
-            get { return IsInt; }
-        }
-
-        bool IJsonWrapper.IsLong {
-            get { return IsLong; }
-        }
-
-        bool IJsonWrapper.IsObject {
-            get { return IsObject; }
-        }
-
-        bool IJsonWrapper.IsString {
-            get { return IsString; }
-        }
-        #endregion
-
-
-        #region IList Properties
-        bool IList.IsFixedSize {
-            get {
-                return EnsureList ().IsFixedSize;
-            }
-        }
-
-        bool IList.IsReadOnly {
-            get {
-                return EnsureList ().IsReadOnly;
-            }
-        }
-        #endregion
-
-
-        #region IDictionary Indexer
-        object IDictionary.this[object key] {
-            get {
-                return EnsureDictionary ()[key];
-            }
-
-            set {
-                if (! (key is String))
-                    throw new ArgumentException (
-                        "The key has to be a string");
-
-                JsonData data = ToJsonData (value);
-
-                this[(string) key] = data;
-            }
-        }
-        #endregion
-
-
-        #region IOrderedDictionary Indexer
-        object IOrderedDictionary.this[int idx] {
-            get {
-                EnsureDictionary ();
-                return object_list[idx].Value;
-            }
-
-            set {
-                EnsureDictionary ();
-                JsonData data = ToJsonData (value);
-
-                KeyValuePair<string, JsonData> old_entry = object_list[idx];
-
-                inst_object[old_entry.Key] = data;
-
-                KeyValuePair<string, JsonData> entry =
-                    new KeyValuePair<string, JsonData> (old_entry.Key, data);
-
-                object_list[idx] = entry;
-            }
-        }
-        #endregion
-
-
-        #region IList Indexer
-        object IList.this[int index] {
-            get {
-                return EnsureList ()[index];
-            }
-
-            set {
-                EnsureList ();
-                JsonData data = ToJsonData (value);
-
-                this[index] = data;
-            }
-        }
-        #endregion
-
-
-        #region Public Indexers
-        public JsonData this[string prop_name] {
-            get {
-                EnsureDictionary ();
-                return inst_object[prop_name];
-            }
-
-            set {
-                EnsureDictionary ();
-
-                KeyValuePair<string, JsonData> entry =
-                    new KeyValuePair<string, JsonData> (prop_name, value);
-
-                if (inst_object.ContainsKey (prop_name)) {
-                    for (int i = 0; i < object_list.Count; i++) {
-                        if (object_list[i].Key == prop_name) {
-                            object_list[i] = entry;
-                            break;
-                        }
-                    }
-                } else
-                    object_list.Add (entry);
-
-                inst_object[prop_name] = value;
-
-                json = null;
-            }
-        }
-
-        public JsonData this[int index] {
-            get {
-                EnsureCollection ();
-
-                if (type == JsonType.Array)
-                    return inst_array[index];
-
-                return object_list[index].Value;
-            }
-
-            set {
-                EnsureCollection ();
-
-                if (type == JsonType.Array)
-                    inst_array[index] = value;
-                else {
-                    KeyValuePair<string, JsonData> entry = object_list[index];
-                    KeyValuePair<string, JsonData> new_entry =
-                        new KeyValuePair<string, JsonData> (entry.Key, value);
-
-                    object_list[index] = new_entry;
-                    inst_object[entry.Key] = value;
-                }
-
-                json = null;
-            }
-        }
-        #endregion
-
-
-        #region Constructors
-        public JsonData ()
-        {
-        }
-
-        public JsonData (bool boolean)
-        {
-            type = JsonType.Boolean;
-            inst_boolean = boolean;
-        }
-
-        public JsonData (double number)
-        {
-            type = JsonType.Double;
-            inst_double = number;
-        }
-
-        public JsonData (int number)
-        {
-            type = JsonType.Int;
-            inst_int = number;
-        }
-
-        public JsonData (long number)
-        {
-            type = JsonType.Long;
-            inst_long = number;
-        }
-
-        public JsonData (object obj)
-        {
-            if (obj is Boolean) {
-                type = JsonType.Boolean;
-                inst_boolean = (bool) obj;
-                return;
-            }
-
-            if (obj is Double) {
-                type = JsonType.Double;
-                inst_double = (double) obj;
-                return;
-            }
-
-            if (obj is Int32) {
-                type = JsonType.Int;
-                inst_int = (int) obj;
-                return;
-            }
-
-            if (obj is Int64) {
-                type = JsonType.Long;
-                inst_long = (long) obj;
-                return;
-            }
-
-            if (obj is String) {
-                type = JsonType.String;
-                inst_string = (string) obj;
-                return;
-            }
-
-            throw new ArgumentException (
-                "Unable to wrap the given object with JsonData");
-        }
-
-        public JsonData (string str)
-        {
-            type = JsonType.String;
-            inst_string = str;
-        }
-        #endregion
-
-
-        #region Implicit Conversions
-        public static implicit operator JsonData (Boolean data)
-        {
-            return new JsonData (data);
-        }
-
-        public static implicit operator JsonData (Double data)
-        {
-            return new JsonData (data);
-        }
-
-        public static implicit operator JsonData (Int32 data)
-        {
-            return new JsonData (data);
-        }
-
-        public static implicit operator JsonData (Int64 data)
-        {
-            return new JsonData (data);
-        }
-
-        public static implicit operator JsonData (String data)
-        {
-            return new JsonData (data);
-        }
-        #endregion
-
-
-        #region Explicit Conversions
-        public static explicit operator Boolean (JsonData data)
-        {
-            if (data.type != JsonType.Boolean)
-                throw new InvalidCastException (
-                    "Instance of JsonData doesn't hold a double");
-
-            return data.inst_boolean;
-        }
-
-        public static explicit operator Double (JsonData data)
-        {
-            if (data.type != JsonType.Double)
-                throw new InvalidCastException (
-                    "Instance of JsonData doesn't hold a double");
-
-            return data.inst_double;
-        }
-
-        public static explicit operator Int32 (JsonData data)
-        {
-            if (data.type != JsonType.Int)
-                throw new InvalidCastException (
-                    "Instance of JsonData doesn't hold an int");
-
-            return data.inst_int;
-        }
-
-        public static explicit operator Int64 (JsonData data)
-        {
-            if (data.type != JsonType.Long)
-                throw new InvalidCastException (
-                    "Instance of JsonData doesn't hold an int");
-
-            return data.inst_long;
-        }
-
-        public static explicit operator String (JsonData data)
-        {
-            if (data.type != JsonType.String)
-                throw new InvalidCastException (
-                    "Instance of JsonData doesn't hold a string");
-
-            return data.inst_string;
-        }
-        #endregion
-
-
-        #region ICollection Methods
-        void ICollection.CopyTo (Array array, int index)
-        {
-            EnsureCollection ().CopyTo (array, index);
-        }
-        #endregion
-
-
-        #region IDictionary Methods
-        void IDictionary.Add (object key, object value)
-        {
-            JsonData data = ToJsonData (value);
-
-            EnsureDictionary ().Add (key, data);
-
-            KeyValuePair<string, JsonData> entry =
-                new KeyValuePair<string, JsonData> ((string) key, data);
-            object_list.Add (entry);
-
-            json = null;
-        }
-
-        void IDictionary.Clear ()
-        {
-            EnsureDictionary ().Clear ();
-            object_list.Clear ();
-            json = null;
-        }
-
-        bool IDictionary.Contains (object key)
-        {
-            return EnsureDictionary ().Contains (key);
-        }
-
-        IDictionaryEnumerator IDictionary.GetEnumerator ()
-        {
-            return ((IOrderedDictionary) this).GetEnumerator ();
-        }
-
-        void IDictionary.Remove (object key)
-        {
-            EnsureDictionary ().Remove (key);
-
-            for (int i = 0; i < object_list.Count; i++) {
-                if (object_list[i].Key == (string) key) {
-                    object_list.RemoveAt (i);
-                    break;
-                }
-            }
-
-            json = null;
-        }
-        #endregion
-
-
-        #region IEnumerable Methods
-        IEnumerator IEnumerable.GetEnumerator ()
-        {
-            return EnsureCollection ().GetEnumerator ();
-        }
-        #endregion
-
-
-        #region IJsonWrapper Methods
-        bool IJsonWrapper.GetBoolean ()
-        {
-            if (type != JsonType.Boolean)
-                throw new InvalidOperationException (
-                    "JsonData instance doesn't hold a boolean");
-
-            return inst_boolean;
-        }
-
-        double IJsonWrapper.GetDouble ()
-        {
-            if (type != JsonType.Double)
-                throw new InvalidOperationException (
-                    "JsonData instance doesn't hold a double");
-
-            return inst_double;
-        }
-
-        int IJsonWrapper.GetInt ()
-        {
-            if (type != JsonType.Int)
-                throw new InvalidOperationException (
-                    "JsonData instance doesn't hold an int");
-
-            return inst_int;
-        }
-
-        long IJsonWrapper.GetLong ()
-        {
-            if (type != JsonType.Long)
-                throw new InvalidOperationException (
-                    "JsonData instance doesn't hold a long");
-
-            return inst_long;
-        }
-
-        string IJsonWrapper.GetString ()
-        {
-            if (type != JsonType.String)
-                throw new InvalidOperationException (
-                    "JsonData instance doesn't hold a string");
-
-            return inst_string;
-        }
-
-        void IJsonWrapper.SetBoolean (bool val)
-        {
-            type = JsonType.Boolean;
-            inst_boolean = val;
-            json = null;
-        }
-
-        void IJsonWrapper.SetDouble (double val)
-        {
-            type = JsonType.Double;
-            inst_double = val;
-            json = null;
-        }
-
-        void IJsonWrapper.SetInt (int val)
-        {
-            type = JsonType.Int;
-            inst_int = val;
-            json = null;
-        }
-
-        void IJsonWrapper.SetLong (long val)
-        {
-            type = JsonType.Long;
-            inst_long = val;
-            json = null;
-        }
-
-        void IJsonWrapper.SetString (string val)
-        {
-            type = JsonType.String;
-            inst_string = val;
-            json = null;
-        }
-
-        string IJsonWrapper.ToJson ()
-        {
-            return ToJson ();
-        }
-
-        void IJsonWrapper.ToJson (JsonWriter writer)
-        {
-            ToJson (writer);
-        }
-        #endregion
-
-
-        #region IList Methods
-        int IList.Add (object value)
-        {
-            return Add (value);
-        }
-
-        void IList.Clear ()
-        {
-            EnsureList ().Clear ();
-            json = null;
-        }
-
-        bool IList.Contains (object value)
-        {
-            return EnsureList ().Contains (value);
-        }
-
-        int IList.IndexOf (object value)
-        {
-            return EnsureList ().IndexOf (value);
-        }
-
-        void IList.Insert (int index, object value)
-        {
-            EnsureList ().Insert (index, value);
-            json = null;
-        }
-
-        void IList.Remove (object value)
-        {
-            EnsureList ().Remove (value);
-            json = null;
-        }
-
-        void IList.RemoveAt (int index)
-        {
-            EnsureList ().RemoveAt (index);
-            json = null;
-        }
-        #endregion
-
-
-        #region IOrderedDictionary Methods
-        IDictionaryEnumerator IOrderedDictionary.GetEnumerator ()
-        {
-            EnsureDictionary ();
-
-            return new OrderedDictionaryEnumerator (
-                object_list.GetEnumerator ());
-        }
-
-        void IOrderedDictionary.Insert (int idx, object key, object value)
-        {
-            string property = (string) key;
-            JsonData data  = ToJsonData (value);
-
-            this[property] = data;
-
-            KeyValuePair<string, JsonData> entry =
-                new KeyValuePair<string, JsonData> (property, data);
-
-            object_list.Insert (idx, entry);
-        }
-
-        void IOrderedDictionary.RemoveAt (int idx)
-        {
-            EnsureDictionary ();
-
-            inst_object.Remove (object_list[idx].Key);
-            object_list.RemoveAt (idx);
-        }
-        #endregion
-
-
-        #region Private Methods
-        private ICollection EnsureCollection ()
-        {
-            if (type == JsonType.Array)
-                return (ICollection) inst_array;
-
-            if (type == JsonType.Object)
-                return (ICollection) inst_object;
-
-            throw new InvalidOperationException (
-                "The JsonData instance has to be initialized first");
-        }
-
-        private IDictionary EnsureDictionary ()
-        {
-            if (type == JsonType.Object)
-                return (IDictionary) inst_object;
-
-            if (type != JsonType.None)
-                throw new InvalidOperationException (
-                    "Instance of JsonData is not a dictionary");
-
-            type = JsonType.Object;
-            inst_object = new Dictionary<string, JsonData> ();
-            object_list = new List<KeyValuePair<string, JsonData>> ();
-
-            return (IDictionary) inst_object;
-        }
-
-        private IList EnsureList ()
-        {
-            if (type == JsonType.Array)
-                return (IList) inst_array;
-
-            if (type != JsonType.None)
-                throw new InvalidOperationException (
-                    "Instance of JsonData is not a list");
-
-            type = JsonType.Array;
-            inst_array = new List<JsonData> ();
-
-            return (IList) inst_array;
-        }
-
-        private JsonData ToJsonData (object obj)
-        {
-            if (obj == null)
-                return null;
-
-            if (obj is JsonData)
-                return (JsonData) obj;
-
-            return new JsonData (obj);
-        }
-
-        private static void WriteJson (IJsonWrapper obj, JsonWriter writer)
-        {
-            if (obj.IsString) {
-                writer.Write (obj.GetString ());
-                return;
-            }
-
-            if (obj.IsBoolean) {
-                writer.Write (obj.GetBoolean ());
-                return;
-            }
-
-            if (obj.IsDouble) {
-                writer.Write (obj.GetDouble ());
-                return;
-            }
-
-            if (obj.IsInt) {
-                writer.Write (obj.GetInt ());
-                return;
-            }
-
-            if (obj.IsLong) {
-                writer.Write (obj.GetLong ());
-                return;
-            }
-
-            if (obj.IsArray) {
-                writer.WriteArrayStart ();
-                foreach (object elem in (IList) obj)
-                    WriteJson ((JsonData) elem, writer);
-                writer.WriteArrayEnd ();
-
-                return;
-            }
-
-            if (obj.IsObject) {
-                writer.WriteObjectStart ();
-
-                foreach (DictionaryEntry entry in ((IDictionary) obj)) {
-                    writer.WritePropertyName ((string) entry.Key);
-                    WriteJson ((JsonData) entry.Value, writer);
-                }
-                writer.WriteObjectEnd ();
-
-                return;
-            }
-        }
-        #endregion
-
-
-        public int Add (object value)
-        {
-            JsonData data = ToJsonData (value);
-
-            json = null;
-
-            return EnsureList ().Add (data);
-        }
-
-        public void Clear ()
-        {
-            if (IsObject) {
-                ((IDictionary) this).Clear ();
-                return;
-            }
-
-            if (IsArray) {
-                ((IList) this).Clear ();
-                return;
-            }
-        }
-
-        public bool Equals (JsonData x)
-        {
-            if (x == null)
-                return false;
-
-            if (x.type != this.type)
-                return false;
-
-            switch (this.type) {
-            case JsonType.None:
-                return true;
-
-            case JsonType.Object:
-                return this.inst_object.Equals (x.inst_object);
-
-            case JsonType.Array:
-                return this.inst_array.Equals (x.inst_array);
-
-            case JsonType.String:
-                return this.inst_string.Equals (x.inst_string);
-
-            case JsonType.Int:
-                return this.inst_int.Equals (x.inst_int);
-
-            case JsonType.Long:
-                return this.inst_long.Equals (x.inst_long);
-
-            case JsonType.Double:
-                return this.inst_double.Equals (x.inst_double);
-
-            case JsonType.Boolean:
-                return this.inst_boolean.Equals (x.inst_boolean);
-            }
-
-            return false;
-        }
-
-        public JsonType GetJsonType ()
-        {
-            return type;
-        }
-
-        public void SetJsonType (JsonType type)
-        {
-            if (this.type == type)
-                return;
-
-            switch (type) {
-            case JsonType.None:
-                break;
-
-            case JsonType.Object:
-                inst_object = new Dictionary<string, JsonData> ();
-                object_list = new List<KeyValuePair<string, JsonData>> ();
-                break;
-
-            case JsonType.Array:
-                inst_array = new List<JsonData> ();
-                break;
-
-            case JsonType.String:
-                inst_string = default (String);
-                break;
-
-            case JsonType.Int:
-                inst_int = default (Int32);
-                break;
-
-            case JsonType.Long:
-                inst_long = default (Int64);
-                break;
-
-            case JsonType.Double:
-                inst_double = default (Double);
-                break;
-
-            case JsonType.Boolean:
-                inst_boolean = default (Boolean);
-                break;
-            }
-
-            this.type = type;
-        }
-
-        public string ToJson ()
-        {
-            if (json != null)
-                return json;
-
-            StringWriter sw = new StringWriter ();
-            JsonWriter writer = new JsonWriter (sw);
-            writer.Validate = false;
-
-            WriteJson (this, writer);
-            json = sw.ToString ();
-
-            return json;
-        }
-
-        public void ToJson (JsonWriter writer)
-        {
-            bool old_validate = writer.Validate;
-
-            writer.Validate = false;
-
-            WriteJson (this, writer);
-
-            writer.Validate = old_validate;
-        }
-
-        public override string ToString ()
-        {
-            switch (type) {
-            case JsonType.Array:
-                return "JsonData array";
-
-            case JsonType.Boolean:
-                return inst_boolean.ToString ();
-
-            case JsonType.Double:
-                return inst_double.ToString ();
-
-            case JsonType.Int:
-                return inst_int.ToString ();
-
-            case JsonType.Long:
-                return inst_long.ToString ();
-
-            case JsonType.Object:
-                return "JsonData object";
-
-            case JsonType.String:
-                return inst_string;
-            }
-
-            return "Uninitialized JsonData";
-        }
-    }
-
-
-    internal class OrderedDictionaryEnumerator : IDictionaryEnumerator
-    {
-        IEnumerator<KeyValuePair<string, JsonData>> list_enumerator;
-
-
-        public object Current {
-            get { return Entry; }
-        }
-
-        public DictionaryEntry Entry {
-            get {
-                KeyValuePair<string, JsonData> curr = list_enumerator.Current;
-                return new DictionaryEntry (curr.Key, curr.Value);
-            }
-        }
-
-        public object Key {
-            get { return list_enumerator.Current.Key; }
-        }
-
-        public object Value {
-            get { return list_enumerator.Current.Value; }
-        }
-
-
-        public OrderedDictionaryEnumerator (
-            IEnumerator<KeyValuePair<string, JsonData>> enumerator)
-        {
-            list_enumerator = enumerator;
-        }
-
-
-        public bool MoveNext ()
-        {
-            return list_enumerator.MoveNext ();
-        }
-
-        public void Reset ()
-        {
-            list_enumerator.Reset ();
-        }
-    }
-}
diff --git a/QBox/Json/JsonException.cs b/QBox/Json/JsonException.cs
deleted file mode 100644
index f7f8db09..00000000
--- a/QBox/Json/JsonException.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-#region Header
-/**
- * JsonException.cs
- *   Base class throwed by LitJSON when a parsing error occurs.
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-using System;
-
-
-namespace LitJson
-{
-    public class JsonException : ApplicationException
-    {
-        public JsonException () : base ()
-        {
-        }
-
-        internal JsonException (ParserToken token) :
-            base (String.Format (
-                    "Invalid token '{0}' in input string", token))
-        {
-        }
-
-        internal JsonException (ParserToken token,
-                                Exception inner_exception) :
-            base (String.Format (
-                    "Invalid token '{0}' in input string", token),
-                inner_exception)
-        {
-        }
-
-        internal JsonException (int c) :
-            base (String.Format (
-                    "Invalid character '{0}' in input string", (char) c))
-        {
-        }
-
-        internal JsonException (int c, Exception inner_exception) :
-            base (String.Format (
-                    "Invalid character '{0}' in input string", (char) c),
-                inner_exception)
-        {
-        }
-
-
-        public JsonException (string message) : base (message)
-        {
-        }
-
-        public JsonException (string message, Exception inner_exception) :
-            base (message, inner_exception)
-        {
-        }
-    }
-}
diff --git a/QBox/Json/JsonMapper.cs b/QBox/Json/JsonMapper.cs
deleted file mode 100644
index f82646ca..00000000
--- a/QBox/Json/JsonMapper.cs
+++ /dev/null
@@ -1,911 +0,0 @@
-#region Header
-/**
- * JsonMapper.cs
- *   JSON to .Net object and object to JSON conversions.
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Reflection;
-
-
-namespace LitJson
-{
-    internal struct PropertyMetadata
-    {
-        public MemberInfo Info;
-        public bool       IsField;
-        public Type       Type;
-    }
-
-
-    internal struct ArrayMetadata
-    {
-        private Type element_type;
-        private bool is_array;
-        private bool is_list;
-
-
-        public Type ElementType {
-            get {
-                if (element_type == null)
-                    return typeof (JsonData);
-
-                return element_type;
-            }
-
-            set { element_type = value; }
-        }
-
-        public bool IsArray {
-            get { return is_array; }
-            set { is_array = value; }
-        }
-
-        public bool IsList {
-            get { return is_list; }
-            set { is_list = value; }
-        }
-    }
-
-
-    internal struct ObjectMetadata
-    {
-        private Type element_type;
-        private bool is_dictionary;
-
-        private IDictionary<string, PropertyMetadata> properties;
-
-
-        public Type ElementType {
-            get {
-                if (element_type == null)
-                    return typeof (JsonData);
-
-                return element_type;
-            }
-
-            set { element_type = value; }
-        }
-
-        public bool IsDictionary {
-            get { return is_dictionary; }
-            set { is_dictionary = value; }
-        }
-
-        public IDictionary<string, PropertyMetadata> Properties {
-            get { return properties; }
-            set { properties = value; }
-        }
-    }
-
-
-    internal delegate void ExporterFunc    (object obj, JsonWriter writer);
-    public   delegate void ExporterFunc<T> (T obj, JsonWriter writer);
-
-    internal delegate object ImporterFunc                (object input);
-    public   delegate TValue ImporterFunc<TJson, TValue> (TJson input);
-
-    public delegate IJsonWrapper WrapperFactory ();
-
-
-    public class JsonMapper
-    {
-        #region Fields
-        private static int max_nesting_depth;
-
-        private static IFormatProvider datetime_format;
-
-        private static IDictionary<Type, ExporterFunc> base_exporters_table;
-        private static IDictionary<Type, ExporterFunc> custom_exporters_table;
-
-        private static IDictionary<Type,
-                IDictionary<Type, ImporterFunc>> base_importers_table;
-        private static IDictionary<Type,
-                IDictionary<Type, ImporterFunc>> custom_importers_table;
-
-        private static IDictionary<Type, ArrayMetadata> array_metadata;
-        private static readonly object array_metadata_lock = new Object ();
-
-        private static IDictionary<Type,
-                IDictionary<Type, MethodInfo>> conv_ops;
-        private static readonly object conv_ops_lock = new Object ();
-
-        private static IDictionary<Type, ObjectMetadata> object_metadata;
-        private static readonly object object_metadata_lock = new Object ();
-
-        private static IDictionary<Type,
-                IList<PropertyMetadata>> type_properties;
-        private static readonly object type_properties_lock = new Object ();
-
-        private static JsonWriter      static_writer;
-        private static readonly object static_writer_lock = new Object ();
-        #endregion
-
-
-        #region Constructors
-        static JsonMapper ()
-        {
-            max_nesting_depth = 100;
-
-            array_metadata = new Dictionary<Type, ArrayMetadata> ();
-            conv_ops = new Dictionary<Type, IDictionary<Type, MethodInfo>> ();
-            object_metadata = new Dictionary<Type, ObjectMetadata> ();
-            type_properties = new Dictionary<Type,
-                            IList<PropertyMetadata>> ();
-
-            static_writer = new JsonWriter ();
-
-            datetime_format = DateTimeFormatInfo.InvariantInfo;
-
-            base_exporters_table   = new Dictionary<Type, ExporterFunc> ();
-            custom_exporters_table = new Dictionary<Type, ExporterFunc> ();
-
-            base_importers_table = new Dictionary<Type,
-                                 IDictionary<Type, ImporterFunc>> ();
-            custom_importers_table = new Dictionary<Type,
-                                   IDictionary<Type, ImporterFunc>> ();
-
-            RegisterBaseExporters ();
-            RegisterBaseImporters ();
-        }
-        #endregion
-
-
-        #region Private Methods
-        private static void AddArrayMetadata (Type type)
-        {
-            if (array_metadata.ContainsKey (type))
-                return;
-
-            ArrayMetadata data = new ArrayMetadata ();
-
-            data.IsArray = type.IsArray;
-
-            if (type.GetInterface ("System.Collections.IList") != null)
-                data.IsList = true;
-
-            foreach (PropertyInfo p_info in type.GetProperties ()) {
-                if (p_info.Name != "Item")
-                    continue;
-
-                ParameterInfo[] parameters = p_info.GetIndexParameters ();
-
-                if (parameters.Length != 1)
-                    continue;
-
-                if (parameters[0].ParameterType == typeof (int))
-                    data.ElementType = p_info.PropertyType;
-            }
-
-            lock (array_metadata_lock) {
-                try {
-                    array_metadata.Add (type, data);
-                } catch (ArgumentException) {
-                    return;
-                }
-            }
-        }
-
-        private static void AddObjectMetadata (Type type)
-        {
-            if (object_metadata.ContainsKey (type))
-                return;
-
-            ObjectMetadata data = new ObjectMetadata ();
-
-            if (type.GetInterface ("System.Collections.IDictionary") != null)
-                data.IsDictionary = true;
-
-            data.Properties = new Dictionary<string, PropertyMetadata> ();
-
-            foreach (PropertyInfo p_info in type.GetProperties ()) {
-                if (p_info.Name == "Item") {
-                    ParameterInfo[] parameters = p_info.GetIndexParameters ();
-
-                    if (parameters.Length != 1)
-                        continue;
-
-                    if (parameters[0].ParameterType == typeof (string))
-                        data.ElementType = p_info.PropertyType;
-
-                    continue;
-                }
-
-                PropertyMetadata p_data = new PropertyMetadata ();
-                p_data.Info = p_info;
-                p_data.Type = p_info.PropertyType;
-
-                data.Properties.Add (p_info.Name, p_data);
-            }
-
-            foreach (FieldInfo f_info in type.GetFields ()) {
-                PropertyMetadata p_data = new PropertyMetadata ();
-                p_data.Info = f_info;
-                p_data.IsField = true;
-                p_data.Type = f_info.FieldType;
-
-                data.Properties.Add (f_info.Name, p_data);
-            }
-
-            lock (object_metadata_lock) {
-                try {
-                    object_metadata.Add (type, data);
-                } catch (ArgumentException) {
-                    return;
-                }
-            }
-        }
-
-        private static void AddTypeProperties (Type type)
-        {
-            if (type_properties.ContainsKey (type))
-                return;
-
-            IList<PropertyMetadata> props = new List<PropertyMetadata> ();
-
-            foreach (PropertyInfo p_info in type.GetProperties ()) {
-                if (p_info.Name == "Item")
-                    continue;
-
-                PropertyMetadata p_data = new PropertyMetadata ();
-                p_data.Info = p_info;
-                p_data.IsField = false;
-                props.Add (p_data);
-            }
-
-            foreach (FieldInfo f_info in type.GetFields ()) {
-                PropertyMetadata p_data = new PropertyMetadata ();
-                p_data.Info = f_info;
-                p_data.IsField = true;
-
-                props.Add (p_data);
-            }
-
-            lock (type_properties_lock) {
-                try {
-                    type_properties.Add (type, props);
-                } catch (ArgumentException) {
-                    return;
-                }
-            }
-        }
-
-        private static MethodInfo GetConvOp (Type t1, Type t2)
-        {
-            lock (conv_ops_lock) {
-                if (! conv_ops.ContainsKey (t1))
-                    conv_ops.Add (t1, new Dictionary<Type, MethodInfo> ());
-            }
-
-            if (conv_ops[t1].ContainsKey (t2))
-                return conv_ops[t1][t2];
-
-            MethodInfo op = t1.GetMethod (
-                "op_Implicit", new Type[] { t2 });
-
-            lock (conv_ops_lock) {
-                try {
-                    conv_ops[t1].Add (t2, op);
-                } catch (ArgumentException) {
-                    return conv_ops[t1][t2];
-                }
-            }
-
-            return op;
-        }
-
-        private static object ReadValue (Type inst_type, JsonReader reader)
-        {
-            reader.Read ();
-
-            if (reader.Token == JsonToken.ArrayEnd)
-                return null;
-
-            if (reader.Token == JsonToken.Null) {
-
-                if (! inst_type.IsClass)
-                    throw new JsonException (String.Format (
-                            "Can't assign null to an instance of type {0}",
-                            inst_type));
-
-                return null;
-            }
-
-            if (reader.Token == JsonToken.Double ||
-                reader.Token == JsonToken.Int ||
-                reader.Token == JsonToken.Long ||
-                reader.Token == JsonToken.String ||
-                reader.Token == JsonToken.Boolean) {
-
-                Type json_type = reader.Value.GetType ();
-
-                if (inst_type.IsAssignableFrom (json_type))
-                    return reader.Value;
-
-                // If there's a custom importer that fits, use it
-                if (custom_importers_table.ContainsKey (json_type) &&
-                    custom_importers_table[json_type].ContainsKey (
-                        inst_type)) {
-
-                    ImporterFunc importer =
-                        custom_importers_table[json_type][inst_type];
-
-                    return importer (reader.Value);
-                }
-
-                // Maybe there's a base importer that works
-                if (base_importers_table.ContainsKey (json_type) &&
-                    base_importers_table[json_type].ContainsKey (
-                        inst_type)) {
-
-                    ImporterFunc importer =
-                        base_importers_table[json_type][inst_type];
-
-                    return importer (reader.Value);
-                }
-
-                // Maybe it's an enum
-                if (inst_type.IsEnum)
-                    return Enum.ToObject (inst_type, reader.Value);
-
-                // Try using an implicit conversion operator
-                MethodInfo conv_op = GetConvOp (inst_type, json_type);
-
-                if (conv_op != null)
-                    return conv_op.Invoke (null,
-                                           new object[] { reader.Value });
-
-                // No luck
-                throw new JsonException (String.Format (
-                        "Can't assign value '{0}' (type {1}) to type {2}",
-                        reader.Value, json_type, inst_type));
-            }
-
-            object instance = null;
-
-            if (reader.Token == JsonToken.ArrayStart) {
-
-                AddArrayMetadata (inst_type);
-                ArrayMetadata t_data = array_metadata[inst_type];
-
-                if (! t_data.IsArray && ! t_data.IsList)
-                    throw new JsonException (String.Format (
-                            "Type {0} can't act as an array",
-                            inst_type));
-
-                IList list;
-                Type elem_type;
-
-                if (! t_data.IsArray) {
-                    list = (IList) Activator.CreateInstance (inst_type);
-                    elem_type = t_data.ElementType;
-                } else {
-                    list = new ArrayList ();
-                    elem_type = inst_type.GetElementType ();
-                }
-
-                while (true) {
-                    object item = ReadValue (elem_type, reader);
-                    if (reader.Token == JsonToken.ArrayEnd)
-                        break;
-
-                    list.Add (item);
-                }
-
-                if (t_data.IsArray) {
-                    int n = list.Count;
-                    instance = Array.CreateInstance (elem_type, n);
-
-                    for (int i = 0; i < n; i++)
-                        ((Array) instance).SetValue (list[i], i);
-                } else
-                    instance = list;
-
-            } else if (reader.Token == JsonToken.ObjectStart) {
-
-                AddObjectMetadata (inst_type);
-                ObjectMetadata t_data = object_metadata[inst_type];
-
-                instance = Activator.CreateInstance (inst_type);
-
-                while (true) {
-                    reader.Read ();
-
-                    if (reader.Token == JsonToken.ObjectEnd)
-                        break;
-
-                    string property = (string) reader.Value;
-
-                    if (t_data.Properties.ContainsKey (property)) {
-                        PropertyMetadata prop_data =
-                            t_data.Properties[property];
-
-                        if (prop_data.IsField) {
-                            ((FieldInfo) prop_data.Info).SetValue (
-                                instance, ReadValue (prop_data.Type, reader));
-                        } else {
-                            PropertyInfo p_info =
-                                (PropertyInfo) prop_data.Info;
-
-                            if (p_info.CanWrite)
-                                p_info.SetValue (
-                                    instance,
-                                    ReadValue (prop_data.Type, reader),
-                                    null);
-                            else
-                                ReadValue (prop_data.Type, reader);
-                        }
-
-                    } else {
-                        if (! t_data.IsDictionary)
-                            throw new JsonException (String.Format (
-                                    "The type {0} doesn't have the " +
-                                    "property '{1}'", inst_type, property));
-
-                        ((IDictionary) instance).Add (
-                            property, ReadValue (
-                                t_data.ElementType, reader));
-                    }
-
-                }
-
-            }
-
-            return instance;
-        }
-
-        private static IJsonWrapper ReadValue (WrapperFactory factory,
-                                               JsonReader reader)
-        {
-            reader.Read ();
-
-            if (reader.Token == JsonToken.ArrayEnd ||
-                reader.Token == JsonToken.Null)
-                return null;
-
-            IJsonWrapper instance = factory ();
-
-            if (reader.Token == JsonToken.String) {
-                instance.SetString ((string) reader.Value);
-                return instance;
-            }
-
-            if (reader.Token == JsonToken.Double) {
-                instance.SetDouble ((double) reader.Value);
-                return instance;
-            }
-
-            if (reader.Token == JsonToken.Int) {
-                instance.SetInt ((int) reader.Value);
-                return instance;
-            }
-
-            if (reader.Token == JsonToken.Long) {
-                instance.SetLong ((long) reader.Value);
-                return instance;
-            }
-
-            if (reader.Token == JsonToken.Boolean) {
-                instance.SetBoolean ((bool) reader.Value);
-                return instance;
-            }
-
-            if (reader.Token == JsonToken.ArrayStart) {
-                instance.SetJsonType (JsonType.Array);
-
-                while (true) {
-                    IJsonWrapper item = ReadValue (factory, reader);
-                    if (reader.Token == JsonToken.ArrayEnd)
-                        break;
-
-                    ((IList) instance).Add (item);
-                }
-            }
-            else if (reader.Token == JsonToken.ObjectStart) {
-                instance.SetJsonType (JsonType.Object);
-
-                while (true) {
-                    reader.Read ();
-
-                    if (reader.Token == JsonToken.ObjectEnd)
-                        break;
-
-                    string property = (string) reader.Value;
-
-                    ((IDictionary) instance)[property] = ReadValue (
-                        factory, reader);
-                }
-
-            }
-
-            return instance;
-        }
-
-        private static void RegisterBaseExporters ()
-        {
-            base_exporters_table[typeof (byte)] =
-                delegate (object obj, JsonWriter writer) {
-                    writer.Write (Convert.ToInt32 ((byte) obj));
-                };
-
-            base_exporters_table[typeof (char)] =
-                delegate (object obj, JsonWriter writer) {
-                    writer.Write (Convert.ToString ((char) obj));
-                };
-
-            base_exporters_table[typeof (DateTime)] =
-                delegate (object obj, JsonWriter writer) {
-                    writer.Write (Convert.ToString ((DateTime) obj,
-                                                    datetime_format));
-                };
-
-            base_exporters_table[typeof (decimal)] =
-                delegate (object obj, JsonWriter writer) {
-                    writer.Write ((decimal) obj);
-                };
-
-            base_exporters_table[typeof (sbyte)] =
-                delegate (object obj, JsonWriter writer) {
-                    writer.Write (Convert.ToInt32 ((sbyte) obj));
-                };
-
-            base_exporters_table[typeof (short)] =
-                delegate (object obj, JsonWriter writer) {
-                    writer.Write (Convert.ToInt32 ((short) obj));
-                };
-
-            base_exporters_table[typeof (ushort)] =
-                delegate (object obj, JsonWriter writer) {
-                    writer.Write (Convert.ToInt32 ((ushort) obj));
-                };
-
-            base_exporters_table[typeof (uint)] =
-                delegate (object obj, JsonWriter writer) {
-                    writer.Write (Convert.ToUInt64 ((uint) obj));
-                };
-
-            base_exporters_table[typeof (ulong)] =
-                delegate (object obj, JsonWriter writer) {
-                    writer.Write ((ulong) obj);
-                };
-        }
-
-        private static void RegisterBaseImporters ()
-        {
-            ImporterFunc importer;
-
-            importer = delegate (object input) {
-                return Convert.ToByte ((int) input);
-            };
-            RegisterImporter (base_importers_table, typeof (int),
-                              typeof (byte), importer);
-
-            importer = delegate (object input) {
-                return Convert.ToUInt64 ((int) input);
-            };
-            RegisterImporter (base_importers_table, typeof (int),
-                              typeof (ulong), importer);
-
-            importer = delegate (object input) {
-                return Convert.ToSByte ((int) input);
-            };
-            RegisterImporter (base_importers_table, typeof (int),
-                              typeof (sbyte), importer);
-
-            importer = delegate (object input) {
-                return Convert.ToInt16 ((int) input);
-            };
-            RegisterImporter (base_importers_table, typeof (int),
-                              typeof (short), importer);
-
-            importer = delegate (object input) {
-                return Convert.ToUInt16 ((int) input);
-            };
-            RegisterImporter (base_importers_table, typeof (int),
-                              typeof (ushort), importer);
-
-            importer = delegate (object input) {
-                return Convert.ToUInt32 ((int) input);
-            };
-            RegisterImporter (base_importers_table, typeof (int),
-                              typeof (uint), importer);
-
-            importer = delegate (object input) {
-                return Convert.ToSingle ((int) input);
-            };
-            RegisterImporter (base_importers_table, typeof (int),
-                              typeof (float), importer);
-
-            importer = delegate (object input) {
-                return Convert.ToDouble ((int) input);
-            };
-            RegisterImporter (base_importers_table, typeof (int),
-                              typeof (double), importer);
-
-            importer = delegate (object input) {
-                return Convert.ToDecimal ((double) input);
-            };
-            RegisterImporter (base_importers_table, typeof (double),
-                              typeof (decimal), importer);
-
-
-            importer = delegate (object input) {
-                return Convert.ToUInt32 ((long) input);
-            };
-            RegisterImporter (base_importers_table, typeof (long),
-                              typeof (uint), importer);
-
-            importer = delegate (object input) {
-                return Convert.ToChar ((string) input);
-            };
-            RegisterImporter (base_importers_table, typeof (string),
-                              typeof (char), importer);
-
-            importer = delegate (object input) {
-                return Convert.ToDateTime ((string) input, datetime_format);
-            };
-            RegisterImporter (base_importers_table, typeof (string),
-                              typeof (DateTime), importer);
-        }
-
-        private static void RegisterImporter (
-            IDictionary<Type, IDictionary<Type, ImporterFunc>> table,
-            Type json_type, Type value_type, ImporterFunc importer)
-        {
-            if (! table.ContainsKey (json_type))
-                table.Add (json_type, new Dictionary<Type, ImporterFunc> ());
-
-            table[json_type][value_type] = importer;
-        }
-
-        private static void WriteValue (object obj, JsonWriter writer,
-                                        bool writer_is_private,
-                                        int depth)
-        {
-            if (depth > max_nesting_depth)
-                throw new JsonException (
-                    String.Format ("Max allowed object depth reached while " +
-                                   "trying to export from type {0}",
-                                   obj.GetType ()));
-
-            if (obj == null) {
-                writer.Write (null);
-                return;
-            }
-
-            if (obj is IJsonWrapper) {
-                if (writer_is_private)
-                    writer.TextWriter.Write (((IJsonWrapper) obj).ToJson ());
-                else
-                    ((IJsonWrapper) obj).ToJson (writer);
-
-                return;
-            }
-
-            if (obj is String) {
-                writer.Write ((string) obj);
-                return;
-            }
-
-            if (obj is Double) {
-                writer.Write ((double) obj);
-                return;
-            }
-
-            if (obj is Int32) {
-                writer.Write ((int) obj);
-                return;
-            }
-
-            if (obj is Boolean) {
-                writer.Write ((bool) obj);
-                return;
-            }
-
-            if (obj is Int64) {
-                writer.Write ((long) obj);
-                return;
-            }
-
-            if (obj is Array) {
-                writer.WriteArrayStart ();
-
-                foreach (object elem in (Array) obj)
-                    WriteValue (elem, writer, writer_is_private, depth + 1);
-
-                writer.WriteArrayEnd ();
-
-                return;
-            }
-
-            if (obj is IList) {
-                writer.WriteArrayStart ();
-                foreach (object elem in (IList) obj)
-                    WriteValue (elem, writer, writer_is_private, depth + 1);
-                writer.WriteArrayEnd ();
-
-                return;
-            }
-
-            if (obj is IDictionary) {
-                writer.WriteObjectStart ();
-                foreach (DictionaryEntry entry in (IDictionary) obj) {
-                    writer.WritePropertyName ((string) entry.Key);
-                    WriteValue (entry.Value, writer, writer_is_private,
-                                depth + 1);
-                }
-                writer.WriteObjectEnd ();
-
-                return;
-            }
-
-            Type obj_type = obj.GetType ();
-
-            // See if there's a custom exporter for the object
-            if (custom_exporters_table.ContainsKey (obj_type)) {
-                ExporterFunc exporter = custom_exporters_table[obj_type];
-                exporter (obj, writer);
-
-                return;
-            }
-
-            // If not, maybe there's a base exporter
-            if (base_exporters_table.ContainsKey (obj_type)) {
-                ExporterFunc exporter = base_exporters_table[obj_type];
-                exporter (obj, writer);
-
-                return;
-            }
-
-            // Last option, let's see if it's an enum
-            if (obj is Enum) {
-                Type e_type = Enum.GetUnderlyingType (obj_type);
-
-                if (e_type == typeof (long)
-                    || e_type == typeof (uint)
-                    || e_type == typeof (ulong))
-                    writer.Write ((ulong) obj);
-                else
-                    writer.Write ((int) obj);
-
-                return;
-            }
-
-            // Okay, so it looks like the input should be exported as an
-            // object
-            AddTypeProperties (obj_type);
-            IList<PropertyMetadata> props = type_properties[obj_type];
-
-            writer.WriteObjectStart ();
-            foreach (PropertyMetadata p_data in props) {
-                if (p_data.IsField) {
-                    writer.WritePropertyName (p_data.Info.Name);
-                    WriteValue (((FieldInfo) p_data.Info).GetValue (obj),
-                                writer, writer_is_private, depth + 1);
-                }
-                else {
-                    PropertyInfo p_info = (PropertyInfo) p_data.Info;
-
-                    if (p_info.CanRead) {
-                        writer.WritePropertyName (p_data.Info.Name);
-                        WriteValue (p_info.GetValue (obj, null),
-                                    writer, writer_is_private, depth + 1);
-                    }
-                }
-            }
-            writer.WriteObjectEnd ();
-        }
-        #endregion
-
-
-        public static string ToJson (object obj)
-        {
-            lock (static_writer_lock) {
-                static_writer.Reset ();
-
-                WriteValue (obj, static_writer, true, 0);
-
-                return static_writer.ToString ();
-            }
-        }
-
-        public static void ToJson (object obj, JsonWriter writer)
-        {
-            WriteValue (obj, writer, false, 0);
-        }
-
-        public static JsonData ToObject (JsonReader reader)
-        {
-            return (JsonData) ToWrapper (
-                delegate { return new JsonData (); }, reader);
-        }
-
-        public static JsonData ToObject (TextReader reader)
-        {
-            JsonReader json_reader = new JsonReader (reader);
-
-            return (JsonData) ToWrapper (
-                delegate { return new JsonData (); }, json_reader);
-        }
-
-        public static JsonData ToObject (string json)
-        {
-            return (JsonData) ToWrapper (
-                delegate { return new JsonData (); }, json);
-        }
-
-        public static T ToObject<T> (JsonReader reader)
-        {
-            return (T) ReadValue (typeof (T), reader);
-        }
-
-        public static T ToObject<T> (TextReader reader)
-        {
-            JsonReader json_reader = new JsonReader (reader);
-
-            return (T) ReadValue (typeof (T), json_reader);
-        }
-
-        public static T ToObject<T> (string json)
-        {
-            JsonReader reader = new JsonReader (json);
-
-            return (T) ReadValue (typeof (T), reader);
-        }
-
-        public static IJsonWrapper ToWrapper (WrapperFactory factory,
-                                              JsonReader reader)
-        {
-            return ReadValue (factory, reader);
-        }
-
-        public static IJsonWrapper ToWrapper (WrapperFactory factory,
-                                              string json)
-        {
-            JsonReader reader = new JsonReader (json);
-
-            return ReadValue (factory, reader);
-        }
-
-        public static void RegisterExporter<T> (ExporterFunc<T> exporter)
-        {
-            ExporterFunc exporter_wrapper =
-                delegate (object obj, JsonWriter writer) {
-                    exporter ((T) obj, writer);
-                };
-
-            custom_exporters_table[typeof (T)] = exporter_wrapper;
-        }
-
-        public static void RegisterImporter<TJson, TValue> (
-            ImporterFunc<TJson, TValue> importer)
-        {
-            ImporterFunc importer_wrapper =
-                delegate (object input) {
-                    return importer ((TJson) input);
-                };
-
-            RegisterImporter (custom_importers_table, typeof (TJson),
-                              typeof (TValue), importer_wrapper);
-        }
-
-        public static void UnregisterExporters ()
-        {
-            custom_exporters_table.Clear ();
-        }
-
-        public static void UnregisterImporters ()
-        {
-            custom_importers_table.Clear ();
-        }
-    }
-}
diff --git a/QBox/Json/JsonReader.cs b/QBox/Json/JsonReader.cs
deleted file mode 100644
index 4d12475c..00000000
--- a/QBox/Json/JsonReader.cs
+++ /dev/null
@@ -1,455 +0,0 @@
-#region Header
-/**
- * JsonReader.cs
- *   Stream-like access to JSON text.
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
-
-namespace LitJson
-{
-    public enum JsonToken
-    {
-        None,
-
-        ObjectStart,
-        PropertyName,
-        ObjectEnd,
-
-        ArrayStart,
-        ArrayEnd,
-
-        Int,
-        Long,
-        Double,
-
-        String,
-
-        Boolean,
-        Null
-    }
-
-
-    public class JsonReader
-    {
-        #region Fields
-        private static IDictionary<int, IDictionary<int, int[]>> parse_table;
-
-        private Stack<int>    automaton_stack;
-        private int           current_input;
-        private int           current_symbol;
-        private bool          end_of_json;
-        private bool          end_of_input;
-        private Lexer         lexer;
-        private bool          parser_in_string;
-        private bool          parser_return;
-        private bool          read_started;
-        private TextReader    reader;
-        private bool          reader_is_owned;
-        private object        token_value;
-        private JsonToken     token;
-        #endregion
-
-
-        #region Public Properties
-        public bool AllowComments {
-            get { return lexer.AllowComments; }
-            set { lexer.AllowComments = value; }
-        }
-
-        public bool AllowSingleQuotedStrings {
-            get { return lexer.AllowSingleQuotedStrings; }
-            set { lexer.AllowSingleQuotedStrings = value; }
-        }
-
-        public bool EndOfInput {
-            get { return end_of_input; }
-        }
-
-        public bool EndOfJson {
-            get { return end_of_json; }
-        }
-
-        public JsonToken Token {
-            get { return token; }
-        }
-
-        public object Value {
-            get { return token_value; }
-        }
-        #endregion
-
-
-        #region Constructors
-        static JsonReader ()
-        {
-            PopulateParseTable ();
-        }
-
-        public JsonReader (string json_text) :
-            this (new StringReader (json_text), true)
-        {
-        }
-
-        public JsonReader (TextReader reader) :
-            this (reader, false)
-        {
-        }
-
-        private JsonReader (TextReader reader, bool owned)
-        {
-            if (reader == null)
-                throw new ArgumentNullException ("reader");
-
-            parser_in_string = false;
-            parser_return = false;
-
-            read_started = false;
-            automaton_stack = new Stack<int> ();
-            automaton_stack.Push ((int) ParserToken.End);
-            automaton_stack.Push ((int) ParserToken.Text);
-
-            lexer = new Lexer (reader);
-
-            end_of_input = false;
-            end_of_json  = false;
-
-            this.reader = reader;
-            reader_is_owned = owned;
-        }
-        #endregion
-
-
-        #region Static Methods
-        private static void PopulateParseTable ()
-        {
-            parse_table = new Dictionary<int, IDictionary<int, int[]>> ();
-
-            TableAddRow (ParserToken.Array);
-            TableAddCol (ParserToken.Array, '[',
-                         '[',
-                         (int) ParserToken.ArrayPrime);
-
-            TableAddRow (ParserToken.ArrayPrime);
-            TableAddCol (ParserToken.ArrayPrime, '"',
-                         (int) ParserToken.Value,
-
-                         (int) ParserToken.ValueRest,
-                         ']');
-            TableAddCol (ParserToken.ArrayPrime, '[',
-                         (int) ParserToken.Value,
-                         (int) ParserToken.ValueRest,
-                         ']');
-            TableAddCol (ParserToken.ArrayPrime, ']',
-                         ']');
-            TableAddCol (ParserToken.ArrayPrime, '{',
-                         (int) ParserToken.Value,
-                         (int) ParserToken.ValueRest,
-                         ']');
-            TableAddCol (ParserToken.ArrayPrime, (int) ParserToken.Number,
-                         (int) ParserToken.Value,
-                         (int) ParserToken.ValueRest,
-                         ']');
-            TableAddCol (ParserToken.ArrayPrime, (int) ParserToken.True,
-                         (int) ParserToken.Value,
-                         (int) ParserToken.ValueRest,
-                         ']');
-            TableAddCol (ParserToken.ArrayPrime, (int) ParserToken.False,
-                         (int) ParserToken.Value,
-                         (int) ParserToken.ValueRest,
-                         ']');
-            TableAddCol (ParserToken.ArrayPrime, (int) ParserToken.Null,
-                         (int) ParserToken.Value,
-                         (int) ParserToken.ValueRest,
-                         ']');
-
-            TableAddRow (ParserToken.Object);
-            TableAddCol (ParserToken.Object, '{',
-                         '{',
-                         (int) ParserToken.ObjectPrime);
-
-            TableAddRow (ParserToken.ObjectPrime);
-            TableAddCol (ParserToken.ObjectPrime, '"',
-                         (int) ParserToken.Pair,
-                         (int) ParserToken.PairRest,
-                         '}');
-            TableAddCol (ParserToken.ObjectPrime, '}',
-                         '}');
-
-            TableAddRow (ParserToken.Pair);
-            TableAddCol (ParserToken.Pair, '"',
-                         (int) ParserToken.String,
-                         ':',
-                         (int) ParserToken.Value);
-
-            TableAddRow (ParserToken.PairRest);
-            TableAddCol (ParserToken.PairRest, ',',
-                         ',',
-                         (int) ParserToken.Pair,
-                         (int) ParserToken.PairRest);
-            TableAddCol (ParserToken.PairRest, '}',
-                         (int) ParserToken.Epsilon);
-
-            TableAddRow (ParserToken.String);
-            TableAddCol (ParserToken.String, '"',
-                         '"',
-                         (int) ParserToken.CharSeq,
-                         '"');
-
-            TableAddRow (ParserToken.Text);
-            TableAddCol (ParserToken.Text, '[',
-                         (int) ParserToken.Array);
-            TableAddCol (ParserToken.Text, '{',
-                         (int) ParserToken.Object);
-
-            TableAddRow (ParserToken.Value);
-            TableAddCol (ParserToken.Value, '"',
-                         (int) ParserToken.String);
-            TableAddCol (ParserToken.Value, '[',
-                         (int) ParserToken.Array);
-            TableAddCol (ParserToken.Value, '{',
-                         (int) ParserToken.Object);
-            TableAddCol (ParserToken.Value, (int) ParserToken.Number,
-                         (int) ParserToken.Number);
-            TableAddCol (ParserToken.Value, (int) ParserToken.True,
-                         (int) ParserToken.True);
-            TableAddCol (ParserToken.Value, (int) ParserToken.False,
-                         (int) ParserToken.False);
-            TableAddCol (ParserToken.Value, (int) ParserToken.Null,
-                         (int) ParserToken.Null);
-
-            TableAddRow (ParserToken.ValueRest);
-            TableAddCol (ParserToken.ValueRest, ',',
-                         ',',
-                         (int) ParserToken.Value,
-                         (int) ParserToken.ValueRest);
-            TableAddCol (ParserToken.ValueRest, ']',
-                         (int) ParserToken.Epsilon);
-        }
-
-        private static void TableAddCol (ParserToken row, int col,
-                                         params int[] symbols)
-        {
-            parse_table[(int) row].Add (col, symbols);
-        }
-
-        private static void TableAddRow (ParserToken rule)
-        {
-            parse_table.Add ((int) rule, new Dictionary<int, int[]> ());
-        }
-        #endregion
-
-
-        #region Private Methods
-        private void ProcessNumber (string number)
-        {
-            if (number.IndexOf ('.') != -1 ||
-                number.IndexOf ('e') != -1 ||
-                number.IndexOf ('E') != -1) {
-
-                double n_double;
-                if (Double.TryParse (number, out n_double)) {
-                    token = JsonToken.Double;
-                    token_value = n_double;
-
-                    return;
-                }
-            }
-
-            int n_int32;
-            if (Int32.TryParse (number, out n_int32)) {
-                token = JsonToken.Int;
-                token_value = n_int32;
-
-                return;
-            }
-
-            long n_int64;
-            if (Int64.TryParse (number, out n_int64)) {
-                token = JsonToken.Long;
-                token_value = n_int64;
-
-                return;
-            }
-
-            // Shouldn't happen, but just in case, return something
-            token = JsonToken.Int;
-            token_value = 0;
-        }
-
-        private void ProcessSymbol ()
-        {
-            if (current_symbol == '[')  {
-                token = JsonToken.ArrayStart;
-                parser_return = true;
-
-            } else if (current_symbol == ']')  {
-                token = JsonToken.ArrayEnd;
-                parser_return = true;
-
-            } else if (current_symbol == '{')  {
-                token = JsonToken.ObjectStart;
-                parser_return = true;
-
-            } else if (current_symbol == '}')  {
-                token = JsonToken.ObjectEnd;
-                parser_return = true;
-
-            } else if (current_symbol == '"')  {
-                if (parser_in_string) {
-                    parser_in_string = false;
-
-                    parser_return = true;
-
-                } else {
-                    if (token == JsonToken.None)
-                        token = JsonToken.String;
-
-                    parser_in_string = true;
-                }
-
-            } else if (current_symbol == (int) ParserToken.CharSeq) {
-                token_value = lexer.StringValue;
-
-            } else if (current_symbol == (int) ParserToken.False)  {
-                token = JsonToken.Boolean;
-                token_value = false;
-                parser_return = true;
-
-            } else if (current_symbol == (int) ParserToken.Null)  {
-                token = JsonToken.Null;
-                parser_return = true;
-
-            } else if (current_symbol == (int) ParserToken.Number)  {
-                ProcessNumber (lexer.StringValue);
-
-                parser_return = true;
-
-            } else if (current_symbol == (int) ParserToken.Pair)  {
-                token = JsonToken.PropertyName;
-
-            } else if (current_symbol == (int) ParserToken.True)  {
-                token = JsonToken.Boolean;
-                token_value = true;
-                parser_return = true;
-
-            }
-        }
-
-        private bool ReadToken ()
-        {
-            if (end_of_input)
-                return false;
-
-            lexer.NextToken ();
-
-            if (lexer.EndOfInput) {
-                Close ();
-
-                return false;
-            }
-
-            current_input = lexer.Token;
-
-            return true;
-        }
-        #endregion
-
-
-        public void Close ()
-        {
-            if (end_of_input)
-                return;
-
-            end_of_input = true;
-            end_of_json  = true;
-
-            if (reader_is_owned)
-                reader.Close ();
-
-            reader = null;
-        }
-
-        public bool Read ()
-        {
-            if (end_of_input)
-                return false;
-
-            if (end_of_json) {
-                end_of_json = false;
-                automaton_stack.Clear ();
-                automaton_stack.Push ((int) ParserToken.End);
-                automaton_stack.Push ((int) ParserToken.Text);
-            }
-
-            parser_in_string = false;
-            parser_return    = false;
-
-            token       = JsonToken.None;
-            token_value = null;
-
-            if (! read_started) {
-                read_started = true;
-
-                if (! ReadToken ())
-                    return false;
-            }
-
-
-            int[] entry_symbols;
-
-            while (true) {
-                if (parser_return) {
-                    if (automaton_stack.Peek () == (int) ParserToken.End)
-                        end_of_json = true;
-
-                    return true;
-                }
-
-                current_symbol = automaton_stack.Pop ();
-
-                ProcessSymbol ();
-
-                if (current_symbol == current_input) {
-                    if (! ReadToken ()) {
-                        if (automaton_stack.Peek () != (int) ParserToken.End)
-                            throw new JsonException (
-                                "Input doesn't evaluate to proper JSON text");
-
-                        if (parser_return)
-                            return true;
-
-                        return false;
-                    }
-
-                    continue;
-                }
-
-                try {
-
-                    entry_symbols =
-                        parse_table[current_symbol][current_input];
-
-                } catch (KeyNotFoundException e) {
-                    throw new JsonException ((ParserToken) current_input, e);
-                }
-
-                if (entry_symbols[0] == (int) ParserToken.Epsilon)
-                    continue;
-
-                for (int i = entry_symbols.Length - 1; i >= 0; i--)
-                    automaton_stack.Push (entry_symbols[i]);
-            }
-        }
-
-    }
-}
diff --git a/QBox/Json/JsonWriter.cs b/QBox/Json/JsonWriter.cs
deleted file mode 100644
index 0d910d42..00000000
--- a/QBox/Json/JsonWriter.cs
+++ /dev/null
@@ -1,462 +0,0 @@
-#region Header
-/**
- * JsonWriter.cs
- *   Stream-like facility to output JSON text.
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Text;
-
-
-namespace LitJson
-{
-    internal enum Condition
-    {
-        InArray,
-        InObject,
-        NotAProperty,
-        Property,
-        Value
-    }
-
-    internal class WriterContext
-    {
-        public int  Count;
-        public bool InArray;
-        public bool InObject;
-        public bool ExpectingValue;
-        public int  Padding;
-    }
-
-    public class JsonWriter
-    {
-        #region Fields
-        private static NumberFormatInfo number_format;
-
-        private WriterContext        context;
-        private Stack<WriterContext> ctx_stack;
-        private bool                 has_reached_end;
-        private char[]               hex_seq;
-        private int                  indentation;
-        private int                  indent_value;
-        private StringBuilder        inst_string_builder;
-        private bool                 pretty_print;
-        private bool                 validate;
-        private TextWriter           writer;
-        #endregion
-
-
-        #region Properties
-        public int IndentValue {
-            get { return indent_value; }
-            set {
-                indentation = (indentation / indent_value) * value;
-                indent_value = value;
-            }
-        }
-
-        public bool PrettyPrint {
-            get { return pretty_print; }
-            set { pretty_print = value; }
-        }
-
-        public TextWriter TextWriter {
-            get { return writer; }
-        }
-
-        public bool Validate {
-            get { return validate; }
-            set { validate = value; }
-        }
-        #endregion
-
-
-        #region Constructors
-        static JsonWriter ()
-        {
-            number_format = NumberFormatInfo.InvariantInfo;
-        }
-
-        public JsonWriter ()
-        {
-            inst_string_builder = new StringBuilder ();
-            writer = new StringWriter (inst_string_builder);
-
-            Init ();
-        }
-
-        public JsonWriter (StringBuilder sb) :
-            this (new StringWriter (sb))
-        {
-        }
-
-        public JsonWriter (TextWriter writer)
-        {
-            if (writer == null)
-                throw new ArgumentNullException ("writer");
-
-            this.writer = writer;
-
-            Init ();
-        }
-        #endregion
-
-
-        #region Private Methods
-        private void DoValidation (Condition cond)
-        {
-            if (! context.ExpectingValue)
-                context.Count++;
-
-            if (! validate)
-                return;
-
-            if (has_reached_end)
-                throw new JsonException (
-                    "A complete JSON symbol has already been written");
-
-            switch (cond) {
-            case Condition.InArray:
-                if (! context.InArray)
-                    throw new JsonException (
-                        "Can't close an array here");
-                break;
-
-            case Condition.InObject:
-                if (! context.InObject || context.ExpectingValue)
-                    throw new JsonException (
-                        "Can't close an object here");
-                break;
-
-            case Condition.NotAProperty:
-                if (context.InObject && ! context.ExpectingValue)
-                    throw new JsonException (
-                        "Expected a property");
-                break;
-
-            case Condition.Property:
-                if (! context.InObject || context.ExpectingValue)
-                    throw new JsonException (
-                        "Can't add a property here");
-                break;
-
-            case Condition.Value:
-                if (! context.InArray &&
-                    (! context.InObject || ! context.ExpectingValue))
-                    throw new JsonException (
-                        "Can't add a value here");
-
-                break;
-            }
-        }
-
-        private void Init ()
-        {
-            has_reached_end = false;
-            hex_seq = new char[4];
-            indentation = 0;
-            indent_value = 4;
-            pretty_print = false;
-            validate = true;
-
-            ctx_stack = new Stack<WriterContext> ();
-            context = new WriterContext ();
-            ctx_stack.Push (context);
-        }
-
-        private static void IntToHex (int n, char[] hex)
-        {
-            int num;
-
-            for (int i = 0; i < 4; i++) {
-                num = n % 16;
-
-                if (num < 10)
-                    hex[3 - i] = (char) ('0' + num);
-                else
-                    hex[3 - i] = (char) ('A' + (num - 10));
-
-                n >>= 4;
-            }
-        }
-
-        private void Indent ()
-        {
-            if (pretty_print)
-                indentation += indent_value;
-        }
-
-
-        private void Put (string str)
-        {
-            if (pretty_print && ! context.ExpectingValue)
-                for (int i = 0; i < indentation; i++)
-                    writer.Write (' ');
-
-            writer.Write (str);
-        }
-
-        private void PutNewline ()
-        {
-            PutNewline (true);
-        }
-
-        private void PutNewline (bool add_comma)
-        {
-            if (add_comma && ! context.ExpectingValue &&
-                context.Count > 1)
-                writer.Write (',');
-
-            if (pretty_print && ! context.ExpectingValue)
-                writer.Write ('\n');
-        }
-
-        private void PutString (string str)
-        {
-            Put (String.Empty);
-
-            writer.Write ('"');
-
-            int n = str.Length;
-            for (int i = 0; i < n; i++) {
-                switch (str[i]) {
-                case '\n':
-                    writer.Write ("\\n");
-                    continue;
-
-                case '\r':
-                    writer.Write ("\\r");
-                    continue;
-
-                case '\t':
-                    writer.Write ("\\t");
-                    continue;
-
-                case '"':
-                case '\\':
-                    writer.Write ('\\');
-                    writer.Write (str[i]);
-                    continue;
-
-                case '\f':
-                    writer.Write ("\\f");
-                    continue;
-
-                case '\b':
-                    writer.Write ("\\b");
-                    continue;
-                }
-
-                if ((int) str[i] >= 32 && (int) str[i] <= 126) {
-                    writer.Write (str[i]);
-                    continue;
-                }
-
-                // Default, turn into a \uXXXX sequence
-                IntToHex ((int) str[i], hex_seq);
-                writer.Write ("\\u");
-                writer.Write (hex_seq);
-            }
-
-            writer.Write ('"');
-        }
-
-        private void Unindent ()
-        {
-            if (pretty_print)
-                indentation -= indent_value;
-        }
-        #endregion
-
-
-        public override string ToString ()
-        {
-            if (inst_string_builder == null)
-                return String.Empty;
-
-            return inst_string_builder.ToString ();
-        }
-
-        public void Reset ()
-        {
-            has_reached_end = false;
-
-            ctx_stack.Clear ();
-            context = new WriterContext ();
-            ctx_stack.Push (context);
-
-            if (inst_string_builder != null)
-                inst_string_builder.Remove (0, inst_string_builder.Length);
-        }
-
-        public void Write (bool boolean)
-        {
-            DoValidation (Condition.Value);
-            PutNewline ();
-
-            Put (boolean ? "true" : "false");
-
-            context.ExpectingValue = false;
-        }
-
-        public void Write (decimal number)
-        {
-            DoValidation (Condition.Value);
-            PutNewline ();
-
-            Put (Convert.ToString (number, number_format));
-
-            context.ExpectingValue = false;
-        }
-
-        public void Write (double number)
-        {
-            DoValidation (Condition.Value);
-            PutNewline ();
-
-            string str = Convert.ToString (number, number_format);
-            Put (str);
-
-            if (str.IndexOf ('.') == -1 &&
-                str.IndexOf ('E') == -1)
-                writer.Write (".0");
-
-            context.ExpectingValue = false;
-        }
-
-        public void Write (int number)
-        {
-            DoValidation (Condition.Value);
-            PutNewline ();
-
-            Put (Convert.ToString (number, number_format));
-
-            context.ExpectingValue = false;
-        }
-
-        public void Write (long number)
-        {
-            DoValidation (Condition.Value);
-            PutNewline ();
-
-            Put (Convert.ToString (number, number_format));
-
-            context.ExpectingValue = false;
-        }
-
-        public void Write (string str)
-        {
-            DoValidation (Condition.Value);
-            PutNewline ();
-
-            if (str == null)
-                Put ("null");
-            else
-                PutString (str);
-
-            context.ExpectingValue = false;
-        }
-
-        public void Write (ulong number)
-        {
-            DoValidation (Condition.Value);
-            PutNewline ();
-
-            Put (Convert.ToString (number, number_format));
-
-            context.ExpectingValue = false;
-        }
-
-        public void WriteArrayEnd ()
-        {
-            DoValidation (Condition.InArray);
-            PutNewline (false);
-
-            ctx_stack.Pop ();
-            if (ctx_stack.Count == 1)
-                has_reached_end = true;
-            else {
-                context = ctx_stack.Peek ();
-                context.ExpectingValue = false;
-            }
-
-            Unindent ();
-            Put ("]");
-        }
-
-        public void WriteArrayStart ()
-        {
-            DoValidation (Condition.NotAProperty);
-            PutNewline ();
-
-            Put ("[");
-
-            context = new WriterContext ();
-            context.InArray = true;
-            ctx_stack.Push (context);
-
-            Indent ();
-        }
-
-        public void WriteObjectEnd ()
-        {
-            DoValidation (Condition.InObject);
-            PutNewline (false);
-
-            ctx_stack.Pop ();
-            if (ctx_stack.Count == 1)
-                has_reached_end = true;
-            else {
-                context = ctx_stack.Peek ();
-                context.ExpectingValue = false;
-            }
-
-            Unindent ();
-            Put ("}");
-        }
-
-        public void WriteObjectStart ()
-        {
-            DoValidation (Condition.NotAProperty);
-            PutNewline ();
-
-            Put ("{");
-
-            context = new WriterContext ();
-            context.InObject = true;
-            ctx_stack.Push (context);
-
-            Indent ();
-        }
-
-        public void WritePropertyName (string property_name)
-        {
-            DoValidation (Condition.Property);
-            PutNewline ();
-
-            PutString (property_name);
-
-            if (pretty_print) {
-                if (property_name.Length > context.Padding)
-                    context.Padding = property_name.Length;
-
-                for (int i = context.Padding - property_name.Length;
-                     i >= 0; i--)
-                    writer.Write (' ');
-
-                writer.Write (": ");
-            } else
-                writer.Write (':');
-
-            context.ExpectingValue = true;
-        }
-    }
-}
diff --git a/QBox/Json/Lexer.cs b/QBox/Json/Lexer.cs
deleted file mode 100644
index 3314227e..00000000
--- a/QBox/Json/Lexer.cs
+++ /dev/null
@@ -1,910 +0,0 @@
-#region Header
-/**
- * Lexer.cs
- *   JSON lexer implementation based on a finite state machine.
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
-
-namespace LitJson
-{
-    internal class FsmContext
-    {
-        public bool  Return;
-        public int   NextState;
-        public Lexer L;
-        public int   StateStack;
-    }
-
-
-    internal class Lexer
-    {
-        #region Fields
-        private delegate bool StateHandler (FsmContext ctx);
-
-        private static int[]          fsm_return_table;
-        private static StateHandler[] fsm_handler_table;
-
-        private bool          allow_comments;
-        private bool          allow_single_quoted_strings;
-        private bool          end_of_input;
-        private FsmContext    fsm_context;
-        private int           input_buffer;
-        private int           input_char;
-        private TextReader    reader;
-        private int           state;
-        private StringBuilder string_buffer;
-        private string        string_value;
-        private int           token;
-        private int           unichar;
-        #endregion
-
-
-        #region Properties
-        public bool AllowComments {
-            get { return allow_comments; }
-            set { allow_comments = value; }
-        }
-
-        public bool AllowSingleQuotedStrings {
-            get { return allow_single_quoted_strings; }
-            set { allow_single_quoted_strings = value; }
-        }
-
-        public bool EndOfInput {
-            get { return end_of_input; }
-        }
-
-        public int Token {
-            get { return token; }
-        }
-
-        public string StringValue {
-            get { return string_value; }
-        }
-        #endregion
-
-
-        #region Constructors
-        static Lexer ()
-        {
-            PopulateFsmTables ();
-        }
-
-        public Lexer (TextReader reader)
-        {
-            allow_comments = true;
-            allow_single_quoted_strings = true;
-
-            input_buffer = 0;
-            string_buffer = new StringBuilder (128);
-            state = 1;
-            end_of_input = false;
-            this.reader = reader;
-
-            fsm_context = new FsmContext ();
-            fsm_context.L = this;
-        }
-        #endregion
-
-
-        #region Static Methods
-        private static int HexValue (int digit)
-        {
-            switch (digit) {
-            case 'a':
-            case 'A':
-                return 10;
-
-            case 'b':
-            case 'B':
-                return 11;
-
-            case 'c':
-            case 'C':
-                return 12;
-
-            case 'd':
-            case 'D':
-                return 13;
-
-            case 'e':
-            case 'E':
-                return 14;
-
-            case 'f':
-            case 'F':
-                return 15;
-
-            default:
-                return digit - '0';
-            }
-        }
-
-        private static void PopulateFsmTables ()
-        {
-            fsm_handler_table = new StateHandler[28] {
-                State1,
-                State2,
-                State3,
-                State4,
-                State5,
-                State6,
-                State7,
-                State8,
-                State9,
-                State10,
-                State11,
-                State12,
-                State13,
-                State14,
-                State15,
-                State16,
-                State17,
-                State18,
-                State19,
-                State20,
-                State21,
-                State22,
-                State23,
-                State24,
-                State25,
-                State26,
-                State27,
-                State28
-            };
-
-            fsm_return_table = new int[28] {
-                (int) ParserToken.Char,
-                0,
-                (int) ParserToken.Number,
-                (int) ParserToken.Number,
-                0,
-                (int) ParserToken.Number,
-                0,
-                (int) ParserToken.Number,
-                0,
-                0,
-                (int) ParserToken.True,
-                0,
-                0,
-                0,
-                (int) ParserToken.False,
-                0,
-                0,
-                (int) ParserToken.Null,
-                (int) ParserToken.CharSeq,
-                (int) ParserToken.Char,
-                0,
-                0,
-                (int) ParserToken.CharSeq,
-                (int) ParserToken.Char,
-                0,
-                0,
-                0,
-                0
-            };
-        }
-
-        private static char ProcessEscChar (int esc_char)
-        {
-            switch (esc_char) {
-            case '"':
-            case '\'':
-            case '\\':
-            case '/':
-                return Convert.ToChar (esc_char);
-
-            case 'n':
-                return '\n';
-
-            case 't':
-                return '\t';
-
-            case 'r':
-                return '\r';
-
-            case 'b':
-                return '\b';
-
-            case 'f':
-                return '\f';
-
-            default:
-                // Unreachable
-                return '?';
-            }
-        }
-
-        private static bool State1 (FsmContext ctx)
-        {
-            while (ctx.L.GetChar ()) {
-                if (ctx.L.input_char == ' ' ||
-                    ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r')
-                    continue;
-
-                if (ctx.L.input_char >= '1' && ctx.L.input_char <= '9') {
-                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                    ctx.NextState = 3;
-                    return true;
-                }
-
-                switch (ctx.L.input_char) {
-                case '"':
-                    ctx.NextState = 19;
-                    ctx.Return = true;
-                    return true;
-
-                case ',':
-                case ':':
-                case '[':
-                case ']':
-                case '{':
-                case '}':
-                    ctx.NextState = 1;
-                    ctx.Return = true;
-                    return true;
-
-                case '-':
-                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                    ctx.NextState = 2;
-                    return true;
-
-                case '0':
-                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                    ctx.NextState = 4;
-                    return true;
-
-                case 'f':
-                    ctx.NextState = 12;
-                    return true;
-
-                case 'n':
-                    ctx.NextState = 16;
-                    return true;
-
-                case 't':
-                    ctx.NextState = 9;
-                    return true;
-
-                case '\'':
-                    if (! ctx.L.allow_single_quoted_strings)
-                        return false;
-
-                    ctx.L.input_char = '"';
-                    ctx.NextState = 23;
-                    ctx.Return = true;
-                    return true;
-
-                case '/':
-                    if (! ctx.L.allow_comments)
-                        return false;
-
-                    ctx.NextState = 25;
-                    return true;
-
-                default:
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private static bool State2 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            if (ctx.L.input_char >= '1' && ctx.L.input_char<= '9') {
-                ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                ctx.NextState = 3;
-                return true;
-            }
-
-            switch (ctx.L.input_char) {
-            case '0':
-                ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                ctx.NextState = 4;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State3 (FsmContext ctx)
-        {
-            while (ctx.L.GetChar ()) {
-                if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9') {
-                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                    continue;
-                }
-
-                if (ctx.L.input_char == ' ' ||
-                    ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r') {
-                    ctx.Return = true;
-                    ctx.NextState = 1;
-                    return true;
-                }
-
-                switch (ctx.L.input_char) {
-                case ',':
-                case ']':
-                case '}':
-                    ctx.L.UngetChar ();
-                    ctx.Return = true;
-                    ctx.NextState = 1;
-                    return true;
-
-                case '.':
-                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                    ctx.NextState = 5;
-                    return true;
-
-                case 'e':
-                case 'E':
-                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                    ctx.NextState = 7;
-                    return true;
-
-                default:
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        private static bool State4 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            if (ctx.L.input_char == ' ' ||
-                ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r') {
-                ctx.Return = true;
-                ctx.NextState = 1;
-                return true;
-            }
-
-            switch (ctx.L.input_char) {
-            case ',':
-            case ']':
-            case '}':
-                ctx.L.UngetChar ();
-                ctx.Return = true;
-                ctx.NextState = 1;
-                return true;
-
-            case '.':
-                ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                ctx.NextState = 5;
-                return true;
-
-            case 'e':
-            case 'E':
-                ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                ctx.NextState = 7;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State5 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9') {
-                ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                ctx.NextState = 6;
-                return true;
-            }
-
-            return false;
-        }
-
-        private static bool State6 (FsmContext ctx)
-        {
-            while (ctx.L.GetChar ()) {
-                if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9') {
-                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                    continue;
-                }
-
-                if (ctx.L.input_char == ' ' ||
-                    ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r') {
-                    ctx.Return = true;
-                    ctx.NextState = 1;
-                    return true;
-                }
-
-                switch (ctx.L.input_char) {
-                case ',':
-                case ']':
-                case '}':
-                    ctx.L.UngetChar ();
-                    ctx.Return = true;
-                    ctx.NextState = 1;
-                    return true;
-
-                case 'e':
-                case 'E':
-                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                    ctx.NextState = 7;
-                    return true;
-
-                default:
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private static bool State7 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            if (ctx.L.input_char >= '0' && ctx.L.input_char<= '9') {
-                ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                ctx.NextState = 8;
-                return true;
-            }
-
-            switch (ctx.L.input_char) {
-            case '+':
-            case '-':
-                ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                ctx.NextState = 8;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State8 (FsmContext ctx)
-        {
-            while (ctx.L.GetChar ()) {
-                if (ctx.L.input_char >= '0' && ctx.L.input_char<= '9') {
-                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                    continue;
-                }
-
-                if (ctx.L.input_char == ' ' ||
-                    ctx.L.input_char >= '\t' && ctx.L.input_char<= '\r') {
-                    ctx.Return = true;
-                    ctx.NextState = 1;
-                    return true;
-                }
-
-                switch (ctx.L.input_char) {
-                case ',':
-                case ']':
-                case '}':
-                    ctx.L.UngetChar ();
-                    ctx.Return = true;
-                    ctx.NextState = 1;
-                    return true;
-
-                default:
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private static bool State9 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            switch (ctx.L.input_char) {
-            case 'r':
-                ctx.NextState = 10;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State10 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            switch (ctx.L.input_char) {
-            case 'u':
-                ctx.NextState = 11;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State11 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            switch (ctx.L.input_char) {
-            case 'e':
-                ctx.Return = true;
-                ctx.NextState = 1;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State12 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            switch (ctx.L.input_char) {
-            case 'a':
-                ctx.NextState = 13;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State13 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            switch (ctx.L.input_char) {
-            case 'l':
-                ctx.NextState = 14;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State14 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            switch (ctx.L.input_char) {
-            case 's':
-                ctx.NextState = 15;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State15 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            switch (ctx.L.input_char) {
-            case 'e':
-                ctx.Return = true;
-                ctx.NextState = 1;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State16 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            switch (ctx.L.input_char) {
-            case 'u':
-                ctx.NextState = 17;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State17 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            switch (ctx.L.input_char) {
-            case 'l':
-                ctx.NextState = 18;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State18 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            switch (ctx.L.input_char) {
-            case 'l':
-                ctx.Return = true;
-                ctx.NextState = 1;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State19 (FsmContext ctx)
-        {
-            while (ctx.L.GetChar ()) {
-                switch (ctx.L.input_char) {
-                case '"':
-                    ctx.L.UngetChar ();
-                    ctx.Return = true;
-                    ctx.NextState = 20;
-                    return true;
-
-                case '\\':
-                    ctx.StateStack = 19;
-                    ctx.NextState = 21;
-                    return true;
-
-                default:
-                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                    continue;
-                }
-            }
-
-            return true;
-        }
-
-        private static bool State20 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            switch (ctx.L.input_char) {
-            case '"':
-                ctx.Return = true;
-                ctx.NextState = 1;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State21 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            switch (ctx.L.input_char) {
-            case 'u':
-                ctx.NextState = 22;
-                return true;
-
-            case '"':
-            case '\'':
-            case '/':
-            case '\\':
-            case 'b':
-            case 'f':
-            case 'n':
-            case 'r':
-            case 't':
-                ctx.L.string_buffer.Append (
-                    ProcessEscChar (ctx.L.input_char));
-                ctx.NextState = ctx.StateStack;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State22 (FsmContext ctx)
-        {
-            int counter = 0;
-            int mult    = 4096;
-
-            ctx.L.unichar = 0;
-
-            while (ctx.L.GetChar ()) {
-
-                if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9' ||
-                    ctx.L.input_char >= 'A' && ctx.L.input_char <= 'F' ||
-                    ctx.L.input_char >= 'a' && ctx.L.input_char <= 'f') {
-
-                    ctx.L.unichar += HexValue (ctx.L.input_char) * mult;
-
-                    counter++;
-                    mult /= 16;
-
-                    if (counter == 4) {
-                        ctx.L.string_buffer.Append (
-                            Convert.ToChar (ctx.L.unichar));
-                        ctx.NextState = ctx.StateStack;
-                        return true;
-                    }
-
-                    continue;
-                }
-
-                return false;
-            }
-
-            return true;
-        }
-
-        private static bool State23 (FsmContext ctx)
-        {
-            while (ctx.L.GetChar ()) {
-                switch (ctx.L.input_char) {
-                case '\'':
-                    ctx.L.UngetChar ();
-                    ctx.Return = true;
-                    ctx.NextState = 24;
-                    return true;
-
-                case '\\':
-                    ctx.StateStack = 23;
-                    ctx.NextState = 21;
-                    return true;
-
-                default:
-                    ctx.L.string_buffer.Append ((char) ctx.L.input_char);
-                    continue;
-                }
-            }
-
-            return true;
-        }
-
-        private static bool State24 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            switch (ctx.L.input_char) {
-            case '\'':
-                ctx.L.input_char = '"';
-                ctx.Return = true;
-                ctx.NextState = 1;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State25 (FsmContext ctx)
-        {
-            ctx.L.GetChar ();
-
-            switch (ctx.L.input_char) {
-            case '*':
-                ctx.NextState = 27;
-                return true;
-
-            case '/':
-                ctx.NextState = 26;
-                return true;
-
-            default:
-                return false;
-            }
-        }
-
-        private static bool State26 (FsmContext ctx)
-        {
-            while (ctx.L.GetChar ()) {
-                if (ctx.L.input_char == '\n') {
-                    ctx.NextState = 1;
-                    return true;
-                }
-            }
-
-            return true;
-        }
-
-        private static bool State27 (FsmContext ctx)
-        {
-            while (ctx.L.GetChar ()) {
-                if (ctx.L.input_char == '*') {
-                    ctx.NextState = 28;
-                    return true;
-                }
-            }
-
-            return true;
-        }
-
-        private static bool State28 (FsmContext ctx)
-        {
-            while (ctx.L.GetChar ()) {
-                if (ctx.L.input_char == '*')
-                    continue;
-
-                if (ctx.L.input_char == '/') {
-                    ctx.NextState = 1;
-                    return true;
-                }
-
-                ctx.NextState = 27;
-                return true;
-            }
-
-            return true;
-        }
-        #endregion
-
-
-        private bool GetChar ()
-        {
-            if ((input_char = NextChar ()) != -1)
-                return true;
-
-            end_of_input = true;
-            return false;
-        }
-
-        private int NextChar ()
-        {
-            if (input_buffer != 0) {
-                int tmp = input_buffer;
-                input_buffer = 0;
-
-                return tmp;
-            }
-
-            return reader.Read ();
-        }
-
-        public bool NextToken ()
-        {
-            StateHandler handler;
-            fsm_context.Return = false;
-
-            while (true) {
-                handler = fsm_handler_table[state - 1];
-
-                if (! handler (fsm_context))
-                    throw new JsonException (input_char);
-
-                if (end_of_input)
-                    return false;
-
-                if (fsm_context.Return) {
-                    string_value = string_buffer.ToString ();
-                    string_buffer.Remove (0, string_buffer.Length);
-                    token = fsm_return_table[state - 1];
-
-                    if (token == (int) ParserToken.Char)
-                        token = input_char;
-
-                    state = fsm_context.NextState;
-
-                    return true;
-                }
-
-                state = fsm_context.NextState;
-            }
-        }
-
-        private void UngetChar ()
-        {
-            input_buffer = input_char;
-        }
-    }
-}
diff --git a/QBox/Json/ParserToken.cs b/QBox/Json/ParserToken.cs
deleted file mode 100644
index 9aaee977..00000000
--- a/QBox/Json/ParserToken.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-#region Header
-/**
- * ParserToken.cs
- *   Internal representation of the tokens used by the lexer and the parser.
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-namespace LitJson
-{
-    internal enum ParserToken
-    {
-        // Lexer tokens
-        None = System.Char.MaxValue + 1,
-        Number,
-        True,
-        False,
-        Null,
-        CharSeq,
-        // Single char
-        Char,
-
-        // Parser Rules
-        Text,
-        Object,
-        ObjectPrime,
-        Pair,
-        PairRest,
-        Array,
-        ArrayPrime,
-        Value,
-        ValueRest,
-        String,
-
-        // End of input
-        End,
-
-        // The empty rule
-        Epsilon
-    }
-}
diff --git a/QBox/QBox.csproj b/QBox/QBox.csproj
index 8f48cd55..9072945f 100644
--- a/QBox/QBox.csproj
+++ b/QBox/QBox.csproj
@@ -39,48 +39,44 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Auth\AuthToken.cs" />
-    <Compile Include="Auth\DownloadPolicy.cs" />
+    <Compile Include="Auth\GetPolicy.cs" />
     <Compile Include="Auth\PutAuthClient.cs" />
+    <Compile Include="FileOp\Exif.cs" />
+    <Compile Include="FileOp\ExifRet.cs" />
     <Compile Include="FileOp\FileOpClient.cs" />
-    <Compile Include="FileOp\ImageMogrifySpec.cs" />
-    <Compile Include="FileOp\ImageViewSpec.cs" />
-    <Compile Include="Json\IJsonWrapper.cs" />
-    <Compile Include="Json\JsonData.cs" />
-    <Compile Include="Json\JsonException.cs" />
-    <Compile Include="Json\JsonMapper.cs" />
-    <Compile Include="Json\JsonReader.cs" />
-    <Compile Include="Json\JsonWriter.cs" />
-    <Compile Include="Json\Lexer.cs" />
-    <Compile Include="Json\ParserToken.cs" />
-    <Compile Include="Auth\AuthPolicy.cs" />
-    <Compile Include="Auth\DigestAuthClient.cs" />
+    <Compile Include="FileOp\ImageMogrify.cs" />
+    <Compile Include="FileOp\ImageView.cs" />
+    <Compile Include="IO\FileParameter.cs" />
+    <Compile Include="IO\IOClient.cs" />
+    <Compile Include="IO\MultiPart.cs" />
+    <Compile Include="IO\PutExtra.cs" />
+    <Compile Include="IO\PutRet.cs" />
+    <Compile Include="Auth\PutPolicy.cs" />
+    <Compile Include="Auth\QBoxAuthClient.cs" />
     <Compile Include="FileOp\ImageInfoRet.cs" />
-    <Compile Include="FileOp\ImageOp.cs" />
+    <Compile Include="FileOp\ImageInfo.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RS\Entry.cs" />
     <Compile Include="Util\Base64UrlSafe.cs" />
     <Compile Include="RPC\CallRet.cs" />
     <Compile Include="RPC\Client.cs" />
-    <Compile Include="RS\Config.cs" />
-    <Compile Include="RS\FileParameter.cs" />
-    <Compile Include="RS\GetRet.cs" />
-    <Compile Include="RS\MultiPartFormDataPost.cs" />
-    <Compile Include="RS\PutAuthRet.cs" />
-    <Compile Include="RS\PutFileRet.cs" />
-    <Compile Include="RS\ResumablePut.cs" />
-    <Compile Include="RS\ResumablePutFileRet.cs" />
+    <Compile Include="Conf\Config.cs" />
+    <Compile Include="IO\ResumablePut.cs" />
+    <Compile Include="IO\ResumablePutRet.cs" />
     <Compile Include="RS\RSClient.cs" />
-    <Compile Include="RS\RSService.cs" />
-    <Compile Include="RS\StatRet.cs" />
     <Compile Include="Util\CRC32.cs" />
-    <Compile Include="Util\StreamUtil.cs" />
+    <Compile Include="Util\IO.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/QBox/RPC/Client.cs b/QBox/RPC/Client.cs
index efc7950b..e3084c79 100644
--- a/QBox/RPC/Client.cs
+++ b/QBox/RPC/Client.cs
@@ -41,7 +41,7 @@ public CallRet CallWithBinary(string url, string contentType, Stream body, long
                 SetAuth(request, body);
                 using (Stream requestStream = request.GetRequestStream())
                 {
-                    StreamUtil.CopyN(body, requestStream, length);
+                    Util.IO.CopyN(requestStream, body, length);
                 }
                 using (HttpWebResponse response = request.GetResponse() as HttpWebResponse)
                 {
diff --git a/QBox/RS/Entry.cs b/QBox/RS/Entry.cs
new file mode 100644
index 00000000..276be3c5
--- /dev/null
+++ b/QBox/RS/Entry.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Web.Script.Serialization;
+using QBox.RPC;
+
+namespace QBox.RS
+{
+    public class Entry : CallRet
+    {
+        public string Hash { get; private set; }
+        public long Fsize { get; private set; }
+        public long PutTime { get; private set; }
+        public string MimeType { get; private set; }
+        public string Customer { get; private set; }
+
+        public Entry(CallRet ret)
+            : base(ret)
+        {
+            if (OK && Response != null)
+            {
+                try
+                {
+                    Unmarshal(Response);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.ToString());
+                    this.Exception = e;
+                }
+            }
+        }
+
+        private void Unmarshal(string json)
+        {
+            var jss = new JavaScriptSerializer();
+            var dict = jss.Deserialize<Dictionary<string, dynamic>>(json);
+            Hash = (string)dict["hash"];
+            MimeType = (string)dict["mimeType"];
+            Fsize = (long)dict["fsize"];
+            PutTime = (long)dict["putTime"];
+            if (dict.ContainsKey("customer"))
+            {
+                Customer = (string)dict["customer"];
+            }
+        }
+    }
+}
diff --git a/QBox/RS/GetRet.cs b/QBox/RS/GetRet.cs
deleted file mode 100644
index b9b2bac2..00000000
--- a/QBox/RS/GetRet.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Net;
-using LitJson;
-using QBox.RPC;
-
-namespace QBox.RS
-{
-    public class GetRet : CallRet
-    {
-        public string Hash { get; private set; }
-        public long FileSize { get; private set; }
-        public string MimeType { get; private set; }
-        public string Url { get; private set; }
-
-        public GetRet(CallRet ret)
-            : base(ret)
-        {
-            if (OK && !String.IsNullOrEmpty(Response))
-            {
-                try
-                {
-                    Unmarshal(Response);
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine(e.ToString());
-                    this.Exception = e;
-                }
-            }
-        }
-
-        private void Unmarshal(string json)
-        {
-            JsonData data = JsonMapper.ToObject(json);
-            Hash = (string)data["hash"];
-            JsonData fsize = data["fsize"];
-            if (fsize.IsInt)
-                FileSize = (int)fsize;
-            else if (fsize.IsLong)
-                FileSize = (long)fsize;
-            MimeType = (string)data["mimeType"];
-            Url = (string)data["url"];
-        }
-    }
-}
diff --git a/QBox/RS/PutAuthRet.cs b/QBox/RS/PutAuthRet.cs
deleted file mode 100644
index 0d4361b5..00000000
--- a/QBox/RS/PutAuthRet.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using LitJson;
-using QBox.RPC;
-
-namespace QBox.RS
-{
-    public class PutAuthRet : CallRet
-    {
-        public int Expires { get; private set; }
-        public string Url { get; private set; }
-
-        public PutAuthRet(CallRet ret)
-            : base(ret)
-        {
-            if (!String.IsNullOrEmpty(Response))
-            {
-                try
-                {
-                    Unmarshal(Response);
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine(e.ToString());
-                    this.Exception = e;
-                }
-            }
-        }
-
-        private void Unmarshal(string json)
-        {
-            JsonData data = JsonMapper.ToObject(json);
-            Expires = (int)data["expiresIn"];
-            Url = (string)data["url"];
-        }
-    }
-}
diff --git a/QBox/RS/RSClient.cs b/QBox/RS/RSClient.cs
index e08a6c3b..d556d9e5 100644
--- a/QBox/RS/RSClient.cs
+++ b/QBox/RS/RSClient.cs
@@ -1,90 +1,50 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using QBox.Util;
+using QBox.Util;
 using QBox.RPC;
+using QBox.Auth;
+using QBox.Conf;
 
 namespace QBox.RS
 {
     public class RSClient
     {
-        public static PutFileRet PutFile(
-            string url, string bucketName, string key, string mimeType,
-            string localFile, string customMeta, string callbackParam)
+        public Client Conn { get; private set; }
+
+        public RSClient()
         {
-            string entryURI = bucketName + ":" + key;
-            if (String.IsNullOrEmpty(mimeType))
-            {
-                mimeType = "application/octet-stream";
-            }
-            string action = "/rs-put/" + Base64UrlSafe.Encode(entryURI) +
-                    "/mimeType/" + Base64UrlSafe.Encode(mimeType);
-            if (!String.IsNullOrEmpty(customMeta))
-            {
-                action += "/meta/" + Base64UrlSafe.Encode(customMeta);
-            }
+            Conn = new QBoxAuthClient();
+        }
 
-            try
-            {
-                var postParams = new Dictionary<string, object>();
-                postParams["action"] = action;
-                postParams["file"] = new FileParameter(localFile, mimeType);
-                if (!String.IsNullOrEmpty(callbackParam))
-                    postParams["params"] = callbackParam;
-                CallRet callRet = MultiPartFormDataPost.Post(url, postParams);
-                return new PutFileRet(callRet);
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-                return new PutFileRet(new CallRet(HttpStatusCode.BadRequest, e));
-            }
+        public Entry Stat(string bucket, string key)
+        {
+            string entryURI = bucket + ":" + key;
+            string url = Config.RS_HOST + "/stat/" + Base64URLSafe.Encode(entryURI);
+            CallRet callRet = Conn.Call(url);
+            return new Entry(callRet);
         }
 
-        public static PutFileRet PutFileWithUpToken(
-            string upToken, string tableName, string key, string mimeType,
-            string localFile, string customMeta, string callbackParam)
+        public CallRet Delete(string bucket, string key)
         {
-            return PutFileWithUpToken(upToken, tableName, key, 
-                mimeType, localFile, customMeta, callbackParam, 0);
+            string entryURI = bucket + ":" + key;
+            string url = Config.RS_HOST + "/delete/" + Base64URLSafe.Encode(entryURI);
+            return Conn.Call(url);
         }
 
-        public static PutFileRet PutFileWithUpToken(
-            string upToken, string tableName, string key, string mimeType,
-            string localFile, string customMeta, string callbackParam, UInt32 crc32)
+        public CallRet Move(string bucketSrc, string keySrc, string bucketDest, string keyDest)
         {
-            string entryURI = tableName + ":" + key;
-            if (String.IsNullOrEmpty(mimeType))
-            {
-                mimeType = "application/octet-stream";
-            }
-            string action = "/rs-put/" + Base64UrlSafe.Encode(entryURI) +
-                    "/mimeType/" + Base64UrlSafe.Encode(mimeType);
-            if (!String.IsNullOrEmpty(customMeta))
-            {
-                action += "/meta/" + Base64UrlSafe.Encode(customMeta);
-            }
-            if (crc32 != 0)
-            {
-                action += "/crc32/" + crc32.ToString();
-            }
+            string entryURISrc = bucketSrc + ":" + keySrc;
+            string entryURIDest = bucketDest + ":" + keyDest;
+            string url = Config.RS_HOST + "/move/" +
+                Base64URLSafe.Encode(entryURISrc) + "/" + Base64URLSafe.Encode(entryURIDest);
+            return Conn.Call(url);
+        }
 
-            try
-            {
-                var postParams = new Dictionary<string, object>();
-                postParams["auth"] = upToken;
-                postParams["action"] = action;
-                postParams["file"] = new FileParameter(localFile, mimeType);
-                if (!String.IsNullOrEmpty(callbackParam))
-                    postParams["params"] = callbackParam;
-                CallRet callRet = MultiPartFormDataPost.Post(Config.UP_HOST + "/upload", postParams);
-                return new PutFileRet(callRet);
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-                return new PutFileRet(new CallRet(HttpStatusCode.BadRequest, e));
-            }
+        public CallRet Copy(string bucketSrc, string keySrc, string bucketDest, string keyDest)
+        {
+            string entryURISrc = bucketSrc + ":" + keySrc;
+            string entryURIDest = bucketDest + ":" + keyDest;
+            string url = Config.RS_HOST + "/copy/" +
+                Base64URLSafe.Encode(entryURISrc) + "/" + Base64URLSafe.Encode(entryURIDest);
+            return Conn.Call(url);
         }
     }
 }
diff --git a/QBox/RS/RSService.cs b/QBox/RS/RSService.cs
deleted file mode 100644
index dc40d1e8..00000000
--- a/QBox/RS/RSService.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using System.IO;
-using System.Net;
-using QBox.FileOp;
-using QBox.Util;
-using QBox.RPC;
-
-namespace QBox.RS
-{
-    public class RSService
-    {
-        public Client Conn { get; private set; }
-        public string BucketName { get; private set; }
-
-        public RSService(Client conn, string bucketName)
-        {
-            Conn = conn;
-            BucketName = bucketName;
-        }
-
-        public CallRet MkBucket()
-        {
-            string url = Config.RS_HOST + "/mkbucket/" + BucketName;
-            return Conn.Call(url);
-        }
-
-        public PutAuthRet PutAuth()
-        {
-            CallRet callRet = Conn.Call(Config.IO_HOST + "/put-auth/");
-            return new PutAuthRet(callRet);
-        }
-
-        public PutFileRet PutFile(string key, string mimeType, string localFile, string customMeta)
-        {
-            string entryURI = BucketName + ":" + key;
-            if (String.IsNullOrEmpty(mimeType))
-            {
-                mimeType = "application/octet-stream";
-            }
-            string url = Config.IO_HOST + "/rs-put/" + Base64UrlSafe.Encode(entryURI) +
-                         "/mimeType/" + Base64UrlSafe.Encode(mimeType);
-            if (!String.IsNullOrEmpty(customMeta))
-            {
-                url += "/meta/" + Base64UrlSafe.Encode(customMeta);
-            }
-
-            try
-            {
-                using (FileStream fs = File.OpenRead(localFile))
-                {
-                    CallRet callRet = Conn.CallWithBinary(url, mimeType, fs, fs.Length);
-                    return new PutFileRet(callRet);
-                }
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-                return new PutFileRet(new CallRet(HttpStatusCode.BadRequest, e));
-            }
-        }
-
-        public GetRet Get(string key, string attName)
-        {
-            string entryURI = BucketName + ":" + key;
-            string url = Config.RS_HOST + "/get/" + Base64UrlSafe.Encode(entryURI) + "/attName/"
-                    + Base64UrlSafe.Encode(attName);
-            CallRet callRet = Conn.Call(url);
-            return new GetRet(callRet);
-        }
-
-        public GetRet GetIfNotModified(string key, string attName, string hash)
-        {
-            string entryURI = BucketName + ":" + key;
-            string url = Config.RS_HOST + "/get/" + Base64UrlSafe.Encode(entryURI) + "/attName/"
-                    + Base64UrlSafe.Encode(attName) + "/base/" + hash;
-            CallRet callRet = Conn.Call(url);
-            return new GetRet(callRet);
-        }
-
-        public StatRet Stat(string key)
-        {
-            string entryURI = BucketName + ":" + key;
-            string url = Config.RS_HOST + "/stat/" + Base64UrlSafe.Encode(entryURI);
-            CallRet callRet = Conn.Call(url);
-            return new StatRet(callRet);
-        }
-
-        public CallRet Publish(string domain)
-        {
-            String url = Config.RS_HOST + "/publish/" + Base64UrlSafe.Encode(domain) + "/from/" + BucketName;
-            return Conn.Call(url);
-        }
-
-        public CallRet Unpublish(string domain)
-        {
-            string url = Config.RS_HOST + "/unpublish/" + Base64UrlSafe.Encode(domain);
-            return Conn.Call(url);
-        }
-
-        public CallRet Delete(string key)
-        {
-            string entryURI = BucketName + ":" + key;
-            string url = Config.RS_HOST + "/delete/" + Base64UrlSafe.Encode(entryURI);
-            return Conn.Call(url);
-        }
-
-        public CallRet Drop()
-        {
-            string url = Config.RS_HOST + "/drop/" + BucketName;
-            return Conn.Call(url);
-        }
-
-        public PutFileRet SaveAs(string url, string specStr, string key)
-        {
-            string entryURI = BucketName + ":" + key;
-            url = url + specStr + "/save-as/" + Base64UrlSafe.Encode(entryURI);
-            CallRet callRet = Conn.Call(url);
-            return new PutFileRet(callRet);
-        }
-
-        public PutFileRet ImageMogrifySaveAs(string url, ImageMogrifySpec spec, string key)
-        {
-            string specStr = spec.MakeSpecString();
-            return SaveAs(url, specStr, key);
-        }
-    }
-}
diff --git a/QBox/RS/StatRet.cs b/QBox/RS/StatRet.cs
deleted file mode 100644
index 0ce1c12d..00000000
--- a/QBox/RS/StatRet.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using LitJson;
-using QBox.RPC;
-
-namespace QBox.RS
-{
-    public class StatRet : CallRet
-    {
-        public string Hash { get; private set; }
-        public long FileSize { get; private set; }
-        public long PutTime { get; private set; }
-        public string MimeType { get; private set; }
-
-        public StatRet(CallRet ret)
-            : base(ret)
-        {
-            if (OK && Response != null)
-            {
-                try
-                {
-                    Unmarshal(Response);
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine(e.ToString());
-                    this.Exception = e;
-                }
-            }
-        }
-
-        private void Unmarshal(string json)
-        {
-            JsonData data = JsonMapper.ToObject(json);
-            Hash = (string)data["hash"];
-            JsonData fsize = data["fsize"];
-            if (fsize.IsInt)
-                FileSize = (int)fsize;
-            else if (fsize.IsLong)
-                FileSize = (long)fsize;
-            JsonData putTime = data["putTime"];
-            if (putTime.IsInt)
-                PutTime = (int)putTime;
-            else if (putTime.IsLong)
-                PutTime = (long)putTime;
-            MimeType = (string)data["mimeType"];
-        }
-    }
-}
diff --git a/QBox/Util/Base64UrlSafe.cs b/QBox/Util/Base64UrlSafe.cs
index 5e242937..e7767a18 100644
--- a/QBox/Util/Base64UrlSafe.cs
+++ b/QBox/Util/Base64UrlSafe.cs
@@ -3,7 +3,7 @@
 
 namespace QBox.Util
 {
-    public static class Base64UrlSafe
+    public static class Base64URLSafe
     {
         public static string Encode(string text)
         {
diff --git a/QBox/Util/StreamUtil.cs b/QBox/Util/IO.cs
similarity index 86%
rename from QBox/Util/StreamUtil.cs
rename to QBox/Util/IO.cs
index 1a94a85d..b569d596 100644
--- a/QBox/Util/StreamUtil.cs
+++ b/QBox/Util/IO.cs
@@ -1,46 +1,46 @@
-using System;
-using System.Text;
-using System.IO;
-
-namespace QBox.Util
-{
-    public static class StreamUtil
-    {
-        public static int bufferLen = 32*1024;
-
-        public static void Copy(Stream src, Stream dst)
-        {
-            byte[] buffer = new byte[bufferLen];
-            while (true)
-            {
-                int n = src.Read(buffer, 0, bufferLen);
-                if (n == 0) break;
-                dst.Write(buffer, 0, n);
-            }
-        }
-
-        public static void CopyN(Stream src, Stream dst, long numBytesToCopy)
-        {
-            Console.WriteLine("Stream.CopyN: {0}", numBytesToCopy);
-            byte[] buffer = new byte[bufferLen];
-            long numBytesWritten = 0;
-            while (numBytesWritten < numBytesToCopy)
-            {
-                int len = bufferLen;
-                if ((numBytesToCopy - numBytesWritten) < len)
-                {
-                    len = (int)(numBytesToCopy - numBytesWritten);
-                }
-                int n = src.Read(buffer, 0, len);
-                if (n == 0) break;
-                dst.Write(buffer, 0, n);
-                numBytesWritten += n;
-                //Console.WriteLine("Stream.CopyN.Write: {0} {1}", n, numBytesWritten);
-            }
-            if (numBytesWritten != numBytesToCopy)
-            {
-                throw new Exception("StreamUtil.CopyN: nwritten not equal to ncopy");
-            }
-        }
-    }
-}
+using System;
+using System.Text;
+using System.IO;
+
+namespace QBox.Util
+{
+    public static class IO
+    {
+        public static int bufferLen = 32*1024;
+
+        public static void Copy(Stream dst, Stream src)
+        {
+            byte[] buffer = new byte[bufferLen];
+            while (true)
+            {
+                int n = src.Read(buffer, 0, bufferLen);
+                if (n == 0) break;
+                dst.Write(buffer, 0, n);
+            }
+        }
+
+        public static void CopyN(Stream dst, Stream src, long numBytesToCopy)
+        {
+            Console.WriteLine("Stream.CopyN: {0}", numBytesToCopy);
+            byte[] buffer = new byte[bufferLen];
+            long numBytesWritten = 0;
+            while (numBytesWritten < numBytesToCopy)
+            {
+                int len = bufferLen;
+                if ((numBytesToCopy - numBytesWritten) < len)
+                {
+                    len = (int)(numBytesToCopy - numBytesWritten);
+                }
+                int n = src.Read(buffer, 0, len);
+                if (n == 0) break;
+                dst.Write(buffer, 0, n);
+                numBytesWritten += n;
+                //Console.WriteLine("Stream.CopyN.Write: {0} {1}", n, numBytesWritten);
+            }
+            if (numBytesWritten != numBytesToCopy)
+            {
+                throw new Exception("StreamUtil.CopyN: nwritten not equal to ncopy");
+            }
+        }
+    }
+}