Cleanup project structure r=ahal