diff --git a/AUTHORS.md b/AUTHORS.md
index 5784ad41f11..448fa50feef 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -8,4 +8,4 @@ contributions under the terms of the [Apache License, Version 2.0]
 * Jack Zampolin (@jackzampolin)
 
 [Apache License, Version 2.0]: https://www.apache.org/licenses/LICENSE-2.0
-[LICENSE]: https://github.com/ovrclk/relayer/blob/master/LICENSE
\ No newline at end of file
+[LICENSE]: https://github.com/cosmos/relayer/blob/master/LICENSE
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 11e4c261dc8..355bca9d542 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,10 @@ all: ci-lint install
 # Build / Install
 ###############################################################################
 
-LD_FLAGS = -X github.com/ovrclk/relayer/cmd.Version=$(VERSION) \
-	-X github.com/ovrclk/relayer/cmd.Commit=$(COMMIT) \
-	-X github.com/ovrclk/relayer/cmd.SDKCommit=$(SDKCOMMIT) \
-	-X github.com/ovrclk/relayer/cmd.GaiaCommit=$(GAIACOMMIT)
+LD_FLAGS = -X github.com/cosmos/relayer/cmd.Version=$(VERSION) \
+	-X github.com/cosmos/relayer/cmd.Commit=$(COMMIT) \
+	-X github.com/cosmos/relayer/cmd.SDKCommit=$(SDKCOMMIT) \
+	-X github.com/cosmos/relayer/cmd.GaiaCommit=$(GAIACOMMIT)
 
 BUILD_FLAGS := -ldflags '$(LD_FLAGS)'
 
diff --git a/README.md b/README.md
index 4a50750d119..e5b504105a8 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ![GOZ](./docs/images/github-repo-banner.png)
 
-![Relayer Build](https://github.com/ovrclk/relayer/workflows/Build%20then%20run%20CI%20Chains/badge.svg)
+![Relayer Build](https://github.com/cosmos/relayer/workflows/Build%20then%20run%20CI%20Chains/badge.svg)
 
 The Cosmos IBC `relayer` package contains a basic relayer implementation that is
 meant for users wishing to relay packets/data between sets of IBC enabled chains.
@@ -27,7 +27,7 @@ If you would like to join a relayer testnet, please [check out the instructions]
 
 | chain | tests | supported ports |
 |-------|--------|----------------|
-| [`gaia`](https://github.com/cosmos/gaia) | ![gaia](https://github.com/ovrclk/relayer/workflows/TESTING%20-%20gaia%20to%20gaia%20integration/badge.svg) | `transfer` |
+| [`gaia`](https://github.com/cosmos/gaia) | ![gaia](https://github.com/cosmos/relayer/workflows/TESTING%20-%20gaia%20to%20gaia%20integration/badge.svg) | `transfer` |
 
 ## Demoing the Relayer
 
diff --git a/cmd/chains.go b/cmd/chains.go
index 3a206b012de..9c7f596476e 100644
--- a/cmd/chains.go
+++ b/cmd/chains.go
@@ -12,7 +12,7 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/ovrclk/relayer/relayer"
+	"github.com/cosmos/relayer/relayer"
 )
 
 const (
@@ -268,6 +268,7 @@ func chainsAddDirCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "add-dir [dir]",
 		Aliases: []string{"ad"},
+		Args:    cobra.ExactArgs(1),
 		Short: `Add new chains to the configuration file from a directory 
 		full of chain configuration, useful for adding testnet configurations`,
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
diff --git a/cmd/config.go b/cmd/config.go
index 2f3c9c54970..adb05edf5d1 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	"github.com/ovrclk/relayer/relayer"
+	"github.com/cosmos/relayer/relayer"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"gopkg.in/yaml.v2"
@@ -146,6 +146,7 @@ func configAddDirCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "add-dir [dir]",
 		Aliases: []string{"ad"},
+		Args:    cobra.ExactArgs(1),
 		Short: `Add new chains and paths to the configuration file from a
 		 directory full of chain and path configuration, useful for adding testnet configurations`,
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
diff --git a/cmd/keys.go b/cmd/keys.go
index 4b40cc8cd58..e4246797f68 100644
--- a/cmd/keys.go
+++ b/cmd/keys.go
@@ -23,7 +23,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/hd"
 	"github.com/spf13/cobra"
 
-	"github.com/ovrclk/relayer/relayer"
+	"github.com/cosmos/relayer/relayer"
 )
 
 // keysCmd represents the keys command
diff --git a/cmd/light.go b/cmd/light.go
index fdb81e0d601..b1e3c06aed6 100644
--- a/cmd/light.go
+++ b/cmd/light.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	tmclient "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
-	"github.com/ovrclk/relayer/relayer"
+	"github.com/cosmos/relayer/relayer"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/paths.go b/cmd/paths.go
index 5da82ea6dae..ee0ba0bd4fa 100644
--- a/cmd/paths.go
+++ b/cmd/paths.go
@@ -9,7 +9,7 @@ import (
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"
 	conntypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types"
 	chantypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types"
-	"github.com/ovrclk/relayer/relayer"
+	"github.com/cosmos/relayer/relayer"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 )
diff --git a/cmd/query.go b/cmd/query.go
index 4bd6112269d..924b722d81b 100644
--- a/cmd/query.go
+++ b/cmd/query.go
@@ -12,7 +12,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"
 	tmclient "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
-	"github.com/ovrclk/relayer/relayer"
+	"github.com/cosmos/relayer/relayer"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/raw.go b/cmd/raw.go
index a5691d40d8d..f03e1e01711 100644
--- a/cmd/raw.go
+++ b/cmd/raw.go
@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"
-	"github.com/ovrclk/relayer/relayer"
+	"github.com/cosmos/relayer/relayer"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/start.go b/cmd/start.go
index 478789660d1..928828b219a 100644
--- a/cmd/start.go
+++ b/cmd/start.go
@@ -21,7 +21,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/ovrclk/relayer/relayer"
+	"github.com/cosmos/relayer/relayer"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/strategy.go b/cmd/strategy.go
index 7f1f8c742f6..d2d87c9f09b 100644
--- a/cmd/strategy.go
+++ b/cmd/strategy.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/ovrclk/relayer/relayer"
+	"github.com/cosmos/relayer/relayer"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/testnets.go b/cmd/testnets.go
index 39f30f888ad..0b2eebd7805 100644
--- a/cmd/testnets.go
+++ b/cmd/testnets.go
@@ -11,8 +11,8 @@ import (
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/relayer/relayer"
 	"github.com/gorilla/mux"
-	"github.com/ovrclk/relayer/relayer"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/tx.go b/cmd/tx.go
index 50546fa3b5e..d29b24c9f2d 100644
--- a/cmd/tx.go
+++ b/cmd/tx.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	"github.com/ovrclk/relayer/relayer"
+	"github.com/cosmos/relayer/relayer"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/xfer.go b/cmd/xfer.go
index e8571415527..68f190adb32 100644
--- a/cmd/xfer.go
+++ b/cmd/xfer.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/spf13/cobra"
 
-	"github.com/ovrclk/relayer/relayer"
+	"github.com/cosmos/relayer/relayer"
 )
 
 // NOTE: These commands are registered over in cmd/raw.go
diff --git a/dev-env b/dev-env
index bb2080779ac..8bce9a17985 100755
--- a/dev-env
+++ b/dev-env
@@ -1,6 +1,6 @@
 #/bin/bash -e
 
-RELAYER_DIR="$GOPATH/src/github.com/ovrclk/relayer"
+RELAYER_DIR="$GOPATH/src/github.com/cosmos/relayer"
 RELAYER_CONF="$HOME/.relayer"
 GAIA_CONF="$(pwd)/data"
 
diff --git a/go.mod b/go.mod
index 4ac921755d2..e643b66cb33 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/ovrclk/relayer
+module github.com/cosmos/relayer
 
 go 1.14
 
diff --git a/main.go b/main.go
index 906fdc248b5..120b750f1ab 100644
--- a/main.go
+++ b/main.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 package main
 
-import "github.com/ovrclk/relayer/cmd"
+import "github.com/cosmos/relayer/cmd"
 
 func main() {
 	cmd.Execute()
diff --git a/scripts/config-relayer b/scripts/config-relayer
index 5217ee69966..b6a912f48c9 100755
--- a/scripts/config-relayer
+++ b/scripts/config-relayer
@@ -7,7 +7,7 @@ if [[ ! -x "$(which jq)" ]]; then
   exit 1
 fi
 
-RELAYER_DIR="$GOPATH/src/github.com/ovrclk/relayer"
+RELAYER_DIR="$GOPATH/src/github.com/cosmos/relayer"
 RELAYER_CONF="$HOME/.relayer"
 GAIA_CONF="$RELAYER_DIR/data"
 
diff --git a/scripts/config-relayer-akash b/scripts/config-relayer-akash
index 421a71d3fbb..368e99b0526 100755
--- a/scripts/config-relayer-akash
+++ b/scripts/config-relayer-akash
@@ -7,7 +7,7 @@ if [[ ! -x "$(which jq)" ]]; then
   exit 1
 fi
 
-RELAYER_DIR="$GOPATH/src/github.com/ovrclk/relayer"
+RELAYER_DIR="$GOPATH/src/github.com/cosmos/relayer"
 RELAYER_CONF="$HOME/.relayer"
 GAIA_CONF="$RELAYER_DIR/data"
 
diff --git a/scripts/config-three b/scripts/config-three
index 99721b91e74..e4a5b7b81fd 100755
--- a/scripts/config-three
+++ b/scripts/config-three
@@ -7,7 +7,7 @@ if [[ ! -x "$(which jq)" ]]; then
   exit 1
 fi
 
-RELAYER_DIR="$GOPATH/src/github.com/ovrclk/relayer"
+RELAYER_DIR="$GOPATH/src/github.com/cosmos/relayer"
 RELAYER_CONF="$HOME/.relayer"
 GAIA_CONF="$RELAYER_DIR/data"
 
diff --git a/scripts/four-chainz b/scripts/four-chainz
index a8e6b7ff784..04fa11d81f8 100755
--- a/scripts/four-chainz
+++ b/scripts/four-chainz
@@ -14,7 +14,7 @@ if [[ ! -x "$(which docker-compose)" ]]; then
   exit 1
 fi
 
-RELAYER_DIR="$GOPATH/src/github.com/ovrclk/relayer"
+RELAYER_DIR="$GOPATH/src/github.com/cosmos/relayer"
 RELAYER_CONF="$HOME/.relayer"
 ENV_FILE="$RELAYER_DIR/.env"
 
diff --git a/test/relayer_gaia_test.go b/test/relayer_gaia_test.go
index 731e6a7d325..f4cf433786c 100644
--- a/test/relayer_gaia_test.go
+++ b/test/relayer_gaia_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/ovrclk/relayer/relayer"
+	"github.com/cosmos/relayer/relayer"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/test/test_chains.go b/test/test_chains.go
index 3a7859cd53b..eccd1d128aa 100644
--- a/test/test_chains.go
+++ b/test/test_chains.go
@@ -8,7 +8,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/server"
 	"github.com/stretchr/testify/require"
 
-	ry "github.com/ovrclk/relayer/relayer"
+	ry "github.com/cosmos/relayer/relayer"
 )
 
 var (
diff --git a/test/test_queries.go b/test/test_queries.go
index c2e76feb6fa..8a2ea3bb863 100644
--- a/test/test_queries.go
+++ b/test/test_queries.go
@@ -8,7 +8,7 @@ import (
 	clientypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"
 	"github.com/stretchr/testify/require"
 
-	ry "github.com/ovrclk/relayer/relayer"
+	ry "github.com/cosmos/relayer/relayer"
 )
 
 // testClientPair tests that the client for src on dst and dst on src are the only clients on those chains
diff --git a/test/test_setup.go b/test/test_setup.go
index 6c80409df7f..89b6df06484 100644
--- a/test/test_setup.go
+++ b/test/test_setup.go
@@ -13,8 +13,8 @@ import (
 	dc "github.com/ory/dockertest/v3/docker"
 	"github.com/stretchr/testify/require"
 
-	"github.com/ovrclk/relayer/relayer"
-	ry "github.com/ovrclk/relayer/relayer"
+	"github.com/cosmos/relayer/relayer"
+	ry "github.com/cosmos/relayer/relayer"
 )
 
 // spinUpTestChains is to be passed any number of test chains with given configuration options
diff --git a/testnets/README.md b/testnets/README.md
index b459566fe1b..97ad2ca5681 100644
--- a/testnets/README.md
+++ b/testnets/README.md
@@ -87,7 +87,7 @@ echo 'export GOPATH=$HOME/go' >> ~/.profile
 echo 'export GOBIN=$GOPATH/bin' >> ~/.profile
 echo 'export PATH=$PATH:/usr/local/go/bin:$GOBIN' >> ~/.profile
 echo "export GAIA=\$GOPATH/src/github.com/cosmos/gaia" >> ~/.profile
-echo "export RELAYER=\$GOPATH/src/github.com/ovrclk/relayer" >> ~/.profile
+echo "export RELAYER=\$GOPATH/src/github.com/cosmos/relayer" >> ~/.profile
 source ~/.profile
 
 # Set these variables to different values that are specific to your chain
@@ -101,7 +101,7 @@ export ACCOUNT_PREFIX=cosmos
 
 # Start by downloading and installing both gaia and the relayer
 mkdir -p $(dirname $GAIA) && git clone https://github.com/cosmos/gaia $GAIA && cd $GAIA && git checkout $GAIASHA && make install
-mkdir -p $(dirname $RELAYER) && git clone https://github.com/ovrclk/relayer $RELAYER && cd $RELAYER && make install
+mkdir -p $(dirname $RELAYER) && git clone https://github.com/cosmos/relayer $RELAYER && cd $RELAYER && make install
 
 # Now its time to configure both the relayer and gaia, start with the relayer
 cd
@@ -144,8 +144,8 @@ Once you have your server (you could deploy the relayer on a different machine a
 
 ```bash
 # install the relayer
-export RELAYER=$GOPATH/src/github.com/ovrclk/relayer
-mkdir -p $(dirname $RELAYER) && git clone git@github.com:ovrclk/relayer $RELAYER && cd $RELAYER
+export RELAYER=$GOPATH/src/github.com/cosmos/relayer
+mkdir -p $(dirname $RELAYER) && git clone git@github.com:cosmos/relayer $RELAYER && cd $RELAYER
 make install
 
 # then to configure your local relayer to talk to your remote chain