Reordering files to make more sense for transition to new models