diff --git a/go/src/github.com/miracl/amcl-cgo/README.txt b/go/amcl-cgo/README.txt
similarity index 100%
rename from go/src/github.com/miracl/amcl-cgo/README.txt
rename to go/amcl-cgo/README.txt
diff --git a/go/src/github.com/miracl/amcl-cgo/crypto.go b/go/amcl-cgo/crypto.go
similarity index 99%
rename from go/src/github.com/miracl/amcl-cgo/crypto.go
rename to go/amcl-cgo/crypto.go
index 2207490..db5a6b1 100644
--- a/go/src/github.com/miracl/amcl-cgo/crypto.go
+++ b/go/amcl-cgo/crypto.go
@@ -34,7 +34,7 @@
 	"fmt"
 	"unsafe"
 
-	amcl "github.com/miracl/amcl-go"
+	amcl "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 const EAS int = int(C.PAS)
diff --git a/go/src/github.com/miracl/amcl-cgo/crypto_test.go b/go/amcl-cgo/crypto_test.go
similarity index 99%
rename from go/src/github.com/miracl/amcl-cgo/crypto_test.go
rename to go/amcl-cgo/crypto_test.go
index 435f954..0fa7c78 100644
--- a/go/src/github.com/miracl/amcl-cgo/crypto_test.go
+++ b/go/amcl-cgo/crypto_test.go
@@ -28,7 +28,7 @@
 
 	"github.com/stretchr/testify/assert"
 
-	amclgo "github.com/miracl/amcl-go"
+	amclgo "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 const nIter int = 100
diff --git a/go/src/github.com/miracl/amcl-go/AES.go b/go/amcl-go/AES.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/AES.go
rename to go/amcl-go/AES.go
diff --git a/go/src/github.com/miracl/amcl-go/BIG.go b/go/amcl-go/BIG.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/BIG.go
rename to go/amcl-go/BIG.go
diff --git a/go/src/github.com/miracl/amcl-go/DBIG.go b/go/amcl-go/DBIG.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/DBIG.go
rename to go/amcl-go/DBIG.go
diff --git a/go/src/github.com/miracl/amcl-go/ECDH.go b/go/amcl-go/ECDH.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/ECDH.go
rename to go/amcl-go/ECDH.go
diff --git a/go/src/github.com/miracl/amcl-go/ECP.go b/go/amcl-go/ECP.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/ECP.go
rename to go/amcl-go/ECP.go
diff --git a/go/src/github.com/miracl/amcl-go/ECP2.go b/go/amcl-go/ECP2.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/ECP2.go
rename to go/amcl-go/ECP2.go
diff --git a/go/src/github.com/miracl/amcl-go/FF.go b/go/amcl-go/FF.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/FF.go
rename to go/amcl-go/FF.go
diff --git a/go/src/github.com/miracl/amcl-go/FP.go b/go/amcl-go/FP.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/FP.go
rename to go/amcl-go/FP.go
diff --git a/go/src/github.com/miracl/amcl-go/FP12.go b/go/amcl-go/FP12.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/FP12.go
rename to go/amcl-go/FP12.go
diff --git a/go/src/github.com/miracl/amcl-go/FP2.go b/go/amcl-go/FP2.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/FP2.go
rename to go/amcl-go/FP2.go
diff --git a/go/src/github.com/miracl/amcl-go/FP4.go b/go/amcl-go/FP4.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/FP4.go
rename to go/amcl-go/FP4.go
diff --git a/go/src/github.com/miracl/amcl-go/GCM.go b/go/amcl-go/GCM.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/GCM.go
rename to go/amcl-go/GCM.go
diff --git a/go/src/github.com/miracl/amcl-go/HASH.go b/go/amcl-go/HASH.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/HASH.go
rename to go/amcl-go/HASH.go
diff --git a/go/src/github.com/miracl/amcl-go/MPIN.go b/go/amcl-go/MPIN.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/MPIN.go
rename to go/amcl-go/MPIN.go
diff --git a/go/src/github.com/miracl/amcl-go/MPIN_test.go b/go/amcl-go/MPIN_test.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/MPIN_test.go
rename to go/amcl-go/MPIN_test.go
diff --git a/go/src/github.com/miracl/amcl-go/PAIR.go b/go/amcl-go/PAIR.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/PAIR.go
rename to go/amcl-go/PAIR.go
diff --git a/go/src/github.com/miracl/amcl-go/RAND.go b/go/amcl-go/RAND.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/RAND.go
rename to go/amcl-go/RAND.go
diff --git a/go/src/github.com/miracl/amcl-go/ROM.go b/go/amcl-go/ROM.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/ROM.go
rename to go/amcl-go/ROM.go
diff --git a/go/src/github.com/miracl/amcl-go/RSA.go b/go/amcl-go/RSA.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/RSA.go
rename to go/amcl-go/RSA.go
diff --git a/go/src/github.com/miracl/amcl-go/UTILS.go b/go/amcl-go/UTILS.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/UTILS.go
rename to go/amcl-go/UTILS.go
diff --git a/go/src/github.com/miracl/amcl-go/UTILS_test.go b/go/amcl-go/UTILS_test.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/UTILS_test.go
rename to go/amcl-go/UTILS_test.go
diff --git a/go/src/github.com/miracl/amcl-go/crypto.go b/go/amcl-go/crypto.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/crypto.go
rename to go/amcl-go/crypto.go
diff --git a/go/src/github.com/miracl/amcl-go/crypto_test.go b/go/amcl-go/crypto_test.go
similarity index 100%
rename from go/src/github.com/miracl/amcl-go/crypto_test.go
rename to go/amcl-go/crypto_test.go
diff --git a/go/src/github.com/miracl/examples-cgo/README.txt b/go/examples-cgo/README.txt
similarity index 100%
rename from go/src/github.com/miracl/examples-cgo/README.txt
rename to go/examples-cgo/README.txt
diff --git a/go/src/github.com/miracl/examples-cgo/mpin.go b/go/examples-cgo/mpin.go
similarity index 97%
rename from go/src/github.com/miracl/examples-cgo/mpin.go
rename to go/examples-cgo/mpin.go
index c25b2b2..35b1d03 100644
--- a/go/src/github.com/miracl/examples-cgo/mpin.go
+++ b/go/examples-cgo/mpin.go
@@ -23,8 +23,8 @@
 	"encoding/hex"
 	"fmt"
 
-	amclcgo "github.com/miracl/amcl-cgo"
-	amclgo "github.com/miracl/amcl-go"
+	amclcgo "git.apache.org/incubator-milagro-crypto.git/go/amcl-cgo"
+	amclgo "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 func main() {
diff --git a/go/src/github.com/miracl/examples-cgo/mpinTwoPass.go b/go/examples-cgo/mpinTwoPass.go
similarity index 97%
rename from go/src/github.com/miracl/examples-cgo/mpinTwoPass.go
rename to go/examples-cgo/mpinTwoPass.go
index 63b541b..9e4cc62 100644
--- a/go/src/github.com/miracl/examples-cgo/mpinTwoPass.go
+++ b/go/examples-cgo/mpinTwoPass.go
@@ -23,8 +23,8 @@
 	"encoding/hex"
 	"fmt"
 
-	amclcgo "github.com/miracl/amcl-cgo"
-	amclgo "github.com/miracl/amcl-go"
+	amclcgo "git.apache.org/incubator-milagro-crypto.git/go/amcl-cgo"
+	amclgo "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 func main() {
diff --git a/go/src/github.com/miracl/examples-cgo/mpinfull.go b/go/examples-cgo/mpinfull.go
similarity index 97%
rename from go/src/github.com/miracl/examples-cgo/mpinfull.go
rename to go/examples-cgo/mpinfull.go
index 3d19092..5a6a649 100644
--- a/go/src/github.com/miracl/examples-cgo/mpinfull.go
+++ b/go/examples-cgo/mpinfull.go
@@ -23,8 +23,8 @@
 	"encoding/hex"
 	"fmt"
 
-	amclcgo "github.com/miracl/amcl-cgo"
-	amclgo "github.com/miracl/amcl-go"
+	amclcgo "git.apache.org/incubator-milagro-crypto.git/go/amcl-cgo"
+	amclgo "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 func main() {
diff --git a/go/src/github.com/miracl/examples-cgo/mpinfullAnon.go b/go/examples-cgo/mpinfullAnon.go
similarity index 97%
rename from go/src/github.com/miracl/examples-cgo/mpinfullAnon.go
rename to go/examples-cgo/mpinfullAnon.go
index b5cfe3b..57472cb 100644
--- a/go/src/github.com/miracl/examples-cgo/mpinfullAnon.go
+++ b/go/examples-cgo/mpinfullAnon.go
@@ -25,8 +25,8 @@
 	"encoding/hex"
 	"fmt"
 
-	amclcgo "github.com/miracl/amcl-cgo"
-	amclgo "github.com/miracl/amcl-go"
+	amclcgo "git.apache.org/incubator-milagro-crypto.git/go/amcl-cgo"
+	amclgo "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 func main() {
diff --git a/go/src/github.com/miracl/examples-cgo/timempin.go b/go/examples-cgo/timempin.go
similarity index 97%
rename from go/src/github.com/miracl/examples-cgo/timempin.go
rename to go/examples-cgo/timempin.go
index 70c3e21..d055bce 100644
--- a/go/src/github.com/miracl/examples-cgo/timempin.go
+++ b/go/examples-cgo/timempin.go
@@ -27,7 +27,7 @@
 	"runtime/pprof"
 	"time"
 
-	amclcgo "github.com/miracl/amcl-cgo"
+	amclcgo "git.apache.org/incubator-milagro-crypto.git/go/amcl-cgo"
 )
 
 // Number of iterations to time functions
diff --git a/go/src/github.com/miracl/examples-go/ecdh.go b/go/examples-go/ecdh.go
similarity index 98%
rename from go/src/github.com/miracl/examples-go/ecdh.go
rename to go/examples-go/ecdh.go
index 45fc091..190ea14 100644
--- a/go/src/github.com/miracl/examples-go/ecdh.go
+++ b/go/examples-go/ecdh.go
@@ -22,7 +22,7 @@
 import (
 	"fmt"
 
-	amcl "github.com/miracl/amcl-go"
+	amcl "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 func main() {
diff --git a/go/src/github.com/miracl/examples-go/generateRandom.go b/go/examples-go/generateRandom.go
similarity index 95%
rename from go/src/github.com/miracl/examples-go/generateRandom.go
rename to go/examples-go/generateRandom.go
index f2afcc9..83faf1b 100644
--- a/go/src/github.com/miracl/examples-go/generateRandom.go
+++ b/go/examples-go/generateRandom.go
@@ -25,7 +25,7 @@
 	"encoding/hex"
 	"fmt"
 
-	amcl "github.com/miracl/amcl-go"
+	amcl "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 func main() {
diff --git a/go/src/github.com/miracl/examples-go/mpin.go b/go/examples-go/mpin.go
similarity index 98%
rename from go/src/github.com/miracl/examples-go/mpin.go
rename to go/examples-go/mpin.go
index 3c13e49..4ee3ae7 100644
--- a/go/src/github.com/miracl/examples-go/mpin.go
+++ b/go/examples-go/mpin.go
@@ -22,7 +22,7 @@
 import (
 	"fmt"
 
-	amcl "github.com/miracl/amcl-go"
+	amcl "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 /* Configure mode of operation */
diff --git a/go/src/github.com/miracl/examples-go/mpinTwoPass.go b/go/examples-go/mpinTwoPass.go
similarity index 98%
rename from go/src/github.com/miracl/examples-go/mpinTwoPass.go
rename to go/examples-go/mpinTwoPass.go
index f2c3d33..b745f10 100644
--- a/go/src/github.com/miracl/examples-go/mpinTwoPass.go
+++ b/go/examples-go/mpinTwoPass.go
@@ -23,7 +23,7 @@
 	"encoding/hex"
 	"fmt"
 
-	amcl "github.com/miracl/amcl-go"
+	amcl "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 func main() {
diff --git a/go/src/github.com/miracl/examples-go/mpinTwoPassWrap.go b/go/examples-go/mpinTwoPassWrap.go
similarity index 98%
rename from go/src/github.com/miracl/examples-go/mpinTwoPassWrap.go
rename to go/examples-go/mpinTwoPassWrap.go
index 6ef787d..f3174d1 100644
--- a/go/src/github.com/miracl/examples-go/mpinTwoPassWrap.go
+++ b/go/examples-go/mpinTwoPassWrap.go
@@ -23,7 +23,7 @@
 	"encoding/hex"
 	"fmt"
 
-	amcl "github.com/miracl/amcl-go"
+	amcl "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 func main() {
diff --git a/go/src/github.com/miracl/examples-go/mpinfull.go b/go/examples-go/mpinfull.go
similarity index 98%
rename from go/src/github.com/miracl/examples-go/mpinfull.go
rename to go/examples-go/mpinfull.go
index 1f2cdfd..53135c4 100644
--- a/go/src/github.com/miracl/examples-go/mpinfull.go
+++ b/go/examples-go/mpinfull.go
@@ -23,7 +23,7 @@
 	"encoding/hex"
 	"fmt"
 
-	amcl "github.com/miracl/amcl-go"
+	amcl "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 func main() {
diff --git a/go/src/github.com/miracl/examples-go/mpinfullWrap.go b/go/examples-go/mpinfullWrap.go
similarity index 98%
rename from go/src/github.com/miracl/examples-go/mpinfullWrap.go
rename to go/examples-go/mpinfullWrap.go
index bbf8f3d..12a7240 100644
--- a/go/src/github.com/miracl/examples-go/mpinfullWrap.go
+++ b/go/examples-go/mpinfullWrap.go
@@ -23,7 +23,7 @@
 	"encoding/hex"
 	"fmt"
 
-	"github.com/miracl/amcl-go"
+	"git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 func main() {
diff --git a/go/src/github.com/miracl/examples-go/otp.go b/go/examples-go/otp.go
similarity index 94%
rename from go/src/github.com/miracl/examples-go/otp.go
rename to go/examples-go/otp.go
index 45375b0..dbeef16 100644
--- a/go/src/github.com/miracl/examples-go/otp.go
+++ b/go/examples-go/otp.go
@@ -25,7 +25,7 @@
 	"encoding/hex"
 	"fmt"
 
-	amcl "github.com/miracl/amcl-go"
+	amcl "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 func main() {
diff --git a/go/src/github.com/miracl/examples-go/pbkdf2.go b/go/examples-go/pbkdf2.go
similarity index 97%
rename from go/src/github.com/miracl/examples-go/pbkdf2.go
rename to go/examples-go/pbkdf2.go
index 7ca6276..dbd209c 100644
--- a/go/src/github.com/miracl/examples-go/pbkdf2.go
+++ b/go/examples-go/pbkdf2.go
@@ -23,7 +23,7 @@
 	"encoding/hex"
 	"fmt"
 
-	amcl "github.com/miracl/amcl-go"
+	amcl "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 func main() {
diff --git a/go/src/github.com/miracl/examples-go/rsa.go b/go/examples-go/rsa.go
similarity index 96%
rename from go/src/github.com/miracl/examples-go/rsa.go
rename to go/examples-go/rsa.go
index 0a1965c..201beeb 100644
--- a/go/src/github.com/miracl/examples-go/rsa.go
+++ b/go/examples-go/rsa.go
@@ -24,7 +24,7 @@
 import (
 	"fmt"
 
-	amcl "github.com/miracl/amcl-go"
+	amcl "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 func main() {
diff --git a/go/src/github.com/miracl/examples-go/timempin.go b/go/examples-go/timempin.go
similarity index 97%
rename from go/src/github.com/miracl/examples-go/timempin.go
rename to go/examples-go/timempin.go
index 6336788..9906b69 100644
--- a/go/src/github.com/miracl/examples-go/timempin.go
+++ b/go/examples-go/timempin.go
@@ -27,7 +27,7 @@
 	"runtime/pprof"
 	"time"
 
-	amcl "github.com/miracl/amcl-go"
+	amcl "git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 // Number of iterations to time functions
diff --git a/go/src/github.com/miracl/examples-go/timempinWrap.go b/go/examples-go/timempinWrap.go
similarity index 97%
rename from go/src/github.com/miracl/examples-go/timempinWrap.go
rename to go/examples-go/timempinWrap.go
index 1bdace0..520b1a9 100644
--- a/go/src/github.com/miracl/examples-go/timempinWrap.go
+++ b/go/examples-go/timempinWrap.go
@@ -27,7 +27,7 @@
 	"runtime/pprof"
 	"time"
 
-	"github.com/miracl/amcl-go"
+	"git.apache.org/incubator-milagro-crypto.git/go/amcl-go"
 )
 
 // Number of iterations to time functions
diff --git a/go/readme.txt b/go/readme.txt
index 3ba399c..d27f74d 100644
--- a/go/readme.txt
+++ b/go/readme.txt
@@ -16,13 +16,13 @@
 
 export GOPATH=$PWD
 
-go run ./src/github.com/miracl/examples-go/mpin.go
+go run ./examples-go/mpin.go
 
 or 
 
-go run ./src/github.com/miracl/examples-go/ecdh.go
+go run ./examples-go/ecdh.go
 
 or
 
-go run ./src/github.com/miracl/examples-go/rsa.go
+go run ./examples-go/rsa.go