foo.go -> main.go, clean up main.go a bit