Updates related to sub-module renaming and package re-org.
Other build issue fixes included.