Transition to single folder data