Project structure clean up in preparation for integration.