diff --git a/token-erc-721/go/chaincode/erc721-contract.go b/token-erc-721/chaincode-go/chaincode/erc721-contract.go
similarity index 100%
rename from token-erc-721/go/chaincode/erc721-contract.go
rename to token-erc-721/chaincode-go/chaincode/erc721-contract.go
diff --git a/token-erc-721/go/chaincode/erc721-contract_test.go b/token-erc-721/chaincode-go/chaincode/erc721-contract_test.go
similarity index 100%
rename from token-erc-721/go/chaincode/erc721-contract_test.go
rename to token-erc-721/chaincode-go/chaincode/erc721-contract_test.go
diff --git a/token-erc-721/go/chaincode/erc721.go b/token-erc-721/chaincode-go/chaincode/erc721.go
similarity index 100%
rename from token-erc-721/go/chaincode/erc721.go
rename to token-erc-721/chaincode-go/chaincode/erc721.go
diff --git a/token-erc-721/go/go.mod b/token-erc-721/chaincode-go/go.mod
similarity index 100%
rename from token-erc-721/go/go.mod
rename to token-erc-721/chaincode-go/go.mod
diff --git a/token-erc-721/go/go.sum b/token-erc-721/chaincode-go/go.sum
similarity index 100%
rename from token-erc-721/go/go.sum
rename to token-erc-721/chaincode-go/go.sum
diff --git a/token-erc-721/go/main.go b/token-erc-721/chaincode-go/main.go
similarity index 92%
rename from token-erc-721/go/main.go
rename to token-erc-721/chaincode-go/main.go
index 1748b434..d6398150 100644
--- a/token-erc-721/go/main.go
+++ b/token-erc-721/chaincode-go/main.go
@@ -5,7 +5,7 @@
 package main
 
 import (
-	"github.com/hyperledger/fabric-samples/token-erc-721/go/chaincode"
+	"github.com/hyperledger/fabric-samples/token-erc-721/chaincode-go/chaincode"
 
 	"github.com/hyperledger/fabric-contract-api-go/contractapi"
 	"github.com/hyperledger/fabric-contract-api-go/metadata"