Reorganize package structure to work with single GOPATH