Rearranged things for git