Move code out of cmd/pkg dirs
Cleanup code and fix build for go 1.2