diff --git a/.travis.yml b/.travis.yml
index de0043a9..c19c1e3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ services:
 
 before_install:
   - go get -u golang.org/x/lint/golint
-  - curl -L https://github.com/SimonBaeumer/commander/releases/download/v1.2.1/commander-linux-amd64 -o ~/bin/commander
+  - curl -L https://github.com/commander-cli/commander/releases/download/v1.2.1/commander-linux-amd64 -o ~/bin/commander
   - chmod +x ~/bin/commander
 
 jobs:
@@ -37,7 +37,7 @@ jobs:
   - name: macOS integration
     os: osx
     script:
-      - curl -L https://github.com/SimonBaeumer/commander/releases/download/v0.3.0/commander-darwin-amd64 -o ~/bin/commander
+      - curl -L https://github.com/commander-cli/commander/releases/download/v0.3.0/commander-darwin-amd64 -o ~/bin/commander
       - chmod +x ~/bin/commander
       - make integration-unix
 
@@ -53,7 +53,7 @@ jobs:
     before_install:
       - choco install make
       - choco install curl
-      - curl -L https://github.com/SimonBaeumer/commander/releases/download/v1.2.1/commander-windows-amd64 -o C:\Windows\system32\commander.exe
+      - curl -L https://github.com/commander-cli/commander/releases/download/v1.2.1/commander-windows-amd64 -o C:\Windows\system32\commander.exe
     script:
       - make integration-windows
 
@@ -95,5 +95,5 @@ jobs:
         - release/commander-windows-386.exe
       skip_cleanup: true
       on:
-        repo: SimonBaeumer/commander
+        repo: commander-cli/commander
         tags: true
diff --git a/cmd/commander/commander.go b/cmd/commander/commander.go
index 08dc5922..de616484 100644
--- a/cmd/commander/commander.go
+++ b/cmd/commander/commander.go
@@ -8,7 +8,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/SimonBaeumer/commander/pkg/app"
+	"github.com/commander-cli/commander/pkg/app"
 	"github.com/urfave/cli"
 )
 
diff --git a/go.mod b/go.mod
index 239fa23c..6f80c88c 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,9 @@
-module github.com/SimonBaeumer/commander
+module github.com/commander-cli/commander
 
 require (
 	github.com/Microsoft/go-winio v0.4.14 // indirect
 	github.com/SimonBaeumer/cmd v1.2.3
+	github.com/SimonBaeumer/commander v1.3.0 // indirect
 	github.com/antchfx/xmlquery v1.1.0
 	github.com/antchfx/xpath v1.1.0 // indirect
 	github.com/docker/distribution v2.7.1+incompatible // indirect
diff --git a/go.sum b/go.sum
index 57c413d2..935e7465 100644
--- a/go.sum
+++ b/go.sum
@@ -4,6 +4,8 @@ github.com/SimonBaeumer/cmd v1.1.0 h1:tr5dUMlly/8bLiC5B0J1AcE4ISru8POEfzAirWnUJn
 github.com/SimonBaeumer/cmd v1.1.0/go.mod h1:4mc/LDXDWNbkeooqHP83yx3JXtInPHjJkF8zhzqqmZE=
 github.com/SimonBaeumer/cmd v1.2.3 h1:Q9/FMZntNPlnbCPzXTCBzx+kRhVX9j3NAh2MCYvnMTA=
 github.com/SimonBaeumer/cmd v1.2.3/go.mod h1:4mc/LDXDWNbkeooqHP83yx3JXtInPHjJkF8zhzqqmZE=
+github.com/SimonBaeumer/commander v1.3.0 h1:QwZ7sTYFrmkOAccZwu8LZltDC08kIEcFjBBOkpjdZIg=
+github.com/SimonBaeumer/commander v1.3.0/go.mod h1:sNvvvwudBa2kQcSO7G1PttZHcBUnS5LmtJAjDS1Yh+U=
 github.com/antchfx/jsonquery v1.0.0 h1:1Yhk496SrCoY6fJkFZqpXEqbwOw5sFtLns9la4NoK3I=
 github.com/antchfx/jsonquery v1.0.0/go.mod h1:h7950pvPrUZzJIflNqsELgDQovTpPNa0rAHf8NwjegY=
 github.com/antchfx/xmlquery v1.1.0 h1:vj0kZ1y3Q6my4AV+a9xbWrMYzubw+84zuiKgvfV8vb8=
diff --git a/install.sh b/install.sh
index dc6cbd33..7303d056 100755
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-LATEST=$(curl -s https://api.github.com/repos/SimonBaeumer/commander/releases/latest | jq -r .tag_name)
+LATEST=$(curl -s https://api.github.com/repos/commander-cli/commander/releases/latest | jq -r .tag_name)
 
 if [ -z "$COMMANDER_VER" ]; then
     COMMANDER_VER=${COMMANDER_VER:-$LATEST}
@@ -19,7 +19,7 @@ else
     arch="386"
 fi
 
-url="https://github.com/SimonBaeumer/commander/releases/download/$COMMANDER_VER/commander-linux-$arch"
+url="https://github.com/commander-cli/commander/releases/download/$COMMANDER_VER/commander-linux-$arch"
 
 echo "Downloading $url"
 curl -L "$url" -o "$INSTALL_LOC"
diff --git a/pkg/app/add_command.go b/pkg/app/add_command.go
index 1496e92c..4a30015d 100644
--- a/pkg/app/add_command.go
+++ b/pkg/app/add_command.go
@@ -2,8 +2,8 @@ package app
 
 import (
 	"github.com/SimonBaeumer/cmd"
-	"github.com/SimonBaeumer/commander/pkg/runtime"
-	"github.com/SimonBaeumer/commander/pkg/suite"
+	"github.com/commander-cli/commander/pkg/runtime"
+	"github.com/commander-cli/commander/pkg/suite"
 	"gopkg.in/yaml.v2"
 	"strings"
 )
diff --git a/pkg/app/test_command.go b/pkg/app/test_command.go
index 45de0a16..fc670194 100644
--- a/pkg/app/test_command.go
+++ b/pkg/app/test_command.go
@@ -8,9 +8,9 @@ import (
 	"path"
 	"sync"
 
-	"github.com/SimonBaeumer/commander/pkg/output"
-	"github.com/SimonBaeumer/commander/pkg/runtime"
-	"github.com/SimonBaeumer/commander/pkg/suite"
+	"github.com/commander-cli/commander/pkg/output"
+	"github.com/commander-cli/commander/pkg/runtime"
+	"github.com/commander-cli/commander/pkg/suite"
 )
 
 // TestCommand executes the test argument
diff --git a/pkg/output/cli.go b/pkg/output/cli.go
index 27698df4..67c38243 100644
--- a/pkg/output/cli.go
+++ b/pkg/output/cli.go
@@ -8,7 +8,7 @@ import (
 	run "runtime"
 	"time"
 
-	"github.com/SimonBaeumer/commander/pkg/runtime"
+	"github.com/commander-cli/commander/pkg/runtime"
 	"github.com/logrusorgru/aurora"
 )
 
diff --git a/pkg/output/cli_test.go b/pkg/output/cli_test.go
index bc0c779e..5878cf93 100644
--- a/pkg/output/cli_test.go
+++ b/pkg/output/cli_test.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/SimonBaeumer/commander/pkg/runtime"
+	"github.com/commander-cli/commander/pkg/runtime"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/runtime/validator.go b/pkg/runtime/validator.go
index 0683f5a2..3ef66254 100644
--- a/pkg/runtime/validator.go
+++ b/pkg/runtime/validator.go
@@ -2,7 +2,7 @@ package runtime
 
 import (
 	"fmt"
-	"github.com/SimonBaeumer/commander/pkg/matcher"
+	"github.com/commander-cli/commander/pkg/matcher"
 	"log"
 	"strings"
 )
diff --git a/pkg/runtime/validator_test.go b/pkg/runtime/validator_test.go
index fc7f6926..d09bbc7a 100644
--- a/pkg/runtime/validator_test.go
+++ b/pkg/runtime/validator_test.go
@@ -1,7 +1,7 @@
 package runtime
 
 import (
-	"github.com/SimonBaeumer/commander/pkg/matcher"
+	"github.com/commander-cli/commander/pkg/matcher"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
diff --git a/pkg/suite/suite.go b/pkg/suite/suite.go
index 6bab1ae6..1128aee6 100644
--- a/pkg/suite/suite.go
+++ b/pkg/suite/suite.go
@@ -3,7 +3,7 @@ package suite
 import (
 	"fmt"
 
-	"github.com/SimonBaeumer/commander/pkg/runtime"
+	"github.com/commander-cli/commander/pkg/runtime"
 )
 
 // Suite represents the current tests, nodes and configs.
diff --git a/pkg/suite/suite_test.go b/pkg/suite/suite_test.go
index 3b1e4230..5801f1a0 100644
--- a/pkg/suite/suite_test.go
+++ b/pkg/suite/suite_test.go
@@ -1,7 +1,7 @@
 package suite
 
 import (
-	"github.com/SimonBaeumer/commander/pkg/runtime"
+	"github.com/commander-cli/commander/pkg/runtime"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
diff --git a/pkg/suite/yaml_suite.go b/pkg/suite/yaml_suite.go
index 3fe00917..e128f236 100644
--- a/pkg/suite/yaml_suite.go
+++ b/pkg/suite/yaml_suite.go
@@ -2,7 +2,7 @@ package suite
 
 import (
 	"fmt"
-	"github.com/SimonBaeumer/commander/pkg/runtime"
+	"github.com/commander-cli/commander/pkg/runtime"
 	"gopkg.in/yaml.v2"
 	"reflect"
 	"strings"
diff --git a/pkg/suite/yaml_suite_test.go b/pkg/suite/yaml_suite_test.go
index ca3be632..81079a71 100644
--- a/pkg/suite/yaml_suite_test.go
+++ b/pkg/suite/yaml_suite_test.go
@@ -1,7 +1,7 @@
 package suite
 
 import (
-	"github.com/SimonBaeumer/commander/pkg/runtime"
+	"github.com/commander-cli/commander/pkg/runtime"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )