diff --git a/src/main/java/com/yau/digitalrmb/exchange/infrastructure/persistence/JdbcExchangeResourceRepository.java b/src/main/java/com/yau/digitalrmb/exchange/infrastructure/persistence/JdbcExchangeResourceRepository.java
index d83c09b..a302702 100644
--- a/src/main/java/com/yau/digitalrmb/exchange/infrastructure/persistence/JdbcExchangeResourceRepository.java
+++ b/src/main/java/com/yau/digitalrmb/exchange/infrastructure/persistence/JdbcExchangeResourceRepository.java
@@ -7,7 +7,7 @@ import com.yau.digitalrmb.exchange.domain.model.ExchangeOrder;
 import com.yau.digitalrmb.exchange.domain.model.OwnershipConfirmation;
 import com.yau.digitalrmb.exchange.domain.model.ReservedCoin;
 import com.yau.digitalrmb.exchange.domain.repository.ExchangeResourceRepository;
-import com.yau.digitalrmb.exchange.infrastructure.crypto.WalletPrivateKeyCipher;
+import com.yau.digitalrmb.shared.wallet.WalletPrivateKeyCipher;
 import com.yau.digitalrmb.institutionidentity.domain.InstitutionIdentityCryptography;
 import com.yau.digitalrmb.institutionidentity.application.InstitutionKeyService;
 import com.yau.digitalrmb.institutionidentity.application.InstitutionKeySubject;
diff --git a/src/main/java/com/yau/digitalrmb/payment/infrastructure/persistence/JdbcPaymentResourceRepository.java b/src/main/java/com/yau/digitalrmb/payment/infrastructure/persistence/JdbcPaymentResourceRepository.java
index 7d94273..436724e 100644
--- a/src/main/java/com/yau/digitalrmb/payment/infrastructure/persistence/JdbcPaymentResourceRepository.java
+++ b/src/main/java/com/yau/digitalrmb/payment/infrastructure/persistence/JdbcPaymentResourceRepository.java
@@ -1,6 +1,6 @@
 package com.yau.digitalrmb.payment.infrastructure.persistence;
 
-import com.yau.digitalrmb.exchange.infrastructure.crypto.WalletPrivateKeyCipher;
+import com.yau.digitalrmb.shared.wallet.WalletPrivateKeyCipher;
 import com.yau.digitalrmb.institutionidentity.application.InstitutionKeyService;
 import com.yau.digitalrmb.institutionidentity.application.InstitutionKeySubject;
 import com.yau.digitalrmb.institutionidentity.domain.InstitutionIdentityCryptography;
diff --git a/src/main/java/com/yau/digitalrmb/exchange/infrastructure/crypto/WalletPrivateKeyCipher.java b/src/main/java/com/yau/digitalrmb/shared/wallet/WalletPrivateKeyCipher.java
similarity index 97%
rename from src/main/java/com/yau/digitalrmb/exchange/infrastructure/crypto/WalletPrivateKeyCipher.java
rename to src/main/java/com/yau/digitalrmb/shared/wallet/WalletPrivateKeyCipher.java
index 46c1ddc..a4a1629 100644
--- a/src/main/java/com/yau/digitalrmb/exchange/infrastructure/crypto/WalletPrivateKeyCipher.java
+++ b/src/main/java/com/yau/digitalrmb/shared/wallet/WalletPrivateKeyCipher.java
@@ -1,4 +1,4 @@
-package com.yau.digitalrmb.exchange.infrastructure.crypto;
+package com.yau.digitalrmb.shared.wallet;
 
 import com.yau.digitalrmb.security.config.SecurityProperties;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/yau/digitalrmb/exchange/interfaces/rest/ExchangeControllerTest.java b/src/test/java/com/yau/digitalrmb/exchange/interfaces/rest/ExchangeControllerTest.java
index 90da99d..5a3f57b 100644
--- a/src/test/java/com/yau/digitalrmb/exchange/interfaces/rest/ExchangeControllerTest.java
+++ b/src/test/java/com/yau/digitalrmb/exchange/interfaces/rest/ExchangeControllerTest.java
@@ -11,7 +11,7 @@ import org.springframework.http.MediaType;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
-import com.yau.digitalrmb.exchange.infrastructure.crypto.WalletPrivateKeyCipher;
+import com.yau.digitalrmb.shared.wallet.WalletPrivateKeyCipher;
 import com.yau.digitalrmb.institutionidentity.application.InstitutionKeyService;
 import com.yau.digitalrmb.institutionidentity.application.InstitutionKeySubject;
 import com.yau.digitalrmb.institutionidentity.domain.InstitutionIdentityCryptography;
diff --git a/src/test/java/com/yau/digitalrmb/payment/interfaces/rest/PaymentControllerTest.java b/src/test/java/com/yau/digitalrmb/payment/interfaces/rest/PaymentControllerTest.java
index cd14e0b..9030dd8 100644
--- a/src/test/java/com/yau/digitalrmb/payment/interfaces/rest/PaymentControllerTest.java
+++ b/src/test/java/com/yau/digitalrmb/payment/interfaces/rest/PaymentControllerTest.java
@@ -1,7 +1,7 @@
 package com.yau.digitalrmb.payment.interfaces.rest;
 
 import com.jayway.jsonpath.JsonPath;
-import com.yau.digitalrmb.exchange.infrastructure.crypto.WalletPrivateKeyCipher;
+import com.yau.digitalrmb.shared.wallet.WalletPrivateKeyCipher;
 import com.yau.digitalrmb.institutionidentity.application.InstitutionKeyService;
 import com.yau.digitalrmb.institutionidentity.application.InstitutionKeySubject;
 import com.yau.digitalrmb.institutionidentity.domain.InstitutionIdentityCryptography;