fix build
clean-up, revert import paths
go fmt
Merge pull request #3 from salviati/master

fix #2