Cleaning up project structure