Reorganization for use with 'go get' command.