rename from accessible/public/ia2/IA2Marshal.def
rename to accessible/interfaces/ia2/IA2Marshal.def

rename from accessible/public/ia2/Makefile.in
rename to accessible/interfaces/ia2/Makefile.in

rename from accessible/public/ia2/moz.build
rename to accessible/interfaces/ia2/moz.build

rename from accessible/public/moz.build
rename to accessible/interfaces/moz.build

rename from accessible/public/msaa/AccessibleMarshal.def
rename to accessible/interfaces/msaa/AccessibleMarshal.def

rename from accessible/public/msaa/ISimpleDOMDocument.idl
rename to accessible/interfaces/msaa/ISimpleDOMDocument.idl

rename from accessible/public/msaa/ISimpleDOMNode.idl
rename to accessible/interfaces/msaa/ISimpleDOMNode.idl

rename from accessible/public/msaa/ISimpleDOMText.idl
rename to accessible/interfaces/msaa/ISimpleDOMText.idl

rename from accessible/public/msaa/Makefile.in
rename to accessible/interfaces/msaa/Makefile.in

rename from accessible/public/msaa/moz.build
rename to accessible/interfaces/msaa/moz.build

rename from accessible/public/nsIAccessibilityService.h
rename to accessible/interfaces/nsIAccessibilityService.h

rename from accessible/public/nsIAccessible.idl
rename to accessible/interfaces/nsIAccessible.idl

rename from accessible/public/nsIAccessibleApplication.idl
rename to accessible/interfaces/nsIAccessibleApplication.idl

rename from accessible/public/nsIAccessibleCaretMoveEvent.idl
rename to accessible/interfaces/nsIAccessibleCaretMoveEvent.idl

rename from accessible/public/nsIAccessibleDocument.idl
rename to accessible/interfaces/nsIAccessibleDocument.idl

rename from accessible/public/nsIAccessibleEditableText.idl
rename to accessible/interfaces/nsIAccessibleEditableText.idl

rename from accessible/public/nsIAccessibleEvent.idl
rename to accessible/interfaces/nsIAccessibleEvent.idl

rename from accessible/public/nsIAccessibleHideEvent.idl
rename to accessible/interfaces/nsIAccessibleHideEvent.idl

rename from accessible/public/nsIAccessibleHyperLink.idl
rename to accessible/interfaces/nsIAccessibleHyperLink.idl

rename from accessible/public/nsIAccessibleHyperText.idl
rename to accessible/interfaces/nsIAccessibleHyperText.idl

rename from accessible/public/nsIAccessibleImage.idl
rename to accessible/interfaces/nsIAccessibleImage.idl

rename from accessible/public/nsIAccessiblePivot.idl
rename to accessible/interfaces/nsIAccessiblePivot.idl

rename from accessible/public/nsIAccessibleRelation.idl
rename to accessible/interfaces/nsIAccessibleRelation.idl

rename from accessible/public/nsIAccessibleRetrieval.idl
rename to accessible/interfaces/nsIAccessibleRetrieval.idl

rename from accessible/public/nsIAccessibleRole.idl
rename to accessible/interfaces/nsIAccessibleRole.idl

rename from accessible/public/nsIAccessibleSelectable.idl
rename to accessible/interfaces/nsIAccessibleSelectable.idl

rename from accessible/public/nsIAccessibleStateChangeEvent.idl
rename to accessible/interfaces/nsIAccessibleStateChangeEvent.idl

rename from accessible/public/nsIAccessibleStates.idl
rename to accessible/interfaces/nsIAccessibleStates.idl

rename from accessible/public/nsIAccessibleTable.idl
rename to accessible/interfaces/nsIAccessibleTable.idl

rename from accessible/public/nsIAccessibleTableChangeEvent.idl
rename to accessible/interfaces/nsIAccessibleTableChangeEvent.idl

rename from accessible/public/nsIAccessibleText.idl
rename to accessible/interfaces/nsIAccessibleText.idl

rename from accessible/public/nsIAccessibleTextChangeEvent.idl
rename to accessible/interfaces/nsIAccessibleTextChangeEvent.idl

rename from accessible/public/nsIAccessibleTextRange.idl
rename to accessible/interfaces/nsIAccessibleTextRange.idl

rename from accessible/public/nsIAccessibleTypes.idl
rename to accessible/interfaces/nsIAccessibleTypes.idl

rename from accessible/public/nsIAccessibleValue.idl
rename to accessible/interfaces/nsIAccessibleValue.idl

rename from accessible/public/nsIAccessibleVirtualCursorChangeEvent.idl
rename to accessible/interfaces/nsIAccessibleVirtualCursorChangeEvent.idl

rename from accessible/public/nsIXBLAccessible.idl
rename to accessible/interfaces/nsIXBLAccessible.idl

--- a/accessible/moz.build
+++ b/accessible/moz.build
@@ -10,14 +10,14 @@ 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']
+DIRS += ['base', 'generic', 'html', 'interfaces', 'jsat', 'xpcom']
 
 if CONFIG['MOZ_XUL']:
     DIRS += ['xul']
 
 TEST_DIRS += ['tests']