Here's my suggestion for changing our layout. Thoughts?
mozilla
calendar
app <-- was /m/cal/sunbird/app
base
branding <-- tri-licensed "Calendar" branding
build
content <-- dir merged with /m/cal/sunbird/base/content
public
src
components <-- stuff from /m/cal/base/build, content, public, src
config <-- was /m/cal/sunbird/config
import-export
installer
linux
windows
libical
lightning
components
content
locale
themes
locales
en-US
chrome
providers
resources <-- to be deprecated, content gets merged into base
locale <-- subdirs move to mozilla/l10n/AB_CD/calendar
skin <-- merge shared items into m/cal/themes
test
themes <-- merge /m/cal/base/themes and /m/cal/sunbird/themes
pinstripe
winstripe
xpi
icons <-- was /m/cal/os2, /m/cal/linux, /m/cal/windows
skin <-- xpi-only items from /m/cal/resources/skin