Correct source organization + test
gofmt
gofmt commented structures
cb inlined C code