Project cleanups, and re-org.