Split the code up a bit

I don't like large files ...
gofmt