Refactoring (move to a flat hierarchy)