Giving main.go correct path to reports package
Moving cartographer go code back out of collector subdir
Use correct upstream path!