Reconfig folder structure