Removed all region directives. Made more refactoring changes.
Completed first-round refactoring, project builds.