Reshuffle everything into the top level folder