rename from accessible/src/atk/ARIAGridAccessibleWrap.h
rename to accessible/atk/ARIAGridAccessibleWrap.h

rename from accessible/src/atk/AccessibleWrap.cpp
rename to accessible/atk/AccessibleWrap.cpp

rename from accessible/src/atk/AccessibleWrap.h
rename to accessible/atk/AccessibleWrap.h

rename from accessible/src/atk/ApplicationAccessibleWrap.cpp
rename to accessible/atk/ApplicationAccessibleWrap.cpp

rename from accessible/src/atk/ApplicationAccessibleWrap.h
rename to accessible/atk/ApplicationAccessibleWrap.h

rename from accessible/src/atk/AtkSocketAccessible.cpp
rename to accessible/atk/AtkSocketAccessible.cpp

rename from accessible/src/atk/AtkSocketAccessible.h
rename to accessible/atk/AtkSocketAccessible.h

rename from accessible/src/atk/DocAccessibleWrap.cpp
rename to accessible/atk/DocAccessibleWrap.cpp

rename from accessible/src/atk/DocAccessibleWrap.h
rename to accessible/atk/DocAccessibleWrap.h

rename from accessible/src/atk/HTMLTableAccessibleWrap.h
rename to accessible/atk/HTMLTableAccessibleWrap.h

rename from accessible/src/atk/HyperTextAccessibleWrap.h
rename to accessible/atk/HyperTextAccessibleWrap.h

rename from accessible/src/atk/ImageAccessibleWrap.h
rename to accessible/atk/ImageAccessibleWrap.h

rename from accessible/src/atk/InterfaceInitFuncs.h
rename to accessible/atk/InterfaceInitFuncs.h

rename from accessible/src/atk/Makefile.in
rename to accessible/atk/Makefile.in

rename from accessible/src/atk/Platform.cpp
rename to accessible/atk/Platform.cpp

rename from accessible/src/atk/RootAccessibleWrap.cpp
rename to accessible/atk/RootAccessibleWrap.cpp

rename from accessible/src/atk/RootAccessibleWrap.h
rename to accessible/atk/RootAccessibleWrap.h

rename from accessible/src/atk/TextLeafAccessibleWrap.h
rename to accessible/atk/TextLeafAccessibleWrap.h

rename from accessible/src/atk/UtilInterface.cpp
rename to accessible/atk/UtilInterface.cpp

rename from accessible/src/atk/XULListboxAccessibleWrap.h
rename to accessible/atk/XULListboxAccessibleWrap.h

rename from accessible/src/atk/XULMenuAccessibleWrap.h
rename to accessible/atk/XULMenuAccessibleWrap.h

rename from accessible/src/atk/XULTreeGridAccessibleWrap.h
rename to accessible/atk/XULTreeGridAccessibleWrap.h

rename from accessible/src/atk/moz.build
rename to accessible/atk/moz.build
--- a/accessible/src/atk/moz.build
+++ b/accessible/atk/moz.build
@@ -27,17 +27,17 @@ SOURCES += [
     'nsMaiInterfaceText.cpp',
     'nsMaiInterfaceValue.cpp',
     'Platform.cpp',
     'RootAccessibleWrap.cpp',
     'UtilInterface.cpp',
 ]
 
 LOCAL_INCLUDES += [
-    '../base',
-    '../generic',
-    '../html',
-    '../xpcom',
-    '../xul',
+    '/accessible/base',
+    '/accessible/generic',
+    '/accessible/html',
+    '/accessible/xpcom',
+    '/accessible/xul',
     '/other-licenses/atk-1.0',
 ]
 
 FINAL_LIBRARY = 'xul'

rename from accessible/src/atk/nsMai.h
rename to accessible/atk/nsMai.h

rename from accessible/src/atk/nsMaiHyperlink.cpp
rename to accessible/atk/nsMaiHyperlink.cpp

rename from accessible/src/atk/nsMaiHyperlink.h
rename to accessible/atk/nsMaiHyperlink.h

rename from accessible/src/atk/nsMaiInterfaceAction.cpp
rename to accessible/atk/nsMaiInterfaceAction.cpp

rename from accessible/src/atk/nsMaiInterfaceComponent.cpp
rename to accessible/atk/nsMaiInterfaceComponent.cpp

rename from accessible/src/atk/nsMaiInterfaceDocument.cpp
rename to accessible/atk/nsMaiInterfaceDocument.cpp

rename from accessible/src/atk/nsMaiInterfaceEditableText.cpp
rename to accessible/atk/nsMaiInterfaceEditableText.cpp

rename from accessible/src/atk/nsMaiInterfaceHyperlinkImpl.cpp
rename to accessible/atk/nsMaiInterfaceHyperlinkImpl.cpp

rename from accessible/src/atk/nsMaiInterfaceHypertext.cpp
rename to accessible/atk/nsMaiInterfaceHypertext.cpp

rename from accessible/src/atk/nsMaiInterfaceImage.cpp
rename to accessible/atk/nsMaiInterfaceImage.cpp

rename from accessible/src/atk/nsMaiInterfaceSelection.cpp
rename to accessible/atk/nsMaiInterfaceSelection.cpp

rename from accessible/src/atk/nsMaiInterfaceTable.cpp
rename to accessible/atk/nsMaiInterfaceTable.cpp

rename from accessible/src/atk/nsMaiInterfaceText.cpp
rename to accessible/atk/nsMaiInterfaceText.cpp

rename from accessible/src/atk/nsMaiInterfaceValue.cpp
rename to accessible/atk/nsMaiInterfaceValue.cpp

rename from accessible/src/atk/nsStateMap.h
rename to accessible/atk/nsStateMap.h

rename from accessible/src/base/ARIAMap.cpp
rename to accessible/base/ARIAMap.cpp

rename from accessible/src/base/ARIAMap.h
rename to accessible/base/ARIAMap.h

rename from accessible/src/base/ARIAStateMap.cpp
rename to accessible/base/ARIAStateMap.cpp

rename from accessible/src/base/ARIAStateMap.h
rename to accessible/base/ARIAStateMap.h

rename from accessible/src/base/AccCollector.cpp
rename to accessible/base/AccCollector.cpp

rename from accessible/src/base/AccCollector.h
rename to accessible/base/AccCollector.h

rename from accessible/src/base/AccEvent.cpp
rename to accessible/base/AccEvent.cpp

rename from accessible/src/base/AccEvent.h
rename to accessible/base/AccEvent.h

rename from accessible/src/base/AccGroupInfo.cpp
rename to accessible/base/AccGroupInfo.cpp

rename from accessible/src/base/AccGroupInfo.h
rename to accessible/base/AccGroupInfo.h

rename from accessible/src/base/AccIterator.cpp
rename to accessible/base/AccIterator.cpp

rename from accessible/src/base/AccIterator.h
rename to accessible/base/AccIterator.h

rename from accessible/src/base/AccTypes.h
rename to accessible/base/AccTypes.h

rename from accessible/src/base/Asserts.cpp
rename to accessible/base/Asserts.cpp

rename from accessible/src/base/DocManager.cpp
rename to accessible/base/DocManager.cpp

rename from accessible/src/base/DocManager.h
rename to accessible/base/DocManager.h

rename from accessible/src/base/EventQueue.cpp
rename to accessible/base/EventQueue.cpp

rename from accessible/src/base/EventQueue.h
rename to accessible/base/EventQueue.h

rename from accessible/src/base/Filters.cpp
rename to accessible/base/Filters.cpp

rename from accessible/src/base/Filters.h
rename to accessible/base/Filters.h

rename from accessible/src/base/FocusManager.cpp
rename to accessible/base/FocusManager.cpp

rename from accessible/src/base/FocusManager.h
rename to accessible/base/FocusManager.h

rename from accessible/src/base/Logging.cpp
rename to accessible/base/Logging.cpp

rename from accessible/src/base/Logging.h
rename to accessible/base/Logging.h

rename from accessible/src/base/Makefile.in
rename to accessible/base/Makefile.in

rename from accessible/src/base/NotificationController.cpp
rename to accessible/base/NotificationController.cpp

rename from accessible/src/base/NotificationController.h
rename to accessible/base/NotificationController.h

rename from accessible/src/base/Platform.h
rename to accessible/base/Platform.h

rename from accessible/src/base/Relation.h
rename to accessible/base/Relation.h

rename from accessible/src/base/RelationType.h
rename to accessible/base/RelationType.h

rename from accessible/src/base/RelationTypeMap.h
rename to accessible/base/RelationTypeMap.h

rename from accessible/src/base/Role.h
rename to accessible/base/Role.h

rename from accessible/src/base/RoleMap.h
rename to accessible/base/RoleMap.h

rename from accessible/src/base/SelectionManager.cpp
rename to accessible/base/SelectionManager.cpp

rename from accessible/src/base/SelectionManager.h
rename to accessible/base/SelectionManager.h

rename from accessible/src/base/States.h
rename to accessible/base/States.h

rename from accessible/src/base/Statistics.h
rename to accessible/base/Statistics.h

rename from accessible/src/base/StyleInfo.cpp
rename to accessible/base/StyleInfo.cpp

rename from accessible/src/base/StyleInfo.h
rename to accessible/base/StyleInfo.h

rename from accessible/src/base/TextAttrs.cpp
rename to accessible/base/TextAttrs.cpp

rename from accessible/src/base/TextAttrs.h
rename to accessible/base/TextAttrs.h

rename from accessible/src/base/TextRange.cpp
rename to accessible/base/TextRange.cpp

rename from accessible/src/base/TextRange.h
rename to accessible/base/TextRange.h

rename from accessible/src/base/TextUpdater.cpp
rename to accessible/base/TextUpdater.cpp

rename from accessible/src/base/TextUpdater.h
rename to accessible/base/TextUpdater.h

rename from accessible/src/base/TreeWalker.cpp
rename to accessible/base/TreeWalker.cpp

rename from accessible/src/base/TreeWalker.h
rename to accessible/base/TreeWalker.h

rename from accessible/src/base/moz.build
rename to accessible/base/moz.build
--- a/accessible/src/base/moz.build
+++ b/accessible/base/moz.build
@@ -53,40 +53,40 @@ UNIFIED_SOURCES += [
 ]
 
 if CONFIG['A11Y_LOG']:
     UNIFIED_SOURCES += [
         'Logging.cpp',
     ]
 
 LOCAL_INCLUDES += [
-    '../generic',
-    '../html',
-    '../xpcom',
-    '../xul',
+    '/accessible/generic',
+    '/accessible/html',
+    '/accessible/xpcom',
+    '/accessible/xul',
     '/dom/xbl',
     '/ipc/chromium/src',
     '/layout/generic',
     '/layout/style',
     '/layout/svg',
     '/layout/xul',
     '/layout/xul/tree/',
 ]
 
 if CONFIG['MOZ_ENABLE_GTK']:
     LOCAL_INCLUDES += [
-        '../atk',
+        '/accessible/atk',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     LOCAL_INCLUDES += [
-        '../windows/ia2',
-        '../windows/msaa',
+        '/accessible/windows/ia2',
+        '/accessible/windows/msaa',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     LOCAL_INCLUDES += [
-        '../mac',
+        '/accessible/mac',
     ]
 else:
     LOCAL_INCLUDES += [
-        '../other',
+        '/accessible/other',
     ]
 
 FINAL_LIBRARY = 'xul'

rename from accessible/src/base/nsAccCache.h
rename to accessible/base/nsAccCache.h

rename from accessible/src/base/nsAccUtils.cpp
rename to accessible/base/nsAccUtils.cpp

rename from accessible/src/base/nsAccUtils.h
rename to accessible/base/nsAccUtils.h

rename from accessible/src/base/nsAccessibilityService.cpp
rename to accessible/base/nsAccessibilityService.cpp

rename from accessible/src/base/nsAccessibilityService.h
rename to accessible/base/nsAccessibilityService.h

rename from accessible/src/base/nsAccessiblePivot.cpp
rename to accessible/base/nsAccessiblePivot.cpp

rename from accessible/src/base/nsAccessiblePivot.h
rename to accessible/base/nsAccessiblePivot.h

rename from accessible/src/base/nsCoreUtils.cpp
rename to accessible/base/nsCoreUtils.cpp

rename from accessible/src/base/nsCoreUtils.h
rename to accessible/base/nsCoreUtils.h

rename from accessible/src/base/nsEventShell.cpp
rename to accessible/base/nsEventShell.cpp

rename from accessible/src/base/nsEventShell.h
rename to accessible/base/nsEventShell.h

rename from accessible/src/base/nsTextEquivUtils.cpp
rename to accessible/base/nsTextEquivUtils.cpp

rename from accessible/src/base/nsTextEquivUtils.h
rename to accessible/base/nsTextEquivUtils.h

rename from accessible/src/generic/ARIAGridAccessible-inl.h
rename to accessible/generic/ARIAGridAccessible-inl.h

rename from accessible/src/generic/ARIAGridAccessible.cpp
rename to accessible/generic/ARIAGridAccessible.cpp

rename from accessible/src/generic/ARIAGridAccessible.h
rename to accessible/generic/ARIAGridAccessible.h

rename from accessible/src/generic/Accessible-inl.h
rename to accessible/generic/Accessible-inl.h

rename from accessible/src/generic/Accessible.cpp
rename to accessible/generic/Accessible.cpp

rename from accessible/src/generic/Accessible.h
rename to accessible/generic/Accessible.h

rename from accessible/src/generic/ApplicationAccessible.cpp
rename to accessible/generic/ApplicationAccessible.cpp

rename from accessible/src/generic/ApplicationAccessible.h
rename to accessible/generic/ApplicationAccessible.h

rename from accessible/src/generic/BaseAccessibles.cpp
rename to accessible/generic/BaseAccessibles.cpp

rename from accessible/src/generic/BaseAccessibles.h
rename to accessible/generic/BaseAccessibles.h

rename from accessible/src/generic/DocAccessible-inl.h
rename to accessible/generic/DocAccessible-inl.h

rename from accessible/src/generic/DocAccessible.cpp
rename to accessible/generic/DocAccessible.cpp

rename from accessible/src/generic/DocAccessible.h
rename to accessible/generic/DocAccessible.h

rename from accessible/src/generic/FormControlAccessible.cpp
rename to accessible/generic/FormControlAccessible.cpp

rename from accessible/src/generic/FormControlAccessible.h
rename to accessible/generic/FormControlAccessible.h

rename from accessible/src/generic/HyperTextAccessible-inl.h
rename to accessible/generic/HyperTextAccessible-inl.h

rename from accessible/src/generic/HyperTextAccessible.cpp
rename to accessible/generic/HyperTextAccessible.cpp

rename from accessible/src/generic/HyperTextAccessible.h
rename to accessible/generic/HyperTextAccessible.h

rename from accessible/src/generic/ImageAccessible.cpp
rename to accessible/generic/ImageAccessible.cpp

rename from accessible/src/generic/ImageAccessible.h
rename to accessible/generic/ImageAccessible.h

rename from accessible/src/generic/OuterDocAccessible.cpp
rename to accessible/generic/OuterDocAccessible.cpp

rename from accessible/src/generic/OuterDocAccessible.h
rename to accessible/generic/OuterDocAccessible.h

rename from accessible/src/generic/RootAccessible.cpp
rename to accessible/generic/RootAccessible.cpp

rename from accessible/src/generic/RootAccessible.h
rename to accessible/generic/RootAccessible.h

rename from accessible/src/generic/TableAccessible.h
rename to accessible/generic/TableAccessible.h

rename from accessible/src/generic/TableCellAccessible.cpp
rename to accessible/generic/TableCellAccessible.cpp

rename from accessible/src/generic/TableCellAccessible.h
rename to accessible/generic/TableCellAccessible.h

rename from accessible/src/generic/TextLeafAccessible.cpp
rename to accessible/generic/TextLeafAccessible.cpp

rename from accessible/src/generic/TextLeafAccessible.h
rename to accessible/generic/TextLeafAccessible.h

rename from accessible/src/generic/moz.build
rename to accessible/generic/moz.build
--- a/accessible/src/generic/moz.build
+++ b/accessible/generic/moz.build
@@ -21,35 +21,35 @@ UNIFIED_SOURCES += [
     'ImageAccessible.cpp',
     'OuterDocAccessible.cpp',
     'RootAccessible.cpp',
     'TableCellAccessible.cpp',
     'TextLeafAccessible.cpp',
 ]
 
 LOCAL_INCLUDES += [
-    '../../../layout/generic',
-    '../../../layout/xul',
-    '../base',
-    '../html',
-    '../xpcom',
-    '../xul',
+    '/accessible/base',
+    '/accessible/html',
+    '/accessible/xpcom',
+    '/accessible/xul',
+    '/layout/generic',
+    '/layout/xul',
 ]
 
 if CONFIG['MOZ_ENABLE_GTK']:
     LOCAL_INCLUDES += [
-        '../atk',
+        '/accessible/atk',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     LOCAL_INCLUDES += [
-        '../windows/ia2',
-        '../windows/msaa',
+        '/accessible/windows/ia2',
+        '/accessible/windows/msaa',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     LOCAL_INCLUDES += [
-        '../mac',
+        '/accessible/mac',
     ]
 else:
     LOCAL_INCLUDES += [
-        '../other',
+        '/accessible/other',
     ]
 
 FINAL_LIBRARY = 'xul'

rename from accessible/src/html/HTMLCanvasAccessible.cpp
rename to accessible/html/HTMLCanvasAccessible.cpp

rename from accessible/src/html/HTMLCanvasAccessible.h
rename to accessible/html/HTMLCanvasAccessible.h

rename from accessible/src/html/HTMLElementAccessibles.cpp
rename to accessible/html/HTMLElementAccessibles.cpp

rename from accessible/src/html/HTMLElementAccessibles.h
rename to accessible/html/HTMLElementAccessibles.h

rename from accessible/src/html/HTMLFormControlAccessible.cpp
rename to accessible/html/HTMLFormControlAccessible.cpp

rename from accessible/src/html/HTMLFormControlAccessible.h
rename to accessible/html/HTMLFormControlAccessible.h

rename from accessible/src/html/HTMLImageMapAccessible.cpp
rename to accessible/html/HTMLImageMapAccessible.cpp

rename from accessible/src/html/HTMLImageMapAccessible.h
rename to accessible/html/HTMLImageMapAccessible.h

rename from accessible/src/html/HTMLLinkAccessible.cpp
rename to accessible/html/HTMLLinkAccessible.cpp

rename from accessible/src/html/HTMLLinkAccessible.h
rename to accessible/html/HTMLLinkAccessible.h

rename from accessible/src/html/HTMLListAccessible.cpp
rename to accessible/html/HTMLListAccessible.cpp

rename from accessible/src/html/HTMLListAccessible.h
rename to accessible/html/HTMLListAccessible.h

rename from accessible/src/html/HTMLSelectAccessible.cpp
rename to accessible/html/HTMLSelectAccessible.cpp

rename from accessible/src/html/HTMLSelectAccessible.h
rename to accessible/html/HTMLSelectAccessible.h

rename from accessible/src/html/HTMLTableAccessible.cpp
rename to accessible/html/HTMLTableAccessible.cpp

rename from accessible/src/html/HTMLTableAccessible.h
rename to accessible/html/HTMLTableAccessible.h

rename from accessible/src/html/moz.build
rename to accessible/html/moz.build
--- a/accessible/src/html/moz.build
+++ b/accessible/html/moz.build
@@ -11,35 +11,35 @@ UNIFIED_SOURCES += [
     'HTMLImageMapAccessible.cpp',
     'HTMLLinkAccessible.cpp',
     'HTMLListAccessible.cpp',
     'HTMLSelectAccessible.cpp',
     'HTMLTableAccessible.cpp',
 ]
 
 LOCAL_INCLUDES += [
-    '../../../layout/generic',
-    '../../../layout/tables',
-    '../../../layout/xul',
-    '../base',
-    '../generic',
-    '../xpcom',
+    '/accessible/base',
+    '/accessible/generic',
+    '/accessible/xpcom',
+    '/layout/generic',
+    '/layout/tables',
+    '/layout/xul',
 ]
 
 if CONFIG['MOZ_ENABLE_GTK']:
     LOCAL_INCLUDES += [
-        '../atk',
+        '/accessible/atk',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     LOCAL_INCLUDES += [
-        '../windows/ia2',
-        '../windows/msaa',
+        '/accessible/windows/ia2',
+        '/accessible/windows/msaa',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     LOCAL_INCLUDES += [
-        '../mac',
+        '/accessible/mac',
     ]
 else:
     LOCAL_INCLUDES += [
-        '../other',
+        '/accessible/other',
     ]
 
 FINAL_LIBRARY = 'xul'

rename from accessible/src/jsat/AccessFu.css
rename to accessible/jsat/AccessFu.css

rename from accessible/src/jsat/AccessFu.jsm
rename to accessible/jsat/AccessFu.jsm

rename from accessible/src/jsat/Constants.jsm
rename to accessible/jsat/Constants.jsm

rename from accessible/src/jsat/ContentControl.jsm
rename to accessible/jsat/ContentControl.jsm

rename from accessible/src/jsat/EventManager.jsm
rename to accessible/jsat/EventManager.jsm

rename from accessible/src/jsat/Gestures.jsm
rename to accessible/jsat/Gestures.jsm

rename from accessible/src/jsat/OutputGenerator.jsm
rename to accessible/jsat/OutputGenerator.jsm

rename from accessible/src/jsat/PointerAdapter.jsm
rename to accessible/jsat/PointerAdapter.jsm

rename from accessible/src/jsat/Presentation.jsm
rename to accessible/jsat/Presentation.jsm

rename from accessible/src/jsat/TraversalRules.jsm
rename to accessible/jsat/TraversalRules.jsm

rename from accessible/src/jsat/Utils.jsm
rename to accessible/jsat/Utils.jsm

rename from accessible/src/jsat/content-script.js
rename to accessible/jsat/content-script.js

rename from accessible/src/jsat/jar.mn
rename to accessible/jsat/jar.mn

rename from accessible/src/jsat/moz.build
rename to accessible/jsat/moz.build

rename from accessible/src/jsat/sounds/clicked.ogg
rename to accessible/jsat/sounds/clicked.ogg

rename from accessible/src/jsat/sounds/virtual_cursor_key.ogg
rename to accessible/jsat/sounds/virtual_cursor_key.ogg

rename from accessible/src/jsat/sounds/virtual_cursor_move.ogg
rename to accessible/jsat/sounds/virtual_cursor_move.ogg

rename from accessible/src/mac/ARIAGridAccessibleWrap.h
rename to accessible/mac/ARIAGridAccessibleWrap.h

rename from accessible/src/mac/AccessibleWrap.h
rename to accessible/mac/AccessibleWrap.h

rename from accessible/src/mac/AccessibleWrap.mm
rename to accessible/mac/AccessibleWrap.mm

rename from accessible/src/mac/ApplicationAccessibleWrap.h
rename to accessible/mac/ApplicationAccessibleWrap.h

rename from accessible/src/mac/DocAccessibleWrap.h
rename to accessible/mac/DocAccessibleWrap.h

rename from accessible/src/mac/DocAccessibleWrap.mm
rename to accessible/mac/DocAccessibleWrap.mm

rename from accessible/src/mac/HTMLTableAccessibleWrap.h
rename to accessible/mac/HTMLTableAccessibleWrap.h

rename from accessible/src/mac/HyperTextAccessibleWrap.h
rename to accessible/mac/HyperTextAccessibleWrap.h

rename from accessible/src/mac/ImageAccessibleWrap.h
rename to accessible/mac/ImageAccessibleWrap.h

rename from accessible/src/mac/MacUtils.h
rename to accessible/mac/MacUtils.h

rename from accessible/src/mac/MacUtils.mm
rename to accessible/mac/MacUtils.mm

rename from accessible/src/mac/Platform.mm
rename to accessible/mac/Platform.mm

rename from accessible/src/mac/RootAccessibleWrap.h
rename to accessible/mac/RootAccessibleWrap.h

rename from accessible/src/mac/RootAccessibleWrap.mm
rename to accessible/mac/RootAccessibleWrap.mm

rename from accessible/src/mac/TextLeafAccessibleWrap.h
rename to accessible/mac/TextLeafAccessibleWrap.h

rename from accessible/src/mac/XULListboxAccessibleWrap.h
rename to accessible/mac/XULListboxAccessibleWrap.h

rename from accessible/src/mac/XULMenuAccessibleWrap.h
rename to accessible/mac/XULMenuAccessibleWrap.h

rename from accessible/src/mac/XULTreeGridAccessibleWrap.h
rename to accessible/mac/XULTreeGridAccessibleWrap.h

rename from accessible/src/mac/moz.build
rename to accessible/mac/moz.build
--- a/accessible/src/mac/moz.build
+++ b/accessible/mac/moz.build
@@ -22,19 +22,19 @@ UNIFIED_SOURCES += [
     'mozDocAccessible.mm',
     'mozHTMLAccessible.mm',
     'mozTextAccessible.mm',
     'Platform.mm',
     'RootAccessibleWrap.mm',
 ]
 
 LOCAL_INCLUDES += [
-    '../base',
-    '../generic',
-    '../html',
-    '../xul',
+    '/accessible/base',
+    '/accessible/generic',
+    '/accessible/html',
+    '/accessible/xul',
     '/layout/generic',
     '/layout/xul',
     '/widget/cocoa',
     '/widget/xpwidgets',
 ]
 
 FINAL_LIBRARY = 'xul'

rename from accessible/src/mac/mozAccessible.h
rename to accessible/mac/mozAccessible.h

rename from accessible/src/mac/mozAccessible.mm
rename to accessible/mac/mozAccessible.mm

rename from accessible/src/mac/mozAccessibleProtocol.h
rename to accessible/mac/mozAccessibleProtocol.h

rename from accessible/src/mac/mozActionElements.h
rename to accessible/mac/mozActionElements.h

rename from accessible/src/mac/mozActionElements.mm
rename to accessible/mac/mozActionElements.mm

rename from accessible/src/mac/mozDocAccessible.h
rename to accessible/mac/mozDocAccessible.h

rename from accessible/src/mac/mozDocAccessible.mm
rename to accessible/mac/mozDocAccessible.mm

rename from accessible/src/mac/mozHTMLAccessible.h
rename to accessible/mac/mozHTMLAccessible.h

rename from accessible/src/mac/mozHTMLAccessible.mm
rename to accessible/mac/mozHTMLAccessible.mm

rename from accessible/src/mac/mozTextAccessible.h
rename to accessible/mac/mozTextAccessible.h

rename from accessible/src/mac/mozTextAccessible.mm
rename to accessible/mac/mozTextAccessible.mm

--- a/accessible/moz.build
+++ b/accessible/moz.build
@@ -1,9 +1,23 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['public', 'src']
+toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
+
+if CONFIG['MOZ_ENABLE_GTK']:
+    DIRS += ['atk']
+elif toolkit == 'windows':
+    DIRS += ['windows']
+elif toolkit == 'cocoa':
+    DIRS += ['mac']
+else:
+    DIRS += ['other']
+
+DIRS += ['base', 'generic', 'html', 'jsat', 'public', 'xpcom']
+
+if CONFIG['MOZ_XUL']:
+    DIRS += ['xul']
+
 TEST_DIRS += ['tests']
-

rename from accessible/src/other/ARIAGridAccessibleWrap.h
rename to accessible/other/ARIAGridAccessibleWrap.h

rename from accessible/src/other/AccessibleWrap.cpp
rename to accessible/other/AccessibleWrap.cpp

rename from accessible/src/other/AccessibleWrap.h
rename to accessible/other/AccessibleWrap.h

rename from accessible/src/other/ApplicationAccessibleWrap.h
rename to accessible/other/ApplicationAccessibleWrap.h

rename from accessible/src/other/DocAccessibleWrap.h
rename to accessible/other/DocAccessibleWrap.h

rename from accessible/src/other/HTMLTableAccessibleWrap.h
rename to accessible/other/HTMLTableAccessibleWrap.h

rename from accessible/src/other/HyperTextAccessibleWrap.h
rename to accessible/other/HyperTextAccessibleWrap.h

rename from accessible/src/other/ImageAccessibleWrap.h
rename to accessible/other/ImageAccessibleWrap.h

rename from accessible/src/other/Platform.cpp
rename to accessible/other/Platform.cpp

rename from accessible/src/other/RootAccessibleWrap.h
rename to accessible/other/RootAccessibleWrap.h

rename from accessible/src/other/TextLeafAccessibleWrap.h
rename to accessible/other/TextLeafAccessibleWrap.h

rename from accessible/src/other/XULListboxAccessibleWrap.h
rename to accessible/other/XULListboxAccessibleWrap.h

rename from accessible/src/other/XULMenuAccessibleWrap.h
rename to accessible/other/XULMenuAccessibleWrap.h

rename from accessible/src/other/XULTreeGridAccessibleWrap.h
rename to accessible/other/XULTreeGridAccessibleWrap.h

rename from accessible/src/other/moz.build
rename to accessible/other/moz.build
--- a/accessible/src/other/moz.build
+++ b/accessible/other/moz.build
@@ -10,15 +10,15 @@ EXPORTS.mozilla.a11y += [
 ]
 
 SOURCES += [
     'AccessibleWrap.cpp',
     'Platform.cpp',
 ]
 
 LOCAL_INCLUDES += [
-    '../base',
-    '../generic',
-    '../html',
-    '../xul',
+    '/accessible/base',
+    '/accessible/generic',
+    '/accessible/html',
+    '/accessible/xul',
 ]
 
 FINAL_LIBRARY = 'xul'

deleted file mode 100644
--- a/accessible/src/moz.build
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
-
-if CONFIG['MOZ_ENABLE_GTK']:
-    DIRS += ['atk']
-elif toolkit == 'windows':
-    DIRS += ['windows']
-elif toolkit == 'cocoa':
-    DIRS += ['mac']
-else:
-    DIRS += ['other']
-
-
-DIRS += ['base', 'generic', 'html', 'jsat', 'xpcom']
-
-if CONFIG['MOZ_XUL']:
-    DIRS += ['xul']

rename from accessible/src/windows/ia2/Makefile.in
rename to accessible/windows/ia2/Makefile.in

rename from accessible/src/windows/ia2/ia2Accessible.cpp
rename to accessible/windows/ia2/ia2Accessible.cpp

rename from accessible/src/windows/ia2/ia2Accessible.h
rename to accessible/windows/ia2/ia2Accessible.h

rename from accessible/src/windows/ia2/ia2AccessibleAction.cpp
rename to accessible/windows/ia2/ia2AccessibleAction.cpp

rename from accessible/src/windows/ia2/ia2AccessibleAction.h
rename to accessible/windows/ia2/ia2AccessibleAction.h

rename from accessible/src/windows/ia2/ia2AccessibleComponent.cpp
rename to accessible/windows/ia2/ia2AccessibleComponent.cpp

rename from accessible/src/windows/ia2/ia2AccessibleComponent.h
rename to accessible/windows/ia2/ia2AccessibleComponent.h

rename from accessible/src/windows/ia2/ia2AccessibleEditableText.cpp
rename to accessible/windows/ia2/ia2AccessibleEditableText.cpp

rename from accessible/src/windows/ia2/ia2AccessibleEditableText.h
rename to accessible/windows/ia2/ia2AccessibleEditableText.h

rename from accessible/src/windows/ia2/ia2AccessibleHyperlink.cpp
rename to accessible/windows/ia2/ia2AccessibleHyperlink.cpp

rename from accessible/src/windows/ia2/ia2AccessibleHyperlink.h
rename to accessible/windows/ia2/ia2AccessibleHyperlink.h

rename from accessible/src/windows/ia2/ia2AccessibleHypertext.cpp
rename to accessible/windows/ia2/ia2AccessibleHypertext.cpp

rename from accessible/src/windows/ia2/ia2AccessibleHypertext.h
rename to accessible/windows/ia2/ia2AccessibleHypertext.h

rename from accessible/src/windows/ia2/ia2AccessibleImage.cpp
rename to accessible/windows/ia2/ia2AccessibleImage.cpp

rename from accessible/src/windows/ia2/ia2AccessibleImage.h
rename to accessible/windows/ia2/ia2AccessibleImage.h