Also had to fix the code that was trying to make sure the go-* folders get renamed to just "go". Resolves #5797