From 8fb70cff3ca5a7d498f83f5b3bb0b1fedb30de62 Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Thu, 10 Nov 2022 23:05:57 +0000
Subject: [PATCH] Attempt update to v4

---
 auth/confirm.go                               | 10 +++---
 auth/fmt.go                                   |  4 +--
 auth/fmt_test.go                              |  2 +-
 auth/interface.go                             | 16 +++++-----
 auth/params.go                                |  2 +-
 auth/receivedConfirm.go                       |  8 ++---
 auth/receivedRequest.go                       |  8 ++---
 auth/request.go                               | 10 +++---
 auth/sentRequestHandler.go                    |  4 +--
 auth/state.go                                 | 16 +++++-----
 auth/state_test.go                            | 24 +++++++-------
 auth/store/confirmation.go                    |  2 +-
 auth/store/confirmation_test.go               |  4 +--
 auth/store/previousNegotiations.go            |  2 +-
 auth/store/previousNegotiations_test.go       |  4 +--
 auth/store/receivedRequest.go                 |  6 ++--
 auth/store/sentRequest.go                     |  4 +--
 auth/store/store.go                           |  4 +--
 auth/store/store_test.go                      |  8 ++---
 auth/utils_test.go                            | 18 +++++------
 auth/verify.go                                |  2 +-
 backup/backup.go                              |  4 +--
 backup/backupRestore.go                       | 12 +++----
 backup/backup_test.go                         |  6 ++--
 backup/jsonStorage.go                         |  2 +-
 backup/jsonStorage_test.go                    |  2 +-
 backup/keyStorage.go                          |  2 +-
 bindings/authenticatedConnection.go           |  2 +-
 bindings/backup.go                            |  2 +-
 bindings/channels.go                          | 10 +++---
 bindings/cmix.go                              |  2 +-
 bindings/connect.go                           |  6 ++--
 bindings/delivery.go                          |  2 +-
 bindings/dummy.go                             |  2 +-
 bindings/e2e.go                               |  6 ++--
 bindings/e2eAuth.go                           |  2 +-
 bindings/e2eHandler.go                        |  6 ++--
 bindings/fileTransfer.go                      |  6 ++--
 bindings/follow.go                            |  2 +-
 bindings/group.go                             |  8 ++---
 bindings/identity.go                          |  2 +-
 bindings/listener.go                          |  2 +-
 bindings/ndf.go                               |  2 +-
 bindings/notifications.go                     |  2 +-
 bindings/notifications_test.go                |  2 +-
 bindings/params.go                            |  8 ++---
 bindings/restlike.go                          |  4 +--
 bindings/restlikeSingle.go                    |  4 +--
 bindings/single.go                            |  6 ++--
 bindings/single_test.go                       |  2 +-
 bindings/ud.go                                |  6 ++--
 bindings/version.go                           |  2 +-
 broadcast/client.go                           |  4 +--
 broadcast/interface.go                        |  8 ++---
 broadcast/processor.go                        |  4 +--
 broadcast/rsaToPublic.go                      |  6 ++--
 broadcast/rsaToPublic_test.go                 |  8 ++---
 broadcast/symmetric.go                        |  6 ++--
 broadcast/symmetric_test.go                   |  6 ++--
 broadcast/utils_test.go                       |  8 ++---
 channels/adminListener.go                     |  4 +--
 channels/adminListener_test.go                |  4 +--
 channels/eventModel.go                        |  4 +--
 channels/eventModel_test.go                   |  4 +--
 channels/identityStore.go                     |  2 +-
 channels/identityStore_test.go                |  2 +-
 channels/interface.go                         |  4 +--
 channels/joinedChannel.go                     |  4 +--
 channels/joinedChannel_test.go                | 10 +++---
 channels/manager.go                           | 10 +++---
 channels/manager_test.go                      |  4 +--
 channels/nickname.go                          |  2 +-
 channels/nickname_test.go                     |  2 +-
 channels/send.go                              |  4 +--
 channels/sendTracker.go                       |  8 ++---
 channels/sendTracker_test.go                  | 10 +++---
 channels/send_test.go                         | 10 +++---
 channels/userListener.go                      |  4 +--
 channels/userListener_test.go                 |  4 +--
 cmd/backup.go                                 |  4 +--
 cmd/broadcast.go                              |  8 ++---
 cmd/callbacks.go                              | 10 +++---
 cmd/connect.go                                | 10 +++---
 cmd/dumpRounds.go                             |  4 +--
 cmd/fileTransfer.go                           |  6 ++--
 cmd/getndf.go                                 |  8 ++---
 cmd/group.go                                  | 10 +++---
 cmd/init.go                                   |  2 +-
 cmd/pickup.go                                 |  2 +-
 cmd/precan.go                                 |  2 +-
 cmd/proto.go                                  |  4 +--
 cmd/root.go                                   |  8 ++---
 cmd/single.go                                 | 10 +++---
 cmd/ud.go                                     |  8 ++---
 cmd/utils.go                                  |  6 ++--
 cmd/version.go                                |  2 +-
 cmix/check.go                                 |  2 +-
 cmix/check_test.go                            |  4 +--
 cmix/client.go                                | 26 +++++++--------
 cmix/cmixMessageBuffer.go                     |  4 +--
 cmix/cmixMessageBuffer_test.go                |  4 +--
 cmix/critical.go                              |  8 ++---
 cmix/critical_test.go                         |  4 +--
 cmix/follow.go                                |  6 ++--
 cmix/gateway/hostPool.go                      |  4 +--
 cmix/gateway/hostpool_test.go                 |  2 +-
 cmix/gateway/sender.go                        |  4 +--
 cmix/gateway/sender_test.go                   |  2 +-
 cmix/gateway/storeHostList.go                 |  2 +-
 cmix/gateway/storeHostList_test.go            |  2 +-
 cmix/health/tracker.go                        |  2 +-
 cmix/identity/receptionID/IdentityUse.go      |  2 +-
 cmix/identity/receptionID/identity.go         |  4 +--
 cmix/identity/receptionID/identity_test.go    |  2 +-
 cmix/identity/receptionID/registration.go     |  4 +--
 .../identity/receptionID/registration_test.go |  2 +-
 cmix/identity/receptionID/store.go            |  2 +-
 .../receptionID/store/checkedRounds.go        |  4 +--
 .../receptionID/store/checkedRounds_test.go   |  4 +--
 .../receptionID/store/earliestRound.go        |  2 +-
 .../receptionID/store/unknownRounds.go        |  2 +-
 .../receptionID/store/unknownRounds_test.go   |  2 +-
 cmix/identity/receptionID/store_test.go       |  2 +-
 cmix/identity/tracker.go                      | 10 +++---
 cmix/identity/tracker_test.go                 |  6 ++--
 cmix/interface.go                             | 12 +++----
 cmix/message/bundle.go                        |  4 +--
 cmix/message/fingerprints_test.go             |  4 +--
 cmix/message/handler.go                       |  6 ++--
 cmix/message/handler_test.go                  |  8 ++---
 cmix/message/inProgress.go                    |  4 +--
 cmix/message/inProgress_test.go               |  6 ++--
 cmix/message/meteredCmixMessageBuffer.go      |  6 ++--
 cmix/message/meteredCmixMessageBuffer_test.go |  6 ++--
 cmix/message/processor.go                     |  4 +--
 cmix/nodes/interfaces.go                      |  4 +--
 cmix/nodes/register.go                        |  4 +--
 cmix/nodes/register_test.go                   |  2 +-
 cmix/nodes/registrar.go                       |  6 ++--
 cmix/nodes/registrar_test.go                  |  4 +--
 cmix/nodes/request.go                         |  4 +--
 cmix/nodes/store.go                           |  2 +-
 cmix/nodes/storeKey.go                        |  2 +-
 cmix/nodes/utils_test.go                      |  8 ++---
 cmix/params.go                                |  8 ++---
 cmix/pickup/get.go                            |  4 +--
 cmix/pickup/pickup.go                         | 14 ++++----
 cmix/pickup/retrieve.go                       | 10 +++---
 cmix/pickup/retrieve_test.go                  | 10 +++---
 cmix/pickup/store/store.go                    |  2 +-
 cmix/pickup/store/uncheckedRounds.go          |  2 +-
 cmix/pickup/store/uncheckedRounds_test.go     |  2 +-
 cmix/pickup/unchecked.go                      |  6 ++--
 cmix/pickup/unchecked_test.go                 |  6 ++--
 cmix/pickup/utils_test.go                     |  6 ++--
 cmix/results.go                               |  2 +-
 cmix/rounds/historical.go                     |  6 ++--
 cmix/rounds/historical_test.go                |  4 +--
 cmix/rounds/roundStorage.go                   |  2 +-
 cmix/sendCmix.go                              | 14 ++++----
 cmix/sendCmixUtils.go                         |  2 +-
 cmix/sendManyCmix.go                          | 14 ++++----
 cmix/utils_test.go                            |  8 ++---
 connect/authCallbacks.go                      | 10 +++---
 connect/authenticated.go                      |  8 ++---
 connect/authenticated_test.go                 |  2 +-
 connect/client.go                             |  2 +-
 connect/connect.go                            | 12 +++----
 connect/connectionList.go                     |  2 +-
 connect/listenerTracker.go                    |  2 +-
 connect/listenerTracker_test.go               |  2 +-
 connect/params_test.go                        |  2 +-
 connect/server.go                             |  2 +-
 connect/utils_test.go                         | 22 ++++++-------
 dummy/manager.go                              |  8 ++---
 dummy/manager_test.go                         |  2 +-
 dummy/mockCmix_test.go                        | 12 +++----
 dummy/random.go                               |  2 +-
 dummy/send.go                                 |  4 +--
 dummy/send_test.go                            |  2 +-
 dummy/utils_test.go                           |  4 +--
 e2e/callbacks.go                              |  2 +-
 e2e/callbacks_test.go                         |  2 +-
 e2e/critical.go                               |  8 ++---
 e2e/e2eMessageBuffer.go                       |  6 ++--
 e2e/e2eMessageBuffer_test.go                  |  8 ++---
 e2e/fpGenerator.go                            |  2 +-
 e2e/fpGenerator_test.go                       | 14 ++++----
 e2e/interface.go                              | 14 ++++----
 e2e/manager.go                                | 20 ++++++------
 e2e/params.go                                 |  4 +--
 e2e/parse/conversation/partner.go             |  2 +-
 e2e/parse/conversation/partner_test.go        |  2 +-
 e2e/parse/conversation/ring.go                |  2 +-
 e2e/parse/conversation/ring_test.go           |  2 +-
 e2e/parse/conversation/store.go               |  2 +-
 e2e/parse/conversation/store_test.go          |  2 +-
 e2e/parse/firstMessagePart.go                 |  2 +-
 e2e/parse/firstMessagePart_test.go            |  2 +-
 e2e/parse/partition.go                        | 10 +++---
 e2e/parse/partition/multiPartMessage.go       |  6 ++--
 e2e/parse/partition/multiPartMessage_test.go  |  6 ++--
 e2e/parse/partition/part.go                   |  2 +-
 e2e/parse/partition/part_test.go              |  2 +-
 e2e/parse/partition/store.go                  |  6 ++--
 e2e/parse/partition/store_test.go             |  4 +--
 e2e/parse/partition_test.go                   |  4 +--
 e2e/processor.go                              |  6 ++--
 e2e/ratchet/partner/interface.go              |  4 +--
 e2e/ratchet/partner/manager.go                |  8 ++---
 e2e/ratchet/partner/manager_test.go           |  6 ++--
 e2e/ratchet/partner/relationship.go           |  4 +--
 .../partner/relationshipFingerprint.go        |  4 +--
 e2e/ratchet/partner/relationship_test.go      |  6 ++--
 e2e/ratchet/partner/session/session.go        |  4 +--
 e2e/ratchet/partner/session/session_test.go   |  2 +-
 e2e/ratchet/partner/session/testUtils.go      |  4 +--
 e2e/ratchet/partner/utils.go                  |  4 +--
 e2e/ratchet/partner/utils_test.go             |  6 ++--
 e2e/ratchet/ratchet.go                        | 10 +++---
 e2e/ratchet/ratchet_test.go                   |  6 ++--
 e2e/ratchet/serviceList.go                    |  4 +--
 e2e/ratchet/storage.go                        | 10 +++---
 e2e/ratchet/utils_test.go                     | 14 ++++----
 e2e/receive/any.go                            |  2 +-
 e2e/receive/byType.go                         |  2 +-
 e2e/receive/byType_test.go                    |  2 +-
 e2e/receive/listener.go                       |  2 +-
 e2e/receive/message.go                        |  4 +--
 e2e/receive/switchboard.go                    |  2 +-
 e2e/receive/switchboard_test.go               |  2 +-
 e2e/rekey/confirm.go                          |  8 ++---
 e2e/rekey/confirm_test.go                     | 12 +++----
 e2e/rekey/exchange.go                         | 10 +++---
 e2e/rekey/exchange_test.go                    | 12 +++----
 e2e/rekey/params.go                           |  2 +-
 e2e/rekey/rekey.go                            | 10 +++---
 e2e/rekey/trigger.go                          | 12 +++----
 e2e/rekey/trigger_test.go                     | 14 ++++----
 e2e/rekey/utils_test.go                       | 20 ++++++------
 e2e/sendE2E.go                                | 14 ++++----
 e2e/sendE2E_test.go                           | 18 +++++------
 e2e/sendUnsafe.go                             |  6 ++--
 e2e/sendUnsafe_test.go                        | 12 +++----
 e2e/unsafeProcessor.go                        |  4 +--
 e2e/utils_test.go                             | 16 +++++-----
 event/event.go                                |  2 +-
 fileTransfer/batchBuilder.go                  |  4 +--
 .../callbackTracker/callbackTracker.go        |  2 +-
 .../callbackTracker/callbackTracker_test.go   |  2 +-
 fileTransfer/callbackTracker/manager.go       |  2 +-
 fileTransfer/callbackTracker/manager_test.go  |  2 +-
 fileTransfer/connect/listener.go              |  2 +-
 fileTransfer/connect/send.go                  |  6 ++--
 fileTransfer/connect/utils_test.go            | 30 ++++++++---------
 fileTransfer/connect/wrapper.go               | 10 +++---
 fileTransfer/connect/wrapper_test.go          |  8 ++---
 fileTransfer/e2e/listener.go                  |  2 +-
 fileTransfer/e2e/send.go                      |  6 ++--
 fileTransfer/e2e/utils_test.go                | 32 +++++++++----------
 fileTransfer/e2e/wrapper.go                   |  8 ++---
 fileTransfer/e2e/wrapper_test.go              |  8 ++---
 fileTransfer/groupChat/processor.go           |  6 ++--
 fileTransfer/groupChat/utils_test.go          | 26 +++++++--------
 fileTransfer/groupChat/wrapper.go             |  6 ++--
 fileTransfer/groupChat/wrapper_test.go        |  4 +--
 fileTransfer/interface.go                     |  2 +-
 fileTransfer/manager.go                       | 22 ++++++-------
 fileTransfer/manager_test.go                  |  4 +--
 fileTransfer/params.go                        |  2 +-
 fileTransfer/params_test.go                   |  2 +-
 fileTransfer/partTracker.go                   |  2 +-
 fileTransfer/processor.go                     | 10 +++---
 fileTransfer/send.go                          | 10 +++---
 fileTransfer/store/cypher/manager.go          |  4 +--
 fileTransfer/store/cypher/manager_test.go     |  4 +--
 fileTransfer/store/part.go                    |  4 +--
 fileTransfer/store/part_test.go               |  2 +-
 fileTransfer/store/received.go                |  2 +-
 fileTransfer/store/receivedTransfer.go        |  6 ++--
 fileTransfer/store/receivedTransfer_test.go   |  6 ++--
 fileTransfer/store/received_test.go           |  2 +-
 fileTransfer/store/sent.go                    |  2 +-
 fileTransfer/store/sentTransfer.go            |  6 ++--
 fileTransfer/store/sentTransfer_test.go       |  8 ++---
 fileTransfer/store/sent_test.go               |  2 +-
 fileTransfer/utils_test.go                    | 24 +++++++-------
 go.mod                                        |  2 +-
 groupChat/e2eManager_test.go                  | 14 ++++----
 groupChat/groupStore/group.go                 |  2 +-
 groupChat/groupStore/group_test.go            |  2 +-
 groupChat/groupStore/store.go                 |  2 +-
 groupChat/groupStore/store_test.go            |  2 +-
 groupChat/interface.go                        | 22 ++++++-------
 groupChat/makeGroup.go                        |  2 +-
 groupChat/makeGroup_test.go                   |  6 ++--
 groupChat/manager.go                          |  6 ++--
 groupChat/manager_test.go                     | 12 +++----
 groupChat/messenger_test.go                   | 12 +++----
 groupChat/networkManager_test.go              | 12 +++----
 groupChat/processor.go                        |  4 +--
 groupChat/receive.go                          |  6 ++--
 groupChat/receiveRequest.go                   |  6 ++--
 groupChat/receiveRequest_test.go              | 10 +++---
 groupChat/send.go                             |  8 ++---
 groupChat/sendRequests.go                     |  6 ++--
 groupChat/sendRequests_test.go                |  4 +--
 groupChat/send_test.go                        |  6 ++--
 groupChat/service.go                          |  6 ++--
 groupChat/session_test.go                     |  6 ++--
 groupChat/utils_test.go                       |  8 ++---
 groupChat/wrapper.go                          |  4 +--
 main.go                                       |  2 +-
 restlike/connect/receiver.go                  | 10 +++---
 restlike/connect/receiver_test.go             |  4 +--
 restlike/connect/request.go                   |  8 ++---
 restlike/connect/response.go                  |  4 +--
 restlike/connect/response_test.go             |  4 +--
 restlike/connect/server.go                    |  8 ++---
 restlike/single/receiver.go                   | 10 +++---
 restlike/single/request.go                    |  6 ++--
 restlike/single/response.go                   |  6 ++--
 restlike/single/response_test.go              |  4 +--
 restlike/single/server.go                     |  6 ++--
 single/interfaces.go                          | 10 +++---
 single/listener.go                            |  8 ++---
 single/listener_test.go                       | 10 +++---
 single/params.go                              |  2 +-
 single/params_test.go                         |  2 +-
 single/receivedRequest.go                     |  6 ++--
 single/receivedRequest_test.go                |  8 ++---
 single/request.go                             | 10 +++---
 single/requestPartProcessor.go                |  6 ++--
 single/request_test.go                        |  8 ++---
 single/responseProcessor.go                   |  6 ++--
 single/roundCollector.go                      |  2 +-
 single/utils_test.go                          |  8 ++---
 storage/clientVersion/store.go                |  2 +-
 storage/clientVersion/store_test.go           |  2 +-
 storage/ndf.go                                |  2 +-
 storage/regCode.go                            |  2 +-
 storage/regStatus.go                          |  2 +-
 storage/session.go                            |  8 ++---
 storage/user/cryptographic.go                 |  4 +--
 storage/user/cryptographic_test.go            |  2 +-
 storage/user/registation.go                   |  2 +-
 storage/user/registation_test.go              |  2 +-
 storage/user/user.go                          |  2 +-
 storage/user/user_test.go                     |  2 +-
 storage/user/username.go                      |  2 +-
 storage/user/username_test.go                 |  2 +-
 storage/utility/NDF.go                        |  2 +-
 storage/utility/NDF_js.go                     |  2 +-
 storage/utility/blockStore.go                 |  2 +-
 storage/utility/blockStore_test.go            |  2 +-
 storage/utility/bucket.go                     |  2 +-
 storage/utility/bucketParams.go               |  2 +-
 storage/utility/bucketParams_test.go          |  2 +-
 storage/utility/contact.go                    |  2 +-
 storage/utility/dh.go                         |  2 +-
 storage/utility/dh_test.go                    |  2 +-
 storage/utility/encryptionSalt.go             |  2 +-
 storage/utility/encryptionSalt_test.go        |  2 +-
 storage/utility/group.go                      |  2 +-
 storage/utility/group_test.go                 |  2 +-
 storage/utility/id.go                         |  2 +-
 storage/utility/messageBuffer.go              |  2 +-
 storage/utility/messageBuffer_test.go         |  2 +-
 storage/utility/multiStateVector.go           |  2 +-
 storage/utility/multiStateVector_test.go      |  2 +-
 storage/utility/sidh.go                       |  4 +--
 storage/utility/sidh_test.go                  |  2 +-
 storage/utility/stateVector.go                |  2 +-
 storage/utility/stateVector_test.go           |  2 +-
 ud/channelIDTracking.go                       |  8 ++---
 ud/channelIDTracking_test.go                  |  6 ++--
 ud/interfaces.go                              | 12 +++----
 ud/lookup.go                                  |  6 ++--
 ud/lookup_test.go                             |  4 +--
 ud/manager.go                                 |  8 ++---
 ud/mockE2e_test.go                            | 24 +++++++-------
 ud/mockStore_test.go                          |  6 ++--
 ud/networkManager_test.go                     | 14 ++++----
 ud/registered.go                              |  2 +-
 ud/search.go                                  |  8 ++---
 ud/search_test.go                             |  4 +--
 ud/store/facts_test.go                        |  2 +-
 ud/store/store.go                             |  2 +-
 ud/store/store_test.go                        |  2 +-
 ud/utils_test.go                              | 16 +++++-----
 xxdk/cmix.go                                  | 14 ++++----
 xxdk/e2e.go                                   | 14 ++++----
 xxdk/event.go                                 |  2 +-
 xxdk/identity.go                              |  4 +--
 xxdk/params.go                                | 10 +++---
 xxdk/permissioning.go                         |  4 +--
 xxdk/precan.go                                |  6 ++--
 xxdk/services.go                              |  2 +-
 xxdk/services_test.go                         |  2 +-
 xxdk/user.go                                  |  2 +-
 xxdk/utilsInterfaces_test.go                  | 12 +++----
 xxdk/utils_test.go                            |  2 +-
 xxmutils/restoreContacts.go                   | 12 +++----
 403 files changed, 1158 insertions(+), 1158 deletions(-)

diff --git a/auth/confirm.go b/auth/confirm.go
index 9b9e55e3f..fec085c1b 100644
--- a/auth/confirm.go
+++ b/auth/confirm.go
@@ -12,11 +12,11 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/auth/store"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/event"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
+	"gitlab.com/elixxir/client/v4/auth/store"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/event"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
 	"gitlab.com/elixxir/crypto/contact"
 	cAuth "gitlab.com/elixxir/crypto/e2e/auth"
 	"gitlab.com/elixxir/primitives/format"
diff --git a/auth/fmt.go b/auth/fmt.go
index 9f9362807..015205aaa 100644
--- a/auth/fmt.go
+++ b/auth/fmt.go
@@ -11,8 +11,8 @@ import (
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	sidhinterface "gitlab.com/elixxir/client/v5/interfaces/sidh"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
+	sidhinterface "gitlab.com/elixxir/client/v4/interfaces/sidh"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/auth/fmt_test.go b/auth/fmt_test.go
index 00dd0dc6f..c8215a4f5 100644
--- a/auth/fmt_test.go
+++ b/auth/fmt_test.go
@@ -13,7 +13,7 @@ import (
 	"reflect"
 	"testing"
 
-	sidhinterface "gitlab.com/elixxir/client/v5/interfaces/sidh"
+	sidhinterface "gitlab.com/elixxir/client/v4/interfaces/sidh"
 	"gitlab.com/xx_network/primitives/id"
 )
 
diff --git a/auth/interface.go b/auth/interface.go
index 8c2862b74..62c086208 100644
--- a/auth/interface.go
+++ b/auth/interface.go
@@ -9,14 +9,14 @@ package auth
 
 import (
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/primitives/fact"
diff --git a/auth/params.go b/auth/params.go
index 8022e1376..b224f5134 100644
--- a/auth/params.go
+++ b/auth/params.go
@@ -9,7 +9,7 @@ package auth
 
 import (
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/catalog"
+	"gitlab.com/elixxir/client/v4/catalog"
 )
 
 // Params is are the parameters for the auth package.
diff --git a/auth/receivedConfirm.go b/auth/receivedConfirm.go
index 64f40c32f..c12fea760 100644
--- a/auth/receivedConfirm.go
+++ b/auth/receivedConfirm.go
@@ -12,10 +12,10 @@ import (
 	"fmt"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/auth/store"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/auth/store"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/crypto/contact"
 	cAuth "gitlab.com/elixxir/crypto/e2e/auth"
 	"gitlab.com/elixxir/primitives/fact"
diff --git a/auth/receivedRequest.go b/auth/receivedRequest.go
index aef3c0c35..b1febe901 100644
--- a/auth/receivedRequest.go
+++ b/auth/receivedRequest.go
@@ -15,10 +15,10 @@ import (
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/auth/store"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet"
+	"gitlab.com/elixxir/client/v4/auth/store"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet"
 	"gitlab.com/elixxir/crypto/contact"
 	cAuth "gitlab.com/elixxir/crypto/e2e/auth"
 	"gitlab.com/elixxir/primitives/fact"
diff --git a/auth/request.go b/auth/request.go
index c9b7e492f..f3f66aec7 100644
--- a/auth/request.go
+++ b/auth/request.go
@@ -15,11 +15,11 @@ import (
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/diffieHellman"
diff --git a/auth/sentRequestHandler.go b/auth/sentRequestHandler.go
index 61f573af5..aa4df76e7 100644
--- a/auth/sentRequestHandler.go
+++ b/auth/sentRequestHandler.go
@@ -9,8 +9,8 @@ package auth
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/auth/store"
-	"gitlab.com/elixxir/client/v5/cmix/message"
+	"gitlab.com/elixxir/client/v4/auth/store"
+	"gitlab.com/elixxir/client/v4/cmix/message"
 )
 
 // sentRequestHandler interface which allows the lower level to register
diff --git a/auth/state.go b/auth/state.go
index 6f5d56101..5dfafc023 100644
--- a/auth/state.go
+++ b/auth/state.go
@@ -11,14 +11,14 @@ import (
 	"encoding/base64"
 
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/auth/store"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/event"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/auth/store"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/event"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/auth/state_test.go b/auth/state_test.go
index 47c6cb241..a67179b5c 100644
--- a/auth/state_test.go
+++ b/auth/state_test.go
@@ -8,24 +8,24 @@
 package auth
 
 import (
-	"gitlab.com/elixxir/client/v5/e2e"
+	"gitlab.com/elixxir/client/v4/e2e"
 	"io"
 	"math/rand"
 	"testing"
 	"time"
 
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/auth/store"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/storage"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/auth/store"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/storage"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/auth/store/confirmation.go b/auth/store/confirmation.go
index e50270b50..4f1ca8963 100644
--- a/auth/store/confirmation.go
+++ b/auth/store/confirmation.go
@@ -10,7 +10,7 @@ package store
 import (
 	"encoding/base64"
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/auth/store/confirmation_test.go b/auth/store/confirmation_test.go
index cc0c5f1a6..b60f29f0a 100644
--- a/auth/store/confirmation_test.go
+++ b/auth/store/confirmation_test.go
@@ -13,8 +13,8 @@ import (
 	"testing"
 
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/e2e/auth"
diff --git a/auth/store/previousNegotiations.go b/auth/store/previousNegotiations.go
index ff529f996..a0d3bc2ff 100644
--- a/auth/store/previousNegotiations.go
+++ b/auth/store/previousNegotiations.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/e2e/auth"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/auth/store/previousNegotiations_test.go b/auth/store/previousNegotiations_test.go
index 3e2e5710e..4c4f25a30 100644
--- a/auth/store/previousNegotiations_test.go
+++ b/auth/store/previousNegotiations_test.go
@@ -13,8 +13,8 @@ import (
 	"testing"
 
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/e2e/auth"
diff --git a/auth/store/receivedRequest.go b/auth/store/receivedRequest.go
index 8fe518aba..bc3bf8d74 100644
--- a/auth/store/receivedRequest.go
+++ b/auth/store/receivedRequest.go
@@ -13,9 +13,9 @@ import (
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/auth/store/sentRequest.go b/auth/store/sentRequest.go
index 40840938d..b8e95e44f 100644
--- a/auth/store/sentRequest.go
+++ b/auth/store/sentRequest.go
@@ -16,8 +16,8 @@ import (
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	sidhinterface "gitlab.com/elixxir/client/v5/interfaces/sidh"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	sidhinterface "gitlab.com/elixxir/client/v4/interfaces/sidh"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/auth/store/store.go b/auth/store/store.go
index 674c7c02b..b0c6f1ac7 100644
--- a/auth/store/store.go
+++ b/auth/store/store.go
@@ -14,8 +14,8 @@ import (
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/primitives/format"
diff --git a/auth/store/store_test.go b/auth/store/store_test.go
index ec2fee33f..5c09170ce 100644
--- a/auth/store/store_test.go
+++ b/auth/store/store_test.go
@@ -16,10 +16,10 @@ import (
 	"testing"
 
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	sidhinterface "gitlab.com/elixxir/client/v5/interfaces/sidh"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	sidhinterface "gitlab.com/elixxir/client/v4/interfaces/sidh"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
diff --git a/auth/utils_test.go b/auth/utils_test.go
index bf1b57a89..c8742b7c0 100644
--- a/auth/utils_test.go
+++ b/auth/utils_test.go
@@ -9,15 +9,15 @@ package auth
 
 import (
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/auth/store"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/auth/store"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/crypto/cyclic"
 	cryptoE2e "gitlab.com/elixxir/crypto/e2e"
diff --git a/auth/verify.go b/auth/verify.go
index 487c05d1b..b40f9dca5 100644
--- a/auth/verify.go
+++ b/auth/verify.go
@@ -8,7 +8,7 @@
 package auth
 
 import (
-	"gitlab.com/elixxir/client/v5/e2e"
+	"gitlab.com/elixxir/client/v4/e2e"
 	"gitlab.com/elixxir/crypto/contact"
 	cAuth "gitlab.com/elixxir/crypto/e2e/auth"
 )
diff --git a/backup/backup.go b/backup/backup.go
index c23273d6f..464cc713a 100644
--- a/backup/backup.go
+++ b/backup/backup.go
@@ -8,11 +8,11 @@
 package backup
 
 import (
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"sync"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/primitives/fact"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/backup/backupRestore.go b/backup/backupRestore.go
index 940a29925..4e146a707 100644
--- a/backup/backupRestore.go
+++ b/backup/backupRestore.go
@@ -10,12 +10,12 @@ package backup
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/rekey"
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/storage/user"
-	"gitlab.com/elixxir/client/v5/ud"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/rekey"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/storage/user"
+	"gitlab.com/elixxir/client/v4/ud"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	cryptoBackup "gitlab.com/elixxir/crypto/backup"
 	"gitlab.com/elixxir/primitives/fact"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/backup/backup_test.go b/backup/backup_test.go
index 2d2b9b81e..cc501ffcc 100644
--- a/backup/backup_test.go
+++ b/backup/backup_test.go
@@ -9,13 +9,13 @@ package backup
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"reflect"
 	"testing"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 
 	"gitlab.com/elixxir/crypto/backup"
diff --git a/backup/jsonStorage.go b/backup/jsonStorage.go
index 066b6da07..ac887bce8 100644
--- a/backup/jsonStorage.go
+++ b/backup/jsonStorage.go
@@ -8,7 +8,7 @@
 package backup
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/netTime"
 )
 
diff --git a/backup/jsonStorage_test.go b/backup/jsonStorage_test.go
index 14168a3e7..02588ed20 100644
--- a/backup/jsonStorage_test.go
+++ b/backup/jsonStorage_test.go
@@ -10,7 +10,7 @@ package backup
 import (
 	"testing"
 
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 )
 
diff --git a/backup/keyStorage.go b/backup/keyStorage.go
index b073546a0..d6b5afd8c 100644
--- a/backup/keyStorage.go
+++ b/backup/keyStorage.go
@@ -10,7 +10,7 @@ package backup
 import (
 	"bytes"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/backup"
 	"gitlab.com/xx_network/primitives/netTime"
 )
diff --git a/bindings/authenticatedConnection.go b/bindings/authenticatedConnection.go
index 9e9af590f..a32fc0b9b 100644
--- a/bindings/authenticatedConnection.go
+++ b/bindings/authenticatedConnection.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/connect"
+	"gitlab.com/elixxir/client/v4/connect"
 	"gitlab.com/elixxir/crypto/contact"
 )
 
diff --git a/bindings/backup.go b/bindings/backup.go
index 81f010ef9..cf0d756b0 100644
--- a/bindings/backup.go
+++ b/bindings/backup.go
@@ -9,7 +9,7 @@ package bindings
 
 import (
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/backup"
+	"gitlab.com/elixxir/client/v4/backup"
 	"gitlab.com/xx_network/primitives/id"
 )
 
diff --git a/bindings/channels.go b/bindings/channels.go
index 20804007d..fcd8e2d46 100644
--- a/bindings/channels.go
+++ b/bindings/channels.go
@@ -15,11 +15,11 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/channels"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/channels"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/crypto/rsa"
diff --git a/bindings/cmix.go b/bindings/cmix.go
index 730e8f6d7..1088c5c4c 100644
--- a/bindings/cmix.go
+++ b/bindings/cmix.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/xxdk"
 )
 
 // init sets the log level to INFO.
diff --git a/bindings/connect.go b/bindings/connect.go
index 727731496..4a5a5175c 100644
--- a/bindings/connect.go
+++ b/bindings/connect.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/connect"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/connect"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/contact"
 )
 
diff --git a/bindings/delivery.go b/bindings/delivery.go
index fc51bf661..c57d548f3 100644
--- a/bindings/delivery.go
+++ b/bindings/delivery.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
+	"gitlab.com/elixxir/client/v4/cmix"
 	"gitlab.com/xx_network/primitives/id"
 )
 
diff --git a/bindings/dummy.go b/bindings/dummy.go
index bde787286..7f61560b4 100644
--- a/bindings/dummy.go
+++ b/bindings/dummy.go
@@ -8,7 +8,7 @@
 package bindings
 
 import (
-	"gitlab.com/elixxir/client/v5/dummy"
+	"gitlab.com/elixxir/client/v4/dummy"
 	"time"
 )
 
diff --git a/bindings/e2e.go b/bindings/e2e.go
index 0075438ab..a5a133719 100644
--- a/bindings/e2e.go
+++ b/bindings/e2e.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/contact"
 )
 
diff --git a/bindings/e2eAuth.go b/bindings/e2eAuth.go
index 04f028781..0576f231a 100644
--- a/bindings/e2eAuth.go
+++ b/bindings/e2eAuth.go
@@ -9,7 +9,7 @@ package bindings
 
 import (
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/primitives/fact"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/bindings/e2eHandler.go b/bindings/e2eHandler.go
index e7f0d43e4..5853560f1 100644
--- a/bindings/e2eHandler.go
+++ b/bindings/e2eHandler.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/bindings/fileTransfer.go b/bindings/fileTransfer.go
index 0ff6a77ea..a8c98a482 100644
--- a/bindings/fileTransfer.go
+++ b/bindings/fileTransfer.go
@@ -14,8 +14,8 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/fileTransfer"
-	"gitlab.com/elixxir/client/v5/fileTransfer/e2e"
+	"gitlab.com/elixxir/client/v4/fileTransfer"
+	"gitlab.com/elixxir/client/v4/fileTransfer/e2e"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/xx_network/primitives/id"
 )
@@ -154,7 +154,7 @@ type FileTransferReceiveProgressCallback interface {
 //  - receiveFileCallback - A callback that is called when a new file transfer
 //    is received.
 //  - e2eFileTransferParamsJson - JSON of
-//    [gitlab.com/elixxir/client/v5/fileTransfer/e2e.Params].
+//    [gitlab.com/elixxir/client/v4/fileTransfer/e2e.Params].
 //  - fileTransferParamsJson - JSON of [fileTransfer.Params].
 //
 // Returns:
diff --git a/bindings/follow.go b/bindings/follow.go
index 873847d2e..b54598189 100644
--- a/bindings/follow.go
+++ b/bindings/follow.go
@@ -11,7 +11,7 @@ import (
 	"encoding/json"
 	"fmt"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/message"
 	"time"
 
 	"github.com/pkg/errors"
diff --git a/bindings/group.go b/bindings/group.go
index 3391c8823..10aa4ffc9 100644
--- a/bindings/group.go
+++ b/bindings/group.go
@@ -11,10 +11,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	gc "gitlab.com/elixxir/client/v5/groupChat"
-	gs "gitlab.com/elixxir/client/v5/groupChat/groupStore"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	gc "gitlab.com/elixxir/client/v4/groupChat"
+	gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
 	"time"
diff --git a/bindings/identity.go b/bindings/identity.go
index a293161ff..fbb431828 100644
--- a/bindings/identity.go
+++ b/bindings/identity.go
@@ -9,7 +9,7 @@ package bindings
 
 import (
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/primitives/fact"
 )
diff --git a/bindings/listener.go b/bindings/listener.go
index a2be2e009..4847ae85e 100644
--- a/bindings/listener.go
+++ b/bindings/listener.go
@@ -11,7 +11,7 @@ import (
 	"encoding/json"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
 )
 
 // Listener provides a callback to hear a message.
diff --git a/bindings/ndf.go b/bindings/ndf.go
index 5343eae95..356ea30d3 100644
--- a/bindings/ndf.go
+++ b/bindings/ndf.go
@@ -7,7 +7,7 @@
 
 package bindings
 
-import "gitlab.com/elixxir/client/v5/xxdk"
+import "gitlab.com/elixxir/client/v4/xxdk"
 
 // DownloadAndVerifySignedNdfWithUrl retrieves the NDF from a specified URL.
 // The NDF is processed into a protobuf containing a signature that is verified
diff --git a/bindings/notifications.go b/bindings/notifications.go
index 199d46870..2f35cf51c 100644
--- a/bindings/notifications.go
+++ b/bindings/notifications.go
@@ -9,7 +9,7 @@ package bindings
 
 import (
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/message"
 	"gitlab.com/elixxir/primitives/notifications"
 )
 
diff --git a/bindings/notifications_test.go b/bindings/notifications_test.go
index 1687d2193..96e8ed21f 100644
--- a/bindings/notifications_test.go
+++ b/bindings/notifications_test.go
@@ -10,7 +10,7 @@ package bindings
 import (
 	"encoding/json"
 	"fmt"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet"
 	"gitlab.com/xx_network/primitives/id"
 	"testing"
 )
diff --git a/bindings/params.go b/bindings/params.go
index 99803ca33..d32a5f21e 100644
--- a/bindings/params.go
+++ b/bindings/params.go
@@ -12,10 +12,10 @@ package bindings
 import (
 	"encoding/json"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/fileTransfer"
-	e2eFileTransfer "gitlab.com/elixxir/client/v5/fileTransfer/e2e"
-	"gitlab.com/elixxir/client/v5/single"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/fileTransfer"
+	e2eFileTransfer "gitlab.com/elixxir/client/v4/fileTransfer/e2e"
+	"gitlab.com/elixxir/client/v4/single"
+	"gitlab.com/elixxir/client/v4/xxdk"
 )
 
 // GetDefaultCMixParams returns a JSON serialized object with all of the cMix
diff --git a/bindings/restlike.go b/bindings/restlike.go
index 471b2be49..6bd33e3e0 100644
--- a/bindings/restlike.go
+++ b/bindings/restlike.go
@@ -11,8 +11,8 @@ import (
 	"encoding/json"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/restlike"
-	"gitlab.com/elixxir/client/v5/restlike/connect"
+	"gitlab.com/elixxir/client/v4/restlike"
+	"gitlab.com/elixxir/client/v4/restlike/connect"
 )
 
 // RestlikeMessage is the bindings' representation of a restlike.Message
diff --git a/bindings/restlikeSingle.go b/bindings/restlikeSingle.go
index ae3f3a201..3625dcc45 100644
--- a/bindings/restlikeSingle.go
+++ b/bindings/restlikeSingle.go
@@ -10,8 +10,8 @@ package bindings
 import (
 	"encoding/json"
 
-	"gitlab.com/elixxir/client/v5/restlike"
-	"gitlab.com/elixxir/client/v5/restlike/single"
+	"gitlab.com/elixxir/client/v4/restlike"
+	"gitlab.com/elixxir/client/v4/restlike/single"
 	"gitlab.com/elixxir/crypto/contact"
 )
 
diff --git a/bindings/single.go b/bindings/single.go
index 690cb878c..50ec375d8 100644
--- a/bindings/single.go
+++ b/bindings/single.go
@@ -10,9 +10,9 @@ package bindings
 import (
 	"encoding/json"
 
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/single"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/single"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/bindings/single_test.go b/bindings/single_test.go
index 9d35a34fc..b49503819 100644
--- a/bindings/single_test.go
+++ b/bindings/single_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
 	"gitlab.com/xx_network/crypto/csprng"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/id/ephemeral"
diff --git a/bindings/ud.go b/bindings/ud.go
index ab83793b7..dfd27b1f0 100644
--- a/bindings/ud.go
+++ b/bindings/ud.go
@@ -12,9 +12,9 @@ import (
 	"fmt"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/single"
-	"gitlab.com/elixxir/client/v5/ud"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/single"
+	"gitlab.com/elixxir/client/v4/ud"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/primitives/fact"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/bindings/version.go b/bindings/version.go
index a86b5135f..e5c58ba75 100644
--- a/bindings/version.go
+++ b/bindings/version.go
@@ -9,7 +9,7 @@
 
 package bindings
 
-import "gitlab.com/elixxir/client/v5/xxdk"
+import "gitlab.com/elixxir/client/v4/xxdk"
 
 // GetVersion returns the xxdk.SEMVER.
 func GetVersion() string {
diff --git a/broadcast/client.go b/broadcast/client.go
index 466e1f9ac..7e897881e 100644
--- a/broadcast/client.go
+++ b/broadcast/client.go
@@ -10,8 +10,8 @@ package broadcast
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/message"
 	crypto "gitlab.com/elixxir/crypto/broadcast"
 	"gitlab.com/elixxir/crypto/fastRNG"
 )
diff --git a/broadcast/interface.go b/broadcast/interface.go
index 878428d47..bb4e592c8 100644
--- a/broadcast/interface.go
+++ b/broadcast/interface.go
@@ -8,10 +8,10 @@
 package broadcast
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	crypto "gitlab.com/elixxir/crypto/broadcast"
 	"gitlab.com/elixxir/crypto/rsa"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/broadcast/processor.go b/broadcast/processor.go
index d624a0b79..79f14fb36 100644
--- a/broadcast/processor.go
+++ b/broadcast/processor.go
@@ -10,8 +10,8 @@ package broadcast
 import (
 	"encoding/binary"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	crypto "gitlab.com/elixxir/crypto/broadcast"
 	"gitlab.com/elixxir/primitives/format"
 )
diff --git a/broadcast/rsaToPublic.go b/broadcast/rsaToPublic.go
index e62a4cdb9..ec007bcfc 100644
--- a/broadcast/rsaToPublic.go
+++ b/broadcast/rsaToPublic.go
@@ -10,9 +10,9 @@ package broadcast
 import (
 	"encoding/binary"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/crypto/rsa"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/broadcast/rsaToPublic_test.go b/broadcast/rsaToPublic_test.go
index 2f4fb3fcb..17edc3169 100644
--- a/broadcast/rsaToPublic_test.go
+++ b/broadcast/rsaToPublic_test.go
@@ -17,10 +17,10 @@ import (
 
 	"gitlab.com/xx_network/crypto/csprng"
 
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	crypto "gitlab.com/elixxir/crypto/broadcast"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/primitives/format"
diff --git a/broadcast/symmetric.go b/broadcast/symmetric.go
index 1d89068a2..e2bebe025 100644
--- a/broadcast/symmetric.go
+++ b/broadcast/symmetric.go
@@ -9,9 +9,9 @@ package broadcast
 
 import (
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/id/ephemeral"
diff --git a/broadcast/symmetric_test.go b/broadcast/symmetric_test.go
index 2637d918b..640824c01 100644
--- a/broadcast/symmetric_test.go
+++ b/broadcast/symmetric_test.go
@@ -11,9 +11,9 @@ package broadcast
 import (
 	"bytes"
 	"fmt"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	crypto "gitlab.com/elixxir/crypto/broadcast"
 
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/broadcast/utils_test.go b/broadcast/utils_test.go
index 214bc6a38..61c4c4147 100644
--- a/broadcast/utils_test.go
+++ b/broadcast/utils_test.go
@@ -14,10 +14,10 @@ import (
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/id/ephemeral"
 
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/primitives/format"
 )
 
diff --git a/channels/adminListener.go b/channels/adminListener.go
index af5821369..9511ba480 100644
--- a/channels/adminListener.go
+++ b/channels/adminListener.go
@@ -10,8 +10,8 @@ package channels
 import (
 	"github.com/golang/protobuf/proto"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/primitives/states"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/channels/adminListener_test.go b/channels/adminListener_test.go
index 3930fed2b..e735772cf 100644
--- a/channels/adminListener_test.go
+++ b/channels/adminListener_test.go
@@ -15,8 +15,8 @@ import (
 
 	"github.com/golang/protobuf/proto"
 
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/primitives/states"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/channels/eventModel.go b/channels/eventModel.go
index 913a47aa4..c2c8251ed 100644
--- a/channels/eventModel.go
+++ b/channels/eventModel.go
@@ -14,12 +14,12 @@ import (
 	"fmt"
 	"github.com/golang/protobuf/proto"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
 	"strconv"
 	"sync"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/channels/eventModel_test.go b/channels/eventModel_test.go
index 7a63fa1c8..0ec6d8780 100644
--- a/channels/eventModel_test.go
+++ b/channels/eventModel_test.go
@@ -11,8 +11,8 @@ import (
 	"bytes"
 	"crypto/ed25519"
 	"github.com/golang/protobuf/proto"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/primitives/states"
diff --git a/channels/identityStore.go b/channels/identityStore.go
index 692a45ad9..2a98eb939 100644
--- a/channels/identityStore.go
+++ b/channels/identityStore.go
@@ -1,7 +1,7 @@
 package channels
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/xx_network/primitives/netTime"
 )
diff --git a/channels/identityStore_test.go b/channels/identityStore_test.go
index 012641828..bb80542e7 100644
--- a/channels/identityStore_test.go
+++ b/channels/identityStore_test.go
@@ -10,7 +10,7 @@ package channels
 import (
 	"bytes"
 	"encoding/base64"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/channels/interface.go b/channels/interface.go
index 8c47218b7..c1b1a2a74 100644
--- a/channels/interface.go
+++ b/channels/interface.go
@@ -11,8 +11,8 @@ import (
 	"math"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/crypto/rsa"
diff --git a/channels/joinedChannel.go b/channels/joinedChannel.go
index 304519d87..307100730 100644
--- a/channels/joinedChannel.go
+++ b/channels/joinedChannel.go
@@ -10,8 +10,8 @@ package channels
 import (
 	"encoding/json"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/broadcast"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/broadcast"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/channels/joinedChannel_test.go b/channels/joinedChannel_test.go
index e13963c68..30b7d9b4e 100644
--- a/channels/joinedChannel_test.go
+++ b/channels/joinedChannel_test.go
@@ -19,11 +19,11 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/broadcast"
-	clientCmix "gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/broadcast"
+	clientCmix "gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/channels/manager.go b/channels/manager.go
index 5a93469c8..26e09ca28 100644
--- a/channels/manager.go
+++ b/channels/manager.go
@@ -16,11 +16,11 @@ import (
 	"fmt"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/broadcast"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/broadcast"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/channels/manager_test.go b/channels/manager_test.go
index 4028c18d8..4bc2ccead 100644
--- a/channels/manager_test.go
+++ b/channels/manager_test.go
@@ -9,8 +9,8 @@ package channels
 
 import (
 	"fmt"
-	"gitlab.com/elixxir/client/v5/broadcast"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/broadcast"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	broadcast2 "gitlab.com/elixxir/crypto/broadcast"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/channels/nickname.go b/channels/nickname.go
index 5f42eb2b8..adc989c06 100644
--- a/channels/nickname.go
+++ b/channels/nickname.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
 	"sync"
diff --git a/channels/nickname_test.go b/channels/nickname_test.go
index 8049e36e3..e8fc2313c 100644
--- a/channels/nickname_test.go
+++ b/channels/nickname_test.go
@@ -1,7 +1,7 @@
 package channels
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/id"
 	"strconv"
diff --git a/channels/send.go b/channels/send.go
index f42eddc27..bd8ff456b 100644
--- a/channels/send.go
+++ b/channels/send.go
@@ -15,8 +15,8 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/crypto/rsa"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/channels/sendTracker.go b/channels/sendTracker.go
index 142b2e0d2..11aed9026 100644
--- a/channels/sendTracker.go
+++ b/channels/sendTracker.go
@@ -11,10 +11,10 @@ import (
 	"encoding/json"
 	"errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/primitives/states"
diff --git a/channels/sendTracker_test.go b/channels/sendTracker_test.go
index dc4475bc3..448c721ff 100644
--- a/channels/sendTracker_test.go
+++ b/channels/sendTracker_test.go
@@ -1,11 +1,11 @@
 package channels
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/ekv"
diff --git a/channels/send_test.go b/channels/send_test.go
index 596ec185f..71c30e26a 100644
--- a/channels/send_test.go
+++ b/channels/send_test.go
@@ -16,9 +16,9 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/proto"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/crypto/rsa"
@@ -29,8 +29,8 @@ import (
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/id/ephemeral"
 
-	"gitlab.com/elixxir/client/v5/broadcast"
-	"gitlab.com/elixxir/client/v5/cmix"
+	"gitlab.com/elixxir/client/v4/broadcast"
+	"gitlab.com/elixxir/client/v4/cmix"
 	cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
 )
 
diff --git a/channels/userListener.go b/channels/userListener.go
index 2ce46422e..b05477829 100644
--- a/channels/userListener.go
+++ b/channels/userListener.go
@@ -10,8 +10,8 @@ package channels
 import (
 	"crypto/ed25519"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/primitives/states"
 	"gitlab.com/xx_network/primitives/id"
 	"time"
diff --git a/channels/userListener_test.go b/channels/userListener_test.go
index 8e4c17aab..c22777c02 100644
--- a/channels/userListener_test.go
+++ b/channels/userListener_test.go
@@ -17,8 +17,8 @@ import (
 
 	"github.com/golang/protobuf/proto"
 
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/primitives/states"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/cmd/backup.go b/cmd/backup.go
index 73d969499..a65964917 100644
--- a/cmd/backup.go
+++ b/cmd/backup.go
@@ -16,8 +16,8 @@ import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
-	"gitlab.com/elixxir/client/v5/backup"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/backup"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	backupCrypto "gitlab.com/elixxir/crypto/backup"
 	"gitlab.com/xx_network/primitives/utils"
 )
diff --git a/cmd/broadcast.go b/cmd/broadcast.go
index b7ef418cf..8c1f33a90 100644
--- a/cmd/broadcast.go
+++ b/cmd/broadcast.go
@@ -15,10 +15,10 @@ import (
 	"github.com/spf13/cobra"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
-	"gitlab.com/elixxir/client/v5/broadcast"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/broadcast"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	crypto "gitlab.com/elixxir/crypto/broadcast"
 	rsa2 "gitlab.com/elixxir/crypto/rsa"
 	"gitlab.com/xx_network/primitives/utils"
diff --git a/cmd/callbacks.go b/cmd/callbacks.go
index b6e1361b7..8b07c6584 100644
--- a/cmd/callbacks.go
+++ b/cmd/callbacks.go
@@ -12,13 +12,13 @@ import (
 	"fmt"
 
 	"github.com/spf13/viper"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/xxdk"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/cmd/connect.go b/cmd/connect.go
index 4b68504cc..7307b2f8a 100644
--- a/cmd/connect.go
+++ b/cmd/connect.go
@@ -12,11 +12,11 @@ import (
 	"github.com/spf13/cobra"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/connect"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/connect"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"os"
 	"os/signal"
 	"syscall"
diff --git a/cmd/dumpRounds.go b/cmd/dumpRounds.go
index 40fb21011..68c265d8a 100644
--- a/cmd/dumpRounds.go
+++ b/cmd/dumpRounds.go
@@ -18,8 +18,8 @@ import (
 
 	"github.com/spf13/cobra"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/xx_network/comms/signature"
 	"gitlab.com/xx_network/crypto/signature/ec"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/cmd/fileTransfer.go b/cmd/fileTransfer.go
index d8cd5061a..f34472229 100644
--- a/cmd/fileTransfer.go
+++ b/cmd/fileTransfer.go
@@ -12,13 +12,13 @@ import (
 	"io/ioutil"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/xxdk"
 
 	"github.com/spf13/cobra"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
-	ft "gitlab.com/elixxir/client/v5/fileTransfer"
-	ftE2e "gitlab.com/elixxir/client/v5/fileTransfer/e2e"
+	ft "gitlab.com/elixxir/client/v4/fileTransfer"
+	ftE2e "gitlab.com/elixxir/client/v4/fileTransfer/e2e"
 	"gitlab.com/elixxir/crypto/contact"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/cmd/getndf.go b/cmd/getndf.go
index d8f80e15d..5528885a4 100644
--- a/cmd/getndf.go
+++ b/cmd/getndf.go
@@ -16,11 +16,11 @@ import (
 	"gitlab.com/elixxir/comms/client"
 
 	// "gitlab.com/elixxir/crypto/contact"
-	// "gitlab.com/elixxir/client/v5/interfaces/message"
-	// "gitlab.com/elixxir/client/v5/switchboard"
-	// "gitlab.com/elixxir/client/v5/ud"
+	// "gitlab.com/elixxir/client/v4/interfaces/message"
+	// "gitlab.com/elixxir/client/v4/switchboard"
+	// "gitlab.com/elixxir/client/v4/ud"
 	// "gitlab.com/elixxir/primitives/fact"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/xx_network/comms/connect"
 	//"time"
 	pb "gitlab.com/elixxir/comms/mixmessages"
diff --git a/cmd/group.go b/cmd/group.go
index cfc1f22ba..69a478862 100644
--- a/cmd/group.go
+++ b/cmd/group.go
@@ -15,16 +15,16 @@ import (
 	"os"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/primitives/format"
 
 	"github.com/spf13/cobra"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
-	"gitlab.com/elixxir/client/v5/groupChat"
-	"gitlab.com/elixxir/client/v5/groupChat/groupStore"
+	"gitlab.com/elixxir/client/v4/groupChat"
+	"gitlab.com/elixxir/client/v4/groupChat/groupStore"
 	"gitlab.com/xx_network/primitives/id"
 )
 
diff --git a/cmd/init.go b/cmd/init.go
index 37d670525..0ab347c0a 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -19,7 +19,7 @@ import (
 	"github.com/spf13/cobra"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/xxdk"
 )
 
 // initCmd creates a new user object with the given NDF
diff --git a/cmd/pickup.go b/cmd/pickup.go
index 0249577c4..5073d4dc1 100644
--- a/cmd/pickup.go
+++ b/cmd/pickup.go
@@ -18,7 +18,7 @@ import (
 	"github.com/spf13/cobra"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
-	"gitlab.com/elixxir/client/v5/cmix/pickup"
+	"gitlab.com/elixxir/client/v4/cmix/pickup"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/primitives/states"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/cmd/precan.go b/cmd/precan.go
index 57fff5f76..81696c97e 100644
--- a/cmd/precan.go
+++ b/cmd/precan.go
@@ -13,7 +13,7 @@ import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/xx_network/primitives/id"
 	"io/fs"
diff --git a/cmd/proto.go b/cmd/proto.go
index ab982ed10..80e60cbe7 100644
--- a/cmd/proto.go
+++ b/cmd/proto.go
@@ -12,8 +12,8 @@ import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
-	"gitlab.com/elixxir/client/v5/storage/user"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/storage/user"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/xx_network/primitives/utils"
 	"io/fs"
 	"io/ioutil"
diff --git a/cmd/root.go b/cmd/root.go
index 06e859ad7..b1e271d09 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -27,11 +27,11 @@ import (
 	"sync"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/backup"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/backup"
+	"gitlab.com/elixxir/client/v4/xxdk"
 
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
 
 	"github.com/spf13/cobra"
 	jww "github.com/spf13/jwalterweatherman"
diff --git a/cmd/single.go b/cmd/single.go
index fdfe03bbf..eb605ff47 100644
--- a/cmd/single.go
+++ b/cmd/single.go
@@ -16,11 +16,11 @@ import (
 	"github.com/spf13/cobra"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/single"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/single"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/xx_network/primitives/utils"
 )
diff --git a/cmd/ud.go b/cmd/ud.go
index 0c7ee115b..76a6eb5e4 100644
--- a/cmd/ud.go
+++ b/cmd/ud.go
@@ -10,13 +10,13 @@ package cmd
 
 import (
 	"fmt"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/xx_network/primitives/id"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/single"
-	"gitlab.com/elixxir/client/v5/ud"
-	"gitlab.com/elixxir/client/v5/xxmutils"
+	"gitlab.com/elixxir/client/v4/single"
+	"gitlab.com/elixxir/client/v4/ud"
+	"gitlab.com/elixxir/client/v4/xxmutils"
 	"gitlab.com/elixxir/primitives/fact"
 	"gitlab.com/xx_network/primitives/utils"
 
diff --git a/cmd/utils.go b/cmd/utils.go
index 9ce533373..c5ddd304d 100644
--- a/cmd/utils.go
+++ b/cmd/utils.go
@@ -10,15 +10,15 @@ package cmd
 import (
 	"fmt"
 	"github.com/spf13/cobra"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"io/ioutil"
 	"strconv"
 	"strings"
 
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
-	"gitlab.com/elixxir/client/v5/cmix"
+	"gitlab.com/elixxir/client/v4/cmix"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/cmd/version.go b/cmd/version.go
index 78d25c8d7..0568fd635 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -13,7 +13,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/xx_network/primitives/utils"
 )
 
diff --git a/cmix/check.go b/cmix/check.go
index 9f760d744..e99fa6b69 100644
--- a/cmix/check.go
+++ b/cmix/check.go
@@ -9,7 +9,7 @@ package cmix
 
 import (
 	"encoding/binary"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID/store"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID/store"
 	"gitlab.com/xx_network/primitives/id"
 )
 
diff --git a/cmix/check_test.go b/cmix/check_test.go
index 72f4d8c94..12b72bd14 100644
--- a/cmix/check_test.go
+++ b/cmix/check_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 
 	bloom "gitlab.com/elixxir/bloomfilter"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID/store"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID/store"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/cmix/client.go b/cmix/client.go
index c38232436..706018eab 100644
--- a/cmix/client.go
+++ b/cmix/client.go
@@ -11,8 +11,8 @@ package cmix
 // and intra-client state are accessible through the context object.
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix/attempts"
-	"gitlab.com/elixxir/client/v5/cmix/clockSkew"
+	"gitlab.com/elixxir/client/v4/cmix/attempts"
+	"gitlab.com/elixxir/client/v4/cmix/clockSkew"
 	"gitlab.com/xx_network/primitives/netTime"
 	"math"
 	"strconv"
@@ -20,17 +20,17 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/cmix/address"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/health"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/nodes"
-	"gitlab.com/elixxir/client/v5/cmix/pickup"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/event"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage"
+	"gitlab.com/elixxir/client/v4/cmix/address"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/health"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/nodes"
+	"gitlab.com/elixxir/client/v4/cmix/pickup"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/event"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage"
 	commClient "gitlab.com/elixxir/comms/client"
 	commNetwork "gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/cmix/cmixMessageBuffer.go b/cmix/cmixMessageBuffer.go
index a97379006..59fbf7de5 100644
--- a/cmix/cmixMessageBuffer.go
+++ b/cmix/cmixMessageBuffer.go
@@ -11,8 +11,8 @@ import (
 	"encoding/json"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/cmix/cmixMessageBuffer_test.go b/cmix/cmixMessageBuffer_test.go
index d28c69387..985b9c5cd 100644
--- a/cmix/cmixMessageBuffer_test.go
+++ b/cmix/cmixMessageBuffer_test.go
@@ -13,8 +13,8 @@ import (
 	"reflect"
 	"testing"
 
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/cmix/critical.go b/cmix/critical.go
index c93138fe3..22cd3b8ad 100644
--- a/cmix/critical.go
+++ b/cmix/critical.go
@@ -8,13 +8,13 @@
 package cmix
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"time"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/health"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/health"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	ds "gitlab.com/elixxir/comms/network/dataStructures"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/elixxir/primitives/states"
diff --git a/cmix/critical_test.go b/cmix/critical_test.go
index 9fabea434..e540e4675 100644
--- a/cmix/critical_test.go
+++ b/cmix/critical_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/cmix/follow.go b/cmix/follow.go
index efa390fbb..df112c3f2 100644
--- a/cmix/follow.go
+++ b/cmix/follow.go
@@ -30,12 +30,12 @@ import (
 	"sync/atomic"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
 	"gitlab.com/xx_network/primitives/ndf"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID/store"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID/store"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/primitives/knownRounds"
 	"gitlab.com/elixxir/primitives/states"
diff --git a/cmix/gateway/hostPool.go b/cmix/gateway/hostPool.go
index 4afc3adb1..89497df7b 100644
--- a/cmix/gateway/hostPool.go
+++ b/cmix/gateway/hostPool.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/crypto/shuffle"
diff --git a/cmix/gateway/hostpool_test.go b/cmix/gateway/hostpool_test.go
index 070091743..abccaa1d5 100644
--- a/cmix/gateway/hostpool_test.go
+++ b/cmix/gateway/hostpool_test.go
@@ -10,7 +10,7 @@ package gateway
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage"
+	"gitlab.com/elixxir/client/v4/storage"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/comms/connect"
diff --git a/cmix/gateway/sender.go b/cmix/gateway/sender.go
index 42c0eb318..b511151ba 100644
--- a/cmix/gateway/sender.go
+++ b/cmix/gateway/sender.go
@@ -12,8 +12,8 @@ package gateway
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/comms/connect"
diff --git a/cmix/gateway/sender_test.go b/cmix/gateway/sender_test.go
index 2ad62cf2e..5b4ad651c 100644
--- a/cmix/gateway/sender_test.go
+++ b/cmix/gateway/sender_test.go
@@ -8,7 +8,7 @@
 package gateway
 
 import (
-	"gitlab.com/elixxir/client/v5/storage"
+	"gitlab.com/elixxir/client/v4/storage"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/comms/connect"
diff --git a/cmix/gateway/storeHostList.go b/cmix/gateway/storeHostList.go
index ed0d28cf3..4b689ddd9 100644
--- a/cmix/gateway/storeHostList.go
+++ b/cmix/gateway/storeHostList.go
@@ -10,7 +10,7 @@ package gateway
 import (
 	"bytes"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
 )
diff --git a/cmix/gateway/storeHostList_test.go b/cmix/gateway/storeHostList_test.go
index 3c201427d..1e2080375 100644
--- a/cmix/gateway/storeHostList_test.go
+++ b/cmix/gateway/storeHostList_test.go
@@ -9,7 +9,7 @@ package gateway
 
 import (
 	"fmt"
-	"gitlab.com/elixxir/client/v5/storage"
+	"gitlab.com/elixxir/client/v4/storage"
 	"gitlab.com/xx_network/primitives/id"
 	"reflect"
 	"strings"
diff --git a/cmix/health/tracker.go b/cmix/health/tracker.go
index d61b8aa79..c53dcf8ec 100644
--- a/cmix/health/tracker.go
+++ b/cmix/health/tracker.go
@@ -15,7 +15,7 @@ import (
 	"time"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/comms/network"
 )
 
diff --git a/cmix/identity/receptionID/IdentityUse.go b/cmix/identity/receptionID/IdentityUse.go
index bd87a5428..d689d84f7 100644
--- a/cmix/identity/receptionID/IdentityUse.go
+++ b/cmix/identity/receptionID/IdentityUse.go
@@ -9,7 +9,7 @@ package receptionID
 
 import (
 	"fmt"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID/store"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID/store"
 	"strconv"
 	"strings"
 )
diff --git a/cmix/identity/receptionID/identity.go b/cmix/identity/receptionID/identity.go
index 3acd19658..586cbe9b9 100644
--- a/cmix/identity/receptionID/identity.go
+++ b/cmix/identity/receptionID/identity.go
@@ -15,8 +15,8 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/primitives/states"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/id/ephemeral"
diff --git a/cmix/identity/receptionID/identity_test.go b/cmix/identity/receptionID/identity_test.go
index 68f657148..8822a89a7 100644
--- a/cmix/identity/receptionID/identity_test.go
+++ b/cmix/identity/receptionID/identity_test.go
@@ -8,7 +8,7 @@
 package receptionID
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/id/ephemeral"
diff --git a/cmix/identity/receptionID/registration.go b/cmix/identity/receptionID/registration.go
index 9d2b932d3..a2150001f 100644
--- a/cmix/identity/receptionID/registration.go
+++ b/cmix/identity/receptionID/registration.go
@@ -10,8 +10,8 @@ package receptionID
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID/store"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID/store"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/id/ephemeral"
 	// "gitlab.com/xx_network/primitives/netTime"
diff --git a/cmix/identity/receptionID/registration_test.go b/cmix/identity/receptionID/registration_test.go
index 6c3fd6c4c..5e5ae2e3b 100644
--- a/cmix/identity/receptionID/registration_test.go
+++ b/cmix/identity/receptionID/registration_test.go
@@ -8,7 +8,7 @@
 package receptionID
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/netTime"
 	"math/rand"
diff --git a/cmix/identity/receptionID/store.go b/cmix/identity/receptionID/store.go
index 2fb2342a4..d671458d3 100644
--- a/cmix/identity/receptionID/store.go
+++ b/cmix/identity/receptionID/store.go
@@ -11,7 +11,7 @@ import (
 	"encoding/json"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/crypto/large"
 	"gitlab.com/xx_network/crypto/shuffle"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/cmix/identity/receptionID/store/checkedRounds.go b/cmix/identity/receptionID/store/checkedRounds.go
index f0593cdf7..adbe9ee43 100644
--- a/cmix/identity/receptionID/store/checkedRounds.go
+++ b/cmix/identity/receptionID/store/checkedRounds.go
@@ -11,8 +11,8 @@ import (
 	"container/list"
 	"encoding/binary"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/id"
 )
 
diff --git a/cmix/identity/receptionID/store/checkedRounds_test.go b/cmix/identity/receptionID/store/checkedRounds_test.go
index dd5b7fd02..924b05244 100644
--- a/cmix/identity/receptionID/store/checkedRounds_test.go
+++ b/cmix/identity/receptionID/store/checkedRounds_test.go
@@ -10,8 +10,8 @@ package store
 import (
 	"container/list"
 	"encoding/binary"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/id"
 	"reflect"
diff --git a/cmix/identity/receptionID/store/earliestRound.go b/cmix/identity/receptionID/store/earliestRound.go
index ef50fb3f0..dd57f681a 100644
--- a/cmix/identity/receptionID/store/earliestRound.go
+++ b/cmix/identity/receptionID/store/earliestRound.go
@@ -10,7 +10,7 @@ package store
 import (
 	"encoding/json"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
 	"sync"
diff --git a/cmix/identity/receptionID/store/unknownRounds.go b/cmix/identity/receptionID/store/unknownRounds.go
index 01aae7ce8..0a6db9b4b 100644
--- a/cmix/identity/receptionID/store/unknownRounds.go
+++ b/cmix/identity/receptionID/store/unknownRounds.go
@@ -10,7 +10,7 @@ package store
 import (
 	"encoding/json"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
 	"sync"
diff --git a/cmix/identity/receptionID/store/unknownRounds_test.go b/cmix/identity/receptionID/store/unknownRounds_test.go
index 064813eda..02c33d5c6 100644
--- a/cmix/identity/receptionID/store/unknownRounds_test.go
+++ b/cmix/identity/receptionID/store/unknownRounds_test.go
@@ -10,7 +10,7 @@ package store
 import (
 	"bytes"
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/id"
 	"reflect"
diff --git a/cmix/identity/receptionID/store_test.go b/cmix/identity/receptionID/store_test.go
index e69b8a247..981312e50 100644
--- a/cmix/identity/receptionID/store_test.go
+++ b/cmix/identity/receptionID/store_test.go
@@ -11,7 +11,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/hash"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/cmix/identity/tracker.go b/cmix/identity/tracker.go
index a50157ccf..3db5b0866 100644
--- a/cmix/identity/tracker.go
+++ b/cmix/identity/tracker.go
@@ -17,11 +17,11 @@ import (
 
 	jww "github.com/spf13/jwalterweatherman"
 
-	"gitlab.com/elixxir/client/v5/cmix/address"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/address"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/id/ephemeral"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/cmix/identity/tracker_test.go b/cmix/identity/tracker_test.go
index 2e27edca3..6c68c863d 100644
--- a/cmix/identity/tracker_test.go
+++ b/cmix/identity/tracker_test.go
@@ -13,9 +13,9 @@ import (
 	"time"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/address"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/storage"
+	"gitlab.com/elixxir/client/v4/cmix/address"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/storage"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
 )
diff --git a/cmix/interface.go b/cmix/interface.go
index 361890d1f..5584c9b89 100644
--- a/cmix/interface.go
+++ b/cmix/interface.go
@@ -10,12 +10,12 @@ package cmix
 import (
 	"time"
 
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/nodes"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/nodes"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/comms/connect"
diff --git a/cmix/message/bundle.go b/cmix/message/bundle.go
index 62702a9cf..827e71cb7 100644
--- a/cmix/message/bundle.go
+++ b/cmix/message/bundle.go
@@ -8,8 +8,8 @@
 package message
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/cmix/message/fingerprints_test.go b/cmix/message/fingerprints_test.go
index d8c7f9dbc..63ca1f5c8 100644
--- a/cmix/message/fingerprints_test.go
+++ b/cmix/message/fingerprints_test.go
@@ -9,8 +9,8 @@ package message
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
 	"reflect"
diff --git a/cmix/message/handler.go b/cmix/message/handler.go
index 712ba6e89..d4f79efb8 100644
--- a/cmix/message/handler.go
+++ b/cmix/message/handler.go
@@ -14,12 +14,12 @@ import (
 	"sync"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/event"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/event"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/id"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/netTime"
 )
diff --git a/cmix/message/handler_test.go b/cmix/message/handler_test.go
index 9c6b92411..5fa164ae7 100644
--- a/cmix/message/handler_test.go
+++ b/cmix/message/handler_test.go
@@ -11,10 +11,10 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/event"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/event"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/crypto/sih"
 	"gitlab.com/elixxir/ekv"
diff --git a/cmix/message/inProgress.go b/cmix/message/inProgress.go
index 85226c743..e1a21c085 100644
--- a/cmix/message/inProgress.go
+++ b/cmix/message/inProgress.go
@@ -9,8 +9,8 @@ package message
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/cmix/message/inProgress_test.go b/cmix/message/inProgress_test.go
index 54fe7635c..3db5c5431 100644
--- a/cmix/message/inProgress_test.go
+++ b/cmix/message/inProgress_test.go
@@ -9,9 +9,9 @@ package message
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/elixxir/primitives/format"
diff --git a/cmix/message/meteredCmixMessageBuffer.go b/cmix/message/meteredCmixMessageBuffer.go
index d2097d4a6..f58d67563 100644
--- a/cmix/message/meteredCmixMessageBuffer.go
+++ b/cmix/message/meteredCmixMessageBuffer.go
@@ -14,9 +14,9 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/elixxir/primitives/states"
diff --git a/cmix/message/meteredCmixMessageBuffer_test.go b/cmix/message/meteredCmixMessageBuffer_test.go
index 3ba3acc94..2002df7ad 100644
--- a/cmix/message/meteredCmixMessageBuffer_test.go
+++ b/cmix/message/meteredCmixMessageBuffer_test.go
@@ -10,9 +10,9 @@ package message
 import (
 	"bytes"
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/elixxir/primitives/format"
diff --git a/cmix/message/processor.go b/cmix/message/processor.go
index 7892774f1..cb3707c93 100644
--- a/cmix/message/processor.go
+++ b/cmix/message/processor.go
@@ -10,8 +10,8 @@ package message
 import (
 	"fmt"
 
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/primitives/format"
 )
 
diff --git a/cmix/nodes/interfaces.go b/cmix/nodes/interfaces.go
index d5acecf4b..469137c44 100644
--- a/cmix/nodes/interfaces.go
+++ b/cmix/nodes/interfaces.go
@@ -8,8 +8,8 @@
 package nodes
 
 import (
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/cyclic"
diff --git a/cmix/nodes/register.go b/cmix/nodes/register.go
index c08f488a5..daad4c163 100644
--- a/cmix/nodes/register.go
+++ b/cmix/nodes/register.go
@@ -18,8 +18,8 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/xx_network/primitives/ndf"
diff --git a/cmix/nodes/register_test.go b/cmix/nodes/register_test.go
index 51999e87e..0ebbdd417 100644
--- a/cmix/nodes/register_test.go
+++ b/cmix/nodes/register_test.go
@@ -8,7 +8,7 @@
 package nodes
 
 import (
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/cmix/nodes/registrar.go b/cmix/nodes/registrar.go
index d8d5de134..6d3ba71d2 100644
--- a/cmix/nodes/registrar.go
+++ b/cmix/nodes/registrar.go
@@ -10,9 +10,9 @@ package nodes
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/comms/connect"
diff --git a/cmix/nodes/registrar_test.go b/cmix/nodes/registrar_test.go
index 3257fadb4..9659428d6 100644
--- a/cmix/nodes/registrar_test.go
+++ b/cmix/nodes/registrar_test.go
@@ -9,8 +9,8 @@ package nodes
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/storage"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/storage"
 	commNetwork "gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/cmix/nodes/request.go b/cmix/nodes/request.go
index d12237699..7c0664f51 100644
--- a/cmix/nodes/request.go
+++ b/cmix/nodes/request.go
@@ -14,8 +14,8 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/cyclic"
diff --git a/cmix/nodes/store.go b/cmix/nodes/store.go
index adffbd64b..04ef3ddf2 100644
--- a/cmix/nodes/store.go
+++ b/cmix/nodes/store.go
@@ -11,7 +11,7 @@ import (
 	"encoding/json"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/cmix/nodes/storeKey.go b/cmix/nodes/storeKey.go
index 680fcbf92..b6de84269 100644
--- a/cmix/nodes/storeKey.go
+++ b/cmix/nodes/storeKey.go
@@ -11,7 +11,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/cmix/nodes/utils_test.go b/cmix/nodes/utils_test.go
index 391040cb8..cf0a64884 100644
--- a/cmix/nodes/utils_test.go
+++ b/cmix/nodes/utils_test.go
@@ -9,10 +9,10 @@ package nodes
 
 import (
 	"github.com/golang/protobuf/proto"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	commNetwork "gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/cyclic"
diff --git a/cmix/params.go b/cmix/params.go
index 1d1431e24..74e639b3c 100644
--- a/cmix/params.go
+++ b/cmix/params.go
@@ -13,10 +13,10 @@ import (
 	"fmt"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/pickup"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/pickup"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/primitives/excludedRounds"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/cmix/pickup/get.go b/cmix/pickup/get.go
index 200e82840..ce2d9bec8 100644
--- a/cmix/pickup/get.go
+++ b/cmix/pickup/get.go
@@ -9,8 +9,8 @@ package pickup
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/xx_network/primitives/id"
 )
 
diff --git a/cmix/pickup/pickup.go b/cmix/pickup/pickup.go
index d65266cb8..5d9ea653f 100644
--- a/cmix/pickup/pickup.go
+++ b/cmix/pickup/pickup.go
@@ -10,13 +10,13 @@ package pickup
 import (
 	"strconv"
 
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/pickup/store"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/pickup/store"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/cmix/pickup/retrieve.go b/cmix/pickup/retrieve.go
index dd1a190b9..f7d0925ce 100644
--- a/cmix/pickup/retrieve.go
+++ b/cmix/pickup/retrieve.go
@@ -13,11 +13,11 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/crypto/shuffle"
 	"gitlab.com/elixxir/primitives/format"
diff --git a/cmix/pickup/retrieve_test.go b/cmix/pickup/retrieve_test.go
index 4b628ea8e..04f92627f 100644
--- a/cmix/pickup/retrieve_test.go
+++ b/cmix/pickup/retrieve_test.go
@@ -9,11 +9,11 @@ package pickup
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	ephemeral2 "gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	ephemeral2 "gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/comms/connect"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/cmix/pickup/store/store.go b/cmix/pickup/store/store.go
index ae27f02d5..43a5effdd 100644
--- a/cmix/pickup/store/store.go
+++ b/cmix/pickup/store/store.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/id/ephemeral"
diff --git a/cmix/pickup/store/uncheckedRounds.go b/cmix/pickup/store/uncheckedRounds.go
index 5401df6e7..b4f77054c 100644
--- a/cmix/pickup/store/uncheckedRounds.go
+++ b/cmix/pickup/store/uncheckedRounds.go
@@ -12,7 +12,7 @@ import (
 	"encoding/binary"
 	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/id/ephemeral"
diff --git a/cmix/pickup/store/uncheckedRounds_test.go b/cmix/pickup/store/uncheckedRounds_test.go
index c19020e49..95f527253 100644
--- a/cmix/pickup/store/uncheckedRounds_test.go
+++ b/cmix/pickup/store/uncheckedRounds_test.go
@@ -9,7 +9,7 @@ package store
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/cmix/pickup/unchecked.go b/cmix/pickup/unchecked.go
index 9f9ccad8a..37e3572a0 100644
--- a/cmix/pickup/unchecked.go
+++ b/cmix/pickup/unchecked.go
@@ -9,9 +9,9 @@ package pickup
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/pickup/store"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/pickup/store"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
 	"time"
diff --git a/cmix/pickup/unchecked_test.go b/cmix/pickup/unchecked_test.go
index 8dc40e683..2650bee31 100644
--- a/cmix/pickup/unchecked_test.go
+++ b/cmix/pickup/unchecked_test.go
@@ -8,9 +8,9 @@
 package pickup
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/comms/connect"
diff --git a/cmix/pickup/utils_test.go b/cmix/pickup/utils_test.go
index b790a131a..a0d9b3da3 100644
--- a/cmix/pickup/utils_test.go
+++ b/cmix/pickup/utils_test.go
@@ -10,9 +10,9 @@ package pickup
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/pickup/store"
-	"gitlab.com/elixxir/client/v5/storage"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/pickup/store"
+	"gitlab.com/elixxir/client/v4/storage"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/comms/testkeys"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/cmix/results.go b/cmix/results.go
index f4f7a7468..d9e258b48 100644
--- a/cmix/results.go
+++ b/cmix/results.go
@@ -9,7 +9,7 @@ package cmix
 
 import (
 	"fmt"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"time"
 
 	jww "github.com/spf13/jwalterweatherman"
diff --git a/cmix/rounds/historical.go b/cmix/rounds/historical.go
index bfefb1450..03a323f26 100644
--- a/cmix/rounds/historical.go
+++ b/cmix/rounds/historical.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/event"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/event"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/xx_network/comms/connect"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/cmix/rounds/historical_test.go b/cmix/rounds/historical_test.go
index caa8bc410..3926f6e73 100644
--- a/cmix/rounds/historical_test.go
+++ b/cmix/rounds/historical_test.go
@@ -12,8 +12,8 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/xx_network/comms/connect"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/cmix/rounds/roundStorage.go b/cmix/rounds/roundStorage.go
index 80885eeed..91f8ac99e 100644
--- a/cmix/rounds/roundStorage.go
+++ b/cmix/rounds/roundStorage.go
@@ -9,7 +9,7 @@ package rounds
 
 import (
 	"github.com/golang/protobuf/proto"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/xx_network/primitives/netTime"
 )
diff --git a/cmix/sendCmix.go b/cmix/sendCmix.go
index dbfbfbd73..1b292cd91 100644
--- a/cmix/sendCmix.go
+++ b/cmix/sendCmix.go
@@ -9,19 +9,19 @@ package cmix
 
 import (
 	"fmt"
-	"gitlab.com/elixxir/client/v5/cmix/attempts"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/attempts"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/primitives/states"
 	"strings"
 	"time"
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/nodes"
-	"gitlab.com/elixxir/client/v5/event"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/nodes"
+	"gitlab.com/elixxir/client/v4/event"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/cmix"
diff --git a/cmix/sendCmixUtils.go b/cmix/sendCmixUtils.go
index bc27375b4..61a115619 100644
--- a/cmix/sendCmixUtils.go
+++ b/cmix/sendCmixUtils.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/nodes"
+	"gitlab.com/elixxir/client/v4/cmix/nodes"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/cmix/sendManyCmix.go b/cmix/sendManyCmix.go
index 5999ea3bc..9c3e687db 100644
--- a/cmix/sendManyCmix.go
+++ b/cmix/sendManyCmix.go
@@ -9,18 +9,18 @@ package cmix
 
 import (
 	"fmt"
-	"gitlab.com/elixxir/client/v5/cmix/attempts"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/attempts"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"strings"
 	"time"
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/nodes"
-	"gitlab.com/elixxir/client/v5/event"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/nodes"
+	"gitlab.com/elixxir/client/v4/event"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/cmix"
diff --git a/cmix/utils_test.go b/cmix/utils_test.go
index 22f0f4b47..6d6a83516 100644
--- a/cmix/utils_test.go
+++ b/cmix/utils_test.go
@@ -8,13 +8,13 @@
 package cmix
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"time"
 
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/nodes"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/nodes"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/comms/mixmessages"
 	commsNetwork "gitlab.com/elixxir/comms/network"
 	ds "gitlab.com/elixxir/comms/network/dataStructures"
diff --git a/connect/authCallbacks.go b/connect/authCallbacks.go
index e3968034d..84fd39d33 100644
--- a/connect/authCallbacks.go
+++ b/connect/authCallbacks.go
@@ -9,11 +9,11 @@ package connect
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/auth"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	clientE2e "gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/auth"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	clientE2e "gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/contact"
 )
 
diff --git a/connect/authenticated.go b/connect/authenticated.go
index 10d4299d6..628d22bf1 100644
--- a/connect/authenticated.go
+++ b/connect/authenticated.go
@@ -13,10 +13,10 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix"
-	clientE2e "gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix"
+	clientE2e "gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/crypto/signature/rsa"
diff --git a/connect/authenticated_test.go b/connect/authenticated_test.go
index 43924a071..211627510 100644
--- a/connect/authenticated_test.go
+++ b/connect/authenticated_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/connect/client.go b/connect/client.go
index fa19d5088..49e47f441 100644
--- a/connect/client.go
+++ b/connect/client.go
@@ -10,7 +10,7 @@ package connect
 import (
 	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/crypto/signature/rsa"
 )
diff --git a/connect/connect.go b/connect/connect.go
index 1bfac7a85..4620e44b3 100644
--- a/connect/connect.go
+++ b/connect/connect.go
@@ -13,16 +13,16 @@ import (
 	"sync/atomic"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/xx_network/primitives/netTime"
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/auth"
-	"gitlab.com/elixxir/client/v5/catalog"
-	clientE2e "gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
+	"gitlab.com/elixxir/client/v4/auth"
+	"gitlab.com/elixxir/client/v4/catalog"
+	clientE2e "gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
 	"gitlab.com/elixxir/crypto/contact"
 )
 
diff --git a/connect/connectionList.go b/connect/connectionList.go
index c99da9c46..07bec5d0c 100644
--- a/connect/connectionList.go
+++ b/connect/connectionList.go
@@ -9,7 +9,7 @@ package connect
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
 	"sync"
diff --git a/connect/listenerTracker.go b/connect/listenerTracker.go
index 2e740e56c..b2db2646d 100644
--- a/connect/listenerTracker.go
+++ b/connect/listenerTracker.go
@@ -8,7 +8,7 @@
 package connect
 
 import (
-	"gitlab.com/elixxir/client/v5/e2e/receive"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
 	"gitlab.com/xx_network/primitives/netTime"
 )
 
diff --git a/connect/listenerTracker_test.go b/connect/listenerTracker_test.go
index 6cf050477..910847a36 100644
--- a/connect/listenerTracker_test.go
+++ b/connect/listenerTracker_test.go
@@ -8,7 +8,7 @@
 package connect
 
 import (
-	"gitlab.com/elixxir/client/v5/e2e/receive"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
 	"reflect"
diff --git a/connect/params_test.go b/connect/params_test.go
index e13e92290..aa8a7aab5 100644
--- a/connect/params_test.go
+++ b/connect/params_test.go
@@ -12,7 +12,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/xxdk"
 )
 
 func TestParams_MarshalUnmarshal(t *testing.T) {
diff --git a/connect/server.go b/connect/server.go
index d757fe98b..84981f7ea 100644
--- a/connect/server.go
+++ b/connect/server.go
@@ -10,7 +10,7 @@ package connect
 import (
 	"github.com/golang/protobuf/proto"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
 	"gitlab.com/xx_network/crypto/signature/rsa"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/connect/utils_test.go b/connect/utils_test.go
index 78289dac9..c3f5a9640 100644
--- a/connect/utils_test.go
+++ b/connect/utils_test.go
@@ -9,17 +9,17 @@ package connect
 
 import (
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
diff --git a/dummy/manager.go b/dummy/manager.go
index 387250754..5df8571be 100644
--- a/dummy/manager.go
+++ b/dummy/manager.go
@@ -12,10 +12,10 @@ package dummy
 
 import (
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"sync/atomic"
 	"time"
diff --git a/dummy/manager_test.go b/dummy/manager_test.go
index d34b7d5cc..06b4b8969 100644
--- a/dummy/manager_test.go
+++ b/dummy/manager_test.go
@@ -9,7 +9,7 @@ package dummy
 
 import (
 	"fmt"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"reflect"
 	"sync/atomic"
 	"testing"
diff --git a/dummy/mockCmix_test.go b/dummy/mockCmix_test.go
index 434862198..aed2446c9 100644
--- a/dummy/mockCmix_test.go
+++ b/dummy/mockCmix_test.go
@@ -8,12 +8,12 @@
 package dummy
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/comms/connect"
diff --git a/dummy/random.go b/dummy/random.go
index efdbc837f..64deddd4f 100644
--- a/dummy/random.go
+++ b/dummy/random.go
@@ -10,7 +10,7 @@ package dummy
 import (
 	"encoding/binary"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/message"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/crypto/csprng"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/dummy/send.go b/dummy/send.go
index 370937687..46b148290 100644
--- a/dummy/send.go
+++ b/dummy/send.go
@@ -8,7 +8,7 @@
 package dummy
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix"
+	"gitlab.com/elixxir/client/v4/cmix"
 	"gitlab.com/xx_network/crypto/csprng"
 	"sync"
 	"sync/atomic"
@@ -16,7 +16,7 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/stoppable"
 )
 
 // Error messages for the Manager.sendThread and its helper functions.
diff --git a/dummy/send_test.go b/dummy/send_test.go
index 73c13ac76..42927c748 100644
--- a/dummy/send_test.go
+++ b/dummy/send_test.go
@@ -9,7 +9,7 @@ package dummy
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
 	"reflect"
diff --git a/dummy/utils_test.go b/dummy/utils_test.go
index 87fd33758..8df8f30bd 100644
--- a/dummy/utils_test.go
+++ b/dummy/utils_test.go
@@ -8,8 +8,8 @@
 package dummy
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/storage"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/storage"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/e2e/callbacks.go b/e2e/callbacks.go
index 9fbb7ae1c..f1f83a5c0 100644
--- a/e2e/callbacks.go
+++ b/e2e/callbacks.go
@@ -9,7 +9,7 @@ package e2e
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/xx_network/primitives/id"
 	"sync"
 )
diff --git a/e2e/callbacks_test.go b/e2e/callbacks_test.go
index ce7df63c4..078452f52 100644
--- a/e2e/callbacks_test.go
+++ b/e2e/callbacks_test.go
@@ -8,7 +8,7 @@
 package e2e
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/xx_network/primitives/id"
 	"reflect"
 	"testing"
diff --git a/e2e/critical.go b/e2e/critical.go
index bc7035d15..4122fbaf7 100644
--- a/e2e/critical.go
+++ b/e2e/critical.go
@@ -12,10 +12,10 @@ import (
 	"time"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	ds "gitlab.com/elixxir/comms/network/dataStructures"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/elixxir/primitives/states"
diff --git a/e2e/e2eMessageBuffer.go b/e2e/e2eMessageBuffer.go
index d12b08b7d..af33b779c 100644
--- a/e2e/e2eMessageBuffer.go
+++ b/e2e/e2eMessageBuffer.go
@@ -12,9 +12,9 @@ import (
 	"encoding/json"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
 	"golang.org/x/crypto/blake2b"
diff --git a/e2e/e2eMessageBuffer_test.go b/e2e/e2eMessageBuffer_test.go
index c064bfe90..e2166aa25 100644
--- a/e2e/e2eMessageBuffer_test.go
+++ b/e2e/e2eMessageBuffer_test.go
@@ -9,10 +9,10 @@ package e2e
 
 import (
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/id"
 	"reflect"
diff --git a/e2e/fpGenerator.go b/e2e/fpGenerator.go
index e028ca54d..8799e1774 100644
--- a/e2e/fpGenerator.go
+++ b/e2e/fpGenerator.go
@@ -9,7 +9,7 @@ package e2e
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
 )
 
 // fpGenerator is a wrapper that allows the network manager's fingerprint
diff --git a/e2e/fpGenerator_test.go b/e2e/fpGenerator_test.go
index 0c12864e1..c0f5c613a 100644
--- a/e2e/fpGenerator_test.go
+++ b/e2e/fpGenerator_test.go
@@ -8,13 +8,13 @@
 package e2e
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/e2e"
 	"gitlab.com/elixxir/primitives/format"
diff --git a/e2e/interface.go b/e2e/interface.go
index 1ddebd195..81898c57f 100644
--- a/e2e/interface.go
+++ b/e2e/interface.go
@@ -8,17 +8,17 @@
 package e2e
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/crypto/e2e"
 	"time"
 
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/e2e/manager.go b/e2e/manager.go
index a510d3fbc..7a982e4e7 100644
--- a/e2e/manager.go
+++ b/e2e/manager.go
@@ -19,16 +19,16 @@ import (
 	"gitlab.com/xx_network/primitives/netTime"
 
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/e2e/parse"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/e2e/rekey"
-	"gitlab.com/elixxir/client/v5/event"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/e2e/parse"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/e2e/rekey"
+	"gitlab.com/elixxir/client/v4/event"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/e2e/params.go b/e2e/params.go
index e0408ae63..7f1c9cfbb 100644
--- a/e2e/params.go
+++ b/e2e/params.go
@@ -11,8 +11,8 @@ import (
 	"encoding/json"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix"
 )
 
 type Params struct {
diff --git a/e2e/parse/conversation/partner.go b/e2e/parse/conversation/partner.go
index 73a86fe7f..9336dfba8 100644
--- a/e2e/parse/conversation/partner.go
+++ b/e2e/parse/conversation/partner.go
@@ -11,7 +11,7 @@ import (
 	"encoding/json"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
 	"math"
diff --git a/e2e/parse/conversation/partner_test.go b/e2e/parse/conversation/partner_test.go
index 60ae22eeb..68460b5e2 100644
--- a/e2e/parse/conversation/partner_test.go
+++ b/e2e/parse/conversation/partner_test.go
@@ -8,7 +8,7 @@
 package conversation
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/id"
 	"math/rand"
diff --git a/e2e/parse/conversation/ring.go b/e2e/parse/conversation/ring.go
index ecac6769d..c99b6c900 100644
--- a/e2e/parse/conversation/ring.go
+++ b/e2e/parse/conversation/ring.go
@@ -11,7 +11,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/netTime"
 	"math"
 	"sync"
diff --git a/e2e/parse/conversation/ring_test.go b/e2e/parse/conversation/ring_test.go
index 25bad8308..b55175012 100644
--- a/e2e/parse/conversation/ring_test.go
+++ b/e2e/parse/conversation/ring_test.go
@@ -8,7 +8,7 @@
 package conversation
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"reflect"
 	"strconv"
diff --git a/e2e/parse/conversation/store.go b/e2e/parse/conversation/store.go
index 1456b0743..651f37cc3 100644
--- a/e2e/parse/conversation/store.go
+++ b/e2e/parse/conversation/store.go
@@ -11,7 +11,7 @@ import (
 	"sync"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/id"
 )
 
diff --git a/e2e/parse/conversation/store_test.go b/e2e/parse/conversation/store_test.go
index 71591c478..68ee8e2ba 100644
--- a/e2e/parse/conversation/store_test.go
+++ b/e2e/parse/conversation/store_test.go
@@ -8,7 +8,7 @@
 package conversation
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/id"
 	"math/rand"
diff --git a/e2e/parse/firstMessagePart.go b/e2e/parse/firstMessagePart.go
index 568c73d1c..a0b75b2ea 100644
--- a/e2e/parse/firstMessagePart.go
+++ b/e2e/parse/firstMessagePart.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
+	"gitlab.com/elixxir/client/v4/catalog"
 )
 
 // Sizes of message parts, in bytes.
diff --git a/e2e/parse/firstMessagePart_test.go b/e2e/parse/firstMessagePart_test.go
index 26da9da56..aef6bc446 100644
--- a/e2e/parse/firstMessagePart_test.go
+++ b/e2e/parse/firstMessagePart_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.com/elixxir/client/v5/catalog"
+	"gitlab.com/elixxir/client/v4/catalog"
 )
 
 // Expected firstMessagePart for checking against, generated by fmp in
diff --git a/e2e/parse/partition.go b/e2e/parse/partition.go
index b60425413..64667c15a 100644
--- a/e2e/parse/partition.go
+++ b/e2e/parse/partition.go
@@ -12,11 +12,11 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e/parse/conversation"
-	"gitlab.com/elixxir/client/v5/e2e/parse/partition"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e/parse/conversation"
+	"gitlab.com/elixxir/client/v4/e2e/parse/partition"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
 )
diff --git a/e2e/parse/partition/multiPartMessage.go b/e2e/parse/partition/multiPartMessage.go
index 3e9078b6e..b050388fd 100644
--- a/e2e/parse/partition/multiPartMessage.go
+++ b/e2e/parse/partition/multiPartMessage.go
@@ -11,9 +11,9 @@ import (
 	"encoding/json"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/e2e"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/e2e/parse/partition/multiPartMessage_test.go b/e2e/parse/partition/multiPartMessage_test.go
index 8397d7fab..182137a7c 100644
--- a/e2e/parse/partition/multiPartMessage_test.go
+++ b/e2e/parse/partition/multiPartMessage_test.go
@@ -10,9 +10,9 @@ package partition
 import (
 	"bytes"
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/e2e"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/e2e/parse/partition/part.go b/e2e/parse/partition/part.go
index 56ebe3c76..0a2932f12 100644
--- a/e2e/parse/partition/part.go
+++ b/e2e/parse/partition/part.go
@@ -8,7 +8,7 @@
 package partition
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/netTime"
 	"strconv"
 )
diff --git a/e2e/parse/partition/part_test.go b/e2e/parse/partition/part_test.go
index 44adf879d..5d4a5889f 100644
--- a/e2e/parse/partition/part_test.go
+++ b/e2e/parse/partition/part_test.go
@@ -9,7 +9,7 @@ package partition
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/netTime"
 	"math/rand"
diff --git a/e2e/parse/partition/store.go b/e2e/parse/partition/store.go
index be16abbd7..06805acf6 100644
--- a/e2e/parse/partition/store.go
+++ b/e2e/parse/partition/store.go
@@ -15,9 +15,9 @@ import (
 	"time"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/e2e"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/e2e/parse/partition/store_test.go b/e2e/parse/partition/store_test.go
index 3386a0fdd..c26c50c19 100644
--- a/e2e/parse/partition/store_test.go
+++ b/e2e/parse/partition/store_test.go
@@ -9,8 +9,8 @@ package partition
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/e2e"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/e2e/parse/partition_test.go b/e2e/parse/partition_test.go
index 9074c5fa4..cf9900e5a 100644
--- a/e2e/parse/partition_test.go
+++ b/e2e/parse/partition_test.go
@@ -11,8 +11,8 @@ import (
 	"gitlab.com/elixxir/crypto/e2e"
 	"testing"
 
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/e2e/processor.go b/e2e/processor.go
index e3d62793f..e13a74aee 100644
--- a/e2e/processor.go
+++ b/e2e/processor.go
@@ -10,11 +10,11 @@ package e2e
 import (
 	"fmt"
 
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/primitives/format"
 )
 
diff --git a/e2e/ratchet/partner/interface.go b/e2e/ratchet/partner/interface.go
index 7c21ab8f5..08515e103 100644
--- a/e2e/ratchet/partner/interface.go
+++ b/e2e/ratchet/partner/interface.go
@@ -9,8 +9,8 @@ package partner
 
 import (
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/e2e/ratchet/partner/manager.go b/e2e/ratchet/partner/manager.go
index 5c6df3428..2d05c8d5c 100644
--- a/e2e/ratchet/partner/manager.go
+++ b/e2e/ratchet/partner/manager.go
@@ -15,10 +15,10 @@ import (
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/e2e/ratchet/partner/manager_test.go b/e2e/ratchet/partner/manager_test.go
index 62c4999ef..dfa88ec25 100644
--- a/e2e/ratchet/partner/manager_test.go
+++ b/e2e/ratchet/partner/manager_test.go
@@ -14,9 +14,9 @@ import (
 	"testing"
 
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
 	dh "gitlab.com/elixxir/crypto/diffieHellman"
 	e2eCrypto "gitlab.com/elixxir/crypto/e2e"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/e2e/ratchet/partner/relationship.go b/e2e/ratchet/partner/relationship.go
index afe9ade7f..3cfd2a706 100644
--- a/e2e/ratchet/partner/relationship.go
+++ b/e2e/ratchet/partner/relationship.go
@@ -14,8 +14,8 @@ import (
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/e2e/ratchet/partner/relationshipFingerprint.go b/e2e/ratchet/partner/relationshipFingerprint.go
index 7ffe0379e..396e65f6b 100644
--- a/e2e/ratchet/partner/relationshipFingerprint.go
+++ b/e2e/ratchet/partner/relationshipFingerprint.go
@@ -9,8 +9,8 @@ package partner
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	session2 "gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	session2 "gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/e2e"
diff --git a/e2e/ratchet/partner/relationship_test.go b/e2e/ratchet/partner/relationship_test.go
index fae313102..4698751fd 100644
--- a/e2e/ratchet/partner/relationship_test.go
+++ b/e2e/ratchet/partner/relationship_test.go
@@ -12,9 +12,9 @@ import (
 	"testing"
 
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	dh "gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/e2e/ratchet/partner/session/session.go b/e2e/ratchet/partner/session/session.go
index 545fbf36d..d2715da97 100644
--- a/e2e/ratchet/partner/session/session.go
+++ b/e2e/ratchet/partner/session/session.go
@@ -19,8 +19,8 @@ import (
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	dh "gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/e2e/ratchet/partner/session/session_test.go b/e2e/ratchet/partner/session/session_test.go
index b7615dd8d..f157b4106 100644
--- a/e2e/ratchet/partner/session/session_test.go
+++ b/e2e/ratchet/partner/session/session_test.go
@@ -8,7 +8,7 @@
 package session
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/utility"
 	"gitlab.com/xx_network/primitives/netTime"
 	"reflect"
 	"testing"
diff --git a/e2e/ratchet/partner/session/testUtils.go b/e2e/ratchet/partner/session/testUtils.go
index f0cb357ac..4540b67a1 100644
--- a/e2e/ratchet/partner/session/testUtils.go
+++ b/e2e/ratchet/partner/session/testUtils.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/pkg/errors"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	dh "gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/e2e/ratchet/partner/utils.go b/e2e/ratchet/partner/utils.go
index ef9ab428a..009b30871 100644
--- a/e2e/ratchet/partner/utils.go
+++ b/e2e/ratchet/partner/utils.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/e2e/ratchet/partner/utils_test.go b/e2e/ratchet/partner/utils_test.go
index 028066b83..4d485f183 100644
--- a/e2e/ratchet/partner/utils_test.go
+++ b/e2e/ratchet/partner/utils_test.go
@@ -13,9 +13,9 @@ import (
 	"testing"
 
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	dh "gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/e2e/ratchet/ratchet.go b/e2e/ratchet/ratchet.go
index a13bf2766..6f70d4669 100644
--- a/e2e/ratchet/ratchet.go
+++ b/e2e/ratchet/ratchet.go
@@ -13,11 +13,11 @@ import (
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/e2e/ratchet/ratchet_test.go b/e2e/ratchet/ratchet_test.go
index c58cefc82..740015a57 100644
--- a/e2e/ratchet/ratchet_test.go
+++ b/e2e/ratchet/ratchet_test.go
@@ -15,9 +15,9 @@ import (
 	"testing"
 
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/ekv"
diff --git a/e2e/ratchet/serviceList.go b/e2e/ratchet/serviceList.go
index 31d8cd7c6..017deb10e 100644
--- a/e2e/ratchet/serviceList.go
+++ b/e2e/ratchet/serviceList.go
@@ -9,8 +9,8 @@ package ratchet
 
 import (
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
 	"gitlab.com/xx_network/primitives/id"
 )
 
diff --git a/e2e/ratchet/storage.go b/e2e/ratchet/storage.go
index 94aa66bff..ceefc9d23 100644
--- a/e2e/ratchet/storage.go
+++ b/e2e/ratchet/storage.go
@@ -12,11 +12,11 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/e2e/ratchet/utils_test.go b/e2e/ratchet/utils_test.go
index d80fee91c..6a2b8ec6b 100644
--- a/e2e/ratchet/utils_test.go
+++ b/e2e/ratchet/utils_test.go
@@ -8,8 +8,8 @@
 package ratchet
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/primitives/format"
 	"io"
 	"reflect"
@@ -17,11 +17,11 @@ import (
 
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/ekv"
diff --git a/e2e/receive/any.go b/e2e/receive/any.go
index 1d42c2e1b..ffa7ca18c 100644
--- a/e2e/receive/any.go
+++ b/e2e/receive/any.go
@@ -8,7 +8,7 @@
 package receive
 
 import (
-	"gitlab.com/elixxir/client/v5/catalog"
+	"gitlab.com/elixxir/client/v4/catalog"
 	"gitlab.com/xx_network/primitives/id"
 )
 
diff --git a/e2e/receive/byType.go b/e2e/receive/byType.go
index c45a640af..b87fdc892 100644
--- a/e2e/receive/byType.go
+++ b/e2e/receive/byType.go
@@ -9,7 +9,7 @@ package receive
 
 import (
 	"github.com/golang-collections/collections/set"
-	"gitlab.com/elixxir/client/v5/catalog"
+	"gitlab.com/elixxir/client/v4/catalog"
 )
 
 type byType struct {
diff --git a/e2e/receive/byType_test.go b/e2e/receive/byType_test.go
index 6b386866d..6f71b5755 100644
--- a/e2e/receive/byType_test.go
+++ b/e2e/receive/byType_test.go
@@ -9,7 +9,7 @@ package receive
 
 import (
 	"github.com/golang-collections/collections/set"
-	"gitlab.com/elixxir/client/v5/catalog"
+	"gitlab.com/elixxir/client/v4/catalog"
 	"gitlab.com/xx_network/primitives/id"
 	"testing"
 )
diff --git a/e2e/receive/listener.go b/e2e/receive/listener.go
index 8109f288f..bbf5d5b02 100644
--- a/e2e/receive/listener.go
+++ b/e2e/receive/listener.go
@@ -9,7 +9,7 @@ package receive
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
+	"gitlab.com/elixxir/client/v4/catalog"
 	"gitlab.com/xx_network/primitives/id"
 	"strconv"
 	"strings"
diff --git a/e2e/receive/message.go b/e2e/receive/message.go
index 56c9d2725..061a9b44d 100644
--- a/e2e/receive/message.go
+++ b/e2e/receive/message.go
@@ -8,8 +8,8 @@
 package receive
 
 import (
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/crypto/e2e"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/id/ephemeral"
diff --git a/e2e/receive/switchboard.go b/e2e/receive/switchboard.go
index 8c645cbd7..45ea7e125 100644
--- a/e2e/receive/switchboard.go
+++ b/e2e/receive/switchboard.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/golang-collections/collections/set"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
+	"gitlab.com/elixxir/client/v4/catalog"
 	"gitlab.com/xx_network/primitives/id"
 )
 
diff --git a/e2e/receive/switchboard_test.go b/e2e/receive/switchboard_test.go
index 2de6b8e94..52440510d 100644
--- a/e2e/receive/switchboard_test.go
+++ b/e2e/receive/switchboard_test.go
@@ -8,7 +8,7 @@
 package receive
 
 import (
-	"gitlab.com/elixxir/client/v5/catalog"
+	"gitlab.com/elixxir/client/v4/catalog"
 	"gitlab.com/xx_network/primitives/id"
 	"strings"
 	"testing"
diff --git a/e2e/rekey/confirm.go b/e2e/rekey/confirm.go
index 98859c516..1c60a7b20 100644
--- a/e2e/rekey/confirm.go
+++ b/e2e/rekey/confirm.go
@@ -11,10 +11,10 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet"
-	session2 "gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet"
+	session2 "gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/stoppable"
 )
 
 func startConfirm(ratchet *ratchet.Ratchet, c chan receive.Message,
diff --git a/e2e/rekey/confirm_test.go b/e2e/rekey/confirm_test.go
index 4f8c0b70e..114a82ddb 100644
--- a/e2e/rekey/confirm_test.go
+++ b/e2e/rekey/confirm_test.go
@@ -13,12 +13,12 @@ import (
 
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/golang/protobuf/proto"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	dh "gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/ekv"
diff --git a/e2e/rekey/exchange.go b/e2e/rekey/exchange.go
index 356861d9f..4cec192bd 100644
--- a/e2e/rekey/exchange.go
+++ b/e2e/rekey/exchange.go
@@ -8,11 +8,11 @@
 package rekey
 
 import (
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/e2e"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/e2e/rekey/exchange_test.go b/e2e/rekey/exchange_test.go
index 2472e335b..b65f9fac8 100644
--- a/e2e/rekey/exchange_test.go
+++ b/e2e/rekey/exchange_test.go
@@ -15,12 +15,12 @@ import (
 
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/golang/protobuf/proto"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	dh "gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/ekv"
diff --git a/e2e/rekey/params.go b/e2e/rekey/params.go
index 2dece217a..33bbd5acb 100644
--- a/e2e/rekey/params.go
+++ b/e2e/rekey/params.go
@@ -9,7 +9,7 @@ package rekey
 
 import (
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/catalog"
+	"gitlab.com/elixxir/client/v4/catalog"
 	"time"
 )
 
diff --git a/e2e/rekey/rekey.go b/e2e/rekey/rekey.go
index f5ebeff7e..de986022a 100644
--- a/e2e/rekey/rekey.go
+++ b/e2e/rekey/rekey.go
@@ -14,11 +14,11 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	session "gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/event"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	session "gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/event"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
 	commsNetwork "gitlab.com/elixxir/comms/network"
 	ds "gitlab.com/elixxir/comms/network/dataStructures"
 	"gitlab.com/elixxir/crypto/cyclic"
diff --git a/e2e/rekey/trigger.go b/e2e/rekey/trigger.go
index 9cae48217..2402ccb9f 100644
--- a/e2e/rekey/trigger.go
+++ b/e2e/rekey/trigger.go
@@ -14,12 +14,12 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
 	"gitlab.com/elixxir/crypto/cyclic"
 )
 
diff --git a/e2e/rekey/trigger_test.go b/e2e/rekey/trigger_test.go
index 04272c990..8cf5888eb 100644
--- a/e2e/rekey/trigger_test.go
+++ b/e2e/rekey/trigger_test.go
@@ -14,13 +14,13 @@ import (
 
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/golang/protobuf/proto"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet"
-	session2 "gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet"
+	session2 "gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	dh "gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/ekv"
diff --git a/e2e/rekey/utils_test.go b/e2e/rekey/utils_test.go
index dbcd7fccf..aab5128b6 100644
--- a/e2e/rekey/utils_test.go
+++ b/e2e/rekey/utils_test.go
@@ -15,16 +15,16 @@ import (
 
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/golang/protobuf/proto"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	session2 "gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	session2 "gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
 	network2 "gitlab.com/elixxir/comms/network"
 	ds "gitlab.com/elixxir/comms/network/dataStructures"
 	"gitlab.com/elixxir/crypto/cyclic"
diff --git a/e2e/sendE2E.go b/e2e/sendE2E.go
index a23fa2f01..5b0ae11ca 100644
--- a/e2e/sendE2E.go
+++ b/e2e/sendE2E.go
@@ -13,13 +13,13 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/e2e/parse"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/rekey"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/e2e/parse"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/rekey"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/crypto/e2e"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/e2e/sendE2E_test.go b/e2e/sendE2E_test.go
index 8c195f7ec..7f6b0c593 100644
--- a/e2e/sendE2E_test.go
+++ b/e2e/sendE2E_test.go
@@ -11,15 +11,15 @@ import (
 	"bytes"
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e/parse"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/e2e/rekey"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e/parse"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/e2e/rekey"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	dh "gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/e2e"
diff --git a/e2e/sendUnsafe.go b/e2e/sendUnsafe.go
index a7766f815..6f9524630 100644
--- a/e2e/sendUnsafe.go
+++ b/e2e/sendUnsafe.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet"
 	"gitlab.com/elixxir/crypto/e2e"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/e2e/sendUnsafe_test.go b/e2e/sendUnsafe_test.go
index 121753b0f..b9d87c15f 100644
--- a/e2e/sendUnsafe_test.go
+++ b/e2e/sendUnsafe_test.go
@@ -8,12 +8,12 @@
 package e2e
 
 import (
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e/parse"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/e2e/rekey"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e/parse"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/e2e/rekey"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	dh "gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/ekv"
diff --git a/e2e/unsafeProcessor.go b/e2e/unsafeProcessor.go
index a5085621e..3f5e1609a 100644
--- a/e2e/unsafeProcessor.go
+++ b/e2e/unsafeProcessor.go
@@ -11,8 +11,8 @@ import (
 	"fmt"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/crypto/e2e"
 	"gitlab.com/elixxir/primitives/format"
 )
diff --git a/e2e/utils_test.go b/e2e/utils_test.go
index 3347803f6..d3a803e5e 100644
--- a/e2e/utils_test.go
+++ b/e2e/utils_test.go
@@ -10,14 +10,14 @@ package e2e
 import (
 	"bytes"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/comms/connect"
diff --git a/event/event.go b/event/event.go
index 030c407b1..4e21f3041 100644
--- a/event/event.go
+++ b/event/event.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/stoppable"
 )
 
 // ReportableEvent is used to surface events to client users.
diff --git a/fileTransfer/batchBuilder.go b/fileTransfer/batchBuilder.go
index 93be198fe..1c67a3640 100644
--- a/fileTransfer/batchBuilder.go
+++ b/fileTransfer/batchBuilder.go
@@ -10,8 +10,8 @@ package fileTransfer
 import (
 	"encoding/binary"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/fileTransfer/store"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/fileTransfer/store"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/primitives/format"
diff --git a/fileTransfer/callbackTracker/callbackTracker.go b/fileTransfer/callbackTracker/callbackTracker.go
index 8fc60dc23..fb1aa6a62 100644
--- a/fileTransfer/callbackTracker/callbackTracker.go
+++ b/fileTransfer/callbackTracker/callbackTracker.go
@@ -8,7 +8,7 @@
 package callbackTracker
 
 import (
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/xx_network/primitives/netTime"
 	"sync"
 	"time"
diff --git a/fileTransfer/callbackTracker/callbackTracker_test.go b/fileTransfer/callbackTracker/callbackTracker_test.go
index a052947f8..0b45cbac0 100644
--- a/fileTransfer/callbackTracker/callbackTracker_test.go
+++ b/fileTransfer/callbackTracker/callbackTracker_test.go
@@ -9,7 +9,7 @@ package callbackTracker
 
 import (
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"reflect"
 	"testing"
 	"time"
diff --git a/fileTransfer/callbackTracker/manager.go b/fileTransfer/callbackTracker/manager.go
index 09e0c8f5d..4dee45a25 100644
--- a/fileTransfer/callbackTracker/manager.go
+++ b/fileTransfer/callbackTracker/manager.go
@@ -9,7 +9,7 @@ package callbackTracker
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"strconv"
 	"sync"
diff --git a/fileTransfer/callbackTracker/manager_test.go b/fileTransfer/callbackTracker/manager_test.go
index df1f82ebb..64ab857c7 100644
--- a/fileTransfer/callbackTracker/manager_test.go
+++ b/fileTransfer/callbackTracker/manager_test.go
@@ -9,7 +9,7 @@ package callbackTracker
 
 import (
 	"errors"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/xx_network/crypto/csprng"
 	"io"
diff --git a/fileTransfer/connect/listener.go b/fileTransfer/connect/listener.go
index b2f92dec7..278b80131 100644
--- a/fileTransfer/connect/listener.go
+++ b/fileTransfer/connect/listener.go
@@ -9,7 +9,7 @@ package connect
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
 )
 
 // Error messages.
diff --git a/fileTransfer/connect/send.go b/fileTransfer/connect/send.go
index ad0df421b..1674d8eec 100644
--- a/fileTransfer/connect/send.go
+++ b/fileTransfer/connect/send.go
@@ -10,9 +10,9 @@ package connect
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e"
-	ft "gitlab.com/elixxir/client/v5/fileTransfer"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e"
+	ft "gitlab.com/elixxir/client/v4/fileTransfer"
 )
 
 // Error messages.
diff --git a/fileTransfer/connect/utils_test.go b/fileTransfer/connect/utils_test.go
index 4b247f901..f111e5268 100644
--- a/fileTransfer/connect/utils_test.go
+++ b/fileTransfer/connect/utils_test.go
@@ -9,21 +9,21 @@ package connect
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/storage/user"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/storage/user"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/cyclic"
 	cryptoE2e "gitlab.com/elixxir/crypto/e2e"
diff --git a/fileTransfer/connect/wrapper.go b/fileTransfer/connect/wrapper.go
index 9446723aa..76d23e9fd 100644
--- a/fileTransfer/connect/wrapper.go
+++ b/fileTransfer/connect/wrapper.go
@@ -8,11 +8,11 @@
 package connect
 
 import (
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	ft "gitlab.com/elixxir/client/v5/fileTransfer"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	ft "gitlab.com/elixxir/client/v4/fileTransfer"
 	cryptoE2e "gitlab.com/elixxir/crypto/e2e"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"time"
diff --git a/fileTransfer/connect/wrapper_test.go b/fileTransfer/connect/wrapper_test.go
index 8fe808075..dd0512739 100644
--- a/fileTransfer/connect/wrapper_test.go
+++ b/fileTransfer/connect/wrapper_test.go
@@ -9,10 +9,10 @@ package connect
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/connect"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	ft "gitlab.com/elixxir/client/v5/fileTransfer"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/connect"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	ft "gitlab.com/elixxir/client/v4/fileTransfer"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/fileTransfer/e2e/listener.go b/fileTransfer/e2e/listener.go
index e8f6e566c..0135ff4a5 100644
--- a/fileTransfer/e2e/listener.go
+++ b/fileTransfer/e2e/listener.go
@@ -9,7 +9,7 @@ package e2e
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
 )
 
 // Error messages.
diff --git a/fileTransfer/e2e/send.go b/fileTransfer/e2e/send.go
index e381f6ca4..6b0a66d55 100644
--- a/fileTransfer/e2e/send.go
+++ b/fileTransfer/e2e/send.go
@@ -10,9 +10,9 @@ package e2e
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e"
-	ft "gitlab.com/elixxir/client/v5/fileTransfer"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e"
+	ft "gitlab.com/elixxir/client/v4/fileTransfer"
 	"gitlab.com/xx_network/primitives/id"
 )
 
diff --git a/fileTransfer/e2e/utils_test.go b/fileTransfer/e2e/utils_test.go
index f53527411..38a6043cc 100644
--- a/fileTransfer/e2e/utils_test.go
+++ b/fileTransfer/e2e/utils_test.go
@@ -10,22 +10,22 @@ package e2e
 import (
 	"github.com/cloudflare/circl/dh/sidh"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage"
-	userStorage "gitlab.com/elixxir/client/v5/storage/user"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage"
+	userStorage "gitlab.com/elixxir/client/v4/storage/user"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/cyclic"
 	cryptoE2e "gitlab.com/elixxir/crypto/e2e"
diff --git a/fileTransfer/e2e/wrapper.go b/fileTransfer/e2e/wrapper.go
index f9b7de52f..a5d904012 100644
--- a/fileTransfer/e2e/wrapper.go
+++ b/fileTransfer/e2e/wrapper.go
@@ -8,10 +8,10 @@
 package e2e
 
 import (
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	ft "gitlab.com/elixxir/client/v5/fileTransfer"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	ft "gitlab.com/elixxir/client/v4/fileTransfer"
 	cryptoE2e "gitlab.com/elixxir/crypto/e2e"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/fileTransfer/e2e/wrapper_test.go b/fileTransfer/e2e/wrapper_test.go
index 9016cd796..b5bf807a2 100644
--- a/fileTransfer/e2e/wrapper_test.go
+++ b/fileTransfer/e2e/wrapper_test.go
@@ -9,10 +9,10 @@ package e2e
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	ft "gitlab.com/elixxir/client/v5/fileTransfer"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	ft "gitlab.com/elixxir/client/v4/fileTransfer"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/fileTransfer/groupChat/processor.go b/fileTransfer/groupChat/processor.go
index a46b2957f..86bef7509 100644
--- a/fileTransfer/groupChat/processor.go
+++ b/fileTransfer/groupChat/processor.go
@@ -9,9 +9,9 @@ package groupChat
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/groupChat"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/groupChat"
 	"gitlab.com/elixxir/primitives/format"
 )
 
diff --git a/fileTransfer/groupChat/utils_test.go b/fileTransfer/groupChat/utils_test.go
index fd3cb5b92..f4f3fd631 100644
--- a/fileTransfer/groupChat/utils_test.go
+++ b/fileTransfer/groupChat/utils_test.go
@@ -9,19 +9,19 @@ package groupChat
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/groupChat"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/storage/user"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/groupChat"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/storage/user"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/fileTransfer/groupChat/wrapper.go b/fileTransfer/groupChat/wrapper.go
index fbc4ed2b3..ab32dcb26 100644
--- a/fileTransfer/groupChat/wrapper.go
+++ b/fileTransfer/groupChat/wrapper.go
@@ -9,9 +9,9 @@ package groupChat
 
 import (
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	ft "gitlab.com/elixxir/client/v5/fileTransfer"
-	"gitlab.com/elixxir/client/v5/groupChat"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	ft "gitlab.com/elixxir/client/v4/fileTransfer"
+	"gitlab.com/elixxir/client/v4/groupChat"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/elixxir/crypto/group"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/fileTransfer/groupChat/wrapper_test.go b/fileTransfer/groupChat/wrapper_test.go
index 50298b818..ffa0fc0bc 100644
--- a/fileTransfer/groupChat/wrapper_test.go
+++ b/fileTransfer/groupChat/wrapper_test.go
@@ -9,8 +9,8 @@ package groupChat
 
 import (
 	"bytes"
-	ft "gitlab.com/elixxir/client/v5/fileTransfer"
-	"gitlab.com/elixxir/client/v5/groupChat"
+	ft "gitlab.com/elixxir/client/v4/fileTransfer"
+	"gitlab.com/elixxir/client/v4/groupChat"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/fileTransfer/interface.go b/fileTransfer/interface.go
index 1d89846c9..a41a2fbaa 100644
--- a/fileTransfer/interface.go
+++ b/fileTransfer/interface.go
@@ -8,7 +8,7 @@
 package fileTransfer
 
 import (
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/xx_network/primitives/id"
 	"strconv"
diff --git a/fileTransfer/manager.go b/fileTransfer/manager.go
index 1e9536831..f4f728249 100644
--- a/fileTransfer/manager.go
+++ b/fileTransfer/manager.go
@@ -11,17 +11,17 @@ import (
 	"bytes"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/fileTransfer/callbackTracker"
-	"gitlab.com/elixxir/client/v5/fileTransfer/store"
-	"gitlab.com/elixxir/client/v5/fileTransfer/store/fileMessage"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/fileTransfer/callbackTracker"
+	"gitlab.com/elixxir/client/v4/fileTransfer/store"
+	"gitlab.com/elixxir/client/v4/fileTransfer/store/fileMessage"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
diff --git a/fileTransfer/manager_test.go b/fileTransfer/manager_test.go
index 03dea0317..a84a49f4f 100644
--- a/fileTransfer/manager_test.go
+++ b/fileTransfer/manager_test.go
@@ -9,8 +9,8 @@ package fileTransfer
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/storage"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/storage"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/crypto/csprng"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/fileTransfer/params.go b/fileTransfer/params.go
index a206a5b47..f14a00005 100644
--- a/fileTransfer/params.go
+++ b/fileTransfer/params.go
@@ -9,7 +9,7 @@ package fileTransfer
 
 import (
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/cmix"
+	"gitlab.com/elixxir/client/v4/cmix"
 	"time"
 )
 
diff --git a/fileTransfer/params_test.go b/fileTransfer/params_test.go
index fda2d163a..45665a714 100644
--- a/fileTransfer/params_test.go
+++ b/fileTransfer/params_test.go
@@ -9,7 +9,7 @@ package fileTransfer
 
 import (
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/cmix"
+	"gitlab.com/elixxir/client/v4/cmix"
 	"reflect"
 	"testing"
 )
diff --git a/fileTransfer/partTracker.go b/fileTransfer/partTracker.go
index 6ac3e5269..6dae85995 100644
--- a/fileTransfer/partTracker.go
+++ b/fileTransfer/partTracker.go
@@ -8,7 +8,7 @@
 package fileTransfer
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/utility"
 )
 
 // sentFilePartTracker contains utility.StateVector that tracks which parts have
diff --git a/fileTransfer/processor.go b/fileTransfer/processor.go
index 81c410bc4..6d625a621 100644
--- a/fileTransfer/processor.go
+++ b/fileTransfer/processor.go
@@ -11,11 +11,11 @@ import (
 	"fmt"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/fileTransfer/store"
-	"gitlab.com/elixxir/client/v5/fileTransfer/store/cypher"
-	"gitlab.com/elixxir/client/v5/fileTransfer/store/fileMessage"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/fileTransfer/store"
+	"gitlab.com/elixxir/client/v4/fileTransfer/store/cypher"
+	"gitlab.com/elixxir/client/v4/fileTransfer/store/fileMessage"
 	"gitlab.com/elixxir/primitives/format"
 )
 
diff --git a/fileTransfer/send.go b/fileTransfer/send.go
index bc003a7f5..c3504c2ca 100644
--- a/fileTransfer/send.go
+++ b/fileTransfer/send.go
@@ -10,11 +10,11 @@ package fileTransfer
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/fileTransfer/sentRoundTracker"
-	"gitlab.com/elixxir/client/v5/fileTransfer/store"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/fileTransfer/sentRoundTracker"
+	"gitlab.com/elixxir/client/v4/fileTransfer/store"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/xx_network/primitives/id"
 	"strconv"
diff --git a/fileTransfer/store/cypher/manager.go b/fileTransfer/store/cypher/manager.go
index 8fd75c579..0ccaa8938 100644
--- a/fileTransfer/store/cypher/manager.go
+++ b/fileTransfer/store/cypher/manager.go
@@ -9,8 +9,8 @@ package cypher
 
 import (
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/xx_network/primitives/netTime"
 )
diff --git a/fileTransfer/store/cypher/manager_test.go b/fileTransfer/store/cypher/manager_test.go
index cf58861ef..1646c0f74 100644
--- a/fileTransfer/store/cypher/manager_test.go
+++ b/fileTransfer/store/cypher/manager_test.go
@@ -9,8 +9,8 @@ package cypher
 
 import (
 	"fmt"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/fileTransfer/store/part.go b/fileTransfer/store/part.go
index 5268eb50f..0b1ba24de 100644
--- a/fileTransfer/store/part.go
+++ b/fileTransfer/store/part.go
@@ -8,8 +8,8 @@
 package store
 
 import (
-	"gitlab.com/elixxir/client/v5/fileTransfer/store/cypher"
-	"gitlab.com/elixxir/client/v5/fileTransfer/store/fileMessage"
+	"gitlab.com/elixxir/client/v4/fileTransfer/store/cypher"
+	"gitlab.com/elixxir/client/v4/fileTransfer/store/fileMessage"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/fileTransfer/store/part_test.go b/fileTransfer/store/part_test.go
index 7751a612d..1581bfbc2 100644
--- a/fileTransfer/store/part_test.go
+++ b/fileTransfer/store/part_test.go
@@ -9,7 +9,7 @@ package store
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/fileTransfer/store/fileMessage"
+	"gitlab.com/elixxir/client/v4/fileTransfer/store/fileMessage"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/elixxir/primitives/format"
 	"testing"
diff --git a/fileTransfer/store/received.go b/fileTransfer/store/received.go
index 496a672cb..c1add4a98 100644
--- a/fileTransfer/store/received.go
+++ b/fileTransfer/store/received.go
@@ -11,7 +11,7 @@ import (
 	"encoding/json"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/xx_network/primitives/netTime"
 	"sync"
diff --git a/fileTransfer/store/receivedTransfer.go b/fileTransfer/store/receivedTransfer.go
index 948be20ca..f6512ee44 100644
--- a/fileTransfer/store/receivedTransfer.go
+++ b/fileTransfer/store/receivedTransfer.go
@@ -13,9 +13,9 @@ import (
 	"encoding/json"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/fileTransfer/store/cypher"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/fileTransfer/store/cypher"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/xx_network/primitives/netTime"
 	"strconv"
diff --git a/fileTransfer/store/receivedTransfer_test.go b/fileTransfer/store/receivedTransfer_test.go
index 351425650..b04cbe1b0 100644
--- a/fileTransfer/store/receivedTransfer_test.go
+++ b/fileTransfer/store/receivedTransfer_test.go
@@ -10,9 +10,9 @@ package store
 import (
 	"bytes"
 	"fmt"
-	"gitlab.com/elixxir/client/v5/fileTransfer/store/cypher"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/fileTransfer/store/cypher"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/fileTransfer/store/received_test.go b/fileTransfer/store/received_test.go
index b2d2b4657..4e75c30bf 100644
--- a/fileTransfer/store/received_test.go
+++ b/fileTransfer/store/received_test.go
@@ -10,7 +10,7 @@ package store
 import (
 	"bytes"
 	"fmt"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/fileTransfer/store/sent.go b/fileTransfer/store/sent.go
index 7536fb814..02cef8801 100644
--- a/fileTransfer/store/sent.go
+++ b/fileTransfer/store/sent.go
@@ -11,7 +11,7 @@ import (
 	"encoding/json"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/fileTransfer/store/sentTransfer.go b/fileTransfer/store/sentTransfer.go
index 02d3ba320..7b3742718 100644
--- a/fileTransfer/store/sentTransfer.go
+++ b/fileTransfer/store/sentTransfer.go
@@ -12,9 +12,9 @@ import (
 	"encoding/json"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/fileTransfer/store/cypher"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/fileTransfer/store/cypher"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/fileTransfer/store/sentTransfer_test.go b/fileTransfer/store/sentTransfer_test.go
index 81bad3e54..c2f489606 100644
--- a/fileTransfer/store/sentTransfer_test.go
+++ b/fileTransfer/store/sentTransfer_test.go
@@ -10,10 +10,10 @@ package store
 import (
 	"bytes"
 	"fmt"
-	"gitlab.com/elixxir/client/v5/fileTransfer/store/cypher"
-	"gitlab.com/elixxir/client/v5/fileTransfer/store/fileMessage"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/fileTransfer/store/cypher"
+	"gitlab.com/elixxir/client/v4/fileTransfer/store/fileMessage"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/elixxir/primitives/format"
diff --git a/fileTransfer/store/sent_test.go b/fileTransfer/store/sent_test.go
index 0cbf0186c..79031b807 100644
--- a/fileTransfer/store/sent_test.go
+++ b/fileTransfer/store/sent_test.go
@@ -10,7 +10,7 @@ package store
 import (
 	"bytes"
 	"fmt"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/fileTransfer/utils_test.go b/fileTransfer/utils_test.go
index e91d1e9cc..275d829ed 100644
--- a/fileTransfer/utils_test.go
+++ b/fileTransfer/utils_test.go
@@ -11,18 +11,18 @@ import (
 	"bytes"
 	"encoding/binary"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage"
-	userStorage "gitlab.com/elixxir/client/v5/storage/user"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage"
+	userStorage "gitlab.com/elixxir/client/v4/storage/user"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/go.mod b/go.mod
index 3e0ecaa03..fd5943de3 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module gitlab.com/elixxir/client/v5
+module gitlab.com/elixxir/client/v4
 
 go 1.19
 
diff --git a/groupChat/e2eManager_test.go b/groupChat/e2eManager_test.go
index ac6925cb7..1afa4afbd 100644
--- a/groupChat/e2eManager_test.go
+++ b/groupChat/e2eManager_test.go
@@ -10,13 +10,13 @@ package groupChat
 import (
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	clientE2E "gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	sessionImport "gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	clientE2E "gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	sessionImport "gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/crypto/cyclic"
 	cryptoE2e "gitlab.com/elixxir/crypto/e2e"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/groupChat/groupStore/group.go b/groupChat/groupStore/group.go
index bdf6d7323..ed8c3d029 100644
--- a/groupChat/groupStore/group.go
+++ b/groupChat/groupStore/group.go
@@ -12,7 +12,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/group"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/groupChat/groupStore/group_test.go b/groupChat/groupStore/group_test.go
index 82a961fc3..c311fb345 100644
--- a/groupChat/groupStore/group_test.go
+++ b/groupChat/groupStore/group_test.go
@@ -8,7 +8,7 @@
 package groupStore
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/group"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/groupChat/groupStore/store.go b/groupChat/groupStore/store.go
index 6cd46c35e..610db4703 100644
--- a/groupChat/groupStore/store.go
+++ b/groupChat/groupStore/store.go
@@ -11,7 +11,7 @@ import (
 	"bytes"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/group"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/groupChat/groupStore/store_test.go b/groupChat/groupStore/store_test.go
index 3df7bd088..fd54413af 100644
--- a/groupChat/groupStore/store_test.go
+++ b/groupChat/groupStore/store_test.go
@@ -10,7 +10,7 @@ package groupStore
 import (
 	"bytes"
 	"fmt"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/group"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/groupChat/interface.go b/groupChat/interface.go
index 79b060175..391e60954 100644
--- a/groupChat/interface.go
+++ b/groupChat/interface.go
@@ -21,17 +21,17 @@ package groupChat
 
 import (
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	sessionImport "gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	gs "gitlab.com/elixxir/client/v5/groupChat/groupStore"
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	sessionImport "gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/cyclic"
 	cryptoE2e "gitlab.com/elixxir/crypto/e2e"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/groupChat/makeGroup.go b/groupChat/makeGroup.go
index 4ade0aca8..89ac7872e 100644
--- a/groupChat/makeGroup.go
+++ b/groupChat/makeGroup.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	gs "gitlab.com/elixxir/client/v5/groupChat/groupStore"
+	gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/crypto/group"
diff --git a/groupChat/makeGroup_test.go b/groupChat/makeGroup_test.go
index c082131b5..1a24adeab 100644
--- a/groupChat/makeGroup_test.go
+++ b/groupChat/makeGroup_test.go
@@ -11,9 +11,9 @@ import (
 	"bytes"
 	"fmt"
 	"github.com/cloudflare/circl/dh/sidh"
-	sessionImport "gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	gs "gitlab.com/elixxir/client/v5/groupChat/groupStore"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
+	sessionImport "gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/crypto/group"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/groupChat/manager.go b/groupChat/manager.go
index 08bd79cef..309de7464 100644
--- a/groupChat/manager.go
+++ b/groupChat/manager.go
@@ -10,9 +10,9 @@ package groupChat
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	gs "gitlab.com/elixxir/client/v5/groupChat/groupStore"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/catalog"
+	gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/crypto/group"
diff --git a/groupChat/manager_test.go b/groupChat/manager_test.go
index 3752e26c8..f27fece94 100644
--- a/groupChat/manager_test.go
+++ b/groupChat/manager_test.go
@@ -8,12 +8,12 @@
 package groupChat
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	e2eImport "gitlab.com/elixxir/client/v5/e2e"
-	gs "gitlab.com/elixxir/client/v5/groupChat/groupStore"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	e2eImport "gitlab.com/elixxir/client/v4/e2e"
+	gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/group"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/elixxir/primitives/format"
diff --git a/groupChat/messenger_test.go b/groupChat/messenger_test.go
index cda7de129..f65e7aba2 100644
--- a/groupChat/messenger_test.go
+++ b/groupChat/messenger_test.go
@@ -8,12 +8,12 @@
 package groupChat
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix"
-	clientE2E "gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/cmix"
+	clientE2E "gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/groupChat/networkManager_test.go b/groupChat/networkManager_test.go
index 9d5057ea7..2f1f254d8 100644
--- a/groupChat/networkManager_test.go
+++ b/groupChat/networkManager_test.go
@@ -9,12 +9,12 @@ package groupChat
 
 import (
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/primitives/format"
diff --git a/groupChat/processor.go b/groupChat/processor.go
index eb96c366e..9163ccfee 100644
--- a/groupChat/processor.go
+++ b/groupChat/processor.go
@@ -9,8 +9,8 @@ package groupChat
 
 import (
 	"fmt"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/primitives/format"
 )
 
diff --git a/groupChat/receive.go b/groupChat/receive.go
index b54d7ecb0..6534267a2 100644
--- a/groupChat/receive.go
+++ b/groupChat/receive.go
@@ -14,9 +14,9 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	gs "gitlab.com/elixxir/client/v5/groupChat/groupStore"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
 	"gitlab.com/elixxir/crypto/group"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/elixxir/primitives/states"
diff --git a/groupChat/receiveRequest.go b/groupChat/receiveRequest.go
index bdc924567..b96a5b91a 100644
--- a/groupChat/receiveRequest.go
+++ b/groupChat/receiveRequest.go
@@ -11,9 +11,9 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	gs "gitlab.com/elixxir/client/v5/groupChat/groupStore"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
 	"gitlab.com/elixxir/crypto/group"
 	"time"
 )
diff --git a/groupChat/receiveRequest_test.go b/groupChat/receiveRequest_test.go
index 960fd281c..7514b00f0 100644
--- a/groupChat/receiveRequest_test.go
+++ b/groupChat/receiveRequest_test.go
@@ -10,11 +10,11 @@ package groupChat
 import (
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/golang/protobuf/proto"
-	"gitlab.com/elixxir/client/v5/catalog"
-	sessionImport "gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	gs "gitlab.com/elixxir/client/v5/groupChat/groupStore"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
+	"gitlab.com/elixxir/client/v4/catalog"
+	sessionImport "gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
 	"math/rand"
 	"reflect"
 	"strings"
diff --git a/groupChat/send.go b/groupChat/send.go
index 6e2c15a7c..0491081ff 100644
--- a/groupChat/send.go
+++ b/groupChat/send.go
@@ -10,10 +10,10 @@ package groupChat
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	gs "gitlab.com/elixxir/client/v5/groupChat/groupStore"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
 	"gitlab.com/elixxir/crypto/group"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/groupChat/sendRequests.go b/groupChat/sendRequests.go
index 997b4292b..89a4b65eb 100644
--- a/groupChat/sendRequests.go
+++ b/groupChat/sendRequests.go
@@ -13,9 +13,9 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/e2e"
-	gs "gitlab.com/elixxir/client/v5/groupChat/groupStore"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/e2e"
+	gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
 	"gitlab.com/elixxir/crypto/group"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/groupChat/sendRequests_test.go b/groupChat/sendRequests_test.go
index 4b12ba213..726237701 100644
--- a/groupChat/sendRequests_test.go
+++ b/groupChat/sendRequests_test.go
@@ -11,8 +11,8 @@ import (
 	"fmt"
 	"github.com/cloudflare/circl/dh/sidh"
 	"github.com/golang/protobuf/proto"
-	sessionImport "gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
+	sessionImport "gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
 	"gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/xx_network/crypto/csprng"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/groupChat/send_test.go b/groupChat/send_test.go
index 98d213411..6c652ed57 100644
--- a/groupChat/send_test.go
+++ b/groupChat/send_test.go
@@ -10,9 +10,9 @@ package groupChat
 import (
 	"bytes"
 	"encoding/base64"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	gs "gitlab.com/elixxir/client/v5/groupChat/groupStore"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
 	"gitlab.com/elixxir/crypto/group"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/elixxir/primitives/states"
diff --git a/groupChat/service.go b/groupChat/service.go
index 124554924..7c2f12a75 100644
--- a/groupChat/service.go
+++ b/groupChat/service.go
@@ -9,9 +9,9 @@ package groupChat
 
 import (
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	gs "gitlab.com/elixxir/client/v5/groupChat/groupStore"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
 	"gitlab.com/xx_network/primitives/id"
 )
 
diff --git a/groupChat/session_test.go b/groupChat/session_test.go
index 4251d4f5a..c5be89101 100644
--- a/groupChat/session_test.go
+++ b/groupChat/session_test.go
@@ -8,9 +8,9 @@
 package groupChat
 
 import (
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/storage/user"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/storage/user"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/elixxir/primitives/version"
diff --git a/groupChat/utils_test.go b/groupChat/utils_test.go
index e185841be..3fcfc3d1c 100644
--- a/groupChat/utils_test.go
+++ b/groupChat/utils_test.go
@@ -9,10 +9,10 @@ package groupChat
 
 import (
 	"encoding/base64"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/event"
-	gs "gitlab.com/elixxir/client/v5/groupChat/groupStore"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/event"
+	gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/group"
diff --git a/groupChat/wrapper.go b/groupChat/wrapper.go
index c9dc5236c..abfa2e7bc 100644
--- a/groupChat/wrapper.go
+++ b/groupChat/wrapper.go
@@ -8,8 +8,8 @@
 package groupChat
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	gs "gitlab.com/elixxir/client/v5/groupChat/groupStore"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
 	"gitlab.com/elixxir/crypto/group"
 	"gitlab.com/xx_network/primitives/id"
 	"time"
diff --git a/main.go b/main.go
index 0b7ecf8ca..a15efab98 100644
--- a/main.go
+++ b/main.go
@@ -7,7 +7,7 @@
 
 package main
 
-import "gitlab.com/elixxir/client/v5/cmd"
+import "gitlab.com/elixxir/client/v4/cmd"
 
 // main needs no introduction.
 func main() {
diff --git a/restlike/connect/receiver.go b/restlike/connect/receiver.go
index 2aa3631d6..a6aa395af 100644
--- a/restlike/connect/receiver.go
+++ b/restlike/connect/receiver.go
@@ -10,11 +10,11 @@ package connect
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/connect"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/restlike"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/connect"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/restlike"
 	"google.golang.org/protobuf/proto"
 )
 
diff --git a/restlike/connect/receiver_test.go b/restlike/connect/receiver_test.go
index 80f4035d3..1742619ac 100644
--- a/restlike/connect/receiver_test.go
+++ b/restlike/connect/receiver_test.go
@@ -8,8 +8,8 @@
 package connect
 
 import (
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/restlike"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/restlike"
 	"testing"
 )
 
diff --git a/restlike/connect/request.go b/restlike/connect/request.go
index 1fb514d5f..e1e0fac24 100644
--- a/restlike/connect/request.go
+++ b/restlike/connect/request.go
@@ -9,10 +9,10 @@ package connect
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/connect"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/restlike"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/connect"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/restlike"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/xx_network/crypto/csprng"
 	"google.golang.org/protobuf/proto"
diff --git a/restlike/connect/response.go b/restlike/connect/response.go
index ad0cf6dc1..87ae89206 100644
--- a/restlike/connect/response.go
+++ b/restlike/connect/response.go
@@ -8,8 +8,8 @@
 package connect
 
 import (
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/restlike"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/restlike"
 	"google.golang.org/protobuf/proto"
 )
 
diff --git a/restlike/connect/response_test.go b/restlike/connect/response_test.go
index 3081aff8c..8a826bd88 100644
--- a/restlike/connect/response_test.go
+++ b/restlike/connect/response_test.go
@@ -9,8 +9,8 @@ package connect
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/restlike"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/restlike"
 	"google.golang.org/protobuf/proto"
 	"testing"
 	"time"
diff --git a/restlike/connect/server.go b/restlike/connect/server.go
index e35d24f01..4b37a39c4 100644
--- a/restlike/connect/server.go
+++ b/restlike/connect/server.go
@@ -8,10 +8,10 @@
 package connect
 
 import (
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/connect"
-	"gitlab.com/elixxir/client/v5/restlike"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/connect"
+	"gitlab.com/elixxir/client/v4/restlike"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/xx_network/primitives/id"
 )
 
diff --git a/restlike/single/receiver.go b/restlike/single/receiver.go
index 4c3f27d9d..fbb62417d 100644
--- a/restlike/single/receiver.go
+++ b/restlike/single/receiver.go
@@ -10,11 +10,11 @@ package single
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/restlike"
-	"gitlab.com/elixxir/client/v5/single"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/restlike"
+	"gitlab.com/elixxir/client/v4/single"
 	"google.golang.org/protobuf/proto"
 	"time"
 )
diff --git a/restlike/single/request.go b/restlike/single/request.go
index e23107130..a0b309fcc 100644
--- a/restlike/single/request.go
+++ b/restlike/single/request.go
@@ -9,9 +9,9 @@ package single
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/restlike"
-	"gitlab.com/elixxir/client/v5/single"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/restlike"
+	"gitlab.com/elixxir/client/v4/single"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/restlike/single/response.go b/restlike/single/response.go
index 2f28f9063..d250c8498 100644
--- a/restlike/single/response.go
+++ b/restlike/single/response.go
@@ -8,9 +8,9 @@
 package single
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/restlike"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/restlike"
 	"google.golang.org/protobuf/proto"
 )
 
diff --git a/restlike/single/response_test.go b/restlike/single/response_test.go
index 7024dc957..40cd62132 100644
--- a/restlike/single/response_test.go
+++ b/restlike/single/response_test.go
@@ -10,8 +10,8 @@ package single
 import (
 	"bytes"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/restlike"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/restlike"
 	"google.golang.org/protobuf/proto"
 	"testing"
 	"time"
diff --git a/restlike/single/server.go b/restlike/single/server.go
index 3749330e3..4ee314580 100644
--- a/restlike/single/server.go
+++ b/restlike/single/server.go
@@ -8,9 +8,9 @@
 package single
 
 import (
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/restlike"
-	"gitlab.com/elixxir/client/v5/single"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/restlike"
+	"gitlab.com/elixxir/client/v4/single"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/single/interfaces.go b/single/interfaces.go
index 4c5eab6b9..617c20dec 100644
--- a/single/interfaces.go
+++ b/single/interfaces.go
@@ -8,11 +8,11 @@
 package single
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	cMixMsg "gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	cMixMsg "gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/single/listener.go b/single/listener.go
index 2199216db..f818e2c72 100644
--- a/single/listener.go
+++ b/single/listener.go
@@ -11,10 +11,10 @@ import (
 	"fmt"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	cMixMsg "gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/single/message"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	cMixMsg "gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/single/message"
 	"gitlab.com/elixxir/crypto/cyclic"
 	cAuth "gitlab.com/elixxir/crypto/e2e/auth"
 	"gitlab.com/elixxir/crypto/e2e/singleUse"
diff --git a/single/listener_test.go b/single/listener_test.go
index 35e6272f8..2fc52436c 100644
--- a/single/listener_test.go
+++ b/single/listener_test.go
@@ -8,11 +8,11 @@
 package single
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	cMixMsg "gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/single/message"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	cMixMsg "gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/single/message"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
diff --git a/single/params.go b/single/params.go
index 531519a58..08bf8d497 100644
--- a/single/params.go
+++ b/single/params.go
@@ -9,7 +9,7 @@ package single
 
 import (
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/cmix"
+	"gitlab.com/elixxir/client/v4/cmix"
 	"time"
 )
 
diff --git a/single/params_test.go b/single/params_test.go
index 71bf18c09..f0c71c48d 100644
--- a/single/params_test.go
+++ b/single/params_test.go
@@ -10,7 +10,7 @@ package single
 import (
 	"bytes"
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/cmix"
+	"gitlab.com/elixxir/client/v4/cmix"
 	"reflect"
 	"testing"
 )
diff --git a/single/receivedRequest.go b/single/receivedRequest.go
index 9445fae22..aea1240f1 100644
--- a/single/receivedRequest.go
+++ b/single/receivedRequest.go
@@ -12,9 +12,9 @@ import (
 	"fmt"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
-	cmixMsg "gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/single/message"
+	"gitlab.com/elixxir/client/v4/cmix"
+	cmixMsg "gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/single/message"
 	ds "gitlab.com/elixxir/comms/network/dataStructures"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/e2e/singleUse"
diff --git a/single/receivedRequest_test.go b/single/receivedRequest_test.go
index 3a43bef5c..a3a11e41f 100644
--- a/single/receivedRequest_test.go
+++ b/single/receivedRequest_test.go
@@ -9,10 +9,10 @@ package single
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/cmix"
-	cmixMsg "gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/single/message"
+	"gitlab.com/elixxir/client/v4/cmix"
+	cmixMsg "gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/single/message"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/e2e/singleUse"
diff --git a/single/request.go b/single/request.go
index 18cd97cfd..d942852ef 100644
--- a/single/request.go
+++ b/single/request.go
@@ -11,11 +11,11 @@ import (
 	"bytes"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	cmixMsg "gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/single/message"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	cmixMsg "gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/single/message"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/diffieHellman"
diff --git a/single/requestPartProcessor.go b/single/requestPartProcessor.go
index c1c96c512..036672a0b 100644
--- a/single/requestPartProcessor.go
+++ b/single/requestPartProcessor.go
@@ -9,9 +9,9 @@ package single
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/single/message"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/single/message"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/single/request_test.go b/single/request_test.go
index d35785282..889cc4218 100644
--- a/single/request_test.go
+++ b/single/request_test.go
@@ -11,10 +11,10 @@ import (
 	"bytes"
 	"fmt"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/single/message"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/single/message"
 	"gitlab.com/elixxir/crypto/contact"
 	dh "gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/single/responseProcessor.go b/single/responseProcessor.go
index 2f588e0db..9c6cd6407 100644
--- a/single/responseProcessor.go
+++ b/single/responseProcessor.go
@@ -11,9 +11,9 @@ import (
 	"fmt"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/single/message"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/single/message"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/primitives/format"
 )
diff --git a/single/roundCollector.go b/single/roundCollector.go
index e4d28a401..4af424752 100644
--- a/single/roundCollector.go
+++ b/single/roundCollector.go
@@ -8,7 +8,7 @@
 package single
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/xx_network/primitives/id"
 	"sync"
 )
diff --git a/single/utils_test.go b/single/utils_test.go
index 699a161ea..4dbae4461 100644
--- a/single/utils_test.go
+++ b/single/utils_test.go
@@ -8,10 +8,10 @@
 package single
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/comms/connect"
diff --git a/storage/clientVersion/store.go b/storage/clientVersion/store.go
index c1c0c523e..8363ee303 100644
--- a/storage/clientVersion/store.go
+++ b/storage/clientVersion/store.go
@@ -10,7 +10,7 @@ package clientVersion
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/primitives/version"
 	"gitlab.com/xx_network/primitives/netTime"
 	"sync"
diff --git a/storage/clientVersion/store_test.go b/storage/clientVersion/store_test.go
index c794b74dd..f114e1e82 100644
--- a/storage/clientVersion/store_test.go
+++ b/storage/clientVersion/store_test.go
@@ -8,7 +8,7 @@
 package clientVersion
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/elixxir/primitives/version"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/storage/ndf.go b/storage/ndf.go
index f02d7a27b..1cf522596 100644
--- a/storage/ndf.go
+++ b/storage/ndf.go
@@ -9,7 +9,7 @@ package storage
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/utility"
 	"gitlab.com/xx_network/primitives/ndf"
 )
 
diff --git a/storage/regCode.go b/storage/regCode.go
index 3a9c1008c..7bd67cb37 100644
--- a/storage/regCode.go
+++ b/storage/regCode.go
@@ -10,7 +10,7 @@ package storage
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/netTime"
 )
 
diff --git a/storage/regStatus.go b/storage/regStatus.go
index 2aebaaa28..49a506c62 100644
--- a/storage/regStatus.go
+++ b/storage/regStatus.go
@@ -11,7 +11,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/netTime"
 )
 
diff --git a/storage/session.go b/storage/session.go
index d7ceef23f..8e98ebb4a 100644
--- a/storage/session.go
+++ b/storage/session.go
@@ -17,14 +17,14 @@ import (
 
 	"gitlab.com/elixxir/crypto/diffieHellman"
 
-	"gitlab.com/elixxir/client/v5/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/utility"
 	"gitlab.com/xx_network/crypto/large"
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/clientVersion"
-	"gitlab.com/elixxir/client/v5/storage/user"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/clientVersion"
+	"gitlab.com/elixxir/client/v4/storage/user"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/elixxir/primitives/version"
diff --git a/storage/user/cryptographic.go b/storage/user/cryptographic.go
index 1a1e27f22..f65ca13ab 100644
--- a/storage/user/cryptographic.go
+++ b/storage/user/cryptographic.go
@@ -13,8 +13,8 @@ import (
 	"encoding/json"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/utility"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/utility"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/xx_network/crypto/signature/rsa"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/storage/user/cryptographic_test.go b/storage/user/cryptographic_test.go
index 228cc0fce..90d7df378 100644
--- a/storage/user/cryptographic_test.go
+++ b/storage/user/cryptographic_test.go
@@ -10,7 +10,7 @@ package user
 import (
 	"bytes"
 	"crypto/rand"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/ekv"
diff --git a/storage/user/registation.go b/storage/user/registation.go
index a865fb504..5900f82a1 100644
--- a/storage/user/registation.go
+++ b/storage/user/registation.go
@@ -10,7 +10,7 @@ package user
 import (
 	"encoding/binary"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/netTime"
 	"time"
 )
diff --git a/storage/user/registation_test.go b/storage/user/registation_test.go
index 15e1048da..3d9efddf5 100644
--- a/storage/user/registation_test.go
+++ b/storage/user/registation_test.go
@@ -10,7 +10,7 @@ package user
 import (
 	"bytes"
 	"encoding/binary"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/ekv"
diff --git a/storage/user/user.go b/storage/user/user.go
index 49ea0fd86..984af7fee 100644
--- a/storage/user/user.go
+++ b/storage/user/user.go
@@ -9,7 +9,7 @@ package user
 
 import (
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/xx_network/crypto/signature/rsa"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/storage/user/user_test.go b/storage/user/user_test.go
index 0191d79d5..c8b97b9e3 100644
--- a/storage/user/user_test.go
+++ b/storage/user/user_test.go
@@ -8,7 +8,7 @@
 package user
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/ekv"
diff --git a/storage/user/username.go b/storage/user/username.go
index f695a3b27..636f4e3d3 100644
--- a/storage/user/username.go
+++ b/storage/user/username.go
@@ -10,7 +10,7 @@ package user
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/netTime"
 )
 
diff --git a/storage/user/username_test.go b/storage/user/username_test.go
index eecda213b..34d617359 100644
--- a/storage/user/username_test.go
+++ b/storage/user/username_test.go
@@ -8,7 +8,7 @@
 package user
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/ekv"
diff --git a/storage/utility/NDF.go b/storage/utility/NDF.go
index b1751523f..d53cf4911 100644
--- a/storage/utility/NDF.go
+++ b/storage/utility/NDF.go
@@ -11,7 +11,7 @@
 package utility
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/ndf"
 	"gitlab.com/xx_network/primitives/netTime"
 )
diff --git a/storage/utility/NDF_js.go b/storage/utility/NDF_js.go
index 4fa4ded28..05d5eb885 100644
--- a/storage/utility/NDF_js.go
+++ b/storage/utility/NDF_js.go
@@ -8,7 +8,7 @@
 package utility
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/ndf"
 	"os"
 	"syscall/js"
diff --git a/storage/utility/blockStore.go b/storage/utility/blockStore.go
index 00ff2d5ce..3683e5178 100644
--- a/storage/utility/blockStore.go
+++ b/storage/utility/blockStore.go
@@ -13,7 +13,7 @@ import (
 	"encoding/json"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/netTime"
 	"strconv"
 )
diff --git a/storage/utility/blockStore_test.go b/storage/utility/blockStore_test.go
index df198bf8b..b519eda92 100644
--- a/storage/utility/blockStore_test.go
+++ b/storage/utility/blockStore_test.go
@@ -11,7 +11,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/netTime"
 	"math/rand"
diff --git a/storage/utility/bucket.go b/storage/utility/bucket.go
index 6471b4da5..f776dabfe 100644
--- a/storage/utility/bucket.go
+++ b/storage/utility/bucket.go
@@ -10,7 +10,7 @@ package utility
 import (
 	"encoding/json"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/netTime"
 	"gitlab.com/xx_network/primitives/rateLimiting"
 	"time"
diff --git a/storage/utility/bucketParams.go b/storage/utility/bucketParams.go
index 40e1fb479..cf8fc5703 100644
--- a/storage/utility/bucketParams.go
+++ b/storage/utility/bucketParams.go
@@ -11,7 +11,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/netTime"
 	"gitlab.com/xx_network/primitives/rateLimiting"
 	"sync"
diff --git a/storage/utility/bucketParams_test.go b/storage/utility/bucketParams_test.go
index e4ab74105..1f2c4bdb5 100644
--- a/storage/utility/bucketParams_test.go
+++ b/storage/utility/bucketParams_test.go
@@ -8,7 +8,7 @@
 package utility
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"reflect"
 	"testing"
diff --git a/storage/utility/contact.go b/storage/utility/contact.go
index de32be1ae..f67443f20 100644
--- a/storage/utility/contact.go
+++ b/storage/utility/contact.go
@@ -10,7 +10,7 @@ package utility
 import (
 	"fmt"
 
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
diff --git a/storage/utility/dh.go b/storage/utility/dh.go
index e0ddd5943..a3f05b2d7 100644
--- a/storage/utility/dh.go
+++ b/storage/utility/dh.go
@@ -8,7 +8,7 @@
 package utility
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/xx_network/primitives/netTime"
 )
diff --git a/storage/utility/dh_test.go b/storage/utility/dh_test.go
index 768273a37..d106c6d90 100644
--- a/storage/utility/dh_test.go
+++ b/storage/utility/dh_test.go
@@ -8,7 +8,7 @@
 package utility
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"testing"
 )
diff --git a/storage/utility/encryptionSalt.go b/storage/utility/encryptionSalt.go
index 95316e051..f8927bf03 100644
--- a/storage/utility/encryptionSalt.go
+++ b/storage/utility/encryptionSalt.go
@@ -2,7 +2,7 @@ package utility
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/netTime"
 	"io"
 )
diff --git a/storage/utility/encryptionSalt_test.go b/storage/utility/encryptionSalt_test.go
index 269ddf007..270136233 100644
--- a/storage/utility/encryptionSalt_test.go
+++ b/storage/utility/encryptionSalt_test.go
@@ -2,7 +2,7 @@ package utility
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/crypto/csprng"
 	"testing"
diff --git a/storage/utility/group.go b/storage/utility/group.go
index 12fe46668..19a157509 100644
--- a/storage/utility/group.go
+++ b/storage/utility/group.go
@@ -8,7 +8,7 @@
 package utility
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/xx_network/primitives/netTime"
 )
diff --git a/storage/utility/group_test.go b/storage/utility/group_test.go
index 655773450..ecc9f3cff 100644
--- a/storage/utility/group_test.go
+++ b/storage/utility/group_test.go
@@ -8,7 +8,7 @@
 package utility
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/crypto/large"
diff --git a/storage/utility/id.go b/storage/utility/id.go
index a21221f6e..5e2168c7b 100644
--- a/storage/utility/id.go
+++ b/storage/utility/id.go
@@ -8,7 +8,7 @@
 package utility
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
 )
diff --git a/storage/utility/messageBuffer.go b/storage/utility/messageBuffer.go
index 12acf9ca3..ce2ae8203 100644
--- a/storage/utility/messageBuffer.go
+++ b/storage/utility/messageBuffer.go
@@ -13,7 +13,7 @@ import (
 	"sync"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/netTime"
 )
diff --git a/storage/utility/messageBuffer_test.go b/storage/utility/messageBuffer_test.go
index f34fbe42b..97fbe0c80 100644
--- a/storage/utility/messageBuffer_test.go
+++ b/storage/utility/messageBuffer_test.go
@@ -10,7 +10,7 @@ package utility
 import (
 	"bytes"
 	"encoding/json"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/netTime"
 	"golang.org/x/crypto/blake2b"
diff --git a/storage/utility/multiStateVector.go b/storage/utility/multiStateVector.go
index 47b6d70f9..8653625c2 100644
--- a/storage/utility/multiStateVector.go
+++ b/storage/utility/multiStateVector.go
@@ -11,7 +11,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/netTime"
 	"math"
 	"sync"
diff --git a/storage/utility/multiStateVector_test.go b/storage/utility/multiStateVector_test.go
index 06e43187c..b8d69f3a8 100644
--- a/storage/utility/multiStateVector_test.go
+++ b/storage/utility/multiStateVector_test.go
@@ -11,7 +11,7 @@ import (
 	"bytes"
 	"encoding/base64"
 	"fmt"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/netTime"
 	"math"
diff --git a/storage/utility/sidh.go b/storage/utility/sidh.go
index 1bb095b54..e82157e14 100644
--- a/storage/utility/sidh.go
+++ b/storage/utility/sidh.go
@@ -12,8 +12,8 @@ import (
 	"fmt"
 	"github.com/cloudflare/circl/dh/sidh"
 	jww "github.com/spf13/jwalterweatherman"
-	sidhinterface "gitlab.com/elixxir/client/v5/interfaces/sidh"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	sidhinterface "gitlab.com/elixxir/client/v4/interfaces/sidh"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
 	"io"
diff --git a/storage/utility/sidh_test.go b/storage/utility/sidh_test.go
index a0c1cc15c..14bc95836 100644
--- a/storage/utility/sidh_test.go
+++ b/storage/utility/sidh_test.go
@@ -9,7 +9,7 @@ package utility
 
 import (
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/storage/utility/stateVector.go b/storage/utility/stateVector.go
index 84238210d..e23c776bb 100644
--- a/storage/utility/stateVector.go
+++ b/storage/utility/stateVector.go
@@ -12,7 +12,7 @@ import (
 	"fmt"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/netTime"
 	"sync"
 	"testing"
diff --git a/storage/utility/stateVector_test.go b/storage/utility/stateVector_test.go
index 803ba49b7..355bbac04 100644
--- a/storage/utility/stateVector_test.go
+++ b/storage/utility/stateVector_test.go
@@ -11,7 +11,7 @@ import (
 	"bytes"
 	"encoding/base64"
 	"fmt"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/netTime"
 	"math/rand"
diff --git a/ud/channelIDTracking.go b/ud/channelIDTracking.go
index cd45720a8..9dc19646e 100644
--- a/ud/channelIDTracking.go
+++ b/ud/channelIDTracking.go
@@ -10,10 +10,10 @@ import (
 
 	jww "github.com/spf13/jwalterweatherman"
 
-	"gitlab.com/elixxir/client/v5/channels"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/channels"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/ud/channelIDTracking_test.go b/ud/channelIDTracking_test.go
index 651cef901..7a3c6c1cb 100644
--- a/ud/channelIDTracking_test.go
+++ b/ud/channelIDTracking_test.go
@@ -13,9 +13,9 @@ import (
 	"gitlab.com/xx_network/crypto/signature/rsa"
 	"gitlab.com/xx_network/primitives/id"
 
-	"gitlab.com/elixxir/client/v5/event"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
-	store "gitlab.com/elixxir/client/v5/ud/store"
+	"gitlab.com/elixxir/client/v4/event"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
+	store "gitlab.com/elixxir/client/v4/ud/store"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/ekv"
 )
diff --git a/ud/interfaces.go b/ud/interfaces.go
index a7e507831..35005143e 100644
--- a/ud/interfaces.go
+++ b/ud/interfaces.go
@@ -8,12 +8,12 @@
 package ud
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/event"
-	"gitlab.com/elixxir/client/v5/single"
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/event"
+	"gitlab.com/elixxir/client/v4/single"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/fastRNG"
 )
 
diff --git a/ud/lookup.go b/ud/lookup.go
index 2f026c99f..9faf9bf6d 100644
--- a/ud/lookup.go
+++ b/ud/lookup.go
@@ -11,9 +11,9 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/single"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/single"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/primitives/fact"
diff --git a/ud/lookup_test.go b/ud/lookup_test.go
index 94bb7fa66..cc26ac81a 100644
--- a/ud/lookup_test.go
+++ b/ud/lookup_test.go
@@ -8,8 +8,8 @@
 package ud
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/single"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/single"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/xx_network/crypto/csprng"
 	"gitlab.com/xx_network/primitives/id"
diff --git a/ud/manager.go b/ud/manager.go
index 84179b80b..eed144156 100644
--- a/ud/manager.go
+++ b/ud/manager.go
@@ -10,10 +10,10 @@ package ud
 import (
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/event"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
-	store "gitlab.com/elixxir/client/v5/ud/store"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/event"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
+	store "gitlab.com/elixxir/client/v4/ud/store"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/primitives/fact"
diff --git a/ud/mockE2e_test.go b/ud/mockE2e_test.go
index 9f9def30c..99b03bf62 100644
--- a/ud/mockE2e_test.go
+++ b/ud/mockE2e_test.go
@@ -9,18 +9,18 @@ package ud
 
 import (
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/catalog"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/receive"
-	"gitlab.com/elixxir/client/v5/event"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/catalog"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/receive"
+	"gitlab.com/elixxir/client/v4/event"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/elixxir/crypto/cyclic"
 	cryptoE2e "gitlab.com/elixxir/crypto/e2e"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/ud/mockStore_test.go b/ud/mockStore_test.go
index 09631bf1a..c86276a77 100644
--- a/ud/mockStore_test.go
+++ b/ud/mockStore_test.go
@@ -8,9 +8,9 @@
 package ud
 
 import (
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/storage/user"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/storage/user"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/elixxir/primitives/version"
diff --git a/ud/networkManager_test.go b/ud/networkManager_test.go
index 1a795a69a..71be04b36 100644
--- a/ud/networkManager_test.go
+++ b/ud/networkManager_test.go
@@ -9,13 +9,13 @@ package ud
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/primitives/format"
diff --git a/ud/registered.go b/ud/registered.go
index 10c70a4aa..648577c01 100644
--- a/ud/registered.go
+++ b/ud/registered.go
@@ -11,7 +11,7 @@ import (
 	"encoding/binary"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/xx_network/primitives/netTime"
 )
 
diff --git a/ud/search.go b/ud/search.go
index cf156778b..11d9c2980 100644
--- a/ud/search.go
+++ b/ud/search.go
@@ -12,10 +12,10 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/event"
-	"gitlab.com/elixxir/client/v5/single"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/event"
+	"gitlab.com/elixxir/client/v4/single"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/factID"
diff --git a/ud/search_test.go b/ud/search_test.go
index a37f70e70..3e8e91ec1 100644
--- a/ud/search_test.go
+++ b/ud/search_test.go
@@ -8,8 +8,8 @@
 package ud
 
 import (
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/single"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/single"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/primitives/fact"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/ud/store/facts_test.go b/ud/store/facts_test.go
index 050fdbc77..fe3e2a85f 100644
--- a/ud/store/facts_test.go
+++ b/ud/store/facts_test.go
@@ -8,7 +8,7 @@
 package ud
 
 import (
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/elixxir/primitives/fact"
 	"reflect"
diff --git a/ud/store/store.go b/ud/store/store.go
index 9a1316a22..24d44d28e 100644
--- a/ud/store/store.go
+++ b/ud/store/store.go
@@ -12,7 +12,7 @@ package ud
 import (
 	"encoding/json"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/primitives/fact"
 	"gitlab.com/xx_network/primitives/netTime"
 	"sync"
diff --git a/ud/store/store_test.go b/ud/store/store_test.go
index cd70d73a1..6099e6aff 100644
--- a/ud/store/store_test.go
+++ b/ud/store/store_test.go
@@ -9,7 +9,7 @@ package ud
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/elixxir/primitives/fact"
 	"reflect"
diff --git a/ud/utils_test.go b/ud/utils_test.go
index 822320616..1ffce2b84 100644
--- a/ud/utils_test.go
+++ b/ud/utils_test.go
@@ -9,14 +9,14 @@ package ud
 
 import (
 	"github.com/golang/protobuf/proto"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/event"
-	"gitlab.com/elixxir/client/v5/single"
-	"gitlab.com/elixxir/client/v5/storage/user"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
-	store "gitlab.com/elixxir/client/v5/ud/store"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/event"
+	"gitlab.com/elixxir/client/v4/single"
+	"gitlab.com/elixxir/client/v4/storage/user"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
+	store "gitlab.com/elixxir/client/v4/ud/store"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/xxdk/cmix.go b/xxdk/cmix.go
index ac0662add..66ce1e4b9 100644
--- a/xxdk/cmix.go
+++ b/xxdk/cmix.go
@@ -15,13 +15,13 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/event"
-	"gitlab.com/elixxir/client/v5/interfaces"
-	"gitlab.com/elixxir/client/v5/registration"
-	"gitlab.com/elixxir/client/v5/stoppable"
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/storage/user"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/event"
+	"gitlab.com/elixxir/client/v4/interfaces"
+	"gitlab.com/elixxir/client/v4/registration"
+	"gitlab.com/elixxir/client/v4/stoppable"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/storage/user"
 	"gitlab.com/elixxir/comms/client"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/xxdk/e2e.go b/xxdk/e2e.go
index 57d07f321..fdf78fc29 100644
--- a/xxdk/e2e.go
+++ b/xxdk/e2e.go
@@ -13,13 +13,13 @@ import (
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/auth"
-	"gitlab.com/elixxir/client/v5/cmix/identity/receptionID"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/rekey"
-	"gitlab.com/elixxir/client/v5/storage/user"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/auth"
+	"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/rekey"
+	"gitlab.com/elixxir/client/v4/storage/user"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/crypto/xx"
diff --git a/xxdk/event.go b/xxdk/event.go
index 4b6b14384..8c530059d 100644
--- a/xxdk/event.go
+++ b/xxdk/event.go
@@ -8,7 +8,7 @@
 package xxdk
 
 import (
-	"gitlab.com/elixxir/client/v5/event"
+	"gitlab.com/elixxir/client/v4/event"
 )
 
 // ReportEvent reports an event from the client to api users, providing a
diff --git a/xxdk/identity.go b/xxdk/identity.go
index 2f02cb7d1..867b86469 100644
--- a/xxdk/identity.go
+++ b/xxdk/identity.go
@@ -11,8 +11,8 @@ import (
 	"encoding/json"
 	"gitlab.com/elixxir/primitives/fact"
 
-	"gitlab.com/elixxir/client/v5/storage/user"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
+	"gitlab.com/elixxir/client/v4/storage/user"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/diffieHellman"
diff --git a/xxdk/params.go b/xxdk/params.go
index fbcf50b45..86241225b 100644
--- a/xxdk/params.go
+++ b/xxdk/params.go
@@ -13,11 +13,11 @@ package xxdk
 import (
 	"encoding/json"
 
-	"gitlab.com/elixxir/client/v5/auth"
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/e2e"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	"gitlab.com/elixxir/client/v5/e2e/rekey"
+	"gitlab.com/elixxir/client/v4/auth"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/e2e"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	"gitlab.com/elixxir/client/v4/e2e/rekey"
 )
 
 // CMIXParams contains the parameters for Network tracking and for specific CMIX
diff --git a/xxdk/permissioning.go b/xxdk/permissioning.go
index 10ddf9383..55a62dbab 100644
--- a/xxdk/permissioning.go
+++ b/xxdk/permissioning.go
@@ -10,8 +10,8 @@ package xxdk
 import (
 	"encoding/json"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/storage/user"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/storage/user"
 )
 
 // registerWithPermissioning returns an error if registration fails.
diff --git a/xxdk/precan.go b/xxdk/precan.go
index c72682560..f58b27b75 100644
--- a/xxdk/precan.go
+++ b/xxdk/precan.go
@@ -12,12 +12,12 @@ import (
 	"math/rand"
 
 	"github.com/cloudflare/circl/dh/sidh"
-	"gitlab.com/elixxir/client/v5/e2e/ratchet/partner/session"
-	util "gitlab.com/elixxir/client/v5/storage/utility"
+	"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
+	util "gitlab.com/elixxir/client/v4/storage/utility"
 	"gitlab.com/elixxir/crypto/contact"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage"
+	"gitlab.com/elixxir/client/v4/storage"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/crypto/csprng"
 )
diff --git a/xxdk/services.go b/xxdk/services.go
index 2005bbb5e..dc719ce86 100644
--- a/xxdk/services.go
+++ b/xxdk/services.go
@@ -9,7 +9,7 @@ package xxdk
 
 import (
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"sync"
 	"time"
 )
diff --git a/xxdk/services_test.go b/xxdk/services_test.go
index a0b03c505..0bfec62f3 100644
--- a/xxdk/services_test.go
+++ b/xxdk/services_test.go
@@ -9,7 +9,7 @@ package xxdk
 
 import (
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	"reflect"
 	"testing"
 	"time"
diff --git a/xxdk/user.go b/xxdk/user.go
index e26e70a9d..cac845864 100644
--- a/xxdk/user.go
+++ b/xxdk/user.go
@@ -18,7 +18,7 @@ import (
 	"gitlab.com/elixxir/crypto/diffieHellman"
 
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/v5/storage/user"
+	"gitlab.com/elixxir/client/v4/storage/user"
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/crypto/csprng"
diff --git a/xxdk/utilsInterfaces_test.go b/xxdk/utilsInterfaces_test.go
index 9acf5631d..a0fb0ebde 100644
--- a/xxdk/utilsInterfaces_test.go
+++ b/xxdk/utilsInterfaces_test.go
@@ -10,12 +10,12 @@ package xxdk
 import (
 	"time"
 
-	"gitlab.com/elixxir/client/v5/cmix"
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
-	"gitlab.com/elixxir/client/v5/cmix/identity"
-	"gitlab.com/elixxir/client/v5/cmix/message"
-	"gitlab.com/elixxir/client/v5/cmix/rounds"
-	"gitlab.com/elixxir/client/v5/stoppable"
+	"gitlab.com/elixxir/client/v4/cmix"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/identity"
+	"gitlab.com/elixxir/client/v4/cmix/message"
+	"gitlab.com/elixxir/client/v4/cmix/rounds"
+	"gitlab.com/elixxir/client/v4/stoppable"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/comms/network"
 	"gitlab.com/elixxir/primitives/format"
diff --git a/xxdk/utils_test.go b/xxdk/utils_test.go
index 583b58d8b..31988d86c 100644
--- a/xxdk/utils_test.go
+++ b/xxdk/utils_test.go
@@ -10,7 +10,7 @@ package xxdk
 import (
 	"testing"
 
-	"gitlab.com/elixxir/client/v5/cmix/gateway"
+	"gitlab.com/elixxir/client/v4/cmix/gateway"
 
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
diff --git a/xxmutils/restoreContacts.go b/xxmutils/restoreContacts.go
index cf00d8a96..578611265 100644
--- a/xxmutils/restoreContacts.go
+++ b/xxmutils/restoreContacts.go
@@ -11,8 +11,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"gitlab.com/elixxir/client/v5/single"
-	"gitlab.com/elixxir/client/v5/xxdk"
+	"gitlab.com/elixxir/client/v4/single"
+	"gitlab.com/elixxir/client/v4/xxdk"
 	"gitlab.com/xx_network/primitives/netTime"
 	"math"
 	"strings"
@@ -21,10 +21,10 @@ import (
 
 	jww "github.com/spf13/jwalterweatherman"
 
-	"gitlab.com/elixxir/client/v5/interfaces"
-	"gitlab.com/elixxir/client/v5/storage"
-	"gitlab.com/elixxir/client/v5/storage/versioned"
-	"gitlab.com/elixxir/client/v5/ud"
+	"gitlab.com/elixxir/client/v4/interfaces"
+	"gitlab.com/elixxir/client/v4/storage"
+	"gitlab.com/elixxir/client/v4/storage/versioned"
+	"gitlab.com/elixxir/client/v4/ud"
 	"gitlab.com/elixxir/crypto/contact"
 	"gitlab.com/xx_network/primitives/id"
 )
-- 
GitLab