Cleaning up project structure.