diff --git a/README.md b/README.md
index 1fa7422..fd6f0de 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,8 @@ must be installed.
 # build
 
 ```
-go get -v -t -u git.wit.com/wit/cloud-control-panel
-cd ~/go/src/git.wit.com/wit/cloud-control-panel
+go get -v -t -u git.wit.org/wit/cloud-control-panel
+cd ~/go/src/git.wit.org/wit/cloud-control-panel
 go build
 ./cloud-control-panel
 ```
diff --git a/config.go b/config.go
index d34964c..588dda0 100644
--- a/config.go
+++ b/config.go
@@ -20,8 +20,8 @@ import "io/ioutil"
 import "strings"
 
 import "github.com/golang/protobuf/jsonpb"
-import pb "git.wit.com/wit/witProtobuf"
-import "git.wit.com/wit/shell"
+import pb "git.wit.org/wit/witProtobuf"
+import "git.wit.org/wit/shell"
 
 import "github.com/davecgh/go-spew/spew"
 
@@ -66,7 +66,7 @@ var customUsage = func() {
 	fmt.Println("")
 	fmt.Println("EXAMPLES:")
 	fmt.Println("")
-	fmt.Println(os.Args[0] + " --hostname test.hostname.wit.com")
+	fmt.Println(os.Args[0] + " --hostname test.hostname.wit.org")
 	fmt.Println("")
 }
 var defaultconfig	*bool
diff --git a/eventChannel.go b/eventChannel.go
index 960a187..b024d60 100644
--- a/eventChannel.go
+++ b/eventChannel.go
@@ -3,8 +3,8 @@ package main
 import "log"
 
 import "github.com/golang/protobuf/proto"
-import pb "git.wit.com/wit/witProtobuf"
-import "git.wit.com/wit/gui"
+import pb "git.wit.org/wit/witProtobuf"
+import "git.wit.org/wit/gui"
 
 var mychannel chan *pb.Event
 var currentMessage *pb.Event
diff --git a/gorilla.go b/gorilla.go
index f23e391..055cc8f 100644
--- a/gorilla.go
+++ b/gorilla.go
@@ -11,8 +11,8 @@ import "time"
 import "github.com/gorilla/websocket"
 
 import "github.com/golang/protobuf/proto"
-import pb "git.wit.com/wit/witProtobuf"
-// import "git.wit.com/wit/gui"
+import pb "git.wit.org/wit/witProtobuf"
+// import "git.wit.org/wit/gui"
 
 var gorillaConn *websocket.Conn
 
@@ -87,7 +87,7 @@ func closeGorillaConn() {
 }
 
 func gorillaDial(hostname string) {
-	// var addr = flag.String("addr", "v000185.testing.com.customers.wprod.wit.com:9000", "http service address")
+	// var addr = flag.String("addr", "v000185.testing.com.customers.wprod.wit.org:9000", "http service address")
 
 	for {
 		u := url.URL{
diff --git a/gui-accounts.go b/gui-accounts.go
index bb318de..cebf0dc 100644
--- a/gui-accounts.go
+++ b/gui-accounts.go
@@ -3,8 +3,8 @@ package main
 import "log"
 import "fmt"
 
-import "git.wit.com/wit/gui"
-import pb "git.wit.com/wit/witProtobuf"
+import "git.wit.org/wit/gui"
+import pb "git.wit.org/wit/witProtobuf"
 
 func makeCloudInfoBox(gw *gui.GuiWindow) {
 	log.Println("makeCloudInfoBox() START gw =", gw)
@@ -103,7 +103,7 @@ func addSubdomainClick(b *gui.GuiButton) {
 	acc.Username	= "jcarr@wit.com"
 	acc.Email	= "jcarr@wit.com"
 	acc.Password	= "badpass"
-	acc.URL		= "http://stackapi-api1.stackapi.customers.wprod.wit.com:4000/"
+	acc.URL		= "http://stackapi-api1.stackapi.customers.wprod.wit.org:4000/"
 	config.Accounts = append(config.Accounts, acc)
 
 	makeCloudInfoBox(b.Box.Window)
@@ -128,7 +128,7 @@ func generateSubdomain(b *gui.GuiButton) {
 	}
 	// subdomain.SetText("cust00013.wit.dev")
 
-	txt := gui.SetText(b.Box, "SUBDOMAIN", "yourname.customers.wprod.wit.com")
+	txt := gui.SetText(b.Box, "SUBDOMAIN", "yourname.customers.wprod.wit.org")
 	log.Println("generateSubdomain subdomain = ", txt)
 	log.Println("generateSubdomain END")
 }
diff --git a/gui-buttonClicks.go b/gui-buttonClicks.go
index 08c9b39..bbe1e5c 100644
--- a/gui-buttonClicks.go
+++ b/gui-buttonClicks.go
@@ -6,8 +6,8 @@ import "time"
 // import "runtime"
 // import "runtime/debug"
 
-import "git.wit.com/wit/gui"
-import pb "git.wit.com/wit/witProtobuf"
+import "git.wit.org/wit/gui"
+import pb "git.wit.org/wit/witProtobuf"
 // import "github.com/davecgh/go-spew/spew"
 
 //
@@ -46,7 +46,7 @@ func mainMouseClick(b *gui.GuiButton) {
 
 	if (b == nil) {
 		log.Println("mainMouseClick() BACK IN MAIN CONTROL PANEL CODE (button is nil) WHY DID THIS HAPPEN?")
-		log.Println("THIS IS PROBABLY A BUG IN git.wit.com/gui")
+		log.Println("THIS IS PROBABLY A BUG IN git.wit.org/gui")
 		// gui.ErrorWindow(gw,
 		// 		"Unknown Mouse Event",
 		// 		"Error in mainMouseClick()")
diff --git a/gui-colors.go b/gui-colors.go
index f930d31..2d478b4 100644
--- a/gui-colors.go
+++ b/gui-colors.go
@@ -4,8 +4,8 @@ import "fmt"
 import "image/color"
 // import "runtime"
 
-import pb "git.wit.com/wit/witProtobuf"
-import "git.wit.com/wit/gui"
+import pb "git.wit.org/wit/witProtobuf"
+import "git.wit.org/wit/gui"
 
 var windowsTextVeryLightGrey  = color.RGBA{10, 10, 10, 10}
 var windowsTextBlack  = color.RGBA{0, 0, 0, 255}
diff --git a/gui-debug.go b/gui-debug.go
index c22dc2c..2ee24bd 100644
--- a/gui-debug.go
+++ b/gui-debug.go
@@ -7,13 +7,13 @@ import "runtime"
 import "os/exec"
 import "strings"
 
-import "git.wit.com/wit/gui"
-import "git.wit.com/wit/shell"
-// import pb "git.wit.com/wit/witProtobuf"
+import "git.wit.org/wit/gui"
+import "git.wit.org/wit/shell"
+// import pb "git.wit.org/wit/witProtobuf"
 
 import "github.com/davecgh/go-spew/spew"
 
-// import pb "git.wit.com/wit/witProtobuf"
+// import pb "git.wit.org/wit/witProtobuf"
 
 func debugClick(b *gui.GuiButton) {
 	log.Println("debugClick() START")
diff --git a/gui-splash.go b/gui-splash.go
index 1586528..5c2869b 100644
--- a/gui-splash.go
+++ b/gui-splash.go
@@ -3,13 +3,13 @@ package main
 import "log"
 import "runtime"
 
-import "git.wit.com/wit/gui"
-import "git.wit.com/wit/shell"
+import "git.wit.org/wit/gui"
+import "git.wit.org/wit/shell"
 
 import "github.com/andlabs/ui"
 import _ "github.com/andlabs/ui/winmanifest"
 
-// import pb "git.wit.com/wit/witProtobuf"
+// import pb "git.wit.org/wit/witProtobuf"
 
 func showSplashBox(box *gui.GuiBox) *gui.GuiBox {
 	log.Println("ShowSplashBox() START")
diff --git a/gui-vm.go b/gui-vm.go
index b30849f..980a448 100644
--- a/gui-vm.go
+++ b/gui-vm.go
@@ -3,8 +3,8 @@ package main
 import "log"
 import "fmt"
 
-import "git.wit.com/wit/gui"
-import pb "git.wit.com/wit/witProtobuf"
+import "git.wit.org/wit/gui"
+import pb "git.wit.org/wit/witProtobuf"
 
 //
 // THIS IS THE STANDARD VM DISPLAY TABLE
diff --git a/linux.go b/linux.go
index 4bc4e10..1241861 100644
--- a/linux.go
+++ b/linux.go
@@ -13,7 +13,7 @@ import "syscall"
 // import "time"
 // import "reflect"
 
-// import "git.wit.com/wit/shell"
+// import "git.wit.org/wit/shell"
 // import "github.com/davecgh/go-spew/spew"
 
 func handleSignal(err interface{}, ret int) {
diff --git a/login.go b/login.go
index b1ab52a..f0636c0 100644
--- a/login.go
+++ b/login.go
@@ -4,8 +4,8 @@ import "log"
 import "fmt"
 import "time"
 
-import "git.wit.com/wit/gui"
-import pb "git.wit.com/wit/witProtobuf"
+import "git.wit.org/wit/gui"
+import pb "git.wit.org/wit/witProtobuf"
 
 // import "github.com/davecgh/go-spew/spew"
 
diff --git a/main.go b/main.go
index d0ecd93..da57472 100644
--- a/main.go
+++ b/main.go
@@ -12,10 +12,10 @@ import "reflect"
 // this is the king of dns libraries
 import "github.com/miekg/dns"
 
-import "git.wit.com/wit/gui"
-import pb "git.wit.com/wit/witProtobuf"
-import "git.wit.com/jcarr/dnssecsocket"
-import "git.wit.com/wit/shell"
+import "git.wit.org/wit/gui"
+import pb "git.wit.org/wit/witProtobuf"
+import "git.wit.org/jcarr/dnssecsocket"
+import "git.wit.org/wit/shell"
 
 import "github.com/gobuffalo/packr"
 import "github.com/davecgh/go-spew/spew"
@@ -120,10 +120,10 @@ func main() {
 	initChannel()
 	go processEvents()
 
-	v185AAAA := lookupAAAA("v000185.testing.com.customers.wprod.wit.com")
+	v185AAAA := lookupAAAA("v000185.testing.com.customers.wprod.wit.org")
 	log.Println("v185AAA = ", v185AAAA)
-	go gorillaDial("ccp.wit.com:9000")
-	// go gorillaDial("stackapi-ccp.stackapi.customers.wit.com:9000")
+	go gorillaDial("ccp.wit.org:9000")
+	// go gorillaDial("stackapi-ccp.stackapi.customers.wit.org:9000")
 	go gui.WatchGUI()
 
 	// use this to discover what the OS thinks it's hostname is
@@ -199,7 +199,7 @@ func init() {
 	*/
 }
 
-// get's sent the return values and errors from git.wit.com/wit/shell/
+// get's sent the return values and errors from git.wit.org/wit/shell/
 func handleShell(err interface{}, ret int) {
 	log.Println("handleShell() shell.Run() END Returned ", ret)
 	errChan <- err
diff --git a/upgrade.go b/upgrade.go
index e03701e..5cf6bf6 100644
--- a/upgrade.go
+++ b/upgrade.go
@@ -9,7 +9,7 @@ import "os"
 import "time"
 import "runtime"
 
-import "git.wit.com/wit/shell"
+import "git.wit.org/wit/shell"
 
 // import "github.com/davecgh/go-spew/spew"
 
@@ -19,7 +19,7 @@ func upgrade() {
 		filename = "cloud-control-panel.exe"
 	}
 
-	mirrors          := "https://mirrors.wit.com/cloud/control-panel/"
+	mirrors          := "https://mirrors.wit.org/cloud/control-panel/"
 	upstreamVERSION  := shell.Chomp(shell.Wget(mirrors + "VERSION"))
 
 	dir              := "/v" + upstreamVERSION + "/linux/"
diff --git a/windows.go b/windows.go
index 7f040de..a235add 100644
--- a/windows.go
+++ b/windows.go
@@ -6,7 +6,7 @@ package main
 
 import "log"
 
-// import "git.wit.com/wit/shell"
+// import "git.wit.org/wit/shell"
 // import "github.com/davecgh/go-spew/spew"
 
 func handleSignal(err interface{}, ret int) {