Reorganizes folder structure