diff --git a/Android.v8.mk b/Android.v8.mk
index d25730e..17e85c3 100644
--- a/Android.v8.mk
+++ b/Android.v8.mk
@@ -246,5 +246,5 @@
 include $(BASE_PATH)/WebKitTools/android/webkitmerge/Android.mk
 
 # Build libv8 and v8shell
-include $(BASE_PATH)/v8/Android.mk
-include $(BASE_PATH)/v8/Android.v8shell.mk
+include $(BASE_PATH)/V8Binding/Android.libv8.mk
+include $(BASE_PATH)/V8Binding/Android.v8shell.mk
diff --git a/V8Binding/Android.libv8.mk b/V8Binding/Android.libv8.mk
index 1e91788..c83b046 100644
--- a/V8Binding/Android.libv8.mk
+++ b/V8Binding/Android.libv8.mk
@@ -73,10 +73,11 @@
 	src/v8threads.cc \
 	src/variables.cc \
 	src/virtual-frame.cc \
+	src/version.cc \
 	src/zone.cc
 
 ifeq ($(TARGET_ARCH),arm)
-	LOCAL_SRC_FILES += \
+  LOCAL_SRC_FILES += \
 		src/assembler-arm.cc \
 		src/builtins-arm.cc \
 		src/codegen-arm.cc \
@@ -127,7 +128,9 @@
   src/snapshot-empty.cc \
 	src/dtoa-config.c
 
-LOCAL_JS_LIBRARY_FILES := $(addprefix $(LOCAL_PATH)/, \
+LOCAL_SRC_FILES := $(addprefix v8/, $(LOCAL_SRC_FILES))
+
+LOCAL_JS_LIBRARY_FILES := $(addprefix $(LOCAL_PATH)/v8/, \
 	src/runtime.js \
 	src/v8natives.js \
 	src/array.js \
@@ -138,6 +141,7 @@
 	src/apinatives.js \
 	src/date-delay.js \
 	src/regexp-delay.js \
+	src/json-delay.js \
 	src/macros.py \
 )
 
@@ -156,13 +160,12 @@
 	-Wno-endif-labels \
 	-Wno-import \
 	-Wno-format \
-	-fno-exceptions \
-	-fno-tree-sink
+	-fno-exceptions
 
 ifeq ($(TARGET_ARCH),arm)
 	LOCAL_CFLAGS += -DARM
 endif
 
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/src
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/v8/src
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/V8Binding/Android.v8shell.mk b/V8Binding/Android.v8shell.mk
index ea18166..46cf4ee 100644
--- a/V8Binding/Android.v8shell.mk
+++ b/V8Binding/Android.v8shell.mk
@@ -1,13 +1,13 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES:= samples/shell.cc
+LOCAL_SRC_FILES:= v8/samples/shell.cc
 LOCAL_MODULE := v8shell 
 
 LOCAL_CPP_EXTENSION := .cc
 
 LOCAL_STATIC_LIBRARIES := libv8
 
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/v8/include
 
 include $(BUILD_EXECUTABLE)
diff --git a/V8Binding/V8Binding.derived.mk b/V8Binding/V8Binding.derived.mk
index 3cf3665..22aca51 100644
--- a/V8Binding/V8Binding.derived.mk
+++ b/V8Binding/V8Binding.derived.mk
@@ -20,10 +20,10 @@
 v8binding_dir := $(LOCAL_PATH)
 
 BINDING_C_INCLUDES := \
-  $(BASE_PATH)/v8/include \
+  $(LOCAL_PATH)/v8/include \
 	$(WEBCORE_PATH)/bindings/v8 \
 	$(WEBCORE_PATH)/bindings/v8/custom \
-	$(LOCAL_PATH)/v8 \
+	$(LOCAL_PATH)/binding \
 	$(LOCAL_PATH)/npapi \
 	$(LOCAL_PATH)/jni \
 	$(JAVASCRIPTCORE_PATH)/wtf \
@@ -113,24 +113,24 @@
 	bindings/v8/custom/V8XMLSerializerConstructor.cpp
 
 LOCAL_SRC_FILES := \
-  v8/V8InitializeThreading.cpp \
-	v8/JSDOMBinding.cpp \
-	v8/JSXPathNSResolver.cpp \
-	v8/NPV8Object.cpp \
-	v8/RGBColor.cpp \
-	v8/V8CanvasPixelArrayCustom.cpp \
-	v8/V8MessagePortCustom.cpp \
-	v8/V8NPObject.cpp \
-	v8/V8NPUtils.cpp \
-	v8/V8Utilities.cpp \
-	v8/V8WorkerContextCustom.cpp \
-	v8/V8WorkerCustom.cpp \
-	v8/npruntime.cpp \
-	v8/v8_binding.cpp \
-	v8/v8_custom.cpp \
-	v8/v8_helpers.cpp \
-	v8/v8_index.cpp \
-	v8/v8_proxy.cpp \
+  binding/V8InitializeThreading.cpp \
+	binding/JSDOMBinding.cpp \
+	binding/JSXPathNSResolver.cpp \
+	binding/NPV8Object.cpp \
+	binding/RGBColor.cpp \
+	binding/V8CanvasPixelArrayCustom.cpp \
+	binding/V8MessagePortCustom.cpp \
+	binding/V8NPObject.cpp \
+	binding/V8NPUtils.cpp \
+	binding/V8Utilities.cpp \
+	binding/V8WorkerContextCustom.cpp \
+	binding/V8WorkerCustom.cpp \
+	binding/npruntime.cpp \
+	binding/v8_binding.cpp \
+	binding/v8_custom.cpp \
+	binding/v8_helpers.cpp \
+	binding/v8_index.cpp \
+	binding/v8_proxy.cpp \
 	\
 	jni/jni_class.cpp \
 	jni/jni_instance.cpp \
diff --git a/V8Binding/bindings/DOMObjectsInclude.h b/V8Binding/binding/DOMObjectsInclude.h
similarity index 99%
rename from V8Binding/bindings/DOMObjectsInclude.h
rename to V8Binding/binding/DOMObjectsInclude.h
index 0268bca..a79f03d 100644
--- a/V8Binding/bindings/DOMObjectsInclude.h
+++ b/V8Binding/binding/DOMObjectsInclude.h
@@ -24,9 +24,10 @@
 #include "CSSPageRule.h"
 #include "CSSRule.h"
 #include "CSSRuleList.h"
-#include "CSSValueList.h"
+#include "CSSStyleDeclaration.h"
 #include "CSSStyleRule.h"
 #include "CSSStyleSheet.h"
+#include "CSSValueList.h"
 #include "CSSVariablesDeclaration.h"
 #include "CSSVariablesRule.h"
 #include "Database.h"
diff --git a/V8Binding/bindings/JSDOMBinding.cpp b/V8Binding/binding/JSDOMBinding.cpp
similarity index 100%
rename from V8Binding/bindings/JSDOMBinding.cpp
rename to V8Binding/binding/JSDOMBinding.cpp
diff --git a/V8Binding/bindings/JSDOMBinding.h b/V8Binding/binding/JSDOMBinding.h
similarity index 100%
rename from V8Binding/bindings/JSDOMBinding.h
rename to V8Binding/binding/JSDOMBinding.h
diff --git a/V8Binding/bindings/JSXPathNSResolver.cpp b/V8Binding/binding/JSXPathNSResolver.cpp
similarity index 100%
rename from V8Binding/bindings/JSXPathNSResolver.cpp
rename to V8Binding/binding/JSXPathNSResolver.cpp
diff --git a/V8Binding/bindings/JSXPathNSResolver.h b/V8Binding/binding/JSXPathNSResolver.h
similarity index 100%
rename from V8Binding/bindings/JSXPathNSResolver.h
rename to V8Binding/binding/JSXPathNSResolver.h
diff --git a/V8Binding/bindings/NPV8Object.cpp b/V8Binding/binding/NPV8Object.cpp
similarity index 100%
rename from V8Binding/bindings/NPV8Object.cpp
rename to V8Binding/binding/NPV8Object.cpp
diff --git a/V8Binding/bindings/NPV8Object.h b/V8Binding/binding/NPV8Object.h
similarity index 100%
rename from V8Binding/bindings/NPV8Object.h
rename to V8Binding/binding/NPV8Object.h
diff --git a/V8Binding/bindings/RGBColor.cpp b/V8Binding/binding/RGBColor.cpp
similarity index 100%
rename from V8Binding/bindings/RGBColor.cpp
rename to V8Binding/binding/RGBColor.cpp
diff --git a/V8Binding/bindings/RGBColor.h b/V8Binding/binding/RGBColor.h
similarity index 100%
rename from V8Binding/bindings/RGBColor.h
rename to V8Binding/binding/RGBColor.h
diff --git a/V8Binding/bindings/ScriptController.cpp b/V8Binding/binding/ScriptController.cpp
similarity index 100%
rename from V8Binding/bindings/ScriptController.cpp
rename to V8Binding/binding/ScriptController.cpp
diff --git a/V8Binding/bindings/ScriptController.h b/V8Binding/binding/ScriptController.h
similarity index 100%
rename from V8Binding/bindings/ScriptController.h
rename to V8Binding/binding/ScriptController.h
diff --git a/V8Binding/bindings/UndetectableHTMLCollection.idl b/V8Binding/binding/UndetectableHTMLCollection.idl
similarity index 100%
rename from V8Binding/bindings/UndetectableHTMLCollection.idl
rename to V8Binding/binding/UndetectableHTMLCollection.idl
diff --git a/V8Binding/bindings/V8CanvasPixelArrayCustom.cpp b/V8Binding/binding/V8CanvasPixelArrayCustom.cpp
similarity index 100%
rename from V8Binding/bindings/V8CanvasPixelArrayCustom.cpp
rename to V8Binding/binding/V8CanvasPixelArrayCustom.cpp
diff --git a/V8Binding/bindings/V8InitializeThreading.cpp b/V8Binding/binding/V8InitializeThreading.cpp
similarity index 100%
rename from V8Binding/bindings/V8InitializeThreading.cpp
rename to V8Binding/binding/V8InitializeThreading.cpp
diff --git a/V8Binding/bindings/V8InitializeThreading.h b/V8Binding/binding/V8InitializeThreading.h
similarity index 100%
rename from V8Binding/bindings/V8InitializeThreading.h
rename to V8Binding/binding/V8InitializeThreading.h
diff --git a/V8Binding/bindings/V8MessagePortCustom.cpp b/V8Binding/binding/V8MessagePortCustom.cpp
similarity index 100%
rename from V8Binding/bindings/V8MessagePortCustom.cpp
rename to V8Binding/binding/V8MessagePortCustom.cpp
diff --git a/V8Binding/bindings/V8NPObject.cpp b/V8Binding/binding/V8NPObject.cpp
similarity index 100%
rename from V8Binding/bindings/V8NPObject.cpp
rename to V8Binding/binding/V8NPObject.cpp
diff --git a/V8Binding/bindings/V8NPObject.h b/V8Binding/binding/V8NPObject.h
similarity index 100%
rename from V8Binding/bindings/V8NPObject.h
rename to V8Binding/binding/V8NPObject.h
diff --git a/V8Binding/bindings/V8NPUtils.cpp b/V8Binding/binding/V8NPUtils.cpp
similarity index 100%
rename from V8Binding/bindings/V8NPUtils.cpp
rename to V8Binding/binding/V8NPUtils.cpp
diff --git a/V8Binding/bindings/V8NPUtils.h b/V8Binding/binding/V8NPUtils.h
similarity index 100%
rename from V8Binding/bindings/V8NPUtils.h
rename to V8Binding/binding/V8NPUtils.h
diff --git a/V8Binding/bindings/V8SVGPODTypeWrapper.h b/V8Binding/binding/V8SVGPODTypeWrapper.h
similarity index 100%
rename from V8Binding/bindings/V8SVGPODTypeWrapper.h
rename to V8Binding/binding/V8SVGPODTypeWrapper.h
diff --git a/V8Binding/bindings/V8Utilities.cpp b/V8Binding/binding/V8Utilities.cpp
similarity index 100%
rename from V8Binding/bindings/V8Utilities.cpp
rename to V8Binding/binding/V8Utilities.cpp
diff --git a/V8Binding/bindings/V8Utilities.h b/V8Binding/binding/V8Utilities.h
similarity index 100%
rename from V8Binding/bindings/V8Utilities.h
rename to V8Binding/binding/V8Utilities.h
diff --git a/V8Binding/bindings/V8WorkerContextCustom.cpp b/V8Binding/binding/V8WorkerContextCustom.cpp
similarity index 100%
rename from V8Binding/bindings/V8WorkerContextCustom.cpp
rename to V8Binding/binding/V8WorkerContextCustom.cpp
diff --git a/V8Binding/bindings/V8WorkerCustom.cpp b/V8Binding/binding/V8WorkerCustom.cpp
similarity index 100%
rename from V8Binding/bindings/V8WorkerCustom.cpp
rename to V8Binding/binding/V8WorkerCustom.cpp
diff --git a/V8Binding/bindings/dom_wrapper_map.h b/V8Binding/binding/dom_wrapper_map.h
similarity index 100%
rename from V8Binding/bindings/dom_wrapper_map.h
rename to V8Binding/binding/dom_wrapper_map.h
diff --git a/V8Binding/bindings/npruntime.cpp b/V8Binding/binding/npruntime.cpp
similarity index 100%
rename from V8Binding/bindings/npruntime.cpp
rename to V8Binding/binding/npruntime.cpp
diff --git a/V8Binding/bindings/npruntime_impl.h b/V8Binding/binding/npruntime_impl.h
similarity index 100%
rename from V8Binding/bindings/npruntime_impl.h
rename to V8Binding/binding/npruntime_impl.h
diff --git a/V8Binding/bindings/npruntime_internal.h b/V8Binding/binding/npruntime_internal.h
similarity index 100%
rename from V8Binding/bindings/npruntime_internal.h
rename to V8Binding/binding/npruntime_internal.h
diff --git a/V8Binding/bindings/npruntime_priv.h b/V8Binding/binding/npruntime_priv.h
similarity index 100%
rename from V8Binding/bindings/npruntime_priv.h
rename to V8Binding/binding/npruntime_priv.h
diff --git a/V8Binding/bindings/v8_binding.cpp b/V8Binding/binding/v8_binding.cpp
similarity index 100%
rename from V8Binding/bindings/v8_binding.cpp
rename to V8Binding/binding/v8_binding.cpp
diff --git a/V8Binding/bindings/v8_binding.h b/V8Binding/binding/v8_binding.h
similarity index 100%
rename from V8Binding/bindings/v8_binding.h
rename to V8Binding/binding/v8_binding.h
diff --git a/V8Binding/bindings/v8_custom.cpp b/V8Binding/binding/v8_custom.cpp
similarity index 100%
rename from V8Binding/bindings/v8_custom.cpp
rename to V8Binding/binding/v8_custom.cpp
diff --git a/V8Binding/bindings/v8_custom.h b/V8Binding/binding/v8_custom.h
similarity index 100%
rename from V8Binding/bindings/v8_custom.h
rename to V8Binding/binding/v8_custom.h
diff --git a/V8Binding/bindings/v8_helpers.cpp b/V8Binding/binding/v8_helpers.cpp
similarity index 100%
rename from V8Binding/bindings/v8_helpers.cpp
rename to V8Binding/binding/v8_helpers.cpp
diff --git a/V8Binding/bindings/v8_helpers.h b/V8Binding/binding/v8_helpers.h
similarity index 100%
rename from V8Binding/bindings/v8_helpers.h
rename to V8Binding/binding/v8_helpers.h
diff --git a/V8Binding/bindings/v8_index.cpp b/V8Binding/binding/v8_index.cpp
similarity index 100%
rename from V8Binding/bindings/v8_index.cpp
rename to V8Binding/binding/v8_index.cpp
diff --git a/V8Binding/bindings/v8_index.h b/V8Binding/binding/v8_index.h
similarity index 100%
rename from V8Binding/bindings/v8_index.h
rename to V8Binding/binding/v8_index.h
diff --git a/V8Binding/bindings/v8_npobject.h b/V8Binding/binding/v8_npobject.h
similarity index 100%
rename from V8Binding/bindings/v8_npobject.h
rename to V8Binding/binding/v8_npobject.h
diff --git a/V8Binding/bindings/v8_proxy.cpp b/V8Binding/binding/v8_proxy.cpp
similarity index 100%
rename from V8Binding/bindings/v8_proxy.cpp
rename to V8Binding/binding/v8_proxy.cpp
diff --git a/V8Binding/bindings/v8_proxy.h b/V8Binding/binding/v8_proxy.h
similarity index 100%
rename from V8Binding/bindings/v8_proxy.h
rename to V8Binding/binding/v8_proxy.h