code reorganization to enable go get