Cleaning up project in preparation for extension extraction.