Cleanup project structure