Cleanup project layout