rearranging to give the repo a more common layout