reorgs folder structure