First steps in flattening out project
Get gofmt to work properly