Simplify song hierarchy models according to #35