diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index f87996cdcb947f3ffbfe33146c8a9db3260246c2..f68afdb82fb11d70e4fb744c1205e3323a1e8630 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -30,11 +30,11 @@ Please make sure your contributions adhere to our coding guidelines:
 Before you submit 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 
-[Wiki page](https://github.com/ethereum/go-ethereum/wiki) for more info
+[Wiki page](https://github.com/maticnetwork/bor/wiki) for more info
 and help.
 
 ## Configuration, dependencies, and tests
 
-Please see the [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide)
+Please see the [Developers' Guide](https://github.com/maticnetwork/bor/wiki/Developers'-Guide)
 for more details on configuring your environment, managing project dependencies
 and testing procedures.
diff --git a/.travis.yml b/.travis.yml
index 36defe308be05d83dd4803ca6d597baf6011c054..c3bc1696771ff33e96098271b26fb45b240cb6c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: go
-go_import_path: github.com/ethereum/go-ethereum
+go_import_path: github.com/maticnetwork/bor
 sudo: false
 matrix:
   include:
@@ -169,7 +169,7 @@ matrix:
         - mv android-ndk-r19b $ANDROID_HOME/ndk-bundle
 
         - mkdir -p $GOPATH/src/github.com/ethereum
-        - ln -s `pwd` $GOPATH/src/github.com/ethereum/go-ethereum
+        - ln -s `pwd` $GOPATH/src/github.com/maticnetwork/bor
         - go run build/ci.go aar -signer ANDROID_SIGNING_KEY -deploy https://oss.sonatype.org -upload gethstore/builds
 
     # This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads
diff --git a/Makefile b/Makefile
index 4bf52f5c9626ce4e06eb67fcff63fe02bd59000a..9f863193ea98df1ee5bbbb0bc3fc5166e02dffa5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,19 +2,19 @@
 # with Go source code. If you know what GOPATH is then you probably
 # don't need to bother with make.
 
-.PHONY: geth android ios geth-cross evm all test clean
-.PHONY: geth-linux geth-linux-386 geth-linux-amd64 geth-linux-mips64 geth-linux-mips64le
-.PHONY: geth-linux-arm geth-linux-arm-5 geth-linux-arm-6 geth-linux-arm-7 geth-linux-arm64
-.PHONY: geth-darwin geth-darwin-386 geth-darwin-amd64
-.PHONY: geth-windows geth-windows-386 geth-windows-amd64
+.PHONY: bor android ios bor-cross evm all test clean
+.PHONY: bor-linux bor-linux-386 bor-linux-amd64 bor-linux-mips64 bor-linux-mips64le
+.PHONY: bor-linux-arm bor-linux-arm-5 bor-linux-arm-6 bor-linux-arm-7 bor-linux-arm64
+.PHONY: bor-darwin bor-darwin-386 bor-darwin-amd64
+.PHONY: bor-windows bor-windows-386 bor-windows-amd64
 
 GOBIN = $(shell pwd)/build/bin
 GO ?= latest
 
-geth:
-	build/env.sh go run build/ci.go install ./cmd/geth
+bor:
+	build/env.sh go run build/ci.go install ./cmd/bor
 	@echo "Done building."
-	@echo "Run \"$(GOBIN)/geth\" to launch geth."
+	@echo "Run \"$(GOBIN)/bor\" to launch bor."
 
 all:
 	build/env.sh go run build/ci.go install
@@ -22,12 +22,12 @@ all:
 android:
 	build/env.sh go run build/ci.go aar --local
 	@echo "Done building."
-	@echo "Import \"$(GOBIN)/geth.aar\" to use the library."
+	@echo "Import \"$(GOBIN)/bor.aar\" to use the library."
 
 ios:
 	build/env.sh go run build/ci.go xcode --local
 	@echo "Done building."
-	@echo "Import \"$(GOBIN)/Geth.framework\" to use the library."
+	@echo "Import \"$(GOBIN)/bor.framework\" to use the library."
 
 test: all
 	build/env.sh go run build/ci.go test
@@ -54,92 +54,92 @@ devtools:
 
 # Cross Compilation Targets (xgo)
 
-geth-cross: geth-linux geth-darwin geth-windows geth-android geth-ios
+bor-cross: bor-linux bor-darwin bor-windows bor-android bor-ios
 	@echo "Full cross compilation done:"
-	@ls -ld $(GOBIN)/geth-*
+	@ls -ld $(GOBIN)/bor-*
 
-geth-linux: geth-linux-386 geth-linux-amd64 geth-linux-arm geth-linux-mips64 geth-linux-mips64le
+bor-linux: bor-linux-386 bor-linux-amd64 bor-linux-arm bor-linux-mips64 bor-linux-mips64le
 	@echo "Linux cross compilation done:"
-	@ls -ld $(GOBIN)/geth-linux-*
+	@ls -ld $(GOBIN)/bor-linux-*
 
-geth-linux-386:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/386 -v ./cmd/geth
+bor-linux-386:
+	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/386 -v ./cmd/bor
 	@echo "Linux 386 cross compilation done:"
-	@ls -ld $(GOBIN)/geth-linux-* | grep 386
+	@ls -ld $(GOBIN)/bor-linux-* | grep 386
 
-geth-linux-amd64:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/amd64 -v ./cmd/geth
+bor-linux-amd64:
+	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/amd64 -v ./cmd/bor
 	@echo "Linux amd64 cross compilation done:"
-	@ls -ld $(GOBIN)/geth-linux-* | grep amd64
+	@ls -ld $(GOBIN)/bor-linux-* | grep amd64
 
-geth-linux-arm: geth-linux-arm-5 geth-linux-arm-6 geth-linux-arm-7 geth-linux-arm64
+bor-linux-arm: bor-linux-arm-5 bor-linux-arm-6 bor-linux-arm-7 bor-linux-arm64
 	@echo "Linux ARM cross compilation done:"
-	@ls -ld $(GOBIN)/geth-linux-* | grep arm
+	@ls -ld $(GOBIN)/bor-linux-* | grep arm
 
-geth-linux-arm-5:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-5 -v ./cmd/geth
+bor-linux-arm-5:
+	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-5 -v ./cmd/bor
 	@echo "Linux ARMv5 cross compilation done:"
-	@ls -ld $(GOBIN)/geth-linux-* | grep arm-5
+	@ls -ld $(GOBIN)/bor-linux-* | grep arm-5
 
-geth-linux-arm-6:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-6 -v ./cmd/geth
+bor-linux-arm-6:
+	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-6 -v ./cmd/bor
 	@echo "Linux ARMv6 cross compilation done:"
-	@ls -ld $(GOBIN)/geth-linux-* | grep arm-6
+	@ls -ld $(GOBIN)/bor-linux-* | grep arm-6
 
-geth-linux-arm-7:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-7 -v ./cmd/geth
+bor-linux-arm-7:
+	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-7 -v ./cmd/bor
 	@echo "Linux ARMv7 cross compilation done:"
-	@ls -ld $(GOBIN)/geth-linux-* | grep arm-7
+	@ls -ld $(GOBIN)/bor-linux-* | grep arm-7
 
-geth-linux-arm64:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm64 -v ./cmd/geth
+bor-linux-arm64:
+	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm64 -v ./cmd/bor
 	@echo "Linux ARM64 cross compilation done:"
-	@ls -ld $(GOBIN)/geth-linux-* | grep arm64
+	@ls -ld $(GOBIN)/bor-linux-* | grep arm64
 
-geth-linux-mips:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips --ldflags '-extldflags "-static"' -v ./cmd/geth
+bor-linux-mips:
+	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips --ldflags '-extldflags "-static"' -v ./cmd/bor
 	@echo "Linux MIPS cross compilation done:"
-	@ls -ld $(GOBIN)/geth-linux-* | grep mips
+	@ls -ld $(GOBIN)/bor-linux-* | grep mips
 
-geth-linux-mipsle:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mipsle --ldflags '-extldflags "-static"' -v ./cmd/geth
+bor-linux-mipsle:
+	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mipsle --ldflags '-extldflags "-static"' -v ./cmd/bor
 	@echo "Linux MIPSle cross compilation done:"
-	@ls -ld $(GOBIN)/geth-linux-* | grep mipsle
+	@ls -ld $(GOBIN)/bor-linux-* | grep mipsle
 
-geth-linux-mips64:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64 --ldflags '-extldflags "-static"' -v ./cmd/geth
+bor-linux-mips64:
+	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64 --ldflags '-extldflags "-static"' -v ./cmd/bor
 	@echo "Linux MIPS64 cross compilation done:"
-	@ls -ld $(GOBIN)/geth-linux-* | grep mips64
+	@ls -ld $(GOBIN)/bor-linux-* | grep mips64
 
-geth-linux-mips64le:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64le --ldflags '-extldflags "-static"' -v ./cmd/geth
+bor-linux-mips64le:
+	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64le --ldflags '-extldflags "-static"' -v ./cmd/bor
 	@echo "Linux MIPS64le cross compilation done:"
-	@ls -ld $(GOBIN)/geth-linux-* | grep mips64le
+	@ls -ld $(GOBIN)/bor-linux-* | grep mips64le
 
-geth-darwin: geth-darwin-386 geth-darwin-amd64
+bor-darwin: bor-darwin-386 bor-darwin-amd64
 	@echo "Darwin cross compilation done:"
-	@ls -ld $(GOBIN)/geth-darwin-*
+	@ls -ld $(GOBIN)/bor-darwin-*
 
-geth-darwin-386:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/386 -v ./cmd/geth
+bor-darwin-386:
+	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/386 -v ./cmd/bor
 	@echo "Darwin 386 cross compilation done:"
-	@ls -ld $(GOBIN)/geth-darwin-* | grep 386
+	@ls -ld $(GOBIN)/bor-darwin-* | grep 386
 
-geth-darwin-amd64:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/amd64 -v ./cmd/geth
+bor-darwin-amd64:
+	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/amd64 -v ./cmd/bor
 	@echo "Darwin amd64 cross compilation done:"
-	@ls -ld $(GOBIN)/geth-darwin-* | grep amd64
+	@ls -ld $(GOBIN)/bor-darwin-* | grep amd64
 
-geth-windows: geth-windows-386 geth-windows-amd64
+bor-windows: bor-windows-386 bor-windows-amd64
 	@echo "Windows cross compilation done:"
-	@ls -ld $(GOBIN)/geth-windows-*
+	@ls -ld $(GOBIN)/bor-windows-*
 
-geth-windows-386:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/386 -v ./cmd/geth
+bor-windows-386:
+	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/386 -v ./cmd/bor
 	@echo "Windows 386 cross compilation done:"
-	@ls -ld $(GOBIN)/geth-windows-* | grep 386
+	@ls -ld $(GOBIN)/bor-windows-* | grep 386
 
-geth-windows-amd64:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/amd64 -v ./cmd/geth
+bor-windows-amd64:
+	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/amd64 -v ./cmd/bor
 	@echo "Windows amd64 cross compilation done:"
-	@ls -ld $(GOBIN)/geth-windows-* | grep amd64
+	@ls -ld $(GOBIN)/bor-windows-* | grep amd64
diff --git a/README.md b/README.md
index fd25941543b9343889e5972249c13d92dd033a6b..6e9beb9be4bc4d4be14a298a91dc01d9c9d8fc27 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,8 @@
 
 Official Golang implementation of the Ethereum protocol.
 
-[![API Reference](
-https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667
-)](https://godoc.org/github.com/ethereum/go-ethereum)
-[![Go Report Card](https://goreportcard.com/badge/github.com/ethereum/go-ethereum)](https://goreportcard.com/report/github.com/ethereum/go-ethereum)
+[![API Reference](https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667)](https://godoc.org/github.com/maticnetwork/bor)
+[![Go Report Card](https://goreportcard.com/badge/github.com/maticnetwork/bor)](https://goreportcard.com/report/github.com/maticnetwork/bor)
 [![Travis](https://travis-ci.org/ethereum/go-ethereum.svg?branch=master)](https://travis-ci.org/ethereum/go-ethereum)
 [![Discord](https://img.shields.io/badge/discord-join%20chat-blue.svg)](https://discord.gg/nthXNEv)
 
@@ -14,13 +12,13 @@ archives are published at https://geth.ethereum.org/downloads/.
 
 ## Building the source
 
-For prerequisites and detailed build instructions please read the [Installation Instructions](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum) on the wiki.
+For prerequisites and detailed build instructions please read the [Installation Instructions](https://github.com/maticnetwork/bor/wiki/Building-Ethereum) on the wiki.
 
-Building `geth` requires both a Go (version 1.10 or later) and a C compiler. You can install
+Building `bor` requires both a Go (version 1.10 or later) and a C compiler. You can install
 them using your favourite package manager. Once the dependencies are installed, run
 
 ```shell
-make geth
+make bor
 ```
 
 or, to build the full suite of utilities:
@@ -34,22 +32,22 @@ make all
 The go-ethereum project comes with several wrappers/executables found in the `cmd`
 directory.
 
-|    Command    | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| :-----------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-|  **`geth`**   | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default), archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as a gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `geth --help` and the [CLI Wiki page](https://github.com/ethereum/go-ethereum/wiki/Command-Line-Options) for command line options.          |
-|   `abigen`    | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI) with expanded functionality if the contract bytecode is also available. However, it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://github.com/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. |
-|  `bootnode`   | Stripped down version of our Ethereum client implementation that only takes part in the network node discovery protocol, but does not run any of the higher level application protocols. It can be used as a lightweight bootstrap node to aid in finding peers in private networks.                                                                                                                                                                                                                                                                 |
-|     `evm`     | Developer utility version of the EVM (Ethereum Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode. Its purpose is to allow isolated, fine-grained debugging of EVM opcodes (e.g. `evm --code 60ff60ff --debug`).                                                                                                                                                                                                                                                                     |
-| `gethrpctest` | Developer utility tool to support our [ethereum/rpc-test](https://github.com/ethereum/rpc-tests) test suite which validates baseline conformity to the [Ethereum JSON RPC](https://github.com/ethereum/wiki/wiki/JSON-RPC) specs. Please see the [test suite's readme](https://github.com/ethereum/rpc-tests/blob/master/README.md) for details.                                                                                                                                                                                                     |
-|   `rlpdump`   | Developer utility tool to convert binary RLP ([Recursive Length Prefix](https://github.com/ethereum/wiki/wiki/RLP)) dumps (data encoding used by the Ethereum protocol both network as well as consensus wise) to user-friendlier hierarchical representation (e.g. `rlpdump --hex CE0183FFFFFFC4C304050583616263`).                                                                                                                                                                                                                                 |
-|   `puppeth`   | a CLI wizard that aids in creating a new Ethereum network.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+|    Command    | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| :-----------: | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+|   **`bor`**   | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default), archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as a gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `geth --help` and the [CLI Wiki page](https://github.com/maticnetwork/bor/wiki/Command-Line-Options) for command line options.          |
+|   `abigen`    | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI) with expanded functionality if the contract bytecode is also available. However, it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://github.com/maticnetwork/bor/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. |
+|  `bootnode`   | Stripped down version of our Ethereum client implementation that only takes part in the network node discovery protocol, but does not run any of the higher level application protocols. It can be used as a lightweight bootstrap node to aid in finding peers in private networks.                                                                                                                                                                                                                                                             |
+|     `evm`     | Developer utility version of the EVM (Ethereum Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode. Its purpose is to allow isolated, fine-grained debugging of EVM opcodes (e.g. `evm --code 60ff60ff --debug`).                                                                                                                                                                                                                                                                 |
+| `gethrpctest` | Developer utility tool to support our [ethereum/rpc-test](https://github.com/ethereum/rpc-tests) test suite which validates baseline conformity to the [Ethereum JSON RPC](https://github.com/ethereum/wiki/wiki/JSON-RPC) specs. Please see the [test suite's readme](https://github.com/ethereum/rpc-tests/blob/master/README.md) for details.                                                                                                                                                                                                 |
+|   `rlpdump`   | Developer utility tool to convert binary RLP ([Recursive Length Prefix](https://github.com/ethereum/wiki/wiki/RLP)) dumps (data encoding used by the Ethereum protocol both network as well as consensus wise) to user-friendlier hierarchical representation (e.g. `rlpdump --hex CE0183FFFFFFC4C304050583616263`).                                                                                                                                                                                                                             |
+|   `puppeth`   | a CLI wizard that aids in creating a new Ethereum network.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 
-## Running `geth`
+## Running `bor`
 
 Going through all the possible command line flags is out of scope here (please consult our
 [CLI Wiki page](https://github.com/ethereum/go-ethereum/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 `geth` instance.
+on how you can run your own `bor` instance.
 
 ### Full node on the main Ethereum network
 
@@ -63,14 +61,15 @@ $ geth console
 ```
 
 This command will:
- * Start `geth` in fast sync mode (default, can be changed with the `--syncmode` flag),
-   causing it to download more data in exchange for avoiding processing the entire history
-   of the Ethereum network, which is very CPU intensive.
- * Start up `geth`'s built-in interactive [JavaScript console](https://github.com/ethereum/go-ethereum/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 `geth`'s own [management APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs).
-   This tool is optional and if you leave it out you can always attach to an already running
-   `geth` instance with `geth attach`.
+
+- Start `geth` in fast sync mode (default, can be changed with the `--syncmode` flag),
+  causing it to download more data in exchange for avoiding processing the entire history
+  of the Ethereum network, which is very CPU intensive.
+- Start up `geth`'s built-in interactive [JavaScript console](https://github.com/ethereum/go-ethereum/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 `geth`'s own [management APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs).
+  This tool is optional and if you leave it out you can always attach to an already running
+  `geth` instance with `geth attach`.
 
 ### A Full node on the Ethereum test network
 
@@ -89,79 +88,46 @@ useful on the testnet too. Please see above for their explanations if you've ski
 
 Specifying the `--testnet` flag, however, will reconfigure your `geth` instance a bit:
 
- * Instead of using the default data directory (`~/.ethereum` on Linux for example), `geth`
-   will nest itself one level deeper into a `testnet` subfolder (`~/.ethereum/testnet` on
-   Linux). Note, on OSX and Linux this also means that attaching to a running testnet node
-   requires the use of a custom endpoint since `geth attach` will try to attach to a
-   production node endpoint by default. E.g.
-   `geth attach <datadir>/testnet/geth.ipc`. Windows users are not affected by
-   this.
- * Instead of connecting the main Ethereum network, the client will connect to the test
-   network, which uses different P2P bootnodes, different network IDs and genesis states.
-   
-*Note: Although there are some internal protective measures to prevent transactions from
+- Instead of using the default data directory (`~/.ethereum` on Linux for example), `geth`
+  will nest itself one level deeper into a `testnet` subfolder (`~/.ethereum/testnet` on
+  Linux). Note, on OSX and Linux this also means that attaching to a running testnet node
+  requires the use of a custom endpoint since `geth attach` will try to attach to a
+  production node endpoint by default. E.g.
+  `geth attach <datadir>/testnet/bor.ipc`. Windows users are not affected by
+  this.
+- Instead of connecting the main Ethereum network, the client will connect to the test
+  network, which uses different P2P bootnodes, different network IDs and genesis states.
+
+_Note: Although there are some internal protective measures to prevent transactions from
 crossing over between the main network and test network, you should make sure to always
 use separate accounts for play-money and real-money. Unless you manually move
 accounts, `geth` will by default correctly separate the two networks and will not make any
-accounts available between them.*
-
-### Full node on the Rinkeby test network
-
-The above test network is a cross-client one based on the ethash proof-of-work consensus
-algorithm. As such, it has certain extra overhead and is more susceptible to reorganization
-attacks due to the network's low difficulty/security. Go Ethereum also supports connecting
-to a proof-of-authority based test network called [*Rinkeby*](https://www.rinkeby.io)
-(operated by members of the community). This network is lighter, more secure, but is only
-supported by go-ethereum.
-
-```shell
-$ geth --rinkeby console
-```
+accounts available between them._
 
 ### Configuration
 
-As an alternative to passing the numerous flags to the `geth` binary, you can also pass a
+As an alternative to passing the numerous flags to the `bor` binary, you can also pass a
 configuration file via:
 
 ```shell
-$ geth --config /path/to/your_config.toml
+$ bor --config /path/to/your_config.toml
 ```
 
 To get an idea how the file should look like you can use the `dumpconfig` subcommand to
 export your existing configuration:
 
 ```shell
-$ geth --your-favourite-flags dumpconfig
-```
-
-*Note: This works only with `geth` v1.6.0 and above.*
-
-#### Docker quick start
-
-One of the quickest ways to get Ethereum up and running on your machine is by using
-Docker:
-
-```shell
-docker run -d --name ethereum-node -v /Users/alice/ethereum:/root \
-           -p 8545:8545 -p 30303:30303 \
-           ethereum/client-go
+$ bor --your-favourite-flags dumpconfig
 ```
 
-This will start `geth` in fast-sync mode with a DB memory allowance of 1GB just as the
-above command does.  It will also create a persistent volume in your home directory for
-saving your blockchain as well as map the default ports. There is also an `alpine` tag
-available for a slim version of the image.
+_Note: This works only with `geth` v1.6.0 and above._
 
-Do not forget `--rpcaddr 0.0.0.0`, if you want to access RPC from other containers
-and/or hosts. By default, `geth` binds to the local interface and RPC endpoints is not
-accessible from the outside.
-
-### Programmatically interfacing `geth` nodes
+### Programmatically interfacing `bor` nodes
 
 As a developer, sooner rather than later you'll want to start interacting with `geth` and the
 Ethereum network via your own programs and not manually through the console. To aid
 this, `geth` has built-in support for a JSON-RPC based APIs ([standard APIs](https://github.com/ethereum/wiki/wiki/JSON-RPC)
-and [`geth` specific APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs)).
+and [`bor` specific APIs](https://github.com/maticnetwork/bor/wiki/Management-APIs)).
 These can be exposed via HTTP, WebSockets and IPC (UNIX sockets on UNIX based
 platforms, and named pipes on Windows).
 
@@ -172,19 +138,19 @@ you'd expect.
 
 HTTP based JSON-RPC API options:
 
-  * `--rpc` Enable the HTTP-RPC server
-  * `--rpcaddr` HTTP-RPC server listening interface (default: `localhost`)
-  * `--rpcport` HTTP-RPC server listening port (default: `8545`)
-  * `--rpcapi` API's offered over the HTTP-RPC interface (default: `eth,net,web3`)
-  * `--rpccorsdomain` Comma separated list of domains from which to accept cross origin requests (browser enforced)
-  * `--ws` Enable the WS-RPC server
-  * `--wsaddr` WS-RPC server listening interface (default: `localhost`)
-  * `--wsport` WS-RPC server listening port (default: `8546`)
-  * `--wsapi` API's offered over the WS-RPC interface (default: `eth,net,web3`)
-  * `--wsorigins` Origins from which to accept websockets requests
-  * `--ipcdisable` Disable the IPC-RPC server
-  * `--ipcapi` API's offered over the IPC-RPC interface (default: `admin,debug,eth,miner,net,personal,shh,txpool,web3`)
-  * `--ipcpath` Filename for IPC socket/pipe within the datadir (explicit paths escape it)
+- `--rpc` Enable the HTTP-RPC server
+- `--rpcaddr` HTTP-RPC server listening interface (default: `localhost`)
+- `--rpcport` HTTP-RPC server listening port (default: `8545`)
+- `--rpcapi` API's offered over the HTTP-RPC interface (default: `eth,net,web3`)
+- `--rpccorsdomain` Comma separated list of domains from which to accept cross origin requests (browser enforced)
+- `--ws` Enable the WS-RPC server
+- `--wsaddr` WS-RPC server listening interface (default: `localhost`)
+- `--wsport` WS-RPC server listening port (default: `8546`)
+- `--wsapi` API's offered over the WS-RPC interface (default: `eth,net,web3`)
+- `--wsorigins` Origins from which to accept websockets requests
+- `--ipcdisable` Disable the IPC-RPC server
+- `--ipcapi` API's offered over the IPC-RPC interface (default: `admin,debug,eth,miner,net,personal,shh,txpool,web3`)
+- `--ipcpath` Filename for IPC socket/pipe within the datadir (explicit paths escape it)
 
 You'll need to use your own programming environments' capabilities (libraries, tools, etc) to
 connect via HTTP, WS or IPC to a `geth` node configured with the above flags and you'll
@@ -197,148 +163,12 @@ Ethereum nodes with exposed APIs! Further, all browser tabs can access locally
 running web servers, so malicious web pages could try to subvert locally available
 APIs!**
 
-### Operating a private network
-
-Maintaining your own private network is more involved as a lot of configurations taken for
-granted in the official networks need to be manually set up.
-
-#### Defining the private genesis state
-
-First, you'll need to create the genesis state of your networks, which all nodes need to be
-aware of and agree upon. This consists of a small JSON file (e.g. call it `genesis.json`):
-
-```json
-{
-  "config": {
-    "chainId": 0,
-    "homesteadBlock": 0,
-    "eip155Block": 0,
-    "eip158Block": 0
-  },
-  "alloc": {},
-  "coinbase": "0x0000000000000000000000000000000000000000",
-  "difficulty": "0x20000",
-  "extraData": "",
-  "gasLimit": "0x2fefd8",
-  "nonce": "0x0000000000000042",
-  "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "timestamp": "0x00"
-}
-```
-
-The above fields should be fine for most purposes, although we'd recommend changing
-the `nonce` to some random value so you prevent unknown remote nodes from being able
-to connect to you. If you'd like to pre-fund some accounts for easier testing, you can
-populate the `alloc` field with account configs:
-
-```json
-"alloc": {
-  "0x0000000000000000000000000000000000000001": {
-    "balance": "111111111"
-  },
-  "0x0000000000000000000000000000000000000002": {
-    "balance": "222222222"
-  }
-}
-```
-
-With the genesis state defined in the above JSON file, you'll need to initialize **every**
-`geth` node with it prior to starting it up to ensure all blockchain parameters are correctly
-set:
-
-```shell
-$ geth init path/to/genesis.json
-```
-
-#### Creating the rendezvous point
-
-With all nodes that you want to run initialized to the desired genesis state, you'll need to
-start a bootstrap node that others can use to find each other in your network and/or over
-the internet. The clean way is to configure and run a dedicated bootnode:
-
-```shell
-$ bootnode --genkey=boot.key
-$ bootnode --nodekey=boot.key
-```
-
-With the bootnode online, it will display an [`enode` URL](https://github.com/ethereum/wiki/wiki/enode-url-format)
-that other nodes can use to connect to it and exchange peer information. Make sure to
-replace the displayed IP address information (most probably `[::]`) with your externally
-accessible IP to get the actual `enode` URL.
-
-*Note: You could also use a full-fledged `geth` node as a bootnode, but it's the less
-recommended way.*
-
-#### Starting up your member nodes
-
-With the bootnode operational and externally reachable (you can try
-`telnet <ip> <port>` to ensure it's indeed reachable), start every subsequent `geth`
-node pointed to the bootnode for peer discovery via the `--bootnodes` flag. It will
-probably also be desirable to keep the data directory of your private network separated, so
-do also specify a custom `--datadir` flag.
-
-```shell
-$ geth --datadir=path/to/custom/data/folder --bootnodes=<bootnode-enode-url-from-above>
-```
-
-*Note: Since your network will be completely cut off from the main and test networks, you'll
-also need to configure a miner to process transactions and create new blocks for you.*
-
-#### Running a private miner
-
-Mining on the public Ethereum network is a complex task as it's only feasible using GPUs,
-requiring an OpenCL or CUDA enabled `ethminer` instance. For information on such a
-setup, please consult the [EtherMining subreddit](https://www.reddit.com/r/EtherMining/)
-and the [Genoil miner](https://github.com/Genoil/cpp-ethereum) repository.
-
-In a private network setting, however a single CPU miner instance is more than enough for
-practical purposes as it can produce a stable stream of blocks at the correct intervals
-without needing heavy resources (consider running on a single thread, no need for multiple
-ones either). To start a `geth` instance for mining, run it with all your usual flags, extended
-by:
-
-```shell
-$ geth <usual-flags> --mine --minerthreads=1 --etherbase=0x0000000000000000000000000000000000000000
-```
-
-Which will start mining blocks and transactions on a single CPU thread, crediting all
-proceedings to the account specified by `--etherbase`. You can further tune the mining
-by changing the default gas limit blocks converge to (`--targetgaslimit`) and the price
-transactions are accepted at (`--gasprice`).
-
-## Contribution
-
-Thank you for considering to help out with the source code! We welcome contributions
-from anyone on the internet, and are grateful for even the smallest of fixes!
-
-If you'd like to contribute to go-ethereum, 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/ethereum/go-ethereum)
-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.
-
-Please make sure your contributions adhere to our coding guidelines:
-
- * Code must adhere to the official Go [formatting](https://golang.org/doc/effective_go.html#formatting)
-   guidelines (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)).
- * Code must be documented adhering to the official Go [commentary](https://golang.org/doc/effective_go.html#commentary)
-   guidelines.
- * Pull requests need to be based on and opened against the `master` branch.
- * Commit messages should be prefixed with the package(s) they modify.
-   * E.g. "eth, rpc: make trace configs optional"
-
-Please see the [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide)
-for more details on configuring your environment, managing project dependencies, and
-testing procedures.
-
 ## License
 
-The go-ethereum library (i.e. all code outside of the `cmd` directory) is licensed under the
+The bor library (i.e. all code outside of the `cmd` directory) is licensed under the
 [GNU Lesser General Public License v3.0](https://www.gnu.org/licenses/lgpl-3.0.en.html),
 also included in our repository in the `COPYING.LESSER` file.
 
-The go-ethereum binaries (i.e. all code inside of the `cmd` directory) is licensed under the
+The bor binaries (i.e. all code inside of the `cmd` directory) is licensed under the
 [GNU General Public License v3.0](https://www.gnu.org/licenses/gpl-3.0.en.html), also
 included in our repository in the `COPYING` file.
diff --git a/SECURITY.md b/SECURITY.md
index bc54ede42fac379960dc664013d0f2f816cb30a4..525da2eaadb3f5bedb03d5003b16db5d01edf3b9 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,13 +6,13 @@ Please see Releases. We recommend to use the most recent released version.
 
 ## Audit reports
 
-Audit reports are published in the `docs` folder: https://github.com/ethereum/go-ethereum/tree/master/docs/audits 
+Audit reports are published in the `docs` folder: https://github.com/maticnetwork/bor/tree/master/docs/audits 
 
 
 | Scope | Date | Report Link |
 | ------- | ------- | ----------- |
-| `geth` | 20170425 | [pdf](https://github.com/ethereum/go-ethereum/blob/master/docs/audits/2017-04-25_Geth-audit_Truesec.pdf) |
-| `clef` | 20180914 | [pdf](https://github.com/ethereum/go-ethereum/blob/master/docs/audits/2018-09-14_Clef-audit_NCC.pdf) |
+| `geth` | 20170425 | [pdf](https://github.com/maticnetwork/bor/blob/master/docs/audits/2017-04-25_Geth-audit_Truesec.pdf) |
+| `clef` | 20180914 | [pdf](https://github.com/maticnetwork/bor/blob/master/docs/audits/2018-09-14_Clef-audit_NCC.pdf) |
 
 
 
diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go
index 97a3a98bd33d6a30e094861a3943043e7e1a8c6b..ba242b14e5888e881dfa70e9e84bc5269335fafa 100644
--- a/accounts/abi/abi.go
+++ b/accounts/abi/abi.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 // The ABI holds information about a contract's context and available
diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go
index 9cfe4208d503d6d6b4ce8c99c50ddd03cfd7a721..ee6979c054a39a41895c93ceb6a964fe6f158d1c 100644
--- a/accounts/abi/abi_test.go
+++ b/accounts/abi/abi_test.go
@@ -26,8 +26,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 const jsondata = `
diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go
index e51f0bd8ead54271f13a2781dfb6dcb0f24ebee6..7a75a989bd2ce116f3c5ebd89eca675efac04c0e 100644
--- a/accounts/abi/bind/auth.go
+++ b/accounts/abi/bind/auth.go
@@ -22,12 +22,12 @@ import (
 	"io"
 	"io/ioutil"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/external"
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/external"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 // NewTransactor is a utility method to easily create a transaction signer from
diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go
index ca60cc1b43203258f4fcb750c78d4f43c8eaf14c..1d93807d156f1686c55c34cd40f568b04150f86e 100644
--- a/accounts/abi/bind/backend.go
+++ b/accounts/abi/bind/backend.go
@@ -21,9 +21,9 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 var (
diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go
index 6c59092b795d6474eef31526fcd03fee49fa2776..58c2c4a44d95d06e167e80ced9a36ea1a1ef3349 100644
--- a/accounts/abi/bind/backends/simulated.go
+++ b/accounts/abi/bind/backends/simulated.go
@@ -24,22 +24,22 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/bloombits"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/eth/filters"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/bloombits"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/eth/filters"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // This nil assignment ensures compile time that SimulatedBackend implements bind.ContractBackend.
diff --git a/accounts/abi/bind/backends/simulated_test.go b/accounts/abi/bind/backends/simulated_test.go
index bd75807d7513623123852f714489b430fbbeb9b5..a142b35167fdaf67eeb2d311152bf72f79978ec1 100644
--- a/accounts/abi/bind/backends/simulated_test.go
+++ b/accounts/abi/bind/backends/simulated_test.go
@@ -21,13 +21,13 @@ import (
 	"math/big"
 	"testing"
 
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
+	ethereum "github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 func TestSimulatedBackend(t *testing.T) {
diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go
index f70f911d37b2bae9344245be9adaae0631bf1a70..93a43f5029ffd592100fc44e34f5078721cea745 100644
--- a/accounts/abi/bind/base.go
+++ b/accounts/abi/bind/base.go
@@ -22,12 +22,12 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/event"
+	"github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/accounts/abi"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/event"
 )
 
 // SignerFn is a signer function callback when a contract requires a method to
diff --git a/accounts/abi/bind/base_test.go b/accounts/abi/bind/base_test.go
index 3ae685e00f0ad55a519340816362d78628fd6460..08b28b3366a6765055a9b42cc0f7f97b8ba7afba 100644
--- a/accounts/abi/bind/base_test.go
+++ b/accounts/abi/bind/base_test.go
@@ -23,14 +23,14 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/accounts/abi"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 type mockCaller struct {
diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go
index cd8c942b573568f4867d5333c0deebd3667fad6b..e07cc04893a1ce1d1d03de262f53c704ebf50d0d 100644
--- a/accounts/abi/bind/bind.go
+++ b/accounts/abi/bind/bind.go
@@ -17,7 +17,7 @@
 // Package bind generates Ethereum contract Go bindings.
 //
 // Detailed usage document and tutorial available on the go-ethereum Wiki page:
-// https://github.com/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts
+// https://github.com/maticnetwork/bor/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts
 package bind
 
 import (
@@ -30,8 +30,8 @@ import (
 	"text/template"
 	"unicode"
 
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/accounts/abi"
+	"github.com/maticnetwork/bor/log"
 )
 
 // Lang is a target programming language selector to generate bindings for.
diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go
index f11966c8124ee0bb8f32f706960ef45e14cfa48a..49c1b8da76ba5c1e5489616d52bfd58abc7a5fcb 100644
--- a/accounts/abi/bind/bind_test.go
+++ b/accounts/abi/bind/bind_test.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 var bindTests = []struct {
@@ -46,7 +46,7 @@ var bindTests = []struct {
 		`contract NilContract {}`,
 		[]string{`606060405260068060106000396000f3606060405200`},
 		[]string{`[]`},
-		`"github.com/ethereum/go-ethereum/common"`,
+		`"github.com/maticnetwork/bor/common"`,
 		`
 			if b, err := NewEmpty(common.Address{}, nil); b == nil || err != nil {
 				t.Fatalf("combined binding (%v) nil or error (%v) not nil", b, nil)
@@ -68,7 +68,7 @@ var bindTests = []struct {
 		`https://ethereum.org/token`,
 		[]string{`60606040526040516107fd3803806107fd83398101604052805160805160a05160c051929391820192909101600160a060020a0333166000908152600360209081526040822086905581548551838052601f6002600019610100600186161502019093169290920482018390047f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56390810193919290918801908390106100e857805160ff19168380011785555b506101189291505b8082111561017157600081556001016100b4565b50506002805460ff19168317905550505050610658806101a56000396000f35b828001600101855582156100ac579182015b828111156100ac5782518260005055916020019190600101906100fa565b50508060016000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017557805160ff19168380011785555b506100c89291506100b4565b5090565b82800160010185558215610165579182015b8281111561016557825182600050559160200191906001019061018756606060405236156100775760e060020a600035046306fdde03811461007f57806323b872dd146100dc578063313ce5671461010e57806370a082311461011a57806395d89b4114610132578063a9059cbb1461018e578063cae9ca51146101bd578063dc3080f21461031c578063dd62ed3e14610341575b610365610002565b61036760008054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156104eb5780601f106104c0576101008083540402835291602001916104eb565b6103d5600435602435604435600160a060020a038316600090815260036020526040812054829010156104f357610002565b6103e760025460ff1681565b6103d560043560036020526000908152604090205481565b610367600180546020600282841615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156104eb5780601f106104c0576101008083540402835291602001916104eb565b610365600435602435600160a060020a033316600090815260036020526040902054819010156103f157610002565b60806020604435600481810135601f8101849004909302840160405260608381526103d5948235946024803595606494939101919081908382808284375094965050505050505060006000836004600050600033600160a060020a03168152602001908152602001600020600050600087600160a060020a031681526020019081526020016000206000508190555084905080600160a060020a0316638f4ffcb1338630876040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a03168152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156102f25780820380516001836020036101000a031916815260200191505b50955050505050506000604051808303816000876161da5a03f11561000257505050509392505050565b6005602090815260043560009081526040808220909252602435815220546103d59081565b60046020818152903560009081526040808220909252602435815220546103d59081565b005b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156103c75780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60408051918252519081900360200190f35b6060908152602090f35b600160a060020a03821660009081526040902054808201101561041357610002565b806003600050600033600160a060020a03168152602001908152602001600020600082828250540392505081905550806003600050600084600160a060020a0316815260200190815260200160002060008282825054019250508190555081600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b820191906000526020600020905b8154815290600101906020018083116104ce57829003601f168201915b505050505081565b600160a060020a03831681526040812054808301101561051257610002565b600160a060020a0380851680835260046020908152604080852033949094168086529382528085205492855260058252808520938552929052908220548301111561055c57610002565b816003600050600086600160a060020a03168152602001908152602001600020600082828250540392505081905550816003600050600085600160a060020a03168152602001908152602001600020600082828250540192505081905550816005600050600086600160a060020a03168152602001908152602001600020600050600033600160a060020a0316815260200190815260200160002060008282825054019250508190555082600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3939250505056`},
 		[]string{`[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"},{"name":"_extraData","type":"bytes"}],"name":"approveAndCall","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"spentAllowance","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"inputs":[{"name":"initialSupply","type":"uint256"},{"name":"tokenName","type":"string"},{"name":"decimalUnits","type":"uint8"},{"name":"tokenSymbol","type":"string"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"}]`},
-		`"github.com/ethereum/go-ethereum/common"`,
+		`"github.com/maticnetwork/bor/common"`,
 		`
 			if b, err := NewToken(common.Address{}, nil); b == nil || err != nil {
 				t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil)
@@ -83,7 +83,7 @@ var bindTests = []struct {
 		`https://ethereum.org/crowdsale`,
 		[]string{`606060408190526007805460ff1916905560a0806105a883396101006040529051608051915160c05160e05160008054600160a060020a03199081169095178155670de0b6b3a7640000958602600155603c9093024201600355930260045560058054909216909217905561052f90819061007990396000f36060604052361561006c5760e060020a600035046301cb3b20811461008257806329dcb0cf1461014457806338af3eed1461014d5780636e66f6e91461015f5780637a3a0e84146101715780637b3e5e7b1461017a578063a035b1fe14610183578063dc0d3dff1461018c575b61020060075460009060ff161561032357610002565b61020060035460009042106103205760025460015490106103cb576002548154600160a060020a0316908290606082818181858883f150915460025460408051600160a060020a039390931683526020830191909152818101869052517fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf6945090819003909201919050a15b60405160008054600160a060020a039081169230909116319082818181858883f150506007805460ff1916600117905550505050565b6103a160035481565b6103ab600054600160a060020a031681565b6103ab600554600160a060020a031681565b6103a160015481565b6103a160025481565b6103a160045481565b6103be60043560068054829081101561000257506000526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f8101547ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d409190910154600160a060020a03919091169082565b005b505050815481101561000257906000526020600020906002020160005060008201518160000160006101000a815481600160a060020a030219169083021790555060208201518160010160005055905050806002600082828250540192505081905550600560009054906101000a9004600160a060020a0316600160a060020a031663a9059cbb3360046000505484046040518360e060020a0281526004018083600160a060020a03168152602001828152602001925050506000604051808303816000876161da5a03f11561000257505060408051600160a060020a03331681526020810184905260018183015290517fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf692509081900360600190a15b50565b5060a0604052336060908152346080819052600680546001810180835592939282908280158290116102025760020281600202836000526020600020918201910161020291905b8082111561039d57805473ffffffffffffffffffffffffffffffffffffffff19168155600060019190910190815561036a565b5090565b6060908152602090f35b600160a060020a03166060908152602090f35b6060918252608052604090f35b5b60065481101561010e576006805482908110156100025760009182526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f0190600680549254600160a060020a0316928490811015610002576002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40015460405190915082818181858883f19350505050507fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf660066000508281548110156100025760008290526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f01548154600160a060020a039190911691908490811015610002576002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40015460408051600160a060020a0394909416845260208401919091526000838201525191829003606001919050a16001016103cc56`},
 		[]string{`[{"constant":false,"inputs":[],"name":"checkGoalReached","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"deadline","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"beneficiary","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"tokenReward","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"fundingGoal","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"amountRaised","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"price","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"funders","outputs":[{"name":"addr","type":"address"},{"name":"amount","type":"uint256"}],"type":"function"},{"inputs":[{"name":"ifSuccessfulSendTo","type":"address"},{"name":"fundingGoalInEthers","type":"uint256"},{"name":"durationInMinutes","type":"uint256"},{"name":"etherCostOfEachToken","type":"uint256"},{"name":"addressOfTokenUsedAsReward","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"backer","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"isContribution","type":"bool"}],"name":"FundTransfer","type":"event"}]`},
-		`"github.com/ethereum/go-ethereum/common"`,
+		`"github.com/maticnetwork/bor/common"`,
 		`
 			if b, err := NewCrowdsale(common.Address{}, nil); b == nil || err != nil {
 				t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil)
@@ -98,7 +98,7 @@ var bindTests = []struct {
 		`https://ethereum.org/dao`,
 		[]string{`606060405260405160808061145f833960e06040529051905160a05160c05160008054600160a060020a03191633179055600184815560028490556003839055600780549182018082558280158290116100b8576003028160030283600052602060002091820191016100b891906101c8565b50506060919091015160029190910155600160a060020a0381166000146100a65760008054600160a060020a031916821790555b505050506111f18061026e6000396000f35b505060408051608081018252600080825260208281018290528351908101845281815292820192909252426060820152600780549194509250811015610002579081527fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c6889050815181546020848101517401000000000000000000000000000000000000000002600160a060020a03199290921690921760a060020a60ff021916178255604083015180516001848101805460008281528690209195600293821615610100026000190190911692909204601f9081018390048201949192919091019083901061023e57805160ff19168380011785555b50610072929150610226565b5050600060028201556001015b8082111561023a578054600160a860020a031916815560018181018054600080835592600290821615610100026000190190911604601f81901061020c57506101bb565b601f0160209004906000526020600020908101906101bb91905b8082111561023a5760008155600101610226565b5090565b828001600101855582156101af579182015b828111156101af57825182600050559160200191906001019061025056606060405236156100b95760e060020a6000350463013cf08b81146100bb578063237e9492146101285780633910682114610281578063400e3949146102995780635daf08ca146102a257806369bd34361461032f5780638160f0b5146103385780638da5cb5b146103415780639644fcbd14610353578063aa02a90f146103be578063b1050da5146103c7578063bcca1fd3146104b5578063d3c0715b146104dc578063eceb29451461058d578063f2fde38b1461067b575b005b61069c6004356004805482908110156100025790600052602060002090600a02016000506005810154815460018301546003840154600485015460068601546007870154600160a060020a03959095169750929560020194919360ff828116946101009093041692919089565b60408051602060248035600481810135601f81018590048502860185019096528585526107759581359591946044949293909201918190840183828082843750949650505050505050600060006004600050848154811015610002575090527f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19e600a8402908101547f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b909101904210806101e65750600481015460ff165b8061026757508060000160009054906101000a9004600160a060020a03168160010160005054846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f15090500193505050506040518091039020816007016000505414155b8061027757506001546005820154105b1561109257610002565b61077560043560066020526000908152604090205481565b61077560055481565b61078760043560078054829081101561000257506000526003026000805160206111d18339815191528101547fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c68a820154600160a060020a0382169260a060020a90920460ff16917fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c689019084565b61077560025481565b61077560015481565b610830600054600160a060020a031681565b604080516020604435600481810135601f81018490048402850184019095528484526100b9948135946024803595939460649492939101918190840183828082843750949650505050505050600080548190600160a060020a03908116339091161461084d57610002565b61077560035481565b604080516020604435600481810135601f8101849004840285018401909552848452610775948135946024803595939460649492939101918190840183828082843750506040805160209735808a0135601f81018a90048a0283018a019093528282529698976084979196506024909101945090925082915084018382808284375094965050505050505033600160a060020a031660009081526006602052604081205481908114806104ab5750604081205460078054909190811015610002579082526003026000805160206111d1833981519152015460a060020a900460ff16155b15610ce557610002565b6100b960043560243560443560005433600160a060020a03908116911614610b1857610002565b604080516020604435600481810135601f810184900484028501840190955284845261077594813594602480359593946064949293910191819084018382808284375094965050505050505033600160a060020a031660009081526006602052604081205481908114806105835750604081205460078054909190811015610002579082526003026000805160206111d18339815191520181505460a060020a900460ff16155b15610f1d57610002565b604080516020606435600481810135601f81018490048402850184019095528484526107759481359460248035956044359560849492019190819084018382808284375094965050505050505060006000600460005086815481101561000257908252600a027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01815090508484846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160070160005054149150610cdc565b6100b960043560005433600160a060020a03908116911614610f0857610002565b604051808a600160a060020a031681526020018981526020018060200188815260200187815260200186815260200185815260200184815260200183815260200182810382528981815460018160011615610100020316600290048152602001915080546001816001161561010002031660029004801561075e5780601f106107335761010080835404028352916020019161075e565b820191906000526020600020905b81548152906001019060200180831161074157829003601f168201915b50509a505050505050505050505060405180910390f35b60408051918252519081900360200190f35b60408051600160a060020a038616815260208101859052606081018390526080918101828152845460026001821615610100026000190190911604928201839052909160a08301908590801561081e5780601f106107f35761010080835404028352916020019161081e565b820191906000526020600020905b81548152906001019060200180831161080157829003601f168201915b50509550505050505060405180910390f35b60408051600160a060020a03929092168252519081900360200190f35b600160a060020a03851660009081526006602052604081205414156108a957604060002060078054918290556001820180825582801582901161095c5760030281600302836000526020600020918201910161095c9190610a4f565b600160a060020a03851660009081526006602052604090205460078054919350908390811015610002575060005250600381026000805160206111d183398151915201805474ff0000000000000000000000000000000000000000191660a060020a85021781555b60408051600160a060020a03871681526020810186905281517f27b022af4a8347100c7a041ce5ccf8e14d644ff05de696315196faae8cd50c9b929181900390910190a15050505050565b505050915081506080604051908101604052808681526020018581526020018481526020014281526020015060076000508381548110156100025790600052602060002090600302016000508151815460208481015160a060020a02600160a060020a03199290921690921774ff00000000000000000000000000000000000000001916178255604083015180516001848101805460008281528690209195600293821615610100026000190190911692909204601f90810183900482019491929190910190839010610ad357805160ff19168380011785555b50610b03929150610abb565b5050600060028201556001015b80821115610acf57805474ffffffffffffffffffffffffffffffffffffffffff1916815560018181018054600080835592600290821615610100026000190190911604601f819010610aa15750610a42565b601f016020900490600052602060002090810190610a4291905b80821115610acf5760008155600101610abb565b5090565b82800160010185558215610a36579182015b82811115610a36578251826000505591602001919060010190610ae5565b50506060919091015160029190910155610911565b600183905560028290556003819055604080518481526020810184905280820183905290517fa439d3fa452be5e0e1e24a8145e715f4fd8b9c08c96a42fd82a855a85e5d57de9181900360600190a1505050565b50508585846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160070160005081905550600260005054603c024201816003016000508190555060008160040160006101000a81548160ff0219169083021790555060008160040160016101000a81548160ff02191690830217905550600081600501600050819055507f646fec02522b41e7125cfc859a64fd4f4cefd5dc3b6237ca0abe251ded1fa881828787876040518085815260200184600160a060020a03168152602001838152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f168015610cc45780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a1600182016005555b50949350505050565b6004805460018101808355909190828015829011610d1c57600a0281600a028360005260206000209182019101610d1c9190610db8565b505060048054929450918491508110156100025790600052602060002090600a02016000508054600160a060020a031916871781556001818101879055855160028381018054600082815260209081902096975091959481161561010002600019011691909104601f90810182900484019391890190839010610ed857805160ff19168380011785555b50610b6c929150610abb565b50506001015b80821115610acf578054600160a060020a03191681556000600182810182905560028381018054848255909281161561010002600019011604601f819010610e9c57505b5060006003830181905560048301805461ffff191690556005830181905560068301819055600783018190556008830180548282559082526020909120610db2916002028101905b80821115610acf57805474ffffffffffffffffffffffffffffffffffffffffff1916815560018181018054600080835592600290821615610100026000190190911604601f819010610eba57505b5050600101610e44565b601f016020900490600052602060002090810190610dfc9190610abb565b601f016020900490600052602060002090810190610e929190610abb565b82800160010185558215610da6579182015b82811115610da6578251826000505591602001919060010190610eea565b60008054600160a060020a0319168217905550565b600480548690811015610002576000918252600a027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01905033600160a060020a0316600090815260098201602052604090205490915060ff1660011415610f8457610002565b33600160a060020a031660009081526009820160205260409020805460ff1916600190811790915560058201805490910190558315610fcd576006810180546001019055610fda565b6006810180546000190190555b7fc34f869b7ff431b034b7b9aea9822dac189a685e0b015c7d1be3add3f89128e8858533866040518085815260200184815260200183600160a060020a03168152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f16801561107a5780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a1509392505050565b6006810154600354901315611158578060000160009054906101000a9004600160a060020a0316600160a060020a03168160010160005054670de0b6b3a76400000284604051808280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156111225780820380516001836020036101000a031916815260200191505b5091505060006040518083038185876185025a03f15050505060048101805460ff191660011761ff00191661010017905561116d565b60048101805460ff191660011761ff00191690555b60068101546005820154600483015460408051888152602081019490945283810192909252610100900460ff166060830152517fd220b7272a8b6d0d7d6bcdace67b936a8f175e6d5c1b3ee438b72256b32ab3af9181900360800190a1509291505056a66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c688`},
 		[]string{`[{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"proposals","outputs":[{"name":"recipient","type":"address"},{"name":"amount","type":"uint256"},{"name":"description","type":"string"},{"name":"votingDeadline","type":"uint256"},{"name":"executed","type":"bool"},{"name":"proposalPassed","type":"bool"},{"name":"numberOfVotes","type":"uint256"},{"name":"currentResult","type":"int256"},{"name":"proposalHash","type":"bytes32"}],"type":"function"},{"constant":false,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"transactionBytecode","type":"bytes"}],"name":"executeProposal","outputs":[{"name":"result","type":"int256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"memberId","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"numProposals","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"members","outputs":[{"name":"member","type":"address"},{"name":"canVote","type":"bool"},{"name":"name","type":"string"},{"name":"memberSince","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"debatingPeriodInMinutes","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"minimumQuorum","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"targetMember","type":"address"},{"name":"canVote","type":"bool"},{"name":"memberName","type":"string"}],"name":"changeMembership","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"majorityMargin","outputs":[{"name":"","type":"int256"}],"type":"function"},{"constant":false,"inputs":[{"name":"beneficiary","type":"address"},{"name":"etherAmount","type":"uint256"},{"name":"JobDescription","type":"string"},{"name":"transactionBytecode","type":"bytes"}],"name":"newProposal","outputs":[{"name":"proposalID","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"minimumQuorumForProposals","type":"uint256"},{"name":"minutesForDebate","type":"uint256"},{"name":"marginOfVotesForMajority","type":"int256"}],"name":"changeVotingRules","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"supportsProposal","type":"bool"},{"name":"justificationText","type":"string"}],"name":"vote","outputs":[{"name":"voteID","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"beneficiary","type":"address"},{"name":"etherAmount","type":"uint256"},{"name":"transactionBytecode","type":"bytes"}],"name":"checkProposalCode","outputs":[{"name":"codeChecksOut","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"type":"function"},{"inputs":[{"name":"minimumQuorumForProposals","type":"uint256"},{"name":"minutesForDebate","type":"uint256"},{"name":"marginOfVotesForMajority","type":"int256"},{"name":"congressLeader","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"recipient","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"description","type":"string"}],"name":"ProposalAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"position","type":"bool"},{"indexed":false,"name":"voter","type":"address"},{"indexed":false,"name":"justification","type":"string"}],"name":"Voted","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"result","type":"int256"},{"indexed":false,"name":"quorum","type":"uint256"},{"indexed":false,"name":"active","type":"bool"}],"name":"ProposalTallied","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"member","type":"address"},{"indexed":false,"name":"isMember","type":"bool"}],"name":"MembershipChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"minimumQuorum","type":"uint256"},{"indexed":false,"name":"debatingPeriodInMinutes","type":"uint256"},{"indexed":false,"name":"majorityMargin","type":"int256"}],"name":"ChangeOfRules","type":"event"}]`},
-		`"github.com/ethereum/go-ethereum/common"`,
+		`"github.com/maticnetwork/bor/common"`,
 		`
 			if b, err := NewDAO(common.Address{}, nil); b == nil || err != nil {
 				t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil)
@@ -124,7 +124,7 @@ var bindTests = []struct {
 		`
 			"fmt"
 
-			"github.com/ethereum/go-ethereum/common"
+			"github.com/maticnetwork/bor/common"
 		`,
 		`if b, err := NewInputChecker(common.Address{}, nil); b == nil || err != nil {
 			 t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil)
@@ -161,7 +161,7 @@ var bindTests = []struct {
 		`
 			"fmt"
 
-			"github.com/ethereum/go-ethereum/common"
+			"github.com/maticnetwork/bor/common"
 		`,
 		`if b, err := NewOutputChecker(common.Address{}, nil); b == nil || err != nil {
 			 t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil)
@@ -200,7 +200,7 @@ var bindTests = []struct {
 			"math/big"
 			"reflect"
 
-			"github.com/ethereum/go-ethereum/common"
+			"github.com/maticnetwork/bor/common"
 		`,
 		`if e, err := NewEventChecker(common.Address{}, nil); e == nil || err != nil {
 			 t.Fatalf("binding (%v) nil or error (%v) not nil", e, nil)
@@ -273,10 +273,10 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/ethereum/go-ethereum/accounts/abi/bind"
-			"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-			"github.com/ethereum/go-ethereum/core"
-			"github.com/ethereum/go-ethereum/crypto"
+			"github.com/maticnetwork/bor/accounts/abi/bind"
+			"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+			"github.com/maticnetwork/bor/core"
+			"github.com/maticnetwork/bor/crypto"
 		`,
 		`
 			// Generate a new random account and a funded simulator
@@ -325,10 +325,10 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/ethereum/go-ethereum/accounts/abi/bind"
-			"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-			"github.com/ethereum/go-ethereum/core"
-			"github.com/ethereum/go-ethereum/crypto"
+			"github.com/maticnetwork/bor/accounts/abi/bind"
+			"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+			"github.com/maticnetwork/bor/core"
+			"github.com/maticnetwork/bor/crypto"
 		`,
 		`
 			// Generate a new random account and a funded simulator
@@ -368,10 +368,10 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/ethereum/go-ethereum/accounts/abi/bind"
-			"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-			"github.com/ethereum/go-ethereum/core"
-			"github.com/ethereum/go-ethereum/crypto"
+			"github.com/maticnetwork/bor/accounts/abi/bind"
+			"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+			"github.com/maticnetwork/bor/core"
+			"github.com/maticnetwork/bor/crypto"
 		`,
 		`
 			// Generate a new random account and a funded simulator
@@ -422,11 +422,11 @@ var bindTests = []struct {
 			"math/big"
 			"reflect"
 
-			"github.com/ethereum/go-ethereum/accounts/abi/bind"
-			"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-			"github.com/ethereum/go-ethereum/common"
-			"github.com/ethereum/go-ethereum/core"
-			"github.com/ethereum/go-ethereum/crypto"
+			"github.com/maticnetwork/bor/accounts/abi/bind"
+			"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+			"github.com/maticnetwork/bor/common"
+			"github.com/maticnetwork/bor/core"
+			"github.com/maticnetwork/bor/crypto"
 		`,
 		`
 			// Generate a new random account and a funded simulator
@@ -468,10 +468,10 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/ethereum/go-ethereum/accounts/abi/bind"
-			"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-			"github.com/ethereum/go-ethereum/core"
-			"github.com/ethereum/go-ethereum/crypto"
+			"github.com/maticnetwork/bor/accounts/abi/bind"
+			"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+			"github.com/maticnetwork/bor/core"
+			"github.com/maticnetwork/bor/crypto"
 		`,
 		`
 			// Generate a new random account and a funded simulator
@@ -512,10 +512,10 @@ var bindTests = []struct {
 		[]string{`6060604052609f8060106000396000f3606060405260e060020a6000350463f97a60058114601a575b005b600060605260c0604052600d60809081527f4920646f6e27742065786973740000000000000000000000000000000000000060a052602060c0908152600d60e081905281906101009060a09080838184600060046012f15050815172ffffffffffffffffffffffffffffffffffffff1916909152505060405161012081900392509050f3`},
 		[]string{`[{"constant":true,"inputs":[],"name":"String","outputs":[{"name":"","type":"string"}],"type":"function"}]`},
 		`
-			"github.com/ethereum/go-ethereum/accounts/abi/bind"
-			"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-			"github.com/ethereum/go-ethereum/common"
-			"github.com/ethereum/go-ethereum/core"
+			"github.com/maticnetwork/bor/accounts/abi/bind"
+			"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+			"github.com/maticnetwork/bor/common"
+			"github.com/maticnetwork/bor/core"
 		`,
 		`
 			// Create a simulator and wrap a non-deployed contract
@@ -557,10 +557,10 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/ethereum/go-ethereum/accounts/abi/bind"
-			"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-			"github.com/ethereum/go-ethereum/core"
-			"github.com/ethereum/go-ethereum/crypto"
+			"github.com/maticnetwork/bor/accounts/abi/bind"
+			"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+			"github.com/maticnetwork/bor/core"
+			"github.com/maticnetwork/bor/crypto"
 		`,
 		`
 			// Generate a new random account and a funded simulator
@@ -603,11 +603,11 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/ethereum/go-ethereum/accounts/abi/bind"
-			"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-			"github.com/ethereum/go-ethereum/common"
-			"github.com/ethereum/go-ethereum/core"
-			"github.com/ethereum/go-ethereum/crypto"
+			"github.com/maticnetwork/bor/accounts/abi/bind"
+			"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+			"github.com/maticnetwork/bor/common"
+			"github.com/maticnetwork/bor/core"
+			"github.com/maticnetwork/bor/crypto"
 		`,
 		`
 			// Generate a new random account and a funded simulator
@@ -676,10 +676,10 @@ var bindTests = []struct {
 			"fmt"
 			"math/big"
 
-			"github.com/ethereum/go-ethereum/accounts/abi/bind"
-			"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-			"github.com/ethereum/go-ethereum/core"
-			"github.com/ethereum/go-ethereum/crypto"
+			"github.com/maticnetwork/bor/accounts/abi/bind"
+			"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+			"github.com/maticnetwork/bor/core"
+			"github.com/maticnetwork/bor/crypto"
 		`,
 		`
 			// Generate a new random account and a funded simulator
@@ -766,11 +766,11 @@ var bindTests = []struct {
 			"math/big"
 			"time"
 
-			"github.com/ethereum/go-ethereum/accounts/abi/bind"
-			"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-			"github.com/ethereum/go-ethereum/common"
-			"github.com/ethereum/go-ethereum/core"
-			"github.com/ethereum/go-ethereum/crypto"
+			"github.com/maticnetwork/bor/accounts/abi/bind"
+			"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+			"github.com/maticnetwork/bor/common"
+			"github.com/maticnetwork/bor/core"
+			"github.com/maticnetwork/bor/crypto"
 		`,
 		`
 			// Generate a new random account and a funded simulator
@@ -954,10 +954,10 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/ethereum/go-ethereum/accounts/abi/bind"
-			"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-			"github.com/ethereum/go-ethereum/core"
-			"github.com/ethereum/go-ethereum/crypto"
+			"github.com/maticnetwork/bor/accounts/abi/bind"
+			"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+			"github.com/maticnetwork/bor/core"
+			"github.com/maticnetwork/bor/crypto"
 		`,
 		`
 			// Generate a new random account and a funded simulator
@@ -1082,10 +1082,10 @@ var bindTests = []struct {
 			"math/big"
 			"reflect"
 		
-			"github.com/ethereum/go-ethereum/accounts/abi/bind"
-			"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-			"github.com/ethereum/go-ethereum/core"
-			"github.com/ethereum/go-ethereum/crypto"
+			"github.com/maticnetwork/bor/accounts/abi/bind"
+			"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+			"github.com/maticnetwork/bor/core"
+			"github.com/maticnetwork/bor/crypto"
 		`,
 
 		`
@@ -1216,10 +1216,10 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/ethereum/go-ethereum/accounts/abi/bind"
-			"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-			"github.com/ethereum/go-ethereum/core"
-			"github.com/ethereum/go-ethereum/crypto"
+			"github.com/maticnetwork/bor/accounts/abi/bind"
+			"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+			"github.com/maticnetwork/bor/core"
+			"github.com/maticnetwork/bor/crypto"
 		`,
 		`
 			// Generate a new random account and a funded simulator
diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go
index 3683a1eb4fdc9c2c273044b1c88638bc6f2da9fe..c33e69a94fd03899bb58d90c1edee29faaba2681 100644
--- a/accounts/abi/bind/template.go
+++ b/accounts/abi/bind/template.go
@@ -16,7 +16,7 @@
 
 package bind
 
-import "github.com/ethereum/go-ethereum/accounts/abi"
+import "github.com/maticnetwork/bor/accounts/abi"
 
 // tmplData is the data structure required to fill the binding template.
 type tmplData struct {
@@ -88,12 +88,12 @@ import (
 	"math/big"
 	"strings"
 
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/event"
+	ethereum "github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/accounts/abi"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/event"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/accounts/abi/bind/topics.go b/accounts/abi/bind/topics.go
index c7657b4a41a2591cc83a59a952b867f1bdc1428f..ea5a64b6103f1fd07404e7d2078b599d5e703ef6 100644
--- a/accounts/abi/bind/topics.go
+++ b/accounts/abi/bind/topics.go
@@ -23,9 +23,9 @@ import (
 	"math/big"
 	"reflect"
 
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/accounts/abi"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 // makeTopics converts a filter query argument list into a filter topic set.
diff --git a/accounts/abi/bind/topics_test.go b/accounts/abi/bind/topics_test.go
index e6f745a15e8e7e2446a9c520884de2fa6b2f8d7a..2b4f4cb0b8b3d0f49135b4661533affa0ae29c7d 100644
--- a/accounts/abi/bind/topics_test.go
+++ b/accounts/abi/bind/topics_test.go
@@ -20,8 +20,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/accounts/abi"
+	"github.com/maticnetwork/bor/common"
 )
 
 func TestMakeTopics(t *testing.T) {
diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go
index d129993ca12f136f5d1862de963b95826c90ec51..59f352077568e90e7921c6d962feb99f24df9020 100644
--- a/accounts/abi/bind/util.go
+++ b/accounts/abi/bind/util.go
@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/log"
 )
 
 // WaitMined waits for tx to be mined on the blockchain.
diff --git a/accounts/abi/bind/util_test.go b/accounts/abi/bind/util_test.go
index 87bc29822b3e37768d4fa8ec68fe713a4d82b3ae..3aa173d6672e3b61b66a1becae9a57b1ce2bbeaa 100644
--- a/accounts/abi/bind/util_test.go
+++ b/accounts/abi/bind/util_test.go
@@ -22,12 +22,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
diff --git a/accounts/abi/event.go b/accounts/abi/event.go
index 9392c1990c3e2f5ac6a4646c5f11dad795ca4d6d..e68b495759edc20b70839f42b1fe95f1cfc9ce47 100644
--- a/accounts/abi/event.go
+++ b/accounts/abi/event.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 // Event is an event potentially triggered by the EVM's LOG mechanism. The Event
diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go
index e735cceb88847de3e95e898a273ac4f6baaafbf0..137528406d0c98d589b0c6eba1b01e5950018b2b 100644
--- a/accounts/abi/event_test.go
+++ b/accounts/abi/event_test.go
@@ -25,8 +25,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -356,7 +356,7 @@ func unpackTestEventData(dest interface{}, hexData string, jsonEvent []byte, ass
 
 /*
 Taken from
-https://github.com/ethereum/go-ethereum/pull/15568
+https://github.com/maticnetwork/bor/pull/15568
 */
 
 type testResult struct {
diff --git a/accounts/abi/method.go b/accounts/abi/method.go
index d3c02599f20fcbff85c303730925a6083e095f36..7a76a91145e6e36bfe2ab82ba6d93bc395d5b004 100644
--- a/accounts/abi/method.go
+++ b/accounts/abi/method.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 // Method represents a callable given a `Name` and whether the method is a constant.
diff --git a/accounts/abi/numbers.go b/accounts/abi/numbers.go
index 4d706846dacda81200aa16178418adc75a451c4c..eb6fbd7f28169f9d666eec3d28a0d19d6033680e 100644
--- a/accounts/abi/numbers.go
+++ b/accounts/abi/numbers.go
@@ -20,8 +20,8 @@ import (
 	"math/big"
 	"reflect"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
 )
 
 var (
diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go
index 36c58265bd4b5388f428acb64ab0f4ef2903a7e4..b5b704deec3c01b03e166ccfe9bf65ddfe7b3c9a 100644
--- a/accounts/abi/pack.go
+++ b/accounts/abi/pack.go
@@ -20,8 +20,8 @@ import (
 	"math/big"
 	"reflect"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
 )
 
 // packBytesSlice packs the given bytes as [L, V] as the canonical representation
diff --git a/accounts/abi/pack_test.go b/accounts/abi/pack_test.go
index 10cd3a396274b4a4821ffdecd585c6abb56221f5..acfb4ad5d5ab5ffa94c1c2e0283976c46d6040ae 100644
--- a/accounts/abi/pack_test.go
+++ b/accounts/abi/pack_test.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 func TestPack(t *testing.T) {
diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go
index 5023456aec1b9910549dd629bc754df66f595db1..006cb5f4dcfab6d33809e78127d52c5b1f26e84a 100644
--- a/accounts/abi/type_test.go
+++ b/accounts/abi/type_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 // typeWithoutStringer is a alias for the Type type which simply doesn't implement
diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go
index b2e61d06c41647bb018dd3749a8177e4ff683df9..79b71d4030819b5f8db2d21c9aa8b5ed51cade7e 100644
--- a/accounts/abi/unpack.go
+++ b/accounts/abi/unpack.go
@@ -22,7 +22,7 @@ import (
 	"math/big"
 	"reflect"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 var (
diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go
index c85b86d8c004066e05ab44cefcf4e16e2d42881f..79348b595df0b17c99e7a32d9eb7aee624ab7a3d 100644
--- a/accounts/abi/unpack_test.go
+++ b/accounts/abi/unpack_test.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/accounts/accounts.go b/accounts/accounts.go
index d63744bd9f733270f2e986546cbcf3df0760757a..742270c9dd107a9f5dbff837dadf4c4eb611e41f 100644
--- a/accounts/accounts.go
+++ b/accounts/accounts.go
@@ -21,10 +21,10 @@ import (
 	"fmt"
 	"math/big"
 
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/event"
+	ethereum "github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/event"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go
index a49e3954eeed285ac8d7e6ec8240f5accd229a49..aad7c07ded0a53eeb8e80b1acbc44ad047ac3145 100644
--- a/accounts/accounts_test.go
+++ b/accounts/accounts_test.go
@@ -20,7 +20,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 func TestTextHash(t *testing.T) {
diff --git a/accounts/external/backend.go b/accounts/external/backend.go
index 705c987227143f1865a5e4f62d6a7e7cfcb727e5..a364734dd1620b0fa017731f3762c1f22f90d850 100644
--- a/accounts/external/backend.go
+++ b/accounts/external/backend.go
@@ -21,16 +21,16 @@ import (
 	"math/big"
 	"sync"
 
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/ethereum/go-ethereum/signer/core"
+	"github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/rpc"
+	"github.com/maticnetwork/bor/signer/core"
 )
 
 type ExternalBackend struct {
diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go
index 8f660e282f57cb1f6265161a22e24f727eb2cde6..0e340b2fbfbb6e6f67e5e4c3c6a178b7ae19dc9e 100644
--- a/accounts/keystore/account_cache.go
+++ b/accounts/keystore/account_cache.go
@@ -28,9 +28,9 @@ import (
 	"time"
 
 	mapset "github.com/deckarep/golang-set"
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/log"
 )
 
 // Minimum amount of time between cache reloads. This limit applies if the platform does
diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go
index fe9233c046e7d4687aadcb356cba604884815487..f2ff1bf04c6ac317a1f6b403d7212460c299b423 100644
--- a/accounts/keystore/account_cache_test.go
+++ b/accounts/keystore/account_cache_test.go
@@ -29,8 +29,8 @@ import (
 
 	"github.com/cespare/cp"
 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
 )
 
 var (
diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go
index 73ff6ae9ee6f587d3d8882d9629d22c9bae00916..54da2b3829dfb7ffb3aad7e537eebfecba50c6ce 100644
--- a/accounts/keystore/file_cache.go
+++ b/accounts/keystore/file_cache.go
@@ -25,7 +25,7 @@ import (
 	"time"
 
 	mapset "github.com/deckarep/golang-set"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // fileCache is a cache of files seen during scan of keystore.
diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go
index 84d8df0c5aab82bf0e59bbcb14ec5e5f1c0158e1..94879607559c66b71554be9177849dae29b94a87 100644
--- a/accounts/keystore/key.go
+++ b/accounts/keystore/key.go
@@ -29,9 +29,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
 	"github.com/pborman/uuid"
 )
 
diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go
index 434e035048b326cc5ec5dd56ce29f4fbb2dce917..37fbbf6b54bd89cc409c4f16b58c83af932df50b 100644
--- a/accounts/keystore/keystore.go
+++ b/accounts/keystore/keystore.go
@@ -33,11 +33,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/event"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/event"
 )
 
 var (
diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go
index a691c506270634da8fb756548a3c922451502862..5a6fff7b5964c686926f96f8d4b6755988931834 100644
--- a/accounts/keystore/keystore_test.go
+++ b/accounts/keystore/keystore_test.go
@@ -26,9 +26,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/event"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/event"
 )
 
 var testSigData = make([]byte, 32)
diff --git a/accounts/keystore/passphrase.go b/accounts/keystore/passphrase.go
index 1ced41e9975bdd6d6b4024a83517194ae887eb0b..e3a683317df395c18a83a9d6dc2c6c1251521bc4 100644
--- a/accounts/keystore/passphrase.go
+++ b/accounts/keystore/passphrase.go
@@ -38,10 +38,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/crypto"
 	"github.com/pborman/uuid"
 	"golang.org/x/crypto/pbkdf2"
 	"golang.org/x/crypto/scrypt"
@@ -121,7 +121,7 @@ func (ks keyStorePassphrase) StoreKey(filename string, key *Key, auth string) er
 				"This indicates that the keystore is corrupted. \n" +
 				"The corrupted file is stored at \n%v\n" +
 				"Please file a ticket at:\n\n" +
-				"https://github.com/ethereum/go-ethereum/issues." +
+				"https://github.com/maticnetwork/bor/issues." +
 				"The error was : %s"
 			return fmt.Errorf(msg, tmpName, err)
 		}
diff --git a/accounts/keystore/passphrase_test.go b/accounts/keystore/passphrase_test.go
index 630682cebdb12138c269a23152f3e751add788ae..ea640bdefef5fc4cd3a0c9b21b4606fbc5b60aaa 100644
--- a/accounts/keystore/passphrase_test.go
+++ b/accounts/keystore/passphrase_test.go
@@ -20,7 +20,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 const (
diff --git a/accounts/keystore/plain.go b/accounts/keystore/plain.go
index f62a133ce16909422f3664a5e64d7e610791cbd1..ecbb60372f0cccb597cafc0ca7e177abb985c02b 100644
--- a/accounts/keystore/plain.go
+++ b/accounts/keystore/plain.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 type keyStorePlain struct {
diff --git a/accounts/keystore/plain_test.go b/accounts/keystore/plain_test.go
index 32852a0add314e5e52c90cc78ecb1b672e162bd6..f25fcbc9147e98d15899dc7cc06a6b0324d4c783 100644
--- a/accounts/keystore/plain_test.go
+++ b/accounts/keystore/plain_test.go
@@ -27,8 +27,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) {
diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go
index 03055245f5e7cf19b07bba2d6d2c2083441cff68..f1acfb1134f692907762cd064da821a43ed24c35 100644
--- a/accounts/keystore/presale.go
+++ b/accounts/keystore/presale.go
@@ -25,8 +25,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/crypto"
 	"github.com/pborman/uuid"
 	"golang.org/x/crypto/pbkdf2"
 )
diff --git a/accounts/keystore/wallet.go b/accounts/keystore/wallet.go
index 498067d49730d4ab4df814def4d4319a9cad5694..7ad47168a0c0bf0f47b314ad9ddf5931cdf8063c 100644
--- a/accounts/keystore/wallet.go
+++ b/accounts/keystore/wallet.go
@@ -19,10 +19,10 @@ package keystore
 import (
 	"math/big"
 
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
+	ethereum "github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 // keystoreWallet implements the accounts.Wallet interface for the original
diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go
index d6ef53327d43eff48f180ce885085a097c7794de..5e81b8ef10cd0af7367fc8f39e7b4f2e31ec1438 100644
--- a/accounts/keystore/watch.go
+++ b/accounts/keystore/watch.go
@@ -21,7 +21,7 @@ package keystore
 import (
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 	"github.com/rjeczalik/notify"
 )
 
diff --git a/accounts/manager.go b/accounts/manager.go
index 3cf3422e77184912e4cbe8d8d2c4b39eb791a9bf..e02c34d30cc3fcfafc66e25cfc13ef45c81a8b5d 100644
--- a/accounts/manager.go
+++ b/accounts/manager.go
@@ -21,7 +21,7 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/event"
+	"github.com/maticnetwork/bor/event"
 )
 
 // Config contains the settings of the global account manager.
diff --git a/accounts/scwallet/hub.go b/accounts/scwallet/hub.go
index 5f939c6586278edbf719ac2d742274b2a1f8c75c..dfcc5ac4bf16735e3d20b8b1cfcd0e07b59074f5 100644
--- a/accounts/scwallet/hub.go
+++ b/accounts/scwallet/hub.go
@@ -41,10 +41,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
 	pcsc "github.com/gballet/go-libpcsclite"
 )
 
diff --git a/accounts/scwallet/securechannel.go b/accounts/scwallet/securechannel.go
index fad876a019c08ce94f8ddb3ee0a8c2c0e3dc2df1..3d0be4728ea2161a4b24c8174efcb77c84c7feef 100644
--- a/accounts/scwallet/securechannel.go
+++ b/accounts/scwallet/securechannel.go
@@ -25,7 +25,7 @@ import (
 	"crypto/sha512"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/crypto"
 	pcsc "github.com/gballet/go-libpcsclite"
 	"github.com/wsddn/go-ecdh"
 	"golang.org/x/crypto/pbkdf2"
diff --git a/accounts/scwallet/wallet.go b/accounts/scwallet/wallet.go
index 57b597706254af7ee7bd806b7a6cd4fd8ba240a5..540bcc1a60dffe9e528545c62529387c1c523d70 100644
--- a/accounts/scwallet/wallet.go
+++ b/accounts/scwallet/wallet.go
@@ -33,12 +33,12 @@ import (
 	"sync"
 	"time"
 
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
+	ethereum "github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
 	pcsc "github.com/gballet/go-libpcsclite"
 	"github.com/status-im/keycard-go/derivationpath"
 )
diff --git a/accounts/usbwallet/hub.go b/accounts/usbwallet/hub.go
index 23be98a084838cd573a0ceb4ea703ba725308560..a80eff5a93a95e5b96a4792f46de5b9419701f5a 100644
--- a/accounts/usbwallet/hub.go
+++ b/accounts/usbwallet/hub.go
@@ -23,9 +23,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
 	"github.com/karalabe/usb"
 )
 
diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go
index c30903b5b769d265f79fe0a75c088037fa50c8ac..aa1e69a8df2dc29a99cb934d9db96fa4a83913bb 100644
--- a/accounts/usbwallet/ledger.go
+++ b/accounts/usbwallet/ledger.go
@@ -28,12 +28,12 @@ import (
 	"io"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // ledgerOpcode is an enumeration encoding the supported Ledger opcodes.
diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go
index 1892097baf657f5508ae73f365c012ab197ac388..f88501e32f503c3f471f5917fe228486daf784ac 100644
--- a/accounts/usbwallet/trezor.go
+++ b/accounts/usbwallet/trezor.go
@@ -27,12 +27,12 @@ import (
 	"io"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/usbwallet/trezor"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/usbwallet/trezor"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/log"
 	"github.com/golang/protobuf/proto"
 )
 
diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go
index ed786d9b42a8425c70ef38ec5f5221903434eec0..09a140a756441555a170fa8a9b3b62f1cab23a2f 100644
--- a/accounts/usbwallet/wallet.go
+++ b/accounts/usbwallet/wallet.go
@@ -25,12 +25,12 @@ import (
 	"sync"
 	"time"
 
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
+	ethereum "github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
 	"github.com/karalabe/usb"
 )
 
diff --git a/build/ci.go b/build/ci.go
index 8be52338989b33add114fb76db6439106b73dd6d..cec9b00a0aa12fb5b5e8a8c813f55f3fd8c48776 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -58,15 +58,15 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/internal/build"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/internal/build"
+	"github.com/maticnetwork/bor/params"
 )
 
 var (
 	// Files that end up in the geth*.zip archive.
 	gethArchiveFiles = []string{
 		"COPYING",
-		executablePath("geth"),
+		executablePath("bor"),
 	}
 
 	// Files that end up in the geth-alltools*.zip archive.
@@ -75,7 +75,7 @@ var (
 		executablePath("abigen"),
 		executablePath("bootnode"),
 		executablePath("evm"),
-		executablePath("geth"),
+		executablePath("bor"),
 		executablePath("puppeth"),
 		executablePath("rlpdump"),
 		executablePath("wnode"),
@@ -97,7 +97,7 @@ var (
 			Description: "Developer utility version of the EVM (Ethereum Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode.",
 		},
 		{
-			BinaryName:  "geth",
+			BinaryName:  "bor",
 			Description: "Ethereum CLI client.",
 		},
 		{
@@ -778,7 +778,7 @@ func doAndroidArchive(cmdline []string) {
 	}
 	// Build the Android archive and Maven resources
 	build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile", "golang.org/x/mobile/cmd/gobind"))
-	build.MustRun(gomobileTool("bind", "-ldflags", "-s -w", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/ethereum/go-ethereum/mobile"))
+	build.MustRun(gomobileTool("bind", "-ldflags", "-s -w", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/maticnetwork/bor/mobile"))
 
 	if *local {
 		// If we're building locally, copy bundle to build dir and skip Maven
@@ -899,7 +899,7 @@ func doXCodeFramework(cmdline []string) {
 	// Build the iOS XCode framework
 	build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile", "golang.org/x/mobile/cmd/gobind"))
 	build.MustRun(gomobileTool("init"))
-	bind := gomobileTool("bind", "-ldflags", "-s -w", "--target", "ios", "--tags", "ios", "-v", "github.com/ethereum/go-ethereum/mobile")
+	bind := gomobileTool("bind", "-ldflags", "-s -w", "--target", "ios", "--tags", "ios", "-v", "github.com/maticnetwork/bor/mobile")
 
 	if *local {
 		// If we're building locally, use the build folder and stop afterwards
diff --git a/build/deb/ethereum/deb.control b/build/deb/ethereum/deb.control
index 5b3ff93542c4fa157bd67df1f2424cd2f483db16..b5c7036dbebe2adf8426ab821dc6039d78eb1260 100644
--- a/build/deb/ethereum/deb.control
+++ b/build/deb/ethereum/deb.control
@@ -5,8 +5,8 @@ Maintainer: {{.Author}}
 Build-Depends: debhelper (>= 8.0.0), golang-1.11
 Standards-Version: 3.9.5
 Homepage: https://ethereum.org
-Vcs-Git: git://github.com/ethereum/go-ethereum.git
-Vcs-Browser: https://github.com/ethereum/go-ethereum
+Vcs-Git: git://github.com/maticnetwork/bor.git
+Vcs-Browser: https://github.com/maticnetwork/bor
 
 Package: {{.Name}}
 Architecture: any
diff --git a/build/env.sh b/build/env.sh
index 3914555d1bbd5381a85f1b2c1566cd21c4c71cf4..acbc70c576388184255ed9505e98b9cd28d9fc43 100755
--- a/build/env.sh
+++ b/build/env.sh
@@ -10,11 +10,11 @@ fi
 # Create fake Go workspace if it doesn't exist yet.
 workspace="$PWD/build/_workspace"
 root="$PWD"
-ethdir="$workspace/src/github.com/ethereum"
-if [ ! -L "$ethdir/go-ethereum" ]; then
+ethdir="$workspace/src/github.com/maticnetwork"
+if [ ! -L "$ethdir/bor" ]; then
     mkdir -p "$ethdir"
     cd "$ethdir"
-    ln -s ../../../../../. go-ethereum
+    ln -s ../../../../../. bor
     cd "$root"
 fi
 
@@ -23,8 +23,8 @@ GOPATH="$workspace"
 export GOPATH
 
 # Run the command inside the workspace.
-cd "$ethdir/go-ethereum"
-PWD="$ethdir/go-ethereum"
+cd "$ethdir/bor"
+PWD="$ethdir/bor"
 
 # Launch the arguments with the configured environment.
 exec "$@"
diff --git a/build/mvn.pom b/build/mvn.pom
index 7670246ba9f1970218bbf74026fba85ad7b4512e..68623c6309689ffb0d7252b4849e2eb8ba3430a7 100644
--- a/build/mvn.pom
+++ b/build/mvn.pom
@@ -11,7 +11,7 @@
 
   <name>Android Ethereum Client</name>
   <description>Android port of the go-ethereum libraries and node</description>
-  <url>https://github.com/ethereum/go-ethereum</url>
+  <url>https://github.com/maticnetwork/bor</url>
   <inceptionYear>2015</inceptionYear>
 
   <licenses>
@@ -48,10 +48,10 @@
 
   <issueManagement>
     <system>GitHub Issues</system>
-    <url>https://github.com/ethereum/go-ethereum/issues/</url>
+    <url>https://github.com/maticnetwork/bor/issues/</url>
   </issueManagement>
 
   <scm>
-    <url>https://github.com/ethereum/go-ethereum</url>
+    <url>https://github.com/maticnetwork/bor</url>
   </scm>
 </project>
diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh
index 57ef5a37c6a4845c2bd7d01515dcbfc097ee9896..80558599249eff41f43ad43664015b0be7b7df25 100644
--- a/build/nsis.install.nsh
+++ b/build/nsis.install.nsh
@@ -3,9 +3,9 @@ InstallDir "$InstDir"
 OutFile "${OUTPUTFILE}" # set through command line arguments
 
 # Links for "Add/Remove Programs"
-!define HELPURL "https://github.com/ethereum/go-ethereum/issues"
-!define UPDATEURL "https://github.com/ethereum/go-ethereum/releases"
-!define ABOUTURL "https://github.com/ethereum/go-ethereum#ethereum-go"
+!define HELPURL "https://github.com/maticnetwork/bor/issues"
+!define UPDATEURL "https://github.com/maticnetwork/bor/releases"
+!define ABOUTURL "https://github.com/maticnetwork/bor#ethereum-go"
 !define /date NOW "%Y%m%d"
 
 PageEx license
@@ -34,8 +34,8 @@ Section "Geth" GETH_IDX
   SimpleFC::AdvAddRule "Geth UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\geth.exe" "" "" "Ethereum" "" 30303 "" ""
 
   # Set default IPC endpoint (https://github.com/ethereum/EIPs/issues/147)
-  ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\geth.ipc"
-  ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "A" "HKLM" "\\.\pipe\geth.ipc"
+  ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\bor.ipc"
+  ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "A" "HKLM" "\\.\pipe\bor.ipc"
 
   # Add instdir to PATH
   Push "$INSTDIR"
diff --git a/build/nsis.uninstall.nsh b/build/nsis.uninstall.nsh
index 6358faa74ec0ea2c89ecd0499c86d6a805bb9a0e..eb7407b78a741043ee5901d1ccb99a97cfccc3dd 100644
--- a/build/nsis.uninstall.nsh
+++ b/build/nsis.uninstall.nsh
@@ -22,7 +22,7 @@ Section "Uninstall"
   SimpleFC::AdvRemoveRule "Geth UDP discovery (UDP:30303)"
 
   # Remove IPC endpoint (https://github.com/ethereum/EIPs/issues/147)
-  ${un.EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\geth.ipc"
+  ${un.EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\bor.ipc"
 
   # Remove install directory from PATH
   Push "$INSTDIR"
diff --git a/build/pod.podspec b/build/pod.podspec
index 2c14c280c7c9dd9141dfa74c2c6dbb5e2d0f97ac..1f0152c04dc0115daa3fb67603e60ecb45865e1b 100644
--- a/build/pod.podspec
+++ b/build/pod.podspec
@@ -2,12 +2,12 @@ Pod::Spec.new do |spec|
   spec.name         = 'Geth'
   spec.version      = '{{.Version}}'
   spec.license      = { :type => 'GNU Lesser General Public License, Version 3.0' }
-  spec.homepage     = 'https://github.com/ethereum/go-ethereum'
+  spec.homepage     = 'https://github.com/maticnetwork/bor'
   spec.authors      = { {{range .Contributors}}
 		'{{.Name}}' => '{{.Email}}',{{end}}
 	}
   spec.summary      = 'iOS Ethereum Client'
-  spec.source       = { :git => 'https://github.com/ethereum/go-ethereum.git', :commit => '{{.Commit}}' }
+  spec.source       = { :git => 'https://github.com/maticnetwork/bor.git', :commit => '{{.Commit}}' }
 
 	spec.platform = :ios
   spec.ios.deployment_target  = '9.0'
diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go
index 6af34c5fe8e37efa374268d07ba09736054b1312..416d9095f3218b79680562f40cfe0b47e0d91163 100644
--- a/cmd/abigen/main.go
+++ b/cmd/abigen/main.go
@@ -23,11 +23,11 @@ import (
 	"os"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/common/compiler"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/common/compiler"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go
index 2f9bba111769211a36266c5840d1d6cdcb4a66db..4f3ef77ff052ccd548c3d21220839f64bf3b23fe 100644
--- a/cmd/bootnode/main.go
+++ b/cmd/bootnode/main.go
@@ -24,14 +24,14 @@ import (
 	"net"
 	"os"
 
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/discover"
-	"github.com/ethereum/go-ethereum/p2p/discv5"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/nat"
-	"github.com/ethereum/go-ethereum/p2p/netutil"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/discover"
+	"github.com/maticnetwork/bor/p2p/discv5"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/nat"
+	"github.com/maticnetwork/bor/p2p/netutil"
 )
 
 func main() {
diff --git a/cmd/geth/accountcmd.go b/cmd/bor/accountcmd.go
similarity index 97%
rename from cmd/geth/accountcmd.go
rename to cmd/bor/accountcmd.go
index 8fd149cacc6018e2a7848886ccd057e1b3dd1d93..0511cd11b1998736050769451271762f7023ef01 100644
--- a/cmd/geth/accountcmd.go
+++ b/cmd/bor/accountcmd.go
@@ -20,12 +20,12 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/console"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/console"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/geth/accountcmd_test.go b/cmd/bor/accountcmd_test.go
similarity index 99%
rename from cmd/geth/accountcmd_test.go
rename to cmd/bor/accountcmd_test.go
index 6c97f0ddc33f89fd91d57b48f00073affb44cd9e..43004f30779464dd462be7f993f0b3734d22e5d8 100644
--- a/cmd/geth/accountcmd_test.go
+++ b/cmd/bor/accountcmd_test.go
@@ -183,7 +183,7 @@ Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could
 `)
 }
 
-// https://github.com/ethereum/go-ethereum/issues/1785
+// https://github.com/maticnetwork/bor/issues/1785
 func TestUnlockFlagMultiIndex(t *testing.T) {
 	datadir := tmpDatadirWithKeystore(t)
 	geth := runGeth(t,
diff --git a/cmd/geth/chaincmd.go b/cmd/bor/chaincmd.go
similarity index 97%
rename from cmd/geth/chaincmd.go
rename to cmd/bor/chaincmd.go
index 49e6a059493399eeca075ab799f5ca8b45418611..0f7c71a175a7aa8e7c1c3d4ff016ad9ae624b68a 100644
--- a/cmd/geth/chaincmd.go
+++ b/cmd/bor/chaincmd.go
@@ -26,17 +26,17 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/console"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/console"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/trie"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/geth/config.go b/cmd/bor/config.go
similarity index 95%
rename from cmd/geth/config.go
rename to cmd/bor/config.go
index 0a63a027760dd776b63a84ab96f618916ba3743f..b525cedb091005bdfd453bf2e7f9153aed64fbce 100644
--- a/cmd/geth/config.go
+++ b/cmd/bor/config.go
@@ -26,12 +26,12 @@ import (
 
 	cli "gopkg.in/urfave/cli.v1"
 
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/dashboard"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/params"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/dashboard"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/params"
+	whisper "github.com/maticnetwork/bor/whisper/whisperv6"
 	"github.com/naoina/toml"
 )
 
@@ -102,7 +102,7 @@ func defaultNodeConfig() node.Config {
 	cfg.Version = params.VersionWithCommit(gitCommit, gitDate)
 	cfg.HTTPModules = append(cfg.HTTPModules, "eth", "shh")
 	cfg.WSModules = append(cfg.WSModules, "eth", "shh")
-	cfg.IPCPath = "geth.ipc"
+	cfg.IPCPath = "bor.ipc"
 	return cfg
 }
 
diff --git a/cmd/geth/consolecmd.go b/cmd/bor/consolecmd.go
similarity index 93%
rename from cmd/geth/consolecmd.go
rename to cmd/bor/consolecmd.go
index d4443b328295dbc07381b422ca7f71bce1d711e0..c1fcce56570b903e491df8c93eead6d6b3ffe26c 100644
--- a/cmd/geth/consolecmd.go
+++ b/cmd/bor/consolecmd.go
@@ -24,10 +24,10 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/console"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/console"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/rpc"
 	"gopkg.in/urfave/cli.v1"
 )
 
@@ -43,7 +43,7 @@ var (
 		Description: `
 The Geth 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/ethereum/go-ethereum/wiki/JavaScript-Console.`,
+See https://github.com/maticnetwork/bor/wiki/JavaScript-Console.`,
 	}
 
 	attachCommand = cli.Command{
@@ -56,7 +56,7 @@ See https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console.`,
 		Description: `
 The Geth 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/ethereum/go-ethereum/wiki/JavaScript-Console.
+See https://github.com/maticnetwork/bor/wiki/JavaScript-Console.
 This command allows to open a console on a running geth node.`,
 	}
 
@@ -69,7 +69,7 @@ This command allows to open a console on a running geth node.`,
 		Category:  "CONSOLE COMMANDS",
 		Description: `
 The JavaScript VM exposes a node admin interface as well as the Ðapp
-JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console`,
+JavaScript API. See https://github.com/maticnetwork/bor/wiki/JavaScript-Console`,
 	}
 )
 
@@ -128,7 +128,7 @@ func remoteConsole(ctx *cli.Context) error {
 				path = filepath.Join(path, "rinkeby")
 			}
 		}
-		endpoint = fmt.Sprintf("%s/geth.ipc", path)
+		endpoint = fmt.Sprintf("%s/bor.ipc", path)
 	}
 	client, err := dialRPC(endpoint)
 	if err != nil {
diff --git a/cmd/geth/consolecmd_test.go b/cmd/bor/consolecmd_test.go
similarity index 98%
rename from cmd/geth/consolecmd_test.go
rename to cmd/bor/consolecmd_test.go
index 4360451195b17a4e7b5abbeee82a119196666c94..925da2994dee7ae62f5ec8dcfdbb321d1ca49a05 100644
--- a/cmd/geth/consolecmd_test.go
+++ b/cmd/bor/consolecmd_test.go
@@ -27,7 +27,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/params"
 )
 
 const (
@@ -79,7 +79,7 @@ func TestIPCAttachWelcome(t *testing.T) {
 	} else {
 		ws := tmpdir(t)
 		defer os.RemoveAll(ws)
-		ipc = filepath.Join(ws, "geth.ipc")
+		ipc = filepath.Join(ws, "bor.ipc")
 	}
 	// Note: we need --shh because testAttachWelcome checks for default
 	// list of ipc modules and shh is included there.
diff --git a/cmd/geth/dao_test.go b/cmd/bor/dao_test.go
similarity index 97%
rename from cmd/geth/dao_test.go
rename to cmd/bor/dao_test.go
index cb06038ec8bc1a46e0590101d9229444ae4d7393..aedd691ca51994408734d12b4c1e82ff4252aa7a 100644
--- a/cmd/geth/dao_test.go
+++ b/cmd/bor/dao_test.go
@@ -23,9 +23,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/params"
 )
 
 // Genesis block for nodes which don't care about the DAO fork (i.e. not configured)
diff --git a/cmd/geth/genesis_test.go b/cmd/bor/genesis_test.go
similarity index 100%
rename from cmd/geth/genesis_test.go
rename to cmd/bor/genesis_test.go
diff --git a/cmd/geth/main.go b/cmd/bor/main.go
similarity index 95%
rename from cmd/geth/main.go
rename to cmd/bor/main.go
index 7d30c9243423e0318e145202e640c41d644af95d..d187f40d71e375adae7dec25172af5b86cad2dec 100644
--- a/cmd/geth/main.go
+++ b/cmd/bor/main.go
@@ -29,24 +29,24 @@ import (
 	"time"
 
 	"github.com/elastic/gosigar"
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/console"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/ethereum/go-ethereum/internal/debug"
-	"github.com/ethereum/go-ethereum/les"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/node"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/console"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/ethclient"
+	"github.com/maticnetwork/bor/internal/debug"
+	"github.com/maticnetwork/bor/les"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/node"
 	cli "gopkg.in/urfave/cli.v1"
 )
 
 const (
-	clientIdentifier = "geth" // Client identifier to advertise over the network
+	clientIdentifier = "bor" // Client identifier to advertise over the network
 )
 
 var (
diff --git a/cmd/geth/misccmd.go b/cmd/bor/misccmd.go
similarity index 95%
rename from cmd/geth/misccmd.go
rename to cmd/bor/misccmd.go
index 39ca47872badc05bf67bdc2ed125ea95e13db8e8..668636b528cbc572ee34b6a3090d6fa7d32df8ab 100644
--- a/cmd/geth/misccmd.go
+++ b/cmd/bor/misccmd.go
@@ -23,10 +23,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/params"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/geth/retesteth.go b/cmd/bor/retesteth.go
similarity index 97%
rename from cmd/geth/retesteth.go
rename to cmd/bor/retesteth.go
index 6d5763f887d22d56c0f99642eef1ca16c45160b0..b466058e471b332a214410a45d4b4c4250218729 100644
--- a/cmd/geth/retesteth.go
+++ b/cmd/bor/retesteth.go
@@ -26,26 +26,26 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/consensus/misc"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/consensus/misc"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/rpc"
+	"github.com/maticnetwork/bor/trie"
 
 	cli "gopkg.in/urfave/cli.v1"
 )
diff --git a/cmd/geth/retesteth_copypaste.go b/cmd/bor/retesteth_copypaste.go
similarity index 97%
rename from cmd/geth/retesteth_copypaste.go
rename to cmd/bor/retesteth_copypaste.go
index e2795af7f968fc23c9c7c526a98685ace3ea8559..7bc45b89ec32014947b4e0c4cb4b1751d25e3f7c 100644
--- a/cmd/geth/retesteth_copypaste.go
+++ b/cmd/bor/retesteth_copypaste.go
@@ -19,9 +19,9 @@ package main
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // RPCTransaction represents a transaction that will serialize to the RPC representation of a transaction
diff --git a/cmd/geth/run_test.go b/cmd/bor/run_test.go
similarity index 97%
rename from cmd/geth/run_test.go
rename to cmd/bor/run_test.go
index da82facac36ef68e48738d22bdcf6d024c9863d1..baa1c2eb8fc6afd70e66b2449012214bf8cbba2d 100644
--- a/cmd/geth/run_test.go
+++ b/cmd/bor/run_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/pkg/reexec"
-	"github.com/ethereum/go-ethereum/internal/cmdtest"
+	"github.com/maticnetwork/bor/internal/cmdtest"
 )
 
 func tmpdir(t *testing.T) string {
diff --git a/cmd/geth/testdata/empty.js b/cmd/bor/testdata/empty.js
similarity index 100%
rename from cmd/geth/testdata/empty.js
rename to cmd/bor/testdata/empty.js
diff --git a/cmd/geth/testdata/guswallet.json b/cmd/bor/testdata/guswallet.json
similarity index 100%
rename from cmd/geth/testdata/guswallet.json
rename to cmd/bor/testdata/guswallet.json
diff --git a/cmd/geth/testdata/passwords.txt b/cmd/bor/testdata/passwords.txt
similarity index 100%
rename from cmd/geth/testdata/passwords.txt
rename to cmd/bor/testdata/passwords.txt
diff --git a/cmd/geth/testdata/wrong-passwords.txt b/cmd/bor/testdata/wrong-passwords.txt
similarity index 100%
rename from cmd/geth/testdata/wrong-passwords.txt
rename to cmd/bor/testdata/wrong-passwords.txt
diff --git a/cmd/geth/usage.go b/cmd/bor/usage.go
similarity index 98%
rename from cmd/geth/usage.go
rename to cmd/bor/usage.go
index af195425b12ea134c20e3da27fb95b04c2fe2543..6d3260e7017891e16a5698b9bf7a648531d7501e 100644
--- a/cmd/geth/usage.go
+++ b/cmd/bor/usage.go
@@ -24,8 +24,8 @@ import (
 
 	"strings"
 
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/internal/debug"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/internal/debug"
 	cli "gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/checkpoint-admin/common.go b/cmd/checkpoint-admin/common.go
index 107cd1de02a67d8238edd8ed79692e45fabf18d0..98c7b0e16da87064b525703c2ebcc3500066ca55 100644
--- a/cmd/checkpoint-admin/common.go
+++ b/cmd/checkpoint-admin/common.go
@@ -19,15 +19,15 @@ package main
 import (
 	"strconv"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/accounts/external"
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/contracts/checkpointoracle"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/accounts/external"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/contracts/checkpointoracle"
+	"github.com/maticnetwork/bor/ethclient"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rpc"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/checkpoint-admin/exec.go b/cmd/checkpoint-admin/exec.go
index 1ce975f4946518d3873061701f7607eea6433c62..0b00785653525d67fce8b1df41ef0b0aa4996c21 100644
--- a/cmd/checkpoint-admin/exec.go
+++ b/cmd/checkpoint-admin/exec.go
@@ -25,17 +25,17 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/contracts/checkpointoracle"
-	"github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/contracts/checkpointoracle"
+	"github.com/maticnetwork/bor/contracts/checkpointoracle/contract"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethclient"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rpc"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/checkpoint-admin/main.go b/cmd/checkpoint-admin/main.go
index 1fdec60a0c256919ee92f1485435b8dec5a820d3..ae6c3ef7ce54a3a7f6f745199564cfe3a3701dc4 100644
--- a/cmd/checkpoint-admin/main.go
+++ b/cmd/checkpoint-admin/main.go
@@ -22,9 +22,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/common/fdlimit"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/common/fdlimit"
+	"github.com/maticnetwork/bor/log"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/checkpoint-admin/status.go b/cmd/checkpoint-admin/status.go
index c134ec090ebba4f47196046f28ccdca0efd4ade4..91d58cf6cd9855ee5364b40f7a96eeede7666cea 100644
--- a/cmd/checkpoint-admin/status.go
+++ b/cmd/checkpoint-admin/status.go
@@ -19,8 +19,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/common"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/clef/main.go b/cmd/clef/main.go
index f4d94f02742245d7506fb9d8613d0755af7df1dd..3f710a688ba46ade1ce5beb3661a9ab16b728179 100644
--- a/cmd/clef/main.go
+++ b/cmd/clef/main.go
@@ -35,24 +35,24 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/console"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/ethereum/go-ethereum/signer/core"
-	"github.com/ethereum/go-ethereum/signer/fourbyte"
-	"github.com/ethereum/go-ethereum/signer/rules"
-	"github.com/ethereum/go-ethereum/signer/storage"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/console"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/rpc"
+	"github.com/maticnetwork/bor/signer/core"
+	"github.com/maticnetwork/bor/signer/fourbyte"
+	"github.com/maticnetwork/bor/signer/rules"
+	"github.com/maticnetwork/bor/signer/storage"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/clef/tutorial.md b/cmd/clef/tutorial.md
index a0a6b052af9a01b05ac609136ddac13da75e282b..08ad9a4488660390b3934a867702441635cfbf64 100644
--- a/cmd/clef/tutorial.md
+++ b/cmd/clef/tutorial.md
@@ -100,9 +100,9 @@ or
 {"jsonrpc":"2.0","id":1,"error":{"code":-32000,"message":"Request denied"}}
 ```
 
-Apart from listing accounts, you can also *request* creating a new account; signing transactions and data; and recovering signatures. You can find the available methods in the Clef [External API Spec](https://github.com/ethereum/go-ethereum/tree/master/cmd/clef#external-api-1) and the [External API Changelog](https://github.com/ethereum/go-ethereum/blob/master/cmd/clef/extapi_changelog.md).
+Apart from listing accounts, you can also *request* creating a new account; signing transactions and data; and recovering signatures. You can find the available methods in the Clef [External API Spec](https://github.com/maticnetwork/bor/tree/master/cmd/clef#external-api-1) and the [External API Changelog](https://github.com/maticnetwork/bor/blob/master/cmd/clef/extapi_changelog.md).
 
-*Note, the number of things you can do from the External API is deliberately small, since we want to limit the power of remote calls by as much as possible! Clef has an [Internal API](https://github.com/ethereum/go-ethereum/tree/master/cmd/clef#ui-api-1) too for the UI (User Interface) which is much richer and can support custom interfaces on top. But that's out of scope here.*
+*Note, the number of things you can do from the External API is deliberately small, since we want to limit the power of remote calls by as much as possible! Clef has an [Internal API](https://github.com/maticnetwork/bor/tree/master/cmd/clef#ui-api-1) too for the UI (User Interface) which is much richer and can support custom interfaces on top. But that's out of scope here.*
 
 ## Automatic rules
 
@@ -288,7 +288,7 @@ t=2019-07-01T15:52:23+0300 lvl=info msg=SignData   api=signer type=request  meta
 t=2019-07-01T15:52:23+0300 lvl=info msg=SignData   api=signer type=response data=                                     error="Request denied"
 ```
 
-For more details on writing automatic rules, please see the [rules spec](https://github.com/ethereum/go-ethereum/blob/master/cmd/clef/rules.md).
+For more details on writing automatic rules, please see the [rules spec](https://github.com/maticnetwork/bor/blob/master/cmd/clef/rules.md).
 
 ## Geth integration
 
diff --git a/cmd/devp2p/discv4cmd.go b/cmd/devp2p/discv4cmd.go
index 1e56687a6c78f8ed1d3f06a8707b0482572587d1..1d12aa70284916d5bc3ea339e381de6e67413af2 100644
--- a/cmd/devp2p/discv4cmd.go
+++ b/cmd/devp2p/discv4cmd.go
@@ -23,10 +23,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p/discover"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p/discover"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/params"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/devp2p/enrcmd.go b/cmd/devp2p/enrcmd.go
index 15d77dd011a82d9b44765636d434ddb99ea9a5cf..938d7708573396ab23aa16884d84c31658c258e1 100644
--- a/cmd/devp2p/enrcmd.go
+++ b/cmd/devp2p/enrcmd.go
@@ -27,9 +27,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/enr"
+	"github.com/maticnetwork/bor/rlp"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/devp2p/main.go b/cmd/devp2p/main.go
index 4532ab96837202c5fce85e2e5f1d3d484a1a9ef0..30d48d898e36382ffd7a1682bf2402e350e6bdac 100644
--- a/cmd/devp2p/main.go
+++ b/cmd/devp2p/main.go
@@ -21,8 +21,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ethereum/go-ethereum/internal/debug"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/internal/debug"
+	"github.com/maticnetwork/bor/params"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/ethkey/changepassphrase.go b/cmd/ethkey/changepassphrase.go
index d1ae2ae0d89b4734f528205ca801789c729769c6..f9bfb72e5fbbb920d2e725cff320b4318d90f85f 100644
--- a/cmd/ethkey/changepassphrase.go
+++ b/cmd/ethkey/changepassphrase.go
@@ -5,8 +5,8 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/cmd/utils"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/cmd/utils"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go
index fe9a0c15192e688a05276a4a89504b19fc618194..0cb51a5d4c45fccc08ecce690bfa38352b5f63eb 100644
--- a/cmd/ethkey/generate.go
+++ b/cmd/ethkey/generate.go
@@ -23,9 +23,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/crypto"
 	"github.com/pborman/uuid"
 	"gopkg.in/urfave/cli.v1"
 )
diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go
index ba03d4d93692c04a304b84845c0bdba373335c48..d14151df6355086a5865c1bb50f49e8a37a2f3a7 100644
--- a/cmd/ethkey/inspect.go
+++ b/cmd/ethkey/inspect.go
@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/crypto"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go
index a8399ad7c5655b3bd5f96e8dfb7d687b15235b67..ea178839e24ebfe2bb8580af84ef39a996c81451 100644
--- a/cmd/ethkey/main.go
+++ b/cmd/ethkey/main.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/ethereum/go-ethereum/cmd/utils"
+	"github.com/maticnetwork/bor/cmd/utils"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go
index 5caea69ff6536ce16d7350c38bad9a4d86a8e8e5..1bcf378acdc3c44493412a72c6741f995c955825 100644
--- a/cmd/ethkey/message.go
+++ b/cmd/ethkey/message.go
@@ -21,10 +21,10 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go
index 6006f6b5bb70255b597f8256e88b0eeee9299040..31643c26dc15c0a2bf89b3785f5f432162795f6e 100644
--- a/cmd/ethkey/run_test.go
+++ b/cmd/ethkey/run_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/pkg/reexec"
-	"github.com/ethereum/go-ethereum/internal/cmdtest"
+	"github.com/maticnetwork/bor/internal/cmdtest"
 )
 
 type testEthkey struct {
diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go
index 6f60ebaf1beb20962b3db9acc6f7f6cb24a5940a..88400d2978ce9a38f4f44dbc5576797e19107336 100644
--- a/cmd/ethkey/utils.go
+++ b/cmd/ethkey/utils.go
@@ -22,9 +22,9 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/console"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/console"
+	"github.com/maticnetwork/bor/crypto"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go
index c019a2fe70b7fa8f191b6f89ecb7df0808eb2130..49801df723e9504654b52bbc7f1593b9704bf7ac 100644
--- a/cmd/evm/compiler.go
+++ b/cmd/evm/compiler.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/ethereum/go-ethereum/cmd/evm/internal/compiler"
+	"github.com/maticnetwork/bor/cmd/evm/internal/compiler"
 
 	cli "gopkg.in/urfave/cli.v1"
 )
diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go
index 69f611e39b114af905e03557647adb1a166acf7e..063fdaf8d4f52ae6162822aadff1f13132612769 100644
--- a/cmd/evm/disasm.go
+++ b/cmd/evm/disasm.go
@@ -22,7 +22,7 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/core/asm"
+	"github.com/maticnetwork/bor/core/asm"
 	cli "gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go
index 54981b66976827be693fdfaef2e10d6299703900..2e0b138cb8d2268cf7fbb8eac75a701bb1cea8ca 100644
--- a/cmd/evm/internal/compiler/compiler.go
+++ b/cmd/evm/internal/compiler/compiler.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/core/asm"
+	"github.com/maticnetwork/bor/core/asm"
 )
 
 func Compile(fn string, src []byte, debug bool) (string, error) {
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index a5159c6b7ee44f3a336fce8c028c03655910e5c4..1d564e714ce7ec07710386a9b66de747898ed2ab 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -22,7 +22,7 @@ import (
 	"math/big"
 	"os"
 
-	"github.com/ethereum/go-ethereum/cmd/utils"
+	"github.com/maticnetwork/bor/cmd/utils"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go
index 318aa222a33a89457a8dcb822592359f1c4c32ec..d8084e0a4218ad1802aaef2bdc95d66e2ef1888f 100644
--- a/cmd/evm/runner.go
+++ b/cmd/evm/runner.go
@@ -26,16 +26,16 @@ import (
 	"runtime/pprof"
 	"time"
 
-	"github.com/ethereum/go-ethereum/cmd/evm/internal/compiler"
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/core/vm/runtime"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/cmd/evm/internal/compiler"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/core/vm/runtime"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
 	cli "gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go
index cef2aedb5e68c7eaf7e0cfadd21c07e241cf9eb8..d35f7608d5324f3f6142492e298ce4e5fb8416e9 100644
--- a/cmd/evm/staterunner.go
+++ b/cmd/evm/staterunner.go
@@ -23,10 +23,10 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/tests"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/tests"
 
 	cli "gopkg.in/urfave/cli.v1"
 )
diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go
index f8092084ad18eada413869e07a5acb8799ced50a..3f0a954187ebe981b011035f2d380a2a247bb1ed 100644
--- a/cmd/faucet/faucet.go
+++ b/cmd/faucet/faucet.go
@@ -41,23 +41,23 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/ethereum/go-ethereum/ethstats"
-	"github.com/ethereum/go-ethereum/les"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/discv5"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/nat"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/ethclient"
+	"github.com/maticnetwork/bor/ethstats"
+	"github.com/maticnetwork/bor/les"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/discv5"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/nat"
+	"github.com/maticnetwork/bor/params"
 	"golang.org/x/net/websocket"
 )
 
@@ -458,7 +458,7 @@ func (f *faucet) apiHandler(conn *websocket.Conn) {
 		case *noauthFlag:
 			username, avatar, address, err = authNoAuth(msg.URL)
 		default:
-			err = errors.New("Something funky happened, please open an issue at https://github.com/ethereum/go-ethereum/issues")
+			err = errors.New("Something funky happened, please open an issue at https://github.com/maticnetwork/bor/issues")
 		}
 		if err != nil {
 			if err = sendError(conn, err); err != nil {
diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go
index f2c1bf97035004fff431c85ddbd8c6c1f76b258f..f9aa76600e74bb933f6b17c71ce9b56de7160e72 100644
--- a/cmd/p2psim/main.go
+++ b/cmd/p2psim/main.go
@@ -45,12 +45,12 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/simulations"
-	"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/simulations"
+	"github.com/maticnetwork/bor/p2p/simulations/adapters"
+	"github.com/maticnetwork/bor/rpc"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go
index ae7675cd9bc906bfe5c5233fe024451a1957ebee..9bf5c4a78844ecf2b5f26543a5bffda5d60e2f48 100644
--- a/cmd/puppeth/genesis.go
+++ b/cmd/puppeth/genesis.go
@@ -23,12 +23,12 @@ import (
 	"math/big"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	math2 "github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	math2 "github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/params"
 )
 
 // alethGenesisSpec represents the genesis specification format used by the
diff --git a/cmd/puppeth/genesis_test.go b/cmd/puppeth/genesis_test.go
index 83e73836057233c317a1243e6e826af092eb12cd..022d03d06aed20f8dc7a6b616a3355f75c67c092 100644
--- a/cmd/puppeth/genesis_test.go
+++ b/cmd/puppeth/genesis_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/core"
+	"github.com/maticnetwork/bor/core"
 )
 
 // Tests the go-ethereum to Aleth chainspec conversion for the Stureby testnet.
diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go
index b6a029a01a48a6413ce05076232ec4add5bdbc4e..a8f4870d1d18133b575d12c778083c280e9c1ac8 100644
--- a/cmd/puppeth/module.go
+++ b/cmd/puppeth/module.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 var (
diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go
index 9a77587b4a85f4a64d2e526202787e9891b2286a..6e845a4e998e376852ecfe84e220063651ad0038 100644
--- a/cmd/puppeth/module_dashboard.go
+++ b/cmd/puppeth/module_dashboard.go
@@ -26,7 +26,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // dashboardContent is the actual dashboard HTML content to serve up when users
@@ -208,7 +208,7 @@ var dashboardContent = `
 											<pre>geth --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre>
 										</p>
 										<p>With your local chain initialized, you can start the Ethereum Wallet:
-											<pre>ethereumwallet --rpc $HOME/.{{.Network}}/geth.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}</pre>
+											<pre>ethereumwallet --rpc $HOME/.{{.Network}}/bor.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}</pre>
 										<p>
 										<br/>
 										<p>You can download the Ethereum Wallet from <a href="https://github.com/ethereum/mist/releases" target="about:blank">https://github.com/ethereum/mist/releases</a>.</p>
@@ -229,7 +229,7 @@ var dashboardContent = `
 											<pre>geth --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre>
 										</p>
 										<p>With your local chain initialized, you can start Mist:
-											<pre>mist --rpc $HOME/.{{.Network}}/geth.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}</pre>
+											<pre>mist --rpc $HOME/.{{.Network}}/bor.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}</pre>
 										<p>
 										<br/>
 										<p>You can download the Mist browser from <a href="https://github.com/ethereum/mist/releases" target="about:blank">https://github.com/ethereum/mist/releases</a>.</p>
@@ -256,7 +256,7 @@ var dashboardContent = `
 										<p>Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for Java based Android projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from Android too.</p>
 										<p>Under the hood the Android library is backed by a go-ethereum light node, meaning that given a not-too-old Android device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.</p>
 										<br/>
-										<p>The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in <a href="https://github.com/ethereum/go-ethereum/wiki/Mobile:-Introduction#android-archive" target="about:blank">Mobile: Introduction &ndash; Android archive</a>.
+										<p>The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in <a href="https://github.com/maticnetwork/bor/wiki/Mobile:-Introduction#android-archive" target="about:blank">Mobile: Introduction &ndash; Android archive</a>.
 										<p>Before connecting to the Ethereum network, download the <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> genesis json file and either store it in your Android project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.</p>
 										<p>Inside your Java code you can now import the geth archive and connect to Ethereum:
 											<pre>import org.ethereum.geth.*;</pre>
@@ -287,7 +287,7 @@ node.start();
 										<p>Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for ObjC/Swift based iOS projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from iOS too.</p>
 										<p>Under the hood the iOS library is backed by a go-ethereum light node, meaning that given a not-too-old Apple device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.</p>
 										<br/>
-										<p>Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in <a href="https://github.com/ethereum/go-ethereum/wiki/Mobile:-Introduction#ios-framework" target="about:blank">Mobile: Introduction &ndash; iOS framework</a>.
+										<p>Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in <a href="https://github.com/maticnetwork/bor/wiki/Mobile:-Introduction#ios-framework" target="about:blank">Mobile: Introduction &ndash; iOS framework</a>.
 										<p>Before connecting to the Ethereum network, download the <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> genesis json file and either store it in your iOS project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.</p>
 										<p>Inside your Swift code you can now import the geth framework and connect to Ethereum (ObjC should be analogous):
 											<pre>import Geth</pre>
@@ -419,7 +419,7 @@ try! node?.start();
 										<p>Puppeth is a tool to aid you in creating a new Ethereum network down to the genesis block, bootnodes, signers, ethstats server, crypto faucet, wallet browsers, block explorer, dashboard and more; without the hassle that it would normally entail to manually configure all these services one by one.</p>
 										<p>Puppeth uses ssh to dial in to remote servers, and builds its network components out of docker containers using docker-compose. The user is guided through the process via a command line wizard that does the heavy lifting and topology configuration automatically behind the scenes.</p>
 										<br/>
-										<p>Puppeth is distributed as part of the <a href="https://geth.ethereum.org/downloads/" target="about:blank">Geth &amp; Tools</a> bundles, but can also be installed separately via:<pre>go get github.com/ethereum/go-ethereum/cmd/puppeth</pre></p>
+										<p>Puppeth is distributed as part of the <a href="https://geth.ethereum.org/downloads/" target="about:blank">Geth &amp; Tools</a> bundles, but can also be installed separately via:<pre>go get github.com/maticnetwork/bor/cmd/puppeth</pre></p>
 										<br/>
 										<p><em>Copyright 2017. The go-ethereum Authors.</em></p>
 									</div>
diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go
index 58ecb83951e00be6b458c8532828ac59b9164542..a479ec3d16c694fd2fb064e21fce3047152452cb 100644
--- a/cmd/puppeth/module_ethstats.go
+++ b/cmd/puppeth/module_ethstats.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // ethstatsDockerfile is the Dockerfile required to build an ethstats backend
diff --git a/cmd/puppeth/module_explorer.go b/cmd/puppeth/module_explorer.go
index 8fffe1a1c468fde9263014b01d67ab40cb7c2283..15335766b784173adc9decd326b395991606ae3b 100644
--- a/cmd/puppeth/module_explorer.go
+++ b/cmd/puppeth/module_explorer.go
@@ -25,7 +25,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // explorerDockerfile is the Dockerfile required to run a block explorer.
diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go
index 3a06bf3c68daa77e97465cfd8fcac0a22156c20b..c5094a83bd1026449ad3fd42485cc2e1b323848b 100644
--- a/cmd/puppeth/module_faucet.go
+++ b/cmd/puppeth/module_faucet.go
@@ -26,8 +26,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/log"
 )
 
 // faucetDockerfile is the Dockerfile required to build a faucet container to
diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go
index 1b1ae61ff598fd490a7d194395350f1a5f948188..e01e3e9e425b51a5c2c11885ab0dfbceebc337f5 100644
--- a/cmd/puppeth/module_nginx.go
+++ b/cmd/puppeth/module_nginx.go
@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // nginxDockerfile is theis the Dockerfile required to build an nginx reverse-
diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go
index 5d9ef46523e0aac00d50930a19da03f1c0e40179..6337724b1f24274d39018d65ff1ba6492a999e78 100644
--- a/cmd/puppeth/module_node.go
+++ b/cmd/puppeth/module_node.go
@@ -26,8 +26,8 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/log"
 )
 
 // nodeDockerfile is the Dockerfile required to run an Ethereum node.
diff --git a/cmd/puppeth/module_wallet.go b/cmd/puppeth/module_wallet.go
index ebaa5b6ae1a5e084e0898e13054c3d6fc2f2fb9c..a0a9e0725909ef4dbc0d44673a9247351ba3e891 100644
--- a/cmd/puppeth/module_wallet.go
+++ b/cmd/puppeth/module_wallet.go
@@ -25,7 +25,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // walletDockerfile is the Dockerfile required to run a web wallet.
diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go
index c3de5f9360242ebdc460c49eb6ee4d6c6314d5b0..40aec347a306ae25709a837394822fef78bd9114 100644
--- a/cmd/puppeth/puppeth.go
+++ b/cmd/puppeth/puppeth.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go
index c507596065bacb4c355240cd1f25778f6c5a1e66..d43c28a394e0f9d0015d44c13b29ce945be63585 100644
--- a/cmd/puppeth/ssh.go
+++ b/cmd/puppeth/ssh.go
@@ -28,7 +28,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/terminal"
 )
diff --git a/cmd/puppeth/wizard.go b/cmd/puppeth/wizard.go
index 83536506c4cb3d02b9301ec79855ea19e6f22dfe..2f22ad677e52fa7d04b9150b061115ac870ac7f1 100644
--- a/cmd/puppeth/wizard.go
+++ b/cmd/puppeth/wizard.go
@@ -31,9 +31,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/log"
 	"golang.org/x/crypto/ssh/terminal"
 )
 
diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go
index b699d7617d0069030608c5363d1635a0e9ed08b2..7b5a362bab05ceef3a598b2b76d8a25a6f5592eb 100644
--- a/cmd/puppeth/wizard_dashboard.go
+++ b/cmd/puppeth/wizard_dashboard.go
@@ -19,7 +19,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // deployDashboard queries the user for various input on deploying a web-service
diff --git a/cmd/puppeth/wizard_ethstats.go b/cmd/puppeth/wizard_ethstats.go
index 58ff3efbe98693acea4d730ff544ad7b676526ec..26fac9b600acfb6f63632b944d8dfdc2f64d0088 100644
--- a/cmd/puppeth/wizard_ethstats.go
+++ b/cmd/puppeth/wizard_ethstats.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // deployEthstats queries the user for various input on deploying an ethstats
diff --git a/cmd/puppeth/wizard_explorer.go b/cmd/puppeth/wizard_explorer.go
index 1df9cbc0f322e38438011c50e8c26d14684a7257..707c55805cab58aaa49c80e1835e2864959fbb8e 100644
--- a/cmd/puppeth/wizard_explorer.go
+++ b/cmd/puppeth/wizard_explorer.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // deployExplorer creates a new block explorer based on some user input.
diff --git a/cmd/puppeth/wizard_faucet.go b/cmd/puppeth/wizard_faucet.go
index 9068c1d30b5ae093470c08eb1d5052d425842bda..85e556045c47e04b0aab5db43f920bb6c774c4d0 100644
--- a/cmd/puppeth/wizard_faucet.go
+++ b/cmd/puppeth/wizard_faucet.go
@@ -20,8 +20,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/log"
 )
 
 // deployFaucet queries the user for various input on deploying a faucet, after
diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go
index f4dd814f976c0827190198c21aff7e4a55607083..439143586c482b12f00c8b793e998cd3cd5984eb 100644
--- a/cmd/puppeth/wizard_genesis.go
+++ b/cmd/puppeth/wizard_genesis.go
@@ -29,10 +29,10 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
 )
 
 // makeGenesis creates a new genesis struct based on some user input.
diff --git a/cmd/puppeth/wizard_intro.go b/cmd/puppeth/wizard_intro.go
index 75fb04b76f70b99fda903bfa9ece687b25e0ba60..a35da1be551e51e1ec3275b60c39bb045f476d4f 100644
--- a/cmd/puppeth/wizard_intro.go
+++ b/cmd/puppeth/wizard_intro.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // makeWizard creates and returns a new puppeth wizard.
diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go
index 99ca11bb177610b66d117b513ccabfb58b5d5aed..94dc95c2e680e81bc1dfe6070edcd74b999e5e28 100644
--- a/cmd/puppeth/wizard_netstats.go
+++ b/cmd/puppeth/wizard_netstats.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/log"
 	"github.com/olekukonko/tablewriter"
 )
 
diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go
index 97302c0df8bba4b0e5d0dd701835df33c3262990..e9fa1ba60af13128d092b8eddf1a54627700b50f 100644
--- a/cmd/puppeth/wizard_network.go
+++ b/cmd/puppeth/wizard_network.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // manageServers displays a list of servers the user can disconnect from, and an
diff --git a/cmd/puppeth/wizard_nginx.go b/cmd/puppeth/wizard_nginx.go
index 8397b7fd57ff3edc3b142627ef402e5201c40bcc..934fb6171a7f4653faab360fc18e6d6a43fe2081 100644
--- a/cmd/puppeth/wizard_nginx.go
+++ b/cmd/puppeth/wizard_nginx.go
@@ -19,7 +19,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // ensureVirtualHost checks whether a reverse-proxy is running on the specified
diff --git a/cmd/puppeth/wizard_node.go b/cmd/puppeth/wizard_node.go
index e37297f6d629329b6bc8269347d20ffc9a9dccc8..42b254b20526f5ea394aa8a9c79d7004abb01c34 100644
--- a/cmd/puppeth/wizard_node.go
+++ b/cmd/puppeth/wizard_node.go
@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/log"
 )
 
 // deployNode creates a new node configuration based on some user input.
diff --git a/cmd/puppeth/wizard_wallet.go b/cmd/puppeth/wizard_wallet.go
index ca1ea5bd25915cd5bf60af8ee080c70e596057a2..ada259493da1f5fc1887f913e8a34bbeb9090ba8 100644
--- a/cmd/puppeth/wizard_wallet.go
+++ b/cmd/puppeth/wizard_wallet.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // deployWallet creates a new web wallet based on some user input.
diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go
index d0f993c5b88df8fee8610817c3111b39c0899e79..13313e1cbba5421928cb6607e8ee308de2214344 100644
--- a/cmd/rlpdump/main.go
+++ b/cmd/rlpdump/main.go
@@ -26,7 +26,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 var (
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index a3ee45ba7f067a7bd2fbffddd84d35d6422f8297..fa0fd8ffce75ccac4271d7836983cd3871d5e320 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -27,16 +27,16 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/internal/debug"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/internal/debug"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 const (
diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go
index e5bf8724c17ae65778adc23a7a4f5835120626c9..ce89c51e7f988da60e9b009172d49761f9548708 100644
--- a/cmd/utils/customflags.go
+++ b/cmd/utils/customflags.go
@@ -27,7 +27,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/maticnetwork/bor/common/math"
 	"gopkg.in/urfave/cli.v1"
 )
 
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index da739abd7b019ed0f072c06546528236524f9e97..920071cf736d184a3801d856e4d557a3c976872b 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -29,38 +29,38 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/fdlimit"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/consensus/bor"
-	"github.com/ethereum/go-ethereum/consensus/clique"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/dashboard"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/eth/gasprice"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/ethstats"
-	"github.com/ethereum/go-ethereum/graphql"
-	"github.com/ethereum/go-ethereum/les"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/metrics/influxdb"
-	"github.com/ethereum/go-ethereum/miner"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/discv5"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/nat"
-	"github.com/ethereum/go-ethereum/p2p/netutil"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rpc"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/fdlimit"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/consensus/bor"
+	"github.com/maticnetwork/bor/consensus/clique"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/dashboard"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/eth/gasprice"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/ethstats"
+	"github.com/maticnetwork/bor/graphql"
+	"github.com/maticnetwork/bor/les"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/metrics/influxdb"
+	"github.com/maticnetwork/bor/miner"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/discv5"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/nat"
+	"github.com/maticnetwork/bor/p2p/netutil"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rpc"
+	whisper "github.com/maticnetwork/bor/whisper/whisperv6"
 	pcsclite "github.com/gballet/go-libpcsclite"
 	cli "gopkg.in/urfave/cli.v1"
 )
diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go
index 99cf84ec1bfa1e5008ea1111065c90e2902be4d0..4c107506e1e51e4f8ecfcc79fa7a4ca4678cdb01 100644
--- a/cmd/wnode/main.go
+++ b/cmd/wnode/main.go
@@ -35,16 +35,16 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/console"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/nat"
-	"github.com/ethereum/go-ethereum/whisper/mailserver"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/console"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/nat"
+	"github.com/maticnetwork/bor/whisper/mailserver"
+	whisper "github.com/maticnetwork/bor/whisper/whisperv6"
 	"golang.org/x/crypto/pbkdf2"
 )
 
diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go
index 13a13011dcb82c131301507da33859a6bd30e5ec..e42d4accf1f9d7c34bab724a1d62ec23e3186e29 100644
--- a/common/bitutil/compress_test.go
+++ b/common/bitutil/compress_test.go
@@ -21,7 +21,7 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 // Tests that data bitset encoding and decoding works and is bijective.
diff --git a/common/debug.go b/common/debug.go
index 61acd8ce70f8b77e4b4ffb581e996d69fef48e03..3ec8f886c6c982bd14d8da0932a500deb3464f2b 100644
--- a/common/debug.go
+++ b/common/debug.go
@@ -26,7 +26,7 @@ import (
 
 // Report gives off a warning requesting the user to submit an issue to the github tracker.
 func Report(extra ...interface{}) {
-	fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/ethereum/go-ethereum/issues")
+	fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/maticnetwork/bor/issues")
 	fmt.Fprintln(os.Stderr, extra...)
 
 	_, file, line, _ := runtime.Caller(1)
diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go
index 80180d918686458908bc3368ad1677299ba2569b..37bee62c64715b1b1be6b066edecd50946e9df78 100644
--- a/common/hexutil/json_example_test.go
+++ b/common/hexutil/json_example_test.go
@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 type MyType [5]byte
diff --git a/common/math/big_test.go b/common/math/big_test.go
index be9810dc8cf54de243b90dd741ca283dfba8cc3a..ce6b142cdde783c2aa912c5c7b33ac49aa41b724 100644
--- a/common/math/big_test.go
+++ b/common/math/big_test.go
@@ -22,7 +22,7 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 func TestHexOrDecimal256(t *testing.T) {
diff --git a/common/types.go b/common/types.go
index 98c83edd4fa2edba534a7a44976135a6b4256c56..8c3f9aae396c30c42cffb097a95ef0eb68efacb4 100644
--- a/common/types.go
+++ b/common/types.go
@@ -26,7 +26,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common/hexutil"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/consensus/bor/api.go b/consensus/bor/api.go
index 3e9cf87fa2385a4d2e2f90ebdc7fe555f3a1d1b5..cca115ebc0416d39f5e8aa4fe78a2fe7c5497558 100644
--- a/consensus/bor/api.go
+++ b/consensus/bor/api.go
@@ -17,10 +17,10 @@
 package bor
 
 import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // API is a user facing RPC API to allow controlling the signer and voting
diff --git a/consensus/bor/bor.go b/consensus/bor/bor.go
index f2d8e43772448ce3d001ab049e5acc5c3fa5079b..dd7cee90eab5220e30f629ce35424edc6d864db0 100644
--- a/consensus/bor/bor.go
+++ b/consensus/bor/bor.go
@@ -17,24 +17,24 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/consensus/misc"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/abi"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/consensus/misc"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/rpc"
 
 	lru "github.com/hashicorp/golang-lru"
 	"golang.org/x/crypto/sha3"
diff --git a/consensus/bor/clerk.go b/consensus/bor/clerk.go
index 70ea4e46643ace974fd2025ea259609be15ededa..755b69583948be9d1370b5130aea70466bb32e6f 100644
--- a/consensus/bor/clerk.go
+++ b/consensus/bor/clerk.go
@@ -1,7 +1,7 @@
 package bor
 
 import (
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 // EventRecord represents state record
diff --git a/consensus/bor/snapshot.go b/consensus/bor/snapshot.go
index 41a844eaa5c0c117c6fd8861ab53c77a4e6af508..09f08af5ad76b7426b7f64f4dbfc24f183fc236e 100644
--- a/consensus/bor/snapshot.go
+++ b/consensus/bor/snapshot.go
@@ -21,11 +21,11 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/params"
 	lru "github.com/hashicorp/golang-lru"
 )
 
diff --git a/consensus/bor/validator.go b/consensus/bor/validator.go
index 50b4a58ae4655e131ac7df280327555ce8b27bfe..0592ab3b138a279d9bcc43d28feabd25913b5112 100644
--- a/consensus/bor/validator.go
+++ b/consensus/bor/validator.go
@@ -9,7 +9,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 // Validator represets Volatile state for each Validator
diff --git a/consensus/bor/validator_set.go b/consensus/bor/validator_set.go
index 1de37a715caf272cf2fbf6d7fc695ea2887ab17a..2f22d5b59f389460c62a95a93b44ba0aba0bee7f 100644
--- a/consensus/bor/validator_set.go
+++ b/consensus/bor/validator_set.go
@@ -10,7 +10,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 // MaxTotalVotingPower - the maximum allowed total voting power.
diff --git a/consensus/clique/api.go b/consensus/clique/api.go
index 6bcf987af55eb983a1dad6c6f9da8909eea7054b..f5caf4ff6199da757ae7d7d6310f90bee19d21f4 100644
--- a/consensus/clique/api.go
+++ b/consensus/clique/api.go
@@ -17,10 +17,10 @@
 package clique
 
 import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // API is a user facing RPC API to allow controlling the signer and voting
diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go
index 084009a066a008f5814136d71dec161d65b1829d..b90f61176647554ead76da13b30215d89416a91d 100644
--- a/consensus/clique/clique.go
+++ b/consensus/clique/clique.go
@@ -26,19 +26,19 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/consensus/misc"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/consensus/misc"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/rpc"
 	lru "github.com/hashicorp/golang-lru"
 	"golang.org/x/crypto/sha3"
 )
diff --git a/consensus/clique/clique_test.go b/consensus/clique/clique_test.go
index 710f4480555590ac4070f54eb49d98c48df21455..5db69c8238c55f748c52d58d46e20f2bed46788b 100644
--- a/consensus/clique/clique_test.go
+++ b/consensus/clique/clique_test.go
@@ -20,13 +20,13 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/params"
 )
 
 // This test case is a repro of an annoying bug that took us forever to catch.
diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go
index 4ee731a9082104c12193d99127acde7134a3e8db..593dfe8b997b17c9c8b8100e02d309cdb47bde53 100644
--- a/consensus/clique/snapshot.go
+++ b/consensus/clique/snapshot.go
@@ -22,11 +22,11 @@ import (
 	"sort"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
 	lru "github.com/hashicorp/golang-lru"
 )
 
diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go
index fc08722efd6323376b1e48263a598e42e0d20c84..26d6bcf7de888477942bbe95c0e2cceedd8cdfaa 100644
--- a/consensus/clique/snapshot_test.go
+++ b/consensus/clique/snapshot_test.go
@@ -22,13 +22,13 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/params"
 )
 
 // testerAccountPool is a pool to maintain currently active tester accounts,
@@ -363,7 +363,7 @@ func TestClique(t *testing.T) {
 			failure: errRecentlySigned,
 		}, {
 			// Recent signatures should not reset on checkpoint blocks imported in a new
-			// batch (https://github.com/ethereum/go-ethereum/issues/17593). Whilst this
+			// batch (https://github.com/maticnetwork/bor/issues/17593). Whilst this
 			// seems overly specific and weird, it was a Rinkeby consensus split.
 			epoch:   3,
 			signers: []string{"A", "B", "C"},
diff --git a/consensus/consensus.go b/consensus/consensus.go
index f753af550ca03516df6d2a7185a1852d6490f9cf..e86583f394d0c6a56b7e28e1de5c8ac7184a97f9 100644
--- a/consensus/consensus.go
+++ b/consensus/consensus.go
@@ -20,11 +20,11 @@ package consensus
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // ChainReader defines a small collection of methods needed to access the local
diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go
index d6c871092ed30e54899f39fcfad7b97787f19b84..b4e5bc173557dac22edc02cdb6d960314e78f3a3 100644
--- a/consensus/ethash/algorithm.go
+++ b/consensus/ethash/algorithm.go
@@ -27,10 +27,10 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/bitutil"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/bitutil"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go
index cf8552f3ab74e6b529af41731b8a6545190eed44..6dfdeab75e48ff7e6344f2a4acb533f2c8eabce1 100644
--- a/consensus/ethash/algorithm_test.go
+++ b/consensus/ethash/algorithm_test.go
@@ -26,9 +26,9 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // prepare converts an ethash cache or dataset from a byte stream into the internal
diff --git a/consensus/ethash/api.go b/consensus/ethash/api.go
index 4d8eed416116e02df07dcdfe4e9813716d52a45d..1cae20aea828103346db044c81c67a17eac6be0e 100644
--- a/consensus/ethash/api.go
+++ b/consensus/ethash/api.go
@@ -19,9 +19,9 @@ package ethash
 import (
 	"errors"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 var errEthashStopped = errors.New("ethash stopped")
diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go
index d271518f4fedc68e2b6a2291869704c4a2c1d5c8..b75bdffb73f5c024ccdcf5d82e611a28558e22e3 100644
--- a/consensus/ethash/consensus.go
+++ b/consensus/ethash/consensus.go
@@ -25,14 +25,14 @@ import (
 	"time"
 
 	mapset "github.com/deckarep/golang-set"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/consensus/misc"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/consensus/misc"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go
index 675737d9e1aa6ffececd83dfea51b84f6f05fabc..208ba7ed7533a25b22e1681763dd41a36ea2d4ec 100644
--- a/consensus/ethash/consensus_test.go
+++ b/consensus/ethash/consensus_test.go
@@ -23,9 +23,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/params"
 )
 
 type diffTest struct {
diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go
index 78892e1da85d90eb7b8911160cfaf11099f6a783..999d92012ac5532558521468dc95b4e960d895e0 100644
--- a/consensus/ethash/ethash.go
+++ b/consensus/ethash/ethash.go
@@ -34,12 +34,12 @@ import (
 	"unsafe"
 
 	mmap "github.com/edsrzf/mmap-go"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/rpc"
 	"github.com/hashicorp/golang-lru/simplelru"
 )
 
diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go
index 90cb6470f735598d303b8c88ac06bce24e65aa31..16180abd6d7494ff489c608b0ec1be771c9452ec 100644
--- a/consensus/ethash/ethash_test.go
+++ b/consensus/ethash/ethash_test.go
@@ -25,9 +25,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // Tests that ethash works correctly in test mode.
@@ -55,7 +55,7 @@ func TestTestMode(t *testing.T) {
 }
 
 // This test checks that cache lru logic doesn't crash under load.
-// It reproduces https://github.com/ethereum/go-ethereum/issues/14943
+// It reproduces https://github.com/maticnetwork/bor/issues/14943
 func TestCacheFileEvict(t *testing.T) {
 	tmpdir, err := ioutil.TempDir("", "ethash-test")
 	if err != nil {
diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go
index 43db1fcb7fd769d3c6470dbc6193c5ea9a488706..6c7790cc60f3c33ce89bdd4e97928803e41e60a5 100644
--- a/consensus/ethash/sealer.go
+++ b/consensus/ethash/sealer.go
@@ -29,11 +29,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/log"
 )
 
 const (
diff --git a/consensus/ethash/sealer_test.go b/consensus/ethash/sealer_test.go
index 436359af7c164deab03a6f6ecd64033e184e91a1..fd03412bcb52c31577c4d2e19a4d3dcc6de080a0 100644
--- a/consensus/ethash/sealer_test.go
+++ b/consensus/ethash/sealer_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // Tests whether remote HTTP servers are correctly notified of new work.
diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go
index 9b22bd7a52abc44d1abdcbc7626a77f97d1237ac..aa414137746c85708083385f3e03793fc2619596 100644
--- a/consensus/misc/dao.go
+++ b/consensus/misc/dao.go
@@ -21,9 +21,9 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/params"
 )
 
 var (
diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go
index 4a5e7c37e03c40e7c6abf77809ad60fd2968fef3..ce63b3f26737db689d880e3604d878f0320382c4 100644
--- a/consensus/misc/forks.go
+++ b/consensus/misc/forks.go
@@ -19,9 +19,9 @@ package misc
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/params"
 )
 
 // VerifyForkHashes verifies that blocks conforming to network hard-forks do have
diff --git a/console/bridge.go b/console/bridge.go
index bb14abca25ae316ce28ca486a152a899dcdabe25..f0d43f7d4190b820befbc7da7ffb7a75428c52a9 100644
--- a/console/bridge.go
+++ b/console/bridge.go
@@ -23,10 +23,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts/scwallet"
-	"github.com/ethereum/go-ethereum/accounts/usbwallet"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/accounts/scwallet"
+	"github.com/maticnetwork/bor/accounts/usbwallet"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/rpc"
 	"github.com/robertkrimen/otto"
 )
 
diff --git a/console/console.go b/console/console.go
index 5326ed2c8791bada844637b62e7b0e21a3052c76..a1ef4ec3385d2a2a0631f515adddbae1a7ac2207 100644
--- a/console/console.go
+++ b/console/console.go
@@ -28,9 +28,9 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/ethereum/go-ethereum/internal/jsre"
-	"github.com/ethereum/go-ethereum/internal/web3ext"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/internal/jsre"
+	"github.com/maticnetwork/bor/internal/web3ext"
+	"github.com/maticnetwork/bor/rpc"
 	"github.com/mattn/go-colorable"
 	"github.com/peterh/liner"
 	"github.com/robertkrimen/otto"
diff --git a/console/console_test.go b/console/console_test.go
index 89dd7cd838a8d9fc621bc0dc0448deea8c465a2a..a3fb83ff8b1a99adec43a7015a9e2ba2c98761e1 100644
--- a/console/console_test.go
+++ b/console/console_test.go
@@ -26,13 +26,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/internal/jsre"
-	"github.com/ethereum/go-ethereum/miner"
-	"github.com/ethereum/go-ethereum/node"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/internal/jsre"
+	"github.com/maticnetwork/bor/miner"
+	"github.com/maticnetwork/bor/node"
 )
 
 const (
diff --git a/contracts/checkpointoracle/contract/oracle.go b/contracts/checkpointoracle/contract/oracle.go
index 3bb351792f7a82571b801d9ab47196c5bba44e2e..9b7bedd12a6435a1759a8f2a91e2cb555ce38709 100644
--- a/contracts/checkpointoracle/contract/oracle.go
+++ b/contracts/checkpointoracle/contract/oracle.go
@@ -7,12 +7,12 @@ import (
 	"math/big"
 	"strings"
 
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/event"
+	ethereum "github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/accounts/abi"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/event"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/contracts/checkpointoracle/oracle.go b/contracts/checkpointoracle/oracle.go
index 13ff236f2d3faf9ef232245257ac90a1150fa71b..428c4df04044d9bfd741be8c6d0345b0b2f3ae71 100644
--- a/contracts/checkpointoracle/oracle.go
+++ b/contracts/checkpointoracle/oracle.go
@@ -23,10 +23,10 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/contracts/checkpointoracle/contract"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // CheckpointOracle is a Go wrapper around an on-chain light client checkpoint oracle.
diff --git a/contracts/checkpointoracle/oracle_test.go b/contracts/checkpointoracle/oracle_test.go
index 8c123a3b41c2d028cd7bd740518a118c13d33c02..1d7616eaaef277e2ac3d31c4dda7be5697b31d3d 100644
--- a/contracts/checkpointoracle/oracle_test.go
+++ b/contracts/checkpointoracle/oracle_test.go
@@ -27,13 +27,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/contracts/checkpointoracle/contract"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/params"
 )
 
 var (
diff --git a/core/asm/asm.go b/core/asm/asm.go
index 4257198cc779a0e78c4c8d8395c3e3c0dc295380..22238d0a7436cb52043c2570dc8e71aba054537d 100644
--- a/core/asm/asm.go
+++ b/core/asm/asm.go
@@ -21,7 +21,7 @@ import (
 	"encoding/hex"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/maticnetwork/bor/core/vm"
 )
 
 // Iterator for disassembled EVM instructions
diff --git a/core/asm/compiler.go b/core/asm/compiler.go
index c7a5440701363a7b0be9a80c7cc8c9a70d4d8755..f896f4c7762558570fbb7dbd3f9dac65e8d84623 100644
--- a/core/asm/compiler.go
+++ b/core/asm/compiler.go
@@ -22,8 +22,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/core/vm"
 )
 
 // Compiler contains information about the parsed source
diff --git a/core/bench_test.go b/core/bench_test.go
index 79c369d5fcfb4952382bd02ae7a7c41aa2e2e4cb..ceb5cb10c661680380ce1d5dd230645fe2741c7d 100644
--- a/core/bench_test.go
+++ b/core/bench_test.go
@@ -23,15 +23,15 @@ import (
 	"os"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/params"
 )
 
 func BenchmarkInsertChain_empty_memdb(b *testing.B) {
diff --git a/core/block_validator.go b/core/block_validator.go
index b36ca56d7f7a60437c0c7aa42d71762c14d88a99..5890022430d3827994088a2c270ccce954955340 100644
--- a/core/block_validator.go
+++ b/core/block_validator.go
@@ -19,10 +19,10 @@ package core
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/params"
 )
 
 // BlockValidator is responsible for validating block headers, uncles and
diff --git a/core/block_validator_test.go b/core/block_validator_test.go
index 06e2ba1a4fd947b3234a5986b66566df7bbc2b1f..343ec72b3facf5a086fdc85f044f056f3250972a 100644
--- a/core/block_validator_test.go
+++ b/core/block_validator_test.go
@@ -21,11 +21,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/params"
 )
 
 // Tests that simple header verification works, for both good and bad blocks.
diff --git a/core/blockchain.go b/core/blockchain.go
index 10ee73e3511fb25fb9626b3fad612d26c49d475f..34bbd400efde468d81aba58b97bde525d1a8e019 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -27,21 +27,21 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/common/prque"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/common/prque"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/trie"
 	"github.com/hashicorp/golang-lru"
 )
 
diff --git a/core/blockchain_insert.go b/core/blockchain_insert.go
index 5685b0a4bdd96b95af6f589ba998e20cb9ea57e6..adc1bdd751535a9e48ccc0770cc08548a838f12b 100644
--- a/core/blockchain_insert.go
+++ b/core/blockchain_insert.go
@@ -19,10 +19,10 @@ package core
 import (
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/log"
 )
 
 // insertStats tracks and reports on block insertion.
diff --git a/core/blockchain_test.go b/core/blockchain_test.go
index 27115af52d994ef4d0e45741ce00fb455ef3a122..5274abfb198c395c10d50acf83cfd5a469a75b42 100644
--- a/core/blockchain_test.go
+++ b/core/blockchain_test.go
@@ -26,16 +26,16 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/params"
 )
 
 // So we can deterministically seed different blockchains
@@ -1482,7 +1482,7 @@ func TestEIP161AccountRemoval(t *testing.T) {
 // tests that under weird reorg conditions the blockchain and its internal header-
 // chain return the same latest block/header.
 //
-// https://github.com/ethereum/go-ethereum/pull/15941
+// https://github.com/maticnetwork/bor/pull/15941
 func TestBlockchainHeaderchainReorgConsistency(t *testing.T) {
 	// Generate a canonical chain to act as the main dataset
 	engine := ethash.NewFaker()
@@ -1743,8 +1743,8 @@ func TestIncompleteAncientReceiptChainInsertion(t *testing.T) {
 // overtake the 'canon' chain until after it's passed canon by about 200 blocks.
 //
 // Details at:
-//  - https://github.com/ethereum/go-ethereum/issues/18977
-//  - https://github.com/ethereum/go-ethereum/pull/18988
+//  - https://github.com/maticnetwork/bor/issues/18977
+//  - https://github.com/maticnetwork/bor/pull/18988
 func TestLowDiffLongChain(t *testing.T) {
 	// Generate a canonical chain to act as the main dataset
 	engine := ethash.NewFaker()
diff --git a/core/blocks.go b/core/blocks.go
index f20ba4aaf29562531deebf191afb3a31ffee27a8..c46c5604b91109baa4c14ab5fafba15f8c2d0108 100644
--- a/core/blocks.go
+++ b/core/blocks.go
@@ -16,7 +16,7 @@
 
 package core
 
-import "github.com/ethereum/go-ethereum/common"
+import "github.com/maticnetwork/bor/common"
 
 // BadHashes represent a set of manually tracked bad hashes (usually hard forks)
 var BadHashes = map[common.Hash]bool{
diff --git a/core/bloombits/generator.go b/core/bloombits/generator.go
index ae07481ada504d0f6ee0dfff4ff0b3bc2bba5efe..1c622c0022ae2419cc904955556734107b4f9c83 100644
--- a/core/bloombits/generator.go
+++ b/core/bloombits/generator.go
@@ -19,7 +19,7 @@ package bloombits
 import (
 	"errors"
 
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 var (
diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go
index f9bcef96e0b5abaa9c573d5ac2f656a5b850030b..f5e779d4b02183f9fa9429ab9940a3af4127ff97 100644
--- a/core/bloombits/generator_test.go
+++ b/core/bloombits/generator_test.go
@@ -21,7 +21,7 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // Tests that batched bloom bits are correctly rotated from the input bloom
diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go
index 3ec0d5ae94e54a3592c4104dc0b0ed2c68d91622..e6eafbd5feb920a3c464b60b90916cb6bda6c069 100644
--- a/core/bloombits/matcher.go
+++ b/core/bloombits/matcher.go
@@ -26,8 +26,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/bitutil"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/common/bitutil"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 // bloomIndexes represents the bit indexes inside the bloom filter that belong
diff --git a/core/bloombits/matcher_test.go b/core/bloombits/matcher_test.go
index 91143e525e7fedb6dd9dbd003053ab5ecc7c25fa..5bb11c79a0e109dc16b248170d0e981e2b70da45 100644
--- a/core/bloombits/matcher_test.go
+++ b/core/bloombits/matcher_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 const testSectionSize = 4096
@@ -82,7 +82,7 @@ func TestMatcherRandom(t *testing.T) {
 
 // Tests that the matcher can properly find matches if the starting block is
 // shifter from a multiple of 8. This is needed to cover an optimisation with
-// bitset matching https://github.com/ethereum/go-ethereum/issues/15309.
+// bitset matching https://github.com/maticnetwork/bor/issues/15309.
 func TestMatcherShifted(t *testing.T) {
 	// Block 0 always matches in the tests, skip ahead of first 8 blocks with the
 	// start to get a potential zero byte in the matcher bitset.
diff --git a/core/chain_indexer.go b/core/chain_indexer.go
index c0c2c4f7f945b34afdd3a13fbf5af4dbdc6fc7c6..37860e3ffe686250266b5d07f3ffe20eacf11eb3 100644
--- a/core/chain_indexer.go
+++ b/core/chain_indexer.go
@@ -24,12 +24,12 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
 )
 
 // ChainIndexerBackend defines the methods needed to process chain segments in
diff --git a/core/chain_indexer_test.go b/core/chain_indexer_test.go
index abf5b3cc14007ee45fb0d4f3ee4328b8bbb8ef14..6bd0faa717a6f910e702627bd152d470b09e87c3 100644
--- a/core/chain_indexer_test.go
+++ b/core/chain_indexer_test.go
@@ -24,9 +24,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // Runs multiple tests with randomized parameters.
diff --git a/core/chain_makers.go b/core/chain_makers.go
index 17f4042116fa3897e65d2baccf2bc034f0bbb6af..54b89c7dbc013172f2a965f07b13606bf92a7f66 100644
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@@ -20,14 +20,14 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/consensus/misc"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/consensus/misc"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/params"
 )
 
 // BlockGen creates blocks for testing.
diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go
index 32e3888d55ce6e5921ca706434f902eb1eeb677e..9c062a454ede30611f1e775581036aab50f6bac4 100644
--- a/core/chain_makers_test.go
+++ b/core/chain_makers_test.go
@@ -20,12 +20,12 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/params"
 )
 
 func ExampleGenerateChain() {
diff --git a/core/dao_test.go b/core/dao_test.go
index 4e8dba9e8488108d853cd726549b3aab0de318e2..a8d15644d0dbb92d26a89b339255730fe7cfdf51 100644
--- a/core/dao_test.go
+++ b/core/dao_test.go
@@ -20,10 +20,10 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/params"
 )
 
 // Tests that DAO-fork enabled clients can properly filter out fork-commencing
diff --git a/core/events.go b/core/events.go
index 710bdb589485e0768d25e1fb2c5bf5d16ba85ec1..ba12738fa1695cef401b7b5921e26f9eab2a8a10 100644
--- a/core/events.go
+++ b/core/events.go
@@ -17,8 +17,8 @@
 package core
 
 import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // NewTxsEvent is posted when a batch of transactions enter the transaction pool.
diff --git a/core/evm.go b/core/evm.go
index 979003bda7918b98bb46df2fc21d792bfe2a8cc5..af370f6c867799bf156cbe621f6177448e6cecca 100644
--- a/core/evm.go
+++ b/core/evm.go
@@ -19,10 +19,10 @@ package core
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
 )
 
 // ChainContext supports retrieving headers and consensus parameters from the
diff --git a/core/forkid/forkid.go b/core/forkid/forkid.go
index 8c1700879a5e33f89d1519afe579a08727976c05..64baae9616e3ce449e757e5afe70b703c3c69d03 100644
--- a/core/forkid/forkid.go
+++ b/core/forkid/forkid.go
@@ -26,10 +26,10 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
 )
 
 var (
diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go
index b33f85bec7ab19b5dbf007bfaa1357adf2893fb7..b0cc1897043acd134c8a0b9253abf536dc10da20 100644
--- a/core/forkid/forkid_test.go
+++ b/core/forkid/forkid_test.go
@@ -21,9 +21,9 @@ import (
 	"math"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // TestCreation tests that different genesis and fork rule combinations result in
diff --git a/core/gen_genesis.go b/core/gen_genesis.go
index bb8ea1d6a23978a0fff6e6d98d327b6135ecff48..c7be3c4fca60dce1c31c57cdf546aa06c83d9d9f 100644
--- a/core/gen_genesis.go
+++ b/core/gen_genesis.go
@@ -7,10 +7,10 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/params"
 )
 
 var _ = (*genesisSpecMarshaling)(nil)
diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go
index 64fb9b9248f9ce447990d3fd1db16ac6a80158d4..d411ea966752de6ecd542f778f5e8c862218a128 100644
--- a/core/gen_genesis_account.go
+++ b/core/gen_genesis_account.go
@@ -7,9 +7,9 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
 )
 
 var _ = (*genesisAccountMarshaling)(nil)
diff --git a/core/genesis.go b/core/genesis.go
index 57809fe73a249bf868781443d37510516b8c006a..3851bd65d02d98b973587015caadca9804d8660c 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -25,16 +25,16 @@ import (
 	"math/big"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 //go:generate gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go
diff --git a/core/genesis_test.go b/core/genesis_test.go
index c6bcd0aa54bde601ecc499915ac21ab75a7f45ca..1d46cc971d2a9ec6f966b76eb2122fe7fce68e45 100644
--- a/core/genesis_test.go
+++ b/core/genesis_test.go
@@ -22,12 +22,12 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/params"
 )
 
 func TestDefaultGenesisBlock(t *testing.T) {
diff --git a/core/headerchain.go b/core/headerchain.go
index 034858f651cf28b281e0a4ac7f41192473d5769b..95634891fe7d3d2a523aeb5a6a1b55b48c9e907e 100644
--- a/core/headerchain.go
+++ b/core/headerchain.go
@@ -26,13 +26,13 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
 	lru "github.com/hashicorp/golang-lru"
 )
 
diff --git a/core/helper_test.go b/core/helper_test.go
index e61c92dcdd23d6dcbb60c43f20b97e06de83ba01..447ed8e996ee277d581053fdc121083259c83095 100644
--- a/core/helper_test.go
+++ b/core/helper_test.go
@@ -19,10 +19,10 @@ package core
 import (
 	"container/list"
 
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
 )
 
 // Implement our EthTest Manager
diff --git a/core/mkalloc.go b/core/mkalloc.go
index 5118a4fcb3279e1a3252ac735c332965d46fdb1c..3c4b9ddc6a1f242f3466297e2f8a3fa1f61731c1 100644
--- a/core/mkalloc.go
+++ b/core/mkalloc.go
@@ -34,8 +34,8 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 type allocItem struct{ Addr, Balance *big.Int }
diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go
index fab7ca56c3a5ff107b845f9cad40cc909f5c66de..f141e2b600b92940b8e7bcd8cfc458aae448575e 100644
--- a/core/rawdb/accessors_chain.go
+++ b/core/rawdb/accessors_chain.go
@@ -21,12 +21,12 @@ import (
 	"encoding/binary"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // ReadCanonicalHash retrieves the hash assigned to a canonical block number.
diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go
index 8c8affffd9e828215bbc82b627d9077207757612..d1815380cd39eeec1984e4ba0eaf43ef2bb8c5f0 100644
--- a/core/rawdb/accessors_chain_test.go
+++ b/core/rawdb/accessors_chain_test.go
@@ -23,10 +23,10 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go
index 38f8fe10ea9440e271ebe2d861af21a7f9225ea2..1e324c912c47a6504ed432bc486f91bae6887aaf 100644
--- a/core/rawdb/accessors_indexes.go
+++ b/core/rawdb/accessors_indexes.go
@@ -19,12 +19,12 @@ package rawdb
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // ReadTxLookupEntry retrieves the positional metadata associated with a transaction
diff --git a/core/rawdb/accessors_indexes_test.go b/core/rawdb/accessors_indexes_test.go
index c09bff0101279f7cdbd2abd3044213973f0dcf5b..c2a62699a5cf527392dd79451d79d611f6f08f41 100644
--- a/core/rawdb/accessors_indexes_test.go
+++ b/core/rawdb/accessors_indexes_test.go
@@ -20,10 +20,10 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // Tests that positional lookup metadata can be stored and retrieved.
diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go
index f8d09fbddf2d8b696def5c58e23bc45629e32b4b..12aa8166ae71278417abe29c54dd921f243cf104 100644
--- a/core/rawdb/accessors_metadata.go
+++ b/core/rawdb/accessors_metadata.go
@@ -19,11 +19,11 @@ package rawdb
 import (
 	"encoding/json"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // ReadDatabaseVersion retrieves the version number of the database.
diff --git a/core/rawdb/database.go b/core/rawdb/database.go
index 353b7dce623d0ec475ca2351bdc9115456c6a466..c8a780170475398d8f4776ac186796074f6fdeb0 100644
--- a/core/rawdb/database.go
+++ b/core/rawdb/database.go
@@ -23,11 +23,11 @@ import (
 	"os"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/ethdb/leveldb"
-	"github.com/ethereum/go-ethereum/ethdb/memorydb"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/ethdb/leveldb"
+	"github.com/maticnetwork/bor/ethdb/memorydb"
+	"github.com/maticnetwork/bor/log"
 	"github.com/olekukonko/tablewriter"
 )
 
diff --git a/core/rawdb/freezer.go b/core/rawdb/freezer.go
index 3f377447ce1397417a13b42c6de9c21114f4b0f5..110e4887131f6e6644d559ae123bc5dfac962c59 100644
--- a/core/rawdb/freezer.go
+++ b/core/rawdb/freezer.go
@@ -25,11 +25,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/params"
 	"github.com/prometheus/tsdb/fileutil"
 )
 
diff --git a/core/rawdb/freezer_reinit.go b/core/rawdb/freezer_reinit.go
index ea4dd33d1d6bcaf4cd267c6bb69d580c3e380325..7a1467320591f8e9742d77ee4f84bec2e4f02731 100644
--- a/core/rawdb/freezer_reinit.go
+++ b/core/rawdb/freezer_reinit.go
@@ -22,11 +22,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/prque"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/prque"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
 )
 
 // InitDatabaseFromFreezer reinitializes an empty database from a previous batch
diff --git a/core/rawdb/freezer_table.go b/core/rawdb/freezer_table.go
index 2fe354a0642168f1430580eb5e7499ddb398d3bb..868d81f6a518bf704629931f52c6a4538a736ab8 100644
--- a/core/rawdb/freezer_table.go
+++ b/core/rawdb/freezer_table.go
@@ -26,9 +26,9 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
 	"github.com/golang/snappy"
 )
 
diff --git a/core/rawdb/freezer_table_test.go b/core/rawdb/freezer_table_test.go
index 116e26a7fe653706c7e915f930be33645cb81dc0..80a4784496ee072022258dc50407a2f04c2169f0 100644
--- a/core/rawdb/freezer_table_test.go
+++ b/core/rawdb/freezer_table_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/metrics"
+	"github.com/maticnetwork/bor/metrics"
 )
 
 func init() {
diff --git a/core/rawdb/schema.go b/core/rawdb/schema.go
index a44a2c99f94fcad18eba220d96c2fd2655f0a736..f4aefe3384465910bb6e766f15374f772ab3a46e 100644
--- a/core/rawdb/schema.go
+++ b/core/rawdb/schema.go
@@ -20,8 +20,8 @@ package rawdb
 import (
 	"encoding/binary"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/metrics"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/metrics"
 )
 
 // The fields below define the low level database schema prefixing.
diff --git a/core/rawdb/table.go b/core/rawdb/table.go
index 6610b7f5a256d54c8256ca79ceacfb143e985a52..f2fbab8ecfb5361cd48ccb491c2f34d922c2c064 100644
--- a/core/rawdb/table.go
+++ b/core/rawdb/table.go
@@ -17,7 +17,7 @@
 package rawdb
 
 import (
-	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/maticnetwork/bor/ethdb"
 )
 
 // table is a wrapper around a database that prefixes each key access with a pre-
diff --git a/core/state/database.go b/core/state/database.go
index ecc2c134da6ce736ecbe44ecabf6641f9618e6c9..834e8ad96b45145932884a9387800cb6f5a8b347 100644
--- a/core/state/database.go
+++ b/core/state/database.go
@@ -19,9 +19,9 @@ package state
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/trie"
 	lru "github.com/hashicorp/golang-lru"
 )
 
diff --git a/core/state/dump.go b/core/state/dump.go
index 51d3e5554f6124d138c842c0bb06c73599f6d4bf..ceb747871beaf7ca1dd18de00992ace677148092 100644
--- a/core/state/dump.go
+++ b/core/state/dump.go
@@ -20,11 +20,11 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/trie"
 )
 
 // DumpAccount represents an account in the state
diff --git a/core/state/iterator.go b/core/state/iterator.go
index 6a5c73d3d13c7b96a63351736385b53c7fd6cdd7..47d4bf90684d7c5034b34dc9ac05ef13aedd90d0 100644
--- a/core/state/iterator.go
+++ b/core/state/iterator.go
@@ -20,9 +20,9 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/trie"
 )
 
 // NodeIterator is an iterator to traverse the entire state trie post-order,
diff --git a/core/state/iterator_test.go b/core/state/iterator_test.go
index 69f51c4c7d8ad293be078b42a15a01d962c87d2b..a2bd123e553dbb86af4dba6b86ad8d767909a021 100644
--- a/core/state/iterator_test.go
+++ b/core/state/iterator_test.go
@@ -20,8 +20,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/ethdb"
 )
 
 // Tests that the node iterator indeed walks over the entire database contents.
diff --git a/core/state/journal.go b/core/state/journal.go
index a03ca57dbc643007375e09d72cbb99191d2ec672..7466aa9bf18663e13559335752f8892ca79b8996 100644
--- a/core/state/journal.go
+++ b/core/state/journal.go
@@ -19,7 +19,7 @@ package state
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 // journalEntry is a modification entry in the state change journal that can be
diff --git a/core/state/state_object.go b/core/state/state_object.go
index 852c340b82d91e8834537b0147c307083bb15077..7e2a63293d13d0d07f9d721c4af2cf7c4361ab45 100644
--- a/core/state/state_object.go
+++ b/core/state/state_object.go
@@ -23,10 +23,10 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 var emptyCodeHash = crypto.Keccak256(nil)
diff --git a/core/state/state_test.go b/core/state/state_test.go
index d6ff714ee49c3c5adec21e5581b3ae675bcf8f77..7abf3476f1c2a890a00312f3517337c2f83a84fc 100644
--- a/core/state/state_test.go
+++ b/core/state/state_test.go
@@ -21,10 +21,10 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
 	checker "gopkg.in/check.v1"
 )
 
diff --git a/core/state/statedb.go b/core/state/statedb.go
index 3bb9862edd15822fef1439f75122594458f98c47..2a5df49a2ce2158437e8a19a3eb30b1450622a34 100644
--- a/core/state/statedb.go
+++ b/core/state/statedb.go
@@ -24,13 +24,13 @@ import (
 	"sort"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/trie"
 )
 
 type revision struct {
@@ -561,7 +561,7 @@ func (self *StateDB) Copy() *StateDB {
 	}
 	// Copy the dirty states, logs, and preimages
 	for addr := range self.journal.dirties {
-		// As documented [here](https://github.com/ethereum/go-ethereum/pull/16485#issuecomment-380438527),
+		// As documented [here](https://github.com/maticnetwork/bor/pull/16485#issuecomment-380438527),
 		// and in the Finalise-method, there is a case where an object is in the journal but not
 		// in the stateObjects: OOG after touch on ripeMD prior to Byzantium. Thus, we need to check for
 		// nil
diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go
index c78ef38fd349ed656bdee1f7293f073176c79636..d91ac6de0a57fbb5f513dc5c9e3988960d101c0e 100644
--- a/core/state/statedb_test.go
+++ b/core/state/statedb_test.go
@@ -30,9 +30,9 @@ import (
 
 	check "gopkg.in/check.v1"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // Tests that updating a state trie does not leak any database writes prior to
@@ -124,7 +124,7 @@ func TestIntermediateLeaks(t *testing.T) {
 
 // TestCopy tests that copying a statedb object indeed makes the original and
 // the copy independent of each other. This test is a regression test against
-// https://github.com/ethereum/go-ethereum/pull/15549.
+// https://github.com/maticnetwork/bor/pull/15549.
 func TestCopy(t *testing.T) {
 	// Create a random state test to copy and modify "independently"
 	orig, _ := New(common.Hash{}, NewDatabase(rawdb.NewMemoryDatabase()))
@@ -436,7 +436,7 @@ func (s *StateSuite) TestTouchDelete(c *check.C) {
 }
 
 // TestCopyOfCopy tests that modified objects are carried over to the copy, and the copy of the copy.
-// See https://github.com/ethereum/go-ethereum/pull/15225#issuecomment-380191512
+// See https://github.com/maticnetwork/bor/pull/15225#issuecomment-380191512
 func TestCopyOfCopy(t *testing.T) {
 	sdb, _ := New(common.Hash{}, NewDatabase(rawdb.NewMemoryDatabase()))
 	addr := common.HexToAddress("aaaa")
diff --git a/core/state/sync.go b/core/state/sync.go
index ef79305273660de1dcd87027810a75efad90b4f6..19592b74be5324dc7e1e7b619ed76914ec05a1fd 100644
--- a/core/state/sync.go
+++ b/core/state/sync.go
@@ -19,10 +19,10 @@ package state
 import (
 	"bytes"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/trie"
 )
 
 // NewStateSync create a new state trie download scheduler.
diff --git a/core/state/sync_test.go b/core/state/sync_test.go
index de098dce0fea87ec5b026b61baa851eabb85bb08..b01510051c987043d526e3557f9e40ccdc74154c 100644
--- a/core/state/sync_test.go
+++ b/core/state/sync_test.go
@@ -21,12 +21,12 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/ethdb/memorydb"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/ethdb/memorydb"
+	"github.com/maticnetwork/bor/trie"
 )
 
 // testAccount is the data associated with an account used by the state tests.
diff --git a/core/state_prefetcher.go b/core/state_prefetcher.go
index cb85a05b578e629b0b4efb44bf1f46255ff87c6b..5a70450bad77164fada8b91de862728043eb139a 100644
--- a/core/state_prefetcher.go
+++ b/core/state_prefetcher.go
@@ -19,12 +19,12 @@ package core
 import (
 	"sync/atomic"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/params"
 )
 
 // statePrefetcher is a basic Prefetcher, which blindly executes a block on top
diff --git a/core/state_processor.go b/core/state_processor.go
index bed6a073063d8d327d3542abedfa12a99cd0ed16..e7b1f84c0200e84231056c394db46affb4831387 100644
--- a/core/state_processor.go
+++ b/core/state_processor.go
@@ -17,14 +17,14 @@
 package core
 
 import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/consensus/misc"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/consensus/misc"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/params"
 )
 
 // StateProcessor is a basic Processor, which takes care of transitioning
diff --git a/core/state_transition.go b/core/state_transition.go
index 1f879d9633842db408165a5545c12a5428133f51..bfcd4fc1edb7043707f7e26064ed457d86a829f1 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -21,11 +21,11 @@ import (
 	"math"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
 )
 
 var (
diff --git a/core/tx_cacher.go b/core/tx_cacher.go
index b1e5d676a2b1c117aa26fcc73b05ad4d4ac3351b..462f3e65180c672380d6e7d9f69edb00f3647cf7 100644
--- a/core/tx_cacher.go
+++ b/core/tx_cacher.go
@@ -19,7 +19,7 @@ package core
 import (
 	"runtime"
 
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // senderCacher is a concurrent transaction sender recoverer and cacher.
diff --git a/core/tx_journal.go b/core/tx_journal.go
index 41b5156d4ad213b4a6582c24fdf253dd4f89074e..0124bf4b23650c11c92507b2dfbf6d3db840aeb7 100644
--- a/core/tx_journal.go
+++ b/core/tx_journal.go
@@ -21,10 +21,10 @@ import (
 	"io"
 	"os"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // errNoActiveJournal is returned if a transaction is attempted to be inserted
diff --git a/core/tx_list.go b/core/tx_list.go
index 75bfdaedac1a9e2c2623141ce50f246105cf0675..6fb0cbb894cc9ceb57da311a328973cb4c143598 100644
--- a/core/tx_list.go
+++ b/core/tx_list.go
@@ -22,9 +22,9 @@ import (
 	"math/big"
 	"sort"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/log"
 )
 
 // nonceHeap is a heap.Interface implementation over 64bit unsigned integers for
diff --git a/core/tx_list_test.go b/core/tx_list_test.go
index d579f501afa8157bd62fe9a9fff7a27a5f6f1a55..479d56b2a46e0fdd9f732a723cab20b355ed1fde 100644
--- a/core/tx_list_test.go
+++ b/core/tx_list_test.go
@@ -20,8 +20,8 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 // Tests that transactions can be added to strict lists and list contents and
diff --git a/core/tx_noncer.go b/core/tx_noncer.go
index 98a78e087e2ad4f2a0c468167597aadbb06390ec..9b37412eb592e3c23627244f43054260dca33f83 100644
--- a/core/tx_noncer.go
+++ b/core/tx_noncer.go
@@ -17,8 +17,8 @@
 package core
 
 import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/state"
 )
 
 // txNoncer is a tiny virtual state database to manage the executable nonces of
diff --git a/core/tx_pool.go b/core/tx_pool.go
index 43caf16b18eda41329433460e6f9b93d5cfc59dc..a089394a18fdc0a90f6634874927a51830fe6a89 100644
--- a/core/tx_pool.go
+++ b/core/tx_pool.go
@@ -25,14 +25,14 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/prque"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/prque"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/params"
 )
 
 const (
diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go
index 7df1a2c6f9539fc2be53f822aa36f00a917ab7cd..d9d3f7dd926d88bcafc2dacacd7e865d21c3c70f 100644
--- a/core/tx_pool_test.go
+++ b/core/tx_pool_test.go
@@ -26,13 +26,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/params"
 )
 
 // testTxPoolConfig is a transaction pool configuration without stateful disk
diff --git a/core/types.go b/core/types.go
index 4c5b74a49865b26d3d9c10ed7b90bf490aec683d..e88d7175fbb639f849dd7b370c341283e4e973aa 100644
--- a/core/types.go
+++ b/core/types.go
@@ -17,9 +17,9 @@
 package core
 
 import (
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
 )
 
 // Validator is an interface which defines the standard for block validation. It
diff --git a/core/types/block.go b/core/types/block.go
index b0ec7fc77d68325959bf7af587c1c50b34b9fea9..b4e650327b17efc6ef8b775987ebc85ed804e385 100644
--- a/core/types/block.go
+++ b/core/types/block.go
@@ -27,9 +27,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/rlp"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/core/types/block_test.go b/core/types/block_test.go
index ff0a641e5cebd7906738204b767c33d7e1d99e90..b2ec5e34a9d17f0305b994586138303cdf58d6c6 100644
--- a/core/types/block_test.go
+++ b/core/types/block_test.go
@@ -22,8 +22,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // from bcValidBlockTest.json, "SimpleTx"
diff --git a/core/types/bloom9.go b/core/types/bloom9.go
index d045c9e6678ec2575ff91e9c6492840def6a7e46..8460b4267205bfb979d329106a45ace8bd95485c 100644
--- a/core/types/bloom9.go
+++ b/core/types/bloom9.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 type bytesBacked interface {
diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go
index a28ac0e7afbaac7961e767044b0950122754f56c..d909f0285e5c2e425a64deff8e190486afdb9fff 100644
--- a/core/types/bloom9_test.go
+++ b/core/types/bloom9_test.go
@@ -54,7 +54,7 @@ func TestBloom(t *testing.T) {
 import (
 	"testing"
 
-	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/maticnetwork/bor/core/state"
 )
 
 func TestBloom9(t *testing.T) {
diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go
index 00c42c5bc62221701587c37ddc8bc67cdbda8c63..94ea6798470ca959b61d01b6b0914529824747b0 100644
--- a/core/types/derive_sha.go
+++ b/core/types/derive_sha.go
@@ -19,9 +19,9 @@ package types
 import (
 	"bytes"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/trie"
 )
 
 type DerivableList interface {
diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go
index 4212b8d94d254717abdd07130a9cb1016234c1c0..627e63a78b8251bcb927e7edce83d99308c698f5 100644
--- a/core/types/gen_header_json.go
+++ b/core/types/gen_header_json.go
@@ -7,8 +7,8 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 var _ = (*headerMarshaling)(nil)
diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go
index 6e94339478f09bf2c58c84ad66c86ded4ae92de6..7744f35f637fa79d6f6ff87da0281ddad74cd7a4 100644
--- a/core/types/gen_log_json.go
+++ b/core/types/gen_log_json.go
@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 var _ = (*logMarshaling)(nil)
diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go
index 790ed65b5817a84be2fb253532284626a63f984e..a76581dec8d985526ceeb0b0c84d850cfe056d02 100644
--- a/core/types/gen_receipt_json.go
+++ b/core/types/gen_receipt_json.go
@@ -7,8 +7,8 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 var _ = (*receiptMarshaling)(nil)
diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go
index e676058ecc4bf5287ed109a7f88949e9521e385c..e78502bec8df41eb5e9181dd64e6211d38e5ad03 100644
--- a/core/types/gen_tx_json.go
+++ b/core/types/gen_tx_json.go
@@ -7,8 +7,8 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 var _ = (*txdataMarshaling)(nil)
diff --git a/core/types/log.go b/core/types/log.go
index 006f62bbf6f6814e1d7620f25a9c533ed122e980..81dde5a8387fb70485e726e27f7ad17555fa409b 100644
--- a/core/types/log.go
+++ b/core/types/log.go
@@ -19,9 +19,9 @@ package types
 import (
 	"io"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 //go:generate gencodec -type Log -field-override logMarshaling -out gen_log_json.go
diff --git a/core/types/log_test.go b/core/types/log_test.go
index 0e56acfe4aa3f443f68761d23fe23c9f3d413def..84cd89ab48509262c398afe2364c4dc62175f8f4 100644
--- a/core/types/log_test.go
+++ b/core/types/log_test.go
@@ -23,8 +23,8 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 var unmarshalLogTests = map[string]struct {
diff --git a/core/types/receipt.go b/core/types/receipt.go
index a96c7525ef3b0b42175110617ed62d5c07c640d9..870424dc65f5839a51204acf15da906ec3571ee8 100644
--- a/core/types/receipt.go
+++ b/core/types/receipt.go
@@ -24,11 +24,11 @@ import (
 	"math/big"
 	"unsafe"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 //go:generate gencodec -type Receipt -field-override receiptMarshaling -out gen_receipt_json.go
diff --git a/core/types/receipt_test.go b/core/types/receipt_test.go
index 806b3dd2ab8850793ac231ce88945a29df59d815..956fcb031f1aa1fca1d4e7b27f3aee5518b5fa66 100644
--- a/core/types/receipt_test.go
+++ b/core/types/receipt_test.go
@@ -23,10 +23,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 func TestLegacyReceiptDecoding(t *testing.T) {
diff --git a/core/types/transaction.go b/core/types/transaction.go
index 3eb8df0ac7c7b2095316bb98182c7928219944b4..b19901c8ec2af9e23c9a86856ad79608648fc4ff 100644
--- a/core/types/transaction.go
+++ b/core/types/transaction.go
@@ -23,10 +23,10 @@ import (
 	"math/big"
 	"sync/atomic"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 //go:generate gencodec -type txdata -field-override txdataMarshaling -out gen_tx_json.go
diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
index 63132048ee72b86d6c04ab5eba9531488982c1be..572c0e98d6a041421b7ee6cdca057edc19cd79d3 100644
--- a/core/types/transaction_signing.go
+++ b/core/types/transaction_signing.go
@@ -22,9 +22,9 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/params"
 )
 
 var (
diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go
index 689fc38a9b660dca828d7b490927e967af855a3b..0defa023b8a714fa58cc0cb00c98903a44298380 100644
--- a/core/types/transaction_signing_test.go
+++ b/core/types/transaction_signing_test.go
@@ -20,9 +20,9 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 func TestEIP155Signing(t *testing.T) {
diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go
index f38d8e7177c4ffaeea23bdcd90086453e0425686..9ee8163848e2d86e864c403dd10fbb24a0c61498 100644
--- a/core/types/transaction_test.go
+++ b/core/types/transaction_test.go
@@ -23,9 +23,9 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // The values in those tests are from the Transaction Tests
diff --git a/core/vm/analysis_test.go b/core/vm/analysis_test.go
index fd2d744d87f49cbaec29bb630491b1c9ad710bb1..dfde21243fac3ca5b4ec8752142d809dde72ffb3 100644
--- a/core/vm/analysis_test.go
+++ b/core/vm/analysis_test.go
@@ -19,7 +19,7 @@ package vm
 import (
 	"testing"
 
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 func TestJumpDestAnalysis(t *testing.T) {
diff --git a/core/vm/common.go b/core/vm/common.go
index d592a9410dd0911c2039ced2615a3e7c8cde6d26..72b98fbed25f4bb53cf0d946ce5ec566dbfde169 100644
--- a/core/vm/common.go
+++ b/core/vm/common.go
@@ -19,8 +19,8 @@ package vm
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
 )
 
 // calcMemSize64 calculates the required memory size, and returns
diff --git a/core/vm/contract.go b/core/vm/contract.go
index 20baa6e751bcae77948ece6f33597fe76003b8fc..4736d6ac97ab0ac6763ddd017310f31706eb5227 100644
--- a/core/vm/contract.go
+++ b/core/vm/contract.go
@@ -19,7 +19,7 @@ package vm
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 // ContractRef is a reference to the contract's backing object
diff --git a/core/vm/contracts.go b/core/vm/contracts.go
index 20b741f8f14446dbcf75306afd585ac5faac4afc..dd762fdf898eb8c0255009a175952b68534144f7 100644
--- a/core/vm/contracts.go
+++ b/core/vm/contracts.go
@@ -21,11 +21,11 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/crypto/bn256"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/crypto/bn256"
+	"github.com/maticnetwork/bor/params"
 	"golang.org/x/crypto/ripemd160"
 )
 
diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go
index 96083337c922074d5264407d6e9c57e67a8a455b..1d7215e0b14428a8a166c20193f673fd2f54e7db 100644
--- a/core/vm/contracts_test.go
+++ b/core/vm/contracts_test.go
@@ -21,7 +21,7 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 // precompiledTest defines the input/output pairs for precompiled contract tests.
diff --git a/core/vm/evm.go b/core/vm/evm.go
index d47b0093889db726d39119646f9dc65759392a98..ba14d5beba55d982601ec3f4e384e7dc69f9ef3b 100644
--- a/core/vm/evm.go
+++ b/core/vm/evm.go
@@ -21,9 +21,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/params"
 )
 
 // emptyCodeHash is used by create to ensure deployment is disallowed to already
diff --git a/core/vm/gas.go b/core/vm/gas.go
index 022a84f243c94ad706ca92d914bc57a6d32e010e..67b9870c654b77c941f6aea311fadc5bee67f6c8 100644
--- a/core/vm/gas.go
+++ b/core/vm/gas.go
@@ -19,7 +19,7 @@ package vm
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/params"
 )
 
 // Gas costs
diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go
index 8270300ba71dcd16ee6d18d532e7fc85438533b5..aa34ea413ff6cd722796173fd82157501594a0f6 100644
--- a/core/vm/gas_table.go
+++ b/core/vm/gas_table.go
@@ -17,9 +17,9 @@
 package vm
 
 import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/params"
 )
 
 // memoryGasCost calculates the quadratic gas for memory expansion. It does so
diff --git a/core/vm/gen_structlog.go b/core/vm/gen_structlog.go
index 726012e59ecf6470881e27df2337a647c6e46c1d..d96811dae8355f83b7b9f729ff22daf2e5520694 100644
--- a/core/vm/gen_structlog.go
+++ b/core/vm/gen_structlog.go
@@ -6,9 +6,9 @@ import (
 	"encoding/json"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
 )
 
 var _ = (*structLogMarshaling)(nil)
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
index 2a062d7e772f805397a869daf3a9b1d9c42d5290..80af2a9a84eeba0889ad76bd61e8b392cd5373cf 100644
--- a/core/vm/instructions.go
+++ b/core/vm/instructions.go
@@ -20,10 +20,10 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/params"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go
index 50d0a9ddae307d40d7f2dd0f79dc0e7149d9423f..7e7cdb4d884fc756008f5d3efa5ae0c59024a912 100644
--- a/core/vm/instructions_test.go
+++ b/core/vm/instructions_test.go
@@ -24,9 +24,9 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/params"
 )
 
 type TwoOperandTestcase struct {
diff --git a/core/vm/interface.go b/core/vm/interface.go
index dd401466adfad2c04ab181681727ccb7927c5e9d..502d5f4ec091c87568dd66b71948cd7cc590b03c 100644
--- a/core/vm/interface.go
+++ b/core/vm/interface.go
@@ -19,8 +19,8 @@ package vm
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // StateDB is an EVM database for full state querying.
diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go
index 989f85f5d31b9b6762c8544a954094a87a960c35..724d04703fdbb0b29ee6e7660bc8984779eaad93 100644
--- a/core/vm/interpreter.go
+++ b/core/vm/interpreter.go
@@ -21,9 +21,9 @@ import (
 	"hash"
 	"sync/atomic"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/params"
 )
 
 // Config are the configuration options for the Interpreter
diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
index 425436f9e50f134d489c4b774aa0a7bfe77ff474..f32b7f89d44c33323eee6f8d264e20ee1b6f7bd3 100644
--- a/core/vm/jump_table.go
+++ b/core/vm/jump_table.go
@@ -19,7 +19,7 @@ package vm
 import (
 	"errors"
 
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/params"
 )
 
 type (
diff --git a/core/vm/logger.go b/core/vm/logger.go
index 262ee5cc3e8311e28f6553c8cd89ff6957412582..7b5165f23c06017d724f0b5d969121f835c90bf4 100644
--- a/core/vm/logger.go
+++ b/core/vm/logger.go
@@ -23,10 +23,10 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // Storage represents a contract's storage.
diff --git a/core/vm/logger_json.go b/core/vm/logger_json.go
index ff379a4efdbad915a3d01fba7d953386c490489a..8bbae70d32229fdb484922a20c857651ec5ea767 100644
--- a/core/vm/logger_json.go
+++ b/core/vm/logger_json.go
@@ -22,8 +22,8 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
 )
 
 type JSONLogger struct {
diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go
index 2ea7535a794de98996143e20e67139702b603d90..7c7f7a01ca6fd4cfc6617f7cf439f350c3b24faf 100644
--- a/core/vm/logger_test.go
+++ b/core/vm/logger_test.go
@@ -20,9 +20,9 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/params"
 )
 
 type dummyContractRef struct {
diff --git a/core/vm/memory.go b/core/vm/memory.go
index 7e6f0eb940dc7dce10ce0b977ca29f113f252526..45a87f7e00429356bf5d1c8e693e0447cf0b687e 100644
--- a/core/vm/memory.go
+++ b/core/vm/memory.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/maticnetwork/bor/common/math"
 )
 
 // Memory implements a simple memory model for the ethereum virtual machine.
diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go
index 31c9b9cf9da080992ab69d50c7bd853da70fcade..b7be63c69832284fb71e768b474bfbd219927f3a 100644
--- a/core/vm/runtime/env.go
+++ b/core/vm/runtime/env.go
@@ -17,9 +17,9 @@
 package runtime
 
 import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/vm"
 )
 
 func NewEnv(cfg *Config) *vm.EVM {
diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go
index db1f6f38222b2718fa16a0c36a5ec1a538dcd5e6..e9c7ea49f7365df5e80441c93bfe069bce9d05bb 100644
--- a/core/vm/runtime/runtime.go
+++ b/core/vm/runtime/runtime.go
@@ -21,12 +21,12 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/params"
 )
 
 // Config is a basic type specifying certain configuration flags for running
diff --git a/core/vm/runtime/runtime_example_test.go b/core/vm/runtime/runtime_example_test.go
index b7d0ddc384eaab0f0c4d9ba04838d3b1907a20e4..5aabd9bfa27efaf8c521992abad9bb44e349c70f 100644
--- a/core/vm/runtime/runtime_example_test.go
+++ b/core/vm/runtime/runtime_example_test.go
@@ -19,8 +19,8 @@ package runtime_test
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/vm/runtime"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/vm/runtime"
 )
 
 func ExampleExecute() {
diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go
index 15f545ddcafb97e6fc65536ffd709593eee8d0a5..b134523c99cec67ef4493389a4a09e3dc655f3ad 100644
--- a/core/vm/runtime/runtime_test.go
+++ b/core/vm/runtime/runtime_test.go
@@ -21,12 +21,12 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/accounts/abi"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/params"
 )
 
 func TestDefaults(t *testing.T) {
diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go
index 10c12901afdbb56d9c77b633b1ddda31fdb2d405..963c3759190b6119a8a8bf250d8d45d59590a49b 100644
--- a/core/vm/stack_table.go
+++ b/core/vm/stack_table.go
@@ -17,7 +17,7 @@
 package vm
 
 import (
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/params"
 )
 
 func minSwapStack(n int) int {
diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go
index 5c081493b0fb4284bfe2d8a9d4315df75a2f9962..1ab2c11fbd27dc5756de9efc553c6a352bb3bcd5 100644
--- a/crypto/bn256/bn256_fast.go
+++ b/crypto/bn256/bn256_fast.go
@@ -7,7 +7,7 @@
 // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve.
 package bn256
 
-import "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare"
+import "github.com/maticnetwork/bor/crypto/bn256/cloudflare"
 
 // G1 is an abstract cyclic group. The zero value is suitable for use as the
 // output of an operation, but cannot be used as an input.
diff --git a/crypto/bn256/bn256_fuzz.go b/crypto/bn256/bn256_fuzz.go
index 6aa1421170453b2f738c8dbdbfc6060bdf7fb9b3..40aaf44386fceb173b7b7a322e5b5675b62aeea3 100644
--- a/crypto/bn256/bn256_fuzz.go
+++ b/crypto/bn256/bn256_fuzz.go
@@ -10,8 +10,8 @@ import (
 	"bytes"
 	"math/big"
 
-	cloudflare "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare"
-	google "github.com/ethereum/go-ethereum/crypto/bn256/google"
+	cloudflare "github.com/maticnetwork/bor/crypto/bn256/cloudflare"
+	google "github.com/maticnetwork/bor/crypto/bn256/google"
 )
 
 // FuzzAdd fuzzez bn256 addition between the Google and Cloudflare libraries.
diff --git a/crypto/bn256/bn256_slow.go b/crypto/bn256/bn256_slow.go
index 47df49d41763618da6f32679860beda25fc28532..81c303b9a09b3a07ec74bf9579f619bf03249751 100644
--- a/crypto/bn256/bn256_slow.go
+++ b/crypto/bn256/bn256_slow.go
@@ -7,7 +7,7 @@
 // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve.
 package bn256
 
-import "github.com/ethereum/go-ethereum/crypto/bn256/google"
+import "github.com/maticnetwork/bor/crypto/bn256/google"
 
 // G1 is an abstract cyclic group. The zero value is suitable for use as the
 // output of an operation, but cannot be used as an input.
diff --git a/crypto/crypto.go b/crypto/crypto.go
index 4567fafc729c9336b9fd99ce65fea9be1b7b47ea..c53ce6becef6f8e949e99367beb1c37a8c851f7e 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -28,9 +28,9 @@ import (
 	"math/big"
 	"os"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/rlp"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go
index 177c19c0cfcae13aa949f3463ad6759e4898ada1..10223a481aceba91058faf3ebad33cf8f7618fd9 100644
--- a/crypto/crypto_test.go
+++ b/crypto/crypto_test.go
@@ -26,8 +26,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791"
diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go
index 6bd57145db9d42571d1d7bb84e3e83c04aeeb885..0863f41cb9b50207e198bc7dff9f07e9c413785f 100644
--- a/crypto/ecies/ecies_test.go
+++ b/crypto/ecies/ecies_test.go
@@ -40,7 +40,7 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 var dumpEnc bool
diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go
index 6312daf5a1c1af7aa3e7c65960da6e64add6befd..089553018d1aa0f9fed557d3d1214c534c3788b1 100644
--- a/crypto/ecies/params.go
+++ b/crypto/ecies/params.go
@@ -42,7 +42,7 @@ import (
 	"fmt"
 	"hash"
 
-	ethcrypto "github.com/ethereum/go-ethereum/crypto"
+	ethcrypto "github.com/maticnetwork/bor/crypto"
 )
 
 var (
diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go
index aadf028d26049e3178de21b388ab03064aec2832..b9e89aeb9e90615f8508316a421ea621563b77fb 100644
--- a/crypto/signature_cgo.go
+++ b/crypto/signature_cgo.go
@@ -23,8 +23,8 @@ import (
 	"crypto/elliptic"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/crypto/secp256k1"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/crypto/secp256k1"
 )
 
 // Ecrecover returns the uncompressed public key that created the given signature.
diff --git a/crypto/signature_test.go b/crypto/signature_test.go
index aecff76bfbda408d928a6441f025e7c0ec2c67e0..751122963c33eeda5db60bf41294b3065bdbf504 100644
--- a/crypto/signature_test.go
+++ b/crypto/signature_test.go
@@ -22,9 +22,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
 )
 
 var (
diff --git a/dashboard/assets.go b/dashboard/assets.go
index eb7a8271035c2422b92afd262ec910cb53a16524..7c2813fd8a994b41efb452f707a124194dd572f1 100644
--- a/dashboard/assets.go
+++ b/dashboard/assets.go
@@ -225,15 +225,15 @@ var _bundleJs = []byte((((`!function(e) {
                 for (var t = 0; e > 1024 && t < 8; t++) e /= 1024;
                 return e.toFixed(2).toString().concat(" ", _[t], "B");
             }, y = [ "#00FF00", "#FFFF00", "#FF7F00", "#FF0000" ], b = [ 0, 2048, 102400, 2097152 ];
-            (l = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : n("./node_modules/react-hot-loader/index.js")).default) && (l.register(c, "menuSkeletons", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), 
-            l.register(d, "MENU", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), 
-            l.register(f, "DURATION", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), 
-            l.register(p, "chartStrokeWidth", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), 
-            l.register(h, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), 
-            l.register(_, "unit", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), 
-            l.register(m, "simplifyBytes", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), 
-            l.register(y, "hues", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), 
-            l.register(b, "hueScale", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx")), 
+            (l = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : n("./node_modules/react-hot-loader/index.js")).default) && (l.register(c, "menuSkeletons", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), 
+            l.register(d, "MENU", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), 
+            l.register(f, "DURATION", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), 
+            l.register(p, "chartStrokeWidth", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), 
+            l.register(h, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), 
+            l.register(_, "unit", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), 
+            l.register(m, "simplifyBytes", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), 
+            l.register(y, "hues", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), 
+            l.register(b, "hueScale", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx")), 
             (u = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : n("./node_modules/react-hot-loader/index.js")).leaveModule) && u(e);
         }).call(this, n("./node_modules/webpack/buildin/harmony-module.js")(e));
     },
@@ -323,9 +323,9 @@ var _bundleJs = []byte((((`!function(e) {
                 } ]), Body;
             }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = Body, reactHotLoader, leaveModule;
             __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, 
-            reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Body.jsx"), 
-            reactHotLoader.register(Body, "Body", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Body.jsx"), 
-            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Body.jsx")), 
+            reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Body.jsx"), 
+            reactHotLoader.register(Body, "Body", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Body.jsx"), 
+            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Body.jsx")), 
             leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, 
             leaveModule && leaveModule(module);
         }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module));
@@ -422,9 +422,9 @@ var _bundleJs = []byte((((`!function(e) {
                 } ]), ChartRow;
             }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = ChartRow, reactHotLoader, leaveModule;
             __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, 
-            reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/ChartRow.jsx"), 
-            reactHotLoader.register(ChartRow, "ChartRow", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/ChartRow.jsx"), 
-            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/ChartRow.jsx")), 
+            reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/ChartRow.jsx"), 
+            reactHotLoader.register(ChartRow, "ChartRow", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/ChartRow.jsx"), 
+            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/ChartRow.jsx")), 
             leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, 
             leaveModule && leaveModule(module);
         }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module));
@@ -547,12 +547,12 @@ var _bundleJs = []byte((((`!function(e) {
                 } ]), CustomTooltip;
             }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = CustomTooltip, reactHotLoader, leaveModule;
             __webpack_exports__.c = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, 
-            reactHotLoader && (reactHotLoader.register(multiplier, "multiplier", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/CustomTooltip.jsx"), 
-            reactHotLoader.register(percentPlotter, "percentPlotter", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/CustomTooltip.jsx"), 
-            reactHotLoader.register(bytePlotter, "bytePlotter", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/CustomTooltip.jsx"), 
-            reactHotLoader.register(bytePerSecPlotter, "bytePerSecPlotter", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/CustomTooltip.jsx"), 
-            reactHotLoader.register(CustomTooltip, "CustomTooltip", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/CustomTooltip.jsx"), 
-            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/CustomTooltip.jsx")), 
+            reactHotLoader && (reactHotLoader.register(multiplier, "multiplier", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/CustomTooltip.jsx"), 
+            reactHotLoader.register(percentPlotter, "percentPlotter", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/CustomTooltip.jsx"), 
+            reactHotLoader.register(bytePlotter, "bytePlotter", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/CustomTooltip.jsx"), 
+            reactHotLoader.register(bytePerSecPlotter, "bytePerSecPlotter", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/CustomTooltip.jsx"), 
+            reactHotLoader.register(CustomTooltip, "CustomTooltip", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/CustomTooltip.jsx"), 
+            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/CustomTooltip.jsx")), 
             leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, 
             leaveModule && leaveModule(module);
         }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module));
@@ -800,16 +800,16 @@ var _bundleJs = []byte((((`!function(e) {
                 } ]), Dashboard;
             }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = Object(react_hot_loader__WEBPACK_IMPORTED_MODULE_1__.hot)(module)(_material_ui_core_styles_withStyles__WEBPACK_IMPORTED_MODULE_2___default()(themeStyles)(Dashboard)), reactHotLoader, leaveModule;
             __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, 
-            reactHotLoader && (reactHotLoader.register(deepUpdate, "deepUpdate", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), 
-            reactHotLoader.register(shouldUpdate, "shouldUpdate", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), 
-            reactHotLoader.register(replacer, "replacer", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), 
-            reactHotLoader.register(appender, "appender", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), 
-            reactHotLoader.register(defaultContent, "defaultContent", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), 
-            reactHotLoader.register(updaters, "updaters", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), 
-            reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), 
-            reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), 
-            reactHotLoader.register(Dashboard, "Dashboard", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), 
-            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx")), 
+            reactHotLoader && (reactHotLoader.register(deepUpdate, "deepUpdate", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), 
+            reactHotLoader.register(shouldUpdate, "shouldUpdate", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), 
+            reactHotLoader.register(replacer, "replacer", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), 
+            reactHotLoader.register(appender, "appender", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), 
+            reactHotLoader.register(defaultContent, "defaultContent", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), 
+            reactHotLoader.register(updaters, "updaters", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), 
+            reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), 
+            reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), 
+            reactHotLoader.register(Dashboard, "Dashboard", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), 
+            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx")), 
             leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, 
             leaveModule && leaveModule(module);
         }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module));
@@ -1041,7 +1041,7 @@ var _bundleJs = []byte((((`!function(e) {
                         }, react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("span", {
                             style: _common__WEBPACK_IMPORTED_MODULE_12__.g.light
                         }, "Commit "), react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("a", {
-                            href: "https://github.com/ethereum/go-ethereum/commit/".concat(t.commit),
+                            href: "https://github.com/maticnetwork/bor/commit/".concat(t.commit),
                             target: "_blank",
                             rel: "noopener noreferrer",
                             style: styles.link
@@ -1055,25 +1055,25 @@ var _bundleJs = []byte((((`!function(e) {
                 } ]), Footer;
             }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = _material_ui_core_styles_withStyles__WEBPACK_IMPORTED_MODULE_1___default()(themeStyles)(Footer), reactHotLoader, leaveModule;
             __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, 
-            reactHotLoader && (reactHotLoader.register(FOOTER_SYNC_ID, "FOOTER_SYNC_ID", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(CPU, "CPU", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(MEMORY, "MEMORY", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(DISK, "DISK", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(TRAFFIC, "TRAFFIC", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(TOP, "TOP", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(BOTTOM, "BOTTOM", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(cpuLabelTop, "cpuLabelTop", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(cpuLabelBottom, "cpuLabelBottom", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(memoryLabelTop, "memoryLabelTop", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(memoryLabelBottom, "memoryLabelBottom", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(diskLabelTop, "diskLabelTop", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(diskLabelBottom, "diskLabelBottom", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(trafficLabelTop, "trafficLabelTop", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(trafficLabelBottom, "trafficLabelBottom", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(Footer, "Footer", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), 
-            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx")), 
+            reactHotLoader && (reactHotLoader.register(FOOTER_SYNC_ID, "FOOTER_SYNC_ID", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(CPU, "CPU", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(MEMORY, "MEMORY", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(DISK, "DISK", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(TRAFFIC, "TRAFFIC", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(TOP, "TOP", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(BOTTOM, "BOTTOM", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(cpuLabelTop, "cpuLabelTop", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(cpuLabelBottom, "cpuLabelBottom", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(memoryLabelTop, "memoryLabelTop", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(memoryLabelBottom, "memoryLabelBottom", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(diskLabelTop, "diskLabelTop", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(diskLabelBottom, "diskLabelBottom", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(trafficLabelTop, "trafficLabelTop", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(trafficLabelBottom, "trafficLabelBottom", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(Footer, "Footer", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), 
+            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx")), 
             leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, 
             leaveModule && leaveModule(module);
         }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module));
@@ -1188,10 +1188,10 @@ var _bundleJs = []byte((((`!function(e) {
                 } ]), Header;
             }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = _material_ui_core_styles_withStyles__WEBPACK_IMPORTED_MODULE_1___default()(themeStyles)(Header), reactHotLoader, leaveModule;
             __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, 
-            reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Header.jsx"), 
-            reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Header.jsx"), 
-            reactHotLoader.register(Header, "Header", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Header.jsx"), 
-            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Header.jsx")), 
+            reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Header.jsx"), 
+            reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Header.jsx"), 
+            reactHotLoader.register(Header, "Header", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Header.jsx"), 
+            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Header.jsx")), 
             leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, 
             leaveModule && leaveModule(module);
         }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module));
@@ -1447,16 +1447,16 @@ var _bundleJs = []byte((((`!function(e) {
                 } ]), Logs;
             }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = Logs, reactHotLoader, leaveModule;
             __webpack_exports__.b = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, 
-            reactHotLoader && (reactHotLoader.register(requestBand, "requestBand", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), 
-            reactHotLoader.register(fieldPadding, "fieldPadding", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), 
-            reactHotLoader.register(createChunk, "createChunk", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), 
-            reactHotLoader.register(ADDED, "ADDED", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), 
-            reactHotLoader.register(SAME, "SAME", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), 
-            reactHotLoader.register(REMOVED, "REMOVED", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), 
-            reactHotLoader.register(inserter, "inserter", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), 
-            reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), 
-            reactHotLoader.register(Logs, "Logs", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), 
-            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx")), 
+            reactHotLoader && (reactHotLoader.register(requestBand, "requestBand", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), 
+            reactHotLoader.register(fieldPadding, "fieldPadding", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), 
+            reactHotLoader.register(createChunk, "createChunk", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), 
+            reactHotLoader.register(ADDED, "ADDED", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), 
+            reactHotLoader.register(SAME, "SAME", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), 
+            reactHotLoader.register(REMOVED, "REMOVED", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), 
+            reactHotLoader.register(inserter, "inserter", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), 
+            reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), 
+            reactHotLoader.register(Logs, "Logs", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), 
+            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx")), 
             leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, 
             leaveModule && leaveModule(module);
         }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module));
@@ -1613,10 +1613,10 @@ var _bundleJs = []byte((((`!function(e) {
                 } ]), Main;
             }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = _material_ui_core_styles_withStyles__WEBPACK_IMPORTED_MODULE_1___default()(themeStyles)(Main), reactHotLoader, leaveModule;
             __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, 
-            reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Main.jsx"), 
-            reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Main.jsx"), 
-            reactHotLoader.register(Main, "Main", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Main.jsx"), 
-            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Main.jsx")), 
+            reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Main.jsx"), 
+            reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Main.jsx"), 
+            reactHotLoader.register(Main, "Main", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Main.jsx"), 
+            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Main.jsx")), 
             leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, 
             leaveModule && leaveModule(module);
         }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module));
@@ -2093,16 +2093,16 @@ var _bundleJs = []byte((((`!function(e) {
                 } ]), Network;
             }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = Network, reactHotLoader, leaveModule;
             __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, 
-            reactHotLoader && (reactHotLoader.register(trafficChartHeight, "trafficChartHeight", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), 
-            reactHotLoader.register(trafficChartWidth, "trafficChartWidth", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), 
-            reactHotLoader.register(setMaxIngress, "setMaxIngress", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), 
-            reactHotLoader.register(setMaxEgress, "setMaxEgress", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), 
-            reactHotLoader.register(setIngressChartAttributes, "setIngressChartAttributes", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), 
-            reactHotLoader.register(setEgressChartAttributes, "setEgressChartAttributes", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), 
-            reactHotLoader.register(inserter, "inserter", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), 
-            reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), 
-            reactHotLoader.register(Network, "Network", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), 
-            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx")), 
+            reactHotLoader && (reactHotLoader.register(trafficChartHeight, "trafficChartHeight", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), 
+            reactHotLoader.register(trafficChartWidth, "trafficChartWidth", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), 
+            reactHotLoader.register(setMaxIngress, "setMaxIngress", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), 
+            reactHotLoader.register(setMaxEgress, "setMaxEgress", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), 
+            reactHotLoader.register(setIngressChartAttributes, "setIngressChartAttributes", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), 
+            reactHotLoader.register(setEgressChartAttributes, "setEgressChartAttributes", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), 
+            reactHotLoader.register(inserter, "inserter", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), 
+            reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), 
+            reactHotLoader.register(Network, "Network", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), 
+            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx")), 
             leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, 
             leaveModule && leaveModule(module);
         }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module));
@@ -2261,10 +2261,10 @@ var _bundleJs = []byte((((`!function(e) {
                 } ]), SideBar;
             }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = _material_ui_core_styles_withStyles__WEBPACK_IMPORTED_MODULE_1___default()(themeStyles)(SideBar), reactHotLoader, leaveModule;
             __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, 
-            reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/SideBar.jsx"), 
-            reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/SideBar.jsx"), 
-            reactHotLoader.register(SideBar, "SideBar", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/SideBar.jsx"), 
-            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/SideBar.jsx")), 
+            reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/SideBar.jsx"), 
+            reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/SideBar.jsx"), 
+            reactHotLoader.register(SideBar, "SideBar", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/SideBar.jsx"), 
+            reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/SideBar.jsx")), 
             leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, 
             leaveModule && leaveModule(module);
         }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module));
@@ -2281,8 +2281,8 @@ var _bundleJs = []byte((((`!function(e) {
             }), h = document.getElementById("dashboard");
             h && Object(a.render)(o.a.createElement(s.a, {
                 theme: p
-            }, o.a.createElement(c.a, null)), h), (d = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : n("./node_modules/react-hot-loader/index.js")).default) && (d.register(p, "theme", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/index.jsx"), 
-            d.register(h, "dashboard", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/index.jsx")), 
+            }, o.a.createElement(c.a, null)), h), (d = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : n("./node_modules/react-hot-loader/index.js")).default) && (d.register(p, "theme", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/index.jsx"), 
+            d.register(h, "dashboard", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/index.jsx")), 
             (f = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : n("./node_modules/react-hot-loader/index.js")).leaveModule) && f(e);
         }.call(this, n("./node_modules/webpack/buildin/harmony-module.js")(e));
     },
@@ -37778,7 +37778,7 @@ var _bundleJsMap = []byte(((((((((((((`{
         "// @flow\n\n// Copyright 2018 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.\n\nimport React, {Component} from 'react';\nimport type {ChildrenArray} from 'react';\n\nimport Grid from '@material-ui/core/Grid';\n\n// styles contains the constant styles of the component.\nconst styles = {\n\tcontainer: {\n\t\tflexWrap: 'nowrap',\n\t\theight:   '100%',\n\t\tmaxWidth: '100%',\n\t\tmargin:   0,\n\t},\n\titem: {\n\t\tflex:    1,\n\t\tpadding: 0,\n\t},\n};\n\nexport type Props = {\n\tchildren: ChildrenArray<React$Element<any>>,\n};\n\n// ChartRow renders a row of equally sized responsive charts.\nclass ChartRow extends Component<Props> {\n\trender() {\n\t\treturn (\n\t\t\t<Grid container direction='row' style={styles.container} justify='space-between'>\n\t\t\t\t{React.Children.map(this.props.children, child => (\n\t\t\t\t\t<Grid item xs style={styles.item}>\n\t\t\t\t\t\t{child}\n\t\t\t\t\t</Grid>\n\t\t\t\t))}\n\t\t\t</Grid>\n\t\t);\n\t}\n}\n\nexport default ChartRow;\n",
         "// @flow\n\n// Copyright 2018 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.\n\nimport React, {Component} from 'react';\n\nimport Typography from '@material-ui/core/Typography';\nimport {styles, simplifyBytes} from '../common';\n\n// multiplier multiplies a number by another.\nexport const multiplier = <T>(by: number = 1) => (x: number) => x * by;\n\n// percentPlotter renders a tooltip, which displays the value of the payload followed by a percent sign.\nexport const percentPlotter = <T>(text: string, mapper: (T => T) = multiplier(1)) => (payload: T) => {\n\tconst p = mapper(payload);\n\tif (typeof p !== 'number') {\n\t\treturn null;\n\t}\n\treturn (\n\t\t<Typography type='caption' color='inherit'>\n\t\t\t<span style={styles.light}>{text}</span> {p.toFixed(2)} %\n\t\t</Typography>\n\t);\n};\n\n// bytePlotter renders a tooltip, which displays the payload as a byte value.\nexport const bytePlotter = <T>(text: string, mapper: (T => T) = multiplier(1)) => (payload: T) => {\n\tconst p = mapper(payload);\n\tif (typeof p !== 'number') {\n\t\treturn null;\n\t}\n\treturn (\n\t\t<Typography type='caption' color='inherit'>\n\t\t\t<span style={styles.light}>{text}</span> {simplifyBytes(p)}\n\t\t</Typography>\n\t);\n};\n\n// bytePlotter renders a tooltip, which displays the payload as a byte value followed by '/s'.\nexport const bytePerSecPlotter = <T>(text: string, mapper: (T => T) = multiplier(1)) => (payload: T) => {\n\tconst p = mapper(payload);\n\tif (typeof p !== 'number') {\n\t\treturn null;\n\t}\n\treturn (\n\t\t<Typography type='caption' color='inherit'>\n\t\t\t<span style={styles.light}>{text}</span>\n\t\t\t{simplifyBytes(p)}/s\n\t\t</Typography>\n\t);\n};\n\nexport type Props = {\n\tactive: boolean,\n\tpayload: Object,\n\ttooltip: <T>(text: string, mapper?: T => T) => (payload: mixed) => null | React$Element<any>,\n};\n\n// CustomTooltip takes a tooltip function, and uses it to plot the active value of the chart.\nclass CustomTooltip extends Component<Props> {\n\trender() {\n\t\tconst {active, payload, tooltip} = this.props;\n\t\tif (!active || typeof tooltip !== 'function' || !Array.isArray(payload) || payload.length < 1) {\n\t\t\treturn null;\n\t\t}\n\t\treturn tooltip(payload[0].value);\n\t}\n}\n\nexport default CustomTooltip;\n",
         "// @flow\n\n// Copyright 2017 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.\n\nimport React, {Component} from 'react';\nimport {hot} from 'react-hot-loader';\n\nimport withStyles from '@material-ui/core/styles/withStyles';\n\nimport Header from 'Header';\nimport Body from 'Body';\nimport {inserter as logInserter, SAME} from 'Logs';\nimport {inserter as peerInserter} from 'Network';\nimport {MENU} from '../common';\nimport type {Content} from '../types/content';\n\n// deepUpdate updates an object corresponding to the given update data, which has\n// the shape of the same structure as the original object. updater also has the same\n// structure, except that it contains functions where the original data needs to be\n// updated. These functions are used to handle the update.\n//\n// Since the messages have the same shape as the state content, this approach allows\n// the generalization of the message handling. The only necessary thing is to set a\n// handler function for every path of the state in order to maximize the flexibility\n// of the update.\nconst deepUpdate = (updater: Object, update: Object, prev: Object): $Shape<Content> => {\n\tif (typeof update === 'undefined') {\n\t\treturn prev;\n\t}\n\tif (typeof updater === 'function') {\n\t\treturn updater(update, prev);\n\t}\n\tconst updated = {};\n\tObject.keys(prev).forEach((key) => {\n\t\tupdated[key] = deepUpdate(updater[key], update[key], prev[key]);\n\t});\n\n\treturn updated;\n};\n\n// shouldUpdate returns the structure of a message. It is used to prevent unnecessary render\n// method triggerings. In the affected component's shouldComponentUpdate method it can be checked\n// whether the involved data was changed or not by checking the message structure.\n//\n// We could return the message itself too, but it's safer not to give access to it.\nconst shouldUpdate = (updater: Object, msg: Object) => {\n\tconst su = {};\n\tObject.keys(msg).forEach((key) => {\n\t\tsu[key] = typeof updater[key] !== 'function' ? shouldUpdate(updater[key], msg[key]) : true;\n\t});\n\n\treturn su;\n};\n\n// replacer is a state updater function, which replaces the original data.\nconst replacer = <T>(update: T) => update;\n\n// appender is a state updater function, which appends the update data to the\n// existing data. limit defines the maximum allowed size of the created array,\n// mapper maps the update data.\nconst appender = <T>(limit: number, mapper = replacer) => (update: Array<T>, prev: Array<T>) => [\n\t...prev,\n\t...update.map(sample => mapper(sample)),\n].slice(-limit);\n\n// defaultContent returns the initial value of the state content. Needs to be a function in order to\n// instantiate the object again, because it is used by the state, and isn't automatically cleaned\n// when a new connection is established. The state is mutated during the update in order to avoid\n// the execution of unnecessary operations (e.g. copy of the log array).\nconst defaultContent: () => Content = () => ({\n\tgeneral: {\n\t\tversion: null,\n\t\tcommit:  null,\n\t},\n\thome:    {},\n\tchain:   {},\n\ttxpool:  {},\n\tnetwork: {\n\t\tpeers: {\n\t\t\tbundles: {},\n\t\t},\n\t\tdiff: [],\n\t},\n\tsystem: {\n\t\tactiveMemory:   [],\n\t\tvirtualMemory:  [],\n\t\tnetworkIngress: [],\n\t\tnetworkEgress:  [],\n\t\tprocessCPU:     [],\n\t\tsystemCPU:      [],\n\t\tdiskRead:       [],\n\t\tdiskWrite:      [],\n\t},\n\tlogs: {\n\t\tchunks:        [],\n\t\tendTop:        false,\n\t\tendBottom:     true,\n\t\ttopChanged:    SAME,\n\t\tbottomChanged: SAME,\n\t},\n});\n\n// updaters contains the state updater functions for each path of the state.\n//\n// TODO (kurkomisi): Define a tricky type which embraces the content and the updaters.\nconst updaters = {\n\tgeneral: {\n\t\tversion: replacer,\n\t\tcommit:  replacer,\n\t},\n\thome:    null,\n\tchain:   null,\n\ttxpool:  null,\n\tnetwork: peerInserter(200),\n\tsystem:  {\n\t\tactiveMemory:   appender(200),\n\t\tvirtualMemory:  appender(200),\n\t\tnetworkIngress: appender(200),\n\t\tnetworkEgress:  appender(200),\n\t\tprocessCPU:     appender(200),\n\t\tsystemCPU:      appender(200),\n\t\tdiskRead:       appender(200),\n\t\tdiskWrite:      appender(200),\n\t},\n\tlogs: logInserter(5),\n};\n\n// styles contains the constant styles of the component.\nconst styles = {\n\tdashboard: {\n\t\tdisplay:  'flex',\n\t\tflexFlow: 'column',\n\t\twidth:    '100%',\n\t\theight:   '100%',\n\t\tzIndex:   1,\n\t\toverflow: 'hidden',\n\t},\n};\n\n// themeStyles returns the styles generated from the theme for the component.\nconst themeStyles: Object = (theme: Object) => ({\n\tdashboard: {\n\t\tbackground: theme.palette.background.default,\n\t},\n});\n\nexport type Props = {\n\tclasses: Object, // injected by withStyles()\n};\n\ntype State = {\n\tactive:       string,  // active menu\n\tsideBar:      boolean, // true if the sidebar is opened\n\tcontent:      Content, // the visualized data\n\tshouldUpdate: Object,  // labels for the components, which need to re-render based on the incoming message\n\tserver:       ?WebSocket,\n};\n\n// Dashboard is the main component, which renders the whole page, makes connection with the server and\n// listens for messages. When there is an incoming message, updates the page's content correspondingly.\nclass Dashboard extends Component<Props, State> {\n\tconstructor(props: Props) {\n\t\tsuper(props);\n\t\tthis.state = {\n\t\t\tactive:       MENU.get('home').id,\n\t\t\tsideBar:      true,\n\t\t\tcontent:      defaultContent(),\n\t\t\tshouldUpdate: {},\n\t\t\tserver:       null,\n\t\t};\n\t}\n\n\t// componentDidMount initiates the establishment of the first websocket connection after the component is rendered.\n\tcomponentDidMount() {\n\t\tthis.reconnect();\n\t}\n\n\t// reconnect establishes a websocket connection with the server, listens for incoming messages\n\t// and tries to reconnect on connection loss.\n\treconnect = () => {\n\t\tconst host = process.env.NODE_ENV === 'production' ? window.location.host : 'localhost:8080';\n\t\tconst server = new WebSocket(` + ("`" + `${((window.location.protocol === 'https:') ? 'wss://' : 'ws://')}${host}/api`)) + ("`" + (`);\n\t\tserver.onopen = () => {\n\t\t\tthis.setState({content: defaultContent(), shouldUpdate: {}, server});\n\t\t};\n\t\tserver.onmessage = (event) => {\n\t\t\tconst msg: $Shape<Content> = JSON.parse(event.data);\n\t\t\tif (!msg) {\n\t\t\t\tconsole.error(` + "`"))) + ((`Incoming message is ${msg}` + ("`" + `);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tthis.update(msg);\n\t\t};\n\t\tserver.onclose = () => {\n\t\t\tthis.setState({server: null});\n\t\t\tsetTimeout(this.reconnect, 3000);\n\t\t};\n\t};\n\n\t// send sends a message to the server, which can be accessed only through this function for safety reasons.\n\tsend = (msg: string) => {\n\t\tif (this.state.server != null) {\n\t\t\tthis.state.server.send(msg);\n\t\t}\n\t};\n\n\t// update updates the content corresponding to the incoming message.\n\tupdate = (msg: $Shape<Content>) => {\n\t\tthis.setState(prevState => ({\n\t\t\tcontent:      deepUpdate(updaters, msg, prevState.content),\n\t\t\tshouldUpdate: shouldUpdate(updaters, msg),\n\t\t}));\n\t};\n\n\t// changeContent sets the active label, which is used at the content rendering.\n\tchangeContent = (newActive: string) => {\n\t\tthis.setState(prevState => (prevState.active !== newActive ? {active: newActive} : {}));\n\t};\n\n\t// switchSideBar opens or closes the sidebar's state.\n\tswitchSideBar = () => {\n\t\tthis.setState(prevState => ({sideBar: !prevState.sideBar}));\n\t};\n\n\trender() {\n\t\treturn (\n\t\t\t<div className={this.props.classes.dashboard} style={styles.dashboard}>\n\t\t\t\t<Header\n\t\t\t\t\tswitchSideBar={this.switchSideBar}\n\t\t\t\t/>\n\t\t\t\t<Body\n\t\t\t\t\topened={this.state.sideBar}\n\t\t\t\t\tchangeContent={this.changeContent}\n\t\t\t\t\tactive={this.state.active}\n\t\t\t\t\tcontent={this.state.content}\n\t\t\t\t\tshouldUpdate={this.state.shouldUpdate}\n\t\t\t\t\tsend={this.send}\n\t\t\t\t/>\n\t\t\t</div>\n\t\t);\n\t}\n}\n\nexport default hot(module)(withStyles(themeStyles)(Dashboard));\n",
-        "// @flow\n\n// Copyright 2017 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.\n\nimport React, {Component} from 'react';\n\nimport withStyles from '@material-ui/core/styles/withStyles';\nimport Typography from '@material-ui/core/Typography';\nimport Grid from '@material-ui/core/Grid';\nimport ResponsiveContainer from 'recharts/es6/component/ResponsiveContainer';\nimport AreaChart from 'recharts/es6/chart/AreaChart';\nimport Area from 'recharts/es6/cartesian/Area';\nimport ReferenceLine from 'recharts/es6/cartesian/ReferenceLine';\nimport Label from 'recharts/es6/component/Label';\nimport Tooltip from 'recharts/es6/component/Tooltip';\n\nimport ChartRow from 'ChartRow';\nimport CustomTooltip, {bytePlotter, bytePerSecPlotter, percentPlotter, multiplier} from 'CustomTooltip';\nimport {chartStrokeWidth, styles as commonStyles} from '../common';\nimport type {General, System} from '../types/content';\n\nconst FOOTER_SYNC_ID = 'footerSyncId';\n\nconst CPU     = 'cpu';\nconst MEMORY  = 'memory';\nconst DISK    = 'disk';\nconst TRAFFIC = 'traffic';\n\nconst TOP = 'Top';\nconst BOTTOM = 'Bottom';\n\nconst cpuLabelTop = 'Process load';\nconst cpuLabelBottom = 'System load';\nconst memoryLabelTop = 'Active memory';\nconst memoryLabelBottom = 'Virtual memory';\nconst diskLabelTop = 'Disk read';\nconst diskLabelBottom = 'Disk write';\nconst trafficLabelTop = 'Download';\nconst trafficLabelBottom = 'Upload';\n\n// styles contains the constant styles of the component.\nconst styles = {\n\tfooter: {\n\t\tmaxWidth: '100%',\n\t\tflexWrap: 'nowrap',\n\t\tmargin:   0,\n\t},\n\tchartRowWrapper: {\n\t\theight:  '100%',\n\t\tpadding: 0,\n\t},\n\tdoubleChartWrapper: {\n\t\theight: '100%',\n\t\twidth:  '99%',\n\t},\n\tlink: {\n\t\tcolor:          'inherit',\n\t\ttextDecoration: 'none',\n\t},\n};\n\n// themeStyles returns the styles generated from the theme for the component.\nconst themeStyles: Object = (theme: Object) => ({\n\tfooter: {\n\t\tbackgroundColor: theme.palette.grey[900],\n\t\tcolor:           theme.palette.getContrastText(theme.palette.grey[900]),\n\t\tzIndex:          theme.zIndex.appBar,\n\t\theight:          theme.spacing.unit * 10,\n\t},\n});\n\nexport type Props = {\n\tclasses: Object, // injected by withStyles()\n\ttheme: Object,\n\tgeneral: General,\n\tsystem: System,\n\tshouldUpdate: Object,\n};\n\ntype State = {};\n\n// Footer renders the footer of the dashboard.\nclass Footer extends Component<Props, State> {\n\tshouldComponentUpdate(nextProps: Readonly<Props>, nextState: Readonly<State>, nextContext: any) {\n\t\treturn typeof nextProps.shouldUpdate.general !== 'undefined' || typeof nextProps.shouldUpdate.system !== 'undefined';\n\t}\n\n\t// halfHeightChart renders an area chart with half of the height of its parent.\n\thalfHeightChart = (chartProps, tooltip, areaProps, label, position) => (\n\t\t<ResponsiveContainer width='100%' height='50%'>\n\t\t\t<AreaChart {...chartProps}>\n\t\t\t\t{!tooltip || (<Tooltip cursor={false} content={<CustomTooltip tooltip={tooltip} />} />)}\n\t\t\t\t<Area isAnimationActive={false} strokeWidth={chartStrokeWidth} type='monotone' {...areaProps} />\n\t\t\t\t<ReferenceLine x={0} strokeWidth={0}>\n\t\t\t\t\t<Label fill={areaProps.fill} value={label} position={position} />\n\t\t\t\t</ReferenceLine>\n\t\t\t</AreaChart>\n\t\t</ResponsiveContainer>\n\t);\n\n\t// doubleChart renders a pair of charts separated by the baseline.\n\tdoubleChart = (syncId, chartKey, topChart, bottomChart) => {\n\t\tif (!Array.isArray(topChart.data) || !Array.isArray(bottomChart.data)) {\n\t\t\treturn null;\n\t\t}\n\t\tconst topDefault = topChart.default || 0;\n\t\tconst bottomDefault = bottomChart.default || 0;\n\t\tconst topKey = `)) + ("`" + (`${chartKey}${TOP}` + "`")))) + (((`;\n\t\tconst bottomKey = ` + ("`" + `${chartKey}${BOTTOM}`)) + ("`" + (`;\n\t\tconst topColor = '#8884d8';\n\t\tconst bottomColor = '#82ca9d';\n\n\t\treturn (\n\t\t\t<div style={styles.doubleChartWrapper}>\n\t\t\t\t{this.halfHeightChart(\n\t\t\t\t\t{\n\t\t\t\t\t\tsyncId,\n\t\t\t\t\t\tdata:   topChart.data.map(({value}) => ({[topKey]: value || topDefault})),\n\t\t\t\t\t\tmargin: {top: 5, right: 5, bottom: 0, left: 5},\n\t\t\t\t\t},\n\t\t\t\t\ttopChart.tooltip,\n\t\t\t\t\t{dataKey: topKey, stroke: topColor, fill: topColor},\n\t\t\t\t\ttopChart.label,\n\t\t\t\t\t'insideBottomLeft',\n\t\t\t\t)}\n\t\t\t\t{this.halfHeightChart(\n\t\t\t\t\t{\n\t\t\t\t\t\tsyncId,\n\t\t\t\t\t\tdata:   bottomChart.data.map(({value}) => ({[bottomKey]: -value || -bottomDefault})),\n\t\t\t\t\t\tmargin: {top: 0, right: 5, bottom: 5, left: 5},\n\t\t\t\t\t},\n\t\t\t\t\tbottomChart.tooltip,\n\t\t\t\t\t{dataKey: bottomKey, stroke: bottomColor, fill: bottomColor},\n\t\t\t\t\tbottomChart.label,\n\t\t\t\t\t'insideTopLeft',\n\t\t\t\t)}\n\t\t\t</div>\n\t\t);\n\t};\n\n\trender() {\n\t\tconst {general, system} = this.props;\n\n\t\treturn (\n\t\t\t<Grid container className={this.props.classes.footer} direction='row' alignItems='center' style={styles.footer}>\n\t\t\t\t<Grid item xs style={styles.chartRowWrapper}>\n\t\t\t\t\t<ChartRow>\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tCPU,\n\t\t\t\t\t\t\t{data: system.processCPU, tooltip: percentPlotter(cpuLabelTop), label: cpuLabelTop},\n\t\t\t\t\t\t\t{data: system.systemCPU, tooltip: percentPlotter(cpuLabelBottom, multiplier(-1)), label: cpuLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tMEMORY,\n\t\t\t\t\t\t\t{data: system.activeMemory, tooltip: bytePlotter(memoryLabelTop), label: memoryLabelTop},\n\t\t\t\t\t\t\t{data: system.virtualMemory, tooltip: bytePlotter(memoryLabelBottom, multiplier(-1)), label: memoryLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tDISK,\n\t\t\t\t\t\t\t{data: system.diskRead, tooltip: bytePerSecPlotter(diskLabelTop), label: diskLabelTop},\n\t\t\t\t\t\t\t{data: system.diskWrite, tooltip: bytePerSecPlotter(diskLabelBottom, multiplier(-1)), label: diskLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tTRAFFIC,\n\t\t\t\t\t\t\t{data: system.networkIngress, tooltip: bytePerSecPlotter(trafficLabelTop), label: trafficLabelTop},\n\t\t\t\t\t\t\t{data: system.networkEgress, tooltip: bytePerSecPlotter(trafficLabelBottom, multiplier(-1)), label: trafficLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t</ChartRow>\n\t\t\t\t</Grid>\n\t\t\t\t<Grid item>\n\t\t\t\t\t<Typography type='caption' color='inherit'>\n\t\t\t\t\t\t<span style={commonStyles.light}>Geth</span> {general.version}\n\t\t\t\t\t</Typography>\n\t\t\t\t\t{general.commit && (\n\t\t\t\t\t\t<Typography type='caption' color='inherit'>\n\t\t\t\t\t\t\t<span style={commonStyles.light}>{'Commit '}</span>\n\t\t\t\t\t\t\t<a\n\t\t\t\t\t\t\t\thref={` + "`"))) + ((`https://github.com/ethereum/go-ethereum/commit/${general.commit}` + ("`" + `}\n\t\t\t\t\t\t\t\ttarget='_blank'\n\t\t\t\t\t\t\t\trel='noopener noreferrer'\n\t\t\t\t\t\t\t\tstyle={styles.link}\n\t\t\t\t\t\t\t>\n\t\t\t\t\t\t\t\t{general.commit.substring(0, 8)}\n\t\t\t\t\t\t\t</a>\n\t\t\t\t\t\t</Typography>\n\t\t\t\t\t)}\n\t\t\t\t</Grid>\n\t\t\t</Grid>\n\t\t);\n\t}\n}\n\nexport default withStyles(themeStyles)(Footer);\n",
+        "// @flow\n\n// Copyright 2017 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.\n\nimport React, {Component} from 'react';\n\nimport withStyles from '@material-ui/core/styles/withStyles';\nimport Typography from '@material-ui/core/Typography';\nimport Grid from '@material-ui/core/Grid';\nimport ResponsiveContainer from 'recharts/es6/component/ResponsiveContainer';\nimport AreaChart from 'recharts/es6/chart/AreaChart';\nimport Area from 'recharts/es6/cartesian/Area';\nimport ReferenceLine from 'recharts/es6/cartesian/ReferenceLine';\nimport Label from 'recharts/es6/component/Label';\nimport Tooltip from 'recharts/es6/component/Tooltip';\n\nimport ChartRow from 'ChartRow';\nimport CustomTooltip, {bytePlotter, bytePerSecPlotter, percentPlotter, multiplier} from 'CustomTooltip';\nimport {chartStrokeWidth, styles as commonStyles} from '../common';\nimport type {General, System} from '../types/content';\n\nconst FOOTER_SYNC_ID = 'footerSyncId';\n\nconst CPU     = 'cpu';\nconst MEMORY  = 'memory';\nconst DISK    = 'disk';\nconst TRAFFIC = 'traffic';\n\nconst TOP = 'Top';\nconst BOTTOM = 'Bottom';\n\nconst cpuLabelTop = 'Process load';\nconst cpuLabelBottom = 'System load';\nconst memoryLabelTop = 'Active memory';\nconst memoryLabelBottom = 'Virtual memory';\nconst diskLabelTop = 'Disk read';\nconst diskLabelBottom = 'Disk write';\nconst trafficLabelTop = 'Download';\nconst trafficLabelBottom = 'Upload';\n\n// styles contains the constant styles of the component.\nconst styles = {\n\tfooter: {\n\t\tmaxWidth: '100%',\n\t\tflexWrap: 'nowrap',\n\t\tmargin:   0,\n\t},\n\tchartRowWrapper: {\n\t\theight:  '100%',\n\t\tpadding: 0,\n\t},\n\tdoubleChartWrapper: {\n\t\theight: '100%',\n\t\twidth:  '99%',\n\t},\n\tlink: {\n\t\tcolor:          'inherit',\n\t\ttextDecoration: 'none',\n\t},\n};\n\n// themeStyles returns the styles generated from the theme for the component.\nconst themeStyles: Object = (theme: Object) => ({\n\tfooter: {\n\t\tbackgroundColor: theme.palette.grey[900],\n\t\tcolor:           theme.palette.getContrastText(theme.palette.grey[900]),\n\t\tzIndex:          theme.zIndex.appBar,\n\t\theight:          theme.spacing.unit * 10,\n\t},\n});\n\nexport type Props = {\n\tclasses: Object, // injected by withStyles()\n\ttheme: Object,\n\tgeneral: General,\n\tsystem: System,\n\tshouldUpdate: Object,\n};\n\ntype State = {};\n\n// Footer renders the footer of the dashboard.\nclass Footer extends Component<Props, State> {\n\tshouldComponentUpdate(nextProps: Readonly<Props>, nextState: Readonly<State>, nextContext: any) {\n\t\treturn typeof nextProps.shouldUpdate.general !== 'undefined' || typeof nextProps.shouldUpdate.system !== 'undefined';\n\t}\n\n\t// halfHeightChart renders an area chart with half of the height of its parent.\n\thalfHeightChart = (chartProps, tooltip, areaProps, label, position) => (\n\t\t<ResponsiveContainer width='100%' height='50%'>\n\t\t\t<AreaChart {...chartProps}>\n\t\t\t\t{!tooltip || (<Tooltip cursor={false} content={<CustomTooltip tooltip={tooltip} />} />)}\n\t\t\t\t<Area isAnimationActive={false} strokeWidth={chartStrokeWidth} type='monotone' {...areaProps} />\n\t\t\t\t<ReferenceLine x={0} strokeWidth={0}>\n\t\t\t\t\t<Label fill={areaProps.fill} value={label} position={position} />\n\t\t\t\t</ReferenceLine>\n\t\t\t</AreaChart>\n\t\t</ResponsiveContainer>\n\t);\n\n\t// doubleChart renders a pair of charts separated by the baseline.\n\tdoubleChart = (syncId, chartKey, topChart, bottomChart) => {\n\t\tif (!Array.isArray(topChart.data) || !Array.isArray(bottomChart.data)) {\n\t\t\treturn null;\n\t\t}\n\t\tconst topDefault = topChart.default || 0;\n\t\tconst bottomDefault = bottomChart.default || 0;\n\t\tconst topKey = `)) + ("`" + (`${chartKey}${TOP}` + "`")))) + (((`;\n\t\tconst bottomKey = ` + ("`" + `${chartKey}${BOTTOM}`)) + ("`" + (`;\n\t\tconst topColor = '#8884d8';\n\t\tconst bottomColor = '#82ca9d';\n\n\t\treturn (\n\t\t\t<div style={styles.doubleChartWrapper}>\n\t\t\t\t{this.halfHeightChart(\n\t\t\t\t\t{\n\t\t\t\t\t\tsyncId,\n\t\t\t\t\t\tdata:   topChart.data.map(({value}) => ({[topKey]: value || topDefault})),\n\t\t\t\t\t\tmargin: {top: 5, right: 5, bottom: 0, left: 5},\n\t\t\t\t\t},\n\t\t\t\t\ttopChart.tooltip,\n\t\t\t\t\t{dataKey: topKey, stroke: topColor, fill: topColor},\n\t\t\t\t\ttopChart.label,\n\t\t\t\t\t'insideBottomLeft',\n\t\t\t\t)}\n\t\t\t\t{this.halfHeightChart(\n\t\t\t\t\t{\n\t\t\t\t\t\tsyncId,\n\t\t\t\t\t\tdata:   bottomChart.data.map(({value}) => ({[bottomKey]: -value || -bottomDefault})),\n\t\t\t\t\t\tmargin: {top: 0, right: 5, bottom: 5, left: 5},\n\t\t\t\t\t},\n\t\t\t\t\tbottomChart.tooltip,\n\t\t\t\t\t{dataKey: bottomKey, stroke: bottomColor, fill: bottomColor},\n\t\t\t\t\tbottomChart.label,\n\t\t\t\t\t'insideTopLeft',\n\t\t\t\t)}\n\t\t\t</div>\n\t\t);\n\t};\n\n\trender() {\n\t\tconst {general, system} = this.props;\n\n\t\treturn (\n\t\t\t<Grid container className={this.props.classes.footer} direction='row' alignItems='center' style={styles.footer}>\n\t\t\t\t<Grid item xs style={styles.chartRowWrapper}>\n\t\t\t\t\t<ChartRow>\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tCPU,\n\t\t\t\t\t\t\t{data: system.processCPU, tooltip: percentPlotter(cpuLabelTop), label: cpuLabelTop},\n\t\t\t\t\t\t\t{data: system.systemCPU, tooltip: percentPlotter(cpuLabelBottom, multiplier(-1)), label: cpuLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tMEMORY,\n\t\t\t\t\t\t\t{data: system.activeMemory, tooltip: bytePlotter(memoryLabelTop), label: memoryLabelTop},\n\t\t\t\t\t\t\t{data: system.virtualMemory, tooltip: bytePlotter(memoryLabelBottom, multiplier(-1)), label: memoryLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tDISK,\n\t\t\t\t\t\t\t{data: system.diskRead, tooltip: bytePerSecPlotter(diskLabelTop), label: diskLabelTop},\n\t\t\t\t\t\t\t{data: system.diskWrite, tooltip: bytePerSecPlotter(diskLabelBottom, multiplier(-1)), label: diskLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tTRAFFIC,\n\t\t\t\t\t\t\t{data: system.networkIngress, tooltip: bytePerSecPlotter(trafficLabelTop), label: trafficLabelTop},\n\t\t\t\t\t\t\t{data: system.networkEgress, tooltip: bytePerSecPlotter(trafficLabelBottom, multiplier(-1)), label: trafficLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t</ChartRow>\n\t\t\t\t</Grid>\n\t\t\t\t<Grid item>\n\t\t\t\t\t<Typography type='caption' color='inherit'>\n\t\t\t\t\t\t<span style={commonStyles.light}>Geth</span> {general.version}\n\t\t\t\t\t</Typography>\n\t\t\t\t\t{general.commit && (\n\t\t\t\t\t\t<Typography type='caption' color='inherit'>\n\t\t\t\t\t\t\t<span style={commonStyles.light}>{'Commit '}</span>\n\t\t\t\t\t\t\t<a\n\t\t\t\t\t\t\t\thref={` + "`"))) + ((`https://github.com/maticnetwork/bor/commit/${general.commit}` + ("`" + `}\n\t\t\t\t\t\t\t\ttarget='_blank'\n\t\t\t\t\t\t\t\trel='noopener noreferrer'\n\t\t\t\t\t\t\t\tstyle={styles.link}\n\t\t\t\t\t\t\t>\n\t\t\t\t\t\t\t\t{general.commit.substring(0, 8)}\n\t\t\t\t\t\t\t</a>\n\t\t\t\t\t\t</Typography>\n\t\t\t\t\t)}\n\t\t\t\t</Grid>\n\t\t\t</Grid>\n\t\t);\n\t}\n}\n\nexport default withStyles(themeStyles)(Footer);\n",
         "// @flow\n\n// Copyright 2017 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.\n\nimport React, {Component} from 'react';\n\nimport withStyles from '@material-ui/core/styles/withStyles';\nimport AppBar from '@material-ui/core/AppBar';\nimport Toolbar from '@material-ui/core/Toolbar';\nimport IconButton from '@material-ui/core/IconButton';\nimport {FontAwesomeIcon} from '@fortawesome/react-fontawesome';\nimport {faBars} from '@fortawesome/free-solid-svg-icons';\nimport Typography from '@material-ui/core/Typography';\n\n// styles contains the constant styles of the component.\nconst styles = {\n\theader: {\n\t\theight: '8%',\n\t},\n\ttoolbar: {\n\t\theight: '100%',\n\t},\n};\n\n// themeStyles returns the styles generated from the theme for the component.\nconst themeStyles = (theme: Object) => ({\n\theader: {\n\t\tbackgroundColor: theme.palette.grey[900],\n\t\tcolor:           theme.palette.getContrastText(theme.palette.grey[900]),\n\t\tzIndex:          theme.zIndex.appBar,\n\t},\n\ttoolbar: {\n\t\tpaddingLeft:  theme.spacing.unit,\n\t\tpaddingRight: theme.spacing.unit,\n\t},\n\ttitle: {\n\t\tpaddingLeft: theme.spacing.unit,\n\t\tfontSize:    3 * theme.spacing.unit,\n\t},\n});\n\nexport type Props = {\n\tclasses: Object, // injected by withStyles()\n\tswitchSideBar: () => void,\n};\n\n// Header renders the header of the dashboard.\nclass Header extends Component<Props> {\n\trender() {\n\t\tconst {classes} = this.props;\n\n\t\treturn (\n\t\t\t<AppBar position='static' className={classes.header} style={styles.header}>\n\t\t\t\t<Toolbar className={classes.toolbar} style={styles.toolbar}>\n\t\t\t\t\t<IconButton onClick={this.props.switchSideBar}>\n\t\t\t\t\t\t<FontAwesomeIcon icon={faBars} />\n\t\t\t\t\t</IconButton>\n\t\t\t\t\t<Typography type='title' color='inherit' noWrap className={classes.title}>\n\t\t\t\t\t\tGo Ethereum Dashboard\n\t\t\t\t\t</Typography>\n\t\t\t\t</Toolbar>\n\t\t\t</AppBar>\n\t\t);\n\t}\n}\n\nexport default withStyles(themeStyles)(Header);\n",
         "// @flow\n\n// Copyright 2018 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.\n\nimport React, {Component} from 'react';\n\nimport List from '@material-ui/core/List';\nimport ListItem from '@material-ui/core/ListItem';\nimport escapeHtml from 'escape-html';\nimport type {Record, Content, LogsMessage, Logs as LogsType} from '../types/content';\n\n// requestBand says how wide is the top/bottom zone, eg. 0.1 means 10% of the container height.\nconst requestBand = 0.05;\n\n// fieldPadding is a global map with maximum field value lengths seen until now\n// to allow padding log contexts in a bit smarter way.\nconst fieldPadding = new Map();\n\n// createChunk creates an HTML formatted object, which displays the given array similarly to\n// the server side terminal.\nconst createChunk = (records: Array<Record>) => {\n\tlet content = '';\n\trecords.forEach((record) => {\n\t\tconst {t, ctx} = record;\n\t\tlet {lvl, msg} = record;\n\t\tlet color = '#ce3c23';\n\t\tswitch (lvl) {\n\t\tcase 'trace':\n\t\tcase 'trce':\n\t\t\tlvl = 'TRACE';\n\t\t\tcolor = '#3465a4';\n\t\t\tbreak;\n\t\tcase 'debug':\n\t\tcase 'dbug':\n\t\t\tlvl = 'DEBUG';\n\t\t\tcolor = '#3d989b';\n\t\t\tbreak;\n\t\tcase 'info':\n\t\t\tlvl = 'INFO&nbsp;';\n\t\t\tcolor = '#4c8f0f';\n\t\t\tbreak;\n\t\tcase 'warn':\n\t\t\tlvl = 'WARN&nbsp;';\n\t\t\tcolor = '#b79a22';\n\t\t\tbreak;\n\t\tcase 'error':\n\t\tcase 'eror':\n\t\t\tlvl = 'ERROR';\n\t\t\tcolor = '#754b70';\n\t\t\tbreak;\n\t\tcase 'crit':\n\t\t\tlvl = 'CRIT&nbsp;';\n\t\t\tcolor = '#ce3c23';\n\t\t\tbreak;\n\t\tdefault:\n\t\t\tlvl = '';\n\t\t}\n\t\tconst time = new Date(t);\n\t\tif (lvl === '' || !(time instanceof Date) || isNaN(time) || typeof msg !== 'string' || !Array.isArray(ctx)) {\n\t\t\tcontent += '<span style=\"color:#ce3c23\">Invalid log record</span><br />';\n\t\t\treturn;\n\t\t}\n\t\tif (ctx.length > 0) {\n\t\t\tmsg += '&nbsp;'.repeat(Math.max(40 - msg.length, 0));\n\t\t}\n\t\tconst month = `)) + ("`" + (`0${time.getMonth() + 1}` + "`"))))) + ((((`.slice(-2);\n\t\tconst date = ` + ("`" + `0${time.getDate()}`)) + ("`" + (`.slice(-2);\n\t\tconst hours = ` + "`"))) + ((`0${time.getHours()}` + ("`" + `.slice(-2);\n\t\tconst minutes = `)) + ("`" + (`0${time.getMinutes()}` + "`")))) + (((`.slice(-2);\n\t\tconst seconds = ` + ("`" + `0${time.getSeconds()}`)) + ("`" + (`.slice(-2);\n\t\tcontent += ` + "`"))) + ((`<span style=\"color:${color}\">${lvl}</span>[${month}-${date}|${hours}:${minutes}:${seconds}] ${msg}` + ("`" + `;\n\n\t\tfor (let i = 0; i < ctx.length; i += 2) {\n\t\t\tconst key = escapeHtml(ctx[i]);\n\t\t\tconst val = escapeHtml(ctx[i + 1]);\n\t\t\tlet padding = fieldPadding.get(key);\n\t\t\tif (typeof padding !== 'number' || padding < val.length) {\n\t\t\t\tpadding = val.length;\n\t\t\t\tfieldPadding.set(key, padding);\n\t\t\t}\n\t\t\tlet p = '';\n\t\t\tif (i < ctx.length - 2) {\n\t\t\t\tp = '&nbsp;'.repeat(padding - val.length);\n\t\t\t}\n\t\t\tcontent += `)) + (("`" + ` <span style=\"color:${color}\">${key}</span>=${val}${p}`) + ("`" + `;\n\t\t}\n\t\tcontent += '<br />';\n\t});\n\treturn content;\n};\n\n// ADDED, SAME and REMOVED are used to track the change of the log chunk array.\n// The scroll position is set using these values.\nexport const ADDED = 1;\nexport const SAME = 0;\nexport const REMOVED = -1;\n\n// inserter is a state updater function for the main component, which inserts the new log chunk into the chunk array.\n// limit is the maximum length of the chunk array, used in order to prevent the browser from OOM.\nexport const inserter = (limit: number) => (update: LogsMessage, prev: LogsType) => {\n\tprev.topChanged = SAME;\n\tprev.bottomChanged = SAME;\n\tif (!Array.isArray(update.chunk) || update.chunk.length < 1) {\n\t\treturn prev;\n\t}\n\tif (!Array.isArray(prev.chunks)) {\n\t\tprev.chunks = [];\n\t}\n\tconst content = createChunk(update.chunk);\n\tif (!update.source) {\n\t\t// In case of stream chunk.\n\t\tif (!prev.endBottom) {\n\t\t\treturn prev;\n\t\t}\n\t\tif (prev.chunks.length < 1) {\n\t\t\t// This should never happen, because the first chunk is always a non-stream chunk.\n\t\t\treturn [{content, name: '00000000000000.log'}];\n\t\t}\n\t\tprev.chunks[prev.chunks.length - 1].content += content;\n\t\tprev.bottomChanged = ADDED;\n\t\treturn prev;\n\t}\n\tconst chunk = {\n\t\tcontent,\n\t\tname: update.source.name,\n\t};\n\tif (prev.chunks.length > 0 && update.source.name < prev.chunks[0].name) {\n\t\tif (update.source.last) {\n\t\t\tprev.endTop = true;\n\t\t}\n\t\tif (prev.chunks.length >= limit) {\n\t\t\tprev.endBottom = false;\n\t\t\tprev.chunks.splice(limit - 1, prev.chunks.length - limit + 1);\n\t\t\tprev.bottomChanged = REMOVED;\n\t\t}\n\t\tprev.chunks = [chunk, ...prev.chunks];\n\t\tprev.topChanged = ADDED;\n\t\treturn prev;\n\t}\n\tif (update.source.last) {\n\t\tprev.endBottom = true;\n\t}\n\tif (prev.chunks.length >= limit) {\n\t\tprev.endTop = false;\n\t\tprev.chunks.splice(0, prev.chunks.length - limit + 1);\n\t\tprev.topChanged = REMOVED;\n\t}\n\tprev.chunks = [...prev.chunks, chunk];\n\tprev.bottomChanged = ADDED;\n\treturn prev;\n};\n\n// styles contains the constant styles of the component.\nconst styles = {\n\tlogListItem: {\n\t\tpadding:    0,\n\t\tlineHeight: 1.231,\n\t},\n\tlogChunk: {\n\t\tcolor:      'white',\n\t\tfontFamily: 'monospace',\n\t\twhiteSpace: 'nowrap',\n\t\twidth:      0,\n\t},\n\twaitMsg: {\n\t\ttextAlign:  'center',\n\t\tcolor:      'white',\n\t\tfontFamily: 'monospace',\n\t},\n};\n\nexport type Props = {\n\tcontainer:    Object,\n\tcontent:      Content,\n\tshouldUpdate: Object,\n\tsend:         string => void,\n};\n\ntype State = {\n\trequestAllowed: boolean,\n};\n\n// Logs renders the log page.\nclass Logs extends Component<Props, State> {\n\tconstructor(props: Props) {\n\t\tsuper(props);\n\t\tthis.content = React.createRef();\n\t\tthis.state = {\n\t\t\trequestAllowed: true,\n\t\t};\n\t}\n\n\tcomponentDidMount() {\n\t\tconst {container} = this.props;\n\t\tif (typeof container === 'undefined') {\n\t\t\treturn;\n\t\t}\n\t\tcontainer.scrollTop = container.scrollHeight - container.clientHeight;\n\t\tconst {logs} = this.props.content;\n\t\tif (typeof this.content === 'undefined' || logs.chunks.length < 1) {\n\t\t\treturn;\n\t\t}\n\t\tif (this.content.clientHeight < container.clientHeight && !logs.endTop) {\n\t\t\tthis.sendRequest(logs.chunks[0].name, true);\n\t\t}\n\t}\n\n\t// onScroll is triggered by the parent component's scroll event, and sends requests if the scroll position is\n\t// at the top or at the bottom.\n\tonScroll = () => {\n\t\tif (!this.state.requestAllowed || typeof this.content === 'undefined') {\n\t\t\treturn;\n\t\t}\n\t\tconst {logs} = this.props.content;\n\t\tif (logs.chunks.length < 1) {\n\t\t\treturn;\n\t\t}\n\t\tif (this.atTop() && !logs.endTop) {\n\t\t\tthis.sendRequest(logs.chunks[0].name, true);\n\t\t} else if (this.atBottom() && !logs.endBottom) {\n\t\t\tthis.sendRequest(logs.chunks[logs.chunks.length - 1].name, false);\n\t\t}\n\t};\n\n\tsendRequest = (name: string, past: boolean) => {\n\t\tthis.setState({requestAllowed: false});\n\t\tthis.props.send(JSON.stringify({\n\t\t\tLogs: {\n\t\t\t\tName: name,\n\t\t\t\tPast: past,\n\t\t\t},\n\t\t}));\n\t};\n\n\t// atTop checks if the scroll position it at the top of the container.\n\tatTop = () => this.props.container.scrollTop <= this.props.container.scrollHeight * requestBand;\n\n\t// atBottom checks if the scroll position it at the bottom of the container.\n\tatBottom = () => {\n\t\tconst {container} = this.props;\n\t\treturn container.scrollHeight - container.scrollTop\n\t\t\t<= container.clientHeight + container.scrollHeight * requestBand;\n\t};\n\n\t// beforeUpdate is called by the parent component, saves the previous scroll position\n\t// and the height of the first log chunk, which can be deleted during the insertion.\n\tbeforeUpdate = () => {\n\t\tlet firstHeight = 0;\n\t\tconst chunkList = this.content.children[1];\n\t\tif (chunkList && chunkList.children[0]) {\n\t\t\tfirstHeight = chunkList.children[0].clientHeight;\n\t\t}\n\t\treturn {\n\t\t\tscrollTop: this.props.container.scrollTop,\n\t\t\tfirstHeight,\n\t\t};\n\t};\n\n\t// didUpdate is called by the parent component, which provides the container. Sends the first request if the\n\t// visible part of the container isn't full, and resets the scroll position in order to avoid jumping when a\n\t// chunk is inserted or removed.\n\tdidUpdate = (prevProps, prevState, snapshot) => {\n\t\tif (typeof this.props.shouldUpdate.logs === 'undefined' || typeof this.content === 'undefined' || snapshot === null) {\n\t\t\treturn;\n\t\t}\n\t\tconst {logs} = this.props.content;\n\t\tconst {container} = this.props;\n\t\tif (typeof container === 'undefined' || logs.chunks.length < 1) {\n\t\t\treturn;\n\t\t}\n\t\tif (this.content.clientHeight < container.clientHeight) {\n\t\t\t// Only enters here at the beginning, when there aren't enough logs to fill the container\n\t\t\t// and the scroll bar doesn't appear.\n\t\t\tif (!logs.endTop) {\n\t\t\t\tthis.sendRequest(logs.chunks[0].name, true);\n\t\t\t}\n\t\t\treturn;\n\t\t}\n\t\tlet {scrollTop} = snapshot;\n\t\tif (logs.topChanged === ADDED) {\n\t\t\t// It would be safer to use a ref to the list, but ref doesn't work well with HOCs.\n\t\t\tscrollTop += this.content.children[1].children[0].clientHeight;\n\t\t} else if (logs.bottomChanged === ADDED) {\n\t\t\tif (logs.topChanged === REMOVED) {\n\t\t\t\tscrollTop -= snapshot.firstHeight;\n\t\t\t} else if (this.atBottom() && logs.endBottom) {\n\t\t\t\tscrollTop = container.scrollHeight - container.clientHeight;\n\t\t\t}\n\t\t}\n\t\tcontainer.scrollTop = scrollTop;\n\t\tthis.setState({requestAllowed: true});\n\t};\n\n\trender() {\n\t\treturn (\n\t\t\t<div ref={(ref) => { this.content = ref; }}>\n\t\t\t\t<div style={styles.waitMsg}>\n\t\t\t\t\t{this.props.content.logs.endTop ? 'No more logs.' : 'Waiting for server...'}\n\t\t\t\t</div>\n\t\t\t\t<List>\n\t\t\t\t\t{this.props.content.logs.chunks.map((c, index) => (\n\t\t\t\t\t\t<ListItem style={styles.logListItem} key={index}>\n\t\t\t\t\t\t\t<div style={styles.logChunk} dangerouslySetInnerHTML={{__html: c.content}} />\n\t\t\t\t\t\t</ListItem>\n\t\t\t\t\t))}\n\t\t\t\t</List>\n\t\t\t\t{this.props.content.logs.endBottom || <div style={styles.waitMsg}>Waiting for server...</div>}\n\t\t\t</div>\n\t\t);\n\t}\n}\n\nexport default Logs;\n",
         "// @flow\n\n// Copyright 2017 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.\n\nimport React, {Component} from 'react';\n\nimport withStyles from '@material-ui/core/styles/withStyles';\n\nimport Network from 'Network';\nimport Logs from 'Logs';\nimport Footer from 'Footer';\nimport {MENU} from '../common';\nimport type {Content} from '../types/content';\n\n// styles contains the constant styles of the component.\nconst styles = {\n\twrapper: {\n\t\tdisplay:       'flex',\n\t\tflexDirection: 'column',\n\t\twidth:         '100%',\n\t},\n\tcontent: {\n\t\tflex:     1,\n\t\toverflow: 'auto',\n\t},\n};\n\n// themeStyles returns the styles generated from the theme for the component.\nconst themeStyles = theme => ({\n\tcontent: {\n\t\tbackgroundColor: theme.palette.background.default,\n\t\tpadding:         theme.spacing.unit * 3,\n\t},\n});\n\nexport type Props = {\n\tclasses:      Object,\n\tactive:       string,\n\tcontent:      Content,\n\tshouldUpdate: Object,\n\tsend:         string => void,\n};\n\ntype State = {};\n\n// Main renders the chosen content.\nclass Main extends Component<Props, State> {\n\tconstructor(props) {\n\t\tsuper(props);\n\t\tthis.container = React.createRef();\n\t\tthis.content = React.createRef();\n\t}\n\n\tcomponentDidUpdate(prevProps, prevState, snapshot) {\n\t\tif (this.content && typeof this.content.didUpdate === 'function') {\n\t\t\tthis.content.didUpdate(prevProps, prevState, snapshot);\n\t\t}\n\t}\n\n\tonScroll = () => {\n\t\tif (this.content && typeof this.content.onScroll === 'function') {\n\t\t\tthis.content.onScroll();\n\t\t}\n\t};\n\n\tgetSnapshotBeforeUpdate(prevProps: Readonly<P>, prevState: Readonly<S>) {\n\t\tif (this.content && typeof this.content.beforeUpdate === 'function') {\n\t\t\treturn this.content.beforeUpdate();\n\t\t}\n\t\treturn null;\n\t}\n\n\trender() {\n\t\tconst {\n\t\t\tclasses, active, content, shouldUpdate,\n\t\t} = this.props;\n\n\t\tlet children = null;\n\t\tswitch (active) {\n\t\tcase MENU.get('home').id:\n\t\t\tchildren = <div>Work in progress.</div>;\n\t\t\tbreak;\n\t\tcase MENU.get('chain').id:\n\t\t\tchildren = <div>Work in progress.</div>;\n\t\t\tbreak;\n\t\tcase MENU.get('txpool').id:\n\t\t\tchildren = <div>Work in progress.</div>;\n\t\t\tbreak;\n\t\tcase MENU.get('network').id:\n\t\t\tchildren = <Network\n\t\t\t\tcontent={this.props.content.network}\n\t\t\t\tcontainer={this.container}\n\t\t\t/>;\n\t\t\tbreak;\n\t\tcase MENU.get('system').id:\n\t\t\tchildren = <div>Work in progress.</div>;\n\t\t\tbreak;\n\t\tcase MENU.get('logs').id:\n\t\t\tchildren = (\n\t\t\t\t<Logs\n\t\t\t\t\tref={(ref) => { this.content = ref; }}\n\t\t\t\t\tcontainer={this.container}\n\t\t\t\t\tsend={this.props.send}\n\t\t\t\t\tcontent={this.props.content}\n\t\t\t\t\tshouldUpdate={shouldUpdate}\n\t\t\t\t/>\n\t\t\t);\n\t\t}\n\n\t\treturn (\n\t\t\t<div style={styles.wrapper}>\n\t\t\t\t<div\n\t\t\t\t\tclassName={classes.content}\n\t\t\t\t\tstyle={styles.content}\n\t\t\t\t\tref={(ref) => { this.container = ref; }}\n\t\t\t\t\tonScroll={this.onScroll}\n\t\t\t\t>\n\t\t\t\t\t{children}\n\t\t\t\t</div>\n\t\t\t\t<Footer\n\t\t\t\t\tgeneral={content.general}\n\t\t\t\t\tsystem={content.system}\n\t\t\t\t\tshouldUpdate={shouldUpdate}\n\t\t\t\t/>\n\t\t\t</div>\n\t\t);\n\t}\n}\n\nexport default withStyles(themeStyles)(Main);\n",
diff --git a/dashboard/assets/components/Footer.jsx b/dashboard/assets/components/Footer.jsx
index a5cab08aabe48e0ce8ce74df276a5c7144ad8fc8..6eac7bffe9d1664bcf636dfbd7a5f8a608cc12d3 100644
--- a/dashboard/assets/components/Footer.jsx
+++ b/dashboard/assets/components/Footer.jsx
@@ -193,7 +193,7 @@ class Footer extends Component<Props, State> {
 						<Typography type='caption' color='inherit'>
 							<span style={commonStyles.light}>{'Commit '}</span>
 							<a
-								href={`https://github.com/ethereum/go-ethereum/commit/${general.commit}`}
+								href={`https://github.com/maticnetwork/bor/commit/${general.commit}`}
 								target='_blank'
 								rel='noopener noreferrer'
 								style={styles.link}
diff --git a/dashboard/cpu.go b/dashboard/cpu.go
index c89879028d5ef43b64ef0e5ccc92f6cfa54b0ade..a70f1785d476f8e85b9b2426cd62f3d3ee7e0bc6 100644
--- a/dashboard/cpu.go
+++ b/dashboard/cpu.go
@@ -21,7 +21,7 @@ package dashboard
 import (
 	"syscall"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // getProcessCPUTime retrieves the process' CPU time since program startup.
diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go
index d69a750f101e9d149a44e121308bca666fdd1792..42b04e82c8039ac2d151f43036a7f5b7bee27d9d 100644
--- a/dashboard/dashboard.go
+++ b/dashboard/dashboard.go
@@ -35,10 +35,10 @@ import (
 
 	"io"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rpc"
 	"github.com/mohae/deepcopy"
 	"golang.org/x/net/websocket"
 )
diff --git a/dashboard/log.go b/dashboard/log.go
index be7732695c39419bc4182fb7cc766abf53eb101c..8044a6e97c04b82d84670da3be25c9755a453701 100644
--- a/dashboard/log.go
+++ b/dashboard/log.go
@@ -26,7 +26,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 	"github.com/mohae/deepcopy"
 	"github.com/rjeczalik/notify"
 )
diff --git a/dashboard/peers.go b/dashboard/peers.go
index e591bda779826c5d4228f5daf2fc4b6eb0ac1d70..88c5ba4ddfd947bcbf201345efa5cefa07b06097 100644
--- a/dashboard/peers.go
+++ b/dashboard/peers.go
@@ -21,10 +21,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/metrics"
+	"github.com/maticnetwork/bor/metrics"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
 )
 
 const (
diff --git a/dashboard/system.go b/dashboard/system.go
index a880c5a72a72a0faae4168d75acab02f0e121b30..44de587d45b4d6c0ebf9853e8c39ceb2fda188fa 100644
--- a/dashboard/system.go
+++ b/dashboard/system.go
@@ -21,8 +21,8 @@ import (
 	"time"
 
 	"github.com/elastic/gosigar"
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/p2p"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/p2p"
 )
 
 // meterCollector returns a function, which retrieves the count of a specific meter.
diff --git a/eth/api.go b/eth/api.go
index 8afa21a389bad6fe23423d1c497f68e0064d5700..fbadcc6eb3f4c33733ed52d184283be749c8e16f 100644
--- a/eth/api.go
+++ b/eth/api.go
@@ -28,16 +28,16 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/rpc"
+	"github.com/maticnetwork/bor/trie"
 )
 
 // PublicEthereumAPI provides an API to access Ethereum full node-related
diff --git a/eth/api_backend.go b/eth/api_backend.go
index ee5b51cf5ac996abe5262890af673ef546c5b823..dbb57207d6b7a264154e83aac951e00ad679ab10 100644
--- a/eth/api_backend.go
+++ b/eth/api_backend.go
@@ -21,21 +21,21 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/bloombits"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/eth/gasprice"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/bloombits"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/eth/gasprice"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // EthAPIBackend implements ethapi.Backend for full nodes
diff --git a/eth/api_test.go b/eth/api_test.go
index cdd5bb8e34552f34d411cf64518705f0f988bf68..239d998eb5386afa484b36d0f542bd2628877798 100644
--- a/eth/api_test.go
+++ b/eth/api_test.go
@@ -21,9 +21,9 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
 )
 
 var dumper = spew.ConfigState{Indent: "    "}
diff --git a/eth/api_tracer.go b/eth/api_tracer.go
index 2800ff659c774d69efef9f8d6c9490a3318b3dcf..53bb58ddb7117ba96c6e21efd3e3f2d6ecac90b7 100644
--- a/eth/api_tracer.go
+++ b/eth/api_tracer.go
@@ -28,19 +28,19 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/eth/tracers"
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/eth/tracers"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/rpc"
+	"github.com/maticnetwork/bor/trie"
 )
 
 const (
diff --git a/eth/backend.go b/eth/backend.go
index 87fc8b9dd0b2a3c5a6c40d7767e62d0d9ec3231c..ac5b3ba9aa3c9dd72044d8a87ba5822d7b005b2d 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -25,33 +25,33 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/consensus/bor"
-	"github.com/ethereum/go-ethereum/consensus/clique"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/bloombits"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/eth/filters"
-	"github.com/ethereum/go-ethereum/eth/gasprice"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/miner"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/consensus/bor"
+	"github.com/maticnetwork/bor/consensus/clique"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/bloombits"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/eth/filters"
+	"github.com/maticnetwork/bor/eth/gasprice"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/miner"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enr"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 type LesServer interface {
@@ -236,7 +236,7 @@ func makeExtraData(extra []byte) []byte {
 		// create default extradata
 		extra, _ = rlp.EncodeToBytes([]interface{}{
 			uint(params.VersionMajor<<16 | params.VersionMinor<<8 | params.VersionPatch),
-			"geth",
+			"bor",
 			runtime.Version(),
 			runtime.GOOS,
 		})
diff --git a/eth/bloombits.go b/eth/bloombits.go
index 9a31997d6002d4eb9ccc1ee998699d1128213c48..c2f827f31180a58696b0100aa2030a22ea7ecdcc 100644
--- a/eth/bloombits.go
+++ b/eth/bloombits.go
@@ -20,13 +20,13 @@ import (
 	"context"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/bitutil"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/bloombits"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/bitutil"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/bloombits"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
 )
 
 const (
diff --git a/eth/config.go b/eth/config.go
index c296553753d3aca0d3b7b0aa011f9e54df52e942..f201b7cc9dfca8c44126d2c3ad8c82cc31c12c2c 100644
--- a/eth/config.go
+++ b/eth/config.go
@@ -24,13 +24,13 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/eth/gasprice"
-	"github.com/ethereum/go-ethereum/miner"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/eth/gasprice"
+	"github.com/maticnetwork/bor/miner"
+	"github.com/maticnetwork/bor/params"
 )
 
 // DefaultConfig contains default settings for use on the Ethereum main net.
diff --git a/eth/downloader/api.go b/eth/downloader/api.go
index 57ff3d71afa886bb573a5809583423a2ce3b8934..653a41038e0c3996a410cafe5b40731d73c9cd8f 100644
--- a/eth/downloader/api.go
+++ b/eth/downloader/api.go
@@ -20,9 +20,9 @@ import (
 	"context"
 	"sync"
 
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/rpc"
+	ethereum "github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // PublicDownloaderAPI provides an API which gives information about the current synchronisation status.
diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go
index 874e6e07f6287289624f8ce19ea34481d81b028f..924aafd1f82ab1bba6a3e0ca85c69bd388d47d92 100644
--- a/eth/downloader/downloader.go
+++ b/eth/downloader/downloader.go
@@ -25,16 +25,16 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/trie"
 )
 
 var (
diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go
index e1f0e03fcdf2d26fe16936d03017b5345e3c7e1b..789331d62df32238a6ca68f62139cf18a149148e 100644
--- a/eth/downloader/downloader_test.go
+++ b/eth/downloader/downloader_test.go
@@ -26,13 +26,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/trie"
 )
 
 // Reduce some of the parameters to make the tester faster.
diff --git a/eth/downloader/events.go b/eth/downloader/events.go
index 25255a3a72e5fc930dcefd34051c3d6039a7cfb4..71419294bf8618b8cca74e25c0df7e79237bffe3 100644
--- a/eth/downloader/events.go
+++ b/eth/downloader/events.go
@@ -16,7 +16,7 @@
 
 package downloader
 
-import "github.com/ethereum/go-ethereum/core/types"
+import "github.com/maticnetwork/bor/core/types"
 
 type DoneEvent struct {
 	Latest *types.Header
diff --git a/eth/downloader/fakepeer.go b/eth/downloader/fakepeer.go
index 3ec90bc9ef08dc39d38c32b68f2a5fd5f64d9666..df22d7cd5efdd6e63fb7bd11629fe5ac09310661 100644
--- a/eth/downloader/fakepeer.go
+++ b/eth/downloader/fakepeer.go
@@ -19,11 +19,11 @@ package downloader
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
 )
 
 // FakePeer is a mock downloader peer that operates on a local database instance
diff --git a/eth/downloader/metrics.go b/eth/downloader/metrics.go
index d4eb33794628467716f60073da21932abf069c67..0800acb6c6b0abbd4d0770e7fd82082827e20f47 100644
--- a/eth/downloader/metrics.go
+++ b/eth/downloader/metrics.go
@@ -19,7 +19,7 @@
 package downloader
 
 import (
-	"github.com/ethereum/go-ethereum/metrics"
+	"github.com/maticnetwork/bor/metrics"
 )
 
 var (
diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go
index 60f86d0e14cf0faa90280d2463e08f878c1a91ca..c1af66bbb58206c9654c009d2edd49e7cce8cd45 100644
--- a/eth/downloader/peer.go
+++ b/eth/downloader/peer.go
@@ -29,9 +29,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
 )
 
 const (
diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go
index 7c339538110aed67b173545340805a15745caae5..fe882c2759d358324ea223b1ff2305dd4cd1f7af 100644
--- a/eth/downloader/queue.go
+++ b/eth/downloader/queue.go
@@ -25,11 +25,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/prque"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/prque"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
 )
 
 var (
diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go
index b422557d58c896da3d8668bedd9df13ac830a5d1..139098cc61abb290513fea6a8f21fe2d75009d38 100644
--- a/eth/downloader/statesync.go
+++ b/eth/downloader/statesync.go
@@ -22,12 +22,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/trie"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/eth/downloader/testchain_test.go b/eth/downloader/testchain_test.go
index f410152f5b001eba5378054e78835714777b0f30..aebfc157744e8456387e6207d321e74cd09a9dc2 100644
--- a/eth/downloader/testchain_test.go
+++ b/eth/downloader/testchain_test.go
@@ -21,13 +21,13 @@ import (
 	"math/big"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/params"
 )
 
 // Test chain parameters.
diff --git a/eth/downloader/types.go b/eth/downloader/types.go
index ff70bfa0e3cc40e742dc128f93bf514f63d444d7..dc9777041a2aed8905a114a3a1b79f6d352bb2b2 100644
--- a/eth/downloader/types.go
+++ b/eth/downloader/types.go
@@ -19,7 +19,7 @@ package downloader
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // peerDropFn is a callback type for dropping a peer detected as malicious.
diff --git a/eth/enr_entry.go b/eth/enr_entry.go
index d9e7b95784a28acaaacb1d14f7a771910ba488e8..635ec79eaf826392956a336e8e9613b89a76aea9 100644
--- a/eth/enr_entry.go
+++ b/eth/enr_entry.go
@@ -17,10 +17,10 @@
 package eth
 
 import (
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/forkid"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/forkid"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // ethEntry is the "eth" ENR entry which advertises eth protocol
diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go
index 28c532d9bdad3a5438d0b08659edbeb886ce0141..f340508a09c0360d1361bb37327ff0803d2386fd 100644
--- a/eth/fetcher/fetcher.go
+++ b/eth/fetcher/fetcher.go
@@ -22,11 +22,11 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/prque"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/prque"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/log"
 )
 
 const (
diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go
index 83172c5348f46af4656f0aa7945d94b20bf0a3fd..ff3295a5cd3c662934670c0a7e106fb98c704026 100644
--- a/eth/fetcher/fetcher_test.go
+++ b/eth/fetcher/fetcher_test.go
@@ -24,13 +24,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/params"
 )
 
 var (
diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go
index d68d12f000f71a44b724657f28b4efb69b828815..f9180cbc292810d847da50aceb8fc7b36a8490e4 100644
--- a/eth/fetcher/metrics.go
+++ b/eth/fetcher/metrics.go
@@ -19,7 +19,7 @@
 package fetcher
 
 import (
-	"github.com/ethereum/go-ethereum/metrics"
+	"github.com/maticnetwork/bor/metrics"
 )
 
 var (
diff --git a/eth/filters/api.go b/eth/filters/api.go
index 5ed80a887563fe2ddd1dd4cb8e4a2af354baad38..addbece2aa5152b4fb5dfeead0948a8a4d8b0f05 100644
--- a/eth/filters/api.go
+++ b/eth/filters/api.go
@@ -25,13 +25,13 @@ import (
 	"sync"
 	"time"
 
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/rpc"
+	ethereum "github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 var (
diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go
index 02229a7549a780293addcf771be66680cc594855..da7e369ff86e72e758aa812c455b0c99364bc714 100644
--- a/eth/filters/api_test.go
+++ b/eth/filters/api_test.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 func TestUnmarshalJSONNewFilterArgs(t *testing.T) {
diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go
index 434e6a44c9f4ffdf08fc498fd60feaf3e39de395..3804c354b1b7cb340705841805e906cc269b93b3 100644
--- a/eth/filters/bench_test.go
+++ b/eth/filters/bench_test.go
@@ -22,14 +22,14 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/bitutil"
-	"github.com/ethereum/go-ethereum/core/bloombits"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/node"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/bitutil"
+	"github.com/maticnetwork/bor/core/bloombits"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/node"
 )
 
 func BenchmarkBloomBits512(b *testing.B) {
diff --git a/eth/filters/filter.go b/eth/filters/filter.go
index 071613ad7a158d739bea4282a6d153ad77cde804..a32a902bd0a5ce3063328382c91fa5ff83c98735 100644
--- a/eth/filters/filter.go
+++ b/eth/filters/filter.go
@@ -21,13 +21,13 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/bloombits"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/bloombits"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 type Backend interface {
diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go
index 70139c1a96ece84df6b75282179ce0e1d6ed7b72..fd947eb0dce1546f53cc7c34212e7610a953d096 100644
--- a/eth/filters/filter_system.go
+++ b/eth/filters/filter_system.go
@@ -25,14 +25,14 @@ import (
 	"sync"
 	"time"
 
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rpc"
+	ethereum "github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // Type determines the kind of filter and is used to put the filter in to
diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go
index 93cb43123f70cb82bfeffbcecdabbb1323074bb9..c8a03892ff8ec521406dd7347012699b758ef29d 100644
--- a/eth/filters/filter_system_test.go
+++ b/eth/filters/filter_system_test.go
@@ -25,17 +25,17 @@ import (
 	"testing"
 	"time"
 
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/bloombits"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rpc"
+	ethereum "github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/bloombits"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 type testBackend struct {
diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go
index eafa19cdfa22797d1581469808a0c39525a15709..ba4637ab8bdfa1e15396d5c1731ba0fcff050c81 100644
--- a/eth/filters/filter_test.go
+++ b/eth/filters/filter_test.go
@@ -23,14 +23,14 @@ import (
 	"os"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/params"
 )
 
 func makeReceipt(addr common.Address) *types.Receipt {
diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go
index 3b8db78a1cc7648a585ae44497b2c9b3786a9e25..bed98fc4c51376dac6922bd465b731e425e21e19 100644
--- a/eth/gasprice/gasprice.go
+++ b/eth/gasprice/gasprice.go
@@ -22,11 +22,11 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 var maxPrice = big.NewInt(500 * params.GWei)
diff --git a/eth/gen_config.go b/eth/gen_config.go
index a7794ffabb34dbd3be34479c6f7c3868eb5325ac..fc50c9bcba9955741e0853675e3fc6bb44ac6e74 100644
--- a/eth/gen_config.go
+++ b/eth/gen_config.go
@@ -6,13 +6,13 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/eth/gasprice"
-	"github.com/ethereum/go-ethereum/miner"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/eth/gasprice"
+	"github.com/maticnetwork/bor/miner"
+	"github.com/maticnetwork/bor/params"
 )
 
 // MarshalTOML marshals as TOML.
diff --git a/eth/handler.go b/eth/handler.go
index 4ce2d1c82f94155acbd7b209089d13ae43d9872c..7f1ebea9ad8b983b9e34e108665d9add8a5c8346 100644
--- a/eth/handler.go
+++ b/eth/handler.go
@@ -26,20 +26,20 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/eth/fetcher"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/eth/fetcher"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/trie"
 )
 
 const (
diff --git a/eth/handler_test.go b/eth/handler_test.go
index 0f1672fd449894cd24cc09720899da4de1f31531..863308cee9ff1694f35989b4bb4dea622a09cc10 100644
--- a/eth/handler_test.go
+++ b/eth/handler_test.go
@@ -24,18 +24,18 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/params"
 )
 
 // Tests that block headers can be retrieved from a remote chain based on user queries.
diff --git a/eth/helper_test.go b/eth/helper_test.go
index 1482e99c4e10763cc42b669ac788490ff33022e5..3aa067416d2df657de3102ecc22c39e4c0f014ae 100644
--- a/eth/helper_test.go
+++ b/eth/helper_test.go
@@ -27,19 +27,19 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/params"
 )
 
 var (
diff --git a/eth/metrics.go b/eth/metrics.go
index 0533a2a8757c5a5e4015b7344e1b25e0cb2606dd..960a19e3bfa84b390d22ea20b98c8974a115cc5b 100644
--- a/eth/metrics.go
+++ b/eth/metrics.go
@@ -17,8 +17,8 @@
 package eth
 
 import (
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/p2p"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/p2p"
 )
 
 var (
diff --git a/eth/peer.go b/eth/peer.go
index 814c787b8c2bd93fe43808aaf971d8d59e0bf95f..c437cd9d8386a1d958c06da80dffb4d8c19489c4 100644
--- a/eth/peer.go
+++ b/eth/peer.go
@@ -24,10 +24,10 @@ import (
 	"time"
 
 	mapset "github.com/deckarep/golang-set"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 var (
diff --git a/eth/protocol.go b/eth/protocol.go
index de0c979d89b80561d011c77fa4fb1f9fe078ccd5..484f64ebb243fde8609c90d24db11bfd263b612b 100644
--- a/eth/protocol.go
+++ b/eth/protocol.go
@@ -21,11 +21,11 @@ import (
 	"io"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // Constants to match up protocol versions and messages
diff --git a/eth/protocol_test.go b/eth/protocol_test.go
index e817d673a6f0a1c788f8ac212f6b2552d6f6c8f7..4f5d9b1d982434cad3cf8cb20f47792bffa119d9 100644
--- a/eth/protocol_test.go
+++ b/eth/protocol_test.go
@@ -22,12 +22,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 func init() {
diff --git a/eth/sync.go b/eth/sync.go
index 9e180ee200f706e275109371b4b57ffeaef1d49f..40be7a4d9f419e57283386d9a1ea8019224acd61 100644
--- a/eth/sync.go
+++ b/eth/sync.go
@@ -21,11 +21,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/enode"
 )
 
 const (
diff --git a/eth/sync_test.go b/eth/sync_test.go
index e4c99ff5873f80b175ad7ac8315b8a256902e78b..d35ef0f4cf1e950218df18a9e5f747f8c58b8628 100644
--- a/eth/sync_test.go
+++ b/eth/sync_test.go
@@ -21,9 +21,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
 )
 
 // Tests that fast sync gets disabled as soon as a real block is successfully
diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go
index 9d6701868c7243c7c1a2bc20eba3b0b2a5f582ae..f730540cb57fbe71cc45f31f5f9a666266e2274b 100644
--- a/eth/tracers/tracer.go
+++ b/eth/tracers/tracer.go
@@ -25,11 +25,11 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
 	duktape "gopkg.in/olebedev/go-duktape.v3"
 )
 
diff --git a/eth/tracers/tracer_test.go b/eth/tracers/tracer_test.go
index a45a121159d867201051d45d543578d6f5f49ac9..7babf568a688be80cd4103898f969ce7403fab4e 100644
--- a/eth/tracers/tracer_test.go
+++ b/eth/tracers/tracer_test.go
@@ -24,10 +24,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/params"
 )
 
 type account struct{}
diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go
index 4e1ef23ad2f81c870057a764f03c668eb4b1e192..4195f06ef68d8d32161a8c3dc3f43140ebba6f2b 100644
--- a/eth/tracers/tracers.go
+++ b/eth/tracers/tracers.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/ethereum/go-ethereum/eth/tracers/internal/tracers"
+	"github.com/maticnetwork/bor/eth/tracers/internal/tracers"
 )
 
 // all contains all the built in JavaScript tracers by name.
diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go
index 69eb80a5c53a02376ec9a059d03fd72803905b99..fa53f60746d74c270c3e4692d967069ba886d540 100644
--- a/eth/tracers/tracers_test.go
+++ b/eth/tracers/tracers_test.go
@@ -27,17 +27,17 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/tests"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/tests"
 )
 
 // To generate a new callTracer test, copy paste the makeTest method below into
diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go
index 0a6f73ab5165d326a36d68fc5fc0d54e00bfa816..ad8acaafa2d64709282c9fb1f4c0da71df9b6361 100644
--- a/ethclient/ethclient.go
+++ b/ethclient/ethclient.go
@@ -24,12 +24,12 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // Client defines typed wrappers for the Ethereum RPC API.
diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go
index 3576d4870e66cbe83a04f6e2fe9fbed70a74717c..c9364e2d8c43321fe1fa645a29a34afbfde20f2e 100644
--- a/ethclient/ethclient_test.go
+++ b/ethclient/ethclient_test.go
@@ -25,16 +25,16 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/params"
 )
 
 // Verify that Client implements the ethereum interfaces.
diff --git a/ethclient/signer.go b/ethclient/signer.go
index 74a93f1e2fd64632552d3b739fa48b643ff3e884..556e8732a89505e1ed7831badf0386b2835212d1 100644
--- a/ethclient/signer.go
+++ b/ethclient/signer.go
@@ -20,8 +20,8 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // senderFromServer is a types.Signer that remembers the sender address returned by the RPC
diff --git a/ethdb/leveldb/leveldb.go b/ethdb/leveldb/leveldb.go
index 3781a6da183e44db8be92bfc7119d6ada8f66efc..ef1ca1342f2743328a4b82f55fa7e30199f41acb 100644
--- a/ethdb/leveldb/leveldb.go
+++ b/ethdb/leveldb/leveldb.go
@@ -26,10 +26,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/errors"
 	"github.com/syndtr/goleveldb/leveldb/filter"
diff --git a/ethdb/memorydb/memorydb.go b/ethdb/memorydb/memorydb.go
index caa9b02a137c2c66da45b89d534d05ee6becb679..73af73470fe050627c852bba9d4b097d5edd2b0e 100644
--- a/ethdb/memorydb/memorydb.go
+++ b/ethdb/memorydb/memorydb.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/ethdb"
 )
 
 var (
diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go
index caf232097a7f2e1aa9674d63d48fca04392f4375..1bd8382c0d0dfe608b97d886d79d874dec1cfa63 100644
--- a/ethstats/ethstats.go
+++ b/ethstats/ethstats.go
@@ -30,17 +30,17 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/les"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/les"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/rpc"
 	"golang.org/x/net/websocket"
 )
 
diff --git a/event/example_feed_test.go b/event/example_feed_test.go
index 9b5ad50df546355c216872ee076116c3da88290b..636e218f525f9a5b1d1bf1d7358e7b1ffb2e52c4 100644
--- a/event/example_feed_test.go
+++ b/event/example_feed_test.go
@@ -19,7 +19,7 @@ package event_test
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/event"
+	"github.com/maticnetwork/bor/event"
 )
 
 func ExampleFeed_acknowledgedEvents() {
diff --git a/event/example_scope_test.go b/event/example_scope_test.go
index 825a8deeacba78ac16b8259577a5ddc9654c8f0b..1629095b03b43ead9d12e6188a339cda4a088c60 100644
--- a/event/example_scope_test.go
+++ b/event/example_scope_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/event"
+	"github.com/maticnetwork/bor/event"
 )
 
 // This example demonstrates how SubscriptionScope can be used to control the lifetime of
diff --git a/event/example_subscription_test.go b/event/example_subscription_test.go
index 5c76b55d98e8a193d27ff1b758a345b88be09d8a..ceabc2685b0be6abd606ac15a78d9c2efb78290a 100644
--- a/event/example_subscription_test.go
+++ b/event/example_subscription_test.go
@@ -19,7 +19,7 @@ package event_test
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/event"
+	"github.com/maticnetwork/bor/event"
 )
 
 func ExampleNewSubscription() {
diff --git a/event/subscription.go b/event/subscription.go
index d03f465075bf77d450193b5fe38d635fbe455801..d14f07b37e99612fb4acfcf2233a7bce1d78ad9e 100644
--- a/event/subscription.go
+++ b/event/subscription.go
@@ -21,7 +21,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
+	"github.com/maticnetwork/bor/common/mclock"
 )
 
 // Subscription represents a stream of events. The carrier of the events is typically a
diff --git a/graphql/graphql.go b/graphql/graphql.go
index 3f6bcab992e50d642859ac2300a78d28c2c8498e..e3eb7df33e083654e1edbeed632772eadfee766f 100644
--- a/graphql/graphql.go
+++ b/graphql/graphql.go
@@ -22,17 +22,17 @@ import (
 	"errors"
 	"time"
 
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/eth/filters"
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/eth/filters"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 var OnlyOnMainChainError = errors.New("This operation is only available for blocks on the canonical chain.")
diff --git a/graphql/service.go b/graphql/service.go
index f64075680634860d9f7075b39c7c5df38e6cde34..473e01b250aacd39715a0f96093252d4dedf10d2 100644
--- a/graphql/service.go
+++ b/graphql/service.go
@@ -21,10 +21,10 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/rpc"
 	"github.com/graph-gophers/graphql-go"
 	"github.com/graph-gophers/graphql-go/relay"
 )
diff --git a/interfaces.go b/interfaces.go
index 1ff31f96b6a6c2a8a4084e3628f06863503096e8..3aaed80b88075ef69062f1c441b6ba012b580019 100644
--- a/interfaces.go
+++ b/interfaces.go
@@ -22,8 +22,8 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // NotFound is returned by API methods if the requested item does not exist.
diff --git a/internal/debug/api.go b/internal/debug/api.go
index 86a4218f6a57fefce223e5f380c325acead4db99..b078d76a3cfd1fac5cb30dbca79547bfce2e0186 100644
--- a/internal/debug/api.go
+++ b/internal/debug/api.go
@@ -34,7 +34,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // Handler is the global debugging handler.
diff --git a/internal/debug/flags.go b/internal/debug/flags.go
index 46c8fe9f80dea4aa6efb69b6379a4ef6f3a77e2b..8bd64b9bb939dbd1ef1033df4915e680ea12652c 100644
--- a/internal/debug/flags.go
+++ b/internal/debug/flags.go
@@ -24,9 +24,9 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/metrics/exp"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/metrics/exp"
 	"github.com/fjl/memsize/memsizeui"
 	colorable "github.com/mattn/go-colorable"
 	"github.com/mattn/go-isatty"
diff --git a/internal/debug/trace.go b/internal/debug/trace.go
index cab5deaafd6cd32b8963c41ed7f18218eadaca8f..697a80f714d3fb1029dec40ea02d4161ebb8c482 100644
--- a/internal/debug/trace.go
+++ b/internal/debug/trace.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"runtime/trace"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // StartGoTrace turns on tracing, writing to the given file.
diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go
index 61ddff688cccf48bce3b2f5c7f51f1557d1a2117..08f2d86173462f8ec2021c27241f13084fc25f2d 100644
--- a/internal/ethapi/addrlock.go
+++ b/internal/ethapi/addrlock.go
@@ -19,7 +19,7 @@ package ethapi
 import (
 	"sync"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 type AddrLocker struct {
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index 338223fd5d0a81f8a98a1148f446aca12503b18e..2a939ed2c463f6d81a3d249a6d45afffd50d95a9 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -26,24 +26,24 @@ import (
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/accounts/scwallet"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/consensus/clique"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/accounts/scwallet"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/consensus/clique"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/rpc"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/tyler-smith/go-bip39"
 )
@@ -425,7 +425,7 @@ func (s *PrivateAccountAPI) SignTransaction(ctx context.Context, args SendTxArgs
 //
 // The key used to calculate the signature is decrypted with the given password.
 //
-// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_sign
+// https://github.com/maticnetwork/bor/wiki/Management-APIs#personal_sign
 func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr common.Address, passwd string) (hexutil.Bytes, error) {
 	// Look up the wallet containing the requested signer
 	account := accounts.Account{Address: addr}
@@ -453,7 +453,7 @@ func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr c
 // Note, the signature must conform to the secp256k1 curve R, S and V values, where
 // the V value must be 27 or 28 for legacy reasons.
 //
-// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_ecRecover
+// https://github.com/maticnetwork/bor/wiki/Management-APIs#personal_ecRecover
 func (s *PrivateAccountAPI) EcRecover(ctx context.Context, data, sig hexutil.Bytes) (common.Address, error) {
 	if len(sig) != 65 {
 		return common.Address{}, fmt.Errorf("signature must be 65 bytes long")
diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go
index 28ec698972cf0134b470c01b3f82d72041957ace..986912b163862c84e6ecae18a0e85011d3ecf118 100644
--- a/internal/ethapi/backend.go
+++ b/internal/ethapi/backend.go
@@ -21,18 +21,18 @@ import (
 	"context"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/bloombits"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/bloombits"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // Backend interface provides the common API services (that are provided by
diff --git a/internal/guide/guide_test.go b/internal/guide/guide_test.go
index 9c7ad16d182dead5f4c6e5643d40061ed045398a..fa71061ec121c9cf44c4dc9225f82a02ec010cc6 100644
--- a/internal/guide/guide_test.go
+++ b/internal/guide/guide_test.go
@@ -30,8 +30,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // Tests that the account management snippets work correctly.
diff --git a/internal/jsre/deps/web3.js b/internal/jsre/deps/web3.js
index df920bb1d389b4d0daa3cbc184593e3f16b47784..4c297928f676ad047400950d71a769e912923ab1 100644
--- a/internal/jsre/deps/web3.js
+++ b/internal/jsre/deps/web3.js
@@ -5862,7 +5862,7 @@ module.exports = Shh;
  * @author Alex Beregszaszi <alex@rtfs.hu>
  * @date 2016
  *
- * Reference: https://github.com/ethereum/go-ethereum/blob/swarm/internal/web3ext/web3ext.go#L33
+ * Reference: https://github.com/maticnetwork/bor/blob/swarm/internal/web3ext/web3ext.go#L33
  */
 
 "use strict";
diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go
index 1b3528a03617bb1889a2ce0bcb840d37662ed663..29069436ec34f076e3b0a94a4d932dbc0022599f 100644
--- a/internal/jsre/jsre.go
+++ b/internal/jsre/jsre.go
@@ -26,8 +26,8 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/internal/jsre/deps"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/internal/jsre/deps"
 	"github.com/robertkrimen/otto"
 )
 
diff --git a/internal/testlog/testlog.go b/internal/testlog/testlog.go
index ffe0546fe0c77139ac6b08af2279d030376511e5..63e4bbbd9787c9bd0d8a7021bf51802f541f6038 100644
--- a/internal/testlog/testlog.go
+++ b/internal/testlog/testlog.go
@@ -20,7 +20,7 @@ package testlog
 import (
 	"testing"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // Logger returns a logger which logs to the unit test log of t.
diff --git a/les/api.go b/les/api.go
index 95e1b009e5d9de4371c787f03a4ecf39715b710c..135b03b16bea522cbd5ed8686545e3f6e152ea6a 100644
--- a/les/api.go
+++ b/les/api.go
@@ -19,7 +19,7 @@ package les
 import (
 	"errors"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 var (
diff --git a/les/api_backend.go b/les/api_backend.go
index 6de15e7bd2fd5b954e959a9d2c10125a33f779b1..8333fdd8c37fca8669cda92723a0921fd9b4cbea 100644
--- a/les/api_backend.go
+++ b/les/api_backend.go
@@ -21,22 +21,22 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/bloombits"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/eth/gasprice"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/light"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/bloombits"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/eth/gasprice"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/light"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 type LesApiBackend struct {
diff --git a/les/api_test.go b/les/api_test.go
index cec9459625192013a50e9d4d5c272fc4d9a4399e..e99753cc37a38ced43a3bdc094cb21f41a1820d4 100644
--- a/les/api_test.go
+++ b/les/api_test.go
@@ -29,18 +29,18 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/les/flowcontrol"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/simulations"
-	"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/les/flowcontrol"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/simulations"
+	"github.com/maticnetwork/bor/p2p/simulations/adapters"
+	"github.com/maticnetwork/bor/rpc"
 	colorable "github.com/mattn/go-colorable"
 )
 
diff --git a/les/backend.go b/les/backend.go
index bd7c73c98fc9f3cca6d281dacda9b4d255734f04..4481bd676ebfb18f3ff545dc619a1ca7deeed7e6 100644
--- a/les/backend.go
+++ b/les/backend.go
@@ -22,29 +22,29 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/bloombits"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/eth/filters"
-	"github.com/ethereum/go-ethereum/eth/gasprice"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/light"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/discv5"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/bloombits"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/eth/filters"
+	"github.com/maticnetwork/bor/eth/gasprice"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/light"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/discv5"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 type LightEthereum struct {
diff --git a/les/benchmark.go b/les/benchmark.go
index 925d1d89e8d3a3dc740ab08d392d0c2dd40ccb5c..8a1feb2235a08bcd635eb512a20ab64e2a6edf9b 100644
--- a/les/benchmark.go
+++ b/les/benchmark.go
@@ -23,17 +23,17 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/les/flowcontrol"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/les/flowcontrol"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // requestBenchmark is an interface for different randomized request generators
diff --git a/les/bloombits.go b/les/bloombits.go
index aea0fcd5f4800bc70bb28f48ca49575b71d6948c..35f29c0f47878fa64e59e74400afdd3b3ddbfed3 100644
--- a/les/bloombits.go
+++ b/les/bloombits.go
@@ -19,8 +19,8 @@ package les
 import (
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/bitutil"
-	"github.com/ethereum/go-ethereum/light"
+	"github.com/maticnetwork/bor/common/bitutil"
+	"github.com/maticnetwork/bor/light"
 )
 
 const (
diff --git a/les/checkpointoracle.go b/les/checkpointoracle.go
index 4695fbc16cedbd7cdc5c43a7550a1b4dbd8fc740..5f03e0c9a73931a42b371bb90d752669ec5e6859 100644
--- a/les/checkpointoracle.go
+++ b/les/checkpointoracle.go
@@ -20,12 +20,12 @@ import (
 	"encoding/binary"
 	"sync/atomic"
 
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/contracts/checkpointoracle"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/contracts/checkpointoracle"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
 )
 
 // checkpointOracle is responsible for offering the latest stable checkpoint
diff --git a/les/commons.go b/les/commons.go
index 7eaf39c843a028ad43bb13e46fa0347b6b30aabe..6cbcc162599268999df3b9711f77e392cf1600b2 100644
--- a/les/commons.go
+++ b/les/commons.go
@@ -20,14 +20,14 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/light"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/light"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/params"
 )
 
 // lesCommons contains fields needed by both server and client.
diff --git a/les/costtracker.go b/les/costtracker.go
index 61b076d15040bdf142960e614ebf446c94923c2d..e401ac0d69ddba48ed2ba35f1002c85279395f14 100644
--- a/les/costtracker.go
+++ b/les/costtracker.go
@@ -23,11 +23,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/les/flowcontrol"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/les/flowcontrol"
+	"github.com/maticnetwork/bor/log"
 )
 
 const makeCostStats = false // make request cost statistics during operation
diff --git a/les/distributor.go b/les/distributor.go
index 9235adc03fd0b5f87a92288379f5d4b19cbc2324..c965e2c4af5695504ddaac644b8a4dd471b4e5b7 100644
--- a/les/distributor.go
+++ b/les/distributor.go
@@ -21,7 +21,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
+	"github.com/maticnetwork/bor/common/mclock"
 )
 
 // requestDistributor implements a mechanism that distributes requests to
diff --git a/les/distributor_test.go b/les/distributor_test.go
index d2247212cd85ac7ddcdb64679516557cc7fe4cc4..19abbb9623a3e2132082e99a7aaff7ec051a72f1 100644
--- a/les/distributor_test.go
+++ b/les/distributor_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
+	"github.com/maticnetwork/bor/common/mclock"
 )
 
 type testDistReq struct {
diff --git a/les/fetcher.go b/les/fetcher.go
index 76e4f076a744125be8713b7af9d016c3d574e058..b520476eaeab459bdcab8d4d051d5f585594f140 100644
--- a/les/fetcher.go
+++ b/les/fetcher.go
@@ -21,13 +21,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/light"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/light"
+	"github.com/maticnetwork/bor/log"
 )
 
 const (
diff --git a/les/fetcher_test.go b/les/fetcher_test.go
index 2ac72ddf788d5bdbc3b268911d76cddef864d9d4..daf0192952eb248cc87ef089abcc3e0ec032c425 100644
--- a/les/fetcher_test.go
+++ b/les/fetcher_test.go
@@ -6,11 +6,11 @@ import (
 
 	"net"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
 )
 
 func TestFetcherULCPeerSelector(t *testing.T) {
diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go
index 490013677c638aa4f625dda62518774228509565..8767c45ae950dd636e7d6279f77039c4746bc72f 100644
--- a/les/flowcontrol/control.go
+++ b/les/flowcontrol/control.go
@@ -22,8 +22,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/log"
 )
 
 const (
diff --git a/les/flowcontrol/logger.go b/les/flowcontrol/logger.go
index fcd1285a59949d8d6d2d2bde42893a5df86fb64b..7f5f236c5ab79a552445d68595dcfda3df6f9e77 100644
--- a/les/flowcontrol/logger.go
+++ b/les/flowcontrol/logger.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
+	"github.com/maticnetwork/bor/common/mclock"
 )
 
 // logger collects events in string format and discards events older than the
diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go
index 68f1a47c9736810bbeb44d5448edd74b6215bad3..ee57c47039d37fb2edf4f7b6c56f3ccb5c0c689e 100644
--- a/les/flowcontrol/manager.go
+++ b/les/flowcontrol/manager.go
@@ -22,8 +22,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/common/prque"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/common/prque"
 )
 
 // cmNodeFields are ClientNode fields used by the client manager
diff --git a/les/flowcontrol/manager_test.go b/les/flowcontrol/manager_test.go
index b32ec559900c83341c0667ece2018aaccb5da3b9..3baf71af0571dc38f6fd033727bbb97cb55ab070 100644
--- a/les/flowcontrol/manager_test.go
+++ b/les/flowcontrol/manager_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
+	"github.com/maticnetwork/bor/common/mclock"
 )
 
 type testNode struct {
diff --git a/les/freeclient.go b/les/freeclient.go
index 934b8815374dbeefc6c90878202a0056825dd6eb..5933fee75386f0852ea148c80681a3c6ce5af79e 100644
--- a/les/freeclient.go
+++ b/les/freeclient.go
@@ -23,11 +23,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/common/prque"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/common/prque"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // freeClientPool implements a client database that limits the connection time
diff --git a/les/freeclient_test.go b/les/freeclient_test.go
index 1918222641ac93782715bc792119d38f26af24c0..e398939a37bdf8bc3dbca1d7e41865345aea21a5 100644
--- a/les/freeclient_test.go
+++ b/les/freeclient_test.go
@@ -23,8 +23,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/core/rawdb"
 )
 
 func TestFreeClientPoolL10C100(t *testing.T) {
diff --git a/les/handler.go b/les/handler.go
index 743776bd040621abc92fa4d9d878ba46abcbeba5..12081fe1fd57bf795ec4bd196b7026e0bde957da 100644
--- a/les/handler.go
+++ b/les/handler.go
@@ -26,21 +26,21 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/light"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/discv5"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/light"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/discv5"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/trie"
 )
 
 var errTooManyInvalidRequest = errors.New("too many invalid requests made")
diff --git a/les/handler_test.go b/les/handler_test.go
index 4e16a897915e2ba8df0126efa069bfc40bc8ac43..690002d7ffdac1e159241b38c7e0ec2a788c6415 100644
--- a/les/handler_test.go
+++ b/les/handler_test.go
@@ -23,19 +23,19 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/light"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/light"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/trie"
 )
 
 func expectResponse(r p2p.MsgReader, msgcode, reqID, bv uint64, data interface{}) error {
diff --git a/les/helper_test.go b/les/helper_test.go
index 4b9f270cc7acfecbca620c64b7a1f8e5752442c7..1fce570d19a3debe2bab8c3e720c2a1664f40220 100644
--- a/les/helper_test.go
+++ b/les/helper_test.go
@@ -27,24 +27,24 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/les/flowcontrol"
-	"github.com/ethereum/go-ethereum/light"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/accounts/abi/bind/backends"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/contracts/checkpointoracle/contract"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/les/flowcontrol"
+	"github.com/maticnetwork/bor/light"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/params"
 )
 
 var (
diff --git a/les/metrics.go b/les/metrics.go
index 4c6737a4e8f0434ba78a12e412d03250cd445423..ca7b4e0ac8bda6acd103fe26373142059a809072 100644
--- a/les/metrics.go
+++ b/les/metrics.go
@@ -17,8 +17,8 @@
 package les
 
 import (
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/p2p"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/p2p"
 )
 
 var (
diff --git a/les/odr.go b/les/odr.go
index a26c06680b9640387c4bc8120cb207118dc29252..83f7225fb6d4f3dbd0d744a4b74444d108ba3bc4 100644
--- a/les/odr.go
+++ b/les/odr.go
@@ -19,10 +19,10 @@ package les
 import (
 	"context"
 
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/light"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/light"
+	"github.com/maticnetwork/bor/log"
 )
 
 // LesOdr implements light.OdrBackend
diff --git a/les/odr_requests.go b/les/odr_requests.go
index 3c4dd7090fc0202e679c064e2456053d372e4b4d..e81a6b543403d5421294a8aed145c638cf0fb6d3 100644
--- a/les/odr_requests.go
+++ b/les/odr_requests.go
@@ -21,15 +21,15 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/light"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/light"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/trie"
 )
 
 var (
diff --git a/les/odr_test.go b/les/odr_test.go
index 1e8a5f8b46f7ba8f3a0799e396b903cbd26b7d53..373e2eb18625d38dbd3b01ba1129a5bb617effff 100644
--- a/les/odr_test.go
+++ b/les/odr_test.go
@@ -23,17 +23,17 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/light"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/light"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 type odrTestFn func(ctx context.Context, db ethdb.Database, config *params.ChainConfig, bc *core.BlockChain, lc *light.LightChain, bhash common.Hash) []byte
diff --git a/les/peer.go b/les/peer.go
index 1aa1613b0e7d1448d5620257d71013edf9e744bb..171d6b0aa3875b654233e5f739f06a3b89cb626a 100644
--- a/les/peer.go
+++ b/les/peer.go
@@ -25,16 +25,16 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/les/flowcontrol"
-	"github.com/ethereum/go-ethereum/light"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/les/flowcontrol"
+	"github.com/maticnetwork/bor/light"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 var (
diff --git a/les/peer_test.go b/les/peer_test.go
index 85de7cded6687a0a955bcd7614388979d1821bac..ff898336062d6628843e7d54866c684d39c4c0a5 100644
--- a/les/peer_test.go
+++ b/les/peer_test.go
@@ -4,11 +4,11 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/les/flowcontrol"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/les/flowcontrol"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 const (
diff --git a/les/protocol.go b/les/protocol.go
index 5fdf32b74a6addadb3e22d36394b61132acff53c..a8ed86b3465174370d20c562f8fcf0a90c6f00bc 100644
--- a/les/protocol.go
+++ b/les/protocol.go
@@ -23,10 +23,10 @@ import (
 	"io"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // Constants to match up protocol versions and messages
diff --git a/les/request_test.go b/les/request_test.go
index 42a63c351e1eb6dada3e8ca955f1fb53f21082c1..d38bcd8a061883141d3fde9bbf4466b4ba357eb6 100644
--- a/les/request_test.go
+++ b/les/request_test.go
@@ -21,11 +21,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/light"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/light"
 )
 
 var testBankSecureTrieKey = secAddr(bankAddr)
diff --git a/les/retrieve.go b/les/retrieve.go
index d17a02e1ae899065b8c8fb2e1e1db5fde267dac7..59f54a9a728addf0ce8d7eb0968a9ead7155b3b8 100644
--- a/les/retrieve.go
+++ b/les/retrieve.go
@@ -24,8 +24,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/light"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/light"
 )
 
 var (
diff --git a/les/server.go b/les/server.go
index 0795baf9fd14a07b711883f6330ca89f58e66416..3652818165c40c014b920e77807503308260c3e8 100644
--- a/les/server.go
+++ b/les/server.go
@@ -21,20 +21,20 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/les/flowcontrol"
-	"github.com/ethereum/go-ethereum/light"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/discv5"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/les/flowcontrol"
+	"github.com/maticnetwork/bor/light"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/discv5"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 const bufLimitRatio = 6000 // fixed bufLimit/MRR ratio
diff --git a/les/serverpool.go b/les/serverpool.go
index 3e8cdee4104db5448e8a8eaecdcad07329eb40a4..157d0567715379f6dada3fe6b4cd3ef81fe0b3c2 100644
--- a/les/serverpool.go
+++ b/les/serverpool.go
@@ -27,14 +27,14 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/discv5"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/discv5"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 const (
diff --git a/les/servingqueue.go b/les/servingqueue.go
index a9e8369fe188f6ac19ec967ca074d784c7f19f65..c1ac9f876af32c945baf221c3e7f015c3138132d 100644
--- a/les/servingqueue.go
+++ b/les/servingqueue.go
@@ -21,8 +21,8 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/common/prque"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/common/prque"
 )
 
 // servingQueue allows running tasks in a limited number of threads and puts the
diff --git a/les/sync.go b/les/sync.go
index 54fd81c2c2ffd1e87ded37baaf5afa7b5c637f0e..79ce8857ed138fb8fe492bacec7b3eda974cca5c 100644
--- a/les/sync.go
+++ b/les/sync.go
@@ -21,11 +21,11 @@ import (
 	"errors"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/light"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/light"
+	"github.com/maticnetwork/bor/log"
 )
 
 var errInvalidCheckpoint = errors.New("invalid advertised checkpoint")
diff --git a/les/sync_test.go b/les/sync_test.go
index f5d1ad5bc5aa4afbfaa3730265159b317971c651..8ebf8c0a5d6612b2da2b3a52d3f9ea67d46abdb3 100644
--- a/les/sync_test.go
+++ b/les/sync_test.go
@@ -22,11 +22,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/light"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/light"
+	"github.com/maticnetwork/bor/params"
 )
 
 // Test light syncing which will download all headers from genesis.
diff --git a/les/txrelay.go b/les/txrelay.go
index 49195161b71cb54517aaf68d1ae83f749f61a737..66a6923e5b66df77246bc2389704639bb7f8e3a1 100644
--- a/les/txrelay.go
+++ b/les/txrelay.go
@@ -20,9 +20,9 @@ import (
 	"context"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 type ltrInfo struct {
diff --git a/les/ulc.go b/les/ulc.go
index b97217e79663ff838490686383d92ab999d2ccc8..91428bb280ca45b301525ead49bbab2658c4f058 100644
--- a/les/ulc.go
+++ b/les/ulc.go
@@ -19,8 +19,8 @@ package les
 import (
 	"errors"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/enode"
 )
 
 type ulc struct {
diff --git a/les/ulc_test.go b/les/ulc_test.go
index cd2bedae84c7af1613c81d5be64965c104cac763..2c41686ffc00eca2787fe788d685ddb53c16f3e8 100644
--- a/les/ulc_test.go
+++ b/les/ulc_test.go
@@ -25,12 +25,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/light"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/light"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
 )
 
 func TestULCSyncWithOnePeer(t *testing.T) {
diff --git a/light/lightchain.go b/light/lightchain.go
index 7f64d1c28bbe4afde5bc49bcb54209bdce690263..cfa684e84624bd81221bcb0b5651d21d02660094 100644
--- a/light/lightchain.go
+++ b/light/lightchain.go
@@ -26,17 +26,17 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 	lru "github.com/hashicorp/golang-lru"
 )
 
diff --git a/light/lightchain_test.go b/light/lightchain_test.go
index 70d2e70c189d088e8d64789612124602ce2198a7..f0a1bc2f665d4083efd293a22325e7c56bd31c58 100644
--- a/light/lightchain_test.go
+++ b/light/lightchain_test.go
@@ -21,13 +21,13 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/params"
 )
 
 // So we can deterministically seed different blockchains
diff --git a/light/nodeset.go b/light/nodeset.go
index 3662596785c79f85250d949eb653b4872f9827d0..d49b43a68f209a7ceefacf1635492ef7459ad510 100644
--- a/light/nodeset.go
+++ b/light/nodeset.go
@@ -20,10 +20,10 @@ import (
 	"errors"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // NodeSet stores a set of trie nodes. It implements trie.Database and can also
diff --git a/light/odr.go b/light/odr.go
index 907712ede74f857803debea6c06c03b4e15b2cb9..07855cb6d8de302db55b2ab72661ae5f648098d6 100644
--- a/light/odr.go
+++ b/light/odr.go
@@ -21,11 +21,11 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
 )
 
 // NoOdr is the default context passed to an ODR capable function when the ODR
diff --git a/light/odr_test.go b/light/odr_test.go
index debd5544c312240edaff8d05c6ce5fd4b5df03b7..e2a0c1357185f460f1f3698a825b3f018c7b391b 100644
--- a/light/odr_test.go
+++ b/light/odr_test.go
@@ -24,19 +24,19 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/trie"
 )
 
 var (
diff --git a/light/odr_util.go b/light/odr_util.go
index 82e33bb78fa9d0c104acb791af63e754c6bc38e0..0c96e8c400035d189b856d90114e424f803c3ab9 100644
--- a/light/odr_util.go
+++ b/light/odr_util.go
@@ -20,12 +20,12 @@ import (
 	"bytes"
 	"context"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 var sha3Nil = crypto.Keccak256Hash(nil)
diff --git a/light/postprocess.go b/light/postprocess.go
index bf632a4496c5180d93222d0ae814572244a0cc98..a2b4ac9132ff8e72716a0aa65f86b8363c85972c 100644
--- a/light/postprocess.go
+++ b/light/postprocess.go
@@ -24,16 +24,16 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/bitutil"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/bitutil"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/trie"
 )
 
 // IndexerConfig includes a set of configs for chain indexers.
diff --git a/light/trie.go b/light/trie.go
index e512bf6f9562bd18c6ff75248b352914fbfc9580..3bad26c3a3d9f9b267063e7562d0411d99aaaffd 100644
--- a/light/trie.go
+++ b/light/trie.go
@@ -21,12 +21,12 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/trie"
 )
 
 func NewState(ctx context.Context, head *types.Header, odr OdrBackend) *state.StateDB {
diff --git a/light/trie_test.go b/light/trie_test.go
index 4919f89641eb54a3dfc3e80527e479b26dce427c..1dc50954c91c7040fccc909d8c0c32545726a1e8 100644
--- a/light/trie_test.go
+++ b/light/trie_test.go
@@ -23,13 +23,13 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/trie"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/trie"
 )
 
 func TestNodeIterator(t *testing.T) {
diff --git a/light/txpool.go b/light/txpool.go
index e945ef2ec178648af7ce2f2f5000b04ba07c0169..8ce4837951277c8dbf171ffcbb0c1b4b3ad12a2e 100644
--- a/light/txpool.go
+++ b/light/txpool.go
@@ -22,16 +22,16 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 const (
diff --git a/light/txpool_test.go b/light/txpool_test.go
index 0996bd7c9cc041828e3506d5f9c9790b405733a5..3359dcf2b6fc011074c38ff9146fa32282814dcb 100644
--- a/light/txpool_test.go
+++ b/light/txpool_test.go
@@ -23,13 +23,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/params"
 )
 
 type testTxRelay struct {
diff --git a/log/format.go b/log/format.go
index a1b5dac6295327b676870b7a2e46c8d5cf641576..1cedd1253e67f8a4d23087033c893b7f29f0265b 100644
--- a/log/format.go
+++ b/log/format.go
@@ -23,7 +23,7 @@ const (
 
 // locationTrims are trimmed for display to avoid unwieldy log lines.
 var locationTrims = []string{
-	"github.com/ethereum/go-ethereum/",
+	"github.com/maticnetwork/bor/",
 }
 
 // PrintOrigins sets or unsets log location (file:line) printing for terminal
diff --git a/metrics/cpu_syscall.go b/metrics/cpu_syscall.go
index e245453e824f6f9ef60febfb8bc5cc6232866903..98c9761a0b0da84129ddca540b099ebb41c2428c 100644
--- a/metrics/cpu_syscall.go
+++ b/metrics/cpu_syscall.go
@@ -21,7 +21,7 @@ package metrics
 import (
 	"syscall"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // getProcessCPUTime retrieves the process' CPU time since program startup.
diff --git a/metrics/exp/exp.go b/metrics/exp/exp.go
index 55820f1aab2fb2418c3c6c1b7e703e8bc467fad5..db9ea24d2605a70fad87d35e83f77c8bf5d50085 100644
--- a/metrics/exp/exp.go
+++ b/metrics/exp/exp.go
@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/metrics/prometheus"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/metrics/prometheus"
 )
 
 type exp struct {
diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go
index 6619915fdba31de73ff5d8a0b20d99af325b4c65..5971c50aa3b525b54582897c4f89d3070534d717 100644
--- a/metrics/influxdb/influxdb.go
+++ b/metrics/influxdb/influxdb.go
@@ -5,8 +5,8 @@ import (
 	uurl "net/url"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
 	"github.com/influxdata/influxdb/client"
 )
 
diff --git a/metrics/librato/librato.go b/metrics/librato/librato.go
index 2138e01ae88bc179a5ab8acef044030184d964aa..501f121baa6e9475204623d444460b2f876daaaf 100644
--- a/metrics/librato/librato.go
+++ b/metrics/librato/librato.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/ethereum/go-ethereum/metrics"
+	"github.com/maticnetwork/bor/metrics"
 )
 
 // a regexp for extracting the unit from time.Duration.String
diff --git a/metrics/metrics.go b/metrics/metrics.go
index 8ab4e28f2c79342de25192cecb5e85fad7327ad1..299e7197324f5dd27c4767338fe69b4096f03218 100644
--- a/metrics/metrics.go
+++ b/metrics/metrics.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // Enabled is checked by the constructor functions for all of the
diff --git a/metrics/prometheus/collector.go b/metrics/prometheus/collector.go
index 8350fa2aaf31e1984491203a050f31353178fd48..7413592d1606ea24ca15e2c8a175358b52be33cf 100644
--- a/metrics/prometheus/collector.go
+++ b/metrics/prometheus/collector.go
@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/metrics"
+	"github.com/maticnetwork/bor/metrics"
 )
 
 var (
diff --git a/metrics/prometheus/prometheus.go b/metrics/prometheus/prometheus.go
index 9ad5ec7e9929d61480c2cc67748a9b727a6560d2..bd70d24e1735f2b1eb4daf61660bc285b0650db5 100644
--- a/metrics/prometheus/prometheus.go
+++ b/metrics/prometheus/prometheus.go
@@ -22,8 +22,8 @@ import (
 	"net/http"
 	"sort"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
 )
 
 // Handler returns an HTTP handler which dump metrics in Prometheus format.
diff --git a/miner/miner.go b/miner/miner.go
index ab97b0c03855a6a5bb28ea5ee23b1c83a03db704..67e2fa59d53221316c28e769b60b7e85322f9d77 100644
--- a/miner/miner.go
+++ b/miner/miner.go
@@ -23,16 +23,16 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
 )
 
 // Backend wraps all methods required for mining.
diff --git a/miner/stress_clique.go b/miner/stress_clique.go
index 7f5db2e520b0c45122d6d37e1914c22d3076e455..27a6d258dd66bc64f1fc93650738f2096cae1ef1 100644
--- a/miner/stress_clique.go
+++ b/miner/stress_clique.go
@@ -28,19 +28,19 @@ import (
 	"os"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/fdlimit"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/fdlimit"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/params"
 )
 
 func main() {
@@ -175,7 +175,7 @@ func makeSealer(genesis *core.Genesis) (*node.Node, error) {
 	datadir, _ := ioutil.TempDir("", "")
 
 	config := &node.Config{
-		Name:    "geth",
+		Name:    "bor",
 		Version: params.Version,
 		DataDir: datadir,
 		P2P: p2p.Config{
diff --git a/miner/stress_ethash.go b/miner/stress_ethash.go
index 7d4a7d24f7dd73d2a4e5d6e064a62940781de30f..92d93b815e977ea2909464e6a96414efc34b44de 100644
--- a/miner/stress_ethash.go
+++ b/miner/stress_ethash.go
@@ -28,20 +28,20 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/fdlimit"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/fdlimit"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/params"
 )
 
 func main() {
@@ -153,7 +153,7 @@ func makeMiner(genesis *core.Genesis) (*node.Node, error) {
 	datadir, _ := ioutil.TempDir("", "")
 
 	config := &node.Config{
-		Name:    "geth",
+		Name:    "bor",
 		Version: params.Version,
 		DataDir: datadir,
 		P2P: p2p.Config{
diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go
index 3a176e8bd6f68b1cbd400f7a74aa1c259cbc2a06..0161d73ce8e8394d30bf986bb93b75ff632459ac 100644
--- a/miner/unconfirmed.go
+++ b/miner/unconfirmed.go
@@ -20,9 +20,9 @@ import (
 	"container/ring"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/log"
 )
 
 // chainRetriever is used by the unconfirmed block set to verify whether a previously
diff --git a/miner/unconfirmed_test.go b/miner/unconfirmed_test.go
index 42e77f3e648cb3810e7c60ca0582c2ae6e1abbf6..59cd233860a1f64e3b7e5962137b9313277dd01e 100644
--- a/miner/unconfirmed_test.go
+++ b/miner/unconfirmed_test.go
@@ -19,8 +19,8 @@ package miner
 import (
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // noopChainRetriever is an implementation of headerRetriever that always
diff --git a/miner/worker.go b/miner/worker.go
index 4a9528c39565c002ee6462c8fa3a1ec79a41ef53..1c265a1cb311998eb8e3c8fa83e9b52fd3cc182a 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -25,15 +25,15 @@ import (
 	"time"
 
 	mapset "github.com/deckarep/golang-set"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/consensus/misc"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/consensus/misc"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/params"
 )
 
 const (
diff --git a/miner/worker_test.go b/miner/worker_test.go
index 7fa9a5f98425692755cb5a89a51157bf4d8350f4..cc494f7fb6d202baea9d081e6444d8ad1829581e 100644
--- a/miner/worker_test.go
+++ b/miner/worker_test.go
@@ -21,18 +21,18 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/consensus/clique"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/consensus/clique"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/params"
 )
 
 var (
diff --git a/mobile/accounts.go b/mobile/accounts.go
index 4d979bffff5dae63968c19401e85d7274e929905..1046e672824db880b5aa986a70d1535d3adcbb31 100644
--- a/mobile/accounts.go
+++ b/mobile/accounts.go
@@ -23,10 +23,10 @@ import (
 	"errors"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 const (
diff --git a/mobile/android_test.go b/mobile/android_test.go
index 3d3bd66d0899d953178fede99b8839a486855676..04a70fb9ffbaac40b28b20e8032e69f38a608741 100644
--- a/mobile/android_test.go
+++ b/mobile/android_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/internal/build"
+	"github.com/maticnetwork/bor/internal/build"
 )
 
 // androidTestClass is a Java class to do some lightweight tests against the Android
@@ -207,7 +207,7 @@ func TestAndroid(t *testing.T) {
 		}
 	}
 	// Generate the mobile bindings for Geth and add the tester class
-	gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/ethereum/go-ethereum/mobile")
+	gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/maticnetwork/bor/mobile")
 	if output, err := gobind.CombinedOutput(); err != nil {
 		t.Logf("%s", output)
 		t.Fatalf("failed to run gomobile bind: %v", err)
diff --git a/mobile/big.go b/mobile/big.go
index 86ea93245aabc2b8d46c0a664af21994fd934e41..3cbe8948db423202da601f1901820999c67c5bac 100644
--- a/mobile/big.go
+++ b/mobile/big.go
@@ -22,7 +22,7 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 // A BigInt represents a signed multi-precision integer.
diff --git a/mobile/bind.go b/mobile/bind.go
index 90ecdf82c414cc55340b7fe49bbb35096be32d67..0f819ee3d4a44c34d70e0831ebaa32138809ad0a 100644
--- a/mobile/bind.go
+++ b/mobile/bind.go
@@ -23,12 +23,12 @@ import (
 	"math/big"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/accounts/abi"
+	"github.com/maticnetwork/bor/accounts/abi/bind"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 // Signer is an interface defining the callback when a contract requires a
diff --git a/mobile/common.go b/mobile/common.go
index d7e0457261a09b8dfacfdf98d27c62026c10d86e..382fee8f28a19a58b88146801835fe2190ae1faa 100644
--- a/mobile/common.go
+++ b/mobile/common.go
@@ -24,8 +24,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 // Hash represents the 32 byte Keccak256 hash of arbitrary data.
diff --git a/mobile/discover.go b/mobile/discover.go
index 9b3c93ccd98f316f2fe0e173f3fe25b937a3f91b..32bbdf74abbda61e7574608bbea378429f90b0c5 100644
--- a/mobile/discover.go
+++ b/mobile/discover.go
@@ -22,7 +22,7 @@ package geth
 import (
 	"errors"
 
-	"github.com/ethereum/go-ethereum/p2p/discv5"
+	"github.com/maticnetwork/bor/p2p/discv5"
 )
 
 // Enode represents a host on the network.
diff --git a/mobile/ethclient.go b/mobile/ethclient.go
index 662125c4adeb0b4ed1d56b85f943320876317bd1..ad9a0614b966babfb345753ec0e443587c4bc52d 100644
--- a/mobile/ethclient.go
+++ b/mobile/ethclient.go
@@ -21,8 +21,8 @@ package geth
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/ethclient"
 )
 
 // EthereumClient provides access to the Ethereum APIs.
diff --git a/mobile/ethereum.go b/mobile/ethereum.go
index 59da85239744fc49c01c8dadc6a17f224e65ee1d..a3761e9809d264b0b97a299adf50edc69d06bc11 100644
--- a/mobile/ethereum.go
+++ b/mobile/ethereum.go
@@ -21,8 +21,8 @@ package geth
 import (
 	"errors"
 
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/common"
+	ethereum "github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/common"
 )
 
 // Subscription represents an event subscription where events are
diff --git a/mobile/geth.go b/mobile/geth.go
index edcbfdbdbe55371e1f9fdc587ec632b07ea58bd6..611a32af0ab28793e5fed6f34eca387d0b47f4b5 100644
--- a/mobile/geth.go
+++ b/mobile/geth.go
@@ -24,18 +24,18 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/eth/downloader"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/ethereum/go-ethereum/ethstats"
-	"github.com/ethereum/go-ethereum/internal/debug"
-	"github.com/ethereum/go-ethereum/les"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/nat"
-	"github.com/ethereum/go-ethereum/params"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/eth"
+	"github.com/maticnetwork/bor/eth/downloader"
+	"github.com/maticnetwork/bor/ethclient"
+	"github.com/maticnetwork/bor/ethstats"
+	"github.com/maticnetwork/bor/internal/debug"
+	"github.com/maticnetwork/bor/les"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/nat"
+	"github.com/maticnetwork/bor/params"
+	whisper "github.com/maticnetwork/bor/whisper/whisperv6"
 )
 
 // NodeConfig represents the collection of configuration values to fine tune the Geth
diff --git a/mobile/init.go b/mobile/init.go
index 2025d85edc92540c481a92f46ab2640e0952c13c..12812ddf5063b43bc3c470976af995b4163ed992 100644
--- a/mobile/init.go
+++ b/mobile/init.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 func init() {
diff --git a/mobile/interface.go b/mobile/interface.go
index d5200d5b1b826e8957e7b3ca777e22f165ec8513..149a34f291aef11fdff8551a6fc67669b2ad6bf3 100644
--- a/mobile/interface.go
+++ b/mobile/interface.go
@@ -22,7 +22,7 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 // Interface represents a wrapped version of Go's interface{}, with the capacity
diff --git a/mobile/interface_test.go b/mobile/interface_test.go
index 4bd1af47aa1df8b7139fa6b90e244836f2096dee..d3e9a5c3b121f0df73bf7f752eb38a7695f2af82 100644
--- a/mobile/interface_test.go
+++ b/mobile/interface_test.go
@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 func TestInterfaceGetSet(t *testing.T) {
diff --git a/mobile/logger.go b/mobile/logger.go
index 7078c4fd2c83a8aa9ab8d35b18b3f342087887e2..0ccc2e1719ee99dcf0dc51cdee8fc513d82e1e18 100644
--- a/mobile/logger.go
+++ b/mobile/logger.go
@@ -19,7 +19,7 @@ package geth
 import (
 	"os"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // SetVerbosity sets the global verbosity level (between 0 and 6 - see logger/verbosity.go).
diff --git a/mobile/p2p.go b/mobile/p2p.go
index a80d9fff2e152ca75b9a2cfce3932a1f7e3ab57c..3fc642a6a17e7e4767327310dbd2cc6bfa54d36f 100644
--- a/mobile/p2p.go
+++ b/mobile/p2p.go
@@ -21,7 +21,7 @@ package geth
 import (
 	"errors"
 
-	"github.com/ethereum/go-ethereum/p2p"
+	"github.com/maticnetwork/bor/p2p"
 )
 
 // NodeInfo represents pi short summary of the information known about the host.
diff --git a/mobile/params.go b/mobile/params.go
index 45fe870ee3dc6c5f4256a0316eb2f58fc47a1659..331726edc2b21d588da13ab7719f3dfb7b6b5465 100644
--- a/mobile/params.go
+++ b/mobile/params.go
@@ -21,9 +21,9 @@ package geth
 import (
 	"encoding/json"
 
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/p2p/discv5"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/p2p/discv5"
+	"github.com/maticnetwork/bor/params"
 )
 
 // MainnetGenesis returns the JSON spec to use for the main Ethereum network. It
diff --git a/mobile/primitives.go b/mobile/primitives.go
index 7e1ab26ef03974993442c47575c11a97824af009..3a5cb71043aa7d59ddebe62d2fa5881734e150af 100644
--- a/mobile/primitives.go
+++ b/mobile/primitives.go
@@ -22,7 +22,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 // Strings represents s slice of strs.
diff --git a/mobile/shhclient.go b/mobile/shhclient.go
index a069c9bd4042f2190e3791af03067268c4b28dff..78a3270a92ad6dc2c75a3ea50d242bfa648e546b 100644
--- a/mobile/shhclient.go
+++ b/mobile/shhclient.go
@@ -19,8 +19,8 @@
 package geth
 
 import (
-	"github.com/ethereum/go-ethereum/whisper/shhclient"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
+	"github.com/maticnetwork/bor/whisper/shhclient"
+	whisper "github.com/maticnetwork/bor/whisper/whisperv6"
 )
 
 // WhisperClient provides access to the Ethereum APIs.
diff --git a/mobile/types.go b/mobile/types.go
index b9c44c25d7a9c6e77d75fa10a431d7f332409cda..18d664c36467e7990e4570e273033b813a4a3089 100644
--- a/mobile/types.go
+++ b/mobile/types.go
@@ -23,10 +23,10 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/rlp"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/rlp"
+	whisper "github.com/maticnetwork/bor/whisper/whisperv6"
 )
 
 // A Nonce is a 64-bit hash which proves (combined with the mix-hash) that
diff --git a/mobile/vm.go b/mobile/vm.go
index 72093e3d5b904a84f2f58cf85d102d0a53004e69..5d59c12275fe7cc684d1dad3b1cb7d295e00ee95 100644
--- a/mobile/vm.go
+++ b/mobile/vm.go
@@ -21,7 +21,7 @@ package geth
 import (
 	"errors"
 
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 // Log represents a contract log event. These events are generated by the LOG
diff --git a/node/api.go b/node/api.go
index 66cd1dde3354b5f1029b37c3a2dc2b662e56240d..8d93e2862f77b79f9feb2d9ac0abb0e09e232ccd 100644
--- a/node/api.go
+++ b/node/api.go
@@ -21,11 +21,11 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // PrivateAdminAPI is the collection of administrative API methods exposed only
diff --git a/node/config.go b/node/config.go
index 1905ac7fa59113379b63d56e09bd50ffa81135d5..9f8806599b0773a495b552977560933e8c3458b5 100644
--- a/node/config.go
+++ b/node/config.go
@@ -26,17 +26,17 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/external"
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/accounts/scwallet"
-	"github.com/ethereum/go-ethereum/accounts/usbwallet"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/external"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/accounts/scwallet"
+	"github.com/maticnetwork/bor/accounts/usbwallet"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 const (
@@ -287,8 +287,8 @@ func (c *Config) ExtRPCEnabled() bool {
 func (c *Config) NodeName() string {
 	name := c.name()
 	// Backwards compatibility: previous versions used title-cased "Geth", keep that.
-	if name == "geth" || name == "geth-testnet" {
-		name = "Geth"
+	if name == "bor" || name == "bor-testnet" {
+		name = "Bor"
 	}
 	if c.UserIdent != "" {
 		name += "/" + c.UserIdent
@@ -333,7 +333,7 @@ func (c *Config) ResolvePath(path string) string {
 	// by geth 1.4 are used if they exist.
 	if warn, isOld := isOldGethResource[path]; isOld {
 		oldpath := ""
-		if c.name() == "geth" {
+		if c.name() == "bor" {
 			oldpath = filepath.Join(c.DataDir, path)
 		}
 		if oldpath != "" && common.FileExist(oldpath) {
diff --git a/node/config_test.go b/node/config_test.go
index 00c24a239123c180d23eab635aac115afd18f85d..6b639117aa9c0d0167913f0b51b98662415db0e6 100644
--- a/node/config_test.go
+++ b/node/config_test.go
@@ -24,8 +24,8 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p"
 )
 
 // Tests that datadirs can be successfully created, be them manually configured
@@ -85,15 +85,15 @@ func TestIPCPathResolution(t *testing.T) {
 	}{
 		{"", "", false, ""},
 		{"data", "", false, ""},
-		{"", "geth.ipc", false, filepath.Join(os.TempDir(), "geth.ipc")},
-		{"data", "geth.ipc", false, "data/geth.ipc"},
-		{"data", "./geth.ipc", false, "./geth.ipc"},
-		{"data", "/geth.ipc", false, "/geth.ipc"},
+		{"", "bor.ipc", false, filepath.Join(os.TempDir(), "bor.ipc")},
+		{"data", "bor.ipc", false, "data/bor.ipc"},
+		{"data", "./bor.ipc", false, "./bor.ipc"},
+		{"data", "/bor.ipc", false, "/bor.ipc"},
 		{"", "", true, ``},
 		{"data", "", true, ``},
-		{"", "geth.ipc", true, `\\.\pipe\geth.ipc`},
-		{"data", "geth.ipc", true, `\\.\pipe\geth.ipc`},
-		{"data", `\\.\pipe\geth.ipc`, true, `\\.\pipe\geth.ipc`},
+		{"", "bor.ipc", true, `\\.\pipe\bor.ipc`},
+		{"data", "bor.ipc", true, `\\.\pipe\bor.ipc`},
+		{"data", `\\.\pipe\bor.ipc`, true, `\\.\pipe\bor.ipc`},
 	}
 	for i, test := range tests {
 		// Only run when platform/test match
diff --git a/node/defaults.go b/node/defaults.go
index f84a5d54799836844cbd23fa2a4dbb294dd7a09e..a1ababd144ccdf27042df5d1d5a51b7f512790aa 100644
--- a/node/defaults.go
+++ b/node/defaults.go
@@ -22,9 +22,9 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/nat"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/nat"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 const (
diff --git a/node/node.go b/node/node.go
index c9c27d8262397a3292028752865b56c70cee3953..c65010d0215703ce8ddb7270e3e2d3bf01ecb904 100644
--- a/node/node.go
+++ b/node/node.go
@@ -26,14 +26,14 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/internal/debug"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/internal/debug"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/rpc"
 	"github.com/prometheus/tsdb/fileutil"
 )
 
diff --git a/node/node_example_test.go b/node/node_example_test.go
index 57b18855f1ed95421b5014db6f3b90df25b6f6c8..d828215cadd6607811b6d78ea1d7cafeb1020148 100644
--- a/node/node_example_test.go
+++ b/node/node_example_test.go
@@ -20,9 +20,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // SampleService is a trivial network service that can be attached to a node for
diff --git a/node/node_test.go b/node/node_test.go
index c464771cd807be1e4d0a21a8fbe9e8b48bfb0114..8dce15e0079c832b2af65c89212536ec9b5e8c0f 100644
--- a/node/node_test.go
+++ b/node/node_test.go
@@ -24,9 +24,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 var (
diff --git a/node/service.go b/node/service.go
index 4dea00995c4456cd6ba6b7ccea18cdbb5998c653..527f1d4629a8afca5e5dd226728c56363ba659c5 100644
--- a/node/service.go
+++ b/node/service.go
@@ -20,12 +20,12 @@ import (
 	"path/filepath"
 	"reflect"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // ServiceContext is a collection of service independent options inherited from
diff --git a/node/utils_test.go b/node/utils_test.go
index 9801b1ed4565f0552a32387f605b6549dee280c9..187284bed422c0ea24ba08f53de223396e46889b 100644
--- a/node/utils_test.go
+++ b/node/utils_test.go
@@ -22,8 +22,8 @@ package node
 import (
 	"reflect"
 
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // NoopService is a trivial implementation of the Service interface.
diff --git a/p2p/dial.go b/p2p/dial.go
index 8dee5063f1d5f18675faf6129c44c1aab401e2ce..66fc20c4914cab44d46a55432b41845d03e5406a 100644
--- a/p2p/dial.go
+++ b/p2p/dial.go
@@ -22,9 +22,9 @@ import (
 	"net"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/netutil"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/netutil"
 )
 
 const (
diff --git a/p2p/dial_test.go b/p2p/dial_test.go
index de8fc4a6e3e6469990ab1cb8d67a21f3772676df..e5fc7475cf33f5105adeb57db2a213629afb8517 100644
--- a/p2p/dial_test.go
+++ b/p2p/dial_test.go
@@ -25,11 +25,11 @@ import (
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/internal/testlog"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/p2p/netutil"
+	"github.com/maticnetwork/bor/internal/testlog"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/enr"
+	"github.com/maticnetwork/bor/p2p/netutil"
 )
 
 func init() {
diff --git a/p2p/discover/common.go b/p2p/discover/common.go
index 3c080359fdf8d5c6a9e221b8e7e2c1c01c96764c..7d5b4c2d08960696dc199770cfc7193eb47b56b4 100644
--- a/p2p/discover/common.go
+++ b/p2p/discover/common.go
@@ -20,9 +20,9 @@ import (
 	"crypto/ecdsa"
 	"net"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/netutil"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/netutil"
 )
 
 type UDPConn interface {
diff --git a/p2p/discover/node.go b/p2p/discover/node.go
index a7d9ce7368c05e8dce5ef6b112667abfb11cab98..33756094b0cd36837775531bcec2f111183562e7 100644
--- a/p2p/discover/node.go
+++ b/p2p/discover/node.go
@@ -23,9 +23,9 @@ import (
 	"net"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p/enode"
 )
 
 // node represents a host on the network.
diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go
index 1bb52399fbc54085153ce65367f8656f1fdcf5b8..f424b56539a80305c5610952e7de5a0b1fde0424 100644
--- a/p2p/discover/ntp.go
+++ b/p2p/discover/ntp.go
@@ -25,7 +25,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 const (
diff --git a/p2p/discover/table.go b/p2p/discover/table.go
index e5a5793e358fbc581ca3e9e6114f2c8e02f4afae..5f0375f40cb7dc018dff36f1435c87129e0c873f 100644
--- a/p2p/discover/table.go
+++ b/p2p/discover/table.go
@@ -32,10 +32,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/netutil"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/netutil"
 )
 
 const (
diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go
index 895c284b270b38f9779e213c6b6191fdaa575aee..c9c8d2e9283b1702a550d1ade61c2e3dcc691140 100644
--- a/p2p/discover/table_test.go
+++ b/p2p/discover/table_test.go
@@ -27,10 +27,10 @@ import (
 	"testing/quick"
 	"time"
 
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/p2p/netutil"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/enr"
+	"github.com/maticnetwork/bor/p2p/netutil"
 )
 
 func TestTable_pingReplace(t *testing.T) {
diff --git a/p2p/discover/table_util_test.go b/p2p/discover/table_util_test.go
index 8e5fc7374b4727c3fe146232d489d4980f6d3ac8..48b3c20454d719088cb0d805cc272d429dcff292 100644
--- a/p2p/discover/table_util_test.go
+++ b/p2p/discover/table_util_test.go
@@ -25,10 +25,10 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/enr"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/enr"
 )
 
 var nullNode *enode.Node
diff --git a/p2p/discover/v4_udp.go b/p2p/discover/v4_udp.go
index b2a5d85cf42189a682a4d695ae13a1e0568eca54..87d301a7f535657b2b47938a74200d67e3d9d246 100644
--- a/p2p/discover/v4_udp.go
+++ b/p2p/discover/v4_udp.go
@@ -28,12 +28,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/p2p/netutil"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/enr"
+	"github.com/maticnetwork/bor/p2p/netutil"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // Errors
diff --git a/p2p/discover/v4_udp_lookup_test.go b/p2p/discover/v4_udp_lookup_test.go
index bc1cdfb089abdaebabad459190a96a45f59e56d8..79856a5c6584d6d9f05f4014e0c710514beb5d51 100644
--- a/p2p/discover/v4_udp_lookup_test.go
+++ b/p2p/discover/v4_udp_lookup_test.go
@@ -24,8 +24,8 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p/enode"
 )
 
 func TestUDPv4_Lookup(t *testing.T) {
diff --git a/p2p/discover/v4_udp_test.go b/p2p/discover/v4_udp_test.go
index c4f5b5de0f44fedd139f5306df60e28525d7a197..252a53e4b5704c4b542f5367b292f5c688e7b06b 100644
--- a/p2p/discover/v4_udp_test.go
+++ b/p2p/discover/v4_udp_test.go
@@ -32,13 +32,13 @@ import (
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/internal/testlog"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/internal/testlog"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/enr"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 func init() {
diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go
index 3c2d5744c383a5c42158bd287b58c14f78e749a9..a39aa51fc560c30a1f894ca83c39bf62bf115dba 100644
--- a/p2p/discv5/database.go
+++ b/p2p/discv5/database.go
@@ -28,9 +28,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/rlp"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/errors"
 	"github.com/syndtr/goleveldb/leveldb/iterator"
diff --git a/p2p/discv5/metrics.go b/p2p/discv5/metrics.go
index cb11d7eacf07a0393e1dd1685324d4e56c661784..2d47918ec4d0afc455469c2dcb3357dfb991aea3 100644
--- a/p2p/discv5/metrics.go
+++ b/p2p/discv5/metrics.go
@@ -1,6 +1,6 @@
 package discv5
 
-import "github.com/ethereum/go-ethereum/metrics"
+import "github.com/maticnetwork/bor/metrics"
 
 var (
 	ingressTrafficMeter = metrics.NewRegisteredMeter("discv5/InboundTraffic", nil)
diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go
index de7d8de6aa401672eb7eaa5b55cebdb70eb08193..dc1a72964c48592d0657b607538439c0535ba574 100644
--- a/p2p/discv5/net.go
+++ b/p2p/discv5/net.go
@@ -24,12 +24,12 @@ import (
 	"net"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/netutil"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/netutil"
+	"github.com/maticnetwork/bor/rlp"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go
index 1a8137673d38dc5e2835d10cc60a6814d0d9ea5d..dd1edefa465e116dfd949f79885c1caaf99dfe43 100644
--- a/p2p/discv5/net_test.go
+++ b/p2p/discv5/net_test.go
@@ -22,8 +22,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 func TestNetwork_Lookup(t *testing.T) {
diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go
index 3d4748512255e4e6cb1621fc1c4377682151ffd0..b86791bd534b11e552a00e6d1cab6045f25eea8b 100644
--- a/p2p/discv5/node.go
+++ b/p2p/discv5/node.go
@@ -30,8 +30,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 // Node represents a host on the network.
diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go
index ce4ad9e4d48ef945557892c2222a528fb333fda6..d7ed052a1faa128d7771053cd1e6ff644de5c057 100644
--- a/p2p/discv5/node_test.go
+++ b/p2p/discv5/node_test.go
@@ -27,8 +27,8 @@ import (
 	"testing/quick"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 func ExampleNewNode() {
diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go
index 4fb5f657ae0a06cd515005700926905c1618a2d5..d20cbb44e56d89ee4649ac19de509b89d251eacc 100644
--- a/p2p/discv5/ntp.go
+++ b/p2p/discv5/ntp.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 const (
diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go
index 543faecd485696bd81a4d129c4a35614f2d9edba..94ce4f651b8b3d796444c4f1bbc3e8ea6eaeb0c7 100644
--- a/p2p/discv5/sim_test.go
+++ b/p2p/discv5/sim_test.go
@@ -28,7 +28,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 // In this test, nodes try to randomly resolve each other.
diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go
index 4f4b2426f411ec3771d1e40433ed54b334aabd84..a8e5d6623dbefe9eb1b419c6e8ebd8eeb4d90ee1 100644
--- a/p2p/discv5/table.go
+++ b/p2p/discv5/table.go
@@ -29,7 +29,7 @@ import (
 	"net"
 	"sort"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 const (
diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go
index a29943dab9b3274706a938773d835d28e445d75d..96babba6a6091c002e3de005c29894be5eff80ba 100644
--- a/p2p/discv5/table_test.go
+++ b/p2p/discv5/table_test.go
@@ -27,8 +27,8 @@ import (
 	"testing/quick"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 type nullTransport struct{}
diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go
index ae4b18e7cd45b48fae1f5e73b2c1cf6d2e7fd199..6ba6a674976d351787f440be28f78eb3af22e351 100644
--- a/p2p/discv5/ticket.go
+++ b/p2p/discv5/ticket.go
@@ -25,10 +25,10 @@ import (
 	"sort"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
 )
 
 const (
diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go
index 609a41297f85ee90172f0c0992c96b584e04fb45..38a1a31ad9b881bd44499f49873564775b6dae7c 100644
--- a/p2p/discv5/topic.go
+++ b/p2p/discv5/topic.go
@@ -23,8 +23,8 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/log"
 )
 
 const (
diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go
index ba79993f29e96500dcf080dacfb75b1fb2e731e8..fec1a880c8dba9440b8cdd8b879c85150cac563f 100644
--- a/p2p/discv5/topic_test.go
+++ b/p2p/discv5/topic_test.go
@@ -21,8 +21,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/mclock"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/mclock"
 )
 
 func TestTopicRadius(t *testing.T) {
diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go
index ff5ed983bab0c3eedca23538aca274b3bc51f251..4a713f1f777d55df8c50b0f0fcc31a68afe63a0d 100644
--- a/p2p/discv5/udp.go
+++ b/p2p/discv5/udp.go
@@ -24,12 +24,12 @@ import (
 	"net"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/nat"
-	"github.com/ethereum/go-ethereum/p2p/netutil"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/nat"
+	"github.com/maticnetwork/bor/p2p/netutil"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 const Version = 4
diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go
index 62184aa9d3bfe73b35e591f0e432926dab578b7b..712b2ad9aa5aacb9cf474c766df854f4e0e1a6b8 100644
--- a/p2p/discv5/udp_test.go
+++ b/p2p/discv5/udp_test.go
@@ -26,9 +26,9 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 func init() {
diff --git a/p2p/enode/idscheme.go b/p2p/enode/idscheme.go
index c1834f06995c16ecd3cae78f65f3045ab1edebf4..48281f4310bcffb8d7fb9a4b743cc3e1d99eb9e1 100644
--- a/p2p/enode/idscheme.go
+++ b/p2p/enode/idscheme.go
@@ -21,10 +21,10 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p/enr"
+	"github.com/maticnetwork/bor/rlp"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/p2p/enode/idscheme_test.go b/p2p/enode/idscheme_test.go
index 0910e6e83f610ff860f6b92e7e5c1162df0d469d..7c912456a18647732ff449000aa0aa6926feae2d 100644
--- a/p2p/enode/idscheme_test.go
+++ b/p2p/enode/idscheme_test.go
@@ -23,9 +23,9 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p/enr"
+	"github.com/maticnetwork/bor/rlp"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/p2p/enode/localnode.go b/p2p/enode/localnode.go
index d8aa02a77e266b36514f5b015b428f9986a72f6a..5bd6cc94aa026fbf0380c0984a472412241318ed 100644
--- a/p2p/enode/localnode.go
+++ b/p2p/enode/localnode.go
@@ -26,9 +26,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/p2p/netutil"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/enr"
+	"github.com/maticnetwork/bor/p2p/netutil"
 )
 
 const (
diff --git a/p2p/enode/localnode_test.go b/p2p/enode/localnode_test.go
index 00746a8d277af60d95b772bae6a72fb2ee59917a..db0926d4be74db1ae4e3f2680434f2aad72b9e19 100644
--- a/p2p/enode/localnode_test.go
+++ b/p2p/enode/localnode_test.go
@@ -21,8 +21,8 @@ import (
 	"net"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p/enr"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p/enr"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/p2p/enode/node.go b/p2p/enode/node.go
index 9eb2544ffe1427a44a5cba51625571e7c976c953..9f97ce10d0f26e523a323c1c945ee73bd49afeb2 100644
--- a/p2p/enode/node.go
+++ b/p2p/enode/node.go
@@ -27,8 +27,8 @@ import (
 	"net"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/p2p/enr"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 var errMissingPrefix = errors.New("missing 'enr:' prefix for base64-encoded record")
diff --git a/p2p/enode/node_test.go b/p2p/enode/node_test.go
index d15859c477a585f96a08a9e7bfd06b16eb016cbf..04414f941a8fb5ac0ab9a0bb8c7a50da057dc1ef 100644
--- a/p2p/enode/node_test.go
+++ b/p2p/enode/node_test.go
@@ -24,8 +24,8 @@ import (
 	"testing"
 	"testing/quick"
 
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/p2p/enr"
+	"github.com/maticnetwork/bor/rlp"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/p2p/enode/nodedb.go b/p2p/enode/nodedb.go
index a43e63868f9c24229cd636804f489cdb729de5a7..d160ffe6993320a8cedc679777eb53347255679f 100644
--- a/p2p/enode/nodedb.go
+++ b/p2p/enode/nodedb.go
@@ -26,7 +26,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/rlp"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/errors"
 	"github.com/syndtr/goleveldb/leveldb/iterator"
diff --git a/p2p/enode/urlv4.go b/p2p/enode/urlv4.go
index 2372d4820b0a259d3caa5479519162330d2979ec..f387b345190eb640bbaf1f5b3200991878913404 100644
--- a/p2p/enode/urlv4.go
+++ b/p2p/enode/urlv4.go
@@ -26,9 +26,9 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p/enr"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p/enr"
 )
 
 var incompleteNodeURL = regexp.MustCompile("(?i)^(?:enode://)?([0-9a-f]+)$")
diff --git a/p2p/enode/urlv4_test.go b/p2p/enode/urlv4_test.go
index 69ed1110213b1781da6569df565a82d3eb64c6be..fbb46f4e1d46a7d3245f65e2c7c53ebc52262594 100644
--- a/p2p/enode/urlv4_test.go
+++ b/p2p/enode/urlv4_test.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p/enr"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p/enr"
 )
 
 var parseNodeTests = []struct {
diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go
index c36ae9e3edeac8d35ddf81e7455efc0d3f2a4770..0ff9449f6a93b9d089a8450857370247a2388924 100644
--- a/p2p/enr/enr.go
+++ b/p2p/enr/enr.go
@@ -40,7 +40,7 @@ import (
 	"io"
 	"sort"
 
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 const SizeLimit = 300 // maximum encoded size of a node record in bytes
diff --git a/p2p/enr/enr_test.go b/p2p/enr/enr_test.go
index 96a9ced5cf3d941b22fe67ce18007d9c9bfb6c85..eabeef67ac62860e9bab102df897ad3719aa9869 100644
--- a/p2p/enr/enr_test.go
+++ b/p2p/enr/enr_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/rlp"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go
index f2118401afb85726faeeda115a0d7052d115c17d..8406d5eed578a58af44e8b991877d22e64d97899 100644
--- a/p2p/enr/entries.go
+++ b/p2p/enr/entries.go
@@ -21,7 +21,7 @@ import (
 	"io"
 	"net"
 
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // Entry is implemented by known node record entry types.
diff --git a/p2p/message.go b/p2p/message.go
index b987732225fb38e884780e277394a1bcd51467a5..e6e44736c8a84952115d5032e6785e276334e568 100644
--- a/p2p/message.go
+++ b/p2p/message.go
@@ -25,9 +25,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // Msg defines the structure of a p2p message.
diff --git a/p2p/metrics.go b/p2p/metrics.go
index c04e5ab4c3ad2ec61177a9f488ef77e5ac3a50f3..8dd7f3fd3b59da81e96a23dd7a2b50e4083ef837 100644
--- a/p2p/metrics.go
+++ b/p2p/metrics.go
@@ -25,10 +25,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/p2p/enode"
 )
 
 const (
diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go
index 8fad921c48d26f9cd8823f8b8252312786b7a892..08b7a39ddaf91ea2305f64cff4e53055e66191ba 100644
--- a/p2p/nat/nat.go
+++ b/p2p/nat/nat.go
@@ -25,7 +25,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 	"github.com/jackpal/go-nat-pmp"
 )
 
diff --git a/p2p/netutil/iptrack.go b/p2p/netutil/iptrack.go
index b9cbd5e1caa9fac077f0dee57e0cb12081f81d4b..e1ab3f24fd8a9f936bb2fed5a645617c5eb62721 100644
--- a/p2p/netutil/iptrack.go
+++ b/p2p/netutil/iptrack.go
@@ -19,7 +19,7 @@ package netutil
 import (
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
+	"github.com/maticnetwork/bor/common/mclock"
 )
 
 // IPTracker predicts the external endpoint, i.e. IP address and port, of the local host
diff --git a/p2p/netutil/iptrack_test.go b/p2p/netutil/iptrack_test.go
index a9a2998a6528876d7dfca3a4fb60aebd19df2ed3..b5798e2b5ed5d3ff0432c4860c5ba1320c83446e 100644
--- a/p2p/netutil/iptrack_test.go
+++ b/p2p/netutil/iptrack_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
+	"github.com/maticnetwork/bor/common/mclock"
 )
 
 const (
diff --git a/p2p/peer.go b/p2p/peer.go
index d370894f1769ddd51179125319a993daada7b0bc..2695bb947ba28ac7f9f0fb25ff46e0b87ce31def 100644
--- a/p2p/peer.go
+++ b/p2p/peer.go
@@ -25,12 +25,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/enr"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 var (
diff --git a/p2p/peer_test.go b/p2p/peer_test.go
index 984cc411adb4fc0b1851cedb4d6fd216cf322934..3d78ecfc6087e7b49875dcbe9f4a0efeb1f662fc 100644
--- a/p2p/peer_test.go
+++ b/p2p/peer_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 var discard = Protocol{
diff --git a/p2p/protocol.go b/p2p/protocol.go
index 9ce4c20203c7bc4223afe4b7911d599e54b560c8..28094ad80501ed8a124427b6362e5587cf28d347 100644
--- a/p2p/protocol.go
+++ b/p2p/protocol.go
@@ -19,8 +19,8 @@ package p2p
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/enr"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/enr"
 )
 
 // Protocol represents a P2P subprotocol implementation.
diff --git a/p2p/rlpx.go b/p2p/rlpx.go
index 0636431f53abef08ec9d828c34487aeb35cc3ed3..1513ed9d09fb95883a75fc1e737cb439990d6d85 100644
--- a/p2p/rlpx.go
+++ b/p2p/rlpx.go
@@ -35,10 +35,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/bitutil"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/crypto/ecies"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common/bitutil"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/crypto/ecies"
+	"github.com/maticnetwork/bor/rlp"
 	"github.com/golang/snappy"
 	"golang.org/x/crypto/sha3"
 )
diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go
index e62196ff049e3f906337c5d66a043de477b5d0b0..35f198b8e23c5d9ffe8d1e0cdd64e5909027fd6f 100644
--- a/p2p/rlpx_test.go
+++ b/p2p/rlpx_test.go
@@ -32,10 +32,10 @@ import (
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/crypto/ecies"
-	"github.com/ethereum/go-ethereum/p2p/simulations/pipes"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/crypto/ecies"
+	"github.com/maticnetwork/bor/p2p/simulations/pipes"
+	"github.com/maticnetwork/bor/rlp"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/p2p/server.go b/p2p/server.go
index 692c9eb7d91d3b538893e46ee72fd5a118aae15d..a364dcd11386372b158a589786c11d69fc20379b 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -29,17 +29,17 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/discover"
-	"github.com/ethereum/go-ethereum/p2p/discv5"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/p2p/nat"
-	"github.com/ethereum/go-ethereum/p2p/netutil"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/mclock"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/discover"
+	"github.com/maticnetwork/bor/p2p/discv5"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/enr"
+	"github.com/maticnetwork/bor/p2p/nat"
+	"github.com/maticnetwork/bor/p2p/netutil"
 )
 
 const (
diff --git a/p2p/server_test.go b/p2p/server_test.go
index e8bc627e1d30ed70683cc276e4aaac1a0c79c6e3..596ffee0667d714cf42f8cc8acd31794ae694618 100644
--- a/p2p/server_test.go
+++ b/p2p/server_test.go
@@ -26,11 +26,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/internal/testlog"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/enr"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/internal/testlog"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/enr"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go
index 4f17efc334fec726b07af9e770f0aed8850000ee..a4cbdabbb5ae0d37519a7ca55405a9e79849af27 100644
--- a/p2p/simulations/adapters/exec.go
+++ b/p2p/simulations/adapters/exec.go
@@ -36,11 +36,11 @@ import (
 	"time"
 
 	"github.com/docker/docker/pkg/reexec"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/rpc"
 	"golang.org/x/net/websocket"
 )
 
diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go
index c1cf23a175c61f150c0b876322f08dc7e5905b5d..6ab67f6a1a1a4dc86e6b8ef97e6de3f2e229a95c 100644
--- a/p2p/simulations/adapters/inproc.go
+++ b/p2p/simulations/adapters/inproc.go
@@ -23,13 +23,13 @@ import (
 	"net"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/simulations/pipes"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/simulations/pipes"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // SimAdapter is a NodeAdapter which creates in-memory simulation nodes and
diff --git a/p2p/simulations/adapters/inproc_test.go b/p2p/simulations/adapters/inproc_test.go
index e1e092f6e14d3c6073537d220d5584af3c3e53b3..2bf8c4c1afba2cb2f97a4760eb3b90be7066d58f 100644
--- a/p2p/simulations/adapters/inproc_test.go
+++ b/p2p/simulations/adapters/inproc_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/p2p/simulations/pipes"
+	"github.com/maticnetwork/bor/p2p/simulations/pipes"
 )
 
 func TestTCPPipe(t *testing.T) {
diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go
index f65ce7b6050fb0e13461e75500df437c41639ec7..904926d319118931e6713bb618fe2db035a65a36 100644
--- a/p2p/simulations/adapters/types.go
+++ b/p2p/simulations/adapters/types.go
@@ -26,13 +26,13 @@ import (
 	"strconv"
 
 	"github.com/docker/docker/pkg/reexec"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/enr"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // Node represents a node in a simulation network which is created by a
diff --git a/p2p/simulations/connect.go b/p2p/simulations/connect.go
index ede96b34c133810819db11c5e706e73b13104297..3b38443d81b39b2454792d5d8f7d439b4101cde2 100644
--- a/p2p/simulations/connect.go
+++ b/p2p/simulations/connect.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/enode"
 )
 
 var (
diff --git a/p2p/simulations/connect_test.go b/p2p/simulations/connect_test.go
index 32d18347d83a20af7f0f58d4d967838d09807342..d164903f3f97d8c451530d8404e6f97e36c6c96e 100644
--- a/p2p/simulations/connect_test.go
+++ b/p2p/simulations/connect_test.go
@@ -19,9 +19,9 @@ package simulations
 import (
 	"testing"
 
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/simulations/adapters"
 )
 
 func newTestNetwork(t *testing.T, nodeCount int) (*Network, []enode.ID) {
diff --git a/p2p/simulations/examples/ping-pong.go b/p2p/simulations/examples/ping-pong.go
index cde2f3a677e2cd9b4d2fcde6407b0930e8791428..638a006f51c4d32ff9d52a2fe1799aa05e4e63d8 100644
--- a/p2p/simulations/examples/ping-pong.go
+++ b/p2p/simulations/examples/ping-pong.go
@@ -25,13 +25,13 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/simulations"
-	"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/simulations"
+	"github.com/maticnetwork/bor/p2p/simulations/adapters"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 var adapterType = flag.String("adapter", "sim", `node adapter to use (one of "sim", "exec" or "docker")`)
diff --git a/p2p/simulations/http.go b/p2p/simulations/http.go
index 1f44cc66753aaaa40de46b6b6ff9193492d5b5c5..c42f2e8a0c67f37df7aa08b166ae1844ae843814 100644
--- a/p2p/simulations/http.go
+++ b/p2p/simulations/http.go
@@ -29,11 +29,11 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/simulations/adapters"
+	"github.com/maticnetwork/bor/rpc"
 	"github.com/julienschmidt/httprouter"
 	"golang.org/x/net/websocket"
 )
diff --git a/p2p/simulations/http_test.go b/p2p/simulations/http_test.go
index ed43c0ed76a29dcf8487d33bfe3688186b759e6c..56bf4e09c1397a93f16a911999c2bf12ea5ae9cd 100644
--- a/p2p/simulations/http_test.go
+++ b/p2p/simulations/http_test.go
@@ -28,13 +28,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/simulations/adapters"
+	"github.com/maticnetwork/bor/rpc"
 	"github.com/mattn/go-colorable"
 )
 
diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go
index 8ce777a0103f78ab11e3bf35de9125dcd612b101..2fa99bd204d0e8db8f97696d0a4a417da791466a 100644
--- a/p2p/simulations/mocker.go
+++ b/p2p/simulations/mocker.go
@@ -24,9 +24,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/simulations/adapters"
 )
 
 //a map of mocker names to its function
diff --git a/p2p/simulations/mocker_test.go b/p2p/simulations/mocker_test.go
index 069040257ed0b5410d9aad191253ec361cbecdd9..d158314e4ef6fe54caa931fce17eaf662fc9bd79 100644
--- a/p2p/simulations/mocker_test.go
+++ b/p2p/simulations/mocker_test.go
@@ -27,7 +27,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/enode"
 )
 
 func TestMocker(t *testing.T) {
diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go
index f03c953e895328ccdd498d6f11f8d1dde9b34961..d8e021fc1f9a0be2f32dd3e950b521a9f6942efa 100644
--- a/p2p/simulations/network.go
+++ b/p2p/simulations/network.go
@@ -27,11 +27,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
+	"github.com/maticnetwork/bor/event"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/simulations/adapters"
 )
 
 var DialBanTimeout = 200 * time.Millisecond
diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go
index 01cd1000de47cf98f5cf1f1c478d3a9309c2b685..dba297df69c620c523df6da1a99c0938ec188884 100644
--- a/p2p/simulations/network_test.go
+++ b/p2p/simulations/network_test.go
@@ -26,10 +26,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/simulations/adapters"
 )
 
 // Tests that a created snapshot with a minimal service only contains the expected connections
diff --git a/p2p/simulations/simulation.go b/p2p/simulations/simulation.go
index ae62c42b9c2dd1b1cc4cb154c8c8c1389e3ad890..9757a3173c3b7dfbd3c51285514a7a4c0fd96de8 100644
--- a/p2p/simulations/simulation.go
+++ b/p2p/simulations/simulation.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/enode"
 )
 
 // Simulation provides a framework for running actions in a simulated network
diff --git a/p2p/simulations/test.go b/p2p/simulations/test.go
index beeb414e41b367d7fdfd137125b714dec3bd430b..8c173b909b08c3b606c0911554bcf9db9c9e202f 100644
--- a/p2p/simulations/test.go
+++ b/p2p/simulations/test.go
@@ -3,10 +3,10 @@ package simulations
 import (
 	"testing"
 
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/enr"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // NoopService is the service that does not do anything
diff --git a/p2p/testing/peerpool.go b/p2p/testing/peerpool.go
index 09db4b2466fa8b4bce85605054e2c7c636bbc9bc..0dd5d2000d3c33dd3f1c31656078bb0e61521728 100644
--- a/p2p/testing/peerpool.go
+++ b/p2p/testing/peerpool.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/enode"
 )
 
 type TestPeer interface {
diff --git a/p2p/testing/protocolsession.go b/p2p/testing/protocolsession.go
index 476c2a9840c5868f4d9e80fbd059a422e4b0d4be..24ff6bfd7973396e64c7f0cd8801ba74855fc14f 100644
--- a/p2p/testing/protocolsession.go
+++ b/p2p/testing/protocolsession.go
@@ -22,10 +22,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/simulations/adapters"
 )
 
 var errTimedOut = errors.New("timed out")
diff --git a/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go
index e798240a560afb879caa11252e8359da6314acf1..f231e6c381bad8c49bafe8d4f4cd3e32dcd051b3 100644
--- a/p2p/testing/protocoltester.go
+++ b/p2p/testing/protocoltester.go
@@ -32,14 +32,14 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/simulations"
-	"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/node"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/simulations"
+	"github.com/maticnetwork/bor/p2p/simulations/adapters"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // ProtocolTester is the tester environment used for unit testing protocol
diff --git a/params/config.go b/params/config.go
index 611b2052d61c1193b4c24488ea8d61da858f8248..0573a762872dd0afbf5951e59ce3e8cb1a455e98 100644
--- a/params/config.go
+++ b/params/config.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 // Genesis hashes to enforce below configs on.
diff --git a/params/dao.go b/params/dao.go
index da3c8dfc992b38e9bb18368ef5b293f293d2aa4b..824d6fda982a6294b6e59818ebbee2d98da044f7 100644
--- a/params/dao.go
+++ b/params/dao.go
@@ -19,7 +19,7 @@ package params
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 // DAOForkBlockExtra is the block header extra-data field to set for the DAO fork
diff --git a/rpc/client.go b/rpc/client.go
index 2053f540699e269ef814f456aab5c882dd1fb6a1..b00eb37582fd2b5bc71347525da9c4b41dd88a0b 100644
--- a/rpc/client.go
+++ b/rpc/client.go
@@ -28,7 +28,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 var (
diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go
index 3bb8717b8061901359bf9089bf5f23d1ff59b402..41b0d2224966cde7750b35607fc4ff676ed42848 100644
--- a/rpc/client_example_test.go
+++ b/rpc/client_example_test.go
@@ -22,7 +22,7 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // In this example, our client wishes to track the latest 'block number'
diff --git a/rpc/client_test.go b/rpc/client_test.go
index 759933f8c66117284c6bfe13fa08863b96938094..2c444e4b4bd1cdd229407a02a4de633d3e4c900f 100644
--- a/rpc/client_test.go
+++ b/rpc/client_test.go
@@ -31,7 +31,7 @@ import (
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 func TestClientRequest(t *testing.T) {
@@ -306,7 +306,7 @@ func TestClientSubscribeClose(t *testing.T) {
 	}
 }
 
-// This test reproduces https://github.com/ethereum/go-ethereum/issues/17837 where the
+// This test reproduces https://github.com/maticnetwork/bor/issues/17837 where the
 // client hangs during shutdown when Unsubscribe races with Client.Close.
 func TestClientCloseUnsubscribeRace(t *testing.T) {
 	server := newTestServer()
diff --git a/rpc/doc.go b/rpc/doc.go
index e5840c32d3f6375a240e3891563d0c6157e48206..5f7314af87731901ecea5167260a5107eb2067f5 100644
--- a/rpc/doc.go
+++ b/rpc/doc.go
@@ -107,7 +107,7 @@ Subscriptions are deleted when the user sends an unsubscribe request or when the
 connection which was used to create the subscription is closed. This can be initiated by
 the client and server. The server will close the connection for any write error.
 
-For more information about subscriptions, see https://github.com/ethereum/go-ethereum/wiki/RPC-PUB-SUB.
+For more information about subscriptions, see https://github.com/maticnetwork/bor/wiki/RPC-PUB-SUB.
 
 Reverse Calls
 
diff --git a/rpc/endpoints.go b/rpc/endpoints.go
index 8ca6d4eb0c6d5f3b565c8dba16644531dadf1b0d..c8c2a9bfdefea301feb2384aa599013ccfc0afb6 100644
--- a/rpc/endpoints.go
+++ b/rpc/endpoints.go
@@ -19,7 +19,7 @@ package rpc
 import (
 	"net"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // StartHTTPEndpoint starts the HTTP RPC endpoint, configured with cors/vhosts/modules
diff --git a/rpc/handler.go b/rpc/handler.go
index 02ab06b6d13102f3a2b6eb3e6ec6805e6db5d534..81f02660eb2a92fd853b297f142f273e306a56e6 100644
--- a/rpc/handler.go
+++ b/rpc/handler.go
@@ -25,7 +25,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // handler handles JSON-RPC messages. There is one handler per connection. Note that
diff --git a/rpc/http.go b/rpc/http.go
index 518b3b874f15596967144e09489e7a85c46ac8aa..0678b4eaed0ac99f523138eacf7c2727086d7bfd 100644
--- a/rpc/http.go
+++ b/rpc/http.go
@@ -31,7 +31,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 	"github.com/rs/cors"
 )
 
diff --git a/rpc/ipc.go b/rpc/ipc.go
index ad8ce03098f7bb29ee060b6c308f15b3dd631e01..396516305193f5683350099d80d465787c2d26d2 100644
--- a/rpc/ipc.go
+++ b/rpc/ipc.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"net"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/netutil"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/netutil"
 )
 
 // ServeListener accepts connections on l, serving JSON-RPC on them.
diff --git a/rpc/ipc_unix.go b/rpc/ipc_unix.go
index da6ce294d7afd88fa5eed2c342bff7101df14884..2370366f98ae058766dc91471d765bba1e8c5403 100644
--- a/rpc/ipc_unix.go
+++ b/rpc/ipc_unix.go
@@ -25,7 +25,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 // ipcListen will create a Unix socket on the given endpoint.
diff --git a/rpc/server.go b/rpc/server.go
index 5a92847f20e4f0bc3006c5e0c433cbbdd37adf7b..ad29a73388b64a290ab98f2029be836a85e88a2f 100644
--- a/rpc/server.go
+++ b/rpc/server.go
@@ -22,7 +22,7 @@ import (
 	"sync/atomic"
 
 	mapset "github.com/deckarep/golang-set"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 const MetadataApi = "rpc"
diff --git a/rpc/service.go b/rpc/service.go
index a9426c6b0ef1ea18331779391b47a474841f3a07..e46f6c21f31a99ba38b661d7c806f895489344e6 100644
--- a/rpc/service.go
+++ b/rpc/service.go
@@ -27,7 +27,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 var (
diff --git a/rpc/types.go b/rpc/types.go
index f31f09a774a0445499b68925d992d86c0236331d..9ee441ebb4047830e1070bc0ceb14b460f8a2061 100644
--- a/rpc/types.go
+++ b/rpc/types.go
@@ -22,7 +22,7 @@ import (
 	"math"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 // API describes the set of methods offered over the RPC interface
diff --git a/rpc/types_test.go b/rpc/types_test.go
index 68b6d3c54f6a9ba18941fffc408c65256139381b..6d82e39508d9954943c50a0f36285084feea8748 100644
--- a/rpc/types_test.go
+++ b/rpc/types_test.go
@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/maticnetwork/bor/common/math"
 )
 
 func TestBlockNumberJSONUnmarshal(t *testing.T) {
diff --git a/rpc/websocket.go b/rpc/websocket.go
index c5383667d912f384d17e9ac9695d626b03ad13df..bc4debde43721044f5944417d379ac6f86b33834 100644
--- a/rpc/websocket.go
+++ b/rpc/websocket.go
@@ -32,7 +32,7 @@ import (
 	"time"
 
 	mapset "github.com/deckarep/golang-set"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 	"golang.org/x/net/websocket"
 )
 
diff --git a/signer/core/api.go b/signer/core/api.go
index d68919c6f4530236ccfd3938004a1f07a0f9423d..5d223a94d31a319159a7ab7785793938c16ef80a 100644
--- a/signer/core/api.go
+++ b/signer/core/api.go
@@ -25,16 +25,16 @@ import (
 	"os"
 	"reflect"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/accounts/scwallet"
-	"github.com/ethereum/go-ethereum/accounts/usbwallet"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/signer/storage"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/accounts/scwallet"
+	"github.com/maticnetwork/bor/accounts/usbwallet"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/signer/storage"
 )
 
 const (
diff --git a/signer/core/api_test.go b/signer/core/api_test.go
index 1eba20ef40582f3d8197e332fb70f3147c2ef6f6..993fc30ac75acb1ac80a7897c964743719732a2f 100644
--- a/signer/core/api_test.go
+++ b/signer/core/api_test.go
@@ -27,16 +27,16 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/signer/core"
-	"github.com/ethereum/go-ethereum/signer/fourbyte"
-	"github.com/ethereum/go-ethereum/signer/storage"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/signer/core"
+	"github.com/maticnetwork/bor/signer/fourbyte"
+	"github.com/maticnetwork/bor/signer/storage"
 )
 
 //Used for testing
diff --git a/signer/core/auditlog.go b/signer/core/auditlog.go
index 9593ad7a53ff1e8e570e844a33712754d0788f6e..da6d021df622a0433c3d197d5c8412d4f6c694ad 100644
--- a/signer/core/auditlog.go
+++ b/signer/core/auditlog.go
@@ -19,10 +19,10 @@ package core
 import (
 	"context"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/log"
 )
 
 type AuditLogger struct {
diff --git a/signer/core/cliui.go b/signer/core/cliui.go
index 381c40be3bc60435f494a163aa7c5c0e5b75fbad..040629cf063b47e0239f8caee11b2c9d678d2f29 100644
--- a/signer/core/cliui.go
+++ b/signer/core/cliui.go
@@ -24,9 +24,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/log"
 	"golang.org/x/crypto/ssh/terminal"
 )
 
diff --git a/signer/core/signed_data.go b/signer/core/signed_data.go
index 64dc3a62aced76f6d15f8cae42ad7e61559cf8ef..a679fe71d2cbd0128441978858760511af4681a6 100644
--- a/signer/core/signed_data.go
+++ b/signer/core/signed_data.go
@@ -30,16 +30,16 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/consensus/bor"
-	"github.com/ethereum/go-ethereum/consensus/clique"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/abi"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/consensus/bor"
+	"github.com/maticnetwork/bor/consensus/clique"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 type SigFormat struct {
@@ -670,7 +670,7 @@ func (api *SignerAPI) EcRecover(ctx context.Context, data hexutil.Bytes, sig hex
 	// Note, the signature must conform to the secp256k1 curve R, S and V values, where
 	// the V value must be be 27 or 28 for legacy reasons.
 	//
-	// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_ecRecover
+	// https://github.com/maticnetwork/bor/wiki/Management-APIs#personal_ecRecover
 	if len(sig) != 65 {
 		return common.Address{}, fmt.Errorf("signature must be 65 bytes long")
 	}
diff --git a/signer/core/signed_data_test.go b/signer/core/signed_data_test.go
index 5a18defaac5e9253f812f4aff423e5dd5f1ac6b4..e82539381cdee6611586794fc1d1b070cd2d268a 100644
--- a/signer/core/signed_data_test.go
+++ b/signer/core/signed_data_test.go
@@ -25,12 +25,12 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/signer/core"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/signer/core"
 )
 
 var typesStandard = core.Types{
diff --git a/signer/core/stdioui.go b/signer/core/stdioui.go
index 0edb72def9746c09b154455f240a30cbddec9e47..b89ce8b85d2610445be798709a561d52042b6f3a 100644
--- a/signer/core/stdioui.go
+++ b/signer/core/stdioui.go
@@ -21,9 +21,9 @@ import (
 	"context"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 type StdIOUI struct {
diff --git a/signer/core/types.go b/signer/core/types.go
index 91443b24717fa993ff3721702feab130a731e4e1..f16b88812ca8876526adc29325e51887ebaf5ff4 100644
--- a/signer/core/types.go
+++ b/signer/core/types.go
@@ -22,9 +22,9 @@ import (
 	"math/big"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 type ValidationInfo struct {
diff --git a/signer/core/uiapi.go b/signer/core/uiapi.go
index 6dc68313b517ff5c18c84e0c809a58d6fda9f00e..358a7ef5e3db90ac3365dc1f61695b4c652522f1 100644
--- a/signer/core/uiapi.go
+++ b/signer/core/uiapi.go
@@ -25,11 +25,11 @@ import (
 	"io/ioutil"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/accounts/keystore"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 // SignerUIAPI implements methods Clef provides for a UI to query, in the bidirectional communication
diff --git a/signer/fourbyte/abi.go b/signer/fourbyte/abi.go
index eb5315355b2f804d2fef7efd6647a90718bf2420..be58e9439704d285a96bff858d5ae274e9e6485a 100644
--- a/signer/fourbyte/abi.go
+++ b/signer/fourbyte/abi.go
@@ -23,8 +23,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/accounts/abi"
+	"github.com/maticnetwork/bor/common"
 )
 
 // decodedCallData is an internal type to represent a method call parsed according
diff --git a/signer/fourbyte/abi_test.go b/signer/fourbyte/abi_test.go
index 4bd8a7760101a74b43ba618f7debbf7fe351f28a..afc4e1dcfbc0c8f4a6d959c41bd991d3c97d7880 100644
--- a/signer/fourbyte/abi_test.go
+++ b/signer/fourbyte/abi_test.go
@@ -22,8 +22,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/accounts/abi"
+	"github.com/maticnetwork/bor/common"
 )
 
 func verify(t *testing.T, jsondata, calldata string, exp []interface{}) {
diff --git a/signer/fourbyte/fourbyte_test.go b/signer/fourbyte/fourbyte_test.go
index 3ce042e72120a010c08eb7fd1c19a5a3f68803b6..02879d148e68750cac66d622008c1a59d69d204a 100644
--- a/signer/fourbyte/fourbyte_test.go
+++ b/signer/fourbyte/fourbyte_test.go
@@ -22,8 +22,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/accounts/abi"
+	"github.com/maticnetwork/bor/common"
 )
 
 // Tests that all the selectors contained in the 4byte database are valid.
diff --git a/signer/fourbyte/validation.go b/signer/fourbyte/validation.go
index 0997c63646e0efebf191199b31827e320b18d4bb..e09d48d71c4b3926f1f27cbd05ed2edf635e5288 100644
--- a/signer/fourbyte/validation.go
+++ b/signer/fourbyte/validation.go
@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/signer/core"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/signer/core"
 )
 
 // ValidateTransaction does a number of checks on the supplied transaction, and
@@ -49,7 +49,7 @@ func (db *Database) ValidateTransaction(selector *string, tx *core.SendTxArgs) (
 	if tx.To == nil {
 		// Contract creation should contain sufficient data to deploy a contract. A
 		// typical error is omitting sender due to some quirk in the javascript call
-		// e.g. https://github.com/ethereum/go-ethereum/issues/16106.
+		// e.g. https://github.com/maticnetwork/bor/issues/16106.
 		if len(data) == 0 {
 			// Prevent sending ether into black hole (show stopper)
 			if tx.Value.ToInt().Cmp(big.NewInt(0)) > 0 {
diff --git a/signer/fourbyte/validation_test.go b/signer/fourbyte/validation_test.go
index bdbc6b5b7a98532f155de282925215f3812024d3..8dc6f60f43c2ee0588c304c3b3e461385ed6abec 100644
--- a/signer/fourbyte/validation_test.go
+++ b/signer/fourbyte/validation_test.go
@@ -20,9 +20,9 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/signer/core"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/signer/core"
 )
 
 func mixAddr(a string) (*common.MixedcaseAddress, error) {
diff --git a/signer/rules/rules.go b/signer/rules/rules.go
index f731dac40abec3f54f1320b1a78da60e4d3ee68e..4d7851f1b3c07b60f2a0143384949082512e09b1 100644
--- a/signer/rules/rules.go
+++ b/signer/rules/rules.go
@@ -22,11 +22,11 @@ import (
 	"os"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/signer/core"
-	"github.com/ethereum/go-ethereum/signer/rules/deps"
-	"github.com/ethereum/go-ethereum/signer/storage"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/signer/core"
+	"github.com/maticnetwork/bor/signer/rules/deps"
+	"github.com/maticnetwork/bor/signer/storage"
 	"github.com/robertkrimen/otto"
 )
 
diff --git a/signer/rules/rules_test.go b/signer/rules/rules_test.go
index e1a23236cd820b96cbca72e7acb9f1f55154ea55..790b779491f2acfbf7b070269c02f09f554e2670 100644
--- a/signer/rules/rules_test.go
+++ b/signer/rules/rules_test.go
@@ -22,13 +22,13 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/internal/ethapi"
-	"github.com/ethereum/go-ethereum/signer/core"
-	"github.com/ethereum/go-ethereum/signer/storage"
+	"github.com/maticnetwork/bor/accounts"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/internal/ethapi"
+	"github.com/maticnetwork/bor/signer/core"
+	"github.com/maticnetwork/bor/signer/storage"
 )
 
 const JS = `
diff --git a/signer/storage/aes_gcm_storage.go b/signer/storage/aes_gcm_storage.go
index e6a8f145cc089d01c1b4d571a6ebfdc48a1aa712..294e047052c242d6076ef9280c1c8f96585c11e4 100644
--- a/signer/storage/aes_gcm_storage.go
+++ b/signer/storage/aes_gcm_storage.go
@@ -26,7 +26,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/log"
 )
 
 type storedCredential struct {
diff --git a/signer/storage/aes_gcm_storage_test.go b/signer/storage/aes_gcm_storage_test.go
index 0aaaf58d257db84ba571bf57ef599b646ccc2aa6..82cb3d464483a19ec1126b3c234a3fb35a1f815d 100644
--- a/signer/storage/aes_gcm_storage_test.go
+++ b/signer/storage/aes_gcm_storage_test.go
@@ -23,8 +23,8 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/log"
 	"github.com/mattn/go-colorable"
 )
 
diff --git a/tests/block_test_util.go b/tests/block_test_util.go
index 81dd7b1d042ad9fdc277dcd65a7aa0159a0360f7..9627d766246f77b7bc99236ce391a9754d2eabd7 100644
--- a/tests/block_test_util.go
+++ b/tests/block_test_util.go
@@ -24,18 +24,18 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/consensus"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // A BlockTest checks handling of entire blocks.
diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go
index fde9db3ad4d3c081bd97f462af32a3b599f2ae99..9bd99f6ccc20a36a06aae1e024031f9973418706 100644
--- a/tests/difficulty_test.go
+++ b/tests/difficulty_test.go
@@ -20,8 +20,8 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/params"
 )
 
 var (
diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go
index fe6e90b027f26bea8aae8aaf622dbaa1ab9b92dd..43816285710c94303beff55a880213b34eaea3ac 100644
--- a/tests/difficulty_test_util.go
+++ b/tests/difficulty_test_util.go
@@ -20,11 +20,11 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/consensus/ethash"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/params"
 )
 
 //go:generate gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go
diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go
index f2e086a7b3be9c1063edd3f58ff54dbd72d2ba4b..3b0f78ba166f31aafce52464e88fece9547b7c56 100644
--- a/tests/gen_btheader.go
+++ b/tests/gen_btheader.go
@@ -6,10 +6,10 @@ import (
 	"encoding/json"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/core/types"
 )
 
 var _ = (*btHeaderMarshaling)(nil)
diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go
index cd15ae31b5d311f90e613884d65a5511dfcc2c3c..eb796091da9b1e2cdf8717168323f30702c18f23 100644
--- a/tests/gen_difficultytest.go
+++ b/tests/gen_difficultytest.go
@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
 )
 
 var _ = (*difficultyTestMarshaling)(nil)
diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go
index 1d4baf2fd79cd3883fd079e206ead7d034269aad..7dc0b211b7cc87c6cf9ab7f6e19bde24d708da5b 100644
--- a/tests/gen_stenv.go
+++ b/tests/gen_stenv.go
@@ -7,8 +7,8 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/math"
 )
 
 var _ = (*stEnvMarshaling)(nil)
diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go
index 451ffcbf43a16678c8e03f3c7aef6e7768493a62..c4268b95ff36d20f88e2df1b8b8d4df774c61cb2 100644
--- a/tests/gen_sttransaction.go
+++ b/tests/gen_sttransaction.go
@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
 )
 
 var _ = (*stTransactionMarshaling)(nil)
diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go
index a5f01cf45695171dab3c91750b47e10df6318438..4a484ea89861b5ea544d214ad73c7482dac72edb 100644
--- a/tests/gen_vmexec.go
+++ b/tests/gen_vmexec.go
@@ -7,9 +7,9 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
 )
 
 var _ = (*vmExecMarshaling)(nil)
diff --git a/tests/init.go b/tests/init.go
index 188cdffe9d7346ef558a9641d7bd2a4bf0570673..f023b179920dc3c6e3928245b4e9a6eaa62570bb 100644
--- a/tests/init.go
+++ b/tests/init.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/params"
 )
 
 // Forks table defines supported forks and their chain config.
diff --git a/tests/init_test.go b/tests/init_test.go
index 053cbd6fcd390c07525365bfe7c04ffa85078653..1b0e0d9f8af01b21f61a5299eaed686e2b39c126 100644
--- a/tests/init_test.go
+++ b/tests/init_test.go
@@ -30,7 +30,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/params"
 )
 
 var (
diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go
index 9069ec55a15dcb2012f87c60781ffb2f95af3044..6a5f51ecb65752a00ae417f8c652f2568c67ac9c 100644
--- a/tests/rlp_test_util.go
+++ b/tests/rlp_test_util.go
@@ -24,7 +24,7 @@ import (
 	"math/big"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // RLPTest is the JSON structure of a single RLP test.
diff --git a/tests/state_test.go b/tests/state_test.go
index 8b69da91f2637d166da79f86d26dc8a8d258792a..41dfddad337d55ddee79e993ca4b4a761ccc74cb 100644
--- a/tests/state_test.go
+++ b/tests/state_test.go
@@ -24,8 +24,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/maticnetwork/bor/cmd/utils"
+	"github.com/maticnetwork/bor/core/vm"
 )
 
 func TestState(t *testing.T) {
diff --git a/tests/state_test_util.go b/tests/state_test_util.go
index 0b78f26ed1af21fadfb05fc697286643c80e164a..96aee6741858f4b6a30faf2f2e3647920f31f8c8 100644
--- a/tests/state_test_util.go
+++ b/tests/state_test_util.go
@@ -23,18 +23,18 @@ import (
 	"math/big"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/tests/transaction_test.go b/tests/transaction_test.go
index 0e3670d04bf7ae7ad95ba5824e26e522fe735ed5..1a4046a88113cbb5ae11117c0bd145e86da8a203 100644
--- a/tests/transaction_test.go
+++ b/tests/transaction_test.go
@@ -19,7 +19,7 @@ package tests
 import (
 	"testing"
 
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/params"
 )
 
 func TestTransaction(t *testing.T) {
diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go
index 12444720cc7a78c15f78d17d8e1905e661f74504..54b72f565bcffa5d6a3cffef6b566cad012aed35 100644
--- a/tests/transaction_test_util.go
+++ b/tests/transaction_test_util.go
@@ -19,12 +19,12 @@ package tests
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/types"
+	"github.com/maticnetwork/bor/params"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // TransactionTest checks RLP decoding and sender derivation of transactions.
diff --git a/tests/vm_test.go b/tests/vm_test.go
index 441483dffa4c481246a659b7bde6efcfd0af82ad..6e25bd765d73c490670fbff88c7a535629c8562f 100644
--- a/tests/vm_test.go
+++ b/tests/vm_test.go
@@ -19,7 +19,7 @@ package tests
 import (
 	"testing"
 
-	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/maticnetwork/bor/core/vm"
 )
 
 func TestVM(t *testing.T) {
diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go
index 91566c47e34783939bd15ee19fece88e15f49a3d..1e854f3caa2a0ce8d14a4fa9f5e6f0e8974dfac4 100644
--- a/tests/vm_test_util.go
+++ b/tests/vm_test_util.go
@@ -22,15 +22,15 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/common/math"
+	"github.com/maticnetwork/bor/core"
+	"github.com/maticnetwork/bor/core/rawdb"
+	"github.com/maticnetwork/bor/core/state"
+	"github.com/maticnetwork/bor/core/vm"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/params"
 )
 
 // VMTest checks EVM execution without block or transaction context.
diff --git a/trie/database.go b/trie/database.go
index d8a0fa9c5342e4cbcc6a139f9266cdf128981775..2118a85591bfcd39dfafa2decef40788424b80a0 100644
--- a/trie/database.go
+++ b/trie/database.go
@@ -26,11 +26,11 @@ import (
 	"time"
 
 	"github.com/allegro/bigcache"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 var (
diff --git a/trie/database_test.go b/trie/database_test.go
index 81c469500f983b89c3832fdeb2acaea3cb58a0d4..c3859cb0b72120a39246852ed3cb01376d9322a1 100644
--- a/trie/database_test.go
+++ b/trie/database_test.go
@@ -19,8 +19,8 @@ package trie
 import (
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethdb/memorydb"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/ethdb/memorydb"
 )
 
 // Tests that the trie database returns a missing trie node error if attempting
diff --git a/trie/errors.go b/trie/errors.go
index 567b80078c062415e1ff50f6df26cf6846bd05d2..199a95f551645183f1a551d77032e4e980e48e69 100644
--- a/trie/errors.go
+++ b/trie/errors.go
@@ -19,7 +19,7 @@ package trie
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 )
 
 // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete)
diff --git a/trie/hasher.go b/trie/hasher.go
index 54f6a9de2b6ae5207a6583cdd9508ad99cfa548f..baa1ca23a7df62048af9c043e7b0d2dfcee75bbb 100644
--- a/trie/hasher.go
+++ b/trie/hasher.go
@@ -20,8 +20,8 @@ import (
 	"hash"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/rlp"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/trie/iterator.go b/trie/iterator.go
index da93b2fadb3bfdc75dcab9aa668c819a1cd38c98..3145e7c0c8092f7acafa523b82ae6aad2c5d0951 100644
--- a/trie/iterator.go
+++ b/trie/iterator.go
@@ -21,8 +21,8 @@ import (
 	"container/heap"
 	"errors"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // Iterator is a key-value trie iterator that traverses a Trie.
diff --git a/trie/iterator_test.go b/trie/iterator_test.go
index 88b8103fb3f2c6ad3fb063e055fa738039beecb7..325bdf56cc78111d0e0f13c310424fa1712a6d87 100644
--- a/trie/iterator_test.go
+++ b/trie/iterator_test.go
@@ -22,8 +22,8 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethdb/memorydb"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/ethdb/memorydb"
 )
 
 func TestIterator(t *testing.T) {
diff --git a/trie/node.go b/trie/node.go
index f4055e779a1b7af56a987273801468d6e5091763..f7f6d8629180ffd867ded9fabfc7fab6e8ca7492 100644
--- a/trie/node.go
+++ b/trie/node.go
@@ -21,8 +21,8 @@ import (
 	"io"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 var indices = []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "[17]"}
diff --git a/trie/proof.go b/trie/proof.go
index 9985e730dd377d46cb4aaba416a93e5092eb2f32..c5d3c1aa2b8f6b3af38414a666cc9c2dc8675efd 100644
--- a/trie/proof.go
+++ b/trie/proof.go
@@ -20,10 +20,10 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // Prove constructs a merkle proof for key. The result contains all encoded nodes
diff --git a/trie/proof_test.go b/trie/proof_test.go
index c488f342c872ecf6e2cfef9bdfe5ad28990e8b85..8a3891f233df8b7e66876057c5a3af961bc93c6a 100644
--- a/trie/proof_test.go
+++ b/trie/proof_test.go
@@ -23,9 +23,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb/memorydb"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb/memorydb"
 )
 
 func init() {
diff --git a/trie/secure_trie.go b/trie/secure_trie.go
index fbc591ed108a536d68cfa3ee7901ee0b2ddeff06..6ad8c1847de548efe9c53af004badd274dbbf3f8 100644
--- a/trie/secure_trie.go
+++ b/trie/secure_trie.go
@@ -19,8 +19,8 @@ package trie
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/log"
 )
 
 // SecureTrie wraps a trie with key hashing. In a secure trie, all
diff --git a/trie/secure_trie_test.go b/trie/secure_trie_test.go
index fb6c38ee222b00cdaf9a831b9dbcfff04379a908..5eaf9e8f32e58937be70e0a30f03cd58fb884097 100644
--- a/trie/secure_trie_test.go
+++ b/trie/secure_trie_test.go
@@ -22,9 +22,9 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb/memorydb"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb/memorydb"
 )
 
 func newEmptySecure() *SecureTrie {
diff --git a/trie/sync.go b/trie/sync.go
index 6f40b45a1ebbfd30f212d31a72387e7952e0a8e6..175b0b7cb2d4178e706d6ce3a2e8f1051632a273 100644
--- a/trie/sync.go
+++ b/trie/sync.go
@@ -20,9 +20,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/prque"
-	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/prque"
+	"github.com/maticnetwork/bor/ethdb"
 )
 
 // ErrNotRequested is returned by the trie sync when it's requested to process a
diff --git a/trie/sync_bloom.go b/trie/sync_bloom.go
index 2182d1c4377237bd066bc616aa8fe96235c6acf2..31f5b18f5a167ae44cdcedeeb22c41fd6af27509 100644
--- a/trie/sync_bloom.go
+++ b/trie/sync_bloom.go
@@ -24,10 +24,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/metrics"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/metrics"
 	"github.com/steakknife/bloomfilter"
 )
 
diff --git a/trie/sync_test.go b/trie/sync_test.go
index 0621bb43570e8dad1a436455a29da38110279c8c..1fa2bdb6f670085e811c49032dde951ac2472f00 100644
--- a/trie/sync_test.go
+++ b/trie/sync_test.go
@@ -20,8 +20,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethdb/memorydb"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/ethdb/memorydb"
 )
 
 // makeTestTrie create a sample test trie to test node-wise reconstruction.
diff --git a/trie/trie.go b/trie/trie.go
index 920e331fd62f495112cce966a3a3bb8270b7797d..7291fb0b65a3fa5c7cbc8ea44729d2fd015e4f71 100644
--- a/trie/trie.go
+++ b/trie/trie.go
@@ -21,9 +21,9 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
 )
 
 var (
diff --git a/trie/trie_test.go b/trie/trie_test.go
index ea0b3cbdd722e86d572ca37e2e0073fb8d851623..9c51d90f9d794b357983f34f769b36335e9e1d68 100644
--- a/trie/trie_test.go
+++ b/trie/trie_test.go
@@ -29,12 +29,12 @@ import (
 	"testing/quick"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/ethdb/leveldb"
-	"github.com/ethereum/go-ethereum/ethdb/memorydb"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/ethdb"
+	"github.com/maticnetwork/bor/ethdb/leveldb"
+	"github.com/maticnetwork/bor/ethdb/memorydb"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 func init() {
diff --git a/whisper/mailserver/mailserver.go b/whisper/mailserver/mailserver.go
index d7af4baae3f9501ba7043c3f295e78e3da474b08..6e1dc8e14eb74c368ab3d9038ffb9085a00408fa 100644
--- a/whisper/mailserver/mailserver.go
+++ b/whisper/mailserver/mailserver.go
@@ -21,11 +21,11 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rlp"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/rlp"
+	whisper "github.com/maticnetwork/bor/whisper/whisperv6"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 	"github.com/syndtr/goleveldb/leveldb/util"
diff --git a/whisper/mailserver/server_test.go b/whisper/mailserver/server_test.go
index edb817cc75ab5212e2fa4f7c5ed6cccd2a5415e8..70f1930eddabb182ae71d220e1316671fafef6fc 100644
--- a/whisper/mailserver/server_test.go
+++ b/whisper/mailserver/server_test.go
@@ -25,9 +25,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	whisper "github.com/maticnetwork/bor/whisper/whisperv6"
 )
 
 const powRequirement = 0.00001
diff --git a/whisper/shhclient/client.go b/whisper/shhclient/client.go
index a814154e4795902f07460783390bd5b701ecc41a..226ab4fbd41ba71f80e73d634dab2f26562f445b 100644
--- a/whisper/shhclient/client.go
+++ b/whisper/shhclient/client.go
@@ -19,10 +19,10 @@ package shhclient
 import (
 	"context"
 
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/rpc"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
+	"github.com/maticnetwork/bor"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/rpc"
+	whisper "github.com/maticnetwork/bor/whisper/whisperv6"
 )
 
 // Client defines typed wrappers for the Whisper v6 RPC API.
diff --git a/whisper/whisperv6/api.go b/whisper/whisperv6/api.go
index d6d4c8d3ded6afe1f9f3bdb4497d94435861b816..60d2f5ff2d957ef79416b8386187f6cd12acd279 100644
--- a/whisper/whisperv6/api.go
+++ b/whisper/whisperv6/api.go
@@ -24,12 +24,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/rpc"
 )
 
 // List of errors
diff --git a/whisper/whisperv6/benchmarks_test.go b/whisper/whisperv6/benchmarks_test.go
index 0473179da5a579a1d3c84212562af42257d0d085..de5d8f15984d7c52cb75738fb118d3844c7fa0a6 100644
--- a/whisper/whisperv6/benchmarks_test.go
+++ b/whisper/whisperv6/benchmarks_test.go
@@ -20,7 +20,7 @@ import (
 	"crypto/sha256"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/crypto"
 	"golang.org/x/crypto/pbkdf2"
 )
 
diff --git a/whisper/whisperv6/envelope.go b/whisper/whisperv6/envelope.go
index 5b6925edb3b58b9ef18e4abae1fb4ace5ea135c0..68f2a1735bda0a4672fd289b15a37b66f1424916 100644
--- a/whisper/whisperv6/envelope.go
+++ b/whisper/whisperv6/envelope.go
@@ -26,10 +26,10 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/crypto/ecies"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/crypto/ecies"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // Envelope represents a clear-text data packet to transmit through the Whisper
diff --git a/whisper/whisperv6/envelope_test.go b/whisper/whisperv6/envelope_test.go
index c0bb4373b884fc14507da1cae2e675b5efd78c1f..70e3fe78d15ae8bba1e2f759103fd1a21bee3f88 100644
--- a/whisper/whisperv6/envelope_test.go
+++ b/whisper/whisperv6/envelope_test.go
@@ -22,7 +22,7 @@ import (
 	mrand "math/rand"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 func TestPoWCalculationsWithNoLeadingZeros(t *testing.T) {
diff --git a/whisper/whisperv6/filter.go b/whisper/whisperv6/filter.go
index 6a5b79674b5c0a5ec3935417fb8671108ab068e0..7a0f19d75fd6f31668e35ec49b4436350d5c014c 100644
--- a/whisper/whisperv6/filter.go
+++ b/whisper/whisperv6/filter.go
@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
 )
 
 // Filter represents a Whisper message filter
diff --git a/whisper/whisperv6/filter_test.go b/whisper/whisperv6/filter_test.go
index 5ce99d9f6ce93a6a58c78d297aabcb15b7686957..efabb7407f7b7e538d63ae360e573190b5f245ad 100644
--- a/whisper/whisperv6/filter_test.go
+++ b/whisper/whisperv6/filter_test.go
@@ -22,8 +22,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
 )
 
 var seed int64
diff --git a/whisper/whisperv6/gen_criteria_json.go b/whisper/whisperv6/gen_criteria_json.go
index 1a428d6df7306303df147aac05e7aa6e28ee56ca..b2ceb321e4b6fbeb03900f57af25523d98af8783 100644
--- a/whisper/whisperv6/gen_criteria_json.go
+++ b/whisper/whisperv6/gen_criteria_json.go
@@ -5,7 +5,7 @@ package whisperv6
 import (
 	"encoding/json"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 var _ = (*criteriaOverride)(nil)
diff --git a/whisper/whisperv6/gen_message_json.go b/whisper/whisperv6/gen_message_json.go
index 6218f5df6ed900bcad44d6ca94cedecc3c518990..8b0129a198e64677a3725f787b62e774909fc6dd 100644
--- a/whisper/whisperv6/gen_message_json.go
+++ b/whisper/whisperv6/gen_message_json.go
@@ -5,7 +5,7 @@ package whisperv6
 import (
 	"encoding/json"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 var _ = (*messageOverride)(nil)
diff --git a/whisper/whisperv6/gen_newmessage_json.go b/whisper/whisperv6/gen_newmessage_json.go
index 75a1279ae3ac27f51a36ef878666c7b3a4f38e16..7d281cd6911e9d21885f06d7e302fc601b327120 100644
--- a/whisper/whisperv6/gen_newmessage_json.go
+++ b/whisper/whisperv6/gen_newmessage_json.go
@@ -5,7 +5,7 @@ package whisperv6
 import (
 	"encoding/json"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 var _ = (*newMessageOverride)(nil)
diff --git a/whisper/whisperv6/message.go b/whisper/whisperv6/message.go
index 2d4e862441097375a798c4a2d7c30f8e18fb3dde..282733d9fdd80e82ac34bc12446b91c19c85e97a 100644
--- a/whisper/whisperv6/message.go
+++ b/whisper/whisperv6/message.go
@@ -28,10 +28,10 @@ import (
 	mrand "math/rand"
 	"strconv"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/crypto/ecies"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/crypto/ecies"
+	"github.com/maticnetwork/bor/log"
 )
 
 // MessageParams specifies the exact way a message should be wrapped
diff --git a/whisper/whisperv6/message_test.go b/whisper/whisperv6/message_test.go
index 0a5c1c85333a436cd0747fe93da4069805d540ad..a77d0fb1c24ae1cb57b103575025ac58afa957af 100644
--- a/whisper/whisperv6/message_test.go
+++ b/whisper/whisperv6/message_test.go
@@ -23,9 +23,9 @@ import (
 	mrand "math/rand"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 func generateMessageParams() (*MessageParams, error) {
diff --git a/whisper/whisperv6/peer.go b/whisper/whisperv6/peer.go
index 621d5120818a6d7384cbba9d5c5d7e0212acd911..2505d1eec8412998719ec74170347be031a917fe 100644
--- a/whisper/whisperv6/peer.go
+++ b/whisper/whisperv6/peer.go
@@ -23,10 +23,10 @@ import (
 	"time"
 
 	mapset "github.com/deckarep/golang-set"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 // Peer represents a whisper protocol peer connection.
diff --git a/whisper/whisperv6/peer_test.go b/whisper/whisperv6/peer_test.go
index c5b044e1a6381fc4086084e19ffd286d84903b22..417a2bf236cd2d01c24b55d21f0c652ab98d34c5 100644
--- a/whisper/whisperv6/peer_test.go
+++ b/whisper/whisperv6/peer_test.go
@@ -28,13 +28,13 @@ import (
 
 	"net"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/nat"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/p2p/enode"
+	"github.com/maticnetwork/bor/p2p/nat"
+	"github.com/maticnetwork/bor/rlp"
 )
 
 var keys = []string{
diff --git a/whisper/whisperv6/topic.go b/whisper/whisperv6/topic.go
index 4dd8f283c357f6f35ee8b4e7b8a307fb895e96c9..333416a4807cea31d1c243e84c9113ce1fec7dd2 100644
--- a/whisper/whisperv6/topic.go
+++ b/whisper/whisperv6/topic.go
@@ -19,8 +19,8 @@
 package whisperv6
 
 import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/common/hexutil"
 )
 
 // TopicType represents a cryptographically secure, probabilistic partial
diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go
index eb713f84ee5c884232a4afd5696dc2ca52ed3f2d..b5daa5fc394b2ae76dae9d1b5e001f2b2a6ff6bb 100644
--- a/whisper/whisperv6/whisper.go
+++ b/whisper/whisperv6/whisper.go
@@ -27,12 +27,12 @@ import (
 	"time"
 
 	mapset "github.com/deckarep/golang-set"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/maticnetwork/bor/common"
+	"github.com/maticnetwork/bor/crypto"
+	"github.com/maticnetwork/bor/log"
+	"github.com/maticnetwork/bor/p2p"
+	"github.com/maticnetwork/bor/rlp"
+	"github.com/maticnetwork/bor/rpc"
 	"github.com/syndtr/goleveldb/leveldb/errors"
 	"golang.org/x/crypto/pbkdf2"
 	"golang.org/x/sync/syncmap"
diff --git a/whisper/whisperv6/whisper_test.go b/whisper/whisperv6/whisper_test.go
index 895bb2b969f9b63c93de8c2886e1f15c77fbebd9..aa8ac3d1979cea1f9d785c7890c9d85aa5a583c3 100644
--- a/whisper/whisperv6/whisper_test.go
+++ b/whisper/whisperv6/whisper_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/maticnetwork/bor/common"
 	"golang.org/x/crypto/pbkdf2"
 )