Git reset, reorganized files