icse15: Rearrange models into proper directories