move all the deps to the latest repo

This was over looked for so long because it was already taken care of in
the newer branches.

.github/CONTRIBUTING.md

@@ -3,7 +3,7 @@ If you'd like to contribute to go-expanse please fork, fix, commit and
 
 Before you do a feature request please check and make sure that it isn't possible
 through some other means. The JavaScript enabled console is a powerful feature
-in the right hands. Please check our [Bitchin' tricks](https://github.com/expanse-project/go-expanse/wiki/bitchin-tricks) wiki page for more info
+in the right hands. Please check our [Bitchin' tricks](https://github.com/expanse-org/go-expanse/wiki/bitchin-tricks) wiki page for more info
 and help.
 
 ## Contributing
@@ -14,6 +14,6 @@ are ignored (use gofmt!). If you send pull requests make absolute sure that you
 commit on the `develop` branch and that you do not merge to master.
 Commits that are directly based on master are simply ignored.
 
-See [Developers' Guide](https://github.com/expanse-project/go-expanse/wiki/Developers'-Guide)
+See [Developers' Guide](https://github.com/expanse-org/go-expanse/wiki/Developers'-Guide)
 for more details on configuring your environment, testing, and
 dependency management.

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "cmd/mist/assets/ext/expanse.js"]
 	path = cmd/mist/assets/ext/expanse.js
-	url = https://github.com/expanse-project/web3.js
+	url = https://github.com/expanse-org/web3.js

Godeps/Godeps.json

@@ -1,5 +1,5 @@
 {
-	"ImportPath": "github.com/expanse-project/go-expanse",
+	"ImportPath": "github.com/expanse-org/go-expanse",
 	"GoVersion": "go1.5.2",
 	"GodepVersion": "v74",
 	"Packages": [

Godeps/_workspace/src/github.com/ethereum/ethash/ethash_opencl.go

@@ -39,8 +39,8 @@ import (
 	"unsafe"
 
 	"github.com/Gustav-Simonsson/go-opencl/cl"
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/pow"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/pow"
 )
 
 /*

Godeps/_workspace/src/github.com/expanse-org/ethash/.travis.yml

@@ -9,9 +9,9 @@ before_install:
   # Set up go-expanse
   - sudo apt-get update -y -qq
   - sudo apt-get install -yqq libgmp3-dev 
-  - git clone --depth=10 https://github.com/expanse-project/go-expanse ${GOPATH}/src/github.com/expanse-project/go-expanse
+  - git clone --depth=10 https://github.com/expanse-org/go-expanse ${GOPATH}/src/github.com/expanse-org/go-expanse
   # use canned dependencies from the go-expanse repository
-  - export GOPATH=$GOPATH:$GOPATH/src/github.com/expanse-project/go-expanse/Godeps/_workspace/
+  - export GOPATH=$GOPATH:$GOPATH/src/github.com/expanse-org/go-expanse/Godeps/_workspace/
   - echo $GOPATH
 
 install:

Godeps/_workspace/src/github.com/expanse-org/ethash/README.md

@@ -4,11 +4,11 @@
 # Ethash
 
 For details on this project, please see the Expanse wiki:
-https://github.com/expanse-project/wiki/wiki/Ethash
+https://github.com/expanse-org/wiki/wiki/Ethash
 
 ### Coding Style for C++ code:
 
-Follow the same exact style as in [cpp-expanse](https://github.com/expanse-project/cpp-expanse/blob/develop/CodingStandards.txt)
+Follow the same exact style as in [cpp-expanse](https://github.com/expanse-org/cpp-expanse/blob/develop/CodingStandards.txt)
 
 ### Coding Style for C code:
 

Godeps/_workspace/src/github.com/expanse-org/ethash/ethash.go

@@ -40,11 +40,11 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/crypto"
-	"github.com/expanse-project/go-expanse/logger"
-	"github.com/expanse-project/go-expanse/logger/glog"
-	"github.com/expanse-project/go-expanse/pow"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/logger"
+	"github.com/expanse-org/go-expanse/logger/glog"
+	"github.com/expanse-org/go-expanse/pow"
 )
 
 var (
@@ -369,7 +369,7 @@ func (pow *Full) Search(block pow.Block, stop <-chan struct{}, index int) (nonce
 			ret := C.ethash_full_compute(dag.ptr, hash, C.uint64_t(nonce))
 			result := h256ToHash(ret.result).Big()
 
-			// TODO: disagrees with the spec https://github.com/expanse-project/wiki/wiki/Ethash#mining
+			// TODO: disagrees with the spec https://github.com/expanse-org/wiki/wiki/Ethash#mining
 			if ret.success && result.Cmp(target) <= 0 {
 				mixDigest = C.GoBytes(unsafe.Pointer(&ret.mix_hash), C.int(32))
 				atomic.AddInt32(&pow.hashRate, -previousHashrate)

Godeps/_workspace/src/github.com/expanse-org/ethash/ethash_test.go

@@ -27,8 +27,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/crypto"
 )
 
 func init() {

Godeps/_workspace/src/github.com/expanse-org/ethash/src/libethash/io.h

@@ -38,7 +38,7 @@ extern "C" {
 // 10 is for maximum number of digits of a uint32_t (for REVISION)
 // 1 is for - and 16 is for the first 16 hex digits for first 8 bytes of
 // the seedhash and last 1 is for the null terminating character
-// Reference: https://github.com/expanse-project/wiki/wiki/Ethash-DAG
+// Reference: https://github.com/expanse-org/wiki/wiki/Ethash-DAG
 #define DAG_MUTABLE_NAME_MAX_SIZE (6 + 10 + 1 + 16 + 1)
 /// Possible return values of @see ethash_io_prepare
 enum ethash_io_rc {
@@ -80,7 +80,7 @@ enum ethash_io_rc {
  *                           data directory. If it does not exist it's created.
  * @param[in] seedhash       The seedhash of the current block number, used in the
  *                           naming of the file as can be seen from the spec at:
- *                           https://github.com/expanse-project/wiki/wiki/Ethash-DAG
+ *                           https://github.com/expanse-org/wiki/wiki/Ethash-DAG
  * @param[out] output_file   If there was no failure then this will point to an open
  *                           file descriptor. User is responsible for closing it.
  *                           In the case of memo match then the file is open on read
@@ -175,7 +175,7 @@ char* ethash_io_create_filename(
 /**
  * Gets the default directory name for the DAG depending on the system
  *
- * The spec defining this directory is here: https://github.com/expanse-project/wiki/wiki/Ethash-DAG
+ * The spec defining this directory is here: https://github.com/expanse-org/wiki/wiki/Ethash-DAG
  *
  * @param[out] strbuf          A string buffer of sufficient size to keep the
  *                             null termninated string of the directory name

Godeps/_workspace/src/github.com/expanse-org/ethash/src/python/core.c

@@ -172,7 +172,7 @@ mine(PyObject *self, PyObject *args) {
     // TODO: Multi threading?
     do {
         ethash_full(&out, (void *) full_bytes, &params, (const ethash_h256_t *) header, nonce++);
-        // TODO: disagrees with the spec https://github.com/expanse-project/wiki/wiki/Ethash#mining
+        // TODO: disagrees with the spec https://github.com/expanse-org/wiki/wiki/Ethash#mining
     } while (!ethash_check_difficulty(&out.result, (const ethash_h256_t *) difficulty));
 
     return Py_BuildValue("{" PY_CONST_STRING_FORMAT ":" PY_STRING_FORMAT ", " PY_CONST_STRING_FORMAT ":" PY_STRING_FORMAT ", " PY_CONST_STRING_FORMAT ":K}",
@@ -233,7 +233,7 @@ static struct PyModuleDef PyethashModule = {
 
 PyMODINIT_FUNC PyInit_pyethash(void) {
     PyObject *module =  PyModule_Create(&PyethashModule);
-    // Following Spec: https://github.com/expanse-project/wiki/wiki/Ethash#definitions
+    // Following Spec: https://github.com/expanse-org/wiki/wiki/Ethash#definitions
     PyModule_AddIntConstant(module, "REVISION", (long) ETHASH_REVISION);
     PyModule_AddIntConstant(module, "DATASET_BYTES_INIT", (long) ETHASH_DATASET_BYTES_INIT);
     PyModule_AddIntConstant(module, "DATASET_BYTES_GROWTH", (long) ETHASH_DATASET_BYTES_GROWTH);
@@ -251,7 +251,7 @@ PyMODINIT_FUNC PyInit_pyethash(void) {
 PyMODINIT_FUNC
 initpyethash(void) {
     PyObject *module = Py_InitModule("pyethash", PyethashMethods);
-    // Following Spec: https://github.com/expanse-project/wiki/wiki/Ethash#definitions
+    // Following Spec: https://github.com/expanse-org/wiki/wiki/Ethash#definitions
     PyModule_AddIntConstant(module, "REVISION", (long) ETHASH_REVISION);
     PyModule_AddIntConstant(module, "DATASET_BYTES_INIT", (long) ETHASH_DATASET_BYTES_INIT);
     PyModule_AddIntConstant(module, "DATASET_BYTES_GROWTH", (long) ETHASH_DATASET_BYTES_GROWTH);

README.md

@@ -4,16 +4,16 @@ Expanse Go Client, by Christopher Franko (forked from Jeffrey Wilcke (and some o
 
           | Linux   | OSX | ARM | Windows | Tests
 ----------|---------|-----|-----|---------|------
-develop   | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20develop%20branch)](https://build.ethdev.com/builders/Linux%20Go%20develop%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20develop%20branch)](https://build.ethdev.com/builders/OSX%20Go%20develop%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=ARM%20Go%20develop%20branch)](https://build.ethdev.com/builders/ARM%20Go%20develop%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Windows%20Go%20develop%20branch)](https://build.ethdev.com/builders/Windows%20Go%20develop%20branch/builds/-1) | [![Buildr+Status](https://travis-ci.org/expanse-project/go-expanse.svg?branch=develop)](https://travis-ci.org/expanse/go-expanse) [![Coverage Status](https://coveralls.io/repos/expanse-project/go-expanse/badge.svg?branch=develop)](https://coveralls.io/r/expanse/go-expanse?branch=develop)
-master    | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20master%20branch)](https://build.ethdev.com/builders/Linux%20Go%20master%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=OSX%20Go%20master%20branch)](https://build.ethdev.com/builders/OSX%20Go%20master%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=ARM%20Go%20master%20branch)](https://build.ethdev.com/builders/ARM%20Go%20master%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Windows%20Go%20master%20branch)](https://build.ethdev.com/builders/Windows%20Go%20master%20branch/builds/-1) | [![Buildr+Status](https://travis-ci.org/expanse-project/go-expanse.svg?branch=master)](https://travis-ci.org/expanse-project/go-expanse) [![Coverage Status](https://coveralls.io/repos/expanse-project/go-expanse/badge.svg?branch=master)](https://coveralls.io/r/expanse-project/go-expanse?branch=master)
+develop   | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20develop%20branch)](https://build.ethdev.com/builders/Linux%20Go%20develop%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20develop%20branch)](https://build.ethdev.com/builders/OSX%20Go%20develop%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=ARM%20Go%20develop%20branch)](https://build.ethdev.com/builders/ARM%20Go%20develop%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Windows%20Go%20develop%20branch)](https://build.ethdev.com/builders/Windows%20Go%20develop%20branch/builds/-1) | [![Buildr+Status](https://travis-ci.org/expanse-org/go-expanse.svg?branch=develop)](https://travis-ci.org/expanse/go-expanse) [![Coverage Status](https://coveralls.io/repos/expanse-org/go-expanse/badge.svg?branch=develop)](https://coveralls.io/r/expanse/go-expanse?branch=develop)
+master    | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20master%20branch)](https://build.ethdev.com/builders/Linux%20Go%20master%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=OSX%20Go%20master%20branch)](https://build.ethdev.com/builders/OSX%20Go%20master%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=ARM%20Go%20master%20branch)](https://build.ethdev.com/builders/ARM%20Go%20master%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Windows%20Go%20master%20branch)](https://build.ethdev.com/builders/Windows%20Go%20master%20branch/builds/-1) | [![Buildr+Status](https://travis-ci.org/expanse-org/go-expanse.svg?branch=master)](https://travis-ci.org/expanse-org/go-expanse) [![Coverage Status](https://coveralls.io/repos/expanse-org/go-expanse/badge.svg?branch=master)](https://coveralls.io/r/expanse-org/go-expanse?branch=master)
 
-[![Bugs](https://badge.waffle.io/expanse-project/go-expanse.png?label=bug&title=Bugs)](https://waffle.io/expanse/go-expanse)
-[![Stories in Ready](https://badge.waffle.io/expanse-project/go-expanse.png?label=ready&title=Ready)](https://waffle.io/expanse/go-expanse)
-[![Stories in Progress](https://badge.waffle.io/expanse-project/go-expanse.svg?label=in%20progress&title=In Progress)](http://waffle.io/expanse/go-expanse)
+[![Bugs](https://badge.waffle.io/expanse-org/go-expanse.png?label=bug&title=Bugs)](https://waffle.io/expanse/go-expanse)
+[![Stories in Ready](https://badge.waffle.io/expanse-org/go-expanse.png?label=ready&title=Ready)](https://waffle.io/expanse/go-expanse)
+[![Stories in Progress](https://badge.waffle.io/expanse-org/go-expanse.svg?label=in%20progress&title=In Progress)](http://waffle.io/expanse/go-expanse)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/expanse/go-expanse?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 ## Automated development builds
 
-The following builds are build automatically by our build servers after each push to the [develop](https://github.com/expanse-project/go-expanse/tree/develop) branch.
+The following builds are build automatically by our build servers after each push to the [develop](https://github.com/expanse-org/go-expanse/tree/develop) branch.
 
 * [Docker](https://registry.hub.docker.com/u/expanse/go-expanse/)
 * [OS X](http://build.ethdev.com/builds/OSX%20Go%20develop%20branch/Mist-OSX-latest.dmg)
@@ -26,7 +26,7 @@ The following builds are build automatically by our build servers after each pus
 ## Building the source
 
 For prerequisites and detailed build instructions please read the
-[Installation Instructions](https://github.com/expanse-project/go-expanse/wiki/Building-Expanse)
+[Installation Instructions](https://github.com/expanse-org/go-expanse/wiki/Building-Expanse)
 on the wiki.
 
 Building gexp requires both a Go and a C compiler.
@@ -42,11 +42,11 @@ or, to build the full suite of utilities:
 ## Executables
 
 Go Expanse comes with several wrappers/executables found in
-[the `cmd` directory](https://github.com/expanse-project/go-expanse/tree/develop/cmd):
+[the `cmd` directory](https://github.com/expanse-org/go-expanse/tree/develop/cmd):
 
 * `gexp` Expanse CLI (expanse command line interface client)
 * `bootnode` runs a bootstrap node for the Discovery Protocol
-* `exptest` test tool which runs with the [tests](https://github.com/expanse-project/tests) suite:
+* `exptest` test tool which runs with the [tests](https://github.com/expanse-org/tests) suite:
   `/path/to/test.json > exptest --test BlockTests --stdin`.
 * `evm` is a generic Expanse Virtual Machine: `evm -code 60ff60ff -gas
   10000 -price 0 -dump`. See `-h` for a detailed description.
@@ -56,7 +56,7 @@ Go Expanse comes with several wrappers/executables found in
 ## Running geth
 
 Going through all the possible command line flags is out of scope here (please consult our
-[CLI Wiki page](https://github.com/expanse-project/go-expanse/wiki/Command-Line-Options)), but we've
+[CLI Wiki page](https://github.com/expanse-org/go-expanse/wiki/Command-Line-Options)), but we've
 enumerated a few common parameter combos to get you up to speed quickly on how you can run your
 own  instance.
 
@@ -78,9 +78,9 @@ This command will:
  * Bump the memory allowance of the database to 512MB (`--cache=512`), which can help significantly in
    sync times especially for HDD users. This flag is optional and you can set it as high or as low as
    you'd like, though we'd recommend the 512MB - 2GB range.
- * Start up 's built-in interactive [JavaScript console](https://github.com/expanse-project/go-expanse/wiki/JavaScript-Console),
+ * Start up 's built-in interactive [JavaScript console](https://github.com/expanse-org/go-expanse/wiki/JavaScript-Console),
    (via the trailing `console` subcommand) through which you can invoke all official [`web3` methods](https://github.com/ethereum/wiki/wiki/JavaScript-API)
-   as well as 's own [management APIs](https://github.com/expanse-project/go-expanse/wiki/Management-APIs).
+   as well as 's own [management APIs](https://github.com/expanse-org/go-expanse/wiki/Management-APIs).
    This too is optional and if you leave it out you can always attach to an already running  instance
    with `geth --attach`.
 
@@ -117,7 +117,7 @@ them.*
 As a developer, sooner rather than later you'll want to start interacting with  and the Ethereum
 network via your own programs and not manually through the console. To aid this,  has built in
 support for a JSON-RPC based APIs ([standard APIs](https://github.com/ethereum/wiki/wiki/JSON-RPC) and
-[ specific APIs](https://github.com/expanse-project/go-expanse/wiki/Management-APIs)). These can be
+[ specific APIs](https://github.com/expanse-org/go-expanse/wiki/Management-APIs)). These can be
 exposed via HTTP, WebSockets and IPC (unix sockets on unix based platroms, and named pipes on Windows).
 
 The IPC interface is enabled by default and exposes all the APIs supported by , whereas the HTTP
@@ -250,7 +250,7 @@ limit blocks converge to (`--targetgaslimit`) and the price transactions are acc
 
 If you'd like to contribute to go-expanse, please fork, fix, commit and send a pull request
 for the maintainers to review and merge into the main code base. If you wish to submit more
-complex changes though, please check up with the core devs first on [our gitter channel](https://gitter.im/expanse-project/go-expanse)
+complex changes though, please check up with the core devs first on [our gitter channel](https://gitter.im/expanse-org/go-expanse)
 to ensure those changes are in line with the general philosophy of the project and/or get some
 early feedback which can make both your efforts much lighter as well as our review and merge
 procedures quick and simple.
@@ -264,7 +264,7 @@ Please make sure your contributions adhere to our coding guidelines:
    * E.g. "exp, rpc: make trace configs optional"
 
 
-Please see the [Developers' Guide](https://github.com/expanse-project/go-expanse/wiki/Developers'-Guide)
+Please see the [Developers' Guide](https://github.com/expanse-org/go-expanse/wiki/Developers'-Guide)
 for more details on configuring your environment, managing project dependencies and testing procedures.
 
 ## License

accounts/abi/abi.go

@@ -24,7 +24,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/expanse-project/go-expanse/common"
+	"github.com/expanse-org/go-expanse/common"
 
 )
 

accounts/abi/abi_test.go

@@ -25,8 +25,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/crypto"
 )
 
 // formatSilceOutput add padding to the value and adds a size

accounts/abi/bind/auth.go

@@ -22,10 +22,10 @@ import (
 	"io"
 	"io/ioutil"
 
-	"github.com/expanse-project/go-expanse/accounts"
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/core/types"
-	"github.com/expanse-project/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/accounts"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/core/types"
+	"github.com/expanse-org/go-expanse/crypto"
 )
 
 // NewTransactor is a utility method to easily create a transaction signer from

accounts/abi/bind/backend.go

@@ -20,8 +20,8 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/core/types"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/core/types"
 )
 
 // ErrNoCode is returned by call and transact operations for which the requested

accounts/abi/bind/backends/nil.go

@@ -19,9 +19,9 @@ package backends
 import (
 	"math/big"
 
-	"github.com/expanse-project/go-expanse/accounts/abi/bind"
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/core/types"
+	"github.com/expanse-org/go-expanse/accounts/abi/bind"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/core/types"
 )
 
 // This nil assignment ensures compile time that nilBackend implements bind.ContractBackend.

accounts/abi/bind/backends/remote.go

@@ -23,11 +23,11 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/expanse-project/go-expanse/accounts/abi/bind"
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/core/types"
-	"github.com/expanse-project/go-expanse/rlp"
-	"github.com/expanse-project/go-expanse/rpc"
+	"github.com/expanse-org/go-expanse/accounts/abi/bind"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/core/types"
+	"github.com/expanse-org/go-expanse/rlp"
+	"github.com/expanse-org/go-expanse/rpc"
 )
 
 // This nil assignment ensures compile time that rpcBackend implements bind.ContractBackend.

accounts/abi/bind/backends/simulated.go

@@ -19,14 +19,14 @@ package backends
 import (
 	"math/big"
 
-	"github.com/expanse-project/go-expanse/accounts/abi/bind"
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/core"
-	"github.com/expanse-project/go-expanse/core/state"
-	"github.com/expanse-project/go-expanse/core/types"
-	"github.com/expanse-project/go-expanse/core/vm"
-	"github.com/expanse-project/go-expanse/ethdb"
-	"github.com/expanse-project/go-expanse/event"
+	"github.com/expanse-org/go-expanse/accounts/abi/bind"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/core"
+	"github.com/expanse-org/go-expanse/core/state"
+	"github.com/expanse-org/go-expanse/core/types"
+	"github.com/expanse-org/go-expanse/core/vm"
+	"github.com/expanse-org/go-expanse/ethdb"
+	"github.com/expanse-org/go-expanse/event"
 )
 
 // Default chain configuration which sets homestead phase at block 0 (i.e. no frontier)

accounts/abi/bind/base.go

@@ -22,10 +22,10 @@ import (
 	"math/big"
 	"sync/atomic"
 
-	"github.com/expanse-project/go-expanse/accounts/abi"
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/core/types"
-	"github.com/expanse-project/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/accounts/abi"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/core/types"
+	"github.com/expanse-org/go-expanse/crypto"
 )
 
 // SignerFn is a signer function callback when a contract requires a method to

accounts/abi/bind/bind.go

@@ -17,7 +17,7 @@
 // Package bind generates Expanse contract Go bindings.
 //
 // Detailed usage document and tutorial available on the go-ethereum Wiki page:
-// https://github.com/expanse-project/go-expanse/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts
+// https://github.com/expanse-org/go-expanse/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts
 package bind
 
 import (
@@ -28,7 +28,7 @@ import (
 	"text/template"
 	"unicode"
 
-	"github.com/expanse-project/go-expanse/accounts/abi"
+	"github.com/expanse-org/go-expanse/accounts/abi"
 	"golang.org/x/tools/imports"
 )
 

accounts/abi/bind/bind_test.go

@@ -26,7 +26,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/expanse-project/go-expanse/common"
+	"github.com/expanse-org/go-expanse/common"
 	"golang.org/x/tools/imports"
 )
 

accounts/abi/bind/template.go

@@ -16,7 +16,7 @@
 
 package bind
 
-import "github.com/expanse-project/go-expanse/accounts/abi"
+import "github.com/expanse-org/go-expanse/accounts/abi"
 
 // tmplData is the data structure required to fill the binding template.
 type tmplData struct {

accounts/abi/event.go

@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/crypto"
 )
 
 // Event is an event potentially triggered by the EVM's LOG mechanism. The Event

accounts/abi/event_test.go

@@ -20,8 +20,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/crypto"
 )
 
 func TestEventId(t *testing.T) {

accounts/abi/method.go

@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/expanse-project/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/crypto"
 )
 
 // Callable method given a `Name` and whether the method is a constant.

accounts/abi/numbers.go

@@ -20,7 +20,7 @@ import (
 	"math/big"
 	"reflect"
 
-	"github.com/expanse-project/go-expanse/common"
+	"github.com/expanse-org/go-expanse/common"
 )
 
 var (

accounts/abi/packing.go

@@ -19,7 +19,7 @@ package abi
 import (
 	"reflect"
 
-	"github.com/expanse-project/go-expanse/common"
+	"github.com/expanse-org/go-expanse/common"
 )
 
 // packBytesSlice packs the given bytes as [L, V] as the canonical representation

accounts/account_manager.go

@@ -32,8 +32,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/crypto"
 )
 
 var (

accounts/addrcache.go

@@ -28,9 +28,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/logger"
-	"github.com/expanse-project/go-expanse/logger/glog"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/logger"
+	"github.com/expanse-org/go-expanse/logger/glog"
 )
 
 // Minimum amount of time between cache reloads. This limit applies if the platform does

accounts/addrcache_test.go

@@ -28,7 +28,7 @@ import (
 
 	"github.com/cespare/cp"
 	"github.com/davecgh/go-spew/spew"
-	"github.com/expanse-project/go-expanse/common"
+	"github.com/expanse-org/go-expanse/common"
 )
 
 var (

accounts/key.go

@@ -29,9 +29,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/crypto"
-	"github.com/expanse-project/go-expanse/crypto/secp256k1"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/crypto/secp256k1"
 	"github.com/pborman/uuid"
 )
 

accounts/key_store_passphrase.go

@@ -19,7 +19,7 @@
 This key store behaves as KeyStorePlain with the difference that
 the private key is encrypted and on disk uses another JSON encoding.
 
-The crypto is documented at https://github.com/expanse-project/wiki/wiki/Web3-Secret-Storage-Definition
+The crypto is documented at https://github.com/expanse-org/wiki/wiki/Web3-Secret-Storage-Definition
 
 */
 
@@ -34,9 +34,9 @@ import (
 	"fmt"
 	"io/ioutil"
 	"path/filepath"
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/crypto"
-	"github.com/expanse-project/go-expanse/crypto/randentropy"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/crypto/randentropy"
 	"github.com/pborman/uuid"
 	"golang.org/x/crypto/pbkdf2"
 	"golang.org/x/crypto/scrypt"

accounts/key_store_passphrase_test.go

@@ -20,7 +20,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/expanse-project/go-expanse/common"
+	"github.com/expanse-org/go-expanse/common"
 )
 
 const (

accounts/key_store_plain.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/expanse-project/go-expanse/common"
+	"github.com/expanse-org/go-expanse/common"
 )
 
 type keyStorePlain struct {

accounts/key_store_test.go

@@ -26,8 +26,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/crypto"
 
 )
 

accounts/presale.go

@@ -24,7 +24,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/expanse-project/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/crypto"
 	"github.com/pborman/uuid"
 	"golang.org/x/crypto/pbkdf2"
 )

accounts/watch.go

@@ -21,8 +21,8 @@ package accounts
 import (
 	"time"
 
-	"github.com/expanse-project/go-expanse/logger"
-	"github.com/expanse-project/go-expanse/logger/glog"
+	"github.com/expanse-org/go-expanse/logger"
+	"github.com/expanse-org/go-expanse/logger/glog"
 	"github.com/rjeczalik/notify"
 )
 

build/deb.control

@@ -5,8 +5,8 @@ Maintainer: {{.Author}}
 Build-Depends: debhelper (>= 8.0.0), golang-1.7
 Standards-Version: 3.9.5
 Homepage: https://ethereum.org
-Vcs-Git: git://github.com/expanse-project/go-expanse.git
-Vcs-Browser: https://github.com/expanse-project/go-expanse
+Vcs-Git: git://github.com/expanse-org/go-expanse.git
+Vcs-Browser: https://github.com/expanse-org/go-expanse
 
 Package: {{.Name}}
 Architecture: any

build/env.sh

@@ -10,7 +10,7 @@ fi
 # Create fake Go workspace if it doesn't exist yet.
 workspace="$PWD/build/_workspace"
 root="$PWD"
-ethdir="$workspace/src/github.com/expanse-project"
+ethdir="$workspace/src/github.com/expanse-org"
 if [ ! -L "$ethdir/go-expanse" ]; then
     mkdir -p "$ethdir"
     cd "$ethdir"

cmd/abigen/main.go

@@ -24,8 +24,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/expanse-project/go-expanse/accounts/abi/bind"
-	"github.com/expanse-project/go-expanse/common/compiler"
+	"github.com/expanse-org/go-expanse/accounts/abi/bind"
+	"github.com/expanse-org/go-expanse/common/compiler"
 )
 
 var (

cmd/bootnode/main.go

@@ -22,11 +22,11 @@ import (
 	"flag"
 	"os"
 
-	"github.com/expanse-project/go-expanse/cmd/utils"
-	"github.com/expanse-project/go-expanse/crypto"
-	"github.com/expanse-project/go-expanse/logger/glog"
-	"github.com/expanse-project/go-expanse/p2p/discover"
-	"github.com/expanse-project/go-expanse/p2p/nat"
+	"github.com/expanse-org/go-expanse/cmd/utils"
+	"github.com/expanse-org/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/logger/glog"
+	"github.com/expanse-org/go-expanse/p2p/discover"
+	"github.com/expanse-org/go-expanse/p2p/nat"
 
 )
 

cmd/disasm/main.go

@@ -22,8 +22,8 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/core/vm"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/core/vm"
 )
 
 func main() {

cmd/ethtest/main.go

@@ -25,9 +25,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/expanse-project/go-expanse/logger/glog"
-	"github.com/expanse-project/go-expanse/params"
-	"github.com/expanse-project/go-expanse/tests"
+	"github.com/expanse-org/go-expanse/logger/glog"
+	"github.com/expanse-org/go-expanse/params"
+	"github.com/expanse-org/go-expanse/tests"
 	"gopkg.in/urfave/cli.v1"
 
 )

cmd/evm/main.go

@@ -24,15 +24,15 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/expanse-project/go-expanse/cmd/utils"
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/core"
-	"github.com/expanse-project/go-expanse/core/state"
-	"github.com/expanse-project/go-expanse/core/types"
-	"github.com/expanse-project/go-expanse/core/vm"
-	"github.com/expanse-project/go-expanse/crypto"
-	"github.com/expanse-project/go-expanse/ethdb"
-	"github.com/expanse-project/go-expanse/logger/glog"
+	"github.com/expanse-org/go-expanse/cmd/utils"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/core"
+	"github.com/expanse-org/go-expanse/core/state"
+	"github.com/expanse-org/go-expanse/core/types"
+	"github.com/expanse-org/go-expanse/core/vm"
+	"github.com/expanse-org/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/ethdb"
+	"github.com/expanse-org/go-expanse/logger/glog"
 	"gopkg.in/urfave/cli.v1"
 )
 

cmd/geth/dao_test.go

@@ -23,10 +23,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/core"
-	"github.com/expanse-project/go-expanse/ethdb"
-	"github.com/expanse-project/go-expanse/params"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/core"
+	"github.com/expanse-org/go-expanse/ethdb"
+	"github.com/expanse-org/go-expanse/params"
 )
 
 // Genesis block for nodes which don't care about the DAO fork (i.e. not configured)

cmd/gethrpctest/main.go

@@ -24,17 +24,17 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/expanse-project/go-expanse/accounts"
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/core"
-	"github.com/expanse-project/go-expanse/crypto"
-	"github.com/expanse-project/go-expanse/eth"
-	"github.com/expanse-project/go-expanse/ethdb"
-	"github.com/expanse-project/go-expanse/logger/glog"
-	"github.com/expanse-project/go-expanse/node"
-	"github.com/expanse-project/go-expanse/params"
-	"github.com/expanse-project/go-expanse/tests"
-	"github.com/expanse-project/go-expanse/whisper"
+	"github.com/expanse-org/go-expanse/accounts"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/core"
+	"github.com/expanse-org/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/eth"
+	"github.com/expanse-org/go-expanse/ethdb"
+	"github.com/expanse-org/go-expanse/logger/glog"
+	"github.com/expanse-org/go-expanse/node"
+	"github.com/expanse-org/go-expanse/params"
+	"github.com/expanse-org/go-expanse/tests"
+	"github.com/expanse-org/go-expanse/whisper"
 )
 
 const defaultTestKey = "b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291"

cmd/gexp/accountcmd.go

@@ -20,12 +20,12 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/expanse-project/go-expanse/accounts"
-	"github.com/expanse-project/go-expanse/cmd/utils"
-	"github.com/expanse-project/go-expanse/console"
-	"github.com/expanse-project/go-expanse/crypto"
-	"github.com/expanse-project/go-expanse/logger"
-	"github.com/expanse-project/go-expanse/logger/glog"
+	"github.com/expanse-org/go-expanse/accounts"
+	"github.com/expanse-org/go-expanse/cmd/utils"
+	"github.com/expanse-org/go-expanse/console"
+	"github.com/expanse-org/go-expanse/crypto"
+	"github.com/expanse-org/go-expanse/logger"
+	"github.com/expanse-org/go-expanse/logger/glog"
 	"gopkg.in/urfave/cli.v1"
 )
 

cmd/gexp/accountcmd_test.go

@@ -172,7 +172,7 @@ Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could
 `)
 }
 
-// https://github.com/expanse-project/go-expanse/issues/1785
+// https://github.com/expanse-org/go-expanse/issues/1785
 func TestUnlockFlagMultiIndex(t *testing.T) {
 	datadir := tmpDatadirWithKeystore(t)
 	gexp := runGexp(t,

cmd/gexp/chaincmd.go

@@ -23,14 +23,14 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/expanse-project/go-expanse/cmd/utils"
-	"github.com/expanse-project/go-expanse/common"
-	"github.com/expanse-project/go-expanse/console"
-	"github.com/expanse-project/go-expanse/core"
-	"github.com/expanse-project/go-expanse/core/state"
-	"github.com/expanse-project/go-expanse/core/types"
-	"github.com/expanse-project/go-expanse/ethdb"
-	"github.com/expanse-project/go-expanse/logger/glog"
+	"github.com/expanse-org/go-expanse/cmd/utils"
+	"github.com/expanse-org/go-expanse/common"
+	"github.com/expanse-org/go-expanse/console"
+	"github.com/expanse-org/go-expanse/core"
+	"github.com/expanse-org/go-expanse/core/state"
+	"github.com/expanse-org/go-expanse/core/types"
+	"github.com/expanse-org/go-expanse/ethdb"
+	"github.com/expanse-org/go-expanse/logger/glog"
 	"gopkg.in/urfave/cli.v1"
 )
 

cmd/gexp/consolecmd.go

@@ -20,8 +20,8 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/expanse-project/go-expanse/cmd/utils"
-	"github.com/expanse-project/go-expanse/console"
+	"github.com/expanse-org/go-expanse/cmd/utils"
+	"github.com/expanse-org/go-expanse/console"
 	"gopkg.in/urfave/cli.v1"
 )
 
@@ -33,7 +33,7 @@ var (
 		Description: `
 The Gexp console is an interactive shell for the JavaScript runtime environment
 which exposes a node admin interface as well as the Ðapp JavaScript API.
-See https://github.com/expanse-project/go-expanse/wiki/Javascipt-Console
+See https://github.com/expanse-org/go-expanse/wiki/Javascipt-Console
 `,
 	}
 	attachCommand = cli.Command{
@@ -43,7 +43,7 @@ See https://github.com/expanse-project/go-expanse/wiki/Javascipt-Console
 		Description: `
 The Gexp console is an interactive shell for the JavaScript runtime environment
 which exposes a node admin interface as well as the Ðapp JavaScript API.
-See https://github.com/expanse-project/go-expanse/wiki/Javascipt-Console.
+See https://github.com/expanse-org/go-expanse/wiki/Javascipt-Console.
 This command allows to open a console on a running geth node.
 	`,
 	}
@@ -53,7 +53,7 @@ This command allows to open a console on a running geth node.
 		Usage:  `executes the given JavaScript files in the Gexp JavaScript VM`,
 		Description: `
 The JavaScript VM exposes a node admin interface as well as the Ðapp
-JavaScript API. See https://github.com/expanse-project/go-expanse/wiki/Javascipt-Console
+JavaScript API. See https://github.com/expanse-org/go-expanse/wiki/Javascipt-Console
 `,
 	}
 )

cmd/gexp/consolecmd_test.go

@@ -28,7 +28,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/expanse-project/go-expanse/rpc"
+	"github.com/expanse-org/go-expanse/rpc"
 )
 
 // Tests that a node embedded within a console can be started up properly and