diff --git a/token-erc-721/go/erc721-contract.go b/token-erc-721/go/chaincode/erc721-contract.go
similarity index 99%
rename from token-erc-721/go/erc721-contract.go
rename to token-erc-721/go/chaincode/erc721-contract.go
index 33b75a0b..5fe163e9 100644
--- a/token-erc-721/go/erc721-contract.go
+++ b/token-erc-721/go/chaincode/erc721-contract.go
@@ -1,4 +1,4 @@
-package main
+package TokenERC721Contract
 
 import (
 	"encoding/base64"
diff --git a/token-erc-721/go/erc721-contract_test.go b/token-erc-721/go/chaincode/erc721-contract_test.go
similarity index 99%
rename from token-erc-721/go/erc721-contract_test.go
rename to token-erc-721/go/chaincode/erc721-contract_test.go
index e8fa4112..1713ec3e 100644
--- a/token-erc-721/go/erc721-contract_test.go
+++ b/token-erc-721/go/chaincode/erc721-contract_test.go
@@ -1,4 +1,4 @@
-package main
+package TokenERC721Contract
 
 import (
 	"encoding/base64"
diff --git a/token-erc-721/go/erc721.go b/token-erc-721/go/chaincode/erc721.go
similarity index 94%
rename from token-erc-721/go/erc721.go
rename to token-erc-721/go/chaincode/erc721.go
index 1b6ca159..616854d2 100644
--- a/token-erc-721/go/erc721.go
+++ b/token-erc-721/go/chaincode/erc721.go
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package main
+package TokenERC721Contract
 
 // Define structs to be used by chaincode
 type Nft struct {
diff --git a/token-erc-721/go/main.go b/token-erc-721/go/main.go
index dd002ed3..1748b434 100644
--- a/token-erc-721/go/main.go
+++ b/token-erc-721/go/main.go
@@ -5,12 +5,14 @@
 package main
 
 import (
+	"github.com/hyperledger/fabric-samples/token-erc-721/go/chaincode"
+
 	"github.com/hyperledger/fabric-contract-api-go/contractapi"
 	"github.com/hyperledger/fabric-contract-api-go/metadata"
 )
 
 func main() {
-	hlpNftContract := new(TokenERC721Contract)
+	hlpNftContract := new(chaincode.TokenERC721Contract)
 	hlpNftContract.Info.Version = "0.0.1"
 	hlpNftContract.Info.Description = "ERC-721 fabric port"
 	hlpNftContract.Info.License = new(metadata.LicenseMetadata)