Updated to reflect dependency on libsndfile
Reorganization