reorganize (excluding models)