--- a/caps/src/Makefile.in
+++ b/caps/src/Makefile.in
@@ -56,11 +56,11 @@ CPPSRCS		= \
 		nsJSPrincipals.cpp \
 		nsScriptSecurityManager.cpp \
 		nsSecurityManagerFactory.cpp \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/../include \
-		   -I$(topsrcdir)/js/src/xpconnect/src \
+		   -I$(topsrcdir)/js/xpconnect/src \
 		   -I$(topsrcdir)/dom/base
 

--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -67,17 +67,17 @@ EXPORTS		= \
 		$(NULL)
 
 EXPORTS_NAMESPACES = mozilla/dom
 
 EXPORTS_mozilla/dom = \
   Link.h \
   $(NULL)
 
-LOCAL_INCLUDES = -I$(srcdir)/js/src/xpconnect/src
+LOCAL_INCLUDES = -I$(srcdir)/js/xpconnect/src
 
 CPPSRCS		= \
 		mozSanitizingSerializer.cpp \
 		nsAtomListUtils.cpp \
 		nsAttrAndChildArray.cpp \
 		nsAttrValue.cpp \
 		nsCCUncollectableMarker.cpp \
 		nsChannelPolicy.cpp \
@@ -197,17 +197,17 @@ INCLUDES	+= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../xbl/src \
 		-I$(srcdir)/../../../layout/generic \
 		-I$(srcdir)/../../../layout/style \
 		-I$(srcdir)/../../../dom/base \
 		-I$(srcdir)/../../xml/document/src \
 		-I$(topsrcdir)/xpcom/io \
 		-I$(topsrcdir)/dom/ipc \
-		-I$(topsrcdir)/js/src/xpconnect/src \
+		-I$(topsrcdir)/js/xpconnect/src \
 		-I$(topsrcdir)/caps/include \
 		-I$(topsrcdir)/netwerk/base/src \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
 
 # gcc requires -msse2 for this file since it uses SSE2 intrinsics.  (See bug
 # 585538 comment 12.)

--- a/content/base/src/nsDOMFileReader.cpp
+++ b/content/base/src/nsDOMFileReader.cpp
@@ -73,17 +73,17 @@
 #include "nsIStreamConverterService.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsLayoutStatics.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsFileDataProtocolHandler.h"
 #include "mozilla/Preferences.h"
 #include "xpcprivate.h"
 #include "xpcpublic.h"
-#include "xpcquickstubs.h"
+#include "XPCQuickStubs.h"
 #include "jstypedarray.h"
 #include "nsDOMJSUtils.h"
 
 using namespace mozilla;
 
 #define LOAD_STR "load"
 #define LOADSTART_STR "loadstart"
 #define LOADEND_STR "loadend"

--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -143,12 +143,12 @@ INCLUDES	+= \
 		-I$(srcdir)/../../../../layout/tables \
 		-I$(srcdir)/../../../../layout/xul/base/src \
 		-I$(srcdir)/../../../../layout/generic \
 		-I$(srcdir)/../../../../dom/base \
 		-I$(srcdir)/../../../../editor/libeditor/base \
 		-I$(srcdir)/../../../../editor/libeditor/text \
 		-I$(srcdir) \
 		-I$(topsrcdir)/xpcom/ds \
-		-I$(srcdir)/../../../../js/src/xpconnect/src \
+		-I$(srcdir)/../../../../js/xpconnect/src \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT

--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@@ -84,12 +84,12 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../html/document/src \
 		-I$(srcdir)/../../xml/document/src \
 		-I$(srcdir)/../../xul/content/src \
 		-I$(srcdir)/../../xul/document/src \
 		-I$(srcdir)/../../events/src \
 		-I$(srcdir)/../../../layout/style \
 		-I$(srcdir)/../../../dom/base \
 		-I$(topsrcdir)/xpcom/ds \
-		-I$(srcdir)/../../../js/src/xpconnect/src \
+		-I$(srcdir)/../../../js/xpconnect/src \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT

--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -114,11 +114,11 @@ CPPSRCS = \
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir)/../shistory/src \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/layout/base \
-  -I$(topsrcdir)/js/src/xpconnect/src \
+  -I$(topsrcdir)/js/xpconnect/src \
   -I$(topsrcdir)/xpcom/ds \
   $(NULL)

--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -131,17 +131,17 @@ DEFINES += -DMOZ_JSDEBUGGER
 endif
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
-		-I$(srcdir)/../../js/src/xpconnect/src \
-		-I$(srcdir)/../../js/src/xpconnect/wrappers \
+		-I$(topsrcdir)/js/xpconnect/src \
+		-I$(topsrcdir)/js/xpconnect/wrappers \
 		-I$(topsrcdir)/xpcom/ds \
 		$(NULL)
 
 ifdef MOZ_X11
 CXXFLAGS += $(TK_CFLAGS)
 LDFLAGS += $(TK_LIBS)
 endif

--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -92,17 +92,17 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/dom/src/storage \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
 
 # Make sure to quickstub as much as possible here! See
-# js/src/xpconnect/src/dom_quickstubs.qsconf.
+# js/xpconnect/src/dom_quickstubs.qsconf.
 XPIDLSRCS = \
   nsIIDBCursor.idl \
   nsIIDBCursorWithValue.idl \
   nsIIDBDatabase.idl \
   nsIIDBDatabaseException.idl \
   nsIIDBFactory.idl \
   nsIIDBIndex.idl \
   nsIIDBKeyRange.idl \

--- a/dom/workers/File.cpp
+++ b/dom/workers/File.cpp
@@ -44,17 +44,17 @@
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jscntxt.h"
 #include "jsfriendapi.h"
 #include "nsCOMPtr.h"
 #include "nsJSUtils.h"
 #include "nsStringGlue.h"
 #include "xpcprivate.h"
-#include "xpcquickstubs.h"
+#include "XPCQuickStubs.h"
 
 #include "Exceptions.h"
 #include "WorkerInlines.h"
 #include "WorkerPrivate.h"
 
 #define PROPERTY_FLAGS \
   JSPROP_ENUMERATE | JSPROP_SHARED
 

--- a/dom/workers/Makefile.in
+++ b/dom/workers/Makefile.in
@@ -72,17 +72,17 @@ CPPSRCS = \
   XMLHttpRequest.cpp \
   XMLHttpRequestPrivate.cpp \
   $(NULL)
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/js/src/xpconnect/src \
+  -I$(topsrcdir)/js/xpconnect/src \
   -I$(topsrcdir)/xpcom/build \
   $(NULL)
 
 ifdef ENABLE_TESTS
 DIRS += test
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/ipc/testshell/Makefile.in
+++ b/ipc/testshell/Makefile.in
@@ -59,17 +59,17 @@ EXPORTS_mozilla/ipc = \
 CPPSRCS += \
   TestShellChild.cpp \
   TestShellParent.cpp \
   XPCShellEnvironment.cpp \
   $(NULL)
 
 # For xpcshell error messages and nsDependentJSString
 LOCAL_INCLUDES += \
-  -I$(topsrcdir)/js/src/xpconnect/shell \
+  -I$(topsrcdir)/js/xpconnect/shell \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 ifneq ($(OS_ARCH),Darwin)
 XPCSHELL_TESTS = tests
 endif
 

rename from js/src/xpconnect/Makefile.in
rename to js/xpconnect/Makefile.in
--- a/js/src/xpconnect/Makefile.in
+++ b/js/xpconnect/Makefile.in
@@ -31,17 +31,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpconnect
 DIRS		= public idl wrappers loader src

rename from js/src/xpconnect/crashtests/117307-1.html
rename to js/xpconnect/crashtests/117307-1.html

rename from js/src/xpconnect/crashtests/193710.html
rename to js/xpconnect/crashtests/193710.html

rename from js/src/xpconnect/crashtests/290162-1.html
rename to js/xpconnect/crashtests/290162-1.html

rename from js/src/xpconnect/crashtests/326615-1.html
rename to js/xpconnect/crashtests/326615-1.html

rename from js/src/xpconnect/crashtests/328553-1.html
rename to js/xpconnect/crashtests/328553-1.html

rename from js/src/xpconnect/crashtests/346258-1.html
rename to js/xpconnect/crashtests/346258-1.html

rename from js/src/xpconnect/crashtests/346512-1-frame1.xhtml
rename to js/xpconnect/crashtests/346512-1-frame1.xhtml

rename from js/src/xpconnect/crashtests/346512-1-frame2.xhtml
rename to js/xpconnect/crashtests/346512-1-frame2.xhtml

rename from js/src/xpconnect/crashtests/346512-1.xhtml
rename to js/xpconnect/crashtests/346512-1.xhtml

rename from js/src/xpconnect/crashtests/382133-1.html
rename to js/xpconnect/crashtests/382133-1.html

rename from js/src/xpconnect/crashtests/386680-1.html
rename to js/xpconnect/crashtests/386680-1.html

rename from js/src/xpconnect/crashtests/394810-1.html
rename to js/xpconnect/crashtests/394810-1.html

rename from js/src/xpconnect/crashtests/400349-1.html
rename to js/xpconnect/crashtests/400349-1.html

rename from js/src/xpconnect/crashtests/403356-1.html
rename to js/xpconnect/crashtests/403356-1.html

rename from js/src/xpconnect/crashtests/418139-1.svg
rename to js/xpconnect/crashtests/418139-1.svg

rename from js/src/xpconnect/crashtests/420513-1.html
rename to js/xpconnect/crashtests/420513-1.html

rename from js/src/xpconnect/crashtests/453935-1.html
rename to js/xpconnect/crashtests/453935-1.html

rename from js/src/xpconnect/crashtests/462926.html
rename to js/xpconnect/crashtests/462926.html

rename from js/src/xpconnect/crashtests/467693-1.html
rename to js/xpconnect/crashtests/467693-1.html

rename from js/src/xpconnect/crashtests/468552-1.html
rename to js/xpconnect/crashtests/468552-1.html

rename from js/src/xpconnect/crashtests/471366-1.html
rename to js/xpconnect/crashtests/471366-1.html

rename from js/src/xpconnect/crashtests/475185-1.html
rename to js/xpconnect/crashtests/475185-1.html

rename from js/src/xpconnect/crashtests/475291-1.html
rename to js/xpconnect/crashtests/475291-1.html

rename from js/src/xpconnect/crashtests/503286-1.html
rename to js/xpconnect/crashtests/503286-1.html

rename from js/src/xpconnect/crashtests/504000-1.html
rename to js/xpconnect/crashtests/504000-1.html

rename from js/src/xpconnect/crashtests/509075-1.html
rename to js/xpconnect/crashtests/509075-1.html

rename from js/src/xpconnect/crashtests/512815-1.html
rename to js/xpconnect/crashtests/512815-1.html

rename from js/src/xpconnect/crashtests/515726-1.html
rename to js/xpconnect/crashtests/515726-1.html

rename from js/src/xpconnect/crashtests/545291-1.html
rename to js/xpconnect/crashtests/545291-1.html

rename from js/src/xpconnect/crashtests/558979.html
rename to js/xpconnect/crashtests/558979.html

rename from js/src/xpconnect/crashtests/582649.html
rename to js/xpconnect/crashtests/582649.html

rename from js/src/xpconnect/crashtests/601284-1.html
rename to js/xpconnect/crashtests/601284-1.html

rename from js/src/xpconnect/crashtests/603146-1.html
rename to js/xpconnect/crashtests/603146-1.html

rename from js/src/xpconnect/crashtests/603858-1.html
rename to js/xpconnect/crashtests/603858-1.html

rename from js/src/xpconnect/crashtests/608963.html
rename to js/xpconnect/crashtests/608963.html

rename from js/src/xpconnect/crashtests/616930-1.html
rename to js/xpconnect/crashtests/616930-1.html

rename from js/src/xpconnect/crashtests/639737-1.html
rename to js/xpconnect/crashtests/639737-1.html

rename from js/src/xpconnect/crashtests/648206-1.html
rename to js/xpconnect/crashtests/648206-1.html

rename from js/src/xpconnect/crashtests/crashtests.list
rename to js/xpconnect/crashtests/crashtests.list

rename from js/src/xpconnect/idl/Makefile.in
rename to js/xpconnect/idl/Makefile.in
--- a/js/src/xpconnect/idl/Makefile.in
+++ b/js/xpconnect/idl/Makefile.in
@@ -31,17 +31,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpconnect
 GRE_MODULE	= 1

rename from js/src/xpconnect/idl/mozIJSSubScriptLoader.idl
rename to js/xpconnect/idl/mozIJSSubScriptLoader.idl

rename from js/src/xpconnect/idl/nsIJSContextStack.idl
rename to js/xpconnect/idl/nsIJSContextStack.idl

rename from js/src/xpconnect/idl/nsIJSEngineTelemetryStats.idl
rename to js/xpconnect/idl/nsIJSEngineTelemetryStats.idl

rename from js/src/xpconnect/idl/nsIJSRuntimeService.idl
rename to js/xpconnect/idl/nsIJSRuntimeService.idl

rename from js/src/xpconnect/idl/nsIScriptError.idl
rename to js/xpconnect/idl/nsIScriptError.idl

rename from js/src/xpconnect/idl/nsIXPCScriptNotify.idl
rename to js/xpconnect/idl/nsIXPCScriptNotify.idl

rename from js/src/xpconnect/idl/nsIXPCScriptable.idl
rename to js/xpconnect/idl/nsIXPCScriptable.idl

rename from js/src/xpconnect/idl/nsIXPCSecurityManager.idl
rename to js/xpconnect/idl/nsIXPCSecurityManager.idl

rename from js/src/xpconnect/idl/nsIXPConnect.idl
rename to js/xpconnect/idl/nsIXPConnect.idl

rename from js/src/xpconnect/idl/xpcIJSGetFactory.idl
rename to js/xpconnect/idl/xpcIJSGetFactory.idl

rename from js/src/xpconnect/idl/xpcIJSModuleLoader.idl
rename to js/xpconnect/idl/xpcIJSModuleLoader.idl

rename from js/src/xpconnect/idl/xpcIJSWeakReference.idl
rename to js/xpconnect/idl/xpcIJSWeakReference.idl

rename from js/src/xpconnect/idl/xpccomponents.idl
rename to js/xpconnect/idl/xpccomponents.idl

rename from js/src/xpconnect/idl/xpcexception.idl
rename to js/xpconnect/idl/xpcexception.idl

rename from js/src/xpconnect/idl/xpcjsid.idl
rename to js/xpconnect/idl/xpcjsid.idl

rename from js/src/xpconnect/loader/Makefile.in
rename to js/xpconnect/loader/Makefile.in
--- a/js/src/xpconnect/loader/Makefile.in
+++ b/js/xpconnect/loader/Makefile.in
@@ -29,17 +29,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH 		= ../../../..
+DEPTH 		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= jsloader
 LIBRARY_NAME	= jsloader_s

rename from js/src/xpconnect/loader/XPCOMUtils.jsm
rename to js/xpconnect/loader/XPCOMUtils.jsm

rename from js/src/xpconnect/loader/mozJSComponentLoader.cpp
rename to js/xpconnect/loader/mozJSComponentLoader.cpp

rename from js/src/xpconnect/loader/mozJSComponentLoader.h
rename to js/xpconnect/loader/mozJSComponentLoader.h

rename from js/src/xpconnect/loader/mozJSLoaderUtils.cpp
rename to js/xpconnect/loader/mozJSLoaderUtils.cpp

rename from js/src/xpconnect/loader/mozJSLoaderUtils.h
rename to js/xpconnect/loader/mozJSLoaderUtils.h

rename from js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
rename to js/xpconnect/loader/mozJSSubScriptLoader.cpp

rename from js/src/xpconnect/loader/mozJSSubScriptLoader.h
rename to js/xpconnect/loader/mozJSSubScriptLoader.h

rename from js/src/xpconnect/public/Makefile.in
rename to js/xpconnect/public/Makefile.in
--- a/js/src/xpconnect/public/Makefile.in
+++ b/js/xpconnect/public/Makefile.in
@@ -31,17 +31,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpconnect
 

rename from js/src/xpconnect/public/nsAXPCNativeCallContext.h
rename to js/xpconnect/public/nsAXPCNativeCallContext.h

rename from js/src/xpconnect/public/nsAutoJSValHolder.h
rename to js/xpconnect/public/nsAutoJSValHolder.h

rename from js/src/xpconnect/public/xpc_map_end.h
rename to js/xpconnect/public/xpc_map_end.h

rename from js/src/xpconnect/shell/Makefile.in
rename to js/xpconnect/shell/Makefile.in
--- a/js/src/xpconnect/shell/Makefile.in
+++ b/js/xpconnect/shell/Makefile.in
@@ -31,17 +31,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcshell
 PROGRAM		= xpcshell$(BIN_SUFFIX)

rename from js/src/xpconnect/shell/jsshell.msg
rename to js/xpconnect/shell/jsshell.msg

rename from js/src/xpconnect/shell/xpcshell.cpp
rename to js/xpconnect/shell/xpcshell.cpp

rename from js/src/xpconnect/shell/xpcshellMacUtils.h
rename to js/xpconnect/shell/xpcshellMacUtils.h

rename from js/src/xpconnect/shell/xpcshellMacUtils.mm
rename to js/xpconnect/shell/xpcshellMacUtils.mm

rename from js/src/xpconnect/src/Makefile.in
rename to js/xpconnect/src/Makefile.in
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -32,17 +32,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpconnect
 
@@ -51,44 +51,44 @@ FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORTS = \
 		xpcpublic.h \
 		dombindings_gen.h
 
 CPPSRCS		= \
 		nsScriptError.cpp \
 		nsXPConnect.cpp \
-		xpccallcontext.cpp \
-		xpccomponents.cpp \
-		xpccontext.cpp \
-		xpcconvert.cpp \
-		xpcdebug.cpp \
-		xpcexception.cpp \
-		xpcjsid.cpp \
-		xpcjsruntime.cpp \
-		xpclocale.cpp \
-		xpclog.cpp \
-		xpcmaps.cpp \
-		xpcmodule.cpp \
-		xpcruntimesvc.cpp  \
-		xpcstack.cpp \
-		xpcstring.cpp \
-		xpcthreadcontext.cpp \
-		xpcthrower.cpp \
-		xpcwrappedjs.cpp \
-		xpcvariant.cpp \
-		xpcwrappedjsclass.cpp \
-		xpcwrappednative.cpp \
-		xpcwrappednativeinfo.cpp \
-		xpcwrappednativejsops.cpp \
-		xpcwrappednativeproto.cpp \
-		xpcwrappednativescope.cpp \
-		xpcJSWeakReference.cpp \
+		XPCCallContext.cpp \
+		XPCComponents.cpp \
+		XPCContext.cpp \
+		XPCConvert.cpp \
+		XPCDebug.cpp \
+		XPCException.cpp \
+		XPCJSID.cpp \
+		XPCJSRuntime.cpp \
+		XPCLocale.cpp \
+		XPCLog.cpp \
+		XPCMaps.cpp \
+		XPCModule.cpp \
+		XPCRuntimeService.cpp  \
+		XPCStack.cpp \
+		XPCString.cpp \
+		XPCThreadContext.cpp \
+		XPCThrower.cpp \
+		XPCWrappedJS.cpp \
+		XPCVariant.cpp \
+		XPCWrappedJSClass.cpp \
+		XPCWrappedNative.cpp \
+		XPCWrappedNativeInfo.cpp \
+		XPCWrappedNativeJSOps.cpp \
+		XPCWrappedNativeProto.cpp \
+		XPCWrappedNativeScope.cpp \
+		XPCJSWeakReference.cpp \
 		XPCWrapper.cpp \
-		xpcquickstubs.cpp \
+		XPCQuickStubs.cpp \
 		dom_quickstubs.cpp \
 		dombindings.cpp \
 		$(NULL)
 
 include $(topsrcdir)/config/config.mk
 
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../wrappers \

rename from js/src/xpconnect/src/README
rename to js/xpconnect/src/README

rename from js/src/xpconnect/src/xpccallcontext.cpp
rename to js/xpconnect/src/XPCCallContext.cpp

rename from js/src/xpconnect/src/xpccomponents.cpp
rename to js/xpconnect/src/XPCComponents.cpp
--- a/js/src/xpconnect/src/xpccomponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -42,17 +42,17 @@
 
 /* The "Components" xpcom objects for JavaScript. */
 
 #include "xpcprivate.h"
 #include "nsReadableUtils.h"
 #include "xpcIJSModuleLoader.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIDOMWindow.h"
-#include "xpcJSWeakReference.h"
+#include "XPCJSWeakReference.h"
 #include "XPCWrapper.h"
 #include "jsproxy.h"
 #include "WrapperFactory.h"
 #include "XrayWrapper.h"
 #include "nsNullPrincipal.h"
 #include "nsJSUtils.h"
 #include "mozJSComponentLoader.h"
 #include "nsContentUtils.h"

rename from js/src/xpconnect/src/xpccontext.cpp
rename to js/xpconnect/src/XPCContext.cpp

rename from js/src/xpconnect/src/xpcconvert.cpp
rename to js/xpconnect/src/XPCConvert.cpp

rename from js/src/xpconnect/src/xpcdebug.cpp
rename to js/xpconnect/src/XPCDebug.cpp

rename from js/src/xpconnect/src/xpcexception.cpp
rename to js/xpconnect/src/XPCException.cpp

rename from js/src/xpconnect/src/xpcforwards.h
rename to js/xpconnect/src/XPCForwards.h

rename from js/src/xpconnect/src/xpcinlines.h
rename to js/xpconnect/src/XPCInlines.h

rename from js/src/xpconnect/src/xpcjsid.cpp
rename to js/xpconnect/src/XPCJSID.cpp

rename from js/src/xpconnect/src/xpcjsruntime.cpp
rename to js/xpconnect/src/XPCJSRuntime.cpp

rename from js/src/xpconnect/src/xpcJSWeakReference.cpp
rename to js/xpconnect/src/XPCJSWeakReference.cpp
--- a/js/src/xpconnect/src/xpcJSWeakReference.cpp
+++ b/js/xpconnect/src/XPCJSWeakReference.cpp
@@ -31,17 +31,17 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "xpcprivate.h"
-#include "xpcJSWeakReference.h"
+#include "XPCJSWeakReference.h"
 
 xpcJSWeakReference::xpcJSWeakReference()
 {
 }
 
 NS_IMPL_ISUPPORTS1(xpcJSWeakReference, xpcIJSWeakReference)
 
 nsresult xpcJSWeakReference::Init()

rename from js/src/xpconnect/src/xpcJSWeakReference.h
rename to js/xpconnect/src/XPCJSWeakReference.h

rename from js/src/xpconnect/src/xpclocale.cpp
rename to js/xpconnect/src/XPCLocale.cpp

rename from js/src/xpconnect/src/xpclog.cpp
rename to js/xpconnect/src/XPCLog.cpp

rename from js/src/xpconnect/src/xpclog.h
rename to js/xpconnect/src/XPCLog.h

rename from js/src/xpconnect/src/xpcmaps.cpp
rename to js/xpconnect/src/XPCMaps.cpp

rename from js/src/xpconnect/src/xpcmaps.h
rename to js/xpconnect/src/XPCMaps.h

rename from js/src/xpconnect/src/xpcmodule.cpp
rename to js/xpconnect/src/XPCModule.cpp

rename from js/src/xpconnect/src/xpcmodule.h
rename to js/xpconnect/src/XPCModule.h

rename from js/src/xpconnect/src/xpcquickstubs.cpp
rename to js/xpconnect/src/XPCQuickStubs.cpp
--- a/js/src/xpconnect/src/xpcquickstubs.cpp
+++ b/js/xpconnect/src/XPCQuickStubs.cpp
@@ -36,18 +36,18 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "jsapi.h"
 #include "jscntxt.h"  /* for error messages */
 #include "nsCOMPtr.h"
 #include "xpcprivate.h"
-#include "xpcinlines.h"
-#include "xpcquickstubs.h"
+#include "XPCInlines.h"
+#include "XPCQuickStubs.h"
 #include "XPCWrapper.h"
 
 static inline QITableEntry *
 GetOffsets(nsISupports *identity, XPCWrappedNativeProto* proto)
 {
     QITableEntry* offsets = proto ? proto->GetOffsets() : nsnull;
     if(!offsets)
     {

rename from js/src/xpconnect/src/xpcquickstubs.h
rename to js/xpconnect/src/XPCQuickStubs.h
--- a/js/src/xpconnect/src/xpcquickstubs.h
+++ b/js/xpconnect/src/XPCQuickStubs.h
@@ -37,17 +37,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef xpcquickstubs_h___
 #define xpcquickstubs_h___
 
 #include "nsINode.h"
 
-/* xpcquickstubs.h - Support functions used only by quick stubs. */
+/* XPCQuickStubs.h - Support functions used only by quick stubs. */
 
 class XPCCallContext;
 
 #define XPC_QS_NULL_INDEX  ((size_t) -1)
 
 struct xpc_qsPropertySpec {
     const char *name;
     JSPropertyOp getter;

rename from js/src/xpconnect/src/xpcruntimesvc.cpp
rename to js/xpconnect/src/XPCRuntimeService.cpp

rename from js/src/xpconnect/src/xpcstack.cpp
rename to js/xpconnect/src/XPCStack.cpp

rename from js/src/xpconnect/src/xpcstring.cpp
rename to js/xpconnect/src/XPCString.cpp

rename from js/src/xpconnect/src/xpcthreadcontext.cpp
rename to js/xpconnect/src/XPCThreadContext.cpp

rename from js/src/xpconnect/src/xpcthrower.cpp
rename to js/xpconnect/src/XPCThrower.cpp

rename from js/src/xpconnect/src/xpcvariant.cpp
rename to js/xpconnect/src/XPCVariant.cpp

rename from js/src/xpconnect/src/xpcwrappedjs.cpp
rename to js/xpconnect/src/XPCWrappedJS.cpp

rename from js/src/xpconnect/src/xpcwrappedjsclass.cpp
rename to js/xpconnect/src/XPCWrappedJSClass.cpp

rename from js/src/xpconnect/src/xpcwrappednative.cpp
rename to js/xpconnect/src/XPCWrappedNative.cpp
--- a/js/src/xpconnect/src/xpcwrappednative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -40,19 +40,19 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* Wrapper object for reflecting native xpcom objects into JavaScript. */
 
 #include "xpcprivate.h"
 #include "nsCRT.h"
 #include "XPCWrapper.h"
 #include "nsWrapperCacheInlines.h"
-#include "xpclog.h"
+#include "XPCLog.h"
 #include "nsINode.h"
-#include "xpcquickstubs.h"
+#include "XPCQuickStubs.h"
 #include "jsproxy.h"
 #include "AccessCheck.h"
 #include "WrapperFactory.h"
 #include "dombindings.h"
 
 bool
 xpc_OkToHandOutWrapper(nsWrapperCache *cache)
 {

rename from js/src/xpconnect/src/xpcwrappednativeinfo.cpp
rename to js/xpconnect/src/XPCWrappedNativeInfo.cpp

rename from js/src/xpconnect/src/xpcwrappednativejsops.cpp
rename to js/xpconnect/src/XPCWrappedNativeJSOps.cpp

rename from js/src/xpconnect/src/xpcwrappednativeproto.cpp
rename to js/xpconnect/src/XPCWrappedNativeProto.cpp

rename from js/src/xpconnect/src/xpcwrappednativescope.cpp
rename to js/xpconnect/src/XPCWrappedNativeScope.cpp

rename from js/src/xpconnect/src/XPCWrapper.cpp
rename to js/xpconnect/src/XPCWrapper.cpp

rename from js/src/xpconnect/src/XPCWrapper.h
rename to js/xpconnect/src/XPCWrapper.h

rename from js/src/xpconnect/src/codegen.py
rename to js/xpconnect/src/codegen.py

rename from js/src/xpconnect/src/dom_quickstubs.qsconf
rename to js/xpconnect/src/dom_quickstubs.qsconf

rename from js/src/xpconnect/src/dombindings.conf
rename to js/xpconnect/src/dombindings.conf

rename from js/src/xpconnect/src/dombindings.cpp
rename to js/xpconnect/src/dombindings.cpp
--- a/js/src/xpconnect/src/dombindings.cpp
+++ b/js/xpconnect/src/dombindings.cpp
@@ -34,17 +34,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "dombindings.h"
 #include "xpcprivate.h"
-#include "xpcquickstubs.h"
+#include "XPCQuickStubs.h"
 #include "XPCWrapper.h"
 #include "WrapperFactory.h"
 #include "nsDOMClassInfo.h"
 #include "nsGlobalWindow.h"
 #include "jsiter.h"
 #include "nsWrapperCacheInlines.h"
 
 using namespace js;

rename from js/src/xpconnect/src/dombindings.h
rename to js/xpconnect/src/dombindings.h

rename from js/src/xpconnect/src/dombindingsgen.py
rename to js/xpconnect/src/dombindingsgen.py

rename from js/src/xpconnect/src/nsCSSPropertiesQS.h
rename to js/xpconnect/src/nsCSSPropertiesQS.h

rename from js/src/xpconnect/src/nsDOMQS.h
rename to js/xpconnect/src/nsDOMQS.h

rename from js/src/xpconnect/src/nsScriptError.cpp
rename to js/xpconnect/src/nsScriptError.cpp

rename from js/src/xpconnect/src/nsXPConnect.cpp
rename to js/xpconnect/src/nsXPConnect.cpp
--- a/js/src/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -60,17 +60,17 @@
 #include "plbase64.h"
 
 #include "XrayWrapper.h"
 #include "WrapperFactory.h"
 #include "AccessCheck.h"
 
 #include "jsdIDebuggerService.h"
 
-#include "xpcquickstubs.h"
+#include "XPCQuickStubs.h"
 #include "dombindings.h"
 #include "nsWrapperCacheInlines.h"
 
 NS_IMPL_THREADSAFE_ISUPPORTS7(nsXPConnect,
                               nsIXPConnect,
                               nsISupportsWeakReference,
                               nsIThreadObserver,
                               nsIJSRuntimeService,
@@ -231,17 +231,17 @@ nsXPConnect::ReleaseXPConnectSingleton()
                             fclose(dumpFile);
                     }
                 }
             }
         }
 #endif
 #ifdef XPC_DUMP_AT_SHUTDOWN
         // NOTE: to see really interesting stuff turn on the prlog stuff.
-        // See the comment at the top of xpclog.h to see how to do that.
+        // See the comment at the top of XPCLog.h to see how to do that.
         xpc->DebugDump(7);
 #endif
         nsrefcnt cnt;
         NS_RELEASE2(xpc, cnt);
 #ifdef XPC_DUMP_AT_SHUTDOWN
         if(0 != cnt)
             printf("*** dangling reference to nsXPConnect: refcnt=%d\n", cnt);
         else

rename from js/src/xpconnect/src/qsWinUndefs.h
rename to js/xpconnect/src/qsWinUndefs.h

rename from js/src/xpconnect/src/qsgen.py
rename to js/xpconnect/src/qsgen.py
--- a/js/src/xpconnect/src/qsgen.py
+++ b/js/xpconnect/src/qsgen.py
@@ -1696,17 +1696,17 @@ stubTopTemplate = '''\
 #include "qsWinUndefs.h"
 #include "prtypes.h"
 #include "nsID.h"
 #include "%s"
 #include "nscore.h"
 #include "nsCOMPtr.h"
 #include "nsDependentString.h"
 #include "xpcprivate.h"  // for XPCCallContext
-#include "xpcquickstubs.h"
+#include "XPCQuickStubs.h"
 #include "nsWrapperCacheInlines.h"
 #include "jsbuiltins.h"
 '''
 
 def writeStubFile(filename, headerFilename, conf, interfaces):
     print "Creating stub file", filename
     make_targets.append(filename)
 

rename from js/src/xpconnect/src/xpc.msg
rename to js/xpconnect/src/xpc.msg

rename from js/src/xpconnect/src/xpcprivate.h
rename to js/xpconnect/src/xpcprivate.h
--- a/js/src/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -78,18 +78,18 @@
 #include "nsIInterfaceInfoManager.h"
 #include "nsIXPCScriptable.h"
 #include "nsIXPCSecurityManager.h"
 #include "nsIJSRuntimeService.h"
 #include "nsWeakReference.h"
 #include "nsCOMPtr.h"
 #include "nsXPTCUtils.h"
 #include "xptinfo.h"
-#include "xpcforwards.h"
-#include "xpclog.h"
+#include "XPCForwards.h"
+#include "XPCLog.h"
 #include "xpccomponents.h"
 #include "xpcexception.h"
 #include "xpcjsid.h"
 #include "prlong.h"
 #include "prmem.h"
 #include "prenv.h"
 #include "prclist.h"
 #include "nsString.h"
@@ -4531,18 +4531,18 @@ ParticipatesInCycleCollection(JSContext 
     return CompartmentParticipatesInCycleCollection(cx, cell->compartment());
 }
 
 }
 
 /***************************************************************************/
 // Inlines use the above - include last.
 
-#include "xpcinlines.h"
+#include "XPCInlines.h"
 
 /***************************************************************************/
 // Maps have inlines that use the above - include last.
 
-#include "xpcmaps.h"
+#include "XPCMaps.h"
 
 /***************************************************************************/
 
 #endif /* xpcprivate_h___ */

rename from js/src/xpconnect/src/xpcpublic.h
rename to js/xpconnect/src/xpcpublic.h

rename from js/src/xpconnect/tests/Makefile.in
rename to js/xpconnect/tests/Makefile.in
--- a/js/src/xpconnect/tests/Makefile.in
+++ b/js/xpconnect/tests/Makefile.in
@@ -31,21 +31,21 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH = ../../../..
+DEPTH = ../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = js/src/xpconnect/tests
+relativesrcdir = js/xpconnect/tests
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS = idl mochitest chrome components/native components/js
 
 XPCSHELL_TESTS = unit
 
 LIBS = \

rename from js/src/xpconnect/tests/chrome/Makefile.in
rename to js/xpconnect/tests/chrome/Makefile.in
--- a/js/src/xpconnect/tests/chrome/Makefile.in
+++ b/js/xpconnect/tests/chrome/Makefile.in
@@ -29,21 +29,21 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH     = ../../../../..
+DEPTH     = ../../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = js/src/xpconnect/tests/chrome
+relativesrcdir  = js/xpconnect/tests/chrome
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _CHROME_FILES = \
 		test_bug448587.xul \
 		test_bug500931.xul \
 		bug503926.xul \

rename from js/src/xpconnect/tests/chrome/bug503926.xul
rename to js/xpconnect/tests/chrome/bug503926.xul

rename from js/src/xpconnect/tests/chrome/file_bug618176.xul
rename to js/xpconnect/tests/chrome/file_bug618176.xul

rename from js/src/xpconnect/tests/chrome/file_evalInSandbox.html
rename to js/xpconnect/tests/chrome/file_evalInSandbox.html

rename from js/src/xpconnect/tests/chrome/test_APIExposer.xul
rename to js/xpconnect/tests/chrome/test_APIExposer.xul

rename from js/src/xpconnect/tests/chrome/test_bug448587.xul
rename to js/xpconnect/tests/chrome/test_bug448587.xul

rename from js/src/xpconnect/tests/chrome/test_bug484459.xul
rename to js/xpconnect/tests/chrome/test_bug484459.xul

rename from js/src/xpconnect/tests/chrome/test_bug500931.xul
rename to js/xpconnect/tests/chrome/test_bug500931.xul
--- a/js/src/xpconnect/tests/chrome/test_bug500931.xul
+++ b/js/xpconnect/tests/chrome/test_bug500931.xul
@@ -29,13 +29,13 @@ https://bugzilla.mozilla.org/show_bug.cg
     ok(weak.get().toString().indexOf("XrayWrapper") >= 0, "weak reference returns a wrapper");
     SimpleTest.finish();
   }
 
   SimpleTest.waitForExplicitFinish();
 
   ]]></script>
   <iframe type="content"
-          src="http://example.org/tests/js/src/xpconnect/tests/mochitest/bug500931_helper.html"
+          src="http://example.org/tests/js/xpconnect/tests/mochitest/bug500931_helper.html"
           onload="go()"
           id="ifr">
   </iframe>
 </window>

rename from js/src/xpconnect/tests/chrome/test_bug503926.xul
rename to js/xpconnect/tests/chrome/test_bug503926.xul

rename from js/src/xpconnect/tests/chrome/test_bug517163.xul
rename to js/xpconnect/tests/chrome/test_bug517163.xul

rename from js/src/xpconnect/tests/chrome/test_bug533596.xul
rename to js/xpconnect/tests/chrome/test_bug533596.xul
--- a/js/src/xpconnect/tests/chrome/test_bug533596.xul
+++ b/js/xpconnect/tests/chrome/test_bug533596.xul
@@ -44,13 +44,13 @@ https://bugzilla.mozilla.org/show_bug.cg
        "unwrapping a chrome object returns the object itself");
     SimpleTest.finish();
   }
 
   SimpleTest.waitForExplicitFinish();
 
   ]]></script>
   <iframe type="content"
-          src="http://example.org/tests/js/src/xpconnect/tests/mochitest/bug500931_helper.html"
+          src="http://example.org/tests/js/xpconnect/tests/mochitest/bug500931_helper.html"
           onload="go()"
           id="ifr">
   </iframe>
 </window>

rename from js/src/xpconnect/tests/chrome/test_bug571849.xul
rename to js/xpconnect/tests/chrome/test_bug571849.xul
--- a/js/src/xpconnect/tests/chrome/test_bug571849.xul
+++ b/js/xpconnect/tests/chrome/test_bug571849.xul
@@ -30,14 +30,14 @@ https://bugzilla.mozilla.org/show_bug.cg
     ok(/Text/.test(output[1]), "the 0th element was a text node");
     SimpleTest.finish();
   }
 
   SimpleTest.waitForExplicitFinish();
 
   ]]></script>
   <iframe type="content"
-          src="http://example.org/tests/js/src/xpconnect/tests/mochitest/bug571849_helper.html"
+          src="http://example.org/tests/js/xpconnect/tests/mochitest/bug571849_helper.html"
           onload="go()"
           id="ifr">
   </iframe>
   </body>
 </window>

rename from js/src/xpconnect/tests/chrome/test_bug596580.xul
rename to js/xpconnect/tests/chrome/test_bug596580.xul

rename from js/src/xpconnect/tests/chrome/test_bug601803.xul
rename to js/xpconnect/tests/chrome/test_bug601803.xul

rename from js/src/xpconnect/tests/chrome/test_bug610390.xul
rename to js/xpconnect/tests/chrome/test_bug610390.xul

rename from js/src/xpconnect/tests/chrome/test_bug614757.xul
rename to js/xpconnect/tests/chrome/test_bug614757.xul
--- a/js/src/xpconnect/tests/chrome/test_bug614757.xul
+++ b/js/xpconnect/tests/chrome/test_bug614757.xul
@@ -24,11 +24,11 @@ https://bugzilla.mozilla.org/show_bug.cg
     is($('ifr').contentDocument.wrappedJSObject.getElementsByTagName('body')[0].toString().indexOf('Xray'),
        -1, "Properly deep wrap");
     SimpleTest.finish();
   }
 
   SimpleTest.waitForExplicitFinish();
 
   ]]></script>
-  <iframe type="content" src="http://mochi.test:8888/tests/js/src/xpconnect/tests/mochitest/file_evalInSandbox.html" onload="go()" id="ifr" />
+  <iframe type="content" src="http://mochi.test:8888/tests/js/xpconnect/tests/mochitest/file_evalInSandbox.html" onload="go()" id="ifr" />
   </body>
 </window>

rename from js/src/xpconnect/tests/chrome/test_bug616992.xul
rename to js/xpconnect/tests/chrome/test_bug616992.xul

rename from js/src/xpconnect/tests/chrome/test_bug618176.xul
rename to js/xpconnect/tests/chrome/test_bug618176.xul

rename from js/src/xpconnect/tests/chrome/test_bug654370.xul
rename to js/xpconnect/tests/chrome/test_bug654370.xul

rename from js/src/xpconnect/tests/chrome/test_bug658560.xul
rename to js/xpconnect/tests/chrome/test_bug658560.xul
--- a/js/src/xpconnect/tests/chrome/test_bug658560.xul
+++ b/js/xpconnect/tests/chrome/test_bug658560.xul
@@ -27,13 +27,13 @@ https://bugzilla.mozilla.org/show_bug.cg
 
         is(win.foo, o, "should have === identity through a CrossOriginWrapper");
         SimpleTest.finish();
       }
 
   ]]></script>
 
   <iframe
-      src="http://example.org/tests/js/src/xpconnect/tests/mochitest/file_bug658560.html"
+      src="http://example.org/tests/js/xpconnect/tests/mochitest/file_bug658560.html"
           id="ifr"
           type="content"
           onload="go()" />
 </window>

rename from js/src/xpconnect/tests/chrome/test_bug664689.xul
rename to js/xpconnect/tests/chrome/test_bug664689.xul

rename from js/src/xpconnect/tests/chrome/test_bug679861.xul
rename to js/xpconnect/tests/chrome/test_bug679861.xul

rename from js/src/xpconnect/tests/chrome/test_cows.xul
rename to js/xpconnect/tests/chrome/test_cows.xul

rename from js/src/xpconnect/tests/chrome/test_doublewrappedcompartments.xul
rename to js/xpconnect/tests/chrome/test_doublewrappedcompartments.xul
--- a/js/src/xpconnect/tests/chrome/test_doublewrappedcompartments.xul
+++ b/js/xpconnect/tests/chrome/test_doublewrappedcompartments.xul
@@ -9,17 +9,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
   <!-- test results are displayed in the html:body -->
   <body xmlns="http://www.w3.org/1999/xhtml">
 
   <iframe type="content"
-          src="http://example.org/tests/js/src/xpconnect/tests/mochitest/file_doublewrappedcompartments.html"
+          src="http://example.org/tests/js/xpconnect/tests/mochitest/file_doublewrappedcompartments.html"
           onload="go()"
           id="ifr">
   </iframe>
   </body>
 
   <!-- test code goes here -->
   <script type="application/javascript"><![CDATA[
       const Ci = Components.interfaces;

rename from js/src/xpconnect/tests/chrome/test_evalInSandbox.xul
rename to js/xpconnect/tests/chrome/test_evalInSandbox.xul
--- a/js/src/xpconnect/tests/chrome/test_evalInSandbox.xul
+++ b/js/xpconnect/tests/chrome/test_evalInSandbox.xul
@@ -8,20 +8,20 @@ https://bugzilla.mozilla.org/show_bug.cg
 <window title="Mozilla Bug 533596"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
   <!-- test results are displayed in the html:body -->
   <body xmlns="http://www.w3.org/1999/xhtml">
 
-  <iframe src="http://example.org/tests/js/src/xpconnect/tests/mochitest/file_evalInSandbox.html"
+  <iframe src="http://example.org/tests/js/xpconnect/tests/mochitest/file_evalInSandbox.html"
           onload="checkCrossOrigin(this)">
   </iframe>
-  <iframe src="chrome://mochitests/content/chrome/js/src/xpconnect/tests/chrome/file_evalInSandbox.html"
+  <iframe src="chrome://mochitests/content/chrome/js/xpconnect/tests/chrome/file_evalInSandbox.html"
           onload="checkSameOrigin(this)">
   </iframe>
   </body>
 
   <!-- test code goes here -->
   <script type="application/javascript"><![CDATA[
       const Cu = Components.utils;
       const Ci = Components.interfaces;

rename from js/src/xpconnect/tests/chrome/test_getweakmapkeys.xul
rename to js/xpconnect/tests/chrome/test_getweakmapkeys.xul

rename from js/src/xpconnect/tests/chrome/test_nodelists.xul
rename to js/xpconnect/tests/chrome/test_nodelists.xul
--- a/js/src/xpconnect/tests/chrome/test_nodelists.xul
+++ b/js/xpconnect/tests/chrome/test_nodelists.xul
@@ -32,11 +32,11 @@
         is(win.document.body.removeChild(win.document.body.lastChild), list2, "remove last paragraph element");
         ok(!("2" in list), "in operator doesn't see phantom element");
         is(list[2], undefined, "no node there!");
         SimpleTest.finish();
       }
   ]]></script>
 
   <iframe id="ifr"
-          src="http://mochi.test:8888/tests/js/src/xpconnect/tests/mochitest/file_nodelists.html"
+          src="http://mochi.test:8888/tests/js/xpconnect/tests/mochitest/file_nodelists.html"
           onload="go()" />
 </window>

rename from js/src/xpconnect/tests/chrome/test_precisegc.xul
rename to js/xpconnect/tests/chrome/test_precisegc.xul

rename from js/src/xpconnect/tests/chrome/test_sandboxImport.xul
rename to js/xpconnect/tests/chrome/test_sandboxImport.xul

rename from js/src/xpconnect/tests/chrome/test_wrappers-2.xul
rename to js/xpconnect/tests/chrome/test_wrappers-2.xul
--- a/js/src/xpconnect/tests/chrome/test_wrappers-2.xul
+++ b/js/xpconnect/tests/chrome/test_wrappers-2.xul
@@ -203,13 +203,13 @@ https://bugzilla.mozilla.org/show_bug.cg
         ok(false, "Allowed to wrap E4X in SJOWs?");
     } catch (e) {
     }
 
     SimpleTest.finish();
   }
   ]]></script>
   <iframe type="content"
-          src="http://mochi.test:8888/tests/js/src/xpconnect/tests/mochitest/file_wrappers-2.html"
+          src="http://mochi.test:8888/tests/js/xpconnect/tests/mochitest/file_wrappers-2.html"
           onload="go()"
           id="ifr">
   </iframe>
 </window>

rename from js/src/xpconnect/tests/chrome/test_wrappers.xul
rename to js/xpconnect/tests/chrome/test_wrappers.xul
--- a/js/src/xpconnect/tests/chrome/test_wrappers.xul
+++ b/js/xpconnect/tests/chrome/test_wrappers.xul
@@ -24,17 +24,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   function go() {
     var win = $('ifr').contentWindow;
     var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
                       .getInterface(Components.interfaces.nsIDOMWindowUtils);
     is(utils.getClassName(window), "Proxy", "our window is wrapped correctly")
     is(utils.getClassName(location), "Proxy", "our location is wrapped correctly")
     is(utils.getClassName(win), "Proxy", "win is an Proxy");
     is(utils.getClassName(win.location), "Proxy", "deep wrapping works");
-    is(win.location.href, "http://example.org/tests/js/src/xpconnect/tests/mochitest/chrome_wrappers_helper.html",
+    is(win.location.href, "http://example.org/tests/js/xpconnect/tests/mochitest/chrome_wrappers_helper.html",
        "can still get strings out");
 
     var unsafeWin = win.wrappedJSObject;
     is(utils.getClassName(unsafeWin), "Proxy", "can get a Proxy");
     is(utils.getClassName(unsafeWin.location), "Proxy", "deep wrapping works");
 
     Object.defineProperty(unsafeWin, "defprop1", { value: 1, writable: true, enumerable: true });
     /* TODO (bug 552854): the getter isn't visible in content.
@@ -61,13 +61,13 @@ https://bugzilla.mozilla.org/show_bug.cg
    ok(win.XPathEvaluator.toString().indexOf("XPathEvaluator") >= 0,
       "Can access content window.XPathEvaluator");
   }
 
   SimpleTest.waitForExplicitFinish();
 
   ]]></script>
   <iframe type="content"
-          src="http://example.org/tests/js/src/xpconnect/tests/mochitest/chrome_wrappers_helper.html"
+          src="http://example.org/tests/js/xpconnect/tests/mochitest/chrome_wrappers_helper.html"
           onload="go()"
           id="ifr">
   </iframe>
 </window>

rename from js/src/xpconnect/tests/components/js/Makefile.in
rename to js/xpconnect/tests/components/js/Makefile.in
--- a/js/src/xpconnect/tests/components/js/Makefile.in
+++ b/js/xpconnect/tests/components/js/Makefile.in
@@ -30,17 +30,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH = ../../../../../..
+DEPTH = ../../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = xpctest
 LIBRARY_NAME = xpctest
@@ -54,15 +54,15 @@ JS_FILES = \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 
 MANIFEST_FILE = xpctest.manifest
 
 include $(topsrcdir)/config/rules.mk
 
-componentdir = js/src/xpconnect/tests/components/js
+componentdir = js/xpconnect/tests/components/js
 
 libs:: $(JS_FILES)
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)
 
 libs:: $(MANIFEST_FILE)
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $< > $(testxpcobjdir)/$(componentdir)/$(<F)