diff --git a/README.md b/README.md
index b44601459e..c9f8e6533b 100644
--- a/README.md
+++ b/README.md
@@ -12,10 +12,10 @@ Obtain the client SDK packages for Fabric and Fabric CA.
 
 ```
 # Hyperledger Fabric client package
-go get -u github.com/hyperledger/fabric-sdk-go/fabric-client
+go get -u github.com/hyperledger/fabric-sdk-go/pkg/fabric-client
 
 # Hyperledger Fabric CA client package
-go get -u github.com/hyperledger/fabric-sdk-go/fabric-ca-client
+go get -u github.com/hyperledger/fabric-sdk-go/pkg/fabric-ca-client
 ```
 
 You're good to go, happy coding! Check out the examples for usage demonstrations.
diff --git a/pkg/fabric-client/client/client.go b/pkg/fabric-client/client.go
similarity index 99%
rename from pkg/fabric-client/client/client.go
rename to pkg/fabric-client/client.go
index f3c4a5ae25..58689cbb85 100644
--- a/pkg/fabric-client/client/client.go
+++ b/pkg/fabric-client/client.go
@@ -4,7 +4,7 @@ Copyright SecureKey Technologies Inc. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package client
+package fabricclient
 
 import (
 	"encoding/json"
diff --git a/pkg/fabric-client/client/client_test.go b/pkg/fabric-client/client_test.go
similarity index 98%
rename from pkg/fabric-client/client/client_test.go
rename to pkg/fabric-client/client_test.go
index 51a6bebaea..d1b2e8b1ec 100644
--- a/pkg/fabric-client/client/client_test.go
+++ b/pkg/fabric-client/client_test.go
@@ -4,7 +4,7 @@ Copyright SecureKey Technologies Inc. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package client
+package fabricclient
 
 import (
 	"fmt"
@@ -121,7 +121,7 @@ func TestClientMethods(t *testing.T) {
 func TestCreateChannel(t *testing.T) {
 	client := NewClient(mocks.NewMockConfig())
 
-	configTx, err := ioutil.ReadFile("../../../test/fixtures/channel/mychannel.tx")
+	configTx, err := ioutil.ReadFile("../../test/fixtures/channel/mychannel.tx")
 	if err != nil {
 		t.Fatalf(err.Error())
 	}
diff --git a/pkg/fabric-client/events/eventmocks.go b/pkg/fabric-client/events/eventmocks.go
index 9c78b12245..bf3f354fdf 100644
--- a/pkg/fabric-client/events/eventmocks.go
+++ b/pkg/fabric-client/events/eventmocks.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	api "github.com/hyperledger/fabric-sdk-go/api"
-	client "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/client"
+	client "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client"
 	mocks "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/mocks"
 
 	internal "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/internal"
diff --git a/pkg/fabric-client/orderer/orderer_test.go b/pkg/fabric-client/orderer/orderer_test.go
index e1a12663b6..1b0ea53c7c 100644
--- a/pkg/fabric-client/orderer/orderer_test.go
+++ b/pkg/fabric-client/orderer/orderer_test.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	api "github.com/hyperledger/fabric-sdk-go/api"
-	client "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/client"
+	client "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client"
 	mocks "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/mocks"
 
 	ab "github.com/hyperledger/fabric/protos/orderer"
diff --git a/pkg/fabric-client/peer/peer_test.go b/pkg/fabric-client/peer/peer_test.go
index f36341a7ec..818d2136d5 100644
--- a/pkg/fabric-client/peer/peer_test.go
+++ b/pkg/fabric-client/peer/peer_test.go
@@ -9,7 +9,7 @@ package peer
 import (
 	"testing"
 
-	client "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/client"
+	client "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client"
 	mocks "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/mocks"
 )
 
diff --git a/pkg/util/client_util.go b/pkg/util/client_util.go
index ecc70148a1..dde43faef5 100644
--- a/pkg/util/client_util.go
+++ b/pkg/util/client_util.go
@@ -9,7 +9,7 @@ package util
 import (
 	"fmt"
 
-	client "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/client"
+	client "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client"
 	sdkUser "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/user"
 
 	api "github.com/hyperledger/fabric-sdk-go/api"
diff --git a/test/integration/fabric_ca_test.go b/test/integration/fabric_ca_test.go
index 46db660cfc..eae3cdf598 100644
--- a/test/integration/fabric_ca_test.go
+++ b/test/integration/fabric_ca_test.go
@@ -18,7 +18,7 @@ import (
 
 	api "github.com/hyperledger/fabric-sdk-go/api"
 
-	client "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/client"
+	client "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client"
 	kvs "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/keyvaluestore"
 	sdkUser "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/user"
 	bccspFactory "github.com/hyperledger/fabric/bccsp/factory"