Some file rearranging.