re-pack folder structure