Reorg and added folders support