Further project refactoring and cleanup.