File structure redesign, step2 start