Revert "simplified song list format, more work on setlist"

This reverts commit fc070e0ce9910948548a74dd6f95338c0de499db.