Rearrange files to have a more sensible layout