Reorganize music data extraction