Some rearranging of our files