Move and update parse_git