updating git alias and rearranging stuff