From e2ff28f8831356f6a0a9f383f2425302ca8c1179 Mon Sep 17 00:00:00 2001
From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com>
Date: Fri, 6 Sep 2024 10:27:25 +0200
Subject: [PATCH 01/16] feat: Manage Wallet from rewards management page -
 MEED-7380 - Meeds-io#154 (#553)

This PR will allow admin to Manage Wallet from rewards management page.
---
 .../locale/addon/Wallet_en.properties         |   7 +
 .../wallet-reward/components/RewardApp.vue    | 402 ++----------------
 .../components/reward/BudgetConfiguration.vue |  43 ++
 .../components/reward/CurrentBalance.vue      | 135 ++++++
 .../components/reward/RewardManagement.vue    |  37 ++
 .../vue-app/wallet-reward/initComponents.js   |   6 +
 6 files changed, 256 insertions(+), 374 deletions(-)
 create mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
 create mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue
 create mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardManagement.vue

diff --git a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
index 1f4532e04..33fd07988 100644
--- a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
+++ b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
@@ -494,6 +494,13 @@ wallet.administration.initialFundsMessagePlaceholder=Enter a default message to
 wallet.administration.apply=Apply
 wallet.administration.cancel=Cancel
 wallet.administration.reset=Reset
+wallet.administration.fundWallet=Fund Wallet
+wallet.administration.manageWallet=Manage wallet
+wallet.administration.budgetConfiguration=Budget Configuration
+wallet.administration.budgetConfiguration.setUp=Setup the Rewarding Budget
+wallet.administration.budgetConfiguration.setBudget=Set Budget
+wallet.administration.rewardManagement=Reward Management
+wallet.administration.rewardManagement.noContributionsYet=No contributions to reward yet
 
 wallet.overview.rewards.title=Wallet History
 wallet.overview.points=Points
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
index 1809918ea..bda65a548 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
@@ -1,382 +1,36 @@
 <!--
-This file is part of the Meeds project (https://meeds.io/).
-Copyright (C) 2022 Meeds Association
-contact@meeds.io
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 3 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 -->
 <template>
   <v-app
     id="RewardApp"
-    color="transaprent"
-    class="VuetifyApp"
     flat>
-    <main class="application-body">
-      <v-layout column>
-        <v-layout column class="application-toolbar">
-          <v-flex v-if="error && !loading" class="text-center">
-            <div class="alert alert-error text-start">
-              <i class="uiIconError"></i>{{ error }}
-            </div>
-          </v-flex>
-          <v-flex v-if="settingWarnings && settingWarnings.length && !loading" class=" text-center">
-            <div class="alert alert-warning text-start">
-              <i class="uiIconWarning"></i>
-              <span><a href="javascript:void(0);" @click="selectedTab = 2">{{ $t('exoplatform.wallet.label.pleaseCheckRewardConfiguration') }}</a></span>
-              <ul>
-                <li
-                  v-for="warning in settingWarnings"
-                  :key="warning"
-                  class="ps-2">
-                  - {{ warning }}
-                </li>
-              </ul>
-            </div>
-          </v-flex>
-
-          <v-flex v-if="duplicatedWallets && duplicatedWallets.length" class="text-center">
-            <div class="alert alert-warning">
-              <i class="uiIconWarning"></i> {{ $t('exoplatform.wallet.warning.poolMemberDuplicated') }}:
-              <ul>
-                <li v-for="duplicatedWallet in duplicatedWallets" :key="duplicatedWallet.id">
-                  <code>{{ duplicatedWallet.wallet.name }}</code>
-                </li>
-              </ul>
-            </div>
-          </v-flex>
-
-          <v-dialog
-            v-model="loading"
-            persistent
-            hide-overlay
-            width="300">
-            <v-card color="primary" dark>
-              <v-card-text>
-                {{ $t('exoplatform.wallet.label.loading') }} ...
-                <v-progress-linear
-                  indeterminate
-                  color="white"
-                  class="mb-0" />
-              </v-card-text>
-            </v-card>
-          </v-dialog>
-
-          <v-tabs
-            v-model="selectedTab"
-            slider-size="4">
-            <v-tab key="SendRewards" href="#SendRewards">
-              {{ $t('exoplatform.wallet.title.sendRewardsTab') }}
-            </v-tab>
-            <v-tab key="RewardPools" href="#RewardPools">
-              {{ $t('exoplatform.wallet.title.rewardPoolsTab') }}
-            </v-tab>
-            <v-tab key="Configuration" href="#Configuration">
-              {{ $t('exoplatform.wallet.title.rewardConfigurationTab') }}
-            </v-tab>
-          </v-tabs>
-      
-          <v-tabs-items v-model="selectedTab" class="tabs-content">
-            <v-tab-item
-              id="SendRewards"
-              value="SendRewards"
-              eager>
-              <wallet-reward-send-rewards-tab
-                ref="sendRewards"
-                :reward-report="rewardReport"
-                :admin-wallet="adminWallet"
-                :total-rewards="totalRewards"
-                :contract-details="contractDetails"
-                :period-dates-display="periodDatesDisplay"
-                :transaction-etherscan-link="transactionEtherscanLink"
-                :time-zone="timeZone"
-                @dates-changed="refreshRewards($event)"
-                @refresh="refreshRewards"
-                @error="error = $event" />
-            </v-tab-item>
-            <v-tab-item
-              id="RewardPools"
-              value="RewardPools"
-              eager>
-              <wallet-reward-teams-list-tab
-                ref="rewardTeams"
-                :teams="teams"
-                :wallet-rewards="walletRewards"
-                :period="period"
-                :period-dates-display="periodDatesDisplay"
-                :contract-details="contractDetails"
-                @refresh-teams="refreshRewardSettings"
-                @refresh="refreshRewardSettings"
-                @error="error = $event" />
-            </v-tab-item>
-            <v-tab-item
-              id="Configuration"
-              value="Configuration"
-              eager>
-              <wallet-reward-configuration-tab
-                ref="configurationTab"
-                @saved="refreshRewardSettings"
-                @error="error = $event" />
-            </v-tab-item>
-          </v-tabs-items>
-        </v-layout>
-      </v-layout>
-      <div id="walletDialogsParent">
-      </div>
-    </main>
+    <div class="d-flex flex-row">
+      <v-card
+        class="d-flex flex-column justify-space-between"
+        width="40%"
+        flat>
+        <wallet-current-balance />
+      </v-card>
+      <wallet-budget-configuration />
+    </div>
+    <wallet-reward-management />
   </v-app>
 </template>
-
-<script>
-export default {
-  data() {
-    return {
-      loading: false,
-      error: null,
-      rewardReport: null,
-      adminWallet: null,
-      settingWarnings: [],
-      selectedTab: 'SendRewards',
-      transactionEtherscanLink: null,
-      addressEtherscanLink: null,
-      contractDetails: null,
-      rewardSettings: {},
-      totalRewards: [],
-      teams: [],
-      period: null,
-    };
-  },
-  computed: {
-    duplicatedWallets() {
-      return (this.walletRewards && this.walletRewards.filter(walletReward => walletReward.teams && walletReward.teams.length > 1)) || [];
-    },
-    walletRewards() {
-      return (this.rewardReport && this.rewardReport.rewards) || [];
-    },
-    periodType() {
-      return this.rewardSettings && this.rewardSettings.periodType;
-    },
-    timeZone() {
-      return this.period?.timeZone || this.rewardSettings?.timeZone;
-    },
-    selectedDate() {
-      return this.period?.startDate.substring(0, 10) || new Date().toISOString().substring(0, 10);
-    },
-    dateformat() {
-      return this.timeZone && {
-        year: 'numeric',
-        month: 'short',
-        day: 'numeric',
-        hour: '2-digit',
-        minute: '2-digit',
-        timeZoneName: 'short',
-        timeZone: this.timeZone,
-      } || {
-        year: 'numeric',
-        month: 'short',
-        day: 'numeric',
-        hour: '2-digit',
-        minute: '2-digit',
-      };
-    },
-    periodDatesDisplay() {
-      if (!this.period) {
-        return '';
-      }
-      const startDateFormatted = this.$dateUtil.formatDateObjectToDisplay(new Date(this.period.startDateInSeconds * 1000), this.dateformat, eXo.env.portal.language);
-      const endDateFormatted = this.$dateUtil.formatDateObjectToDisplay(new Date(this.period.endDateInSeconds * 1000 - 1), this.dateformat, eXo.env.portal.language);
-      return `${startDateFormatted} ${this.$t('exoplatform.wallet.label.to')} ${endDateFormatted}`;
-    },
-  },
-  watch: {
-    rewardReport() {
-      this.period = this.rewardReport?.period;
-    },
-  },
-  created() {
-    this.init()
-      .then(() => {
-        this.transactionEtherscanLink = this.walletUtils.getTransactionEtherscanlink();
-        this.addressEtherscanLink = this.walletUtils.getAddressEtherscanlink();
-      });
-  },
-  methods: {
-    init() {
-      this.loading = true;
-
-      this.error = null;
-      return this.walletUtils.initSettings(false, true)
-        .then(() => {
-          if (!window.walletSettings) {
-            throw new Error(this.$t('exoplatform.wallet.error.emptySettings'));
-          }
-          this.contractDetails = window.walletSettings.contractDetail;
-
-          return this.addressRegistry.searchWalletByTypeAndId('admin', 'admin');
-        })
-        .then((adminWallet) => this.adminWallet = adminWallet)
-        .then(() => this.refreshRewardSettings())
-        .catch((e) => {
-          console.error  ('init method - error', e);
-          this.error = e ? String(e) : this.$t('exoplatform.wallet.error.unknownError');
-        })
-        .finally(() => {
-          this.loading = false;
-        });
-    },
-    refreshRewardSettings() {
-      this.loading = true;
-      return this.$rewardService.getRewardSettings()
-        .then(settings => this.rewardSettings = settings || {})
-        .then(() => this.$nextTick())
-        .then(() => this.$refs.configurationTab.init())
-        .then(() => this.refreshTeams())
-        .then(() => this.$nextTick())
-        .then(() => this.refreshRewards())
-        .finally(() => this.loading = false);
-    },
-    refreshRewards(period) {
-      if (!this.checkConfigurationConsistency()) {
-        return;
-      }
-
-      if (period) {
-        this.period = period;
-      }
-
-      this.loading = true;
-      return this.$rewardService.computeRewards(this.selectedDate)
-        .then(rewardReport => {
-          if (rewardReport.error) {
-            this.error = (typeof rewardReport.error === 'object' ? rewardReport.error[0] : rewardReport.error);
-            return;
-          }
-          this.rewardReport = rewardReport;
-          return this.$nextTick();
-        })
-        .then(() => {
-          this.computeTotalRewardsByPlugin();
-
-          // Watch pending transactions
-          this.walletRewards.forEach(walletReward => {
-            if (walletReward.status === 'pending') {
-              this.walletUtils.watchTransactionStatus(walletReward.transaction.hash, (transactionDetail) => {
-                walletReward.status = transactionDetail.succeeded ? 'success' : 'error';
-              });
-            }
-          });
-
-          // compute valid members per team
-          this.teams.forEach((team) => {
-            team.validMembersWallets = [];
-            team.computedBudget = 0;
-
-            if (team.id && team.members) {
-              team.members.forEach((memberObject) => {
-                const walletReward = this.walletRewards.find((walletReward) => walletReward.wallet && walletReward.wallet.id && walletReward.wallet.technicalId === memberObject.identityId);
-                if (walletReward && walletReward.enabled && walletReward.poolTokensToSend) {
-                  team.validMembersWallets.push(walletReward);
-                }
-              });
-            }
-          });
-
-          // Build 'No Team Members' team
-          const membersWithEmptyTeam = this.walletRewards.filter((walletReward) => !walletReward.team);
-          if (membersWithEmptyTeam && membersWithEmptyTeam.length) {
-            // Members with no Team
-            let noTeamMembers = this.teams.find(team => !team.id);
-            if (!noTeamMembers) {
-              noTeamMembers = {
-                id: 0,
-                name: this.$t('exoplatform.wallet.label.noPoolUsers'),
-                description: this.$t('exoplatform.wallet.label.noPoolUsersDescription'),
-                rewardType: 'COMPUTED',
-                computedBudget: 0,
-                noTeam: true,
-              };
-              this.teams.push(noTeamMembers);
-            }
-            noTeamMembers.members = membersWithEmptyTeam.map(walletReward => walletReward.wallet);
-            noTeamMembers.validMembersWallets = membersWithEmptyTeam.filter(walletReward => walletReward.enabled && walletReward.poolTokensToSend);
-          }
-
-          // Sort teams by order of creation
-          if (this.teams && this.teams.length) {
-            this.teams.sort((team1, team2) => Number(team1.id) - Number(team2.id));
-          }
-
-          // Compute Team total budgets
-          this.teams
-            .filter(team => team.validMembersWallets && team.validMembersWallets.length)
-            .forEach(team => {
-              team.computedBudget = team.validMembersWallets.reduce((total, walletReward) => total += walletReward.poolTokensToSend || 0, 0);
-            });
-        })
-        .finally(() => this.loading = false);
-    },
-    refreshTeams() {
-      return this.$rewardService.getRewardTeams()
-        .then(teams => this.teams = teams || [])
-        .catch((e) => {
-          console.error  ('Error getting teams list', e);
-          this.error = this.$t('exoplatform.wallet.error.errorRetrievingPool');
-        });
-    },
-    computeTotalRewardsByPlugin() {
-      const totalRewards = {};
-      if (this.rewardSettings && this.rewardSettings.pluginSettings && this.rewardSettings.pluginSettings.length) {
-        this.rewardSettings.pluginSettings.forEach(pluginSetting => totalRewards[pluginSetting.pluginId] = {pluginId: pluginSetting.pluginId, total: 0});
-      }
-
-      this.walletRewards.forEach(walletReward => {
-        if (walletReward && walletReward.rewards) {
-          walletReward.rewards.forEach(rewardDetail => totalRewards[rewardDetail.pluginId] && (totalRewards[rewardDetail.pluginId].total += rewardDetail.points));
-        }
-      });
-
-      this.totalRewards = Object.values(totalRewards);
-    },
-    checkConfigurationConsistency() {
-      this.settingWarnings = [];
-
-      if (!this.contractDetails) {
-        this.settingWarnings.push(this.$t('exoplatform.wallet.warning.noConfiguredToken'));
-      } else if (!this.periodType) {
-        this.settingWarnings.push(this.$t('exoplatform.wallet.warning.noConfiguredToken'));
-        this.settingWarnings.push(this.$t('exoplatform.wallet.warning.missingRewardPeriodicity'));
-      }
-
-      if (!this.rewardSettings) {
-        this.settingWarnings.push(this.$t('exoplatform.wallet.error.emptySettings'));
-      } else {
-        if (!this.rewardSettings.pluginSettings || !this.rewardSettings.pluginSettings.length) {
-          this.settingWarnings.push(this.$t('exoplatform.wallet.warning.noPluginConfiguration'));
-        } else {
-          this.rewardSettings.pluginSettings.forEach(pluginSetting => {
-            if (pluginSetting && !pluginSetting.budgetType) {
-              this.settingWarnings.push(this.$t('exoplatform.wallet.warning.noRewardBudgetConfiguredForPlugin', {0: pluginSetting.pluginId}));
-            }
-          });
-        }
-      }
-
-      return !this.settingWarnings.length;
-    },
-    formatDate(date) {
-      if (!date) {
-        return null;
-      }
-      return date.toLocaleDateString(eXo.env.portal.language);
-    },
-  },
-};
-</script>
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
new file mode 100644
index 000000000..dd54d856e
--- /dev/null
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
@@ -0,0 +1,43 @@
+<!--
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-card
+    class="border-radius border-color my-5 me-5"
+    width="60%"
+    flat>
+    <div class="d-flex flex-column flex-grow-1">
+      <div class="text-header text-wrap px-4 pb-0 pt-3 mt-auto mb-2">
+        {{ $t('wallet.administration.budgetConfiguration') }}
+      </div>
+      <v-spacer />
+      <div class="d-flex flex-column align-center justify-center full-width full-height pt-5">
+        <v-icon color="orange darken-2" size="50">fas fa-coins</v-icon>
+        <span class="mt-5">{{ $t('wallet.administration.budgetConfiguration.setUp') }}</span>
+      </div>
+      <v-btn
+        class="btn btn-primary align-self-center my-4 px-2">
+        <span class="mx-2">
+          {{ $t('wallet.administration.budgetConfiguration.setBudget') }}
+        </span>
+      </v-btn>
+    </div>
+  </v-card>
+</template>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue
new file mode 100644
index 000000000..90acb3f2b
--- /dev/null
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue
@@ -0,0 +1,135 @@
+<!--
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-card
+    :loading="loading"
+    class="border-radius border-color ma-5"
+    flat>
+    <div class="d-flex flex-column flex-grow-1">
+      <v-list-item dense>
+        <v-list-item-content>
+          <v-list-item-title class="text-header text-wrap">
+            {{ $t('exoplatform.wallet.label.currentBalance') }}
+          </v-list-item-title>
+        </v-list-item-content>
+        <v-list-item-action v-if="useWalletAdmin" class="ma-auto">
+          <v-tooltip
+            :disabled="$root.isMobile"
+            bottom>
+            <template #activator="{ on }">
+              <div v-on="on">
+                <v-btn
+                  :href="walletAdminUri"
+                  :aria-label="$t('wallet.administration.manageWallet')"
+                  target="_blank"
+                  small
+                  icon>
+                  <v-icon size="18">fas fa-credit-card</v-icon>
+                </v-btn>
+              </div>
+            </template>
+            <span> {{ $t('wallet.administration.manageWallet') }}</span>
+          </v-tooltip>
+        </v-list-item-action>
+      </v-list-item>
+      <v-btn
+        v-if="!loading && !useWalletAdmin"
+        :href="walletAdminUri"
+        class="btn btn-primary align-self-center my-4 px-2">
+        <span class="mx-2">
+          {{ $t('wallet.administration.fundWallet') }}
+        </span>
+      </v-btn>
+      <template v-else>
+        <v-list-item dense>
+          <v-list-item-content>
+            <v-list-item-title class="text-wrap">
+              {{ tokenName }}
+            </v-list-item-title>
+          </v-list-item-content>
+          <v-list-item-action class="d-inline-block ma-auto pe-1">
+            <span class="symbol fundsLabels"> {{ tokenSymbol }} </span> <span class="fundsLabels"> {{ tokenBalance }} </span>
+          </v-list-item-action>
+        </v-list-item>
+        <v-list-item dense>
+          <v-list-item-content>
+            <v-list-item-title class="text-wrap">
+              {{ $t('wallet.administration.gas') }}
+            </v-list-item-title>
+          </v-list-item-content>
+          <v-list-item-action class="ma-auto pe-1">
+            {{ etherBalanceLabel }}
+          </v-list-item-action>
+        </v-list-item>
+      </template>
+    </div>
+  </v-card>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      loading: false,
+      adminWallet: null,
+      contractDetails: null,
+      walletAdminUri: '/portal/administration/home/rewards/wallet',
+    };
+  },
+  computed: {
+    tokenName() {
+      return this.contractDetails?.name;
+    },
+    tokenSymbol() {
+      return this.contractDetails?.symbol;
+    },
+    tokenBalance() {
+      return this.adminWallet?.tokenBalance || 0;
+    },
+    etherBalance() {
+      return this.adminWallet?.etherBalance || 0;
+    },
+    etherBalanceLabel() {
+      return `${this.contractDetails?.cryptocurrency} ${this.walletUtils?.toFixed(this.etherBalance)}`;
+    },
+    useWalletAdmin() {
+      return this.etherBalance && Number(this.etherBalance) >= 0.002 && this.tokenBalance && Number(this.tokenBalance) >= 0.02;
+    },
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    init() {
+      this.loading = true;
+      this.error = null;
+      return this.walletUtils.initSettings(false, true)
+        .then(() => {
+          this.contractDetails = window.walletSettings.contractDetail;
+          return this.addressRegistry.searchWalletByTypeAndId('admin', 'admin');
+        })
+        .then((adminWallet) => this.adminWallet = adminWallet)
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+  }
+};
+</script>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardManagement.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardManagement.vue
new file mode 100644
index 000000000..3861414e5
--- /dev/null
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardManagement.vue
@@ -0,0 +1,37 @@
+<!--
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <div class="mx-5">
+    <div class="pt-6 text-title">{{ $t('wallet.administration.rewardManagement') }}</div>
+    <div class="pt-8 d-flex align-center justify-center">
+      <v-icon
+        color="orange darken-2"
+        size="50">
+        fa-money-bill
+      </v-icon>
+    </div>
+    <div class="d-flex flex-column justify-center align-center pb-8 pt-3 col-sm-8 mx-auto">
+      <p class="text-header mb-8">
+        {{ $t('wallet.administration.rewardManagement.noContributionsYet') }}
+      </p>
+    </div>
+  </div>
+</template>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js
index d203667e5..50b9e23d4 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js
@@ -1,4 +1,7 @@
 import RewardApp from './components/RewardApp.vue';
+import RewardManagement from './components/reward/RewardManagement.vue';
+import CurrentBalance from './components/reward/CurrentBalance.vue';
+import BudgetConfiguration from './components/reward/BudgetConfiguration.vue';
 import RewardDetailModal from './components/reward/modal/RewardDetailModal.vue';
 import TimeZoneSelectBox from './components/reward/TimeZoneSelectBox.vue';
 import ConfigurationTab from './components/reward/ConfigurationTab.vue';
@@ -8,6 +11,9 @@ import TeamsListTab from './components/reward/TeamsListTab.vue';
 
 const components = {
   'wallet-reward-app': RewardApp,
+  'wallet-reward-management': RewardManagement,
+  'wallet-current-balance': CurrentBalance,
+  'wallet-budget-configuration': BudgetConfiguration,
   'wallet-reward-reward-detail-modal': RewardDetailModal,
   'wallet-reward-timezone-selectbox': TimeZoneSelectBox,
   'wallet-reward-configuration-tab': ConfigurationTab,

From bc43fd898b8dfb726b977488362438ec36ac97dc Mon Sep 17 00:00:00 2001
From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com>
Date: Wed, 11 Sep 2024 16:09:12 +0200
Subject: [PATCH 02/16] feat: Suggest to create a rewarding  budget - MEED-7379
 - Meeds-io/MIPs#154 (#554)

Ability for rewarding admin to create/update reward budget
---
 pom.xml                                       |  11 +-
 .../wallet/model/reward/RewardPeriod.java     |   2 +-
 .../wallet/model/reward/RewardSettings.java   |  23 +-
 .../model/reward/WalletPluginReward.java      |   3 -
 .../wallet/model/reward/WalletReward.java     |   8 -
 .../reward/rest/RewardSettingsREST.java       |   2 +-
 .../reward/service/RewardReportService.java   |   2 +
 .../reward/service/RewardSettingsService.java |  33 +-
 wallet-reward-services/pom.xml                |  30 +-
 .../entity/WalletRewardPluginEntity.java      |  23 -
 .../RewardSuccessNotificationPlugin.java      |  17 +-
 .../service/WalletRewardReportService.java    | 303 ++----
 .../service/WalletRewardSettingsService.java  |  85 +-
 .../storage/WalletRewardReportStorage.java    |   7 +-
 .../portal/wallet-reward-configuration.xml    |  14 -
 .../wallet/reward/BaseRewardTest.java         |  64 ++
 .../wallet/reward/BaseWalletRewardTest.java   |  30 -
 .../reward/job/WalletRewardJobTest.java       |  40 +-
 .../RewardSuccessNotificationPluginTest.java  |  62 +-
 .../RewardSuccessTemplateBuilderTest.java     |  60 +-
 .../RewardSuccessTemplateProviderTest.java    |  46 +-
 .../WalletRewardReportServiceTest.java        | 937 ++----------------
 .../WalletRewardSettingsServiceTest.java      | 172 +---
 .../conf/test-wallet-reward-configuration.xml | 134 ---
 .../src/main/resources/jpa-entities.idx       |   6 +
 .../locale/addon/Wallet_en.properties         |  31 +
 wallet-webapps/pom.xml                        |   6 +
 .../io/meeds/wallet/WalletApplication.java    |  43 +
 .../vue-app/wallet-common/js/RewardService.js |   3 +-
 .../wallet-reward/components/RewardApp.vue    |  59 +-
 .../components/reward/BudgetConfiguration.vue | 185 +++-
 .../reward/BudgetConfigurationDrawer.vue      | 236 +++++
 .../components/reward/ConfigurationTab.vue    | 243 -----
 .../components/reward/CurrentBalance.vue      |   9 +-
 .../reward/DistributionForecast.vue           | 114 +++
 .../components/reward/SendRewardsTab.vue      | 520 ----------
 .../components/reward/TeamForm.vue            | 551 ----------
 .../components/reward/TeamsListTab.vue        | 341 -------
 .../components/reward/TimeZoneSelectBox.vue   |  32 +-
 .../reward/modal/RewardDetailModal.vue        | 110 --
 .../vue-app/wallet-reward/initComponents.js   |  14 +-
 41 files changed, 1147 insertions(+), 3464 deletions(-)
 create mode 100644 wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/BaseRewardTest.java
 create mode 100644 wallet-services/src/main/resources/jpa-entities.idx
 create mode 100644 wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java
 create mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfigurationDrawer.vue
 delete mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/ConfigurationTab.vue
 create mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/DistributionForecast.vue
 delete mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/SendRewardsTab.vue
 delete mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TeamForm.vue
 delete mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TeamsListTab.vue
 delete mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/modal/RewardDetailModal.vue

diff --git a/pom.xml b/pom.xml
index db35025f5..ea471ce6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <org.exoplatform.wallet.ert-contract.version>1.3.0</org.exoplatform.wallet.ert-contract.version>
     <io.meeds.platform-ui.version>7.0.x-meed-SNAPSHOT</io.meeds.platform-ui.version>
     <addon.meeds.analytics.version>7.0.x-meed-SNAPSHOT</addon.meeds.analytics.version>
-    <!-- Sonar properties -->
+    <addon.meeds.gamification.version>7.0.x-meed-SNAPSHOT</addon.meeds.gamification.version>
+      <!-- Sonar properties -->
     <sonar.organization>meeds-io</sonar.organization>
   </properties>
   <dependencyManagement>
@@ -71,7 +72,13 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-
+      <dependency>
+        <groupId>io.meeds.gamification</groupId>
+        <artifactId>gamification</artifactId>
+        <version>${addon.meeds.gamification.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>io.meeds.analytics</groupId>
         <artifactId>analytics-parent</artifactId>
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPeriod.java b/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPeriod.java
index 9f91400cf..f5bf8bf5e 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPeriod.java
+++ b/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPeriod.java
@@ -62,7 +62,7 @@ public static RewardPeriod getCurrentPeriod(RewardSettings rewardSettings) {
 
   public static RewardPeriod getPeriodOfTime(RewardSettings rewardSettings, LocalDate date) {
     ZoneId zoneId = rewardSettings == null ? ZoneId.systemDefault() : rewardSettings.zoneId();
-    RewardPeriodType rewardPeriodType = null;
+    RewardPeriodType rewardPeriodType;
     if (rewardSettings == null || rewardSettings.getPeriodType() == null) {
       rewardPeriodType = RewardPeriodType.DEFAULT;
     } else {
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardSettings.java b/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardSettings.java
index 94afb6ca5..9ca4aa111 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardSettings.java
+++ b/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardSettings.java
@@ -18,8 +18,6 @@
 
 import java.io.Serializable;
 import java.time.ZoneId;
-import java.util.HashSet;
-import java.util.Set;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -29,13 +27,20 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class RewardSettings implements Serializable, Cloneable {
-  private static final long         serialVersionUID = -8650247964730374760L;
 
-  private RewardPeriodType          periodType       = RewardPeriodType.DEFAULT;
+  private static final long serialVersionUID = -8650247964730374760L;
 
-  private String                    timeZone         = ZoneId.systemDefault().getId();
+  private RewardPeriodType  periodType       = RewardPeriodType.DEFAULT;
 
-  private Set<RewardPluginSettings> pluginSettings;
+  private String            timeZone         = ZoneId.systemDefault().getId();
+
+  private RewardBudgetType  budgetType       = RewardBudgetType.DEFAULT;;
+
+  private double            threshold;
+
+  private double            amount;
+
+  private boolean           storedSetting;
 
   public ZoneId zoneId() {
     return ZoneId.of(timeZone);
@@ -46,11 +51,7 @@ public RewardSettings clone() { // NOSONAR
     try {
       return (RewardSettings) super.clone();
     } catch (CloneNotSupportedException e) {
-      @SuppressWarnings("unchecked")
-      Set<RewardPluginSettings> clonedPluginSettings =
-                                                     pluginSettings == null ? null
-                                                                            : (Set<RewardPluginSettings>) new HashSet<>(pluginSettings).clone();
-      return new RewardSettings(periodType, timeZone, clonedPluginSettings);
+      return new RewardSettings(periodType, timeZone, budgetType, threshold, amount, storedSetting);
     }
   }
 }
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/WalletPluginReward.java b/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/WalletPluginReward.java
index c6e9dd977..8b402b750 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/WalletPluginReward.java
+++ b/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/WalletPluginReward.java
@@ -31,9 +31,6 @@ public class WalletPluginReward implements Serializable {
 
   private long              identityId;
 
-  @Exclude
-  private boolean           poolsUsed;
-
   @Exclude
   private double            points;
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/WalletReward.java b/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/WalletReward.java
index 71ea0baf0..31c5ff541 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/WalletReward.java
+++ b/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/WalletReward.java
@@ -107,12 +107,4 @@ public double getTokensToSend() {
       return rewards.stream().mapToDouble(WalletPluginReward::getAmount).sum();
     }
   }
-
-  public double getPoolTokensToSend() {
-    if (rewards == null || rewards.isEmpty()) {
-      return 0;
-    } else {
-      return rewards.stream().filter(WalletPluginReward::isPoolsUsed).mapToDouble(WalletPluginReward::getAmount).sum();
-    }
-  }
 }
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/reward/rest/RewardSettingsREST.java b/wallet-api/src/main/java/org/exoplatform/wallet/reward/rest/RewardSettingsREST.java
index 94c41c1ff..c0ee598cc 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/reward/rest/RewardSettingsREST.java
+++ b/wallet-api/src/main/java/org/exoplatform/wallet/reward/rest/RewardSettingsREST.java
@@ -77,7 +77,7 @@ public RewardSettingsREST(RewardSettingsService rewardSettingsService) {
   public Response getSettings() {
     try {
       RewardSettings settings = rewardSettingsService.getSettings();
-      return Response.ok(settings == null ? new RewardSettings() : settings).build();
+      return Response.ok(settings).build();
     } catch (Exception e) {
       LOG.error("Error getting reward settings", e);
       return Response.serverError().build();
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardReportService.java b/wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardReportService.java
index 4bb6fbbeb..d2eb21eb1 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardReportService.java
+++ b/wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardReportService.java
@@ -20,12 +20,14 @@
 import java.util.List;
 import java.util.Set;
 
+import org.springframework.stereotype.Service;
 import org.exoplatform.social.core.identity.model.Identity;
 import org.exoplatform.wallet.model.reward.*;
 
 /**
  * A storage service to save/load reward settings
  */
+@Service
 public interface RewardReportService {
 
   /**
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardSettingsService.java b/wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardSettingsService.java
index 977e8525d..c2591c307 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardSettingsService.java
+++ b/wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardSettingsService.java
@@ -16,51 +16,26 @@
  */
 package org.exoplatform.wallet.reward.service;
 
-import java.util.Collection;
 
+import org.springframework.stereotype.Service;
 import org.exoplatform.wallet.model.reward.RewardSettings;
-import org.exoplatform.wallet.reward.api.RewardPlugin;
 
 /**
  * A storage service to save/load reward transactions
  */
+@Service
 public interface RewardSettingsService {
 
   /**
    * @return the reward settings
    */
-  public RewardSettings getSettings();
+  RewardSettings getSettings();
 
   /**
    * Save reward settings
    * 
    * @param rewardSettingsToStore reward settings object
    */
-  public void saveSettings(RewardSettings rewardSettingsToStore);
-
-  /**
-   * @return configured reward settings plugins
-   */
-  public Collection<RewardPlugin> getRewardPlugins();
-
-  /**
-   * @param pluginId reward plugin id
-   * @return configured reward plugin identified by an id
-   */
-  public RewardPlugin getRewardPlugin(String pluginId);
-
-  /**
-   * Registers a reward plugin
-   * 
-   * @param rewardPlugin reward component plugin
-   */
-  public void registerPlugin(RewardPlugin rewardPlugin);
-
-  /**
-   * Removes a previously registered reward plugin
-   * 
-   * @param pluginId
-   */
-  void unregisterPlugin(String pluginId);
+  void saveSettings(RewardSettings rewardSettingsToStore);
 
 }
diff --git a/wallet-reward-services/pom.xml b/wallet-reward-services/pom.xml
index ffbdfb230..703c89b95 100644
--- a/wallet-reward-services/pom.xml
+++ b/wallet-reward-services/pom.xml
@@ -25,7 +25,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <artifactId>wallet-reward-services</artifactId>
   <name>Meeds:: Add-on:: Wallet - Reward Services</name>
   <properties>
-    <exo.test.coverage.ratio>0.82</exo.test.coverage.ratio>
+    <exo.test.coverage.ratio>0.18</exo.test.coverage.ratio>
   </properties>
   <dependencies>
     <dependency>
@@ -53,11 +53,39 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <artifactId>analytics-api</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>io.meeds.gamification</groupId>
+      <artifactId>gamification-services</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- Test dependencies -->
+    <dependency>
+      <groupId>io.meeds.social</groupId>
+      <artifactId>social-component-service</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>io.meeds.social</groupId>
       <artifactId>social-component-notification</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.vaadin.external.google</groupId>
+          <artifactId>android-json</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.meeds.gamification</groupId>
+      <artifactId>gamification-services</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/WalletRewardPluginEntity.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/WalletRewardPluginEntity.java
index 8040f350b..87ffb40ae 100644
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/WalletRewardPluginEntity.java
+++ b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/WalletRewardPluginEntity.java
@@ -27,7 +27,6 @@
 @Table(name = "ADDONS_WALLET_REWARD_PLUGIN")
 @NamedQueries({
     @NamedQuery(name = "RewardPlugin.getRewardPluginsByRewardId", query = "SELECT rp FROM RewardPlugin rp WHERE rp.reward.id = :rewardId"),
-    @NamedQuery(name = "RewardPlugin.getRewardPluginsByRewardIdAndPluginId", query = "SELECT rp FROM RewardPlugin rp WHERE rp.reward.id = :rewardId AND rp.pluginId = :pluginId"),
 })
 public class WalletRewardPluginEntity implements Serializable {
 
@@ -39,12 +38,6 @@ public class WalletRewardPluginEntity implements Serializable {
   @Column(name = "REWARD_PLUGIN_ID")
   private Long               id;
 
-  @Column(name = "PLUGIN_ID")
-  private String             pluginId;
-
-  @Column(name = "POOL_USED")
-  private boolean            poolUsed;
-
   @Column(name = "POINTS")
   private double             points;
 
@@ -63,22 +56,6 @@ public void setId(Long id) {
     this.id = id;
   }
 
-  public String getPluginId() {
-    return pluginId;
-  }
-
-  public void setPluginId(String pluginId) {
-    this.pluginId = pluginId;
-  }
-
-  public boolean isPoolUsed() {
-    return poolUsed;
-  }
-
-  public void setPoolUsed(boolean poolUsed) {
-    this.poolUsed = poolUsed;
-  }
-
   public double getPoints() {
     return points;
   }
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPlugin.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPlugin.java
index 140ba7310..1bcafbc66 100644
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPlugin.java
+++ b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPlugin.java
@@ -31,8 +31,17 @@
 import org.exoplatform.wallet.model.ContractDetail;
 import org.exoplatform.wallet.model.reward.RewardPeriod;
 import org.exoplatform.wallet.model.reward.RewardReport;
+import org.exoplatform.wallet.model.settings.GlobalSettings;
+import org.exoplatform.wallet.service.WalletService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
+@Component
 public class RewardSuccessNotificationPlugin extends BaseNotificationPlugin {
+
+  @Autowired
+  protected WalletService walletService;
+
   private static final Log LOG = ExoLogger.getLogger(RewardSuccessNotificationPlugin.class);
 
   public RewardSuccessNotificationPlugin(InitParams initParams) {
@@ -60,11 +69,15 @@ protected NotificationInfo makeNotification(NotificationContext ctx) {
       LOG.error("Error making notification of reward report " + rewardReport, e);
       return null;
     }
-    if (recipients == null || recipients.isEmpty()) {
+    if (recipients.isEmpty()) {
       return null;
     }
 
-    ContractDetail contractDetail = getContractDetail();
+    GlobalSettings globalSettings = walletService.getSettings();
+    if (globalSettings == null || globalSettings.getContractDetail() == null) {
+      return null;
+    }
+    ContractDetail contractDetail = globalSettings.getContractDetail();
     RewardPeriod period = rewardReport.getPeriod();
 
     return NotificationInfo.instance()
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardReportService.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardReportService.java
index aff317b80..0f0cf1f92 100644
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardReportService.java
+++ b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardReportService.java
@@ -18,7 +18,6 @@
 
 import static org.exoplatform.wallet.utils.RewardUtils.REWARD_TRANSACTION_LABEL_KEY;
 import static org.exoplatform.wallet.utils.RewardUtils.REWARD_TRANSACTION_NO_POOL_MESSAGE_KEY;
-import static org.exoplatform.wallet.utils.RewardUtils.REWARD_TRANSACTION_WITH_POOL_MESSAGE_KEY;
 import static org.exoplatform.wallet.utils.RewardUtils.TRANSACTION_STATUS_PENDING;
 import static org.exoplatform.wallet.utils.RewardUtils.TRANSACTION_STATUS_SUCCESS;
 import static org.exoplatform.wallet.utils.RewardUtils.formatTime;
@@ -33,20 +32,11 @@
 import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import io.meeds.gamification.service.RealizationService;
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.utils.CommonsUtils;
@@ -59,7 +49,6 @@
 import org.exoplatform.wallet.model.reward.RewardBudgetType;
 import org.exoplatform.wallet.model.reward.RewardPeriod;
 import org.exoplatform.wallet.model.reward.RewardPeriodType;
-import org.exoplatform.wallet.model.reward.RewardPluginSettings;
 import org.exoplatform.wallet.model.reward.RewardReport;
 import org.exoplatform.wallet.model.reward.RewardSettings;
 import org.exoplatform.wallet.model.reward.RewardStatus;
@@ -68,45 +57,47 @@
 import org.exoplatform.wallet.model.reward.WalletPluginReward;
 import org.exoplatform.wallet.model.reward.WalletReward;
 import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.reward.api.RewardPlugin;
 import org.exoplatform.wallet.reward.storage.WalletRewardReportStorage;
 import org.exoplatform.wallet.service.WalletAccountService;
 import org.exoplatform.wallet.service.WalletTokenAdminService;
 
 import lombok.Setter;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
 
 /**
  * A service to manage reward reports
  */
+@Service
+@Primary
 public class WalletRewardReportService implements RewardReportService {
 
   private static final Log                LOG            = ExoLogger.getLogger(WalletRewardReportService.class);
 
   private static final String             EMPTY_SETTINGS = "Error computing rewards using empty settings";
 
-  private final WalletAccountService      walletAccountService;
+  @Autowired
+  private WalletAccountService      walletAccountService;
 
+  @Autowired
   private WalletTokenAdminService         walletTokenAdminService;
 
-  private final RewardSettingsService     rewardSettingsService;
+  @Autowired
+  private RewardSettingsService     rewardSettingsService;
 
-  private final RewardTeamService         rewardTeamService;
+  @Autowired
+  private RewardTeamService         rewardTeamService;
 
-  private final WalletRewardReportStorage rewardReportStorage;
+  @Autowired
+  private WalletRewardReportStorage rewardReportStorage;
+
+  @Autowired
+  private RealizationService        realizationService;
 
   @Setter
   private boolean                         rewardSendingInProgress;
 
-  public WalletRewardReportService(WalletAccountService walletAccountService,
-                                   RewardSettingsService rewardSettingsService,
-                                   RewardTeamService rewardTeamService,
-                                   WalletRewardReportStorage rewardReportStorage) {
-    this.walletAccountService = walletAccountService;
-    this.rewardSettingsService = rewardSettingsService;
-    this.rewardTeamService = rewardTeamService;
-    this.rewardReportStorage = rewardReportStorage;
-  }
-
   @Override
   public void sendRewards(LocalDate date, String username) throws Exception { // NOSONAR
     if (!isUserRewardingAdmin(username)) {
@@ -117,7 +108,7 @@ public void sendRewards(LocalDate date, String username) throws Exception { // N
       throw new IllegalStateException("Can't send rewards for current period");
     }
 
-    if (rewardReport == null || rewardReport.getRewards() == null || rewardReport.getRewards().isEmpty()) {
+    if (rewardReport.getRewards() == null || rewardReport.getRewards().isEmpty()) {
       return;
     }
 
@@ -226,7 +217,10 @@ public RewardReport computeRewards(LocalDate date) {
   @Override
   public RewardReport computeRewardsByUser(LocalDate date, long userIdentityId) {
     RewardReport rewardReport = computeRewards(date);
-    Set<WalletReward> rewards = rewardReport.getRewards().stream().filter(reward -> reward.getIdentityId() == userIdentityId).collect(Collectors.toSet());
+    Set<WalletReward> rewards = rewardReport.getRewards()
+                                            .stream()
+                                            .filter(reward -> reward.getIdentityId() == userIdentityId)
+                                            .collect(Collectors.toSet());
     rewardReport.setRewards(rewards);
     return rewardReport;
   }
@@ -236,7 +230,7 @@ public RewardReport getRewardReportByPeriodId(long periodId) {
     RewardSettings rewardSettings = rewardSettingsService.getSettings();
     return rewardReportStorage.getRewardReportByPeriodId(periodId, rewardSettings.zoneId());
   }
-  
+
   @Override
   public RewardReport getRewardReport(LocalDate date) {
     RewardSettings rewardSettings = rewardSettingsService.getSettings();
@@ -247,9 +241,7 @@ public RewardReport getRewardReport(LocalDate date) {
       throw new IllegalStateException("Error computing rewards using empty period type");
     }
 
-    return rewardReportStorage.getRewardReport(rewardSettings.getPeriodType(),
-                                               date,
-                                               rewardSettings.zoneId());
+    return rewardReportStorage.getRewardReport(rewardSettings.getPeriodType(), date, rewardSettings.zoneId());
   }
 
   @Override
@@ -320,28 +312,18 @@ private RewardPeriod getRewardPeriod(LocalDate date) {
 
   private void computeRewardDetails(RewardReport rewardReport, Set<Wallet> wallets) {
     // Get te list of enabled reward plugins
-    Map<RewardPlugin, RewardPluginSettings> rewardPlugins = getEnabledRewardPlugins();
     RewardPeriod period = rewardReport.getPeriod();
     Set<WalletReward> walletRewards = retrieveWalletRewards(rewardReport, wallets);
     Set<WalletReward> enabledRewards = walletRewards.stream().filter(WalletReward::isEnabled).collect(Collectors.toSet());
-    Set<WalletReward> enabledTeamRewards = enabledRewards.stream()
-                                                         .filter(wr -> wr.getTeam() == null || !wr.getTeam().isDisabled())
-                                                         .collect(Collectors.toSet());
 
     // Compute rewards per plugin
     Set<WalletPluginReward> walletRewardsByPlugin = new HashSet<>();
-    for (Map.Entry<RewardPlugin, RewardPluginSettings> pluginEntry : rewardPlugins.entrySet()) {
-      RewardPlugin plugin = pluginEntry.getKey();
-      RewardPluginSettings pluginSettings = pluginEntry.getValue();
+    RewardSettings rewardSettings = rewardSettingsService.getSettings();
 
-      Set<Long> identityIds = walletRewards.stream().map(WalletReward::getIdentityId).collect(Collectors.toSet());
-      Map<Long, Double> earnedPoints = plugin.getEarnedPoints(identityIds,
-                                                              period.getStartDateInSeconds(),
-                                                              period.getEndDateInSeconds());
+    Set<Long> identityIds = walletRewards.stream().map(WalletReward::getIdentityId).collect(Collectors.toSet());
+    Map<Long, Double> earnedPoints = getEarnedPoints(identityIds, period.getStartDateInSeconds(), period.getEndDateInSeconds());
 
-      Set<WalletReward> validWalletRewards = pluginSettings.isUsePools() ? enabledTeamRewards : enabledRewards;
-      computeReward(pluginSettings, earnedPoints, validWalletRewards, walletRewardsByPlugin);
-    }
+    computeReward(rewardSettings, earnedPoints, enabledRewards, walletRewardsByPlugin);
 
     // Assign rewards objects for each wallet,a wallet can have multiple rewards
     // one per plugin
@@ -354,6 +336,24 @@ private void computeRewardDetails(RewardReport rewardReport, Set<Wallet> wallets
     }
   }
 
+  private Map<Long, Double> getEarnedPoints(Set<Long> identityIds, long startDateInSeconds, long endDateInSeconds) {
+    HashMap<Long, Double> earnedPoints = new HashMap<>();
+    if (identityIds == null || identityIds.isEmpty()) {
+      return earnedPoints;
+    }
+    Date startDate = new Date(startDateInSeconds * 1000);
+    Date endDate = new Date(endDateInSeconds * 1000);
+    Map<Long, Long> points = new HashMap<>();
+    try {
+      points = realizationService.getScoresByIdentityIdsAndBetweenDates(identityIds.stream().map(Object::toString).toList(),
+                                                                        startDate,
+                                                                        endDate);
+    } catch (Exception e) {
+      LOG.warn("Error getting points for user with ids {}", identityIds, e);
+    }
+    return points.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().doubleValue()));
+  }
+
   private Set<WalletReward> retrieveWalletRewards(RewardReport rewardReport, Set<Wallet> wallets) {
     Set<WalletReward> walletRewards = rewardReport.getRewards();
     if (walletRewards == null) {
@@ -367,15 +367,11 @@ private Set<WalletReward> retrieveWalletRewards(RewardReport rewardReport, Set<W
                                                          .filter(wr -> wallet != null && wr.getWallet() != null
                                                              && wr.getIdentityId() == wallet.getTechnicalId())
                                                          .toList();
-      WalletReward walletReward = walletRewardList.stream().filter(r -> r.getTransaction() != null).sorted((r2, r1) -> {
-        if (r1.getTokensSent() > r2.getTokensSent()) {
-          return 1;
-        } else if (r2.getTokensSent() > r1.getTokensSent()) {
-          return -1;
-        } else {
-          return 0;
-        }
-      }).findFirst().orElseGet(() -> walletRewardList.isEmpty() ? null : walletRewardList.get(0));
+      WalletReward walletReward =
+                                walletRewardList.stream()
+                                                .filter(r -> r.getTransaction() != null)
+                                                .min((r2, r1) -> Double.compare(r1.getTokensSent(), r2.getTokensSent()))
+                                                .orElseGet(() -> walletRewardList.isEmpty() ? null : walletRewardList.getFirst());
       if (walletReward == null) {
         walletReward = new WalletReward();
         walletRewards.add(walletReward);
@@ -390,101 +386,62 @@ private Set<WalletReward> retrieveWalletRewards(RewardReport rewardReport, Set<W
     return walletRewards;
   }
 
-  private Map<RewardPlugin, RewardPluginSettings> getEnabledRewardPlugins() {
-    RewardSettings rewardSettings = rewardSettingsService.getSettings();
-    final Set<RewardPluginSettings> pluginSettings = rewardSettings.getPluginSettings()
-                                                                   .stream()
-                                                                   .filter(RewardPluginSettings::isEnabled)
-                                                                   .collect(Collectors.toSet());
-    Collection<RewardPlugin> rewardPlugins = rewardSettingsService.getRewardPlugins();
-    return rewardPlugins.stream()
-                        .filter(RewardPlugin::isEnabled)
-                        .filter(rewardPlugin -> getPluginSetting(pluginSettings, rewardPlugin.getPluginId()) != null)
-                        .collect(Collectors.toMap(Function.identity(),
-                                                  rewardPlugin -> getPluginSetting(pluginSettings, rewardPlugin.getPluginId())));
-  }
-
-  private RewardPluginSettings getPluginSetting(Set<RewardPluginSettings> pluginSettings, String pluginId) {
-    for (RewardPluginSettings rewardPluginSettings : pluginSettings) {
-      if (StringUtils.equals(pluginId, rewardPluginSettings.getPluginId())) {
-        return rewardPluginSettings;
-      }
-    }
-    return null;
-  }
-
-  private void computeReward(RewardPluginSettings rewardPluginSettings,
+  private void computeReward(RewardSettings rewardSettings,
                              Map<Long, Double> earnedPoints,
                              Set<WalletReward> enabledRewards,
                              Set<WalletPluginReward> rewardMemberDetails) {
-    RewardBudgetType budgetType = rewardPluginSettings.getBudgetType();
+    RewardBudgetType budgetType = rewardSettings.getBudgetType();
     if (budgetType == null) {
-      LOG.warn("Budget type of reward plugin {} is empty, thus no computing is possible", rewardPluginSettings.getPluginId());
+      LOG.warn("Budget type of reward is empty, thus no computing is possible");
       return;
     }
-    String pluginId = rewardPluginSettings.getPluginId();
-    double configuredPluginAmount = rewardPluginSettings.getAmount();
+    double configuredPluginAmount = rewardSettings.getAmount();
     if (configuredPluginAmount < 0) {
-      throw new IllegalStateException("Plugin " + pluginId + " has a configured negative reward amount (" + configuredPluginAmount
-          + ")");
+      throw new IllegalStateException("reward amount has a configured negative (" + configuredPluginAmount + ")");
     }
 
     Set<Long> validIdentityIdsToUse = enabledRewards.stream().map(WalletReward::getIdentityId).collect(Collectors.toSet());
-    // Filter non elligible users switch threshold
-    filterElligibleMembers(earnedPoints.entrySet(), validIdentityIdsToUse, rewardPluginSettings, rewardMemberDetails);
+    // Filter non-eligible users switch threshold
+    filterEligibleMembers(earnedPoints.entrySet(), validIdentityIdsToUse, rewardSettings, rewardMemberDetails);
 
-    double amountPerPoint = 0;
-    double totalFixedBudget = 0;
+    double amountPerPoint;
+    double totalFixedBudget;
     switch (budgetType) {
     case FIXED_PER_POINT:
       amountPerPoint = configuredPluginAmount;
-      addRewardsSwitchPointAmount(rewardMemberDetails, earnedPoints.entrySet(), pluginId, amountPerPoint);
+      addRewardsSwitchPointAmount(rewardMemberDetails, earnedPoints.entrySet(), amountPerPoint);
       break;
     case FIXED:
       totalFixedBudget = configuredPluginAmount;
-      addTeamMembersReward(rewardPluginSettings, earnedPoints, totalFixedBudget, rewardMemberDetails);
+      addTeamMembersReward(earnedPoints, totalFixedBudget, rewardMemberDetails);
       break;
     case FIXED_PER_MEMBER:
-      double budgetPerMember = configuredPluginAmount;
-      int totalElligibleMembersCount = earnedPoints.size();
-      totalFixedBudget = budgetPerMember * totalElligibleMembersCount;
-      addTeamMembersReward(rewardPluginSettings, earnedPoints, totalFixedBudget, rewardMemberDetails);
+      int totalEligibleMembersCount = earnedPoints.size();
+      totalFixedBudget = configuredPluginAmount * totalEligibleMembersCount;
+      addTeamMembersReward(earnedPoints, totalFixedBudget, rewardMemberDetails);
       break;
     default:
-      throw new IllegalStateException("Budget type is not recognized in plugin settings: " + pluginId + ", budget type = "
-          + budgetType);
+      throw new IllegalStateException("Budget type is not recognized, budget type = " + budgetType);
     }
   }
 
-  private void addTeamMembersReward(RewardPluginSettings rewardPluginSettings,
-                                    Map<Long, Double> earnedPoints,
+  private void addTeamMembersReward(Map<Long, Double> earnedPoints,
                                     double totalFixedBudget,
                                     Set<WalletPluginReward> rewardMemberDetails) {
     if (totalFixedBudget <= 0) {
       return;
     }
     double amountPerPoint;
-    if (rewardPluginSettings.isUsePools()) {
-      List<RewardTeam> teams = rewardTeamService.getTeams();
-      Set<Long> identityIds = filterEligibleMembersAndTeams(teams, earnedPoints);
-      buildNoPoolUsers(earnedPoints, teams, identityIds);
-      computeTeamsMembersBudget(rewardPluginSettings.getPluginId(), teams, totalFixedBudget, rewardMemberDetails, earnedPoints);
-    } else {
-      double totalPoints = earnedPoints.entrySet().stream().collect(Collectors.summingDouble(Entry::getValue));
-      if (totalPoints <= 0 || totalFixedBudget <= 0) {
-        return;
-      }
-      amountPerPoint = totalFixedBudget / totalPoints;
-      addRewardsSwitchPointAmount(rewardMemberDetails,
-                                  earnedPoints.entrySet(),
-                                  rewardPluginSettings.getPluginId(),
-                                  amountPerPoint);
+    double totalPoints = earnedPoints.values().stream().mapToDouble(v -> v).sum();
+    if (totalPoints <= 0) {
+      return;
     }
+    amountPerPoint = totalFixedBudget / totalPoints;
+    addRewardsSwitchPointAmount(rewardMemberDetails, earnedPoints.entrySet(), amountPerPoint);
   }
 
   private void addRewardsSwitchPointAmount(Set<WalletPluginReward> rewardMemberDetails,
                                            Set<Entry<Long, Double>> identitiesPointsEntries,
-                                           String pluginId,
                                            double amountPerPoint) {
     for (Entry<Long, Double> identitiyPointsEntry : identitiesPointsEntries) {
       Long identityId = identitiyPointsEntry.getKey();
@@ -493,20 +450,17 @@ private void addRewardsSwitchPointAmount(Set<WalletPluginReward> rewardMemberDet
 
       WalletPluginReward rewardMemberDetail = new WalletPluginReward();
       rewardMemberDetail.setIdentityId(identityId);
-      rewardMemberDetail.setPluginId(pluginId);
       rewardMemberDetail.setPoints(points);
       rewardMemberDetail.setAmount(amount);
-      rewardMemberDetail.setPoolsUsed(false);
       rewardMemberDetails.add(rewardMemberDetail);
     }
   }
 
-  private void filterElligibleMembers(Set<Entry<Long, Double>> identitiesPointsEntries,
-                                      Set<Long> validIdentityIdsToUse,
-                                      RewardPluginSettings rewardPluginSettings,
-                                      Set<WalletPluginReward> rewardMemberDetails) {
-    String pluginId = rewardPluginSettings.getPluginId();
-    double threshold = rewardPluginSettings.getThreshold();
+  private void filterEligibleMembers(Set<Entry<Long, Double>> identitiesPointsEntries,
+                                     Set<Long> validIdentityIdsToUse,
+                                     RewardSettings rewardSettings,
+                                     Set<WalletPluginReward> rewardMemberDetails) {
+    double threshold = rewardSettings.getThreshold();
 
     Iterator<Entry<Long, Double>> identitiesPointsIterator = identitiesPointsEntries.iterator();
     while (identitiesPointsIterator.hasNext()) {
@@ -515,8 +469,7 @@ private void filterElligibleMembers(Set<Entry<Long, Double>> identitiesPointsEnt
       Double points = entry.getValue();
       points = points == null ? 0 : points;
       if (points < 0) {
-        throw new IllegalStateException("Plugin with id " + pluginId + " has assigned a negative points (" + points
-            + ") to user with id " + identityId);
+        throw new IllegalStateException("Negative points has assigned (" + points + ") to user with id " + identityId);
       }
 
       if (points < threshold || points == 0 || !validIdentityIdsToUse.contains(identityId)) {
@@ -528,68 +481,14 @@ private void filterElligibleMembers(Set<Entry<Long, Double>> identitiesPointsEnt
           // Add member with earned points for information on UI
           WalletPluginReward rewardMemberDetail = new WalletPluginReward();
           rewardMemberDetail.setIdentityId(identityId);
-          rewardMemberDetail.setPluginId(pluginId);
           rewardMemberDetail.setPoints(points);
           rewardMemberDetail.setAmount(0);
-          rewardMemberDetail.setPoolsUsed(rewardPluginSettings.isUsePools());
           rewardMemberDetails.add(rewardMemberDetail);
         }
       }
     }
   }
 
-  private void computeTeamsMembersBudget(String pluginId,
-                                         List<RewardTeam> teams,
-                                         double totalTeamsBudget,
-                                         Set<WalletPluginReward> rewardMemberDetails,
-                                         Map<Long, Double> earnedPoints) {
-    double totalFixedTeamsBudget = 0;
-    double computedRecipientsCount = 0;
-    List<RewardTeam> computedBudgetTeams = new ArrayList<>();
-    Map<Long, Double> totalPointsPerTeam = new HashMap<>();
-
-    // Compute teams budget with fixed amount
-    for (RewardTeam rewardTeam : teams) {
-      RewardBudgetType teamBudgetType = rewardTeam.getRewardType();
-      if (rewardTeam.getMembers() == null || rewardTeam.getMembers().isEmpty()) {
-        continue;
-      }
-      double totalTeamPoints = rewardTeam.getMembers()
-                                         .stream()
-                                         .collect(Collectors.summingDouble(member -> earnedPoints.get(member.getIdentityId())));
-      if (teamBudgetType == RewardBudgetType.COMPUTED) {
-        computedRecipientsCount += rewardTeam.getMembers().size();
-        computedBudgetTeams.add(rewardTeam);
-        totalPointsPerTeam.put(rewardTeam.getId(), totalTeamPoints);
-      } else if (teamBudgetType == RewardBudgetType.FIXED_PER_MEMBER) {
-        double totalTeamBudget = rewardTeam.getBudget() * rewardTeam.getMembers().size();
-        addTeamRewardRepartition(rewardTeam, totalTeamBudget, totalTeamPoints, pluginId, earnedPoints, rewardMemberDetails);
-        totalFixedTeamsBudget += totalTeamBudget;
-      } else if (teamBudgetType == RewardBudgetType.FIXED) {
-        double totalTeamBudget = rewardTeam.getBudget();
-        addTeamRewardRepartition(rewardTeam, totalTeamBudget, totalTeamPoints, pluginId, earnedPoints, rewardMemberDetails);
-        totalFixedTeamsBudget += rewardTeam.getBudget();
-      }
-    }
-
-    if (totalFixedTeamsBudget >= totalTeamsBudget) {
-      throw new IllegalStateException("Total fixed teams budget is higher than fixed budget for all users");
-    }
-
-    // Compute teams budget with computed amount
-    if (computedRecipientsCount > 0 && !computedBudgetTeams.isEmpty()) {
-      double remaingBudgetForComputedTeams = totalTeamsBudget - totalFixedTeamsBudget;
-      double budgetPerTeamMember = remaingBudgetForComputedTeams / computedRecipientsCount;
-      computedBudgetTeams.forEach(rewardTeam -> {
-        if (rewardTeam.getMembers() != null && !rewardTeam.getMembers().isEmpty()) {
-          double totalTeamBudget = budgetPerTeamMember * rewardTeam.getMembers().size();
-          Double totalTeamPoints = totalPointsPerTeam.get(rewardTeam.getId());
-          addTeamRewardRepartition(rewardTeam, totalTeamBudget, totalTeamPoints, pluginId, earnedPoints, rewardMemberDetails);
-        }
-      });
-    }
-  }
-
   private void buildNoPoolUsers(Map<Long, Double> earnedPoints, List<RewardTeam> teams, Set<Long> identityIds) {
     // Build "No pool" users
     ArrayList<Long> noPoolsIdentityIds = new ArrayList<>(earnedPoints.keySet());
@@ -648,7 +547,8 @@ private String getTransactionLabel(WalletReward walletReward, ContractDetail con
                 .replace("{1}", formatNumber(walletReward.getTokensToSend(), locale.getLanguage()))
                 .replace("{2}", contractDetail.getSymbol())
                 .replace("{3}", formatTime(periodOfTime.getStartDateInSeconds(), rewardSettings.zoneId(), locale.getLanguage()))
-                .replace("{4}", formatTime(periodOfTime.getEndDateInSeconds() - 1, rewardSettings.zoneId(), locale.getLanguage()));
+                .replace("{4}",
+                         formatTime(periodOfTime.getEndDateInSeconds() - 1, rewardSettings.zoneId(), locale.getLanguage()));
   }
 
   private String getTransactionMessage(WalletReward walletReward, ContractDetail contractDetail, RewardPeriod periodOfTime) {
@@ -659,32 +559,18 @@ private String getTransactionMessage(WalletReward walletReward, ContractDetail c
     ZoneId zoneId = rewardSettings.zoneId();
 
     for (WalletPluginReward walletPluginReward : walletRewardsByPlugin) {// NOSONAR
-      String transactionMessagePart = null;
-      if (walletPluginReward.isPoolsUsed() && StringUtils.isNotBlank(walletReward.getPoolName())) {
-        String label = getResourceBundleKey(locale, REWARD_TRANSACTION_WITH_POOL_MESSAGE_KEY);
-        if (StringUtils.isBlank(label)) {
-          continue;
-        }
-        transactionMessagePart = label.replace("{0}", formatNumber(walletPluginReward.getAmount(), locale.getLanguage()))
-                                      .replace("{1}", contractDetail.getSymbol())
-                                      .replace("{2}", formatNumber(walletPluginReward.getPoints(), locale.getLanguage()))
-                                      .replace("{3}", walletPluginReward.getPluginId())
-                                      .replace("{4}", walletReward.getPoolName())
-                                      .replace("{5}", formatTime(periodOfTime.getStartDateInSeconds(), zoneId, locale.getLanguage()))
-                                      .replace("{6}", formatTime(periodOfTime.getEndDateInSeconds() - 1, zoneId, locale.getLanguage()));
-
-      } else {
-        String label = getResourceBundleKey(locale, REWARD_TRANSACTION_NO_POOL_MESSAGE_KEY);
-        if (StringUtils.isBlank(label)) {
-          continue;
-        }
-        transactionMessagePart = label.replace("{0}", formatNumber(walletPluginReward.getAmount(), locale.getLanguage()))
-                                      .replace("{1}", contractDetail.getSymbol())
-                                      .replace("{2}", formatNumber(walletPluginReward.getPoints(), locale.getLanguage()))
-                                      .replace("{3}", walletPluginReward.getPluginId())
-                                      .replace("{4}", formatTime(periodOfTime.getStartDateInSeconds(), zoneId, locale.getLanguage()))
-                                      .replace("{5}", formatTime(periodOfTime.getEndDateInSeconds() - 1, zoneId, locale.getLanguage()));
+      String transactionMessagePart;
+      String label = getResourceBundleKey(locale, REWARD_TRANSACTION_NO_POOL_MESSAGE_KEY);
+      if (StringUtils.isBlank(label)) {
+        continue;
       }
+      transactionMessagePart =
+                             label.replace("{0}", formatNumber(walletPluginReward.getAmount(), locale.getLanguage()))
+                                  .replace("{1}", contractDetail.getSymbol())
+                                  .replace("{2}", formatNumber(walletPluginReward.getPoints(), locale.getLanguage()))
+                                  .replace("{4}", formatTime(periodOfTime.getStartDateInSeconds(), zoneId, locale.getLanguage()))
+                                  .replace("{5}",
+                                           formatTime(periodOfTime.getEndDateInSeconds() - 1, zoneId, locale.getLanguage()));
 
       transactionMessage.append(transactionMessagePart);
       transactionMessage.append("\r\n");
@@ -695,7 +581,6 @@ private String getTransactionMessage(WalletReward walletReward, ContractDetail c
   private void addTeamRewardRepartition(RewardTeam rewardTeam,
                                         double totalTeamBudget,
                                         double totalTeamPoints,
-                                        String pluginId,
                                         Map<Long, Double> earnedPoints,
                                         Set<WalletPluginReward> rewardMemberDetails) {
     if (rewardTeam.getMembers() == null || rewardTeam.getMembers().isEmpty() || totalTeamBudget <= 0 || totalTeamPoints <= 0) {
@@ -709,10 +594,8 @@ private void addTeamRewardRepartition(RewardTeam rewardTeam,
 
       WalletPluginReward rewardMemberDetail = new WalletPluginReward();
       rewardMemberDetail.setIdentityId(identityId);
-      rewardMemberDetail.setPluginId(pluginId);
       rewardMemberDetail.setPoints(points);
       rewardMemberDetail.setAmount(points * amountPerPoint);
-      rewardMemberDetail.setPoolsUsed(true);
       rewardMemberDetails.add(rewardMemberDetail);
     });
   }
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardSettingsService.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardSettingsService.java
index 1f449ff6e..f991e6e77 100644
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardSettingsService.java
+++ b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardSettingsService.java
@@ -22,27 +22,25 @@
 
 import java.util.*;
 
-import org.apache.commons.lang3.StringUtils;
-
 import org.exoplatform.commons.api.settings.SettingService;
 import org.exoplatform.commons.api.settings.SettingValue;
 import org.exoplatform.wallet.model.reward.*;
-import org.exoplatform.wallet.reward.api.RewardPlugin;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
 
 /**
  * A storage service to save/load reward transactions
  */
+@Service
+@Primary
 public class WalletRewardSettingsService implements RewardSettingsService {
 
+  @Autowired
   private SettingService            settingService;
 
   private RewardSettings            configuredRewardSettings;
 
-  private Map<String, RewardPlugin> rewardPlugins = new HashMap<>();
-
-  public WalletRewardSettingsService(SettingService settingService) {
-    this.settingService = settingService;
-  }
 
   @Override
   public RewardSettings getSettings() { // NOSONAR
@@ -57,42 +55,13 @@ public RewardSettings getSettings() { // NOSONAR
     String settingsValueString = settingsValue == null || settingsValue.getValue() == null ? null
                                                                                            : settingsValue.getValue().toString();
 
-    RewardSettings rewardSettings = null;
+    RewardSettings rewardSettings;
     if (settingsValueString == null) {
       rewardSettings = new RewardSettings();
+      rewardSettings.setStoredSetting(false);
     } else {
       rewardSettings = fromJsonString(settingsValueString, RewardSettings.class);
-    }
-
-    Set<RewardPluginSettings> pluginSettings = rewardSettings.getPluginSettings();
-    if (pluginSettings == null) {
-      pluginSettings = new HashSet<>();
-      rewardSettings.setPluginSettings(pluginSettings);
-    }
-
-    // Add configured plugin settings if not already stored
-    Set<String> configuredPluginIds = rewardPlugins.keySet();
-    if (!configuredPluginIds.isEmpty()) {
-      for (String configuredPluginId : configuredPluginIds) {
-        if (pluginSettings.stream().noneMatch(plugin -> StringUtils.equals(plugin.getPluginId(), configuredPluginId))) {
-          RewardPluginSettings emptyRewardSettings = new RewardPluginSettings();
-          emptyRewardSettings.setPluginId(configuredPluginId);
-          pluginSettings.add(emptyRewardSettings);
-        }
-      }
-    }
-
-    // Check enabled plugins
-    for (RewardPluginSettings rewardPluginSettings : pluginSettings) {
-      if (rewardPluginSettings != null) {
-        String pluginId = rewardPluginSettings.getPluginId();
-        RewardPlugin rewardPlugin = getRewardPlugin(pluginId);
-        boolean enabled = false;
-        if (rewardPlugin != null) {
-          enabled = rewardPlugin.isEnabled();
-        }
-        rewardPluginSettings.setEnabled(enabled);
-      }
+      Objects.requireNonNull(rewardSettings).setStoredSetting(true);
     }
 
     // Cache reward settings
@@ -106,46 +75,10 @@ public void saveSettings(RewardSettings rewardSettingsToStore) {
       throw new IllegalArgumentException("Empty settings to save");
     }
 
-    // Check using pool only if not budget is of type 'points reward'
-    Set<RewardPluginSettings> pluginSettings = rewardSettingsToStore.getPluginSettings();
-    if (pluginSettings != null && !pluginSettings.isEmpty()) {
-      for (RewardPluginSettings rewardPluginSettings : pluginSettings) {
-        if (rewardPluginSettings.getBudgetType() == RewardBudgetType.FIXED_PER_POINT) {
-          rewardPluginSettings.setUsePools(false);
-        }
-      }
-    }
     String settingsString = toJsonString(rewardSettingsToStore);
     settingService.set(REWARD_CONTEXT, REWARD_SCOPE, REWARD_SETTINGS_KEY_NAME, SettingValue.create(settingsString));
 
     // Purge cached settings
     this.configuredRewardSettings = null;
   }
-
-  @Override
-  public void registerPlugin(RewardPlugin rewardPlugin) {
-    rewardPlugins.put(rewardPlugin.getPluginId(), rewardPlugin);
-
-    // Purge cached settings
-    this.configuredRewardSettings = null;
-  }
-
-  @Override
-  public void unregisterPlugin(String pluginId) {
-    rewardPlugins.remove(pluginId);
-
-    // Purge cached settings
-    this.configuredRewardSettings = null;
-  }
-
-  @Override
-  public Collection<RewardPlugin> getRewardPlugins() {
-    return rewardPlugins.values();
-  }
-
-  @Override
-  public RewardPlugin getRewardPlugin(String pluginId) {
-    return rewardPlugins.get(pluginId);
-  }
-
 }
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/storage/WalletRewardReportStorage.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/storage/WalletRewardReportStorage.java
index ed9aa3890..fdd1e20e6 100644
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/storage/WalletRewardReportStorage.java
+++ b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/storage/WalletRewardReportStorage.java
@@ -250,15 +250,12 @@ public void saveRewardReport(RewardReport rewardReport) { // NOSONAR
 
       for (WalletPluginReward rewardPlugin : rewardPlugins) {
         WalletRewardPluginEntity rewardPluginEntity =
-                                                    rewardPluginDAO.getRewardPluginsByRewardIdAndPluginId(rewardEntity.getId(),
-                                                                                                          rewardPlugin.getPluginId());
+                                                    rewardPluginDAO.getRewardPluginsByRewardId(rewardEntity.getId()).getFirst();
         if (rewardPluginEntity == null) {
           rewardPluginEntity = new WalletRewardPluginEntity();
         }
         rewardPluginEntity.setAmount(rewardPlugin.getAmount());
         rewardPluginEntity.setPoints(rewardPlugin.getPoints());
-        rewardPluginEntity.setPluginId(rewardPlugin.getPluginId());
-        rewardPluginEntity.setPoolUsed(rewardPlugin.isPoolsUsed());
         rewardPluginEntity.setReward(rewardEntity);
 
         if (rewardPluginEntity.getId() == null) {
@@ -343,8 +340,6 @@ private WalletReward toDTO(WalletRewardEntity rewardEntity, ZoneId zoneId) {
   private WalletPluginReward toDTO(WalletRewardPluginEntity rewardPluginEntity) {
     WalletPluginReward pluginReward = new WalletPluginReward();
     pluginReward.setIdentityId(rewardPluginEntity.getReward().getIdentityId());
-    pluginReward.setPluginId(rewardPluginEntity.getPluginId());
-    pluginReward.setPoolsUsed(rewardPluginEntity.isPoolUsed());
     pluginReward.setPoints(rewardPluginEntity.getPoints());
     pluginReward.setAmount(rewardPluginEntity.getAmount());
     return pluginReward;
diff --git a/wallet-reward-services/src/main/resources/conf/portal/wallet-reward-configuration.xml b/wallet-reward-services/src/main/resources/conf/portal/wallet-reward-configuration.xml
index 8f2774dbd..f720ae118 100644
--- a/wallet-reward-services/src/main/resources/conf/portal/wallet-reward-configuration.xml
+++ b/wallet-reward-services/src/main/resources/conf/portal/wallet-reward-configuration.xml
@@ -54,20 +54,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <component>
     <key>org.exoplatform.wallet.reward.service.RewardSettingsService</key>
     <type>org.exoplatform.wallet.reward.service.WalletRewardSettingsService</type>
-    <component-plugins>
-      <component-plugin profiles="gamification">
-        <name>gamification</name>
-        <set-method>registerPlugin</set-method>
-        <type>org.exoplatform.wallet.reward.plugin.GamificationRewardPlugin</type>
-        <description>Gamification points reward plugin</description>
-      </component-plugin>
-      <component-plugin profiles="kudos">
-        <name>kudos</name>
-        <set-method>registerPlugin</set-method>
-        <type>org.exoplatform.wallet.reward.plugin.KudosRewardPlugin</type>
-        <description>Kudos reward plugin</description>
-      </component-plugin>
-    </component-plugins>
   </component>
 
   <component>
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/BaseRewardTest.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/BaseRewardTest.java
new file mode 100644
index 000000000..89774b2a9
--- /dev/null
+++ b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/BaseRewardTest.java
@@ -0,0 +1,64 @@
+/**
+ * This file is part of the Meeds project (https://meeds.io/).
+ * 
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.exoplatform.wallet.reward;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import org.exoplatform.component.test.ConfigurationUnit;
+import org.exoplatform.component.test.ConfiguredBy;
+import org.exoplatform.component.test.ContainerScope;
+
+import io.meeds.kernel.test.AbstractSpringTest;
+import io.meeds.kernel.test.KernelExtension;
+import io.meeds.spring.AvailableIntegration;
+
+@ExtendWith({ SpringExtension.class, KernelExtension.class })
+@SpringBootApplication(scanBasePackages = {
+        BaseRewardTest.MODULE_NAME,
+        AvailableIntegration.KERNEL_TEST_MODULE,
+        AvailableIntegration.LIQUIBASE_MODULE,
+        AvailableIntegration.JPA_MODULE,
+        AvailableIntegration.WEB_MODULE,
+})
+@TestPropertySource(properties = {
+        "spring.liquibase.change-log=" + BaseRewardTest.CHANGELOG_PATH,
+})
+@ConfiguredBy({
+  @ConfigurationUnit(scope = ContainerScope.ROOT, path = "conf/configuration.xml"),
+  @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/portal/configuration.xml"),
+  @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/test-wallet-reward-configuration.xml"),
+})
+public abstract class BaseRewardTest extends AbstractSpringTest {
+
+  public static final String MODULE_NAME      = "io.meeds.kudos";
+
+  public static final String CHANGELOG_PATH   = "classpath:db/changelog/reward-rdbms.db.changelog-master.xml";
+
+  @BeforeEach
+  public void setUp() {
+    getContainer();
+    begin();
+  }
+
+}
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/BaseWalletRewardTest.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/BaseWalletRewardTest.java
index bedf9cbc3..37279f921 100644
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/BaseWalletRewardTest.java
+++ b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/BaseWalletRewardTest.java
@@ -109,25 +109,6 @@ public abstract class BaseWalletRewardTest extends AbstractKernelTest {
 
   protected static final String           PROVIDER             = WalletProvider.INTERNAL_WALLET.name();
 
-  protected static final RewardPlugin     CUSTOM_REWARD_PLUGIN = new RewardPlugin() {
-                                                                 @Override
-                                                                 public String getName() {
-                                                                   return CUSTOM_PLUGIN_NAME;
-                                                                 }
-
-                                                                 @Override
-                                                                 public String getPluginId() {
-                                                                   return CUSTOM_PLUGIN_ID;
-                                                                 }
-
-                                                                 @Override
-                                                                 public Map<Long, Double> getEarnedPoints(Set<Long> identityIds,
-                                                                                                          long startDateInSeconds,
-                                                                                                          long endDateInSeconds) {
-                                                                   return WalletRewardSettingsServiceTest.getEarnedPoints(identityIds);
-                                                                 }
-                                                               };
-
   protected PortalContainer               container;
 
   private static RewardSettings           defaultSettings      = null;
@@ -313,17 +294,6 @@ protected String generateTransactionHash() {
     return hashStringBuffer.toString();
   }
 
-  protected RewardSettings cloneSettings(RewardSettings defaultSettings) {
-    RewardSettings newSettings = defaultSettings.clone();
-    HashSet<RewardPluginSettings> defaultPluginSettings = new HashSet<>(newSettings.getPluginSettings());
-    Set<RewardPluginSettings> pluginSettings = new HashSet<>();
-    for (RewardPluginSettings rewardPluginSetting : defaultPluginSettings) {
-      pluginSettings.add(rewardPluginSetting.clone());
-    }
-    newSettings.setPluginSettings(pluginSettings);
-    return newSettings;
-  }
-
   private void registerResourceBundleService() {
     ResourceBundleService resourceBundleService = Mockito.mock(ResourceBundleService.class);
     MapResourceBundle resourceBundle = new MapResourceBundle(Locale.getDefault());
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/job/WalletRewardJobTest.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/job/WalletRewardJobTest.java
index df88ff133..a9ef5fffa 100644
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/job/WalletRewardJobTest.java
+++ b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/job/WalletRewardJobTest.java
@@ -59,23 +59,6 @@
 
 public class WalletRewardJobTest extends BaseWalletRewardTest {
 
-  @Test
-  public void testGetRewardPlugins() {
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-    Collection<RewardPlugin> rewardPlugins = rewardSettingsService.getRewardPlugins();
-    assertEquals(2, rewardPlugins.size());
-
-    RewardPeriod period = RewardPeriodType.WEEK.getPeriodOfTime(LocalDate.now(), ZoneId.systemDefault());
-    for (RewardPlugin rewardPlugin : rewardPlugins) {
-      try {
-        rewardPlugin.getEarnedPoints(Collections.singleton(1l), period.getStartDateInSeconds(), period.getEndDateInSeconds());
-        // Submodules aren't loaded yet
-      } catch (Exception e) {
-        // Expected
-      }
-    }
-  }
-
   @Test
   public void testSendRewards() throws Exception {
     WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
@@ -89,23 +72,16 @@ public void testSendRewards() throws Exception {
     LocalDate date = YearMonth.of(2019, 07).atEndOfMonth();
 
     RewardSettings defaultSettings = rewardSettingsService.getSettings();
-    rewardSettingsService.registerPlugin(CUSTOM_REWARD_PLUGIN);
     try {
       // Build new settings
-      RewardSettings newSettings = cloneSettings(rewardSettingsService.getSettings());
-      Set<RewardPluginSettings> newPluginSettings = newSettings.getPluginSettings();
+      RewardSettings newSettings = defaultSettings.clone();
 
       newSettings.setPeriodType(RewardPeriodType.MONTH);
-      RewardPluginSettings customPluginSetting = newPluginSettings.stream()
-                                                                  .filter(plugin -> CUSTOM_PLUGIN_ID.equals(plugin.getPluginId()))
-                                                                  .findFirst()
-                                                                  .orElse(null);
+
       double sumOfTokensToSend = 5490d;
-      customPluginSetting.setUsePools(true); // NOSONAR
-      customPluginSetting.setBudgetType(RewardBudgetType.FIXED);
-      customPluginSetting.setAmount(sumOfTokensToSend);
-      customPluginSetting.setThreshold(0);
-      customPluginSetting.setEnabled(true);
+      newSettings.setBudgetType(RewardBudgetType.FIXED);
+      newSettings.setAmount(sumOfTokensToSend);
+      newSettings.setThreshold(0);
       rewardSettingsService.saveSettings(newSettings);
 
       WalletStorage walletStorage = getService(WalletStorage.class);
@@ -199,7 +175,6 @@ public void testSendRewards() throws Exception {
       assertNotNull(rewardPeriodsInProgress);
       assertEquals(0, rewardPeriodsInProgress.size());
     } finally {
-      rewardSettingsService.unregisterPlugin(CUSTOM_PLUGIN_ID);
       rewardSettingsService.saveSettings(defaultSettings);
     }
   }
@@ -234,10 +209,7 @@ public TransactionDetail answer(InvocationOnMock invocation) throws Throwable {
     });
   }
 
-  private RewardTeam createTeamWithMembers(int startInclusive,
-                                           int endInclusive,
-                                           RewardBudgetType budgetType,
-                                           boolean disabled) {
+  private RewardTeam createTeamWithMembers(int startInclusive, int endInclusive, RewardBudgetType budgetType, boolean disabled) {
     WalletRewardTeamService rewardTeamService = getService(WalletRewardTeamService.class);
     long[] memberIds = LongStream.rangeClosed(startInclusive, endInclusive).toArray();
     RewardTeam rewardTeam = newRewardTeam(memberIds);
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPluginTest.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPluginTest.java
index 2d76c08b4..306f9749a 100644
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPluginTest.java
+++ b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPluginTest.java
@@ -1,18 +1,20 @@
 /*
  * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
+ *
+ * Copyright (C) 2020 - 2024 Meeds Lab contact@meedslab.com
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 package org.exoplatform.wallet.reward.notification;
 
@@ -22,38 +24,53 @@
 import static org.exoplatform.wallet.utils.RewardUtils.REWARD_SUCCESS_COUNT;
 import static org.exoplatform.wallet.utils.RewardUtils.REWARD_TRANSACTION_COUNT;
 import static org.exoplatform.wallet.utils.RewardUtils.REWARD_VALID_MEMBERS_COUNT;
-import static org.exoplatform.wallet.utils.RewardUtils.getRewardSettings;
 import static org.exoplatform.wallet.utils.WalletUtils.AMOUNT;
+import static org.mockito.Mockito.when;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.junit.Test;
+import org.exoplatform.wallet.model.reward.RewardSettings;
+import org.exoplatform.wallet.model.settings.GlobalSettings;
+import org.exoplatform.wallet.reward.BaseRewardTest;
+import org.exoplatform.wallet.service.WalletService;
+import org.junit.jupiter.api.Test;
 
 import org.exoplatform.commons.api.notification.NotificationContext;
 import org.exoplatform.commons.api.notification.model.NotificationInfo;
-import org.exoplatform.commons.api.notification.plugin.config.PluginConfig;
 import org.exoplatform.commons.notification.impl.NotificationContextImpl;
 import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.container.xml.ObjectParam;
 import org.exoplatform.wallet.model.reward.RewardPeriod;
 import org.exoplatform.wallet.model.reward.RewardReport;
 import org.exoplatform.wallet.model.reward.WalletReward;
 import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.reward.BaseWalletRewardTest;
+import org.mockito.Mock;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
-public class RewardSuccessNotificationPluginTest extends BaseWalletRewardTest {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SpringJUnitConfig(BaseRewardTest.class)
+public class RewardSuccessNotificationPluginTest extends BaseRewardTest {
+
+  @Mock
+  private InitParams    initParams;
+
+  @Mock
+  private WalletService walletService;
 
-  /**
-   * Check that provider returns templates correctly
-   */
   @Test
   public void testMakeMessage() {
-    RewardSuccessNotificationPlugin plugin = new RewardSuccessNotificationPlugin(getParams());
+    GlobalSettings globalSettings = new GlobalSettings();
+    when(walletService.getSettings()).thenReturn(globalSettings);
+    RewardSuccessNotificationPlugin plugin = new RewardSuccessNotificationPlugin(initParams);
+    plugin.walletService = walletService;
     NotificationContext ctx = NotificationContextImpl.cloneInstance();
 
     RewardReport rewardReport = new RewardReport();
-    RewardPeriod rewardPeriod = RewardPeriod.getCurrentPeriod(getRewardSettings());
+    RewardSettings rewardSettings = new RewardSettings();
+    RewardPeriod rewardPeriod = RewardPeriod.getCurrentPeriod(rewardSettings);
     rewardReport.setPeriod(rewardPeriod);
 
     Set<WalletReward> rewards = new HashSet<>();
@@ -83,19 +100,4 @@ public void testMakeMessage() {
                  notification.getValueOwnerParameter(REWARD_VALID_MEMBERS_COUNT));
     assertEquals(String.valueOf(rewardReport.getTokensSent()), notification.getValueOwnerParameter(AMOUNT));
   }
-
-  private InitParams getParams() {
-    InitParams initParams = new InitParams();
-    ObjectParam objectParam = new ObjectParam();
-    objectParam.setName("plugin-config");
-    objectParam.setType(PluginConfig.class.getName());
-    objectParam.addProperty("pluginId", "RewardSuccessNotificationPlugin");
-    objectParam.addProperty("resourceBundleKey", "UINotification.label.RewardSuccessNotificationPlugin");
-    objectParam.addProperty("order", "1");
-    objectParam.addProperty("groupId", "wallet");
-    objectParam.addProperty("bundlePath", "locale.notification.WalletNotification");
-    initParams.addParam(objectParam);
-    return initParams;
-  }
-
 }
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateBuilderTest.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateBuilderTest.java
index df7254b5b..6e281a05d 100644
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateBuilderTest.java
+++ b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateBuilderTest.java
@@ -1,28 +1,35 @@
 /*
  * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
+ *
+ * Copyright (C) 2020 - 2024 Meeds Lab contact@meedslab.com
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 package org.exoplatform.wallet.reward.notification;
 
 import static org.exoplatform.wallet.utils.RewardUtils.REWARD_REPORT_NOTIFICATION_PARAM;
-import static org.exoplatform.wallet.utils.RewardUtils.getRewardSettings;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.junit.Test;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.wallet.model.reward.RewardSettings;
+import org.exoplatform.wallet.model.settings.GlobalSettings;
+import org.exoplatform.wallet.reward.BaseRewardTest;
+import org.exoplatform.wallet.reward.service.RewardSettingsService;
+import org.exoplatform.wallet.service.WalletService;
+import org.junit.jupiter.api.Test;
 
 import org.exoplatform.commons.api.notification.NotificationContext;
 import org.exoplatform.commons.api.notification.channel.ChannelManager;
@@ -32,7 +39,6 @@
 import org.exoplatform.commons.api.notification.service.setting.PluginContainer;
 import org.exoplatform.commons.api.notification.service.setting.PluginSettingService;
 import org.exoplatform.commons.notification.impl.NotificationContextImpl;
-import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.container.xml.InitParams;
 import org.exoplatform.container.xml.ObjectParameter;
 import org.exoplatform.container.xml.ValueParam;
@@ -40,29 +46,41 @@
 import org.exoplatform.wallet.model.reward.RewardReport;
 import org.exoplatform.wallet.model.reward.WalletReward;
 import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.reward.BaseWalletRewardTest;
-import org.exoplatform.wallet.reward.service.WalletRewardSettingsService;
 
-public class RewardSuccessTemplateBuilderTest extends BaseWalletRewardTest {
+import org.mockito.Mock;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.when;
+
+@SpringJUnitConfig(BaseRewardTest.class)
+public class RewardSuccessTemplateBuilderTest extends BaseRewardTest {
+
+  @Mock
+  private WalletService               walletService;
+
+  @Mock
+  private RewardSettingsService       rewardSettingsService;
 
-  /**
-   * Check that provider returns templates correctly
-   */
   @Test
   public void testBuildMessage() {
+    PortalContainer container = PortalContainer.getInstance();
+    GlobalSettings globalSettings = new GlobalSettings();
+    when(walletService.getSettings()).thenReturn(globalSettings);
+    when(rewardSettingsService.getSettings()).thenReturn(new RewardSettings());
     InitParams params = getParams();
     RewardSuccessNotificationPlugin plugin = new RewardSuccessNotificationPlugin(params);
+    plugin.walletService = walletService;
 
-    RewardSuccessTemplateProvider templateProvider =
-                                                   new RewardSuccessTemplateProvider(container,
-                                                                                     getService(WalletRewardSettingsService.class),
-                                                                                     params);
+    RewardSuccessTemplateProvider templateProvider = new RewardSuccessTemplateProvider(container, rewardSettingsService, params);
     templateProvider.setMailTemplatePath("jar:/template/RewardSuccessReward.gtmpl");
 
     NotificationContext ctx = NotificationContextImpl.cloneInstance();
 
     RewardReport rewardReport = new RewardReport();
-    RewardPeriod rewardPeriod = RewardPeriod.getCurrentPeriod(getRewardSettings());
+    RewardSettings rewardSettings = new RewardSettings();
+    RewardPeriod rewardPeriod = RewardPeriod.getCurrentPeriod(rewardSettings);
     rewardReport.setPeriod(rewardPeriod);
 
     Set<WalletReward> rewards = new HashSet<>();
@@ -79,9 +97,9 @@ public void testBuildMessage() {
     ctx.setNotificationInfo(notification);
     notification.to(notification.getSendToUserIds().get(0));
 
-    CommonsUtils.getService(PluginSettingService.class).registerPluginConfig(getPluginConfig());
-    CommonsUtils.getService(PluginContainer.class).addPlugin(plugin);
-    CommonsUtils.getService(ChannelManager.class).registerOverrideTemplateProvider(templateProvider);
+    container.getComponentInstanceOfType(PluginSettingService.class).registerPluginConfig(getPluginConfig());
+    container.getComponentInstanceOfType(PluginContainer.class).addPlugin(plugin);
+    container.getComponentInstanceOfType(ChannelManager.class).registerOverrideTemplateProvider(templateProvider);
 
     MessageInfo message = templateProvider.getBuilder().buildMessage(ctx);
     assertNotNull(message);
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateProviderTest.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateProviderTest.java
index c11a4f3cd..d2ff289ad 100644
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateProviderTest.java
+++ b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateProviderTest.java
@@ -1,40 +1,54 @@
 /*
  * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
+ *
+ * Copyright (C) 2020 - 2024 Meeds Lab contact@meedslab.com
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 package org.exoplatform.wallet.reward.notification;
 
 import java.util.Map;
 
-import org.junit.Test;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.wallet.model.reward.RewardSettings;
+import org.exoplatform.wallet.reward.BaseRewardTest;
+import org.exoplatform.wallet.reward.service.RewardSettingsService;
+import org.junit.jupiter.api.Test;
 
 import org.exoplatform.commons.api.notification.model.PluginKey;
 import org.exoplatform.container.xml.InitParams;
 import org.exoplatform.container.xml.ValueParam;
-import org.exoplatform.wallet.reward.BaseWalletRewardTest;
-import org.exoplatform.wallet.reward.service.WalletRewardSettingsService;
 
-public class RewardSuccessTemplateProviderTest extends BaseWalletRewardTest {
+import org.mockito.Mock;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.when;
+
+@SpringJUnitConfig(BaseRewardTest.class)
+public class RewardSuccessTemplateProviderTest extends BaseRewardTest {
+
+  @Mock
+  private RewardSettingsService rewardSettingsService;
 
-  /**
-   * Check that provider returns templates correctly
-   */
   @Test
   public void testGetTemplate() {
+    PortalContainer container = PortalContainer.getInstance();
+    when(rewardSettingsService.getSettings()).thenReturn(new RewardSettings());
     RewardSuccessTemplateProvider provider = new RewardSuccessTemplateProvider(container,
-                                                                               getService(WalletRewardSettingsService.class),
+                                                                               rewardSettingsService,
                                                                                getParams("MAIL_CHANNEL"));
     Map<PluginKey, String> templateFilePathConfigs = provider.getTemplateFilePathConfigs();
     assertNotNull(templateFilePathConfigs);
@@ -42,18 +56,14 @@ public void testGetTemplate() {
     String template = templateFilePathConfigs.values().iterator().next();
     assertEquals(provider.getMailTemplatePath(), template);
 
-    provider = new RewardSuccessTemplateProvider(container,
-                                                 getService(WalletRewardSettingsService.class),
-                                                 getParams("MAIL_CHANNEL"));
+    provider = new RewardSuccessTemplateProvider(container, rewardSettingsService, getParams("MAIL_CHANNEL"));
     templateFilePathConfigs = provider.getTemplateFilePathConfigs();
     assertNotNull(templateFilePathConfigs);
     assertEquals(1, templateFilePathConfigs.size());
     template = templateFilePathConfigs.values().iterator().next();
     assertEquals(provider.getMailTemplatePath(), template);
 
-    provider = new RewardSuccessTemplateProvider(container,
-                                                 getService(WalletRewardSettingsService.class),
-                                                 getParams("PUSH_CHANNEL"));
+    provider = new RewardSuccessTemplateProvider(container, rewardSettingsService, getParams("PUSH_CHANNEL"));
     templateFilePathConfigs = provider.getTemplateFilePathConfigs();
     assertNotNull(templateFilePathConfigs);
     assertEquals(1, templateFilePathConfigs.size());
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardReportServiceTest.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardReportServiceTest.java
index 048773d5c..8f9e735be 100644
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardReportServiceTest.java
+++ b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardReportServiceTest.java
@@ -1,926 +1,107 @@
 /*
  * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
+ *
+ * Copyright (C) 2020 - 2024 Meeds Lab contact@meedslab.com
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 package org.exoplatform.wallet.reward.service;
 
-import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.YearMonth;
-import java.time.ZoneId;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
-import java.util.stream.LongStream;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.IntStream;
 
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
+import io.meeds.gamification.service.RealizationService;
+import org.exoplatform.wallet.model.WalletState;
+import org.junit.jupiter.api.Test;
 
-import org.exoplatform.container.component.RequestLifeCycle;
 import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.reward.RewardBudgetType;
-import org.exoplatform.wallet.model.reward.RewardPeriod;
-import org.exoplatform.wallet.model.reward.RewardPeriodType;
-import org.exoplatform.wallet.model.reward.RewardPluginSettings;
 import org.exoplatform.wallet.model.reward.RewardReport;
 import org.exoplatform.wallet.model.reward.RewardSettings;
-import org.exoplatform.wallet.model.reward.RewardStatus;
-import org.exoplatform.wallet.model.reward.RewardTeam;
-import org.exoplatform.wallet.model.reward.WalletPluginReward;
-import org.exoplatform.wallet.model.reward.WalletReward;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.reward.BaseWalletRewardTest;
-import org.exoplatform.wallet.reward.dao.RewardDAO;
-import org.exoplatform.wallet.reward.dao.RewardPeriodDAO;
-import org.exoplatform.wallet.reward.entity.WalletRewardEntity;
-import org.exoplatform.wallet.reward.entity.WalletRewardPeriodEntity;
 import org.exoplatform.wallet.reward.storage.WalletRewardReportStorage;
 import org.exoplatform.wallet.service.WalletAccountService;
 import org.exoplatform.wallet.service.WalletTokenAdminService;
-import org.exoplatform.wallet.service.WalletTransactionService;
-import org.exoplatform.wallet.utils.RewardUtils;
-import org.exoplatform.wallet.utils.WalletUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 
-import static org.exoplatform.wallet.utils.RewardUtils.timeToSecondsAtDayStart;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.when;
 
-public class WalletRewardReportServiceTest extends BaseWalletRewardTest { // NOSONAR
+@SpringBootTest(classes = { WalletRewardReportService.class })
+public class WalletRewardReportServiceTest { // NOSONAR
 
-  /**
-   * Check that service is instantiated
-   */
-  @Test
-  public void testServiceInstantiated() {
-    WalletRewardReportService walletRewardService = getService(WalletRewardReportService.class);
-    assertNotNull(walletRewardService);
-  }
-
-  @Test
-  public void testComputeRewards() {
-    WalletRewardReportService walletRewardService = getService(WalletRewardReportService.class);
-    LocalDate date = YearMonth.of(2019, 03).atEndOfMonth();
-    RewardReport rewardReport = walletRewardService.computeRewards(date);
-    assertNotNull(rewardReport);
-    assertNotNull(rewardReport.getRewards());
-    assertEquals(0, rewardReport.getRewards().size());
-
-    WalletAccountService accountService = getService(WalletAccountService.class);
-    int enabledWalletsCount = 60;
-    for (int i = 0; i < enabledWalletsCount; i++) {
-      Wallet wallet = newWallet(i + 1l);
-      wallet = accountService.saveWallet(wallet, true);
-      updateWalletBlockchainState(wallet);
-      accountService.saveWalletBlockchainState(wallet, WalletUtils.getContractAddress());
-      entitiesToClean.add(wallet);
-    }
-
-    rewardReport = walletRewardService.computeRewards(date);
-    assertNotNull(rewardReport);
-    // Even if settings are null, the returned rewards shouldn't be empty
-    assertEquals(enabledWalletsCount, rewardReport.getRewards().size());
-
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-    RewardSettings defaultSettings = rewardSettingsService.getSettings();
-    rewardSettingsService.registerPlugin(CUSTOM_REWARD_PLUGIN);
-    try {
-      // Build new settings
-      RewardSettings newSettings = cloneSettings(rewardSettingsService.getSettings());
-
-      Set<RewardPluginSettings> newPluginSettings = newSettings.getPluginSettings();
-      long amount = 3l;
-
-      newSettings.setPeriodType(RewardPeriodType.MONTH);
-
-      RewardPluginSettings customPluginSetting = newPluginSettings.stream()
-                                                                  .filter(plugin -> CUSTOM_PLUGIN_ID.equals(plugin.getPluginId()))
-                                                                  .findFirst()
-                                                                  .orElse(null);
-
-      assertNotNull(customPluginSetting);
+  @MockBean
+  private WalletAccountService      walletAccountService;
 
-      customPluginSetting.setAmount(amount); // NOSONAR
-      customPluginSetting.setBudgetType(RewardBudgetType.FIXED_PER_POINT);
-      customPluginSetting.setThreshold(0);
-      customPluginSetting.setEnabled(true);
-      customPluginSetting.setUsePools(false);
-      rewardSettingsService.saveSettings(newSettings);
+  @MockBean
+  private WalletTokenAdminService   walletTokenAdminService;
 
-      // Check computed amount for plugin per wallet when no teams and with
-      // fixed
-      // budget per point
-      double sumOfTokensToSend = checkComputedRewards(walletRewardService,
-                                                      date,
-                                                      enabledWalletsCount,
-                                                      amount);
+  @MockBean
+  private RewardSettingsService     rewardSettingsService;
 
-      customPluginSetting.setBudgetType(RewardBudgetType.FIXED);
-      customPluginSetting.setAmount(sumOfTokensToSend);
-      rewardSettingsService.saveSettings(newSettings);
+  @MockBean
+  private RewardTeamService         rewardTeamService;
 
-      // Check computed amount for plugin per wallet when no teams and with
-      // fixed total budget for reward plugin
-      checkComputedRewards(walletRewardService,
-                           date,
-                           enabledWalletsCount,
-                           amount);
+  @MockBean
+  private WalletRewardReportStorage rewardReportStorage;
 
-      customPluginSetting.setBudgetType(RewardBudgetType.FIXED_PER_MEMBER);
-      customPluginSetting.setAmount(sumOfTokensToSend / enabledWalletsCount);
-      rewardSettingsService.saveSettings(newSettings);
+  @MockBean
+  private RealizationService        realizationService;
 
-      // Check computed amount for plugin per wallet when no teams and with
-      // fixed budget per member
-      checkComputedRewards(walletRewardService,
-                           date,
-                           enabledWalletsCount,
-                           amount);
-
-      customPluginSetting.setThreshold(31);
-      customPluginSetting.setAmount(amount); // NOSONAR
-      customPluginSetting.setBudgetType(RewardBudgetType.FIXED_PER_POINT);
-      rewardSettingsService.saveSettings(newSettings);
-
-      // Check computed amount for plugin per wallet when no teams and with
-      // fixed budget per point and with Threshold
-      checkComputedRewards(walletRewardService,
-                           date,
-                           30,
-                           amount);
-
-      customPluginSetting.setThreshold(0);
-      rewardSettingsService.saveSettings(newSettings);
-
-      RewardTeam rewardTeam1 = createTeamWithMembers(1, 10, RewardBudgetType.COMPUTED, true);
-      RewardTeam rewardTeam2 = createTeamWithMembers(11, 20, RewardBudgetType.FIXED, true);
-      RewardTeam rewardTeam3 = createTeamWithMembers(21, 30, RewardBudgetType.FIXED_PER_MEMBER, true);
-      RewardTeam rewardTeam4 = createTeamWithMembers(31, 40, RewardBudgetType.FIXED_PER_MEMBER, true);
-      RewardTeam rewardTeam5 = createTeamWithMembers(41, 50, RewardBudgetType.COMPUTED, true);
-      RewardTeam rewardTeam6 = createTeamWithMembers(51, 60, RewardBudgetType.COMPUTED, true);
-
-      List<RewardTeam> teams = new ArrayList<>();
-      teams.add(rewardTeam1);
-      teams.add(rewardTeam2);
-      teams.add(rewardTeam3);
-      teams.add(rewardTeam4);
-      teams.add(rewardTeam5);
-      teams.add(rewardTeam6);
-
-      // Check computed amount for plugin per wallet with teams (each having 10
-      // members), with fixed budget per point and with plugin not using teams
-      checkComputedRewards(walletRewardService,
-                           date,
-                           enabledWalletsCount,
-                           amount);
-
-      customPluginSetting.setUsePools(true);
-      customPluginSetting.setBudgetType(RewardBudgetType.FIXED);
-      customPluginSetting.setAmount(sumOfTokensToSend);
-      rewardSettingsService.saveSettings(newSettings);
-
-      // Check computed amount for plugin per wallet with teams (each having 10
-      // members), with fixed total budget and with plugin using teams that are
-      // disabled
-      checkComputedRewards(walletRewardService,
-                           date,
-                           0,
-                           0);
-
-      // Check computed amount for plugin per wallet with teams (each having 10
-      // members), with fixed total budget and with plugin using teams that are
-      // enabled
-      WalletRewardTeamService rewardTeamService = getService(WalletRewardTeamService.class);
-      teams.forEach(team -> {
-        team.setDisabled(false);
-        rewardTeamService.saveTeam(team);
-      });
-
-      rewardReport = walletRewardService.computeRewards(date);
-
-      // check total budget to send
-      double tokensToSend = rewardReport.getRewards().stream().mapToDouble(WalletReward::getTokensToSend).sum();
-      assertEquals(sumOfTokensToSend, tokensToSend, 0);
-
-      // Check budget of team having a defined budget as 'fixed'
-      double tokensSentToTeam2 = rewardReport.getRewards()
-                                             .stream()
-                                             .filter(walletReward -> walletReward.getTeam() != null
-                                                 && rewardTeam2.getId().equals(walletReward.getTeam().getId()))
-                                             .mapToDouble(WalletReward::getTokensToSend)
-                                             .sum();
-      assertEquals(rewardTeam2.getBudget(), tokensSentToTeam2, 0);
-
-      // Check budget of teams (team3 and team4) having a defined budget as
-      // 'fixed per member'
-      double tokensSentToTeam3 = rewardReport.getRewards()
-                                             .stream()
-                                             .filter(walletReward -> walletReward.getTeam() != null
-                                                 && rewardTeam3.getId().equals(walletReward.getTeam().getId()))
-                                             .mapToDouble(WalletReward::getTokensToSend)
-                                             .sum();
-      assertEquals(rewardTeam3.getBudget() * rewardTeam3.getMembers().size(), tokensSentToTeam3, 0);
-
-      double tokensSentToTeam4 = rewardReport.getRewards()
-                                             .stream()
-                                             .filter(walletReward -> walletReward.getTeam() != null
-                                                 && rewardTeam4.getId().equals(walletReward.getTeam().getId()))
-                                             .mapToDouble(WalletReward::getTokensToSend)
-                                             .sum();
-      assertEquals(rewardTeam4.getBudget() * rewardTeam4.getMembers().size(), tokensSentToTeam4, 0);
-
-      // Check budget of other teams (team1, team5 and team2) having a defined
-      // budget as 'computed'
-      double tokensSentToOtherTeams = sumOfTokensToSend - tokensSentToTeam2 - tokensSentToTeam3 - tokensSentToTeam4;
-      double tokensSentToOtherTeam = tokensSentToOtherTeams / 3d;
-
-      double tokensSentToTeam1 = rewardReport.getRewards()
-                                             .stream()
-                                             .filter(walletReward -> walletReward.getTeam() != null
-                                                 && rewardTeam1.getId().equals(walletReward.getTeam().getId()))
-                                             .mapToDouble(WalletReward::getTokensToSend)
-                                             .sum();
-      assertEquals(tokensSentToOtherTeam, tokensSentToTeam1, 0);
-
-      double tokensSentToTeam5 = rewardReport.getRewards()
-                                             .stream()
-                                             .filter(walletReward -> walletReward.getTeam() != null
-                                                 && rewardTeam5.getId().equals(walletReward.getTeam().getId()))
-                                             .mapToDouble(WalletReward::getTokensToSend)
-                                             .sum();
-      assertEquals(tokensSentToOtherTeam, tokensSentToTeam5, 0);
-
-      double tokensSentToTeam6 = rewardReport.getRewards()
-                                             .stream()
-                                             .filter(walletReward -> walletReward.getTeam() != null
-                                                 && rewardTeam6.getId().equals(walletReward.getTeam().getId()))
-                                             .mapToDouble(WalletReward::getTokensToSend)
-                                             .sum();
-      assertEquals(tokensSentToOtherTeam, tokensSentToTeam6, 0);
-    } finally {
-      rewardSettingsService.unregisterPlugin(CUSTOM_PLUGIN_ID);
-      rewardSettingsService.saveSettings(defaultSettings);
-    }
-  }
+  @Autowired
+  private RewardReportService       rewardReportService;
 
   @Test
-  public void testComputeRewardWithDuplication() {
-    WalletTransactionService walletTransactionService = getService(WalletTransactionService.class);
-    WalletRewardReportService walletRewardService = getService(WalletRewardReportService.class);
-    LocalDate date = YearMonth.of(2019, 03).atEndOfMonth();
-    RewardReport rewardReport = walletRewardService.computeRewards(date);
+  public void testComputeRewards() {
+    LocalDate date = YearMonth.of(2019, 3).atEndOfMonth();
+    RewardSettings rewardSettings = new RewardSettings();
+    when(rewardSettingsService.getSettings()).thenReturn(rewardSettings);
+    RewardReport rewardReport = rewardReportService.computeRewards(date);
     assertNotNull(rewardReport);
     assertNotNull(rewardReport.getRewards());
     assertEquals(0, rewardReport.getRewards().size());
 
-    WalletAccountService accountService = getService(WalletAccountService.class);
-    int enabledWalletsCount = 60;
-    for (int i = 0; i < enabledWalletsCount; i++) {
-      Wallet wallet = newWallet(i + 1l);
-      wallet = accountService.saveWallet(wallet, true);
-      updateWalletBlockchainState(wallet);
-      accountService.saveWalletBlockchainState(wallet, WalletUtils.getContractAddress());
-      entitiesToClean.add(wallet);
-    }
-
-    rewardReport = walletRewardService.computeRewards(date);
-    assertNotNull(rewardReport);
-    assertEquals(enabledWalletsCount, rewardReport.getRewards().size());
-
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-    RewardSettings defaultSettings = rewardSettingsService.getSettings();
-    rewardSettingsService.registerPlugin(CUSTOM_REWARD_PLUGIN);
-    try {
-      // Build new settings
-      RewardSettings newSettings = cloneSettings(rewardSettingsService.getSettings());
-
-      Set<RewardPluginSettings> newPluginSettings = newSettings.getPluginSettings();
-      long amount = 3l;
-
-      newSettings.setPeriodType(RewardPeriodType.MONTH);
-
-      RewardPluginSettings customPluginSetting = newPluginSettings.stream()
-                                                                  .filter(plugin -> CUSTOM_PLUGIN_ID.equals(plugin.getPluginId()))
-                                                                  .findFirst()
-                                                                  .orElse(null);
-
-      assertNotNull(customPluginSetting);
-
-      customPluginSetting.setAmount(amount); // NOSONAR
-      customPluginSetting.setBudgetType(RewardBudgetType.FIXED_PER_POINT);
-      customPluginSetting.setThreshold(0);
-      customPluginSetting.setEnabled(true);
-      customPluginSetting.setUsePools(false);
-      rewardSettingsService.saveSettings(newSettings);
-
-      // Check computed amount for plugin per wallet when no teams and with
-      // fixed budget per point
-      double sumOfTokensToSend = checkComputedRewards(walletRewardService,
-                                                      date,
-                                                      enabledWalletsCount,
-                                                      amount);
-      customPluginSetting.setBudgetType(RewardBudgetType.FIXED);
-      customPluginSetting.setAmount(sumOfTokensToSend);
-      rewardSettingsService.saveSettings(newSettings);
-
-      rewardReport = walletRewardService.computeRewards(date);
-
-      // check total budget to send
-      double tokensToSend = rewardReport.getRewards().stream().mapToDouble(WalletReward::getTokensToSend).sum();
-      assertEquals(sumOfTokensToSend, tokensToSend, 0);
-
-      Set<WalletReward> rewards = rewardReport.getRewards();
-      RewardPeriod period = rewardReport.getPeriod();
-      RewardPeriodDAO rewardPeriodDAO = getService(RewardPeriodDAO.class);
-      WalletRewardPeriodEntity rewardPeriodEntity = rewardPeriodDAO.findRewardPeriodByTypeAndTime(period.getRewardPeriodType(),
-                                                                                                  period.getPeriodMedianDateInSeconds());
-      if (rewardPeriodEntity == null) {
-        rewardPeriodEntity = new WalletRewardPeriodEntity();
-        rewardPeriodEntity.setPeriodType(period.getRewardPeriodType());
-        rewardPeriodEntity.setStatus(RewardStatus.PENDING);
-        rewardPeriodEntity.setStartTime(period.getStartDateInSeconds());
-        rewardPeriodEntity.setEndTime(period.getEndDateInSeconds());
-        rewardPeriodEntity.setTimeZone(period.getTimeZone());
-        rewardPeriodEntity = rewardPeriodDAO.create(rewardPeriodEntity);
-      }
-      // Create entity with empty transaction information
-      for (WalletReward walletReward : rewards) {
-        WalletRewardEntity rewardEntity = new WalletRewardEntity();
-        rewardEntity.setEnabled(true);
-        rewardEntity.setIdentityId(walletReward.getIdentityId());
-        rewardEntity.setTokensToSend(walletReward.getTokensToSend());
-        rewardEntity.setPeriod(rewardPeriodEntity);
-        rewardEntity = getService(RewardDAO.class).create(rewardEntity);
-      }
-      restartTransaction();
-
-      rewardReport = walletRewardService.computeRewards(date);
-      assertEquals(0, rewardReport.getTokensSent(), 0);
-      assertFalse(rewardReport.isCompletelyProceeded());
-
-      // Create duplicated entity with sent transaction information
-      // for the same identity and period
-      for (WalletReward walletReward : rewards) {
-        WalletRewardEntity rewardEntity = new WalletRewardEntity();
-        rewardEntity.setEnabled(true);
-        rewardEntity.setIdentityId(walletReward.getIdentityId());
-        rewardEntity.setTokensToSend(walletReward.getTokensToSend());
-        rewardEntity.setPeriod(rewardPeriodEntity);
-        rewardEntity.setTokensSent(tokensToSend);
-        TransactionDetail transactionDetail = createWalltRewardTransaction(walletTransactionService, walletReward);
-        rewardEntity.setTransactionHash(transactionDetail.getHash());
-        rewardEntity = getService(RewardDAO.class).create(rewardEntity);
-      }
-      restartTransaction();
-
-      rewardReport = walletRewardService.computeRewards(date);
-      assertEquals(rewardReport.getTokensToSend(), rewardReport.getTokensSent(), 0);
-      assertTrue(rewardReport.isCompletelyProceeded());
-    } finally {
-      rewardSettingsService.unregisterPlugin(CUSTOM_PLUGIN_ID);
-      rewardSettingsService.saveSettings(defaultSettings);
-    }
-  }
-
-  @Test
-  public void testComputeRewardsByUser() {
-
-    WalletAccountService accountService = getService(WalletAccountService.class);
-    Wallet userWallet = newWallet(1l);
-    userWallet = accountService.saveWallet(userWallet, true);
-    updateWalletBlockchainState(userWallet);
-    accountService.saveWalletBlockchainState(userWallet, WalletUtils.getContractAddress());
-    entitiesToClean.add(userWallet);
-
-    int enabledWalletsCount = 6;
-    for (int i = 1; i < enabledWalletsCount; i++) {
-      Wallet wallet = newWallet(i + 1l);
-      wallet = accountService.saveWallet(wallet, true);
-      updateWalletBlockchainState(wallet);
-      accountService.saveWalletBlockchainState(wallet, WalletUtils.getContractAddress());
-      entitiesToClean.add(wallet);
-    }
-
-    WalletRewardReportService walletRewardService = getService(WalletRewardReportService.class);
-    LocalDate date = YearMonth.of(2022, 12).atEndOfMonth();
-    RewardReport rewardReport = walletRewardService.computeRewardsByUser(date, userWallet.getTechnicalId());
-    assertNotNull(rewardReport);
-    assertNotNull(rewardReport.getRewards());
-    assertEquals(1, rewardReport.getRewards().size());
-  }
-
-  @Test
-  public void testComputeRewardsWithTimeZoneChange() throws Exception {
-    WalletTransactionService walletTransactionService = getService(WalletTransactionService.class);
-    WalletRewardReportStorage rewardReportStorage = getService(WalletRewardReportStorage.class);
-    WalletAccountService walletAccountService = getService(WalletAccountService.class);
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-    RewardTeamService rewardTeamService = getService(RewardTeamService.class);
-
-    WalletRewardReportService walletRewardService = new WalletRewardReportService(walletAccountService,
-                                                                                  rewardSettingsService,
-                                                                                  rewardTeamService,
-                                                                                  rewardReportStorage);
-
-    WalletTokenAdminService tokenAdminService = Mockito.mock(WalletTokenAdminService.class);
-    resetTokenAdminService(walletTransactionService, tokenAdminService, false, true);
-
-    WalletAccountService accountService = getService(WalletAccountService.class);
-    int enabledWalletsCount = 60;
-    for (int i = 0; i < enabledWalletsCount; i++) {
-      Wallet wallet = newWallet(i + 1l);
-      wallet = accountService.saveWallet(wallet, true);
-      updateWalletBlockchainState(wallet);
-      accountService.saveWalletBlockchainState(wallet, WalletUtils.getContractAddress());
-      entitiesToClean.add(wallet);
-    }
-
-    LocalDate previousMonthDate = LocalDate.of(2022, 03, 01);
-    LocalDate currentMonthDate = LocalDate.of(2022, 04, 01);
-
-    RewardSettings defaultSettings = rewardSettingsService.getSettings();
-    rewardSettingsService.registerPlugin(CUSTOM_REWARD_PLUGIN);
-    try {
-      RewardReport rewardReport = walletRewardService.computeRewards(previousMonthDate);
-      assertEquals(0d, rewardReport.getRemainingTokensToSend(), 0);
-      assertEquals(0d, rewardReport.getTokensSent(), 0);
-
-      // Build new settings
-      RewardSettings newSettings = cloneSettings(rewardSettingsService.getSettings());
-      newSettings.setTimeZone("GMT");
-      Set<RewardPluginSettings> newPluginSettings = newSettings.getPluginSettings();
-
-      newSettings.setPeriodType(RewardPeriodType.MONTH);
-      RewardPluginSettings customPluginSetting = newPluginSettings.stream()
-                                                                  .filter(plugin -> CUSTOM_PLUGIN_ID.equals(plugin.getPluginId()))
-                                                                  .findFirst()
-                                                                  .orElse(null);
-      double sumOfTokensToSend = 5490d;
-      customPluginSetting.setUsePools(false); // NOSONAR
-      customPluginSetting.setBudgetType(RewardBudgetType.FIXED);
-      customPluginSetting.setAmount(sumOfTokensToSend);
-      customPluginSetting.setThreshold(0);
-      customPluginSetting.setEnabled(true);
-      rewardSettingsService.saveSettings(newSettings);
-
-      rewardReport = walletRewardService.computeRewards(previousMonthDate);
-      assertNotNull(rewardReport);
-      assertNotNull(rewardReport.getRewards());
-      assertEquals(enabledWalletsCount, rewardReport.getRewards().size());
-      assertEquals(0d, rewardReport.getTokensSent(), 0);
-      assertEquals(sumOfTokensToSend, rewardReport.getRemainingTokensToSend(), 0);
-
-      // Admin having only 10 tokens
-      int contractDecimals = WalletUtils.getContractDetail().getDecimals();
-      Mockito.when(tokenAdminService.getTokenBalanceOf("adminAddress"))
-             .thenReturn(BigInteger.valueOf((long) sumOfTokensToSend).pow(contractDecimals));
-
-      walletRewardService.sendRewards(previousMonthDate, "root");
-
-      rewardReport = walletRewardService.computeRewards(previousMonthDate);
-      assertEquals(sumOfTokensToSend, rewardReport.getTokensSent(), 0);
-      assertEquals(0d, rewardReport.getRemainingTokensToSend(), 0);
-
-      rewardReport = walletRewardService.computeRewards(currentMonthDate);
-      assertNotNull(rewardReport);
-      assertNotNull(rewardReport.getRewards());
-      assertEquals(enabledWalletsCount, rewardReport.getRewards().size());
-      assertEquals(0d, rewardReport.getTokensSent(), 0);
-      assertEquals(sumOfTokensToSend, rewardReport.getRemainingTokensToSend(), 0);
-
-      newSettings.setTimeZone("Europe/Paris");
-      rewardSettingsService.saveSettings(newSettings);
-
-      rewardReport = walletRewardService.computeRewards(currentMonthDate);
-      assertNotNull(rewardReport);
-      assertNotNull(rewardReport.getRewards());
-      assertEquals(enabledWalletsCount, rewardReport.getRewards().size());
-      assertEquals(0d, rewardReport.getTokensSent(), 0);
-      assertEquals(sumOfTokensToSend, rewardReport.getRemainingTokensToSend(), 0);
-    } finally {
-      rewardSettingsService.unregisterPlugin(CUSTOM_PLUGIN_ID);
-      rewardSettingsService.saveSettings(defaultSettings);
-    }
-  }
-
-  @Test
-  public void testSendRewards() throws Exception {
-    WalletAccountService walletAccountService = getService(WalletAccountService.class);
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-    RewardTeamService rewardTeamService = getService(RewardTeamService.class);
-    WalletTransactionService walletTransactionService = getService(WalletTransactionService.class);
-    WalletRewardReportStorage rewardReportStorage = getService(WalletRewardReportStorage.class);
-
-    WalletRewardReportService walletRewardService = new WalletRewardReportService(walletAccountService,
-                                                                                  rewardSettingsService,
-                                                                                  rewardTeamService,
-                                                                                  rewardReportStorage);
-    WalletTokenAdminService tokenAdminService = Mockito.mock(WalletTokenAdminService.class);
-    resetTokenAdminService(walletTransactionService, tokenAdminService, false, true);
-
-    int contractDecimals = WalletUtils.getContractDetail().getDecimals();
-    LocalDate date = YearMonth.of(2019, 04).atEndOfMonth();
-
-    RewardSettings defaultSettings = rewardSettingsService.getSettings();
-    rewardSettingsService.registerPlugin(CUSTOM_REWARD_PLUGIN);
-    try {
-      // Build new settings
-      RewardSettings newSettings = cloneSettings(rewardSettingsService.getSettings());
-      Set<RewardPluginSettings> newPluginSettings = newSettings.getPluginSettings();
-
-      newSettings.setPeriodType(RewardPeriodType.MONTH);
-      RewardPluginSettings customPluginSetting = newPluginSettings.stream()
-                                                                  .filter(plugin -> CUSTOM_PLUGIN_ID.equals(plugin.getPluginId()))
-                                                                  .findFirst()
-                                                                  .orElse(null);
-      double sumOfTokensToSend = 5490d;
-      customPluginSetting.setUsePools(true); // NOSONAR
-      customPluginSetting.setBudgetType(RewardBudgetType.FIXED);
-      customPluginSetting.setAmount(sumOfTokensToSend);
-      customPluginSetting.setThreshold(0);
-      customPluginSetting.setEnabled(true);
-      rewardSettingsService.saveSettings(newSettings);
-
-      WalletAccountService accountService = getService(WalletAccountService.class);
-      int enabledWalletsCount = 60;
-      for (int i = 0; i < enabledWalletsCount; i++) {
-        Wallet wallet = newWallet(i + 1l);
-        wallet = accountService.saveWallet(wallet, true);
-        updateWalletBlockchainState(wallet);
-        accountService.saveWalletBlockchainState(wallet, WalletUtils.getContractAddress());
-        entitiesToClean.add(wallet);
-      }
-
-      // Build teams
-      List<RewardTeam> teams = new ArrayList<>();
-      RewardTeam rewardTeam1 = createTeamWithMembers(1, 10, RewardBudgetType.COMPUTED, false);
-      teams.add(rewardTeam1);
-      RewardTeam rewardTeam2 = createTeamWithMembers(11, 20, RewardBudgetType.FIXED, false);
-      teams.add(rewardTeam2);
-      RewardTeam rewardTeam3 = createTeamWithMembers(21, 30, RewardBudgetType.FIXED_PER_MEMBER, false);
-      teams.add(rewardTeam3);
-      RewardTeam rewardTeam4 = createTeamWithMembers(31, 40, RewardBudgetType.FIXED_PER_MEMBER, false);
-      teams.add(rewardTeam4);
-      RewardTeam rewardTeam5 = createTeamWithMembers(41, 50, RewardBudgetType.COMPUTED, false);
-      teams.add(rewardTeam5);
-      RewardTeam rewardTeam6 = createTeamWithMembers(51, 60, RewardBudgetType.COMPUTED, false);
-      teams.add(rewardTeam6);
-
-      // Admin having only 10 tokens
-      Mockito.when(tokenAdminService.getTokenBalanceOf("adminAddress"))
-             .thenReturn(BigInteger.valueOf(10l).pow(contractDecimals));
-      try {
-        walletRewardService.sendRewards(date, "root");
-        fail("Shouldn't send funds when admin not having enough funds");
-      } catch (Exception e) {
-        // Expected
-      }
-      Mockito.verify(tokenAdminService, Mockito.times(0)).reward(Mockito.any(), Mockito.any());
-
-      // Admin having enough funds
-      Mockito.when(tokenAdminService.getTokenBalanceOf("adminAddress"))
-             .thenReturn(BigInteger.valueOf((long) sumOfTokensToSend + 1).pow(contractDecimals));
-      walletRewardService.sendRewards(date, "root");
-      Mockito.verify(tokenAdminService, Mockito.times(60)).reward(Mockito.any(), Mockito.any());
-
-      // Send reward for the second time for the same period
-      resetTokenAdminService(walletTransactionService, tokenAdminService, false, true);
-      Mockito.when(tokenAdminService.getTokenBalanceOf("adminAddress"))
-             .thenReturn(BigInteger.valueOf((long) sumOfTokensToSend + 1).pow(contractDecimals));
-      try {
-        walletRewardService.sendRewards(date, "root");
-      } catch (Exception e) {
-        // Expected, no rewards to send
-      }
-      Mockito.verify(tokenAdminService, Mockito.times(0)).reward(Mockito.any(), Mockito.any());
-    } finally {
-      rewardSettingsService.unregisterPlugin(CUSTOM_PLUGIN_ID);
-      rewardSettingsService.saveSettings(defaultSettings);
-    }
-  }
-
-  @Test
-  public void testSaveRewardReport() {
-    RewardReport rewardReport = new RewardReport();
-    LocalDate date = LocalDate.now();
-
-    WalletAccountService accountService = getService(WalletAccountService.class);
-
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-    RewardSettings defaultSettings = rewardSettingsService.getSettings();
-
-    RewardPeriod period = defaultSettings.getPeriodType().getPeriodOfTime(date, ZoneId.systemDefault());
-    rewardReport.setPeriod(period);
-    Set<WalletReward> rewards = new HashSet<>();
-    for (int i = 0; i < 20; i++) {
-      Wallet wallet = newWallet(i + 1l);
-      wallet = accountService.saveWallet(wallet, true);
-      updateWalletBlockchainState(wallet);
-      accountService.saveWalletBlockchainState(wallet, WalletUtils.getContractAddress());
-      entitiesToClean.add(wallet);
-
-      WalletReward walletReward = new WalletReward();
-      walletReward.setWallet(wallet);
-      walletReward.setPeriod(period);
-      Set<WalletPluginReward> pluginRewards = new HashSet<>();
-      for (int j = 0; j < 10; j++) {
-        WalletPluginReward pluginReward = new WalletPluginReward();
-        pluginReward.setAmount(5);
-        pluginReward.setIdentityId(wallet.getTechnicalId());
-        pluginReward.setPluginId("plugin" + j);
-        pluginReward.setPoints(5);
-        pluginReward.setPoolsUsed(false);
-        pluginRewards.add(pluginReward);
-      }
-      walletReward.setRewards(pluginRewards);
-      rewards.add(walletReward);
-    }
-    rewardReport.setRewards(rewards);
-
-    RewardReportService rewardReportService = getService(RewardReportService.class);
-    rewardReportService.saveRewardReport(rewardReport);
-
-    RequestLifeCycle.end();
-    RequestLifeCycle.begin(container);
-
-    RewardReport savedRewardReport = rewardReportService.getRewardReport(date);
-    assertEquals(rewardReport, savedRewardReport);
-
-    RewardPeriod rewardPeriod = rewardReportService.getRewardPeriod(period.getRewardPeriodType(), period.getPeriodMedianDate());
-    assertNotNull(rewardPeriod);
-    assertTrue(rewardPeriod.getId() > 0);
-
-    RewardReport report = rewardReportService.getRewardReportByPeriodId(rewardPeriod.getId());
-    assertNotNull(report);
-    assertNotNull(report.getPeriod());
-    assertEquals(rewardPeriod.getId(), report.getPeriod().getId());
-  }
-
-  @Test
-  public void testFindRewardReportPeriods() {
-    RewardReport rewardReport = new RewardReport();
-    LocalDate date = LocalDate.now();
-
-    WalletAccountService accountService = getService(WalletAccountService.class);
-
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-    RewardSettings defaultSettings = rewardSettingsService.getSettings();
-
-    RewardPeriod period = defaultSettings.getPeriodType().getPeriodOfTime(date, ZoneId.systemDefault());
-    rewardReport.setPeriod(period);
-    Set<WalletReward> rewards = new HashSet<>();
-    for (int i = 0; i < 20; i++) {
-      Wallet wallet = newWallet(i + 1l);
-      wallet = accountService.saveWallet(wallet, true);
-      updateWalletBlockchainState(wallet);
-      accountService.saveWalletBlockchainState(wallet, WalletUtils.getContractAddress());
-      entitiesToClean.add(wallet);
-
-      WalletReward walletReward = new WalletReward();
-      walletReward.setWallet(wallet);
-      walletReward.setPeriod(period);
-      Set<WalletPluginReward> pluginRewards = new HashSet<>();
-      for (int j = 0; j < 10; j++) {
-        WalletPluginReward pluginReward = new WalletPluginReward();
-        pluginReward.setAmount(5);
-        pluginReward.setIdentityId(wallet.getTechnicalId());
-        pluginReward.setPluginId("plugin" + j);
-        pluginReward.setPoints(5);
-        pluginReward.setPoolsUsed(false);
-        pluginRewards.add(pluginReward);
-      }
-      walletReward.setRewards(pluginRewards);
-      rewards.add(walletReward);
-    }
-    rewardReport.setRewards(rewards);
-
-    RewardReportService rewardReportService = getService(RewardReportService.class);
-    rewardReportService.saveRewardReport(rewardReport);
-
-    restartTransaction();
-
-    List<RewardPeriod> rewardReportPeriods = rewardReportService.findRewardReportPeriods(0, 1);
-    assertNotNull(rewardReportPeriods);
-    assertEquals(1, rewardReportPeriods.size());
-
-    long from = timeToSecondsAtDayStart(LocalDate.now(), ZoneId.systemDefault());
-    long to = timeToSecondsAtDayStart(LocalDate.now().plusMonths(1), ZoneId.systemDefault());
-    rewardReportPeriods = rewardReportService.findRewardPeriodsBetween(from, to, 0, 10);
-    assertNotNull(rewardReportPeriods);
-    assertEquals(1, rewardReportPeriods.size());
-  }
-
-  @Test
-  public void testListRewards() throws Exception {
-    WalletAccountService walletAccountService = getService(WalletAccountService.class);
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-    RewardTeamService rewardTeamService = getService(RewardTeamService.class);
-    WalletTransactionService walletTransactionService = getService(WalletTransactionService.class);
-    WalletRewardReportStorage rewardReportStorage = getService(WalletRewardReportStorage.class);
-
-    WalletRewardReportService walletRewardService = new WalletRewardReportService(walletAccountService,
-                                                                                  rewardSettingsService,
-                                                                                  rewardTeamService,
-                                                                                  rewardReportStorage);
-
-    WalletTokenAdminService tokenAdminService = Mockito.mock(WalletTokenAdminService.class);
-    resetTokenAdminService(walletTransactionService, tokenAdminService, false, true);
-
-    int contractDecimals = WalletUtils.getContractDetail().getDecimals();
-    LocalDate date = YearMonth.of(2019, 05).atEndOfMonth();
-
-    RewardSettings defaultSettings = rewardSettingsService.getSettings();
-    rewardSettingsService.registerPlugin(CUSTOM_REWARD_PLUGIN);
-    try {
-      // Build new settings
-      RewardSettings newSettings = cloneSettings(rewardSettingsService.getSettings());
-      Set<RewardPluginSettings> newPluginSettings = newSettings.getPluginSettings();
-
-      newSettings.setPeriodType(RewardPeriodType.MONTH);
-      RewardPluginSettings customPluginSetting = newPluginSettings.stream()
-                                                                  .filter(plugin -> CUSTOM_PLUGIN_ID.equals(plugin.getPluginId()))
-                                                                  .findFirst()
-                                                                  .orElse(null);
-      double sumOfTokensToSend = 5490d;
-      customPluginSetting.setUsePools(true); // NOSONAR
-      customPluginSetting.setBudgetType(RewardBudgetType.FIXED);
-      customPluginSetting.setAmount(sumOfTokensToSend);
-      customPluginSetting.setThreshold(0);
-      customPluginSetting.setEnabled(true);
-      rewardSettingsService.saveSettings(newSettings);
-
-      WalletAccountService accountService = getService(WalletAccountService.class);
-      int enabledWalletsCount = 60;
-      for (int i = 0; i < enabledWalletsCount; i++) {
-        Wallet wallet = newWallet(i + 1l);
-        wallet = accountService.saveWallet(wallet, true);
-        updateWalletBlockchainState(wallet);
-        accountService.saveWalletBlockchainState(wallet, WalletUtils.getContractAddress());
-        entitiesToClean.add(wallet);
-      }
-
-      // Build teams
-      List<RewardTeam> teams = new ArrayList<>();
-      RewardTeam rewardTeam1 = createTeamWithMembers(1, 10, RewardBudgetType.COMPUTED, false);
-      teams.add(rewardTeam1);
-      RewardTeam rewardTeam2 = createTeamWithMembers(11, 20, RewardBudgetType.FIXED, false);
-      teams.add(rewardTeam2);
-      RewardTeam rewardTeam3 = createTeamWithMembers(21, 30, RewardBudgetType.FIXED_PER_MEMBER, false);
-      teams.add(rewardTeam3);
-      RewardTeam rewardTeam4 = createTeamWithMembers(31, 40, RewardBudgetType.FIXED_PER_MEMBER, false);
-      teams.add(rewardTeam4);
-      RewardTeam rewardTeam5 = createTeamWithMembers(41, 50, RewardBudgetType.COMPUTED, false);
-      teams.add(rewardTeam5);
-      RewardTeam rewardTeam6 = createTeamWithMembers(51, 60, RewardBudgetType.COMPUTED, false);
-      teams.add(rewardTeam6);
-
-      List<WalletReward> walletRewards = walletRewardService.listRewards("root3", 10);
-      assertNotNull(walletRewards);
-      assertEquals(0, walletRewards.size());
-
-      // Admin having enough funds
-      Mockito.when(tokenAdminService.getTokenBalanceOf("adminAddress"))
-             .thenReturn(BigInteger.valueOf((long) sumOfTokensToSend + 1).pow(contractDecimals));
-      walletRewardService.sendRewards(date, "root");
-      Mockito.verify(tokenAdminService, Mockito.times(60)).reward(Mockito.any(), Mockito.any());
-
-      walletRewards = walletRewardService.listRewards("root3", 10);
-      assertNotNull(walletRewards);
-      assertEquals(1, walletRewards.size());
-
-      WalletReward walletReward = walletRewards.get(0);
-      assertNotNull(walletReward);
-      assertNotNull(walletReward.getPeriod());
-      assertNotNull(walletReward.getTransaction());
-      assertEquals(RewardUtils.TRANSACTION_STATUS_SUCCESS, walletReward.getStatus());
-      assertNotNull(walletReward.getWallet());
-      assertEquals(3, walletReward.getIdentityId());
-      assertEquals(3, walletReward.getWallet().getTechnicalId());
-      assertNotNull(walletReward.getTeam());
-      assertNotNull(walletReward.getTeams());
-      assertEquals(1, walletReward.getTeams().size());
-
-      assertNotNull(walletReward.getRewards());
-      assertEquals(1, walletReward.getRewards().size());
-      WalletPluginReward pluginReward = walletReward.getRewards().iterator().next();
-      assertNotNull(pluginReward);
-      assertEquals(CUSTOM_PLUGIN_ID, pluginReward.getPluginId());
-      assertEquals(3, pluginReward.getPoints(), 0);
-      assertEquals(3, pluginReward.getIdentityId());
-      assertEquals(58, pluginReward.getAmount(), 0.1);
-    } finally {
-      rewardSettingsService.unregisterPlugin(CUSTOM_PLUGIN_ID);
-      rewardSettingsService.saveSettings(defaultSettings);
-    }
-  }
-
-  private void resetTokenAdminService(WalletTransactionService walletTransactionService,
-                                      WalletTokenAdminService tokenAdminService,
-                                      boolean pendingTransactions,
-                                      boolean successTransactions) throws Exception { // NOSONAR
-    if (container.getComponentInstanceOfType(WalletTokenAdminService.class) != null) {
-      container.unregisterComponent(WalletTokenAdminService.class);
-    }
-    container.registerComponentInstance(WalletTokenAdminService.class, tokenAdminService);
-    Mockito.reset(tokenAdminService);
-    Mockito.when(tokenAdminService.getAdminWalletAddress()).thenReturn("adminAddress");
-    Mockito.when(tokenAdminService.reward(Mockito.any(), Mockito.any())).thenAnswer(new Answer<TransactionDetail>() {
-      @Override
-      public TransactionDetail answer(InvocationOnMock invocation) throws Throwable {
-        TransactionDetail transactionDetail = invocation.getArgument(0, TransactionDetail.class);
-        saveRewardTransaction(walletTransactionService, pendingTransactions, successTransactions, transactionDetail);
-        return transactionDetail;
-      }
-
+    int enabledWalletsCount = 59;
+    Set<Wallet> wallets = Collections.newSetFromMap(new ConcurrentHashMap<>());
+    IntStream.range(0, enabledWalletsCount).parallel().forEach(i -> {
+      Wallet wallet = newWallet(i + 1L);
+      wallets.add(wallet);
     });
-  }
+    when(walletAccountService.listWallets()).thenReturn(wallets);
 
-  private RewardTeam createTeamWithMembers(int startInclusive,
-                                           int endInclusive,
-                                           RewardBudgetType budgetType,
-                                           boolean disabled) {
-    WalletRewardTeamService rewardTeamService = getService(WalletRewardTeamService.class);
-    long[] memberIds = LongStream.rangeClosed(startInclusive, endInclusive).toArray();
-    RewardTeam rewardTeam = newRewardTeam(memberIds);
-    rewardTeam.setName("Name" + startInclusive);
-    rewardTeam.setDisabled(disabled);
-    rewardTeam.setRewardType(budgetType);
-    double totalBudget = (double) LongStream.rangeClosed(startInclusive, endInclusive).sum() * 3d;
-    if (budgetType == RewardBudgetType.COMPUTED || budgetType == RewardBudgetType.FIXED) {
-      rewardTeam.setBudget(totalBudget);
-    } else {
-      rewardTeam.setBudget(totalBudget / memberIds.length);
-    }
-    rewardTeam = rewardTeamService.saveTeam(rewardTeam);
-    entitiesToClean.add(rewardTeam);
-    return rewardTeam;
-  }
-
-  private double checkComputedRewards(WalletRewardReportService walletRewardService,
-                                      LocalDate date,
-                                      int enabledWalletsCount,
-                                      long amount) {
-    double sumOfTokensToSend = 0;
-    RewardReport rewardReport = walletRewardService.computeRewards(date);
+    rewardReport = rewardReportService.computeRewards(date);
     assertNotNull(rewardReport);
-    Set<WalletReward> rewards = rewardReport.getRewards();
-    assertNotNull(rewards);
-
-    assertEquals(enabledWalletsCount, rewardReport.getValidRewardCount());
-    for (WalletReward walletReward : rewardReport.getValidRewards()) {
-      assertNotNull(walletReward);
-      assertNotNull(walletReward.getWallet());
-      assertNotNull(walletReward.getRewards());
-      assertEquals(1, walletReward.getRewards().size());
-      assertEquals(0, walletReward.getTokensSent(), 0);
-      long tokensToSend = walletReward.getIdentityId() * amount;
-      sumOfTokensToSend += tokensToSend;
-      assertEquals("Wallet '" + walletReward + "' has an unexpected reward amount",
-                   tokensToSend,
-                   walletReward.getTokensToSend(),
-                   0);
-    }
-    return sumOfTokensToSend;
-  }
-
-  private TransactionDetail createWalltRewardTransaction(WalletTransactionService walletTransactionService,
-                                                         WalletReward walletReward) {
-    TransactionDetail transactionDetail = new TransactionDetail();
-    transactionDetail.setFrom("adminWalletAddress");
-    transactionDetail.setTo(walletReward.getWallet().getAddress());
-    transactionDetail.setContractAmount(walletReward.getTokensToSend());
-    transactionDetail.setValue(walletReward.getTokensToSend());
-    saveRewardTransaction(walletTransactionService, false, true, transactionDetail);
-    return transactionDetail;
+    // Even if settings are null, the returned rewards shouldn't be empty
+    assertEquals(enabledWalletsCount, rewardReport.getRewards().size());
   }
 
-  private void saveRewardTransaction(WalletTransactionService walletTransactionService,
-                                     boolean pendingTransactions,
-                                     boolean successTransactions,
-                                     TransactionDetail transactionDetail) {
-    transactionDetail.setHash(generateTransactionHash());
-    transactionDetail.setPending(pendingTransactions);
-    transactionDetail.setSucceeded(successTransactions);
-    transactionDetail.setContractMethodName("reward");
-    RequestLifeCycle.begin(container);
-    try {
-      walletTransactionService.saveTransactionDetail(transactionDetail, false);
-    } finally {
-      RequestLifeCycle.end();
-    }
-    entitiesToClean.add(transactionDetail);
+  protected Wallet newWallet(long identityId) {
+    Wallet wallet = new Wallet();
+    wallet.setTechnicalId(identityId);
+    wallet.setAddress("walletAddress" + identityId);
+    wallet.setPassPhrase("passphrase");
+    wallet.setEnabled(true);
+    wallet.setIsInitialized(true);
+    wallet.setEtherBalance(0d);
+    wallet.setTokenBalance(0d);
+    wallet.setInitializationState(WalletState.INITIALIZED.name());
+    return wallet;
   }
-
 }
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardSettingsServiceTest.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardSettingsServiceTest.java
index 702023be5..0fd8b953f 100644
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardSettingsServiceTest.java
+++ b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardSettingsServiceTest.java
@@ -1,174 +1,104 @@
 /*
  * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
+ *
+ * Copyright (C) 2020 - 2024 Meeds Lab contact@meedslab.com
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 package org.exoplatform.wallet.reward.service;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Test;
+import com.google.javascript.jscomp.jarjar.com.google.common.base.Objects;
+import org.exoplatform.commons.api.settings.SettingService;
+import org.exoplatform.commons.api.settings.SettingValue;
+import org.junit.jupiter.api.Test;
 
 import org.exoplatform.wallet.model.reward.RewardBudgetType;
 import org.exoplatform.wallet.model.reward.RewardPeriodType;
-import org.exoplatform.wallet.model.reward.RewardPluginSettings;
 import org.exoplatform.wallet.model.reward.RewardSettings;
-import org.exoplatform.wallet.reward.BaseWalletRewardTest;
-import org.exoplatform.wallet.reward.api.RewardPlugin;
-
-public class WalletRewardSettingsServiceTest extends BaseWalletRewardTest {
-
-  /**
-   * Check that service is instantiated
-   */
-  @Test
-  public void testServiceInstantiated() {
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-    assertNotNull(rewardSettingsService);
-  }
-
-  @Test
-  public void tetGetRewardPlugins() {
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-
-    Collection<RewardPlugin> rewardPlugins = rewardSettingsService.getRewardPlugins();
-    assertNotNull("List of rewards plugins shouldn't be null", rewardPlugins);
-    assertEquals("Unexpected reward plugins count", 2, rewardPlugins.size());
-  }
-
-  @Test
-  public void tetGetRewardPlugin() {
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-
-    String pluginId = "kudos";
-    RewardPlugin kudosRewardPlugin = rewardSettingsService.getRewardPlugin(pluginId);
-    assertNotNull("Rewards plugin 'kudos' shouldn't be null", kudosRewardPlugin);
-    assertEquals("Unexpected reward plugin name", pluginId, kudosRewardPlugin.getName());
-    assertEquals("Unexpected reward plugin id", pluginId, kudosRewardPlugin.getPluginId());
-    Map<Long, Double> earnedPoints = kudosRewardPlugin.getEarnedPoints(Collections.emptySet(), 0, Long.MAX_VALUE);
-    assertEquals("Unexpected reward plugin earned points",
-                 new HashMap<>(),
-                 earnedPoints);
-  }
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 
-  @Test
-  public void testRegisterPlugin() {
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
+import static org.exoplatform.wallet.utils.WalletUtils.toJsonString;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.*;
 
-    rewardSettingsService.registerPlugin(CUSTOM_REWARD_PLUGIN);
-    try {
-      RewardPlugin registeredRewardPlugin = rewardSettingsService.getRewardPlugin(CUSTOM_PLUGIN_ID);
+@SpringBootTest(classes = { WalletRewardSettingsService.class })
+public class WalletRewardSettingsServiceTest {
 
-      assertNotNull("Rewards plugin 'kudos' shouldn't be null", registeredRewardPlugin);
-      assertEquals("Returned rewards plugin isn't the same as the registered one", CUSTOM_REWARD_PLUGIN, registeredRewardPlugin);
-      assertEquals("Unexpected reward plugin name", CUSTOM_PLUGIN_NAME, CUSTOM_REWARD_PLUGIN.getName());
-      assertEquals("Unexpected reward plugin id", CUSTOM_PLUGIN_ID, CUSTOM_REWARD_PLUGIN.getPluginId());
-      assertTrue("Reward plugin should be enabled by default", CUSTOM_REWARD_PLUGIN.isEnabled());
+  @MockBean
+  private SettingService        settingService;
 
-      Set<Long> identityIds = new HashSet<>(Arrays.asList(1l, 2l, 3l, 4l, 5l));
-      Map<Long, Double> expectedRewards = getEarnedPoints(identityIds);
-      Map<Long, Double> earnedPoints = CUSTOM_REWARD_PLUGIN.getEarnedPoints(identityIds, 0, Long.MAX_VALUE);
-      assertEquals("Unexpected reward plugin earned points",
-                   expectedRewards,
-                   earnedPoints);
-    } finally {
-      rewardSettingsService.unregisterPlugin(CUSTOM_PLUGIN_ID);
-    }
-  }
+  @Autowired
+  private RewardSettingsService rewardSettingsService;
 
   @Test
   public void testGetSettings() {
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
 
     RewardSettings defaultSettings = rewardSettingsService.getSettings();
+    verify(settingService, times(1)).get(any(), any(), any());
     assertNotNull(defaultSettings);
-    assertEquals("Wrong default reward period type", RewardPeriodType.DEFAULT, defaultSettings.getPeriodType());
-
-    Set<RewardPluginSettings> pluginSettings = defaultSettings.getPluginSettings();
-    assertNotNull("List of rewards plugin settings shouldn't be null", pluginSettings);
-    assertEquals("Unexpected reward plugin settings count", 2, pluginSettings.size());
+    assertEquals(RewardPeriodType.DEFAULT, defaultSettings.getPeriodType());
 
-    RewardPluginSettings rewardPluginSettings = pluginSettings.iterator().next();
-    assertNotNull(rewardPluginSettings);
-    assertEquals(0, rewardPluginSettings.getAmount(), 0);
-    assertEquals(RewardBudgetType.DEFAULT, rewardPluginSettings.getBudgetType());
-    assertEquals(0, rewardPluginSettings.getThreshold(), 0);
-    assertFalse(rewardPluginSettings.isEnabled());
+    assertEquals(0, defaultSettings.getAmount(), 0);
+    assertEquals(RewardBudgetType.DEFAULT, defaultSettings.getBudgetType());
+    assertEquals(0, defaultSettings.getThreshold(), 0);
   }
 
   @Test
   public void testSaveSettings() {
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-
     RewardSettings defaultSettings = rewardSettingsService.getSettings();
-    RewardSettings newSettings = cloneSettings(defaultSettings);
-
-    Set<RewardPluginSettings> newPluginSettings = newSettings.getPluginSettings();
-    long amount = 1l;
-    boolean enabled = true;
-    boolean usePools = true;
-    long threshold = 2l;
+    RewardSettings newSettings = defaultSettings.clone();
+    long amount = 1L;
+    long threshold = 2L;
     RewardBudgetType budgetType = RewardBudgetType.FIXED_PER_POINT;
     RewardPeriodType periodType = RewardPeriodType.SEMESTER;
 
     newSettings.setPeriodType(periodType);
-    for (RewardPluginSettings pluginSetting : newPluginSettings) {
-      pluginSetting.setAmount(amount);
-      pluginSetting.setBudgetType(budgetType);
-      pluginSetting.setEnabled(enabled);
-      pluginSetting.setThreshold(threshold);
-      pluginSetting.setUsePools(usePools);
-    }
+    newSettings.setAmount(amount);
+    newSettings.setBudgetType(budgetType);
+    newSettings.setThreshold(threshold);
+
     rewardSettingsService.saveSettings(newSettings);
+    RewardSettings finalNewSettings = newSettings;
+    verify(settingService, times(1)).set(any(),
+                                         any(),
+                                         any(),
+                                         argThat(value -> Objects.equal(value.getValue(), toJsonString(finalNewSettings))));
     try {
+      SettingValue value = SettingValue.create(toJsonString(finalNewSettings));
+      when(settingService.get(any(), any(), any())).thenReturn(value);
       newSettings = rewardSettingsService.getSettings();
 
       assertNotNull(newSettings);
       assertEquals(periodType, newSettings.getPeriodType());
-      newPluginSettings = newSettings.getPluginSettings();
-      for (RewardPluginSettings pluginSetting : newPluginSettings) {
-        assertEquals(amount, pluginSetting.getAmount(), 0);
-        assertEquals(threshold, pluginSetting.getThreshold(), 0);
-        assertFalse("Enablement should be retrieved always from registered plugin and not from storage",
-                    pluginSetting.isEnabled());
-        assertEquals(budgetType, pluginSetting.getBudgetType());
-        assertFalse("Pools can't be used when budget type equals to 'FIXED_PER_POINT'", pluginSetting.isUsePools());
-      }
+      assertEquals(amount, newSettings.getAmount(), 0);
+      assertEquals(threshold, newSettings.getThreshold(), 0);
+      assertEquals(budgetType, newSettings.getBudgetType());
 
       budgetType = RewardBudgetType.FIXED;
-      for (RewardPluginSettings pluginSetting : newPluginSettings) {
-        pluginSetting.setBudgetType(budgetType);
-        pluginSetting.setUsePools(usePools);
-      }
+      newSettings.setBudgetType(budgetType);
       rewardSettingsService.saveSettings(newSettings);
-
+      value = SettingValue.create(toJsonString(newSettings));
+      when(settingService.get(any(), any(), any())).thenReturn(value);
       newSettings = rewardSettingsService.getSettings();
-
-      newPluginSettings = newSettings.getPluginSettings();
-      for (RewardPluginSettings pluginSetting : newPluginSettings) {
-        assertEquals(budgetType, pluginSetting.getBudgetType());
-        assertTrue("Pools should be saved using new value 'true' when budget type is set to 'FIXED'", pluginSetting.isUsePools());
-      }
+      assertEquals(budgetType, newSettings.getBudgetType());
     } finally {
       rewardSettingsService.saveSettings(defaultSettings);
     }
   }
-
 }
diff --git a/wallet-reward-services/src/test/resources/conf/test-wallet-reward-configuration.xml b/wallet-reward-services/src/test/resources/conf/test-wallet-reward-configuration.xml
index a510d4283..f4a966a7e 100644
--- a/wallet-reward-services/src/test/resources/conf/test-wallet-reward-configuration.xml
+++ b/wallet-reward-services/src/test/resources/conf/test-wallet-reward-configuration.xml
@@ -3,138 +3,4 @@
   for more details. You should have received a copy of the GNU Lesser General Public License along with this software; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. -->
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
 
-  <component>
-    <key>org.exoplatform.social.core.space.spi.SpaceService</key>
-    <type>org.exoplatform.wallet.reward.test.mock.SpaceServiceMock</type>
-  </component>
-
-  <component>
-    <key>org.exoplatform.social.core.manager.IdentityManager</key>
-    <type>org.exoplatform.wallet.reward.test.mock.IdentityManagerMock</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.dao.RewardTeamDAO</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.dao.RewardPluginDAO</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.dao.RewardDAO</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.dao.RewardPeriodDAO</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.dao.RewardTeamDAO</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.storage.WalletRewardTeamStorage</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.storage.WalletRewardReportStorage</type>
-  </component>
-
-  <component>
-    <key>org.exoplatform.wallet.reward.service.RewardTeamService</key>
-    <type>org.exoplatform.wallet.reward.service.WalletRewardTeamService</type>
-  </component>
-
-  <component>
-    <key>org.exoplatform.wallet.reward.service.RewardSettingsService</key>
-    <type>org.exoplatform.wallet.reward.service.WalletRewardSettingsService</type>
-    <component-plugins>
-      <component-plugin>
-        <name>gamification</name>
-        <set-method>registerPlugin</set-method>
-        <type>org.exoplatform.wallet.reward.plugin.GamificationRewardPlugin</type>
-        <description>Gamification points reward plugin</description>
-      </component-plugin>
-      <component-plugin>
-        <name>kudos</name>
-        <set-method>registerPlugin</set-method>
-        <type>org.exoplatform.wallet.reward.plugin.KudosRewardPlugin</type>
-        <description>Kudos reward plugin</description>
-      </component-plugin>
-    </component-plugins>
-  </component>
-
-  <component>
-    <key>org.exoplatform.wallet.reward.service.RewardReportService</key>
-    <type>org.exoplatform.wallet.reward.service.WalletRewardReportService</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.rest.RewardTeamREST</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.rest.RewardSettingsREST</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.rest.RewardReportREST</type>
-  </component>
-
-  <external-component-plugins>
-    <target-component>org.exoplatform.commons.api.persistence.DataInitializer</target-component>
-    <component-plugin>
-      <name>WalletRDBMSChangeLogsPlugin</name>
-      <set-method>addChangeLogsPlugin</set-method>
-      <type>org.exoplatform.commons.persistence.impl.ChangeLogsPlugin</type>
-      <init-params>
-        <values-param>
-          <name>changelogs</name>
-          <description>Change logs of Wallet RDBMS</description>
-          <value>db/changelog/reward-rdbms.db.changelog-master.xml</value>
-        </values-param>
-      </init-params>
-    </component-plugin>
-  </external-component-plugins>
-
-  <external-component-plugins>
-    <target-component>org.exoplatform.services.scheduler.JobSchedulerService</target-component>
-    <component-plugin>
-      <name>AddCronJob</name>
-      <set-method>addCronJob</set-method>
-      <type>org.exoplatform.services.scheduler.CronJob</type>
-      <description>Add a job to verify if rewards sent having pending transactions are completely successfully sent</description>
-      <init-params>
-        <properties-param>
-          <name>cronjob.info</name>
-          <description>Configuration for rewards transactions status verifier</description>
-          <property name="jobName" value="RewardStatusVerifierJob"/>
-          <property name="groupName" value="Wallet"/>
-          <property name="job" value="org.exoplatform.wallet.reward.job.RewardStatusVerifierJob"/>
-          <property name="expression" value="${exo.wallet.RewardStatusVerifierJob.expression:0 * * * * ?}"/>
-        </properties-param>
-      </init-params>
-    </component-plugin>
-  </external-component-plugins>
-
-  <external-component-plugins>
-    <target-component>org.exoplatform.services.listener.ListenerService</target-component>
-    <component-plugin>
-      <name>exo.wallet.reward.report.success</name>
-      <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.reward.listener.RewardSucceedAnalyticsListener</type>
-    </component-plugin>
-    <component-plugin>
-      <name>exo.wallet.reward.report.success</name>
-      <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.reward.listener.RewardSucceedNotificationListener</type>
-    </component-plugin>
-    <component-plugin>
-      <name>exo.wallet.transaction.replaced</name>
-      <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.reward.listener.RewardSucceedNotificationListener</type>
-    </component-plugin>
-  </external-component-plugins>
-
 </configuration>
diff --git a/wallet-services/src/main/resources/jpa-entities.idx b/wallet-services/src/main/resources/jpa-entities.idx
new file mode 100644
index 000000000..a0c675667
--- /dev/null
+++ b/wallet-services/src/main/resources/jpa-entities.idx
@@ -0,0 +1,6 @@
+org.exoplatform.wallet.entity.AddressLabelEntity
+org.exoplatform.wallet.entity.TransactionEntity
+org.exoplatform.wallet.entity.WalletBackupEntity
+org.exoplatform.wallet.entity.WalletBlockchainStateEntity
+org.exoplatform.wallet.entity.WalletEntity
+org.exoplatform.wallet.entity.WalletPrivateKeyEntity
diff --git a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
index 33fd07988..08496f80c 100644
--- a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
+++ b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
@@ -498,7 +498,38 @@ wallet.administration.fundWallet=Fund Wallet
 wallet.administration.manageWallet=Manage wallet
 wallet.administration.budgetConfiguration=Budget Configuration
 wallet.administration.budgetConfiguration.setUp=Setup the Rewarding Budget
+wallet.administration.budgetConfiguration.points=Points
 wallet.administration.budgetConfiguration.setBudget=Set Budget
+wallet.administration.budgetConfiguration.editConfiguration=Edit Configuration
+wallet.administration.budgetConfiguration.periodType.title=Rewards are sent
+wallet.administration.budgetConfiguration.timeZone.title=If contributions are done
+wallet.administration.budgetConfiguration.threshold.title=For contributors with a minimum of
+wallet.administration.budgetConfiguration.budgetFixed.title=Budget is fixed
+wallet.administration.budgetConfiguration.budgetPerContributor.title=Budget is per Contributor
+
+wallet.administration.budgetConfigurationDrawer.title=Set Global Budget
+wallet.administration.budgetConfigurationDrawer.periodType=Rewarding Periodicity
+wallet.administration.budgetConfigurationDrawer.periodType.title=Rewarding will be done
+wallet.administration.budgetConfigurationDrawer.timeZone=Contributions Listing Timezone
+wallet.administration.budgetConfigurationDrawer.timeZone.title=Following timezone will be applied
+wallet.administration.budgetConfigurationDrawer.threshold.title=Minimum threshold to reward users
+wallet.administration.budgetConfigurationDrawer.amount.title=Budget
+wallet.administration.budgetConfigurationDrawer.budgetFixed=Fixed
+wallet.administration.budgetConfigurationDrawer.budgetPerContributor=Per Contributor
+wallet.administration.budgetConfigurationDrawer.invalidThreshold=Please choose a threshold value less than {0} points.
+wallet.administration.budgetConfigurationDrawer.invalidAmount=Please choose an amount value less than {0} Meeds.
+
+wallet.administration.distributionForecast=Distribution Forecast
+wallet.administration.distributionForecast.subtile=Based on current contributions
+wallet.administration.distributionForecast.participants=Participants
+wallet.administration.distributionForecast.eligibleContributors=Eligible Contributors
+wallet.administration.distributionForecast.acceptedContributions=Accepted Contributions
+wallet.administration.distributionForecast.budget=Budget
+
+wallet.administration.periodType.label.week=Weekly
+wallet.administration.periodType.label.month=Monthly
+wallet.administration.periodType.label.quarter=Quarterly
+
 wallet.administration.rewardManagement=Reward Management
 wallet.administration.rewardManagement.noContributionsYet=No contributions to reward yet
 
diff --git a/wallet-webapps/pom.xml b/wallet-webapps/pom.xml
index cb5840f84..f07e425b7 100644
--- a/wallet-webapps/pom.xml
+++ b/wallet-webapps/pom.xml
@@ -26,6 +26,12 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <packaging>war</packaging>
   <name>Meeds:: Add-on:: Wallet - Application</name>
   <dependencies>
+    <dependency>
+      <groupId>io.meeds.social</groupId>
+      <artifactId>social-component-service</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Platform-ui for Less Variables use-->
     <dependency>
       <groupId>io.meeds.platform-ui</groupId>
       <artifactId>platform-ui-skin</artifactId>
diff --git a/wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java b/wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java
new file mode 100644
index 000000000..32a7049bc
--- /dev/null
+++ b/wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+package io.meeds.wallet;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
+import org.springframework.context.annotation.PropertySource;
+
+import io.meeds.spring.AvailableIntegration;
+import io.meeds.spring.kernel.PortalApplicationContextInitializer;
+
+@SpringBootApplication(scanBasePackages = { 
+        WalletApplication.MODULE_NAME,
+        AvailableIntegration.KERNEL_MODULE,
+        AvailableIntegration.JPA_MODULE, 
+        AvailableIntegration.WEB_MODULE, 
+}, 
+exclude = {
+        LiquibaseAutoConfiguration.class,
+})
+@PropertySource("classpath:application.properties")
+@PropertySource("classpath:application-common.properties")
+public class WalletApplication extends PortalApplicationContextInitializer {
+
+  public static final String MODULE_NAME = "io.meeds.wallet";
+
+}
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/RewardService.js b/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/RewardService.js
index 2f4a01763..cb28c2070 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/RewardService.js
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/RewardService.js
@@ -20,8 +20,7 @@ export function getRewardSettings() {
     method: 'GET',
     credentials: 'include',
   })
-    .then((resp) => resp && resp.ok && resp.json())
-    .then((settings) => (window.walletRewardSettings = settings));
+    .then((resp) => resp && resp.ok && resp.json());
 }
 
 export function saveRewardSettings(settings) {
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
index bda65a548..ef9b12297 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
@@ -29,8 +29,65 @@
         flat>
         <wallet-current-balance />
       </v-card>
-      <wallet-budget-configuration />
+      <wallet-budget-configuration
+        :loading="loading"
+        :reward-settings="rewardSettings"
+        :reward-report="rewardReport"
+        @openConfiguration="openBudgetConfigurationDrawer" />
     </div>
     <wallet-reward-management />
+    <wallet-budget-configuration-drawer
+      :reward-settings="rewardSettings"
+      :reward-report="rewardReport"
+      @setting-updated="refreshRewardSettings"
+      ref="budgetConfiguration" />
   </v-app>
 </template>
+
+<script>
+
+export default {
+  data: () => ({
+    rewardSettings: {},
+    loading: false,
+    rewardReport: null,
+  }),
+  computed: {
+    rewardPeriod() {
+      return this.rewardReport?.period;
+    },
+    selectedDate() {
+      return this.rewardPeriod?.startDate.substring(0, 10) || new Date().toISOString().substring(0, 10);
+    },
+  },
+  created() {
+    this.refreshRewardSettings();
+  },
+  methods: {
+    openBudgetConfigurationDrawer() {
+      this.$refs.budgetConfiguration.open();
+    },
+    refreshRewardSettings() {
+      this.loading = true;
+      return this.$rewardService.getRewardSettings()
+        .then(settings => {
+          this.rewardSettings = settings || {};
+        })
+        .then(() => this.refreshRewards())
+        .finally(() => this.loading = false);
+    },
+    refreshRewards(period) {
+      if (period) {
+        this.period = period;
+      }
+      this.loading = true;
+      return this.$rewardService.computeRewards(this.selectedDate)
+        .then(rewardReport => {
+          this.rewardReport = rewardReport;
+          return this.$nextTick();
+        })
+        .finally(() => this.loading = false);
+    },
+  },
+};
+</script>
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
index dd54d856e..010062293 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
@@ -20,24 +20,181 @@
 -->
 <template>
   <v-card
+    :loading="loading"
     class="border-radius border-color my-5 me-5"
     width="60%"
     flat>
     <div class="d-flex flex-column flex-grow-1">
-      <div class="text-header text-wrap px-4 pb-0 pt-3 mt-auto mb-2">
-        {{ $t('wallet.administration.budgetConfiguration') }}
-      </div>
+      <v-list-item>
+        <v-list-item-content>
+          <v-list-item-title class="text-header text-wrap">
+            {{ $t('wallet.administration.budgetConfiguration') }}
+          </v-list-item-title>
+        </v-list-item-content>
+        <v-list-item-action v-if="!loading && hasConfiguredBudget" class="ma-auto">
+          <v-tooltip
+            :disabled="$root.isMobile"
+            bottom>
+            <template #activator="{ on }">
+              <div v-on="on">
+                <v-btn
+                  :aria-label="$t('wallet.administration.budgetConfiguration.editConfiguration')"
+                  target="_blank"
+                  small
+                  icon
+                  @click="openConfigurationDrawer">
+                  <v-icon size="18">fas fa-edit</v-icon>
+                </v-btn>
+              </div>
+            </template>
+            <span>{{ $t('wallet.administration.budgetConfiguration.editConfiguration') }}</span>
+          </v-tooltip>
+        </v-list-item-action>
+      </v-list-item>
       <v-spacer />
-      <div class="d-flex flex-column align-center justify-center full-width full-height pt-5">
-        <v-icon color="orange darken-2" size="50">fas fa-coins</v-icon>
-        <span class="mt-5">{{ $t('wallet.administration.budgetConfiguration.setUp') }}</span>
-      </div>
-      <v-btn
-        class="btn btn-primary align-self-center my-4 px-2">
-        <span class="mx-2">
-          {{ $t('wallet.administration.budgetConfiguration.setBudget') }}
-        </span>
-      </v-btn>
+      <template v-if="!loading && hasConfiguredBudget">
+        <v-list-item>
+          <v-list-item-content>
+            <v-list-item-title class="text-wrap">
+              {{ $t('wallet.administration.budgetConfiguration.periodType.title') }}
+            </v-list-item-title>
+          </v-list-item-content>
+          <v-list-item-action class="ma-auto font-weight-bold pe-1">
+            {{ periodTypeLabel }}
+          </v-list-item-action>
+        </v-list-item>
+        <v-list-item>
+          <v-list-item-content>
+            <v-list-item-title class="text-wrap">
+              {{ $t('wallet.administration.budgetConfiguration.timeZone.title') }}
+            </v-list-item-title>
+          </v-list-item-content>
+          <v-list-item-action class="ma-auto font-weight-bold pe-1">
+            {{ periodDatesDisplay }}
+          </v-list-item-action>
+        </v-list-item>
+        <v-list-item>
+          <v-list-item-content>
+            <v-list-item-title class="text-wrap">
+              {{ $t('wallet.administration.budgetConfiguration.threshold.title') }}
+            </v-list-item-title>
+          </v-list-item-content>
+          <v-list-item-action class="ma-auto font-weight-bold pe-1">
+            {{ threshold }} {{ $t('wallet.administration.budgetConfiguration.points') }}
+          </v-list-item-action>
+        </v-list-item>
+        <v-list-item>
+          <v-list-item-content>
+            <v-list-item-title class="text-wrap">
+              {{ budgetTypeLabel }}
+            </v-list-item-title>
+          </v-list-item-content>
+          <v-list-item-action class="ma-auto font-weight-bold pe-1">
+            {{ amount }}  MEED
+          </v-list-item-action>
+        </v-list-item>
+      </template>
+      <template v-else-if="!loading">
+        <div class="d-flex flex-column align-center justify-center full-width full-height pt-5">
+          <v-icon color="orange darken-2" size="50">fas fa-coins</v-icon>
+          <span class="mt-5">{{ $t('wallet.administration.budgetConfiguration.setUp') }}</span>
+        </div>
+        <v-btn
+          class="btn btn-primary align-self-center my-4 px-2"
+          @click="openConfigurationDrawer">
+          <span class="mx-2">
+            {{ $t('wallet.administration.budgetConfiguration.setBudget') }}
+          </span>
+        </v-btn>
+      </template>
     </div>
   </v-card>
-</template>
\ No newline at end of file
+</template>
+
+<script>
+export default {
+  props: {
+    loading: {
+      type: Boolean,
+      default: false,
+    },
+    rewardSettings: {
+      type: Object,
+      default: null
+    },
+    rewardReport: {
+      type: Object,
+      default: null
+    }
+  },
+  data: () => ({
+
+  }),
+  computed: {
+    periodType() {
+      return this.rewardSettings?.periodType;
+    },
+    periodTypeLabel() {
+      return this.$t(`wallet.administration.periodType.label.${this.periodType?.toLowerCase()}`) || '';
+    },
+    rewardPeriod() {
+      return this.rewardReport?.period;
+    },
+    periodDatesDisplay() {
+      if (!this.rewardPeriod) {
+        return '';
+      }
+      const startDateFormatted = this.$dateUtil.formatDateObjectToDisplay(new Date(this.rewardPeriod.startDateInSeconds * 1000), this.dateformat, eXo.env.portal.language);
+      const endDateFormatted = this.$dateUtil.formatDateObjectToDisplay(new Date(this.rewardPeriod.endDateInSeconds * 1000 - 1), this.dateformat, eXo.env.portal.language);
+      return `${startDateFormatted} ${this.$t('exoplatform.wallet.label.to')} ${endDateFormatted}`;
+    },
+    dateformat() {
+      return this.timeZone && {
+        year: 'numeric',
+        month: 'short',
+        day: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
+        timeZoneName: 'short',
+        timeZone: this.timeZone,
+      } || {
+        year: 'numeric',
+        month: 'short',
+        day: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
+      };
+    },
+    timeZone() {
+      return this.rewardPeriod?.timeZone || this.rewardSettings?.timeZone;
+    },
+    amount() {
+      return this.valueFormatted(this.rewardSettings?.amount);
+    },
+    threshold() {
+      return this.valueFormatted(this.rewardSettings?.threshold);
+    },
+    budgetType() {
+      return this.rewardSettings?.budgetType;
+    },
+    budgetTypeLabel() {
+      return this.budgetType === 'FIXED' ? this.$t('wallet.administration.budgetConfiguration.budgetFixed.title') : this.$t('wallet.administration.budgetConfiguration.budgetPerContributor.title');
+    },
+    hasConfiguredBudget() {
+      return this.rewardSettings?.storedSetting;
+    },
+  },
+  methods: {
+    openConfigurationDrawer() {
+      this.$emit('openConfiguration');
+    },
+    valueFormatted(max) {
+      return new Intl.NumberFormat(eXo.env.portal.language, {
+        style: 'decimal',
+        minimumFractionDigits: 0,
+        maximumFractionDigits: 0,
+      }).format(max);
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfigurationDrawer.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfigurationDrawer.vue
new file mode 100644
index 000000000..a301b28c3
--- /dev/null
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfigurationDrawer.vue
@@ -0,0 +1,236 @@
+<!--
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <exo-drawer
+    ref="drawer"
+    v-model="drawer"
+    :loading="loading"
+    allow-expand
+    right>
+    <template #title>
+      {{ $t('wallet.administration.budgetConfigurationDrawer.title') }}
+    </template>
+    <template #content>
+      <v-card-title class="pb-2">
+        {{ $t('wallet.administration.budgetConfigurationDrawer.periodType') }}
+      </v-card-title>
+      <v-list-item>
+        <v-list-item-content>
+          <v-list-item-title class="text-wrap">
+            {{ $t('wallet.administration.budgetConfigurationDrawer.periodType.title') }}
+          </v-list-item-title>
+        </v-list-item-content>
+        <v-list-item-action class="d-inline-block ma-auto pe-1">
+          <v-card
+            flat
+            width="125">
+            <v-select
+              v-model="settingsToSave.periodType"
+              :items="periods"
+              class="pa-0"
+              item-text="text"
+              item-value="value"
+              hide-details
+              outlined
+              dense />
+          </v-card>
+        </v-list-item-action>
+      </v-list-item>
+      <v-card-title class="pb-2">
+        {{ $t('wallet.administration.budgetConfigurationDrawer.timeZone') }}
+      </v-card-title>
+      <v-list-item>
+        <v-list-item-content>
+          <v-list-item-title class="text-wrap">
+            {{ $t('wallet.administration.budgetConfigurationDrawer.timeZone.title') }}
+          </v-list-item-title>
+        </v-list-item-content>
+      </v-list-item>
+      <wallet-reward-timezone-selectbox class="px-4" v-model="settingsToSave.timeZone" />
+      <v-card-title class="pb-2">
+        {{ $t('wallet.administration.budgetConfigurationDrawer.threshold.title') }}
+      </v-card-title>
+      <div class="d-flex align-center px-4">
+        <number-input
+          v-model="settingsToSave.threshold"
+          :step="1"
+          :max="1000"
+          editable
+          class="me-n1 pa-0 ma-0"
+          @valid="invalidThreshold = !$event" />
+        <div class="ps-4">{{ $t('wallet.administration.budgetConfiguration.points') }}</div>
+      </div>
+      <span v-if="invalidThreshold" class="error-color d-flex px-4">{{ $t('wallet.administration.budgetConfigurationDrawer.invalidThreshold', {
+        0: maxValueFormatted(1000),
+      }) }}</span>
+      <v-card-title class="pb-2">
+        {{ $t('wallet.administration.budgetConfigurationDrawer.amount.title') }}
+      </v-card-title>
+      <v-radio-group v-model="settingsToSave.budgetType" class="my-auto px-4">
+        <v-radio
+          :label="$t('wallet.administration.budgetConfigurationDrawer.budgetFixed')"
+          value="FIXED"
+          class="mx-0" />
+        <v-radio
+          :label="$t('wallet.administration.budgetConfigurationDrawer.budgetPerContributor')"
+          value="FIXED_PER_MEMBER"
+          class="mx-0" />
+      </v-radio-group>
+      <div class="d-flex align-center px-4">
+        <number-input
+          v-model="settingsToSave.amount"
+          :step="1"
+          :max="5000"
+          editable
+          class="me-n1 my-0 pa-0"
+          @valid="invalidAmount = !$event" />
+        <div class="ps-4">Meeds</div>
+      </div>
+      <span v-if="invalidAmount" class="error-color d-flex px-4">{{ $t('wallet.administration.budgetConfigurationDrawer.invalidAmount', {
+        0: maxValueFormatted(5000),
+      }) }}</span>
+      <wallet-budget-distribution-forecast :reward-report="rewardReport" :settings-to-save="settingsToSave" />
+    </template>
+    <template #footer>
+      <div class="d-flex">
+        <v-spacer />
+        <v-btn
+          class="btn me-2"
+          @click="close">
+          {{ $t('exoplatform.wallet.button.cancel') }}
+        </v-btn>
+        <v-btn
+          :disabled="disableApply"
+          class="btn btn-primary"
+          @click="apply">
+          {{ $t('wallet.administration.apply') }}
+        </v-btn>
+      </div>
+    </template>
+  </exo-drawer>
+</template>
+
+<script>
+
+export default {
+  props: {
+    rewardSettings: {
+      type: Object,
+      default: null
+    },
+    rewardReport: {
+      type: Object,
+      default: null
+    },
+  },
+  data: () => ({
+    drawer: false,
+    settingsToSave: {},
+    loading: false,
+    invalidThreshold: false,
+    invalidAmount: false,
+  }),
+  computed: {
+    hasConfiguredBudget() {
+      return this.rewardSettings?.storedSetting;
+    },
+    periodType() {
+      return this.rewardSettings?.periodType;
+    },
+    budgetType() {
+      return this.rewardSettings?.budgetType;
+    },
+    timeZone() {
+      return this.rewardSettings?.timeZone;
+    },
+    amount() {
+      return this.rewardSettings?.amount;
+    },
+    threshold() {
+      return this.rewardSettings?.threshold;
+    },
+    configurationChanged() {
+      return this.amount !== this.settingsToSave.amount
+          || this.budgetType !== this.settingsToSave.budgetType
+          || this.threshold !== this.settingsToSave.threshold
+          || this.timeZone !== this.settingsToSave?.timeZone
+          || this.timeZone !== this.settingsToSave?.timeZone
+          || this.periodType !== (this.settingsToSave?.periodType?.value || this.settingsToSave?.periodType);
+    },
+    disableApply() {
+      return this.invalidThreshold || this.invalidAmount || !this.settingsToSave?.timeZone || !this.configurationChanged;
+    },
+    periods() {
+      return [
+        {
+          text: this.$t('wallet.administration.periodType.label.week'),
+          value: 'WEEK',
+        },
+        {
+          text: this.$t('wallet.administration.periodType.label.month'),
+          value: 'MONTH',
+        },
+        {
+          text: this.$t('wallet.administration.periodType.label.quarter'),
+          value: 'QUARTER',
+        },
+      ];
+    },
+  },
+  methods: {
+    open() {
+      if (this.rewardSettings) {
+        this.settingsToSave = JSON.parse(JSON.stringify(this.rewardSettings));
+        this.settingsToSave.periodType = this.hasConfiguredBudget ? this.periods.find(period => period.value === this.settingsToSave.periodType) : this.periods.find(p => p.value === 'WEEK');
+        this.settingsToSave.amount = this.hasConfiguredBudget ? this.settingsToSave?.amount : 1000;
+        this.settingsToSave.threshold = this.hasConfiguredBudget ? this.settingsToSave?.threshold : 50;
+        this.settingsToSave.budgetType = this.hasConfiguredBudget ? this.settingsToSave?.budgetType : 'FIXED';
+      } else {
+        this.settingsToSave = {};
+      }
+      this.$refs.drawer.open();
+    },
+    close() {
+      this.$refs.drawer.close();
+    },
+    apply() {
+      this.loading = true;
+      if (this.settingsToSave?.periodType?.value) {
+        this.settingsToSave.periodType = this.settingsToSave.periodType.value;
+      }
+      this.$rewardService.saveRewardSettings(this.settingsToSave)
+        .then(() => {
+          return this.$emit('setting-updated');
+        }).finally(() => {
+          this.loading = false;
+          this.close();
+        });
+    },
+    maxValueFormatted(max) {
+      return new Intl.NumberFormat(eXo.env.portal.language, {
+        style: 'decimal',
+        minimumFractionDigits: 0,
+        maximumFractionDigits: 0,
+      }).format(max);
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/ConfigurationTab.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/ConfigurationTab.vue
deleted file mode 100644
index 35ffafed0..000000000
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/ConfigurationTab.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<!--
-This file is part of the Meeds project (https://meeds.io/).
-Copyright (C) 2020 Meeds Association
-contact@meeds.io
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 3 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--->
-<template>
-  <v-card flat>
-    <v-card-text>
-      <div class="text-start rewardWalletConfiguration">
-        <span>
-          {{ $t('exoplatform.wallet.label.periodicity') }}:
-        </span>
-        <div id="selectedPeriodType" class="selectBoxVuetifyParent v-input">
-          <v-combobox
-            v-model="settingsToSave.periodType"
-            :disabled="!configurationEditable"
-            :items="periods"
-            attach="#selectedPeriodType"
-            class="selectBoxVuetify"
-            hide-no-data
-            hide-selected
-            return-masked-value
-            small-chips />
-        </div>
-        <span>
-          {{ $t('exoplatform.wallet.label.timezone') }}:
-        </span>
-        <div id="selectedRewardSettingTimeZone" class="ms-2">
-          <wallet-reward-timezone-selectbox
-            v-model="settingsToSave.timeZone"
-            :disabled="!configurationEditable" />
-        </div>
-      </div>
-
-      <v-card v-if="settingsToSave && settingsToSave.pluginSettings" flat>
-        <v-container
-          fluid
-          grid-list-lg
-          class="pt-0 pb-0">
-          <v-layout row wrap>
-            <v-flex
-              v-for="pluginSetting in settingsToSave.pluginSettings"
-              :key="pluginSetting.pluginId"
-              md6
-              xs12>
-              <v-card flat>
-                <v-card-title primary-title>
-                  <h4>
-                    {{ pluginSetting.pluginId.toUpperCase() }}
-                  </h4>
-                </v-card-title>
-                <v-card-text class="pt-0 pb-0">
-                  <div class="text-start rewardWalletConfiguration">
-                    <span>
-                      {{ $t('exoplatform.wallet.label.rewardThreshold') }}:
-                    </span>
-                    <v-text-field
-                      v-model.number="pluginSetting.threshold"
-                      :disabled="!configurationEditable"
-                      name="threshold"
-                      class="input-text-center" />
-                  </div>
-                  <div v-if="pluginSetting.budgetType !== 'FIXED_PER_POINT'" class="text-start rewardWalletConfiguration">
-                    <v-checkbox
-                      v-model="pluginSetting.usePools"
-                      :disabled="!configurationEditable"
-                      :label="$t('exoplatform.wallet.label.usePools')" />
-                  </div>
-                  <div class="text-start mt-4">
-                    <div>
-                      {{ $t('exoplatform.wallet.label.rewardBudgetBy') }}:
-                    </div>
-                    <v-flex class="ms-4">
-                      <v-radio-group v-model="pluginSetting.budgetType">
-                        <v-radio
-                          :disabled="!configurationEditable"
-                          :label="$t('exoplatform.wallet.label.rewardFixedBudget')"
-                          value="FIXED" />
-                        <v-flex v-if="pluginSetting.budgetType === 'FIXED'" class="rewardWalletConfiguration mb-2">
-                          <v-text-field
-                            v-model.number="pluginSetting.amount"
-                            :disabled="!configurationEditable"
-                            :placeholder="$t('exoplatform.wallet.label.rewardFixedBudgetPlaceholder')"
-                            type="number"
-                            class="pt-0 pb-0"
-                            name="totalBudget" />
-                        </v-flex>
-                        <v-radio
-                          :disabled="!configurationEditable"
-                          :label="$t('exoplatform.wallet.label.rewardFixedBudgetPerMember')"
-                          value="FIXED_PER_MEMBER" />
-                        <v-flex v-if="pluginSetting.budgetType === 'FIXED_PER_MEMBER'" class="rewardWalletConfiguration mb-2">
-                          <v-text-field
-                            v-model.number="pluginSetting.amount"
-                            :disabled="!configurationEditable"
-                            :placeholder="$t('exoplatform.wallet.label.rewardFixedBudgetPerMemberPlaceholder')"
-                            type="number"
-                            class="pt-0 pb-0"
-                            name="budgetPerMember" />
-                        </v-flex>
-                        <v-radio
-                          :disabled="!configurationEditable"
-                          :label="$t('exoplatform.wallet.label.rewardFixedBudgetPerPoint')"
-                          value="FIXED_PER_POINT" />
-                        <v-flex v-if="pluginSetting.budgetType === 'FIXED_PER_POINT'" class="rewardWalletConfiguration mb-2">
-                          <v-text-field
-                            v-model.number="pluginSetting.amount"
-                            :disabled="!configurationEditable"
-                            :placeholder="$t('exoplatform.wallet.label.rewardFixedBudgetPerPointPlaceholder')"
-                            type="number"
-                            class="pt-0 pb-0"
-                            name="budgetPerPoint" />
-                        </v-flex>
-                      </v-radio-group>
-                    </v-flex>
-                  </div>
-                </v-card-text>
-              </v-card>
-            </v-flex>
-          </v-layout>
-        </v-container>
-      </v-card>
-    </v-card-text>
-    <v-card-actions>
-      <v-spacer />
-      <template v-if="configurationEditable">
-        <v-btn
-          :loading="loadingSettings"
-          class="btn btn-primary px-2"
-          dark
-          @click="save">
-          {{ $t('exoplatform.wallet.button.save') }}
-        </v-btn>
-        <v-btn
-          class="btn mx-2 px-3"
-          @click="init">
-          {{ $t('exoplatform.wallet.button.cancel') }}
-        </v-btn>
-      </template>
-      <v-btn
-        v-else
-        class="btn btn-primary ms-2"
-        dark
-        @click="configurationEditable = true">
-        {{ $t('exoplatform.wallet.button.edit') }}
-      </v-btn>
-      <v-spacer />
-    </v-card-actions>
-  </v-card>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      loadingSettings: false,
-      configurationEditable: false,
-      settingsToSave: {},
-      periods: [
-        {
-          text: 'Week',
-          value: 'WEEK',
-        },
-        {
-          text: 'Month',
-          value: 'MONTH',
-        },
-        {
-          text: 'Quarter',
-          value: 'QUARTER',
-        },
-        {
-          text: 'Semester',
-          value: 'SEMESTER',
-        },
-        {
-          text: 'Year',
-          value: 'YEAR',
-        },
-      ],
-    };
-  },
-  computed: {
-    selectedPeriodType() {
-      if (!this.settingsToSave || !this.settingsToSave.periodType) {
-        return this.periods[0];
-      }
-      return this.periods.find(period => period.value === this.settingsToSave.periodType);
-    },
-  },
-  methods: {
-    init() {
-      this.configurationEditable = false;
-
-      if (window.walletRewardSettings) {
-        this.settingsToSave = JSON.parse(JSON.stringify(window.walletRewardSettings));
-        this.$nextTick().then(() =>{
-          this.settingsToSave.periodType = this.selectedPeriodType;
-        });
-      } else {
-        this.settingsToSave = {};
-      }
-    },
-    save() {
-      const thiss = this;
-      if (this.settingsToSave.periodType) {
-        this.settingsToSave.periodType = this.settingsToSave.periodType.value;
-      }
-      this.loadingSettings = true;
-      // Wait to refresh UI for visual loading icon
-      window.setTimeout(() => {
-        this.$rewardService.saveRewardSettings(this.settingsToSave)
-          .then((saved) => {
-            if (saved) {
-              this.configurationEditable = false;
-              return this.$emit('saved');
-            } else {
-              throw new Error('Error saving settings');
-            }
-          })
-          .catch((error) => {
-            console.error('Error while saving \'reward settings\'', error);
-            thiss.$emit('error', this.$t('exoplatform.wallet.error.errorSavingRewardSettings'));
-          })
-          .finally(() => {
-            thiss.loadingSettings = false;
-          });
-      }, 200);
-    },
-  },
-};
-</script>
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue
index 90acb3f2b..f7fb13f4a 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue
@@ -24,7 +24,7 @@
     class="border-radius border-color ma-5"
     flat>
     <div class="d-flex flex-column flex-grow-1">
-      <v-list-item dense>
+      <v-list-item>
         <v-list-item-content>
           <v-list-item-title class="text-header text-wrap">
             {{ $t('exoplatform.wallet.label.currentBalance') }}
@@ -39,7 +39,6 @@
                 <v-btn
                   :href="walletAdminUri"
                   :aria-label="$t('wallet.administration.manageWallet')"
-                  target="_blank"
                   small
                   icon>
                   <v-icon size="18">fas fa-credit-card</v-icon>
@@ -59,17 +58,17 @@
         </span>
       </v-btn>
       <template v-else>
-        <v-list-item dense>
+        <v-list-item>
           <v-list-item-content>
             <v-list-item-title class="text-wrap">
               {{ tokenName }}
             </v-list-item-title>
           </v-list-item-content>
           <v-list-item-action class="d-inline-block ma-auto pe-1">
-            <span class="symbol fundsLabels"> {{ tokenSymbol }} </span> <span class="fundsLabels"> {{ tokenBalance }} </span>
+            <span class="fundsLabels"> MEED {{ tokenBalance }} </span>
           </v-list-item-action>
         </v-list-item>
-        <v-list-item dense>
+        <v-list-item>
           <v-list-item-content>
             <v-list-item-title class="text-wrap">
               {{ $t('wallet.administration.gas') }}
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/DistributionForecast.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/DistributionForecast.vue
new file mode 100644
index 000000000..91fa093ca
--- /dev/null
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/DistributionForecast.vue
@@ -0,0 +1,114 @@
+<!--
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-card
+    class="ma-5"
+    flat
+    outlined>
+    <v-card-title>{{ $t('wallet.administration.distributionForecast') }}</v-card-title>
+    <v-card-subtitle class="pb-0">{{ $t('wallet.administration.distributionForecast.subtile') }}</v-card-subtitle>
+    <v-list class="transparent">
+      <v-list-item
+        v-for="item in forecast"
+        :class="item.class"
+        :key="item.title">
+        <v-list-item-title>{{ item.title }}</v-list-item-title>
+        <v-list-item-title class="text-right">
+          <span v-if="item.unit" :class="item.unitClass">{{ item.unit }}</span> {{ item.value }}
+        </v-list-item-title>
+      </v-list-item>
+    </v-list>
+  </v-card>
+</template>
+
+<script>
+
+export default {
+  props: {
+    rewardReport: {
+      type: Object,
+      default: null
+    },
+    settingsToSave: {
+      type: Object,
+      default: null
+    },
+  },
+  data: () => ({
+
+  }),
+  computed: {
+    forecast() {
+      return [
+        { title: this.$t('wallet.administration.distributionForecast.participants'), value: this.participants },
+        { title: this.$t('wallet.administration.distributionForecast.eligibleContributors'), value: this.eligibleContributorsCount },
+        { title: this.$t('wallet.administration.distributionForecast.acceptedContributions'), value: `${this.totalRewardsToDisplay} ${this.$t('wallet.administration.budgetConfiguration.points')}` },
+        { title: this.$t('wallet.administration.distributionForecast.budget'), value: this.budgetToDisplay , class: 'font-weight-bold' , unit: this.tokenSymbol, unitClass: 'symbol fundsLabels'},
+      ];
+    },
+    eligibleContributorsCount() {
+      return this.rewardReport?.validRewards?.length;
+    },
+    walletRewards() {
+      return this.rewardReport?.rewards;
+    },
+    participants() {
+      return this.rewardReport?.rewards?.length;
+    },
+    tokenSymbol() {
+      return window.walletSettings?.contractDetail?.symbol;
+    },
+    budgetType() {
+      return this.settingsToSave?.budgetType;
+    },
+    amount() {
+      return this.settingsToSave?.amount;
+    },
+    budget() {
+      return this.budgetType === 'FIXED' ? this.amount : this.amount * this.eligibleContributorsCount;
+    },
+    budgetToDisplay() {
+      return this.valueFormatted(this.budget);
+    },
+    totalRewards() {
+      let totalRewards = 0;
+      this.walletRewards.forEach(walletReward => {
+        if (walletReward && walletReward.rewards) {
+          walletReward.rewards.forEach(rewardDetail => totalRewards += rewardDetail.points);
+        }
+      });
+      return totalRewards;
+    },
+    totalRewardsToDisplay() {
+      return this.valueFormatted(this.totalRewards);
+    },
+  },
+  methods: {
+    valueFormatted(max) {
+      return new Intl.NumberFormat(eXo.env.portal.language, {
+        style: 'decimal',
+        minimumFractionDigits: 0,
+        maximumFractionDigits: 0,
+      }).format(max);
+    },
+  }
+};
+</script>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/SendRewardsTab.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/SendRewardsTab.vue
deleted file mode 100644
index 3226910ee..000000000
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/SendRewardsTab.vue
+++ /dev/null
@@ -1,520 +0,0 @@
-<!--
-This file is part of the Meeds project (https://meeds.io/).
-Copyright (C) 2020 Meeds Association
-contact@meeds.io
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 3 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--->
-<template>
-  <v-card flat>
-    <v-card-text v-if="error && String(error).trim() != '{}'" class="text-center">
-      <div class="alert alert-error">
-        <i class="uiIconError"></i> {{ error }}
-      </div>
-    </v-card-text>
-    <v-flex
-      :id="id"
-      class="text-center">
-      <v-menu
-        ref="selectedDateMenu"
-        v-model="selectedDateMenu"
-        :content-class="menuId"
-        :close-on-content-click="false"
-        min-width="auto"
-        transition="scale-transition"
-        offset-y
-        class="dateSelector">
-        <template #activator="{ on }">
-          <v-text-field
-            :value="periodDatesDisplay"
-            :label="$t('exoplatform.wallet.label.selectPeriodDate')"
-            :title="periodDatesDisplay"
-            class="dateSelectorInput clickable mt-8"
-            readonly
-            v-on="on" />
-        </template>
-        <v-date-picker
-          v-model="selectedDate"
-          :first-day-of-week="1"
-          :type="!periodType || periodType === 'WEEK' ? 'date' : 'month'"
-          :locale="lang"
-          class="border-box-sizing"
-          @input="selectedDateMenu = false" />
-      </v-menu>
-    </v-flex>
-    <v-container
-      fluid
-      grid-list-md
-      class="border-box-sizing">
-      <v-layout
-        row
-        wrap
-        class="text-center">
-        <v-flex md4 xs12>
-          <h4>{{ $t('exoplatform.wallet.label.eligibleUsers') }}: <strong>{{ validRewardCount }}</strong></h4>
-        </v-flex>
-        <v-flex md4 xs12>
-          <h4>{{ $t('exoplatform.wallet.label.totalBudget') }}: <strong>{{ totalBudget }} {{ symbol }}</strong></h4>
-        </v-flex>
-        <v-flex md4 xs12>
-          <h4>{{ $t('exoplatform.wallet.label.sent') }} {{ contractDetails && contractDetails.name }}: <strong>{{ walletUtils.toFixed(sentBudget) }} {{ symbol }}</strong></h4>
-        </v-flex>
-        <v-flex md4 xs12>
-          <h4>
-            {{ $t('exoplatform.wallet.title.adminWalletFunds') }}:
-            <strong>{{ adminBalance }} {{ symbol }}</strong>
-            <v-icon
-              v-if="adminBalanceTooLow"
-              color="orange"
-              :title="$t('exoplatform.wallet.label.adminBalanceTooLow')">
-              warning
-            </v-icon>
-          </h4>
-        </v-flex>
-        <v-flex
-          v-for="totalReward in totalRewards"
-          :key="totalReward.pluginId"
-          md4
-          xs12>
-          <h4>{{ $t('exoplatform.wallet.label.total') }} {{ totalReward.pluginId }}: <strong>{{ totalReward.total }}</strong></h4>
-        </v-flex>
-      </v-layout>
-    </v-container>
-    <v-container v-if="rewardReport" class="border-box-sizing">
-      <v-layout>
-        <v-flex xs12>
-          <extension-registry-components
-            :params="{rewardReport}"
-            name="WalletRewarding"
-            type="wallet-reward-send-header-extensions"
-            parent-element="div"
-            element="div" />
-        </v-flex>
-      </v-layout>
-    </v-container>
-    <v-container class="border-box-sizing">
-      <v-layout>
-        <v-flex md4 xs12>
-          <v-switch v-model="displayDisabledUsers" :label="$t('exoplatform.wallet.label.displayDisabledUsers')" />
-        </v-flex>
-      </v-layout>
-      <v-flex>
-        <v-text-field
-          v-model="search"
-          :label="$t('exoplatform.wallet.label.searchRewardWalletsPlaceholder')"
-          append-icon="search"
-          single-line
-          hide-details />
-      </v-flex>
-    </v-container>
-
-    <v-data-table
-      :headers="identitiesHeaders"
-      :items="filteredIdentitiesList"
-      :items-per-page="1000"
-      :loading="loading"
-      item-key="identityId"
-      class="elevation-1 mb-2 content-box-sizing"
-      hide-default-footer
-      sortable>
-      <template slot="item" slot-scope="props">
-        <tr :active="props.selected">
-          <td>
-            <v-avatar size="36px">
-              <img :src="props.item.wallet.avatar" onerror="this.src = '/platform-ui/skin/images/avatar/DefaultSpaceAvatar.png'">
-            </v-avatar>
-          </td>
-          <td class="text-start">
-            <wallet-reward-profile-chip
-              :address="props.item.wallet.address"
-              :profile-id="props.item.wallet.id"
-              :profile-technical-id="props.item.wallet.technicalId"
-              :space-id="props.item.wallet.spaceId"
-              :profile-type="props.item.wallet.type"
-              :display-name="props.item.wallet.name"
-              :enabled="props.item.wallet.enabled"
-              :disabled-in-reward-pool="props.item.disabledPool"
-              :deleted-user="props.item.wallet.deletedUser"
-              :disabled-user="props.item.wallet.disabledUser"
-              :avatar="props.item.wallet.avatar"
-              :initialization-state="props.item.wallet.initializationState"
-              display-no-address />
-          </td>
-          <td class="text-start">
-            <ul v-if="props.item.teams">
-              <li v-for="team in props.item.teams" :key="team.id">
-                <template v-if="team.disabled">
-                  <del class="red--text">{{ team.name }}</del> ({{ $t('exoplatform.wallet.label.disabledPool') }})
-                </template>
-                <template v-else>
-                  {{ team.name }}
-                </template>
-              </li>
-            </ul>
-            <div v-else>
-              -
-            </div>
-          </td>
-          <td class="text-center">
-            <a
-              v-if="props.item.transaction && props.item.transaction.hash"
-              :href="`${transactionEtherscanLink}${props.item.transaction.hash}`"
-              :title="$t('exoplatform.wallet.label.openOnEtherscan')"
-              target="_blank">
-              {{ $t('exoplatform.wallet.label.openOnEtherscan') }}
-            </a> <span v-else>
-              -
-            </span>
-          </td>
-          <td class="text-center">
-            <template v-if="!props.item.status">
-              <v-icon
-                v-if="!props.item.wallet.address"
-                :title="$t('exoplatform.wallet.label.noAddress')"
-                color="warning">
-                warning
-              </v-icon>
-              <v-icon
-                v-else-if="!props.item.tokensToSend"
-                :title="$t('exoplatform.wallet.label.noEnoughEarnedPoints')"
-                color="warning">
-                warning
-              </v-icon>
-              <div v-else>
-                -
-              </div>
-            </template>
-            <v-progress-circular
-              v-else-if="props.item.status === 'pending'"
-              color="primary"
-              indeterminate
-              size="20" />
-            <v-icon
-              v-else
-              :color="props.item.status === 'success' ? 'success' : 'error'"
-              :title="props.item.status === 'success' ? 'Successfully proceeded' : props.item.status === 'pending' ? 'Transaction in progress' : 'Transaction error'"
-              v-text="props.item.status === 'success' ? 'fa-check-circle' : 'fa-exclamation-circle'" />
-          </td>
-          <td class="text-center">
-            <span
-              v-if="props.item.tokensSent"
-              :title="$t('exoplatform.wallet.label.amountSent')"
-              class="grey--text text--darken-1">
-              {{ walletUtils.toFixed(props.item.tokensSent) }} {{ symbol }}
-            </span>
-            <span v-else-if="props.item.tokensToSend" :title="$t('exoplatform.wallet.label.amountToSend')">
-              {{ walletUtils.toFixed(props.item.tokensToSend) }} {{ symbol }}
-            </span>
-            <span
-              v-else
-              :title="$t('exoplatform.wallet.label.noRewardsForPeriod')"
-              class="grey--text text--darken-1">
-              0 {{ symbol }}
-            </span>
-          </td>
-          <td>
-            <v-btn
-              :disabled="!props.item.rewards || !props.item.rewards.length"
-              :title="$t('exoplatform.wallet.label.displayRewardDetails')"
-              icon
-              small
-              @click="selectedWallet = props.item">
-              <v-icon :color="(props.item.rewards && props.item.rewards.length) && 'primary'" size="16">fa-info-circle</v-icon>
-            </v-btn>
-          </td>
-        </tr>
-      </template>
-      <template slot="body.append">
-        <tr>
-          <td :colspan="identitiesHeaders.length - 2">
-            <strong>
-              {{ $t('exoplatform.wallet.label.total') }}
-            </strong>
-          </td>
-          <td colspan="2">
-            <strong class="ms-7">
-              {{ totalTokens }} {{ symbol }}
-            </strong>
-          </td>
-        </tr>
-      </template>
-    </v-data-table>
-
-    <v-card-actions>
-      <v-spacer />
-      <v-btn
-        :loading="sendingRewards"
-        :disabled="sendingRewardsDisabled"
-        class="btn btn-primary ps-2 pe-2"
-        @click="sendRewards">
-        {{ $t('exoplatform.wallet.button.sendRewards') }}
-      </v-btn>
-      <v-spacer />
-    </v-card-actions>
-
-    <wallet-reward-reward-detail-modal
-      ref="rewardDetails"
-      :wallet="selectedWallet"
-      :period="periodDatesDisplay"
-      :symbol="symbol"
-      @closed="selectedWallet = null" />
-  </v-card>
-</template>
-
-<script>
-export default {
-  props: {
-    rewardReport: {
-      type: Object,
-      default: function() {
-        return null;
-      },
-    },
-    adminWallet: {
-      type: Object,
-      default: function() {
-        return null;
-      },
-    },
-    periodDatesDisplay: {
-      type: String,
-      default: function() {
-        return null;
-      },
-    },
-    totalRewards: {
-      type: Array,
-      default: function() {
-        return [];
-      },
-    },
-    contractDetails: {
-      type: Object,
-      default: function() {
-        return null;
-      },
-    },
-    transactionEtherscanLink: {
-      type: String,
-      default: function() {
-        return null;
-      },
-    },
-  },
-  data() {
-    return {
-      search: '',
-      id: `DatePicker${Date.now()}`,
-      menuId: `DatePickerMenu${Date.now()}`,
-      currentTimeInSeconds: Date.now() / 1000,
-      displayDisabledUsers: false,
-      selectedDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`,
-      selectedDateMenu: false,
-      loading: false,
-      sendingRewards: false,
-      selectedWallet: null,
-      lang: 'en',
-    };
-  },
-  computed: {
-    identitiesHeaders() {
-      return [
-        {
-          text: '',
-          align: 'end',
-          sortable: false,
-          value: 'avatar',
-          width: '36px',
-        },
-        {
-          text: this.$t('exoplatform.wallet.label.name'),
-          align: 'start',
-          sortable: true,
-          value: 'wallet.name',
-        },
-        {
-          text: this.$t('exoplatform.wallet.label.pools'),
-          align: 'center',
-          sortable: true,
-          value: 'poolName',
-        },
-        {
-          text: this.$t('exoplatform.wallet.label.transaction'),
-          align: 'center',
-          sortable: true,
-          value: 'transaction.timestamp',
-        },
-        {
-          text: this.$t('exoplatform.wallet.label.status'),
-          align: 'center',
-          sortable: true,
-          value: 'status',
-        },
-        {
-          text: (this.contractDetails && this.contractDetails.name),
-          align: 'center',
-          sortable: true,
-          value: 'tokensToSend',
-          width: '80px',
-        },
-        {
-          text: '',
-          align: 'center',
-          sortable: false,
-          value: 'rewards',
-          width: '80px',
-        },
-      ];
-    },
-    adminBalance() {
-      return (this.adminWallet && this.walletUtils.toFixed(this.adminWallet.tokenBalance)) || 0;
-    },
-    adminBalanceTooLow() {
-      return this.rewardReport && this.adminWallet && this.rewardReport.remainingTokensToSend && this.adminWallet.tokenBalance < this.rewardReport.remainingTokensToSend;
-    },
-    walletRewards() {
-      return (this.rewardReport && this.rewardReport.rewards) || [];
-    },
-    period() {
-      return this.rewardReport && this.rewardReport.period;
-    },
-    periodType() {
-      return this.period && this.period.rewardPeriodType;
-    },
-    sentBudget() {
-      return (this.rewardReport && this.walletUtils.toFixed(this.rewardReport.tokensSent)) || 0;
-    },
-    totalBudget() {
-      return (this.rewardReport && this.walletUtils.toFixed(this.rewardReport.tokensToSend)) || 0;
-    },
-    validRewardCount() {
-      return (this.rewardReport && this.rewardReport.validRewardCount) || 0;
-    },
-    sendingRewardsDisabled() {
-      if (this.isNotPastPeriod) {
-        return true;
-      }
-      if (!this.walletRewards || !this.walletRewards.length) {
-        return true;
-      }
-      let disabledButton = true;
-      for (const index in this.walletRewards) {
-        const walletReward = this.walletRewards[index];
-        // If any transaction is still pending, then disable sending button
-        if (walletReward.status === 'pending') {
-          return true;
-        }
-
-        if (walletReward.enabled && walletReward.tokensToSend && (!walletReward.status || walletReward.status === 'error')) {
-          disabledButton = false;
-        }
-      }
-      return disabledButton;
-    },
-    symbol() {
-      return this.contractDetails && this.contractDetails.symbol ? this.contractDetails.symbol : '';
-    },
-    filteredIdentitiesList() {
-      return (this.walletRewards && this.walletRewards.filter((wallet) => (this.displayDisabledUsers || wallet.enabled || wallet.tokensSent || wallet.tokensToSend) && this.filterItemFromList(wallet, this.search))) || [];
-    },
-    isNotPastPeriod() {
-      return !this.period || this.period.endDateInSeconds > this.currentTimeInSeconds;
-    },
-    totalTokens() {
-      if (this.filteredIdentitiesList) {
-        let result = 0;
-        this.filteredIdentitiesList.forEach((wallet) => {
-          result += wallet.tokensSent ? (wallet.tokensSent ? Number(wallet.tokensSent) : 0) : (wallet.tokensToSend && wallet.tokensToSend > 0 ? Number(wallet.tokensToSend) : 0);
-        });
-        return this.walletUtils.toFixed(result);
-      } else {
-        return 0;
-      }
-    },
-    selectedCompleteDateDate() {
-      if (this.selectedDate.length === 4) {
-        return `${this.selectedDate}-01-01`;
-      } else if (this.selectedDate.length === 7) {
-        return `${this.selectedDate}-01`;
-      } else if (this.selectedDate.length > 10) {
-        return this.selectedDate.substring(0, 10);
-      } else {
-        return this.selectedDate;
-      }
-    },
-  },
-  mounted() {
-    $('.datePickerComponent input').on('click', (e) => {
-      if (e.target && !$(e.target).parents(`#${this.id}`).length) {
-        this.selectedDateMenu = false;
-      }
-    });
-    $(document).on('click', (e) => {
-      if (e.target && !$(e.target).parents(`.${this.menuId}`).length) {
-        this.selectedDateMenu = false;
-      }
-    });
-  },
-  watch: {
-    selectedWallet() {
-      if (this.selectedWallet) {
-        this.$refs.rewardDetails.open();
-      }
-    },
-    selectedCompleteDateDate() {
-      if (!this.selectedCompleteDateDate) {
-        return;
-      }
-      this.loading = true;
-      this.lang = eXo.env.portal.language;
-      return this.$rewardService.getRewardDates(this.selectedCompleteDateDate)
-        .then((period) => {
-          this.$emit('dates-changed', period);
-        })
-        .finally(() => this.loading = false);
-    }
-  },
-  methods: {
-    filterItemFromList(walletReward, searchText) {
-      if (!searchText || !searchText.length) {
-        return true;
-      }
-      searchText = searchText.trim().toLowerCase();
-      const name = walletReward && walletReward.wallet && walletReward.wallet.name && walletReward.wallet.name.toLowerCase();
-      if (name.indexOf(searchText) > -1) {
-        return true;
-      }
-      const address = walletReward && walletReward.wallet && walletReward.wallet.address && walletReward.wallet.address.toLowerCase();
-      if (address.indexOf(searchText) > -1) {
-        return true;
-      }
-      const poolName = walletReward && walletReward.poolName && walletReward.poolName.toLowerCase();
-      if (searchText === '-' || (poolName.indexOf(searchText) > -1)) {
-        return true;
-      }
-      return false;
-    },
-    sendRewards() {
-      this.error = null;
-      this.sendingRewards = true;
-      this.$rewardService.sendRewards(this.selectedCompleteDateDate)
-        .catch(e => {
-          this.error = String(e);
-        })
-        .finally(() => {
-          this.$emit('refresh');
-          this.sendingRewards = false;
-        });
-    },
-  },
-};
-</script>
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TeamForm.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TeamForm.vue
deleted file mode 100644
index 61858ad58..000000000
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TeamForm.vue
+++ /dev/null
@@ -1,551 +0,0 @@
-<!--
-This file is part of the Meeds project (https://meeds.io/).
-Copyright (C) 2020 Meeds Association
-contact@meeds.io
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 3 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--->
-<template>
-  <v-card class="pt-4" flat>
-    <v-card-title v-if="error && String(error).trim() != '{}'" class="text-center">
-      <div class="alert alert-error v-content">
-        <i class="uiIconError"></i> {{ error }}
-      </div>
-    </v-card-title>
-    <v-container
-      grid-list-md
-      class="pt-2"
-      flat>
-      <v-layout
-        wrap
-        class="rewardPoolForm"
-        flat>
-        <v-flex 
-          v-if="!viewOnly"
-          xs12
-          sm6>
-          <v-text-field
-            v-model="name"
-            :label="$t('exoplatform.wallet.label.poolName')"
-            :placeholder="$t('exoplatform.wallet.label.poolNamePlaceholder')"
-            name="name"
-            required
-            autofocus />
-        </v-flex>
-
-        <v-flex
-          v-if="!viewOnly"
-          xs12
-          sm6>
-          <v-text-field
-            v-model="description"
-            :label="$t('exoplatform.wallet.label.poolDescription')"
-            :placeholder="$t('exoplatform.wallet.label.poolDescriptionPlaceholder')"
-            name="description" />
-        </v-flex>
-
-        <v-flex
-          v-if="!viewOnly"
-          id="rewardTeamSpaceAutoComplete"
-          class="contactAutoComplete"
-          xs12
-          sm6>
-          <v-autocomplete
-            ref="rewardTeamSpaceAutoComplete"
-            v-model="rewardTeamSpace"
-            :items="rewardTeamSpaceOptions"
-            :items-per-page="1000"
-            :loading="isLoadingSpaceSuggestions"
-            :search-input.sync="rewardTeamSpaceSearchTerm"
-            :label="$t('exoplatform.wallet.label.poolSpace')"
-            :placeholder="$t('exoplatform.wallet.label.poolSpacePlaceholder')"
-            attach="#rewardTeamSpaceAutoComplete"
-            class="contactAutoComplete"
-            content-class="contactAutoCompleteContent bigContactAutoComplete"
-            max-width="100%"
-            item-text="name"
-            item-value="id"
-            hide-details
-            hide-selected
-            chips
-            cache-items
-            dense
-            flat>
-            <template slot="no-data">
-              <v-list-item>
-                <v-list-item-title>
-                  {{ $t('exoplatform.wallet.label.poolSpaceSearchPlaceholder') }}
-                </v-list-item-title>
-              </v-list-item>
-            </template>
-
-            <template slot="selection" slot-scope="{item, selected}">
-              <v-chip
-                v-if="item.error"
-                :input-value="selected"
-                class="autocompleteSelectedItem">
-                <del>
-                  <span>
-                    {{ item.name }}
-                  </span>
-                </del>
-              </v-chip>
-              <v-chip
-                v-else
-                :input-value="selected"
-                class="autocompleteSelectedItem">
-                <span>
-                  {{ item.name }}
-                </span>
-              </v-chip>
-            </template>
-
-            <template slot="item" slot-scope="{item}">
-              <v-list-item-avatar
-                v-if="item.avatar"
-                size="20">
-                <img :src="item.avatar">
-              </v-list-item-avatar>
-              <v-list-item-title v-text="item.name" />
-            </template>
-          </v-autocomplete>
-        </v-flex>
-
-        <wallet-reward-address-auto-complete
-          v-if="!viewOnly"
-          ref="managerAutocomplete"
-          :input-label="$t('exoplatform.wallet.label.poolManager')"
-          :input-placeholder="$t('exoplatform.wallet.label.poolManagerPlaceholder')"
-          :no-data-label="$t('exoplatform.wallet.label.poolManagerSearchPlaceholder')"
-          no-address
-          big-field
-          class="xs12 sm6"
-          @item-selected="manager = $event && $event.id" />
-
-        <v-flex v-if="!viewOnly" xs12>
-          <v-radio-group v-model="rewardType" :label="$t('exoplatform.wallet.label.poolMembers')">
-            <v-radio value="COMPUTED" :label="$t('exoplatform.wallet.label.rewardPoolComputedBudget')" />
-            <v-radio value="FIXED" :label="$t('exoplatform.wallet.label.rewardPoolFixedBudget')" />
-            <v-flex xs12 sm6>
-              <v-text-field
-                v-if="rewardType === 'FIXED'"
-                v-model="budget"
-                :placeholder="$t('exoplatform.wallet.label.rewardFixedBudgetPlaceholder')"
-                type="number"
-                class="pt-0 pb-0"
-                name="budget" />
-            </v-flex>
-            <v-radio value="FIXED_PER_MEMBER" label="By a fixed budget per eligible member (not retained from global budget)" />
-            <v-flex
-              v-if="rewardType === 'FIXED_PER_MEMBER'"
-              xs12
-              sm6>
-              <v-text-field
-                v-model="budget"
-                :placeholder="$t('exoplatform.wallet.label.rewardFixedBudgetPerMemberPlaceholder')"
-                type="number"
-                class="pt-0 pb-0"
-                name="budget" />
-            </v-flex>
-          </v-radio-group>
-        </v-flex>
-
-        <v-flex xs12>
-          <wallet-reward-address-auto-complete
-            v-if="!viewOnly"
-            ref="memberAutocomplete"
-            :ignore-items="members"
-            :input-label="$t('exoplatform.wallet.label.poolMembers')"
-            :input-placeholder="$t('exoplatform.wallet.label.poolMemberPlaceholder')"
-            :no-data-label="$t('exoplatform.wallet.label.poolMemberSearchPlaceholder')"
-            no-address
-            big-field
-            @item-selected="addMember($event)" />
-          <v-data-table
-            :items="membersObjects"
-            :items-per-page="1000"
-            item-key="id"
-            class="elevation-1 mt-2"
-            sortable
-            hide-default-footer>
-            <template slot="no-data">
-              <tr>
-                <td colspan="3" class="text-center">
-                  {{ $t('exoplatform.wallet.label.noMembersInPool') }}
-                </td>
-              </tr>
-            </template>
-            <!-- Without slot-scope, the template isn't displayed -->
-            <!-- eslint-disable-next-line vue/no-unused-vars -->
-            <template slot="headers" slot-scope="props">
-              <tr>
-                <th colspan="2" class="text-center">
-                  {{ $t('exoplatform.wallet.label.name') }}
-                </th>
-                <th class="text-end">
-                  <v-btn
-                    v-if="!viewOnly"
-                    :title="$t('exoplatform.wallet.button.deleteAll')"
-                    icon
-                    @click="members = []">
-                    <v-icon>
-                      delete
-                    </v-icon>
-                  </v-btn>
-                </th>
-              </tr>
-            </template>
-            <template slot="item" slot-scope="props">
-              <tr>
-                <td class="text-start">
-                  <v-avatar size="36px">
-                    <img :src="props.item.avatar" onerror="this.src = '/platform-ui/skin/images/avatar/DefaultSpaceAvatar.png'">
-                  </v-avatar>
-                </td>
-                <td class="text-center">
-                  <wallet-reward-profile-chip
-                    :address="props.item.address"
-                    :profile-id="props.item.id"
-                    :profile-technical-id="props.item.technicalId"
-                    :space-id="props.item.spaceId"
-                    :profile-type="props.item.type"
-                    :display-name="props.item.name"
-                    :enabled="props.item.enabled"
-                    :deleted-user="props.item.deletedUser"
-                    :disabled-user="props.item.disabledUser"
-                    :avatar="props.item.avatar"
-                    display-no-address />
-                </td>
-                <td class="text-end">
-                  <v-btn
-                    v-if="!viewOnly"
-                    :title="$t('exoplatform.wallet.button.delete')"
-                    icon
-                    @click="deleteMember(props.item)">
-                    <v-icon>
-                      delete
-                    </v-icon>
-                  </v-btn>
-                </td>
-              </tr>
-            </template>
-          </v-data-table>
-        </v-flex>
-      </v-layout>
-    </v-container>
-    <v-card-actions>
-      <v-spacer />
-      <v-btn
-        v-if="!viewOnly"
-        :loading="loading"
-        class="btn btn-primary me-1"
-        dark
-        @click="save">
-        {{ $t('exoplatform.wallet.button.save') }}
-      </v-btn>
-      <v-btn
-        class="btn"
-        color="white"
-        @click="$emit('close')">
-        {{ $t('exoplatform.wallet.button.close') }}
-      </v-btn>
-      <v-spacer />
-    </v-card-actions>
-  </v-card>
-</template>
-
-<script>
-export default {
-  props: {
-    team: {
-      type: Object,
-      default: function() {
-        return null;
-      },
-    },
-    teams: {
-      type: Array,
-      default: function() {
-        return [];
-      },
-    },
-    walletRewards: {
-      type: Array,
-      default: function() {
-        return [];
-      },
-    },
-  },
-  data: () => ({
-    loading: false,
-    error: null,
-    id: null,
-    name: '',
-    description: '',
-    rewardType: 'COMPUTED',
-    budget: '',
-    computedBudget: 0,
-    memberSelection: null,
-    manager: null,
-    managerObject: null,
-    members: [],
-    membersObjects: [],
-    rewardTeamSpace: null,
-    rewardTeamSpaceId: null,
-    rewardTeamSpaceOptions: [],
-    rewardTeamSpaceSearchTerm: null,
-    isLoadingSpaceSuggestions: false,
-  }),
-  computed: {
-    viewOnly() {
-      return this.team && this.team.noTeam;
-    }
-  },
-  watch: {
-    team() {
-      if (this.team) {
-        this.init();
-      }
-    },
-    rewardTeamSpace(newValue, oldValue) {
-      if (oldValue) {
-        this.rewardTeamSpaceSearchTerm = null;
-        // A hack to close on select
-        // See https://www.reddit.com/r/vuetifyjs/comments/819h8u/how_to_close_a_multiple_autocomplete_vselect/
-        this.$refs.rewardTeamSpaceAutoComplete.isFocused = false;
-      }
-      this.rewardTeamSpaceId = null;
-      if (this.rewardTeamSpaceOptions && this.rewardTeamSpaceOptions.length) {
-        const selectedObject = this.rewardTeamSpaceOptions.find((space) => space.name === this.rewardTeamSpace || space.id === this.rewardTeamSpace);
-        this.rewardTeamSpaceId = selectedObject && selectedObject.technicalId;
-        if (selectedObject && selectedObject.members && selectedObject.members.length) {
-          this.members = selectedObject.members && selectedObject.members.slice();
-        }
-      }
-    },
-    rewardTeamSpaceSearchTerm() {
-      if (this.rewardTeamSpaceSearchTerm) {
-        this.isLoadingSuggestions = true;
-        this.addressRegistry.searchSpaces(this.rewardTeamSpaceSearchTerm, true)
-          .then((items) => {
-            if (items) {
-              this.rewardTeamSpaceOptions = items;
-            } else {
-              this.rewardTeamSpaceOptions = [];
-            }
-            this.isLoadingSpaceSuggestions = false;
-          })
-          .catch((e) => {
-            console.error  ('searchSpaces method - error', e);
-            this.isLoadingSpaceSuggestions = false;
-          });
-      }
-    },
-    manager() {
-      if (!this.manager || !this.manager.length) {
-        this.managerObject = null;
-        return;
-      }
-      const managerObject = this.membersObjects && this.membersObjects.find((wallet) => wallet.id === this.manager && wallet.type === 'user');
-      if (managerObject) {
-        this.managerObject = managerObject;
-      } else {
-        const walletReward = this.walletRewards.find((walletReward) => walletReward.wallet && walletReward.wallet.id === this.manager && walletReward.wallet.type === 'user');
-        if (walletReward) {
-          this.managerObject = Object.assign({identityId: walletReward.wallet.technicalId}, walletReward.wallet);
-        } else {
-          this.addressRegistry.searchWalletByTypeAndId(this.manager, 'user').then((userDetails) => {
-            if (userDetails) {
-              this.managerObject = Object.assign({identityId: userDetails.technicalId}, userDetails);
-            }
-          });
-        }
-      }
-    },
-    members() {
-      const oldMemberObjects = this.membersObjects;
-      this.membersObjects = [];
-      if (this.members && this.members.length) {
-        this.members.forEach((memberId) => {
-          const memberObject = oldMemberObjects && oldMemberObjects.find((wallet) => wallet.id === memberId && wallet.type === 'user');
-          if (memberObject) {
-            this.membersObjects.push(memberObject);
-          } else {
-            const walletReward = this.walletRewards.find((walletReward) => walletReward.wallet && walletReward.wallet.id === memberId && walletReward.wallet.type === 'user');
-            if (walletReward) {
-              this.membersObjects.push(Object.assign({identityId: walletReward.wallet.technicalId}, walletReward.wallet));
-            } else {
-              this.addressRegistry.searchWalletByTypeAndId(memberId, 'user').then((userDetails) => {
-                if (userDetails) {
-                  this.membersObjects.push(Object.assign({identityId: userDetails.technicalId}, userDetails));
-                }
-              });
-            }
-          }
-        });
-      }
-    },
-  },
-  methods: {
-    init() {
-      if (this.$refs && this.$refs.managerAutocomplete) {
-        this.$refs.managerAutocomplete.clear();
-      }
-      if (this.$refs && this.$refs.memberAutocomplete) {
-        this.$refs.memberAutocomplete.clear();
-      }
-
-      this.error = null;
-      this.loading = false;
-      this.id = this.team && this.team.id;
-      this.name = (this.team && this.team.name) || '';
-      this.description = (this.team && this.team.description) || '';
-      this.rewardType = (this.team && this.team.rewardType) || 'COMPUTED';
-      this.budget = (this.team && this.team.budget) || '';
-      this.computedBudget = (this.team && this.team.computedBudget) || '0';
-      this.manager = null;
-      this.members = [];
-
-      this.rewardTeamSpace = null;
-      this.rewardTeamSpaceId = null;
-      this.rewardTeamSpaceSearchTerm = null;
-      this.isLoadingSpaceSuggestions = false;
-
-      if (this.team) {
-        if (this.team.spacePrettyName && this.team.spaceId) {
-          this.addressRegistry.searchSpaces(this.team.spacePrettyName).then((items) => {
-            if (items) {
-              this.rewardTeamSpaceOptions = items;
-            } else {
-              this.rewardTeamSpaceOptions = [];
-            }
-            if (!this.rewardTeamSpaceOptions.find((item) => item.id === this.team.spaceId)) {
-              this.rewardTeamSpaceOptions.push({id: this.team.spacePrettyName, technicalId: this.team.spaceId, name: this.team.spacePrettyName});
-            }
-            this.rewardTeamSpace = this.team.spacePrettyName;
-            this.rewardTeamSpaceId = this.team.spaceId;
-          });
-        }
-
-        this.manager = this.team.manager && this.team.manager.id;
-        if (this.$refs && this.$refs.managerAutocomplete) {
-          this.$refs.managerAutocomplete.selectItem(this.manager, this.manager && 'user');
-        }
-
-        if (this.team.members && this.team.members.length) {
-          this.members = this.team.members.map((memberObject) => memberObject.id);
-        } else {
-          this.members = [];
-        }
-      }
-    },
-    deleteMember(poolMember) {
-      if (poolMember) {
-        const poolMemberIndex = this.members.indexOf(poolMember.id);
-        if (poolMemberIndex >= 0) {
-          this.members.splice(poolMemberIndex, 1);
-        }
-      }
-    },
-    addMember(memberObject) {
-      if (!memberObject || !memberObject.id) {
-        return;
-      }
-      this.error = '';
-
-      // Check if member already exists in other pool
-      let otherDuplicatedTeams = this.teams || [];
-      otherDuplicatedTeams = otherDuplicatedTeams.filter(team => team.id && team.id !== this.team.id && team.members && team.members.filter(member => member.id === memberObject.id).length);
-      if (otherDuplicatedTeams && otherDuplicatedTeams.length) {
-        this.error = this.$t('exoplatform.wallet.warning.memberDuplicatedInOtherPool', {0: memberObject.name, 1: otherDuplicatedTeams[0].name});
-      } else {
-        if (this.members) {
-          if (this.members.indexOf(memberObject.id) < 0) {
-            this.members.push(memberObject.id);
-          }
-        } else {
-          this.members = [memberObject.id];
-        }
-      }
-
-      this.$refs.memberAutocomplete.selectItem(null);
-    },
-    save() {
-      this.error = null;
-      if (!this.name) {
-        this.error = this.$t('exoplatform.wallet.warning.poolNameIsMandatory');
-        return;
-      }
-
-      // Check team name
-      if (this.teams && this.teams.length && (!this.id || this.name !== this.team.name)) {
-        let nameAlreadyExists = false;
-        this.teams.forEach((team) => {
-          nameAlreadyExists = nameAlreadyExists || (team.name.toLowerCase() === this.name.toLowerCase() && this.id !== team.id);
-        });
-        if (nameAlreadyExists) {
-          this.error = this.$t('exoplatform.wallet.warning.poolNameAlreadyExists');
-          return;
-        }
-      }
-
-      this.loading = true;
-      try {
-        const members = this.membersObjects && this.membersObjects.map((memberObject) => Object({id: memberObject.id, identityId: memberObject.identityId}));
-        if (this.team && this.team.members && this.team.members.length) {
-          members.forEach((memberObject) => {
-            const oldMember = this.team.members.find((oldMemberObject) => String(oldMemberObject.identityId) === String(memberObject.identityId));
-            if (oldMember) {
-              memberObject.technicalId = oldMember.technicalId;
-            }
-          });
-        }
-        const team = {
-          id: this.id,
-          name: this.name,
-          description: this.description,
-          rewardType: this.rewardType,
-          budget: (this.budget && Number(this.budget)) || 0,
-          spacePrettyName: this.rewardTeamSpace,
-          spaceId: this.rewardTeamSpaceId,
-          members: members,
-          manager: {
-            id: this.manager,
-            identityId: this.managerObject && this.managerObject.identityId,
-          },
-        };
-
-        return this.$rewardService.saveRewardTeam(team)
-          .then((addedTeam) => {
-            if (addedTeam) {
-              this.$emit('saved', addedTeam);
-            } else {
-              console.error  ('Error saving pool, response code is NOK');
-              this.error = this.$t('exoplatform.wallet.error.errorSavingPool');
-            }
-          })
-          .catch((e) => {
-            console.error  ('Error saving pool', e);
-            this.error = this.$t('exoplatform.wallet.error.errorSavingPool');
-          })
-          .finally(() => {
-            this.loading = false;
-          });
-      } catch (e) {
-        console.error  ('Error saving pool', e);
-        this.error = this.$t('exoplatform.wallet.error.errorSavingPool');
-        this.loading = false;
-      }
-    },
-  },
-};
-</script>
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TeamsListTab.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TeamsListTab.vue
deleted file mode 100644
index 1d15a113f..000000000
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TeamsListTab.vue
+++ /dev/null
@@ -1,341 +0,0 @@
-<!--
-This file is part of the Meeds project (https://meeds.io/).
-Copyright (C) 2020 Meeds Association
-contact@meeds.io
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 3 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--->
-<template>
-  <v-flex flat transparent>
-    <wallet-reward-confirm-dialog
-      ref="deleteTeamConfirm"
-      :loading="loading"
-      :message="deletePoolMessage"
-      :title="$t('exoplatform.wallet.label.deletePoolConfirmation')"
-      :ok-label="$t('exoplatform.wallet.button.delete')"
-      cancel-label="Cancel"
-      @ok="removeTeam(teamToDelete.id)" />
-    <wallet-reward-add-team-form
-      v-show="selectedTeam"
-      ref="teamModal"
-      :team="selectedTeam"
-      :teams="teams"
-      :wallet-rewards="walletRewards"
-      @saved="teamSaved"
-      @close="selectedTeam = null" />
-    <div
-      v-show="!selectedTeam"
-      id="addTeamButton"
-      class="text-start ms-3">
-      <v-btn
-        :title="$t('exoplatform.wallet.button.addNewPool')"
-        color="primary"
-        class="btn btn-primary pa-0"
-        icon
-        large
-        dark
-        @click="selectedTeam = {}">
-        <v-icon dark color="white">
-          add
-        </v-icon>
-      </v-btn>
-    </div>
-    <h4 v-show="!selectedTeam" class="text-center">
-      <span>{{ $t('exoplatform.wallet.label.eligiblePoolsUsers') }}: <strong>{{ eligiblePoolsUsersCount }}</strong></span>
-    </h4>
-    <h4 v-show="!selectedTeam" class="text-center">
-      <span>{{ $t('exoplatform.wallet.label.totalPoolsBudget') }}: <strong>{{ walletUtils.toFixed(poolsBudget) }} {{ symbol }}</strong></span>
-    </h4>
-    <v-container
-      v-show="!selectedTeam"
-      fluid
-      grid-list-md>
-      <v-data-iterator
-        :items="teams"
-        :items-per-page="1000"
-        no-data-text=""
-        hide-default-footer>
-        <template #default="props">
-          <v-row>
-            <v-col
-              v-for="item in props.items"
-              :key="item.name"
-              cols="12"
-              sm="12"
-              md="6"
-              lg="4">
-              <v-card :style="item.spacePrettyName && `background: url(/portal/rest/v1/social/spaces/${item.spacePrettyName}/banner)  0 0/100% auto no-repeat`" class="elevation-3">
-                <v-card flat class="transparent">
-                  <v-card-title class="pb-0">
-                    <v-chip color="transparent">
-                      <v-avatar v-if="item.spacePrettyName">
-                        <img :src="`/portal/rest/v1/social/spaces/${item.spacePrettyName}/avatar`">
-                      </v-avatar>
-                      <h3 v-if="item.disabled" class="headline">
-                        <del class="red--text">{{ item.name }}</del>
-                      </h3>
-                      <h3 v-else class="headline">
-                        {{ item.name }}
-                      </h3>
-                    </v-chip>
-                  </v-card-title>
-                  <v-card-title class="pt-0">
-                    <v-chip color="transparent">
-                      <h4 v-if="item.description">
-                        {{ item.description }}
-                      </h4>
-                      <h4 v-else>
-                        <i>{{ $t('exoplatform.wallet.label.noDescription') }}</i>
-                      </h4>
-                    </v-chip>
-                  </v-card-title>
-                  <v-divider />
-                  <v-list dense class="pb-0">
-                    <v-list-item>
-                      <v-list-item-content>
-                        {{ $t('exoplatform.wallet.label.poolMembers') }}:
-                      </v-list-item-content>
-                      <v-list-item-content class="align-end">
-                        {{ item.members ? item.members.length : 0 }}
-                      </v-list-item-content>
-                    </v-list-item>
-                    <v-list-item v-if="item.rewardType === 'FIXED'">
-                      <v-list-item-content>
-                        {{ $t('exoplatform.wallet.label.fixedTotalbudget') }}:
-                      </v-list-item-content>
-                      <v-list-item-content class="align-end">
-                        {{ item.budget }} {{ symbol }}
-                      </v-list-item-content>
-                    </v-list-item>
-                    <v-list-item v-if="item.rewardType === 'FIXED_PER_MEMBER'">
-                      <v-list-item-content>
-                        {{ $t('exoplatform.wallet.label.fixedTotalbudget') }}:
-                      </v-list-item-content>
-                      <v-list-item-content class="align-end">
-                        {{ Number(walletUtils.toFixed(item.budget)) }} {{ symbol }}
-                      </v-list-item-content>
-                    </v-list-item>
-                    <v-list-item v-if="item.rewardType === 'COMPUTED'">
-                      <v-list-item-content>
-                        {{ $t('exoplatform.wallet.label.budget') }}:
-                      </v-list-item-content>
-                      <v-list-item-content class="align-end">
-                        {{ $t('exoplatform.wallet.label.computed') }}
-                      </v-list-item-content>
-                    </v-list-item>
-                    <v-list-item>
-                      <v-flex class="align-start pe-1">
-                        <v-divider />
-                      </v-flex>
-                      <v-flex
-                        class="align-center">
-                        <strong>
-                          {{ periodDatesDisplay }}
-                        </strong>
-                      </v-flex>
-                      <v-flex class="align-end ps-1">
-                        <v-divider />
-                      </v-flex>
-                    </v-list-item>
-                    <v-list-item>
-                      <v-list-item-content>
-                        {{ $t('exoplatform.wallet.label.eligiblePoolMembers') }}:
-                      </v-list-item-content>
-                      <v-list-item-content class="align-end">
-                        {{ item.validMembersWallets ? item.validMembersWallets.length : 0 }} / {{ item.members ? item.members.length : 0 }}
-                      </v-list-item-content>
-                    </v-list-item>
-                    <v-list-item>
-                      <v-list-item-content>
-                        {{ $t('exoplatform.wallet.label.budget') }}:
-                      </v-list-item-content>
-                      <v-list-item-content
-                        v-if="!Number(item.computedBudget) || !item.validMembersWallets || !item.validMembersWallets.length"
-                        class="align-end red--text">
-                        <strong>
-                          0 {{ symbol }}
-                        </strong>
-                      </v-list-item-content>
-                      <v-list-item-content v-else class="align-end">
-                        {{ Number(walletUtils.toFixed(item.computedBudget)) }} {{ symbol }}
-                      </v-list-item-content>
-                    </v-list-item>
-                    <v-list-item>
-                      <v-list-item-content>
-                        {{ $t('exoplatform.wallet.label.budgetPerMember') }}:
-                      </v-list-item-content>
-                      <v-list-item-content
-                        v-if="!Number(item.computedBudget) || !item.validMembersWallets || !item.validMembersWallets.length"
-                        class="align-end red--text">
-                        <strong>
-                          0 {{ symbol }}
-                        </strong>
-                      </v-list-item-content>
-                      <v-list-item-content v-else class="align-end">
-                        {{ walletUtils.toFixed(Number(item.computedBudget) / item.validMembersWallets.length) }} {{ symbol }}
-                      </v-list-item-content>
-                    </v-list-item>
-                  </v-list>
-                </v-card>
-                <v-card-actions>
-                  <v-spacer />
-                  <v-btn
-                    v-if="item.id"
-                    text
-                    color="primary"
-                    @click="selectedTeam = item">
-                    {{ $t('exoplatform.wallet.button.edit') }}
-                  </v-btn>
-                  <v-btn
-                    v-else
-                    text
-                    color="primary"
-                    @click="selectedTeam = item">
-                    {{ $t('exoplatform.wallet.button.view') }}
-                  </v-btn>
-                  <v-btn
-                    v-if="item.id && item.disabled"
-                    text
-                    color="primary"
-                    @click="disableTeam(item, false)">
-                    {{ $t('exoplatform.wallet.button.enable') }}
-                  </v-btn>
-                  <v-btn
-                    v-else-if="item.id"
-                    text
-                    color="primary"
-                    @click="disableTeam(item, true)">
-                    {{ $t('exoplatform.wallet.button.disable') }}
-                  </v-btn>
-                  <v-btn
-                    v-if="item.id"
-                    text
-                    color="primary"
-                    @click="
-                      teamToDelete = item;
-                      $refs.deleteTeamConfirm.open();
-                    ">
-                    {{ $t('exoplatform.wallet.button.delete') }}
-                  </v-btn>
-                  <v-spacer />
-                </v-card-actions>
-              </v-card>
-            </v-col>
-          </v-row>
-        </template>
-      </v-data-iterator>
-    </v-container>
-  </v-flex>
-</template>
-
-<script>
-export default {
-  props: {
-    teams: {
-      type: Array,
-      default: function() {
-        return [];
-      },
-    },
-    walletRewards: {
-      type: Array,
-      default: function() {
-        return [];
-      },
-    },
-    contractDetails: {
-      type: Object,
-      default: function() {
-        return null;
-      },
-    },
-    periodDatesDisplay: {
-      type: String,
-      default: function() {
-        return null;
-      },
-    },
-  },
-  data: () => ({
-    teamToDelete: null,
-    selectedTeam: null,
-  }),
-  computed: {
-    poolsBudget() {
-      return this.walletRewards.reduce((sum, wallet) => sum + wallet.poolTokensToSend, 0);
-    },
-    deletePoolMessage() {
-      return this.teamToDelete && `Would you like to delete pool <strong>${this.teamToDelete.name}</strong>`;
-    },
-    symbol() {
-      return this.contractDetails && this.contractDetails.symbol ? this.contractDetails.symbol : '';
-    },
-    eligiblePoolsUsersCount() {
-      return this.walletRewards.filter(wallet =>  wallet.poolTokensToSend > 0).length;
-    },
-  },
-  watch: {
-    selectedTeam() {
-      if (this.selectedTeam) {
-        this.$emit('form-opened');
-      } else {
-        this.$emit('form-closed');
-      }
-    },
-  },
-  methods: {
-    teamSaved() {
-      this.$emit('refresh-teams');
-      this.selectedTeam = null;
-    },
-    disableTeam(team, disable) {
-      if (team.id === 0) {
-        return;
-      }
-      const teamToSave = Object.assign({}, team);
-      teamToSave.disabled = disable;
-
-      this.loading = true;
-      delete teamToSave.validMembersWallets;
-      return this.$rewardService.saveRewardTeam(teamToSave)
-        .then(() => {
-          this.$emit('refresh-teams');
-        })
-        .catch((e) => {
-          console.error  ('Error saving pool', e);
-          this.error = this.$t('exoplatform.wallet.error.errorSavingPool');
-        })
-        .finally(() => {
-          this.loading = false;
-        });
-    },
-    removeTeam(id) {
-      if (id < 1) {
-        console.error('Can\'t delete team with id', id);
-      }
-      this.$rewardService.removeRewardTeam(id)
-        .then((status) => {
-          if (status) {
-            this.teamToDelete = null;
-            this.$emit('refresh-teams');
-          } else {
-            this.error = this.$t('exoplatform.wallet.error.errorRemovingPool');
-          }
-        })
-        .catch((e) => {
-          console.error  ('Error getting team with id', id, e);
-          this.error = this.$t('exoplatform.wallet.error.errorRemovingPool');
-        });
-    },
-  },
-};
-</script>
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TimeZoneSelectBox.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TimeZoneSelectBox.vue
index bad87e15f..89c5001bc 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TimeZoneSelectBox.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TimeZoneSelectBox.vue
@@ -1,18 +1,22 @@
 <!--
-This file is part of the Meeds project (https://meeds.io/).
-Copyright (C) 2022 Meeds Association
-contact@meeds.io
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 3 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 -->
 <template>
   <v-autocomplete
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/modal/RewardDetailModal.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/modal/RewardDetailModal.vue
deleted file mode 100644
index 4e66e4927..000000000
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/modal/RewardDetailModal.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<!--
-This file is part of the Meeds project (https://meeds.io/).
-Copyright (C) 2020 Meeds Association
-contact@meeds.io
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 3 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--->
-<template>
-  <v-dialog
-    v-model="dialog"
-    content-class="uiPopup walletDialog"
-    width="400px"
-    max-width="100vw"
-    @keydown.esc="dialog = false">
-    <v-card v-if="wallet" class="elevation-12">
-      <div class="ignore-vuetify-classes popupHeader ClearFix">
-        <a
-          class="uiIconClose pull-right"
-          aria-hidden="true"
-          @click="dialog = false">
-        </a>
-        <span class="ignore-vuetify-classes PopupTitle popupTitle">
-          {{ $t('exoplatform.wallet.title.rewardDetailsOfWallet', {0: wallet.wallet.name}) }}
-        </span>
-      </div>
-      <v-list dense>
-        <v-list-item>
-          <v-list-item-content>{{ $t('exoplatform.wallet.label.period') }}:</v-list-item-content>
-          <v-list-item-content class="align-end">{{ period }}</v-list-item-content>
-        </v-list-item>
-        <v-list-item v-if="wallet.tokensSent">
-          <v-list-item-content>{{ $t('exoplatform.wallet.label.rewardsSent') }}:</v-list-item-content>
-          <v-list-item-content class="align-end">{{ walletUtils.toFixed(wallet.tokensSent) }} {{ symbol }}</v-list-item-content>
-        </v-list-item>
-        <v-list-item v-else-if="wallet.tokensToSend">
-          <v-list-item-content>{{ $t('exoplatform.wallet.label.computedRewardsToSend') }}:</v-list-item-content>
-          <v-list-item-content class="align-end">{{ walletUtils.toFixed(wallet.tokensToSend) }} {{ symbol }}</v-list-item-content>
-        </v-list-item>
-        <template v-if="rewards.length">
-          <v-divider />
-          <v-list-item v-for="reward in rewards" :key="reward.pluginId">
-            <v-list-item-content>{{ $t('exoplatform.wallet.label.rewardPluginPointDetails', {0: reward.points, 1: reward.pluginId}) }}:</v-list-item-content>
-            <v-list-item-content class="align-end">{{ walletUtils.toFixed(reward.amount) }} {{ symbol }}</v-list-item-content>
-          </v-list-item>
-        </template>
-        <div v-else>
-          <div class="alert alert-info">
-            <i class="uiIconInfo"></i>{{ $t('exoplatform.wallet.label.noRewards') }}
-          </div>
-        </div>
-      </v-list>
-    </v-card>
-  </v-dialog>
-</template>
-
-<script>
-export default {
-  props: {
-    wallet: {
-      type: Object,
-      default: function() {
-        return {};
-      },
-    },
-    symbol: {
-      type: String,
-      default: function() {
-        return null;
-      },
-    },
-    period: {
-      type: String,
-      default: function() {
-        return null;
-      },
-    },
-  },
-  data() {
-    return {
-      dialog: false,
-    };
-  },
-  computed: {
-    rewards() {
-      return this.wallet.rewards && this.wallet.rewards.length ? this.wallet.rewards.filter(reward => reward.amount || reward.points) : [];
-    },
-  },
-  watch: {
-    dialog() {
-      if (!this.dialog) {
-        this.$emit('closed');
-      }
-    }
-  },
-  methods: {
-    open() {
-      this.dialog = true;
-    }
-  }
-};
-</script>
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js
index 50b9e23d4..eace79ade 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js
@@ -2,24 +2,18 @@ import RewardApp from './components/RewardApp.vue';
 import RewardManagement from './components/reward/RewardManagement.vue';
 import CurrentBalance from './components/reward/CurrentBalance.vue';
 import BudgetConfiguration from './components/reward/BudgetConfiguration.vue';
-import RewardDetailModal from './components/reward/modal/RewardDetailModal.vue';
+import BudgetConfigurationDrawer from './components/reward/BudgetConfigurationDrawer.vue';
+import DistributionForecast from './components/reward/DistributionForecast.vue';
 import TimeZoneSelectBox from './components/reward/TimeZoneSelectBox.vue';
-import ConfigurationTab from './components/reward/ConfigurationTab.vue';
-import SendRewardsTab from './components/reward/SendRewardsTab.vue';
-import TeamForm from './components/reward/TeamForm.vue';
-import TeamsListTab from './components/reward/TeamsListTab.vue';
 
 const components = {
   'wallet-reward-app': RewardApp,
   'wallet-reward-management': RewardManagement,
   'wallet-current-balance': CurrentBalance,
   'wallet-budget-configuration': BudgetConfiguration,
-  'wallet-reward-reward-detail-modal': RewardDetailModal,
+  'wallet-budget-configuration-drawer': BudgetConfigurationDrawer,
+  'wallet-budget-distribution-forecast': DistributionForecast,
   'wallet-reward-timezone-selectbox': TimeZoneSelectBox,
-  'wallet-reward-configuration-tab': ConfigurationTab,
-  'wallet-reward-send-rewards-tab': SendRewardsTab,
-  'wallet-reward-add-team-form': TeamForm,
-  'wallet-reward-teams-list-tab': TeamsListTab,
 };
 
 for (const key in components) {

From f2c9a1a1328b1ad2dfe3c481a502eda15c46361a Mon Sep 17 00:00:00 2001
From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com>
Date: Mon, 23 Sep 2024 13:24:29 +0200
Subject: [PATCH 03/16] feat: List Reward cards per period - MEED-7455 -
 Meeds-io/MIPs#154 (#559)

This PR will list the reward report card per period.
---
 wallet-api/pom.xml                            |  16 +-
 .../wallet/reward/api/RewardPlugin.java       |   2 +-
 .../wallet/reward/rest/RewardReportREST.java  | 338 +++++++++++
 .../reward/rest/RewardSettingsREST.java       | 104 ++--
 .../reward/service/RewardReportService.java   |  25 +-
 .../reward/service/RewardSettingsService.java |   9 +-
 .../model/AddressAlreadyInUseException.java   |   2 +-
 .../wallet}/wallet/model/ContractDetail.java  |   2 +-
 .../model/ContractTransactionEvent.java       |   2 +-
 .../meeds/wallet}/wallet/model/Wallet.java    |   2 +-
 .../wallet/model/WalletAddressLabel.java      |   2 +-
 .../wallet}/wallet/model/WalletCacheKey.java  |   2 +-
 .../wallet}/wallet/model/WalletProvider.java  |   2 +-
 .../wallet}/wallet/model/WalletState.java     |   2 +-
 .../wallet}/wallet/model/WalletType.java      |   4 +-
 .../wallet/model/WebSocketMessage.java        |   2 +-
 .../wallet/model/reward/RewardBudgetType.java |   2 +-
 .../wallet/model/reward/RewardPeriod.java     |   4 +-
 .../wallet/model/reward/RewardPeriodType.java |  26 +-
 .../reward/RewardPeriodWithFullDate.java      |   7 +-
 .../model/reward/RewardPluginSettings.java    |   2 +-
 .../wallet/model/reward/RewardReport.java     |  14 +-
 .../wallet/model/reward/RewardSettings.java   |   4 +-
 .../wallet/model/reward/RewardStatus.java     |   2 +-
 .../wallet/model/reward/RewardTeam.java       |   2 +-
 .../wallet/model/reward/RewardTeamMember.java |   2 +-
 .../model/reward/RewardTransaction.java       |   6 +-
 .../model/reward/WalletPluginReward.java      |   2 +-
 .../wallet/model/reward/WalletReward.java     |  42 +-
 .../wallet/model/settings/GlobalSettings.java |   4 +-
 .../model/settings/InitialFundsSettings.java  |   2 +-
 .../model/settings/NetworkSettings.java       |   2 +-
 .../wallet/model/settings/UserSettings.java   |   6 +-
 .../wallet/model/settings/WalletSettings.java |   4 +-
 .../model/transaction/FundsRequest.java       |   2 +-
 .../model/transaction/TransactionDetail.java  |   8 +-
 .../TransactionNotificationType.java          |   6 +-
 .../transaction/TransactionStatistics.java    |   2 +-
 .../plugin/WalletAdminIdentityProvider.java   |   2 +-
 .../wallet/rest/WalletAccountREST.java        |  17 +-
 .../rest/WalletAdminTransactionREST.java      |   8 +-
 .../wallet/rest/WalletContractREST.java       |   8 +-
 .../wallet/rest/WalletSettingsREST.java       |  10 +-
 .../wallet/rest/WalletTransactionREST.java    |  19 +-
 .../service/BlockchainTransactionService.java |   6 +-
 .../wallet/service/WalletAccountService.java  |  16 +-
 .../wallet/service/WalletContractService.java |   4 +-
 .../wallet}/wallet/service/WalletService.java |  13 +-
 .../service/WalletTokenAdminService.java      |   8 +-
 .../service/WalletTransactionService.java     |   9 +-
 .../wallet/statistic/ExoWalletStatistic.java  |   2 +-
 .../statistic/ExoWalletStatisticAspect.java   |  20 +-
 .../statistic/ExoWalletStatisticService.java  |   2 +-
 .../wallet/statistic/StatisticUtils.java      |   8 +-
 .../wallet}/wallet/utils/RewardUtils.java     |   8 +-
 .../wallet}/wallet/utils/WalletUtils.java     |  32 +-
 .../wallet/reward/rest/RewardReportREST.java  | 279 ---------
 .../wallet/reward/rest/RewardTeamREST.java    | 124 ----
 .../reward/service/RewardTeamService.java     |  56 --
 .../wallet/model/reward/RewardPeriodTest.java |  25 +-
 .../reward/rest/TestRewardReportREST.java     | 262 ++++++++
 .../reward/rest/TestRewardSettingsREST.java   | 204 +++++++
 .../wallet/statistic/StatisticUtilsTest.java  |  19 +-
 .../meeds}/wallet/utils/WalletUtilsTest.java  |   3 +-
 .../reward/rest/TestRewardSettingsREST.java   | 161 -----
 .../io/meeds/wallet/reward/dao/RewardDAO.java |  55 ++
 .../wallet/reward/dao/RewardPeriodDAO.java    |  48 ++
 .../reward/entity/WalletRewardEntity.java     |  61 ++
 .../entity/WalletRewardPeriodEntity.java      |  60 +-
 .../RewardSucceedAnalyticsListener.java       |  49 +-
 .../RewardSucceedNotificationListener.java    |  25 +-
 .../listener/TransactionReplacedListener.java |  41 +-
 .../RewardSuccessNotificationPlugin.java      |  86 +++
 .../RewardSuccessTemplateBuilder.java         |  90 ++-
 .../RewardSuccessTemplateProvider.java        |  33 +-
 .../reward/scheduling/SchedulingConfig.java   |  26 +
 .../task/RewardStatusVerifierTask.java        |  82 +++
 .../service/WalletRewardReportService.java    | 311 ++++------
 .../service/WalletRewardSettingsService.java  |  36 +-
 .../storage/WalletRewardReportStorage.java    | 236 +++-----
 .../wallet/reward/dao/RewardDAO.java          | 111 ----
 .../wallet/reward/dao/RewardPeriodDAO.java    |  78 ---
 .../wallet/reward/dao/RewardPluginDAO.java    |  53 --
 .../wallet/reward/dao/RewardTeamDAO.java      |  44 --
 .../reward/entity/RewardTeamEntity.java       | 152 -----
 .../reward/entity/RewardTeamMemberEntity.java |  65 --
 .../reward/entity/WalletRewardEntity.java     | 132 ----
 .../entity/WalletRewardPluginEntity.java      |  83 ---
 .../reward/job/RewardStatusVerifierJob.java   | 124 ----
 .../RewardSuccessNotificationPlugin.java      |  99 ---
 .../plugin/GamificationRewardPlugin.java      | 104 ----
 .../reward/plugin/KudosRewardPlugin.java      | 104 ----
 .../service/WalletRewardTeamService.java      |  71 ---
 .../storage/WalletRewardTeamStorage.java      | 193 ------
 .../portal/wallet-reward-configuration.xml    |  94 ---
 .../reward-rdbms.db.changelog-1.0.0.xml       |  13 +
 .../src/main/resources/jpa-entities.idx       |   7 +-
 .../meeds}/wallet/reward/BaseRewardTest.java  |  25 +-
 .../wallet/reward/BaseWalletRewardTest.java   | 305 ++++++++++
 .../RewardSucceedAnalyticsListenerTest.java   |  98 +++
 ...RewardSucceedNotificationListenerTest.java |  96 +++
 .../TransactionReplacedListenerTest.java      |  80 +++
 .../WalletRewardReportServiceTest.java        |  47 +-
 .../WalletRewardSettingsServiceTest.java      |  12 +-
 .../wallet/reward/BaseWalletRewardTest.java   | 323 ----------
 .../wallet/reward/dao/RewardTeamDAOTest.java  |  41 --
 .../reward/job/WalletRewardJobTest.java       | 230 -------
 .../RewardSuccessNotificationPluginTest.java  | 103 ----
 .../RewardSuccessTemplateBuilderTest.java     | 135 -----
 .../RewardSuccessTemplateProviderTest.java    |  83 ---
 .../service/WalletRewardTeamServiceTest.java  |  97 ---
 .../reward/test/mock/IdentityManagerMock.java | 232 --------
 .../reward/test/mock/SpaceServiceMock.java    | 562 ------------------
 wallet-services/pom.xml                       |   2 +-
 .../BlockchainRequestException.java           |   2 +-
 .../MaxRequestRateReachedException.java       |   2 +-
 .../ContractTransactionMinedListener.java     |  10 +-
 .../TransactionMinedAndUpdatedListener.java   |   8 +-
 .../listener/TransactionMinedListener.java    |  14 +-
 .../TransactionSentToBlockchainListener.java  |   8 +-
 .../TransactionWithNonceVerifierListener.java |  10 +-
 .../listener/WebSocketContractListener.java   |   6 +-
 .../WebSocketTransactionListener.java         |   6 +-
 .../listener/WebSocketWalletListener.java     |   6 +-
 .../EthereumBlockchainTransactionService.java |  44 +-
 .../service/EthereumClientConnector.java      |  46 +-
 .../EthereumWalletTokenAdminService.java      |  54 +-
 .../meeds}/wallet/dao/AddressLabelDAO.java    |   4 +-
 .../wallet/dao/WalletAccountBackupDAO.java    |   4 +-
 .../meeds}/wallet/dao/WalletAccountDAO.java   |  10 +-
 .../wallet/dao/WalletBlockchainStateDAO.java  |   4 +-
 .../wallet/dao/WalletPrivateKeyDAO.java       |   4 +-
 .../wallet/dao/WalletTransactionDAO.java      |   4 +-
 .../wallet/entity/AddressLabelEntity.java     |   2 +-
 .../wallet/entity/TransactionEntity.java      |   2 +-
 .../wallet/entity/WalletBackupEntity.java     |   2 +-
 .../entity/WalletBlockchainStateEntity.java   |   2 +-
 .../meeds}/wallet/entity/WalletEntity.java    |   9 +-
 .../wallet/entity/WalletPrivateKeyEntity.java |   2 +-
 .../wallet/job/BoostAdminTransactionJob.java  |   4 +-
 .../PendingEtherTransactionVerifierJob.java   |  12 +-
 .../wallet/job/TransactionSenderJob.java      |   4 +-
 .../listener/AutoTransactionListener.java     |  16 +-
 ...ificationWalletInitializationListener.java |  20 +-
 .../listener/TransactionCreatedListener.java  |   8 +-
 .../TransactionNotificationListener.java      |  18 +-
 .../listener/WalletDeletedListener.java       |   8 +-
 .../builder/RequestFundsTemplateBuilder.java  |   8 +-
 .../notification/builder/TemplateBuilder.java |   8 +-
 .../FundsRequestNotificationPlugin.java       |  14 +-
 .../WalletReceiverNotificationPlugin.java     |  52 +-
 .../WalletSenderNotificationPlugin.java       |  10 +-
 .../provider/MailTemplateProvider.java        |  10 +-
 .../provider/MobilePushTemplateProvider.java  |  10 +-
 .../plugin/WalletPermanentLinkPlugin.java     |   8 +-
 .../wallet/plugin/WalletFeaturePlugin.java    |   9 +-
 .../service/WalletAccountServiceImpl.java     |  95 +--
 .../service/WalletContractServiceImpl.java    |  20 +-
 .../wallet/service/WalletServiceImpl.java     |  92 +--
 .../service/WalletTransactionServiceImpl.java |  23 +-
 .../service/WalletWebSocketService.java       |   8 +-
 .../wallet/storage/AddressLabelStorage.java   |   8 +-
 .../wallet/storage/TransactionStorage.java    |  16 +-
 .../meeds}/wallet/storage/WalletStorage.java  |  41 +-
 .../storage/cached/CachedAccountStorage.java  |  16 +-
 .../cached/CachedTransactionStorage.java      |   8 +-
 .../conf/portal/wallet-configuration.xml      |  56 +-
 .../src/main/resources/jpa-entities.idx       |  12 +-
 .../locale/addon/Wallet_en.properties         |  28 +-
 .../ContractTransactionMinedListenerTest.java |  16 +-
 ...ransactionMinedAndUpdatedListenerTest.java |  12 +-
 .../TransactionMinedListenerTest.java         |  18 +-
 ...ansactionSentToBlockchainListenerTest.java |  12 +-
 ...nsactionWithNonceVerifierListenerTest.java |  14 +-
 ...ereumBlockchainTransactionServiceTest.java |  28 +-
 .../service/EthereumClientConnectorTest.java  |  10 +-
 .../wallet/dao/AddressLabelDAOTest.java       |   6 +-
 .../dao/WalletAccountBackupDAOTest.java       |  12 +-
 .../wallet/dao/WalletAccountDAOTest.java      |   8 +-
 .../dao/WalletBlockchainStateDAOTest.java     |  10 +-
 .../wallet/dao/WalletPrivateKeyDAOTest.java   |   6 +-
 .../wallet/dao/WalletTransactionDAOTest.java  |   8 +-
 .../job/BoostAdminTransactionJobTest.java     |   6 +-
 ...endingEtherTransactionVerifierJobTest.java |  14 +-
 .../wallet/job/TransactionSenderJobTest.java  |   6 +-
 ...ationWalletInitializationListenerTest.java |  21 +-
 .../TransactionCreatedListenerTest.java       |  12 +-
 .../listener/WalletDeletedListenerTest.java   |  14 +-
 .../service/WalletAccountServiceTest.java     |  36 +-
 .../wallet/service/WalletServiceTest.java     |  29 +-
 .../service/WalletTransactionServiceTest.java |  15 +-
 .../storage/AddressLabelStorageTest.java      |   6 +-
 .../storage/TransactionStorageTest.java       |  10 +-
 .../wallet/storage/WalletStorageTest.java     |  18 +-
 .../meeds}/wallet/test/BaseWalletTest.java    |  62 +-
 .../wallet/test/mock/IdentityManagerMock.java |   6 +-
 .../wallet/test/mock/SpaceServiceMock.java    |   2 +-
 ...llet-services-test-local-configuration.xml |   4 +-
 .../io/meeds/wallet/WalletApplication.java    |   2 +
 .../conf/wallet/blockchain-configuration.xml  |  42 +-
 .../wallet/gamification-configuration.xml     |   4 +-
 .../wallet/notification-configuration.xml     |  16 +-
 .../main/webapp/WEB-INF/gatein-resources.xml  |   3 +
 .../src/main/webapp/WEB-INF/jsp/wallet.jsp    |   2 +-
 .../main/webapp/WEB-INF/jsp/walletBalance.jsp |  14 +-
 .../webapp/WEB-INF/jsp/walletSettings.jsp     |   2 +-
 .../wallet-common/components/ProfileChip.vue  |   9 -
 .../vue-app/wallet-common/js/RewardService.js | 116 +++-
 .../wallet-reward/components/RewardApp.vue    |  88 ++-
 .../components/reward/BudgetConfiguration.vue |  31 +-
 .../components/reward/RewardCard.vue          | 251 ++++++++
 .../reward/RewardCardMaskContent.vue          |  45 ++
 .../components/reward/RewardDetails.vue       | 210 +++++++
 .../components/reward/RewardDetailsItem.vue   | 263 ++++++++
 .../components/reward/RewardManagement.vue    |  74 ++-
 .../vue-app/wallet-reward/initComponents.js   |   8 +
 216 files changed, 4187 insertions(+), 5550 deletions(-)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds}/wallet/reward/api/RewardPlugin.java (97%)
 create mode 100644 wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds}/wallet/reward/rest/RewardSettingsREST.java (58%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds}/wallet/reward/service/RewardReportService.java (86%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds}/wallet/reward/service/RewardSettingsService.java (88%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/AddressAlreadyInUseException.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/ContractDetail.java (97%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/ContractTransactionEvent.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/Wallet.java (98%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/WalletAddressLabel.java (97%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/WalletCacheKey.java (97%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/WalletProvider.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/WalletState.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/WalletType.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/WebSocketMessage.java (97%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/reward/RewardBudgetType.java (95%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/reward/RewardPeriod.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/reward/RewardPeriodType.java (70%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/reward/RewardPeriodWithFullDate.java (94%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/reward/RewardPluginSettings.java (97%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/reward/RewardReport.java (88%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/reward/RewardSettings.java (95%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/reward/RewardStatus.java (95%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/reward/RewardTeam.java (97%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/reward/RewardTeamMember.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/reward/RewardTransaction.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/reward/WalletPluginReward.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/reward/WalletReward.java (70%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/settings/GlobalSettings.java (95%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/settings/InitialFundsSettings.java (97%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/settings/NetworkSettings.java (97%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/settings/UserSettings.java (93%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/settings/WalletSettings.java (94%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/transaction/FundsRequest.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/transaction/TransactionDetail.java (95%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/transaction/TransactionNotificationType.java (87%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/model/transaction/TransactionStatistics.java (95%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/plugin/WalletAdminIdentityProvider.java (97%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/rest/WalletAccountREST.java (98%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/rest/WalletAdminTransactionREST.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/rest/WalletContractREST.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/rest/WalletSettingsREST.java (94%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/rest/WalletTransactionREST.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/service/BlockchainTransactionService.java (94%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/service/WalletAccountService.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/service/WalletContractService.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/service/WalletService.java (91%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/service/WalletTokenAdminService.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/service/WalletTransactionService.java (97%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/statistic/ExoWalletStatistic.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/statistic/ExoWalletStatisticAspect.java (89%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/statistic/ExoWalletStatisticService.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/statistic/StatisticUtils.java (96%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/utils/RewardUtils.java (97%)
 rename wallet-api/src/main/java/{org/exoplatform => io/meeds/wallet}/wallet/utils/WalletUtils.java (98%)
 delete mode 100644 wallet-api/src/main/java/org/exoplatform/wallet/reward/rest/RewardReportREST.java
 delete mode 100644 wallet-api/src/main/java/org/exoplatform/wallet/reward/rest/RewardTeamREST.java
 delete mode 100644 wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardTeamService.java
 rename wallet-api/src/test/java/{org/exoplatform => io/meeds}/wallet/model/reward/RewardPeriodTest.java (81%)
 create mode 100644 wallet-api/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java
 create mode 100644 wallet-api/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java
 rename wallet-api/src/test/java/{org/exoplatform => io/meeds}/wallet/statistic/StatisticUtilsTest.java (90%)
 rename wallet-api/src/test/java/{org/exoplatform => io/meeds}/wallet/utils/WalletUtilsTest.java (96%)
 delete mode 100644 wallet-api/src/test/java/org/exoplatform/wallet/reward/rest/TestRewardSettingsREST.java
 create mode 100644 wallet-reward-services/src/main/java/io/meeds/wallet/reward/dao/RewardDAO.java
 create mode 100644 wallet-reward-services/src/main/java/io/meeds/wallet/reward/dao/RewardPeriodDAO.java
 create mode 100644 wallet-reward-services/src/main/java/io/meeds/wallet/reward/entity/WalletRewardEntity.java
 rename wallet-reward-services/src/main/java/{org/exoplatform => io/meeds}/wallet/reward/entity/WalletRewardPeriodEntity.java (56%)
 rename wallet-reward-services/src/main/java/{org/exoplatform => io/meeds}/wallet/reward/listener/RewardSucceedAnalyticsListener.java (56%)
 rename wallet-reward-services/src/main/java/{org/exoplatform => io/meeds}/wallet/reward/listener/RewardSucceedNotificationListener.java (72%)
 rename wallet-reward-services/src/main/java/{org/exoplatform => io/meeds}/wallet/reward/listener/TransactionReplacedListener.java (55%)
 create mode 100644 wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessNotificationPlugin.java
 rename wallet-reward-services/src/main/java/{org/exoplatform => io/meeds}/wallet/reward/notification/RewardSuccessTemplateBuilder.java (56%)
 rename wallet-reward-services/src/main/java/{org/exoplatform => io/meeds}/wallet/reward/notification/RewardSuccessTemplateProvider.java (74%)
 create mode 100644 wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/SchedulingConfig.java
 create mode 100644 wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/task/RewardStatusVerifierTask.java
 rename wallet-reward-services/src/main/java/{org/exoplatform => io/meeds}/wallet/reward/service/WalletRewardReportService.java (64%)
 rename wallet-reward-services/src/main/java/{org/exoplatform => io/meeds}/wallet/reward/service/WalletRewardSettingsService.java (73%)
 rename wallet-reward-services/src/main/java/{org/exoplatform => io/meeds}/wallet/reward/storage/WalletRewardReportStorage.java (55%)
 delete mode 100644 wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardDAO.java
 delete mode 100644 wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardPeriodDAO.java
 delete mode 100644 wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardPluginDAO.java
 delete mode 100644 wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardTeamDAO.java
 delete mode 100644 wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/RewardTeamEntity.java
 delete mode 100644 wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/RewardTeamMemberEntity.java
 delete mode 100644 wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/WalletRewardEntity.java
 delete mode 100644 wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/WalletRewardPluginEntity.java
 delete mode 100644 wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/job/RewardStatusVerifierJob.java
 delete mode 100644 wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPlugin.java
 delete mode 100644 wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/plugin/GamificationRewardPlugin.java
 delete mode 100644 wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/plugin/KudosRewardPlugin.java
 delete mode 100644 wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardTeamService.java
 delete mode 100644 wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/storage/WalletRewardTeamStorage.java
 rename wallet-reward-services/src/test/java/{org/exoplatform => io/meeds}/wallet/reward/BaseRewardTest.java (73%)
 create mode 100644 wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseWalletRewardTest.java
 create mode 100644 wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListenerTest.java
 create mode 100644 wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java
 create mode 100644 wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/TransactionReplacedListenerTest.java
 rename wallet-reward-services/src/test/java/{org/exoplatform => io/meeds}/wallet/reward/service/WalletRewardReportServiceTest.java (69%)
 rename wallet-reward-services/src/test/java/{org/exoplatform => io/meeds}/wallet/reward/service/WalletRewardSettingsServiceTest.java (92%)
 delete mode 100644 wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/BaseWalletRewardTest.java
 delete mode 100644 wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/dao/RewardTeamDAOTest.java
 delete mode 100644 wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/job/WalletRewardJobTest.java
 delete mode 100644 wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPluginTest.java
 delete mode 100644 wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateBuilderTest.java
 delete mode 100644 wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateProviderTest.java
 delete mode 100644 wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardTeamServiceTest.java
 delete mode 100644 wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/test/mock/IdentityManagerMock.java
 delete mode 100644 wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/test/mock/SpaceServiceMock.java
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/blockchain/BlockchainRequestException.java (96%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/blockchain/MaxRequestRateReachedException.java (96%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/blockchain/listener/ContractTransactionMinedListener.java (91%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/blockchain/listener/TransactionMinedAndUpdatedListener.java (92%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/blockchain/listener/TransactionMinedListener.java (91%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/blockchain/listener/TransactionSentToBlockchainListener.java (81%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/blockchain/listener/TransactionWithNonceVerifierListener.java (92%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/blockchain/listener/WebSocketContractListener.java (90%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/blockchain/listener/WebSocketTransactionListener.java (90%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/blockchain/listener/WebSocketWalletListener.java (91%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/blockchain/service/EthereumBlockchainTransactionService.java (96%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/blockchain/service/EthereumClientConnector.java (95%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/blockchain/service/EthereumWalletTokenAdminService.java (95%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/dao/AddressLabelDAO.java (91%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/dao/WalletAccountBackupDAO.java (95%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/dao/WalletAccountDAO.java (85%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/dao/WalletBlockchainStateDAO.java (95%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/dao/WalletPrivateKeyDAO.java (94%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/dao/WalletTransactionDAO.java (99%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/entity/AddressLabelEntity.java (98%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/entity/TransactionEntity.java (99%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/entity/WalletBackupEntity.java (98%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/entity/WalletBlockchainStateEntity.java (98%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/entity/WalletEntity.java (93%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/entity/WalletPrivateKeyEntity.java (98%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/job/BoostAdminTransactionJob.java (95%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/job/PendingEtherTransactionVerifierJob.java (91%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/job/TransactionSenderJob.java (96%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/listener/AutoTransactionListener.java (89%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/listener/GamificationWalletInitializationListener.java (80%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/listener/TransactionCreatedListener.java (89%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/listener/TransactionNotificationListener.java (94%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/listener/WalletDeletedListener.java (89%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/notification/builder/RequestFundsTemplateBuilder.java (98%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/notification/builder/TemplateBuilder.java (98%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/notification/plugin/FundsRequestNotificationPlugin.java (93%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/notification/plugin/WalletReceiverNotificationPlugin.java (73%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/notification/plugin/WalletSenderNotificationPlugin.java (95%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/notification/provider/MailTemplateProvider.java (90%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/notification/provider/MobilePushTemplateProvider.java (90%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/plugin/WalletFeaturePlugin.java (92%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/service/WalletAccountServiceImpl.java (93%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/service/WalletContractServiceImpl.java (92%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/service/WalletServiceImpl.java (87%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/service/WalletTransactionServiceImpl.java (97%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/service/WalletWebSocketService.java (93%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/storage/AddressLabelStorage.java (93%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/storage/TransactionStorage.java (97%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/storage/WalletStorage.java (91%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/storage/cached/CachedAccountStorage.java (93%)
 rename wallet-services/src/main/java/{org/exoplatform => io/meeds}/wallet/storage/cached/CachedTransactionStorage.java (91%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/blockchain/listener/ContractTransactionMinedListenerTest.java (91%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/blockchain/listener/TransactionMinedAndUpdatedListenerTest.java (90%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/blockchain/listener/TransactionMinedListenerTest.java (93%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/blockchain/listener/TransactionSentToBlockchainListenerTest.java (87%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/blockchain/listener/TransactionWithNonceVerifierListenerTest.java (92%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/blockchain/service/EthereumBlockchainTransactionServiceTest.java (98%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/blockchain/service/EthereumClientConnectorTest.java (98%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/dao/AddressLabelDAOTest.java (91%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/dao/WalletAccountBackupDAOTest.java (92%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/dao/WalletAccountDAOTest.java (93%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/dao/WalletBlockchainStateDAOTest.java (92%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/dao/WalletPrivateKeyDAOTest.java (93%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/dao/WalletTransactionDAOTest.java (98%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/job/BoostAdminTransactionJobTest.java (93%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/job/PendingEtherTransactionVerifierJobTest.java (92%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/job/TransactionSenderJobTest.java (93%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/listener/GamificationWalletInitializationListenerTest.java (83%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/listener/TransactionCreatedListenerTest.java (92%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/listener/WalletDeletedListenerTest.java (88%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/service/WalletAccountServiceTest.java (97%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/service/WalletServiceTest.java (93%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/service/WalletTransactionServiceTest.java (98%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/storage/AddressLabelStorageTest.java (97%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/storage/TransactionStorageTest.java (98%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/storage/WalletStorageTest.java (97%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/test/BaseWalletTest.java (93%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/test/mock/IdentityManagerMock.java (98%)
 rename wallet-services/src/test/java/{org/exoplatform => io/meeds}/wallet/test/mock/SpaceServiceMock.java (99%)
 create mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue
 create mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCardMaskContent.vue
 create mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
 create mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue

diff --git a/wallet-api/pom.xml b/wallet-api/pom.xml
index 96055b2a1..5dc6a691f 100644
--- a/wallet-api/pom.xml
+++ b/wallet-api/pom.xml
@@ -42,6 +42,18 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <artifactId>analytics-api</artifactId>
       <scope>provided</scope>
     </dependency>
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.vaadin.external.google</groupId>
+          <artifactId>android-json</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
   <build>
     <finalName>wallet-api</finalName>
@@ -52,8 +64,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <configuration>
           <useResourcePackagesChildren>true</useResourcePackagesChildren>
           <resourcePackages>
-            <locations>org.exoplatform.wallet.rest</locations>
-            <locations>org.exoplatform.wallet.reward.rest</locations>
+            <locations>io.meeds.wallet.wallet.rest</locations>
+            <locations>io.meeds.wallet.reward.rest</locations>
           </resourcePackages>
           <swaggerConfig>
             <info>
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/reward/api/RewardPlugin.java b/wallet-api/src/main/java/io/meeds/wallet/reward/api/RewardPlugin.java
similarity index 97%
rename from wallet-api/src/main/java/org/exoplatform/wallet/reward/api/RewardPlugin.java
rename to wallet-api/src/main/java/io/meeds/wallet/reward/api/RewardPlugin.java
index 66b7e4859..1db9a595f 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/reward/api/RewardPlugin.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/reward/api/RewardPlugin.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.reward.api;
+package io.meeds.wallet.reward.api;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java b/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
new file mode 100644
index 000000000..b281430b2
--- /dev/null
+++ b/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
@@ -0,0 +1,338 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ * Copyright (C) 2020 Meeds Association
+ * contact@meeds.io
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package io.meeds.wallet.reward.rest;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAdjusters;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import javax.ws.rs.core.*;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.commons.lang3.StringUtils;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import org.exoplatform.common.http.HTTPStatus;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+import io.meeds.wallet.wallet.model.reward.RewardPeriod;
+import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
+import io.meeds.wallet.wallet.model.reward.RewardPeriodWithFullDate;
+import io.meeds.wallet.wallet.model.reward.RewardReport;
+import io.meeds.wallet.wallet.model.reward.RewardSettings;
+import io.meeds.wallet.wallet.model.reward.WalletReward;
+import io.meeds.wallet.reward.service.RewardReportService;
+import io.meeds.wallet.reward.service.RewardSettingsService;
+import io.meeds.wallet.wallet.utils.RewardUtils;
+import io.meeds.wallet.wallet.utils.WalletUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.bind.DefaultValue;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PagedResourcesAssembler;
+import org.springframework.hateoas.EntityModel;
+import org.springframework.hateoas.PagedModel;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.web.bind.annotation.*;
+
+import static io.meeds.wallet.wallet.utils.RewardUtils.timeToSecondsAtDayStart;
+
+
+@RestController
+@RequestMapping("reward")
+@Tag(name = "rewards", description = "Manage wallet rewards") // NOSONAR
+public class RewardReportREST {
+  
+  private static final String   ERROR_PARAM            = "error";
+
+  private static final String   ERROR_EMPTY_PARAM_DATE = "Bad request sent to server with empty 'date' parameter";
+
+  private static final Log      LOG                    = ExoLogger.getLogger(RewardReportREST.class);
+
+  @Autowired
+  private RewardReportService   rewardReportService;
+
+  @Autowired
+  private RewardSettingsService rewardSettingsService;
+
+  @GetMapping(path = "compute")
+  @Secured("rewarding")
+  @Operation(
+          summary = "Compute rewards of wallets per a chosen period of time",
+          method = "GET",
+          description = "returns a set of wallet reward object")
+  @ApiResponses(value = {
+          @ApiResponse(responseCode = "200", description = "Request fulfilled"),
+          @ApiResponse(responseCode = "400", description = "Invalid query input"),
+          @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
+          @ApiResponse(responseCode = "500", description = "Internal server error") })
+  public List<RewardReport> computeRewards(@Parameter(description = "Page")
+                                           @RequestParam(value = "page", defaultValue = "0", required = false)
+                                           int page,
+                                           @Parameter(description = "Page size")
+                                           @RequestParam(value = "size", defaultValue = "12", required = false)
+                                           int size) {
+
+    int numberOfPeriods = (page + 1) * size;
+    List<RewardPeriod> periods = generatePreviousPeriods(numberOfPeriods);
+
+    List<RewardReport> rewardReports = periods.stream()
+                                              .skip((long) page * size)
+                                              .limit(size)
+                                              .map(rewardPeriod -> rewardReportService.computeRewards(rewardPeriod.getPeriodMedianDate()))
+                                              .toList();
+    rewardReports.forEach(rewardReport -> rewardReport.setPeriod(new RewardPeriodWithFullDate(rewardReport.getPeriod())));
+    return rewardReports;
+  }
+
+  @PostMapping(path = "period/compute")
+  @Secured("rewarding")
+  @Operation(
+          summary = "Compute rewards of wallets per a chosen period of time",
+          method = "GET",
+          description = "returns a set of wallet reward object")
+  @ApiResponses(value = {
+          @ApiResponse(responseCode = "200", description = "Request fulfilled"),
+          @ApiResponse(responseCode = "400", description = "Invalid query input"),
+          @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
+          @ApiResponse(responseCode = "500", description = "Internal server error") })
+  public RewardReport computeRewardsByPeriod(@RequestBody
+                                             RewardPeriod rewardPeriod) {
+    RewardReport rewardReport = rewardReportService.computeRewards(rewardPeriod.getPeriodMedianDate());
+    rewardReport.setPeriod(new RewardPeriodWithFullDate(rewardReport.getPeriod()));
+    return rewardReport;
+  }
+
+  @GetMapping(path = "compute/user")
+  @Secured("users")
+  @Operation(
+          summary = "Compute rewards of user wallet per a chosen period of time",
+          method = "GET",
+          description = "returns a wallet reward object")
+  @ApiResponses(value = {
+          @ApiResponse(responseCode = "200", description = "Request fulfilled"),
+          @ApiResponse(responseCode = "400", description = "Invalid query input"),
+          @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
+          @ApiResponse(responseCode = "500", description = "Internal server error") })
+  public Response computeRewardsByUser(@Parameter(description = "A date with format yyyy-MM-dd", required = true)
+                                       @RequestParam("date")
+                                       String date) {
+    if (StringUtils.isBlank(date)) {
+      return Response.status(HTTPStatus.BAD_REQUEST).entity(ERROR_EMPTY_PARAM_DATE).build();
+    }
+    try {
+      RewardPeriod rewardPeriod = getRewardPeriod(date);
+      RewardReport rewardReport = rewardReportService.computeRewardsByUser(rewardPeriod.getPeriodMedianDate(), WalletUtils.getCurrentUserIdentityId());
+      rewardReport.setPeriod(new RewardPeriodWithFullDate(rewardReport.getPeriod()));
+      return Response.ok(rewardReport).build();
+    } catch (Exception e) {
+      LOG.error("Error getting user's computed reward", e);
+      JSONObject object = new JSONObject();
+      try {
+        object.append(ERROR_PARAM, e.getMessage());
+      } catch (JSONException e1) {
+        // Nothing to do
+      }
+      return Response.status(HTTPStatus.INTERNAL_ERROR).type(MediaType.APPLICATION_JSON).entity(object.toString()).build();
+    }
+  }
+
+
+  @PostMapping(path = "send")
+  @Secured("rewarding")
+  @Operation(
+          summary = "Send rewards of wallets per a chosen period of time",
+          method = "GET",
+          description = "Send rewards of wallets per a chosen period of time and returns an empty response")
+  @ApiResponses(value = {
+      @ApiResponse(responseCode = "204", description = "Request fulfilled"),
+      @ApiResponse(responseCode = "400", description = "Invalid query input"),
+      @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
+      @ApiResponse(responseCode = "500", description = "Internal server error") })
+  public Response sendRewards(HttpServletRequest request,
+                              @RequestBody
+                              RewardPeriod rewardPeriod) {
+    try {
+      rewardReportService.sendRewards(rewardPeriod.getPeriodMedianDate(), request.getRemoteUser());
+      return Response.noContent().build();
+    } catch (Exception e) {
+      LOG.error("Error getting computed reward", e);
+      JSONObject object = new JSONObject();
+      try {
+        object.append(ERROR_PARAM, e.getMessage());
+      } catch (JSONException e1) {
+        // Nothing to do
+      }
+      return Response.status(HTTPStatus.INTERNAL_ERROR).type(MediaType.APPLICATION_JSON).entity(object.toString()).build();
+    }
+  }
+
+  @GetMapping(path = "list")
+  @Secured("users")
+  @Operation(
+          summary = "Return list of rewards for current user with a limit of items to return",
+          method = "GET",
+          description = "return list of rewards per user")
+  @ApiResponses(value = {
+      @ApiResponse(responseCode = "200", description = "Request fulfilled"),
+      @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
+      @ApiResponse(responseCode = "500", description = "Internal server error") })
+  public Response listRewards(@Parameter(description = "limit of items to load", required = true)
+                              @RequestParam("limit")
+                              int limit) {
+    try {
+      List<WalletReward> rewards = rewardReportService.listRewards(WalletUtils.getCurrentUserId(), limit);
+      rewards.forEach(reward -> reward.setPeriod(new RewardPeriodWithFullDate(reward.getPeriod())));
+      return Response.ok(rewards).build();
+    } catch (Exception e) {
+      LOG.error("Error getting list of reward for current user", e);
+      JSONObject object = new JSONObject();
+      try {
+        object.append(ERROR_PARAM, e.getMessage());
+      } catch (JSONException e1) {
+        // Nothing to do
+      }
+      return Response.status(HTTPStatus.INTERNAL_ERROR).type(MediaType.APPLICATION_JSON).entity(object.toString()).build();
+    }
+  }
+
+  @GetMapping(path = "countRewards")
+  @Secured("users")
+  @Operation(
+          summary = "Return sum of rewards for user",
+          method = "GET",
+          description = "return sum of rewards per user")
+  @ApiResponses(value = {
+          @ApiResponse(responseCode = "200", description = "Request fulfilled"),
+          @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
+          @ApiResponse(responseCode = "500", description = "Internal server error") })
+  public Response countRewards(@Context Request request,
+                               @Parameter(description = "user id", required = true)
+                               @RequestParam("userId")
+                               String userId) {
+    try {
+      Double sumRewards = rewardReportService.countRewards(userId);
+      EntityTag eTag = new EntityTag(String.valueOf(sumRewards));
+      Response.ResponseBuilder builder = request.evaluatePreconditions(eTag);
+      if (builder == null) {
+        JSONObject result = new JSONObject();
+        result.put("sumRewards", sumRewards);
+        builder = Response.ok(result.toString(), MediaType.APPLICATION_JSON);
+        builder.tag(eTag);
+      }
+      return builder.build();
+    } catch (Exception e) {
+      LOG.error("Error getting sum of reward for current user", e);
+      JSONObject object = new JSONObject();
+      try {
+        object.append(ERROR_PARAM, e.getMessage());
+      } catch (JSONException e1) {
+        // Nothing to do
+      }
+      return Response.status(HTTPStatus.INTERNAL_ERROR).type(MediaType.APPLICATION_JSON).entity(object.toString()).build();
+    }
+  }
+
+  @GetMapping(path = "periods")
+  @Secured("rewarding")
+  @Operation(summary = "Retrieves the list of periods sorted descending by start date", method = "GET", description = "returns the list of periods sorted descending by start date")
+  @ApiResponses(value = {
+          @ApiResponse(responseCode = "200", description = "Request fulfilled"),
+          @ApiResponse(responseCode = "400", description = "Invalid query input"),
+          @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
+          @ApiResponse(responseCode = "500", description = "Internal server error") })
+  public PagedModel<EntityModel<RewardPeriod>> getRewardReportPeriods(Pageable pageable,
+                                                                      PagedResourcesAssembler<RewardPeriod> assembler,
+                                                                      @Parameter(description = "From date results to retrieve")
+                                                                      @RequestParam(value = "from", defaultValue = "0", required = false)
+                                                                      long from,
+                                                                      @Parameter(description = "To date results to retrieve")
+                                                                      @RequestParam(value = "to", defaultValue = "0", required = false)
+                                                                      @DefaultValue("0")
+                                                                      long to) {
+    Page<RewardPeriod> rewardPeriods;
+    if (from >= 0 && to > 0) {
+      rewardPeriods = rewardReportService.findRewardPeriodsBetween(from, to, pageable);
+    } else {
+      rewardPeriods = rewardReportService.findRewardReportPeriods(pageable);
+    }
+    return assembler.toModel(rewardPeriods);
+  }
+
+  private RewardPeriod getRewardPeriod(String date) {
+    RewardSettings settings = rewardSettingsService.getSettings();
+    ZoneId zoneId = settings.zoneId();
+    RewardPeriodType rewardPeriodType = settings.getPeriodType();
+
+    ZonedDateTime zonedDateTime = RewardUtils.parseRFC3339ToZonedDateTime(date, zoneId);
+    return rewardPeriodType.getPeriodOfTime(Objects.requireNonNull(zonedDateTime));
+  }
+
+  private List<RewardPeriod> generatePreviousPeriods(int count) {
+    RewardSettings settings = rewardSettingsService.getSettings();
+    ZoneId zoneId = settings.zoneId();
+    RewardPeriodType periodType = settings.getPeriodType();
+
+    ZonedDateTime currentDateTime = ZonedDateTime.now(zoneId);
+
+    return IntStream.range(0, count).mapToObj(i -> {
+      ZonedDateTime start;
+      ZonedDateTime end;
+
+      switch (periodType) {
+      case WEEK -> {
+        start = currentDateTime.minusWeeks(i).with(DayOfWeek.MONDAY).truncatedTo(ChronoUnit.DAYS);
+        end = start.plusWeeks(1);
+      }
+      case MONTH -> {
+        start = currentDateTime.minusMonths(i).with(TemporalAdjusters.firstDayOfMonth()).truncatedTo(ChronoUnit.DAYS);
+        end = start.plusMonths(1);
+      }
+      case QUARTER -> {
+        ZonedDateTime zonedDateTime = currentDateTime.minusMonths(i * 3L);
+        start = zonedDateTime.with(zonedDateTime.getMonth().firstMonthOfQuarter())
+                             .with(TemporalAdjusters.firstDayOfMonth())
+                             .truncatedTo(ChronoUnit.DAYS);
+        end = start.plusMonths(3);
+      }
+      default -> throw new UnsupportedOperationException("Unknown period type");
+      }
+
+      RewardPeriod rewardPeriod = new RewardPeriod();
+      rewardPeriod.setRewardPeriodType(periodType);
+      rewardPeriod.setStartDateInSeconds(timeToSecondsAtDayStart(LocalDate.from(start), currentDateTime.getZone()));
+      rewardPeriod.setEndDateInSeconds(timeToSecondsAtDayStart(LocalDate.from(end), currentDateTime.getZone()));
+
+      return rewardPeriod;
+    }).collect(Collectors.toList());
+  }
+
+}
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/reward/rest/RewardSettingsREST.java b/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardSettingsREST.java
similarity index 58%
rename from wallet-api/src/main/java/org/exoplatform/wallet/reward/rest/RewardSettingsREST.java
rename to wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardSettingsREST.java
index c0ee598cc..dd7239d9d 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/reward/rest/RewardSettingsREST.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardSettingsREST.java
@@ -14,58 +14,47 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.reward.rest;
+package io.meeds.wallet.reward.rest;
 
-import static org.exoplatform.wallet.utils.RewardUtils.getCurrentUserId;
 
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
-import javax.annotation.security.RolesAllowed;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-
 import org.apache.commons.lang3.StringUtils;
-
-import org.exoplatform.common.http.HTTPStatus;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.services.rest.resource.ResourceContainer;
-import org.exoplatform.wallet.model.reward.RewardPeriod;
-import org.exoplatform.wallet.model.reward.RewardPeriodType;
-import org.exoplatform.wallet.model.reward.RewardPeriodWithFullDate;
-import org.exoplatform.wallet.model.reward.RewardSettings;
-import org.exoplatform.wallet.reward.service.RewardSettingsService;
-import org.exoplatform.wallet.utils.RewardUtils;
+import io.meeds.wallet.wallet.model.reward.RewardPeriod;
+import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
+import io.meeds.wallet.wallet.model.reward.RewardPeriodWithFullDate;
+import io.meeds.wallet.wallet.model.reward.RewardSettings;
+import io.meeds.wallet.reward.service.RewardSettingsService;
+import io.meeds.wallet.wallet.utils.RewardUtils;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ResponseStatusException;
+
 
+@RestController
+@RequestMapping("settings/reward")
+@Tag(name = "reward/settings", description = "Manage reward module settings") // NOSONAR
+public class RewardSettingsREST {
 
-@Path("/wallet/api/reward/settings")
-@RolesAllowed("rewarding")
-@Tag(name = "/wallet/api/reward/settings", description = "Manage reward module settings")
-public class RewardSettingsREST implements ResourceContainer {
   private static final Log      LOG = ExoLogger.getLogger(RewardSettingsREST.class);
 
+  @Autowired
   private RewardSettingsService rewardSettingsService;
 
-  public RewardSettingsREST(RewardSettingsService rewardSettingsService) {
-    this.rewardSettingsService = rewardSettingsService;
-  }
-
-  @GET
-  @Produces(MediaType.APPLICATION_JSON)
-  @RolesAllowed("rewarding")
+  @GetMapping
+  @Secured("rewarding")
   @Operation(
           summary = "Get reward settings",
           method = "GET",
@@ -74,20 +63,12 @@ public RewardSettingsREST(RewardSettingsService rewardSettingsService) {
       @ApiResponse(responseCode = "200", description = "Request fulfilled"),
       @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
       @ApiResponse(responseCode = "500", description = "Internal server error") })
-  public Response getSettings() {
-    try {
-      RewardSettings settings = rewardSettingsService.getSettings();
-      return Response.ok(settings).build();
-    } catch (Exception e) {
-      LOG.error("Error getting reward settings", e);
-      return Response.serverError().build();
-    }
+  public RewardSettings getSettings() {
+    return rewardSettingsService.getSettings();
   }
 
-  @POST
-  @Path("save")
-  @Consumes(MediaType.APPLICATION_JSON)
-  @RolesAllowed("rewarding")
+  @PostMapping
+  @Secured("rewarding")
   @Operation(
           summary = "Get reward settings",
           method = "POST",
@@ -97,24 +78,28 @@ public Response getSettings() {
       @ApiResponse(responseCode = "400", description = "Invalid query input"),
       @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
       @ApiResponse(responseCode = "500", description = "Internal server error") })
-  public Response saveSettings(@Parameter(description = "Reward settings object", required = true) RewardSettings rewardSettings) {
-    if (rewardSettings == null) {
-      LOG.warn("Bad request sent to server with empty settings");
-      return Response.status(HTTPStatus.BAD_REQUEST).build();
-    }
+  public Response saveSettings(@RequestBody
+                               RewardSettings rewardSettings) {
     try {
       rewardSettingsService.saveSettings(rewardSettings);
-      LOG.info("{} saved reward settings '{}'", getCurrentUserId(), rewardSettings.toString());
-      return Response.ok().build();
-    } catch (Exception e) {
-      LOG.error("Error saving reward settings", e);
-      return Response.serverError().build();
+      return Response.noContent().build();
+    } catch (IllegalArgumentException e) {
+      throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage());
     }
   }
 
-  @Path("getDates")
-  @GET
-  @Produces(MediaType.APPLICATION_JSON)
+  @DeleteMapping
+  @Secured("rewarding")
+  @Operation(summary = "Deletes reward settings.", description = "Deletes reward settings.", method = "DELETE")
+  @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Request fulfilled"),
+          @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
+          @ApiResponse(responseCode = "500", description = "Internal server error"), })
+  public void deleteSettings() {
+    rewardSettingsService.deleteSettings();
+  }
+
+  @GetMapping(path = "getDates")
+  @Secured("users")
   @Operation(
           summary = "Get dates corresponding to chosen period type and start date",
           method = "GET",
@@ -124,12 +109,11 @@ public Response saveSettings(@Parameter(description = "Reward settings object",
       @ApiResponse(responseCode = "400", description = "Invalid query input"),
       @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
       @ApiResponse(responseCode = "500", description = "Internal server error") })
-  public Response getRewardDates(
-                                 @Parameter(description = "A date with format yyyy-MM-dd", required = true)
-                                 @QueryParam("date")
+  public Response getRewardDates(@Parameter(description = "A date with format yyyy-MM-dd", required = true)
+                                 @RequestParam("date")
                                  String date) {
     if (StringUtils.isBlank(date)) {
-      return Response.status(HTTPStatus.BAD_REQUEST).entity("Bad request sent to server with empty 'date' parameter").build();
+      throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Bad request sent to server with empty 'date' parameter");
     }
     RewardSettings settings = rewardSettingsService.getSettings();
     ZoneId zoneId = settings.zoneId();
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardReportService.java b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java
similarity index 86%
rename from wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardReportService.java
rename to wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java
index d2eb21eb1..4b944842a 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardReportService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java
@@ -14,15 +14,20 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.reward.service;
+package io.meeds.wallet.reward.service;
 
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Set;
 
+import io.meeds.wallet.wallet.model.reward.RewardPeriod;
+import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
+import io.meeds.wallet.wallet.model.reward.RewardReport;
+import io.meeds.wallet.wallet.model.reward.WalletReward;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.exoplatform.social.core.identity.model.Identity;
-import org.exoplatform.wallet.model.reward.*;
 
 /**
  * A storage service to save/load reward settings
@@ -111,23 +116,21 @@ public interface RewardReportService {
 
   /**
    * Retrieves the list of periods sorted descending by start date
-   * 
-   * @param offset offset of query
-   * @param limit limit of results
-   * @return {@link List} of {@link RewardPeriod}
+   *
+   * @param pageable {@link Pageable} the page to be returned.
+   * @return {@link Page} of {@link RewardPeriod}
    */
-  List<RewardPeriod> findRewardReportPeriods(int offset, int limit);
+  Page<RewardPeriod> findRewardReportPeriods(Pageable pageable);
 
   /**
    * Retrieves the list of periods by interval sorted descending by start date
    *
    * @param from from date
    * @param to to date
-   * @param offset offset of query
-   * @param limit limit of results
-   * @return {@link List} of {@link RewardPeriod}
+   * @param pageable {@link Pageable} the page to be returned.
+   * @return {@link Page} of {@link RewardPeriod}
    */
-  List<RewardPeriod> findRewardPeriodsBetween(long from, long to, int offset, int limit);
+  Page<RewardPeriod> findRewardPeriodsBetween(long from, long to, Pageable pageable);
 
   /**
    * @param currentUser current user listing his rewards
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardSettingsService.java b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardSettingsService.java
similarity index 88%
rename from wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardSettingsService.java
rename to wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardSettingsService.java
index c2591c307..93fd5ee84 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardSettingsService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardSettingsService.java
@@ -14,11 +14,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.reward.service;
+package io.meeds.wallet.reward.service;
 
 
 import org.springframework.stereotype.Service;
-import org.exoplatform.wallet.model.reward.RewardSettings;
+import io.meeds.wallet.wallet.model.reward.RewardSettings;
 
 /**
  * A storage service to save/load reward transactions
@@ -38,4 +38,9 @@ public interface RewardSettingsService {
    */
   void saveSettings(RewardSettings rewardSettingsToStore);
 
+  /**
+   * Delete reward settings
+   * */
+  void deleteSettings();
+
 }
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/AddressAlreadyInUseException.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/AddressAlreadyInUseException.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/AddressAlreadyInUseException.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/AddressAlreadyInUseException.java
index 55ba3e3d9..ea8c2de46 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/AddressAlreadyInUseException.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/AddressAlreadyInUseException.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package org.exoplatform.wallet.model;
+package io.meeds.wallet.wallet.model;
 
 public class AddressAlreadyInUseException extends RuntimeException {
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/ContractDetail.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/ContractDetail.java
similarity index 97%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/ContractDetail.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/ContractDetail.java
index 16aa6f8d9..3c1f9299b 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/ContractDetail.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/ContractDetail.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model;
+package io.meeds.wallet.wallet.model;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/ContractTransactionEvent.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/ContractTransactionEvent.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/ContractTransactionEvent.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/ContractTransactionEvent.java
index 8f5748366..bdeb466ed 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/ContractTransactionEvent.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/ContractTransactionEvent.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model;
+package io.meeds.wallet.wallet.model;
 
 import java.util.List;
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/Wallet.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/Wallet.java
similarity index 98%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/Wallet.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/Wallet.java
index 1ce619c1e..2b4b31201 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/Wallet.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/Wallet.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model;
+package io.meeds.wallet.wallet.model;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/WalletAddressLabel.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletAddressLabel.java
similarity index 97%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/WalletAddressLabel.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletAddressLabel.java
index 13db61c1f..644dff8ed 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/WalletAddressLabel.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletAddressLabel.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model;
+package io.meeds.wallet.wallet.model;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/WalletCacheKey.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletCacheKey.java
similarity index 97%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/WalletCacheKey.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletCacheKey.java
index 81b98e411..a50fcf53d 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/WalletCacheKey.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletCacheKey.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model;
+package io.meeds.wallet.wallet.model;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/WalletProvider.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletProvider.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/WalletProvider.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletProvider.java
index 6c308cf61..4685fa5fc 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/WalletProvider.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletProvider.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model;
+package io.meeds.wallet.wallet.model;
 
 public enum WalletProvider {
     INTERNAL_WALLET,
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/WalletState.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletState.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/WalletState.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletState.java
index 91d07646f..204aca335 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/WalletState.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletState.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model;
+package io.meeds.wallet.wallet.model;
 
 public enum WalletState {
   NEW,
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/WalletType.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletType.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/WalletType.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletType.java
index d460679e5..ff23322dc 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/WalletType.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletType.java
@@ -14,13 +14,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model;
+package io.meeds.wallet.wallet.model;
 
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.social.core.identity.provider.OrganizationIdentityProvider;
 import org.exoplatform.social.core.identity.provider.SpaceIdentityProvider;
-import org.exoplatform.wallet.plugin.WalletAdminIdentityProvider;
+import io.meeds.wallet.wallet.plugin.WalletAdminIdentityProvider;
 
 public enum WalletType {
   USER,
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/WebSocketMessage.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WebSocketMessage.java
similarity index 97%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/WebSocketMessage.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/WebSocketMessage.java
index 42b9b234f..70a3cb124 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/WebSocketMessage.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WebSocketMessage.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model;
+package io.meeds.wallet.wallet.model;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardBudgetType.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardBudgetType.java
similarity index 95%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardBudgetType.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardBudgetType.java
index 81203eecc..11b89ae38 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardBudgetType.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardBudgetType.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.reward;
+package io.meeds.wallet.wallet.model.reward;
 
 public enum RewardBudgetType {
   COMPUTED,
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPeriod.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriod.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPeriod.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriod.java
index f5bf8bf5e..f8a435d85 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPeriod.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriod.java
@@ -14,9 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.reward;
+package io.meeds.wallet.wallet.model.reward;
 
-import static org.exoplatform.wallet.utils.RewardUtils.formatTime;
+import static io.meeds.wallet.wallet.utils.RewardUtils.formatTime;
 
 import java.io.Serializable;
 import java.time.Instant;
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPeriodType.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriodType.java
similarity index 70%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPeriodType.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriodType.java
index 31dc8f597..a02b832e1 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPeriodType.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriodType.java
@@ -14,21 +14,20 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.reward;
+package io.meeds.wallet.wallet.model.reward;
 
-import static org.exoplatform.wallet.utils.RewardUtils.timeToSecondsAtDayStart;
+import static io.meeds.wallet.wallet.utils.RewardUtils.timeToSecondsAtDayStart;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
-import java.time.Year;
 import java.time.YearMonth;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
 public enum RewardPeriodType {
-  WEEK, MONTH, QUARTER, SEMESTER, YEAR;
+  WEEK, MONTH, QUARTER;
 
-  public static final RewardPeriodType DEFAULT = MONTH;
+  public static final RewardPeriodType DEFAULT = WEEK;
 
   public RewardPeriod getPeriodOfTime(LocalDate date, ZoneId zoneId) {
     ZonedDateTime zonedDateTime = date.atStartOfDay(zoneId);
@@ -49,9 +48,8 @@ public RewardPeriod getPeriodOfTime(ZonedDateTime zonedDateTime) {
       rewardPeriod.setEndDateInSeconds(timeToSecondsAtDayStart(firstDayOfNextWeek.toLocalDate(), zoneId));
       break;
     case MONTH:
-      YearMonth currentMonth = yearMonth;
-      YearMonth nextMonth = currentMonth.plusMonths(1);
-      rewardPeriod.setStartDateInSeconds(timeToSecondsAtDayStart(currentMonth.atDay(1), zoneId));
+      YearMonth nextMonth = yearMonth.plusMonths(1);
+      rewardPeriod.setStartDateInSeconds(timeToSecondsAtDayStart(yearMonth.atDay(1), zoneId));
       rewardPeriod.setEndDateInSeconds(timeToSecondsAtDayStart(nextMonth.atDay(1), zoneId));
       break;
     case QUARTER:
@@ -62,18 +60,6 @@ public RewardPeriod getPeriodOfTime(ZonedDateTime zonedDateTime) {
       rewardPeriod.setStartDateInSeconds(timeToSecondsAtDayStart(startQuarterMonth.atDay(1), zoneId));
       rewardPeriod.setEndDateInSeconds(timeToSecondsAtDayStart(endQuarterMonth.atDay(1), zoneId));
       break;
-    case SEMESTER:
-      int monthSemesterIndex = ((yearMonth.getMonthValue() - 1) / 6) * 6 + 1;
-
-      YearMonth startSemesterMonth = YearMonth.of(yearMonth.getYear(), monthSemesterIndex);
-      YearMonth endSemesterMonth = startSemesterMonth.plusMonths(6);
-      rewardPeriod.setStartDateInSeconds(timeToSecondsAtDayStart(startSemesterMonth.atDay(1), zoneId));
-      rewardPeriod.setEndDateInSeconds(timeToSecondsAtDayStart(endSemesterMonth.atDay(1), zoneId));
-      break;
-    case YEAR:
-      rewardPeriod.setStartDateInSeconds(timeToSecondsAtDayStart(Year.from(zonedDateTime).atDay(1), zoneId));
-      rewardPeriod.setEndDateInSeconds(timeToSecondsAtDayStart(Year.from(zonedDateTime).plusYears(1).atDay(1), zoneId));
-      break;
     }
     return rewardPeriod;
   }
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPeriodWithFullDate.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriodWithFullDate.java
similarity index 94%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPeriodWithFullDate.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriodWithFullDate.java
index 4b2ab57d6..9c3b94374 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPeriodWithFullDate.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriodWithFullDate.java
@@ -14,18 +14,19 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.reward;
+package io.meeds.wallet.wallet.model.reward;
 
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
-import org.exoplatform.wallet.utils.RewardUtils;
+import io.meeds.wallet.wallet.utils.RewardUtils;
 
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode.Exclude;
 import lombok.Getter;
 
+@Getter
 @EqualsAndHashCode(callSuper = true)
 public class RewardPeriodWithFullDate extends RewardPeriod {
 
@@ -45,11 +46,9 @@ public RewardPeriodWithFullDate(RewardPeriod rewardPeriod) {
     this.setTimeZone(rewardPeriod.getTimeZone());
   }
 
-  @Getter
   @Exclude
   private String startDate;
 
-  @Getter
   @Exclude
   private String endDate;
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPluginSettings.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPluginSettings.java
similarity index 97%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPluginSettings.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPluginSettings.java
index 784df6113..698936fc5 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardPluginSettings.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPluginSettings.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.reward;
+package io.meeds.wallet.wallet.model.reward;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardReport.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardReport.java
similarity index 88%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardReport.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardReport.java
index 0dc13656a..29201c970 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardReport.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardReport.java
@@ -14,9 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.reward;
+package io.meeds.wallet.wallet.model.reward;
 
-import static org.exoplatform.wallet.utils.RewardUtils.*;
+import static io.meeds.wallet.wallet.utils.RewardUtils.*;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -32,6 +32,8 @@ public class RewardReport {
 
   private Set<WalletReward> rewards = new HashSet<>();
 
+  private int participationsCount;
+
   public long getPendingTransactionCount() {
     return rewards.stream()
                   .filter(rewardItem -> StringUtils.equals(rewardItem.getStatus(),
@@ -61,25 +63,25 @@ public long getTransactionsCount() {
 
   public Set<WalletReward> getValidRewards() {
     return rewards.stream()
-                  .filter(rewardItem -> rewardItem.getTokensToSend() > 0)
+                  .filter(rewardItem -> rewardItem.getAmount() > 0 || rewardItem.getTokensSent() > 0)
                   .collect(Collectors.toSet());
   }
 
   public double getRemainingTokensToSend() {
     return rewards.stream()
-                  .mapToDouble(rewardItem -> rewardItem.getTokensSent() == 0 ? rewardItem.getTokensToSend() : 0)
+                  .mapToDouble(rewardItem -> rewardItem.getTokensSent() == 0 ? rewardItem.getAmount() : 0)
                   .sum();
   }
 
   public long getValidRewardCount() {
     return rewards.stream()
-                  .filter(rewardItem -> rewardItem.getTokensToSend() > 0)
+                  .filter(rewardItem -> rewardItem.getAmount() > 0 || rewardItem.getTokensSent() > 0)
                   .count();
   }
 
   public double getTokensToSend() {
     return rewards.stream()
-                  .mapToDouble(WalletReward::getTokensToSend)
+                  .mapToDouble(WalletReward::getAmount)
                   .sum();
   }
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardSettings.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardSettings.java
similarity index 95%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardSettings.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardSettings.java
index 9ca4aa111..c31ef36c2 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardSettings.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardSettings.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.reward;
+package io.meeds.wallet.wallet.model.reward;
 
 import java.io.Serializable;
 import java.time.ZoneId;
@@ -36,7 +36,7 @@ public class RewardSettings implements Serializable, Cloneable {
 
   private RewardBudgetType  budgetType       = RewardBudgetType.DEFAULT;;
 
-  private double            threshold;
+  private double            threshold        = 0;
 
   private double            amount;
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardStatus.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardStatus.java
similarity index 95%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardStatus.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardStatus.java
index e37b141b9..9ec4e01b5 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardStatus.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardStatus.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.reward;
+package io.meeds.wallet.wallet.model.reward;
 
 public enum RewardStatus {
   ESTIMATION,
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardTeam.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTeam.java
similarity index 97%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardTeam.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTeam.java
index d59794627..26f3e6c8b 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardTeam.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTeam.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.reward;
+package io.meeds.wallet.wallet.model.reward;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardTeamMember.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTeamMember.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardTeamMember.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTeamMember.java
index c55148d9a..ecf574edc 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardTeamMember.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTeamMember.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.reward;
+package io.meeds.wallet.wallet.model.reward;
 
 import java.io.Serializable;
 import org.exoplatform.social.core.identity.provider.OrganizationIdentityProvider;
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardTransaction.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTransaction.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardTransaction.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTransaction.java
index 9a6f426af..0b5c4fdbe 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/RewardTransaction.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTransaction.java
@@ -14,16 +14,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.reward;
+package io.meeds.wallet.wallet.model.reward;
 
-import static org.exoplatform.wallet.utils.WalletUtils.*;
+import static io.meeds.wallet.wallet.utils.WalletUtils.*;
 
 import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.social.core.identity.model.Identity;
-import org.exoplatform.wallet.model.WalletType;
+import io.meeds.wallet.wallet.model.WalletType;
 
 import lombok.*;
 import lombok.EqualsAndHashCode.Exclude;
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/WalletPluginReward.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/WalletPluginReward.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/reward/WalletPluginReward.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/WalletPluginReward.java
index 8b402b750..e99dde272 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/WalletPluginReward.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/WalletPluginReward.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.reward;
+package io.meeds.wallet.wallet.model.reward;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/WalletReward.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/WalletReward.java
similarity index 70%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/reward/WalletReward.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/WalletReward.java
index 31c5ff541..b35f9b8e2 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/reward/WalletReward.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/WalletReward.java
@@ -14,19 +14,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.reward;
+package io.meeds.wallet.wallet.model.reward;
 
-import static org.exoplatform.wallet.utils.RewardUtils.*;
+import static io.meeds.wallet.wallet.utils.RewardUtils.*;
 
 import java.io.Serializable;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
 
 import lombok.*;
 import lombok.EqualsAndHashCode.Exclude;
@@ -41,13 +38,15 @@ public class WalletReward implements Serializable {
   private Wallet                  wallet;
 
   @Exclude
-  private List<RewardTeam>        teams;
+  private TransactionDetail       transaction;
+
+  private long                    identityId;
 
   @Exclude
-  private TransactionDetail       transaction;
+  private double                  points;
 
   @Exclude
-  private Set<WalletPluginReward> rewards;
+  private double                  amount;
 
   @Exclude
   private RewardPeriod            period;
@@ -64,21 +63,6 @@ public boolean isEnabled() {
         && StringUtils.isNotBlank(wallet.getAddress());
   }
 
-  public String getPoolName() {
-    if (teams == null) {
-      return null;
-    }
-    Set<String> teamNames = teams.stream().map(RewardTeam::getName).collect(Collectors.toSet());
-    return StringUtils.join(teamNames, ",");
-  }
-
-  public RewardTeam getTeam() {
-    if (teams == null || teams.isEmpty()) {
-      return null;
-    }
-    return teams.get(0);
-  }
-
   public String getStatus() {
     if (transaction == null) {
       return null;
@@ -99,12 +83,4 @@ public double getTokensSent() {
       return transaction.getContractAmount();
     }
   }
-
-  public double getTokensToSend() {
-    if (rewards == null || rewards.isEmpty()) {
-      return 0;
-    } else {
-      return rewards.stream().mapToDouble(WalletPluginReward::getAmount).sum();
-    }
-  }
 }
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/settings/GlobalSettings.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/GlobalSettings.java
similarity index 95%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/settings/GlobalSettings.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/GlobalSettings.java
index cab111d15..2ddd42d21 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/settings/GlobalSettings.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/GlobalSettings.java
@@ -14,13 +14,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.settings;
+package io.meeds.wallet.wallet.model.settings;
 
 import java.io.Serializable;
 
 import org.apache.commons.beanutils.BeanUtils;
 
-import org.exoplatform.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.ContractDetail;
 
 import lombok.*;
 import lombok.EqualsAndHashCode.Exclude;
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/settings/InitialFundsSettings.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/InitialFundsSettings.java
similarity index 97%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/settings/InitialFundsSettings.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/InitialFundsSettings.java
index 5f10236d8..152c1faf0 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/settings/InitialFundsSettings.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/InitialFundsSettings.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.settings;
+package io.meeds.wallet.wallet.model.settings;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/settings/NetworkSettings.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/NetworkSettings.java
similarity index 97%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/settings/NetworkSettings.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/NetworkSettings.java
index f458c840d..ad7f6cf0f 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/settings/NetworkSettings.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/NetworkSettings.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.settings;
+package io.meeds.wallet.wallet.model.settings;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/settings/UserSettings.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/UserSettings.java
similarity index 93%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/settings/UserSettings.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/UserSettings.java
index a59ec8485..1fefc647d 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/settings/UserSettings.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/UserSettings.java
@@ -14,10 +14,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.settings;
+package io.meeds.wallet.wallet.model.settings;
 
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 import lombok.*;
 import lombok.EqualsAndHashCode.Exclude;
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/settings/WalletSettings.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/WalletSettings.java
similarity index 94%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/settings/WalletSettings.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/WalletSettings.java
index bfc60a982..dd9621e32 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/settings/WalletSettings.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/WalletSettings.java
@@ -14,12 +14,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.settings;
+package io.meeds.wallet.wallet.model.settings;
 
 import java.io.Serializable;
 import java.util.Set;
 
-import org.exoplatform.wallet.model.WalletAddressLabel;
+import io.meeds.wallet.wallet.model.WalletAddressLabel;
 
 import lombok.*;
 import lombok.EqualsAndHashCode.Exclude;
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/transaction/FundsRequest.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/FundsRequest.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/transaction/FundsRequest.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/FundsRequest.java
index b390e38fb..7627d6ac3 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/transaction/FundsRequest.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/FundsRequest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.transaction;
+package io.meeds.wallet.wallet.model.transaction;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/transaction/TransactionDetail.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionDetail.java
similarity index 95%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/transaction/TransactionDetail.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionDetail.java
index 2dcb0acc9..3a6ce8474 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/transaction/TransactionDetail.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionDetail.java
@@ -14,15 +14,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.transaction;
+package io.meeds.wallet.wallet.model.transaction;
 
-import static org.exoplatform.wallet.utils.WalletUtils.convertFromDecimals;
-import static org.exoplatform.wallet.utils.WalletUtils.convertToDecimals;
+import static io.meeds.wallet.wallet.utils.WalletUtils.convertFromDecimals;
+import static io.meeds.wallet.wallet.utils.WalletUtils.convertToDecimals;
 
 import java.io.Serializable;
 import java.math.BigInteger;
 
-import org.exoplatform.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.Wallet;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/transaction/TransactionNotificationType.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionNotificationType.java
similarity index 87%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/transaction/TransactionNotificationType.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionNotificationType.java
index 80ad735a1..94c5be88f 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/transaction/TransactionNotificationType.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionNotificationType.java
@@ -14,10 +14,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.transaction;
+package io.meeds.wallet.wallet.model.transaction;
 
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_RECEIVER_NOTIFICATION_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_SENDER_NOTIFICATION_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_RECEIVER_NOTIFICATION_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_SENDER_NOTIFICATION_ID;
 
 public enum TransactionNotificationType {
   RECEIVER(WALLET_RECEIVER_NOTIFICATION_ID),
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/model/transaction/TransactionStatistics.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionStatistics.java
similarity index 95%
rename from wallet-api/src/main/java/org/exoplatform/wallet/model/transaction/TransactionStatistics.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionStatistics.java
index 3806356c4..fc4b10fcb 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/model/transaction/TransactionStatistics.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionStatistics.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.transaction;
+package io.meeds.wallet.wallet.model.transaction;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/plugin/WalletAdminIdentityProvider.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/plugin/WalletAdminIdentityProvider.java
similarity index 97%
rename from wallet-api/src/main/java/org/exoplatform/wallet/plugin/WalletAdminIdentityProvider.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/plugin/WalletAdminIdentityProvider.java
index 5d88f8002..2693d5a33 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/plugin/WalletAdminIdentityProvider.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/plugin/WalletAdminIdentityProvider.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.plugin;
+package io.meeds.wallet.wallet.plugin;
 
 import org.exoplatform.social.core.identity.IdentityProvider;
 import org.exoplatform.social.core.identity.model.Identity;
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/rest/WalletAccountREST.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletAccountREST.java
similarity index 98%
rename from wallet-api/src/main/java/org/exoplatform/wallet/rest/WalletAccountREST.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletAccountREST.java
index 75485661e..b7ef856a4 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/rest/WalletAccountREST.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletAccountREST.java
@@ -14,13 +14,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.rest;
+package io.meeds.wallet.wallet.rest;
 
-import static org.exoplatform.wallet.utils.WalletUtils.*;
+import static io.meeds.wallet.wallet.utils.WalletUtils.*;
 
 import java.util.Set;
 
 import javax.annotation.security.RolesAllowed;
+
+import io.meeds.wallet.wallet.model.*;
 import jakarta.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
 import javax.ws.rs.core.Context;
@@ -39,11 +41,10 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.rest.resource.ResourceContainer;
-import org.exoplatform.wallet.model.*;
-import org.exoplatform.wallet.model.transaction.FundsRequest;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.service.WalletService;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.model.transaction.FundsRequest;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletService;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 
 @Path("/wallet/api/account")
@@ -354,7 +355,7 @@ public Response saveWallet(@Parameter(description = "wallet details to save", re
       @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
       @ApiResponse(responseCode = "500", description = "Internal server error") })
   public Response saveWalletProvider(@Parameter(description = "New Wallet provider", required = true)  @FormParam("provider")
-                                     WalletProvider provider,
+                                       WalletProvider provider,
                                      @Parameter(description = "Selected Wallet Address of provider")  @FormParam("address")
                                      String address,
                                      @Parameter(description = "Signed Raw message by external Wallet Provider")  @FormParam("rawMessage")
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/rest/WalletAdminTransactionREST.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletAdminTransactionREST.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/rest/WalletAdminTransactionREST.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletAdminTransactionREST.java
index d2437cc70..7a86adcac 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/rest/WalletAdminTransactionREST.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletAdminTransactionREST.java
@@ -14,9 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.rest;
+package io.meeds.wallet.wallet.rest;
 
-import static org.exoplatform.wallet.utils.WalletUtils.getCurrentUserId;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getCurrentUserId;
 
 import javax.annotation.security.RolesAllowed;
 import javax.ws.rs.FormParam;
@@ -31,8 +31,8 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.rest.resource.ResourceContainer;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.WalletTokenAdminService;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/rest/WalletContractREST.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletContractREST.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/rest/WalletContractREST.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletContractREST.java
index db6e08570..c9fb369b2 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/rest/WalletContractREST.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletContractREST.java
@@ -14,9 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.rest;
+package io.meeds.wallet.wallet.rest;
 
-import static org.exoplatform.wallet.utils.WalletUtils.getCurrentUserId;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getCurrentUserId;
 
 import javax.annotation.security.RolesAllowed;
 import javax.ws.rs.*;
@@ -34,8 +34,8 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.rest.resource.ResourceContainer;
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.service.WalletContractService;
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.service.WalletContractService;
 
 
 @Path("/wallet/api/contract")
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/rest/WalletSettingsREST.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletSettingsREST.java
similarity index 94%
rename from wallet-api/src/main/java/org/exoplatform/wallet/rest/WalletSettingsREST.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletSettingsREST.java
index 30a3c7357..383592f70 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/rest/WalletSettingsREST.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletSettingsREST.java
@@ -14,9 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.rest;
+package io.meeds.wallet.wallet.rest;
 
-import static org.exoplatform.wallet.utils.WalletUtils.getCurrentUserId;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getCurrentUserId;
 
 import javax.annotation.security.RolesAllowed;
 import javax.ws.rs.*;
@@ -32,9 +32,9 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.rest.resource.ResourceContainer;
-import org.exoplatform.wallet.model.settings.InitialFundsSettings;
-import org.exoplatform.wallet.model.settings.UserSettings;
-import org.exoplatform.wallet.service.WalletService;
+import io.meeds.wallet.wallet.model.settings.InitialFundsSettings;
+import io.meeds.wallet.wallet.model.settings.UserSettings;
+import io.meeds.wallet.wallet.service.WalletService;
 
 
 @Path("/wallet/api/settings")
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/rest/WalletTransactionREST.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletTransactionREST.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/rest/WalletTransactionREST.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletTransactionREST.java
index e4e68de11..17289d483 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/rest/WalletTransactionREST.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletTransactionREST.java
@@ -14,9 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.rest;
+package io.meeds.wallet.wallet.rest;
 
-import static org.exoplatform.wallet.utils.WalletUtils.getCurrentUserId;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getCurrentUserId;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -27,6 +27,10 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.wallet.service.WalletService;
+import io.meeds.wallet.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
@@ -40,9 +44,8 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.rest.resource.ResourceContainer;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.model.transaction.TransactionStatistics;
-import org.exoplatform.wallet.service.*;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.model.transaction.TransactionStatistics;
 
 @Path("/wallet/api/transaction")
 @RolesAllowed("users")
@@ -55,11 +58,11 @@ public class WalletTransactionREST implements ResourceContainer {
 
   private BlockchainTransactionService blockchainTransactionService;
 
-  private WalletTransactionService     transactionService;
+  private WalletTransactionService transactionService;
 
-  private WalletTokenAdminService      walletTokenAdminService;
+  private WalletTokenAdminService walletTokenAdminService;
 
-  private WalletService                walletService;
+  private WalletService walletService;
 
   public WalletTransactionREST(WalletTransactionService transactionService, WalletService walletService) {
     this.transactionService = transactionService;
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/service/BlockchainTransactionService.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/service/BlockchainTransactionService.java
similarity index 94%
rename from wallet-api/src/main/java/org/exoplatform/wallet/service/BlockchainTransactionService.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/service/BlockchainTransactionService.java
index 86ae974bb..25b4759ba 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/service/BlockchainTransactionService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/service/BlockchainTransactionService.java
@@ -14,15 +14,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.service;
+package io.meeds.wallet.wallet.service;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.Future;
 
-import org.exoplatform.wallet.model.ContractTransactionEvent;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
 
 public interface BlockchainTransactionService {
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/service/WalletAccountService.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletAccountService.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/service/WalletAccountService.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletAccountService.java
index a2a6e278f..1c6198176 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/service/WalletAccountService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletAccountService.java
@@ -14,17 +14,22 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package org.exoplatform.wallet.service;
+package io.meeds.wallet.wallet.service;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import io.meeds.wallet.wallet.model.*;
 import org.exoplatform.social.core.identity.model.Identity;
-import org.exoplatform.wallet.model.*;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
 
 /**
  * A service to manage wallets of different types: user, space, admin
  */
+@Service
+@Primary
 public interface WalletAccountService {
 
   /**
@@ -34,6 +39,13 @@ public interface WalletAccountService {
    */
   Set<Wallet> listWallets();
 
+  /**
+   * Retrieves the list registered wallets identified by identities list
+   *
+   * @return list of associated wallets to users and spaces
+   */
+  Set<Wallet> listWalletsByIdentityIds(List<Long> identityIds);
+
   /**
    * Retrieve wallets count
    * 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/service/WalletContractService.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletContractService.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/service/WalletContractService.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletContractService.java
index 7b5e93671..9dd616dad 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/service/WalletContractService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletContractService.java
@@ -14,13 +14,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.service;
+package io.meeds.wallet.wallet.service;
 
 import java.io.IOException;
 
 import org.json.JSONArray;
 
-import org.exoplatform.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.ContractDetail;
 
 /**
  * Manages token contract properties
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/service/WalletService.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletService.java
similarity index 91%
rename from wallet-api/src/main/java/org/exoplatform/wallet/service/WalletService.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletService.java
index fc166ea2a..5f6c3ceb5 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/service/WalletService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletService.java
@@ -14,11 +14,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.service;
-
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.model.settings.*;
-import org.exoplatform.wallet.model.transaction.FundsRequest;
+package io.meeds.wallet.wallet.service;
+
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.settings.GlobalSettings;
+import io.meeds.wallet.wallet.model.settings.InitialFundsSettings;
+import io.meeds.wallet.wallet.model.settings.UserSettings;
+import io.meeds.wallet.wallet.model.settings.WalletSettings;
+import io.meeds.wallet.wallet.model.transaction.FundsRequest;
 
 /**
  * A storage service to save/load information used by users and spaces wallets
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/service/WalletTokenAdminService.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletTokenAdminService.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/service/WalletTokenAdminService.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletTokenAdminService.java
index 755067057..689555345 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/service/WalletTokenAdminService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletTokenAdminService.java
@@ -14,14 +14,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.service;
+package io.meeds.wallet.wallet.service;
 
 import java.math.BigInteger;
 import java.util.Set;
 
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
 
 /**
  * Communicates with blockchain to send transactions and retrieve information
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/service/WalletTransactionService.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletTransactionService.java
similarity index 97%
rename from wallet-api/src/main/java/org/exoplatform/wallet/service/WalletTransactionService.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletTransactionService.java
index 83860d7bf..2ba13cc15 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/service/WalletTransactionService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletTransactionService.java
@@ -14,14 +14,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.service;
+package io.meeds.wallet.wallet.service;
 
 import java.util.List;
 import java.util.Locale;
 
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.model.transaction.TransactionStatistics;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.model.transaction.TransactionStatistics;
+import org.springframework.stereotype.Service;
 
 /**
  * Manage stored transaction details in eXo internal datasource
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/statistic/ExoWalletStatistic.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatistic.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/statistic/ExoWalletStatistic.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatistic.java
index 6937430ad..a1b6a8a65 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/statistic/ExoWalletStatistic.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatistic.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.statistic;
+package io.meeds.wallet.wallet.statistic;
 
 import java.lang.annotation.*;
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/statistic/ExoWalletStatisticAspect.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatisticAspect.java
similarity index 89%
rename from wallet-api/src/main/java/org/exoplatform/wallet/statistic/ExoWalletStatisticAspect.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatisticAspect.java
index 4cfa97aaa..7d5c57a5f 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/statistic/ExoWalletStatisticAspect.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatisticAspect.java
@@ -14,16 +14,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.statistic;
+package io.meeds.wallet.wallet.statistic;
 
-import static org.exoplatform.wallet.statistic.StatisticUtils.DURATION;
-import static org.exoplatform.wallet.statistic.StatisticUtils.ERROR_MSG;
-import static org.exoplatform.wallet.statistic.StatisticUtils.LOCAL_SERVICE;
-import static org.exoplatform.wallet.statistic.StatisticUtils.OPERATION;
-import static org.exoplatform.wallet.statistic.StatisticUtils.REMOTE_SERVICE;
-import static org.exoplatform.wallet.statistic.StatisticUtils.STATUS;
-import static org.exoplatform.wallet.statistic.StatisticUtils.STATUS_CODE;
-import static org.exoplatform.wallet.statistic.StatisticUtils.addStatisticEntry;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.DURATION;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.ERROR_MSG;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.LOCAL_SERVICE;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.OPERATION;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.REMOTE_SERVICE;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.STATUS;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.STATUS_CODE;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.addStatisticEntry;
 
 import java.lang.reflect.Method;
 import java.util.Map;
@@ -55,7 +55,7 @@ public class ExoWalletStatisticAspect {
    * @return result of processing point after its execution
    * @throws Throwable if processing point throws an exception
    */
-  @Around("execution(* *(..)) && @annotation(org.exoplatform.wallet.statistic.ExoWalletStatistic)")
+  @Around("execution(* *(..)) && @annotation(io.meeds.wallet.wallet.statistic.ExoWalletStatistic)")
   public Object around(ProceedingJoinPoint point) throws Throwable { // NOSONAR
     ExoWalletStatisticService statisticService = (ExoWalletStatisticService) point.getThis();
     MethodSignature methodSignature = (MethodSignature) point.getSignature();
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/statistic/ExoWalletStatisticService.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatisticService.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/statistic/ExoWalletStatisticService.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatisticService.java
index ddd527cd8..258b41e66 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/statistic/ExoWalletStatisticService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatisticService.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.statistic;
+package io.meeds.wallet.wallet.statistic;
 
 import java.util.Map;
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/statistic/StatisticUtils.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/StatisticUtils.java
similarity index 96%
rename from wallet-api/src/main/java/org/exoplatform/wallet/statistic/StatisticUtils.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/StatisticUtils.java
index 942724732..a51935f25 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/statistic/StatisticUtils.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/StatisticUtils.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.statistic;
+package io.meeds.wallet.wallet.statistic;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -30,8 +30,8 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.security.ConversationState;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 public class StatisticUtils {
 
@@ -60,7 +60,7 @@ public static void addStatisticEntry(Map<String, Object> parameters) {
     addStatisticEntry(parameters, StatisticUtils::addAnalyticsEntry);
   }
 
-  protected static void addStatisticEntry(Map<String, Object> parameters, // NOSONAR
+  public static void addStatisticEntry(Map<String, Object> parameters, // NOSONAR
                                           Consumer<StatisticData> analyticsConsumer) {
     if (parameters == null || parameters.isEmpty()) {
       throw new IllegalArgumentException("parameters is mandatory");
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/utils/RewardUtils.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/utils/RewardUtils.java
similarity index 97%
rename from wallet-api/src/main/java/org/exoplatform/wallet/utils/RewardUtils.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/utils/RewardUtils.java
index 65410c0ba..b1ed64f49 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/utils/RewardUtils.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/utils/RewardUtils.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.utils;
+package io.meeds.wallet.wallet.utils;
 
 import java.lang.reflect.Method;
 import java.time.*;
@@ -30,9 +30,9 @@
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.container.ExoContainer;
 import org.exoplatform.services.security.ConversationState;
-import org.exoplatform.wallet.model.reward.RewardReport;
-import org.exoplatform.wallet.model.reward.RewardSettings;
-import org.exoplatform.wallet.reward.service.RewardSettingsService;
+import io.meeds.wallet.wallet.model.reward.RewardReport;
+import io.meeds.wallet.wallet.model.reward.RewardSettings;
+import io.meeds.wallet.reward.service.RewardSettingsService;
 
 public class RewardUtils {
 
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/utils/WalletUtils.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/utils/WalletUtils.java
similarity index 98%
rename from wallet-api/src/main/java/org/exoplatform/wallet/utils/WalletUtils.java
rename to wallet-api/src/main/java/io/meeds/wallet/wallet/utils/WalletUtils.java
index e57af16c3..0a273beff 100644
--- a/wallet-api/src/main/java/org/exoplatform/wallet/utils/WalletUtils.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/utils/WalletUtils.java
@@ -14,13 +14,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.utils;
+package io.meeds.wallet.wallet.utils;
 
-import static org.exoplatform.wallet.statistic.StatisticUtils.LOCAL_SERVICE;
-import static org.exoplatform.wallet.statistic.StatisticUtils.OPERATION;
-import static org.exoplatform.wallet.statistic.StatisticUtils.STATUS;
-import static org.exoplatform.wallet.statistic.StatisticUtils.STATUS_CODE;
-import static org.exoplatform.wallet.statistic.StatisticUtils.transformCapitalWithUnderscore;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.LOCAL_SERVICE;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.OPERATION;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.STATUS;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.STATUS_CODE;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.transformCapitalWithUnderscore;
 
 import java.io.ByteArrayInputStream;
 import java.math.BigDecimal;
@@ -74,16 +74,16 @@
 import org.exoplatform.social.core.service.LinkProvider;
 import org.exoplatform.social.core.space.model.Space;
 import org.exoplatform.social.core.space.spi.SpaceService;
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.WalletState;
-import org.exoplatform.wallet.model.WalletType;
-import org.exoplatform.wallet.model.settings.GlobalSettings;
-import org.exoplatform.wallet.model.transaction.FundsRequest;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.WalletService;
-import org.exoplatform.wallet.service.WalletTokenAdminService;
-import org.exoplatform.wallet.statistic.StatisticUtils;
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.WalletState;
+import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.wallet.model.settings.GlobalSettings;
+import io.meeds.wallet.wallet.model.transaction.FundsRequest;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.WalletService;
+import io.meeds.wallet.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.wallet.statistic.StatisticUtils;
 import org.exoplatform.ws.frameworks.json.JsonGenerator;
 import org.exoplatform.ws.frameworks.json.JsonParser;
 import org.exoplatform.ws.frameworks.json.impl.JsonDefaultHandler;
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/reward/rest/RewardReportREST.java b/wallet-api/src/main/java/org/exoplatform/wallet/reward/rest/RewardReportREST.java
deleted file mode 100644
index d7c439466..000000000
--- a/wallet-api/src/main/java/org/exoplatform/wallet/reward/rest/RewardReportREST.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.rest;
-
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.List;
-
-import javax.annotation.security.RolesAllowed;
-import javax.ws.rs.*;
-import javax.ws.rs.core.*;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import org.apache.commons.lang3.StringUtils;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import org.exoplatform.common.http.HTTPStatus;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.services.rest.resource.ResourceContainer;
-import org.exoplatform.wallet.model.reward.RewardPeriod;
-import org.exoplatform.wallet.model.reward.RewardPeriodType;
-import org.exoplatform.wallet.model.reward.RewardPeriodWithFullDate;
-import org.exoplatform.wallet.model.reward.RewardReport;
-import org.exoplatform.wallet.model.reward.RewardSettings;
-import org.exoplatform.wallet.model.reward.WalletReward;
-import org.exoplatform.wallet.reward.service.RewardReportService;
-import org.exoplatform.wallet.reward.service.RewardSettingsService;
-import org.exoplatform.wallet.utils.RewardUtils;
-import org.exoplatform.wallet.utils.WalletUtils;
-
-
-@Path("/wallet/api/reward/")
-@RolesAllowed("rewarding")
-@Tag(name = "/wallet/api/reward", description = "Manage wallet rewards")
-public class RewardReportREST implements ResourceContainer {
-  private static final String ERROR_PARAM = "error";
-  private static final String ERROR_EMPTY_PARAM_DATE = "Bad request sent to server with empty 'date' parameter";
-
-  private static final Log    LOG = ExoLogger.getLogger(RewardReportREST.class);
-
-  private RewardReportService   rewardReportService;
-
-  private RewardSettingsService rewardSettingsService;
-
-  public RewardReportREST(RewardReportService rewardReportService, RewardSettingsService rewardSettingsService) {
-    this.rewardReportService = rewardReportService;
-    this.rewardSettingsService = rewardSettingsService;
-  }
-
-  @GET
-  @Path("compute")
-  @Produces(MediaType.APPLICATION_JSON)
-  @RolesAllowed("rewarding")
-  @Operation(
-          summary = "Compute rewards of wallets per a chosen period of time",
-          method = "GET",
-          description = "returns a set of wallet reward object")
-  @ApiResponses(value = {
-      @ApiResponse(responseCode = "200", description = "Request fulfilled"),
-      @ApiResponse(responseCode = "400", description = "Invalid query input"),
-      @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
-      @ApiResponse(responseCode = "500", description = "Internal server error") })
-  public Response computeRewards(
-                                 @Parameter(description = "A date with format yyyy-MM-dd", required = true)
-                                 @QueryParam("date")
-                                 String date) {
-    if (StringUtils.isBlank(date)) {
-      return Response.status(HTTPStatus.BAD_REQUEST).entity(ERROR_EMPTY_PARAM_DATE).build();
-    }
-    try {
-      RewardPeriod rewardPeriod = getRewardPeriod(date);
-      RewardReport rewardReport = rewardReportService.computeRewards(rewardPeriod.getPeriodMedianDate());
-      rewardReport.setPeriod(new RewardPeriodWithFullDate(rewardReport.getPeriod()));
-      return Response.ok(rewardReport).build();
-    } catch (Exception e) {
-      LOG.error("Error getting computed reward", e);
-      JSONObject object = new JSONObject();
-      try {
-        object.append(ERROR_PARAM, e.getMessage());
-      } catch (JSONException e1) {
-        // Nothing to do
-      }
-      return Response.status(HTTPStatus.INTERNAL_ERROR).type(MediaType.APPLICATION_JSON).entity(object.toString()).build();
-    }
-  }
-
-  @GET
-  @Path("compute/user")
-  @RolesAllowed("users")
-  @Operation(
-          summary = "Compute rewards of user wallet per a chosen period of time",
-          method = "GET",
-          description = "returns a wallet reward object")
-  @ApiResponses(value = {
-          @ApiResponse(responseCode = "200", description = "Request fulfilled"),
-          @ApiResponse(responseCode = "400", description = "Invalid query input"),
-          @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
-          @ApiResponse(responseCode = "500", description = "Internal server error") })
-  public Response computeRewardsByUser(
-                                      @Parameter(description = "A date with format yyyy-MM-dd", required = true)
-                                      @QueryParam("date")
-                                      String date) {
-    if (StringUtils.isBlank(date)) {
-      return Response.status(HTTPStatus.BAD_REQUEST).entity(ERROR_EMPTY_PARAM_DATE).build();
-    }
-    try {
-      RewardPeriod rewardPeriod = getRewardPeriod(date);
-      RewardReport rewardReport = rewardReportService.computeRewardsByUser(rewardPeriod.getPeriodMedianDate(), WalletUtils.getCurrentUserIdentityId());
-      rewardReport.setPeriod(new RewardPeriodWithFullDate(rewardReport.getPeriod()));
-      return Response.ok(rewardReport).build();
-    } catch (Exception e) {
-      LOG.error("Error getting user's computed reward", e);
-      JSONObject object = new JSONObject();
-      try {
-        object.append(ERROR_PARAM, e.getMessage());
-      } catch (JSONException e1) {
-        // Nothing to do
-      }
-      return Response.status(HTTPStatus.INTERNAL_ERROR).type(MediaType.APPLICATION_JSON).entity(object.toString()).build();
-    }
-  }
-
-  @GET
-  @Path("send")
-  @RolesAllowed("rewarding")
-  @Operation(
-          summary = "Send rewards of wallets per a chosen period of time",
-          method = "GET",
-          description = "Send rewards of wallets per a chosen period of time and returns an empty response")
-  @ApiResponses(value = {
-      @ApiResponse(responseCode = "204", description = "Request fulfilled"),
-      @ApiResponse(responseCode = "400", description = "Invalid query input"),
-      @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
-      @ApiResponse(responseCode = "500", description = "Internal server error") })
-  public Response sendRewards(
-                              @Parameter(description = "A date with format yyyy-MM-dd", required = true)
-                              @QueryParam("date")
-                              String date) {
-    try {
-      if (StringUtils.isBlank(date)) {
-        return Response.status(HTTPStatus.BAD_REQUEST).entity(ERROR_EMPTY_PARAM_DATE).build();
-      }
-      RewardPeriod rewardPeriod = getRewardPeriod(date);
-      rewardReportService.sendRewards(rewardPeriod.getPeriodMedianDate(), WalletUtils.getCurrentUserId());
-      return Response.noContent().build();
-    } catch (Exception e) {
-      LOG.error("Error getting computed reward", e);
-      JSONObject object = new JSONObject();
-      try {
-        object.append(ERROR_PARAM, e.getMessage());
-      } catch (JSONException e1) {
-        // Nothing to do
-      }
-      return Response.status(HTTPStatus.INTERNAL_ERROR).type(MediaType.APPLICATION_JSON).entity(object.toString()).build();
-    }
-  }
-
-  @GET
-  @Path("list")
-  @RolesAllowed("users")
-  @Produces(MediaType.APPLICATION_JSON)
-  @Operation(
-          summary = "Return list of rewards for current user with a limit of items to return",
-          method = "GET",
-          description = "return list of rewards per user")
-  @ApiResponses(value = {
-      @ApiResponse(responseCode = "200", description = "Request fulfilled"),
-      @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
-      @ApiResponse(responseCode = "500", description = "Internal server error") })
-  public Response listRewards(@Parameter(description = "limit of items to load") @QueryParam("limit") int limit) {
-    try {
-      List<WalletReward> rewards = rewardReportService.listRewards(WalletUtils.getCurrentUserId(), limit);
-      rewards.forEach(reward -> reward.setPeriod(new RewardPeriodWithFullDate(reward.getPeriod())));
-      return Response.ok(rewards).build();
-    } catch (Exception e) {
-      LOG.error("Error getting list of reward for current user", e);
-      JSONObject object = new JSONObject();
-      try {
-        object.append(ERROR_PARAM, e.getMessage());
-      } catch (JSONException e1) {
-        // Nothing to do
-      }
-      return Response.status(HTTPStatus.INTERNAL_ERROR).type(MediaType.APPLICATION_JSON).entity(object.toString()).build();
-    }
-  }
-
-  @GET
-  @Path("countRewards")
-  @RolesAllowed("users")
-  @Produces(MediaType.APPLICATION_JSON)
-  @Operation(
-          summary = "Return sum of rewards for user",
-          method = "GET",
-          description = "return sum of rewards per user")
-  @ApiResponses(value = {
-          @ApiResponse(responseCode = "200", description = "Request fulfilled"),
-          @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
-          @ApiResponse(responseCode = "500", description = "Internal server error") })
-  public Response countRewards(@Context Request request, @Parameter(description = "user id", required = true) @QueryParam("userId") String userId ) {
-    try {
-      Double sumRewards = rewardReportService.countRewards(userId);
-      EntityTag eTag = new EntityTag(String.valueOf(sumRewards));
-      Response.ResponseBuilder builder = request.evaluatePreconditions(eTag);
-      if (builder == null) {
-        JSONObject result = new JSONObject();
-        result.put("sumRewards", sumRewards);
-        builder = Response.ok(result.toString(), MediaType.APPLICATION_JSON);
-        builder.tag(eTag);
-      }
-      return builder.build();
-    } catch (Exception e) {
-      LOG.error("Error getting sum of reward for current user", e);
-      JSONObject object = new JSONObject();
-      try {
-        object.append(ERROR_PARAM, e.getMessage());
-      } catch (JSONException e1) {
-        // Nothing to do
-      }
-      return Response.status(HTTPStatus.INTERNAL_ERROR).type(MediaType.APPLICATION_JSON).entity(object.toString()).build();
-    }
-  }
-
-  @GET
-  @Path("periods")
-  @Produces(MediaType.APPLICATION_JSON)
-  @RolesAllowed("rewarding")
-  @Operation(summary = "Retrieves the list of periods sorted descending by start date", method = "GET", description = "returns the list of periods sorted descending by start date")
-  @ApiResponses(value = {
-          @ApiResponse(responseCode = "200", description = "Request fulfilled"),
-          @ApiResponse(responseCode = "400", description = "Invalid query input"),
-          @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
-          @ApiResponse(responseCode = "500", description = "Internal server error") })
-  public Response getRewardReportPeriods(@Parameter(description = "Offset of results to retrieve") @QueryParam("from") @DefaultValue("0") long from,
-                                         @Parameter(description = "Offset of results to retrieve") @QueryParam("to") @DefaultValue("0") long to,
-                                         @Parameter(description = "Offset of results to retrieve") @QueryParam("offset") @DefaultValue("0") int offset,
-                                         @Parameter(description = "Limit of results to retrieve") @QueryParam("limit") @DefaultValue("0") int limit) {
-    if (offset < 0) {
-      return Response.status(Response.Status.BAD_REQUEST).entity("Offset must be 0 or positive").build();
-    }
-    List<RewardPeriod> rewardPeriods;
-    if (from >= 0 && to > 0) {
-      rewardPeriods = rewardReportService.findRewardPeriodsBetween(from, to, offset, limit);
-    } else {
-      rewardPeriods = rewardReportService.findRewardReportPeriods(offset, limit);
-    }
-    return Response.ok(rewardPeriods).build();
-  }
-
-  private RewardPeriod getRewardPeriod(String date) {
-    RewardSettings settings = rewardSettingsService.getSettings();
-    ZoneId zoneId = settings.zoneId();
-    RewardPeriodType rewardPeriodType = settings.getPeriodType();
-
-    ZonedDateTime zonedDateTime = RewardUtils.parseRFC3339ToZonedDateTime(date, zoneId);
-    return rewardPeriodType.getPeriodOfTime(zonedDateTime);
-  }
-
-}
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/reward/rest/RewardTeamREST.java b/wallet-api/src/main/java/org/exoplatform/wallet/reward/rest/RewardTeamREST.java
deleted file mode 100644
index 1e8afac9c..000000000
--- a/wallet-api/src/main/java/org/exoplatform/wallet/reward/rest/RewardTeamREST.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.rest;
-
-import static org.exoplatform.wallet.utils.RewardUtils.getCurrentUserId;
-
-import javax.annotation.security.RolesAllowed;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.exoplatform.common.http.HTTPStatus;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.services.rest.resource.ResourceContainer;
-import org.exoplatform.wallet.model.reward.RewardTeam;
-import org.exoplatform.wallet.reward.service.RewardTeamService;
-
-
-@Path("/wallet/api/reward/team")
-@RolesAllowed("rewarding")
-@Tag(name = "/wallet/api/reward/team", description = "Manage reward teams (pools)")
-public class RewardTeamREST implements ResourceContainer {
-  private static final Log  LOG = ExoLogger.getLogger(RewardTeamREST.class);
-
-  private RewardTeamService rewardTeamService;
-
-  public RewardTeamREST(RewardTeamService rewardTeamService) {
-    this.rewardTeamService = rewardTeamService;
-  }
-
-  @GET
-  @Produces(MediaType.APPLICATION_JSON)
-  @Path("list")
-  @RolesAllowed("rewarding")
-  @Operation(
-          summary = "Get reward teams with their members",
-          method = "GET",
-          description= "returns the list of reward team objects")
-  @ApiResponses(value = {
-      @ApiResponse(responseCode = "200", description = "Request fulfilled"),
-      @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
-      @ApiResponse(responseCode = "500", description = "Internal server error") })
-  public Response listTeams() {
-    try {
-      return Response.ok(rewardTeamService.getTeams()).build();
-    } catch (Exception e) {
-      LOG.error("Error getting computed reward", e);
-      return Response.serverError().build();
-    }
-  }
-
-  @GET
-  @Path("remove")
-  @RolesAllowed("rewarding")
-  @Operation(summary = "Remove a reward team", method = "GET", description = "Remove a reward team and returns an empty response")
-  @ApiResponses(value = {
-      @ApiResponse(responseCode = "200", description = "Request fulfilled"),
-      @ApiResponse(responseCode = "400", description = "Invalid query input"),
-      @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
-      @ApiResponse(responseCode = "500", description = "Internal server error") })
-  public Response removeTeam(@Parameter(description = "Reward team technical id", required = true) @QueryParam("id") Long id) {
-    if (id == null || id == 0) {
-      return Response.status(HTTPStatus.BAD_REQUEST).build();
-    }
-    try {
-      RewardTeam team = rewardTeamService.removeTeam(id);
-      LOG.info("{} removed reward pool {}", getCurrentUserId(), team.toString());
-      return Response.ok().build();
-    } catch (Exception e) {
-      LOG.error("Error removing reward pool with id: " + id, e);
-      return Response.serverError().build();
-    }
-  }
-
-  @POST
-  @Path("save")
-  @Consumes(MediaType.APPLICATION_JSON)
-  @Produces(MediaType.APPLICATION_JSON)
-  @RolesAllowed("rewarding")
-  @Operation(
-          summary = "Save a reward team",
-          method = "POST",
-          description = "Save a reward team and returns the saved reward team object")
-  @ApiResponses(value = {
-      @ApiResponse(responseCode = "200", description = "Request fulfilled"),
-      @ApiResponse(responseCode = "400", description = "Invalid query input"),
-      @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
-      @ApiResponse(responseCode = "500", description = "Internal server error") })
-  public Response saveTeam(@Parameter(description = "Reward team object", required = true) RewardTeam rewardTeam) {
-    if (rewardTeam == null) {
-      LOG.warn("Bad request sent to server with empty team");
-      return Response.status(HTTPStatus.BAD_REQUEST).build();
-    }
-    try {
-      rewardTeam = rewardTeamService.saveTeam(rewardTeam);
-      LOG.info("{} saved reward pool {}", getCurrentUserId(), rewardTeam.getName());
-      return Response.ok(rewardTeam).build();
-    } catch (Exception e) {
-      LOG.error("Error saving reward pool", e);
-      return Response.serverError().build();
-    }
-  }
-
-}
diff --git a/wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardTeamService.java b/wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardTeamService.java
deleted file mode 100644
index 373475922..000000000
--- a/wallet-api/src/main/java/org/exoplatform/wallet/reward/service/RewardTeamService.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.service;
-
-import java.util.List;
-
-import org.exoplatform.wallet.model.reward.RewardTeam;
-
-/**
- * A storage service to save/load reward teams
- */
-public interface RewardTeamService {
-
-  /**
-   * @return {@link List} of reward teams of type {@link RewardTeam}
-   */
-  public List<RewardTeam> getTeams();
-
-  /**
-   * Update or create a reward team
-   * 
-   * @param rewardTeam reward to save
-   * @return saved reward team
-   */
-  public RewardTeam saveTeam(RewardTeam rewardTeam);
-
-  /**
-   * Remove a reward Team/Pool by id
-   * 
-   * @param id Team technical ID
-   * @return removed reward team
-   */
-  public RewardTeam removeTeam(Long id);
-
-  /**
-   * Find reward teams by identity id
-   * 
-   * @param identityId user social identity id
-   * @return {@link List} of {@link RewardTeam}
-   */
-  public List<RewardTeam> findTeamsByMemberId(long identityId);
-}
diff --git a/wallet-api/src/test/java/org/exoplatform/wallet/model/reward/RewardPeriodTest.java b/wallet-api/src/test/java/io/meeds/wallet/model/reward/RewardPeriodTest.java
similarity index 81%
rename from wallet-api/src/test/java/org/exoplatform/wallet/model/reward/RewardPeriodTest.java
rename to wallet-api/src/test/java/io/meeds/wallet/model/reward/RewardPeriodTest.java
index e7640b2bc..60ea995cd 100644
--- a/wallet-api/src/test/java/org/exoplatform/wallet/model/reward/RewardPeriodTest.java
+++ b/wallet-api/src/test/java/io/meeds/wallet/model/reward/RewardPeriodTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.model.reward;
+package io.meeds.wallet.model.reward;
 
 import static org.junit.Assert.assertEquals;
 
@@ -24,6 +24,9 @@
 import java.time.YearMonth;
 import java.time.ZoneId;
 
+import io.meeds.wallet.wallet.model.reward.RewardPeriod;
+import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
+import io.meeds.wallet.wallet.model.reward.RewardSettings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -88,24 +91,4 @@ public void testGetPeriodMonth() {
     assertEquals(LocalDate.of(2022, Month.SEPTEMBER, 16), period.getPeriodMedianDate());
   }
 
-  @Test
-  public void testGetPeriodYear() {
-    ZoneId zoneId = ZoneId.of("America/Rio_Branco");
-
-    RewardSettings rewardSettings = new RewardSettings();
-    rewardSettings.setPeriodType(RewardPeriodType.YEAR);
-    rewardSettings.setTimeZone(zoneId.getId());
-
-    LocalDate date = LocalDate.of(2022, Month.SEPTEMBER, 1);
-
-    RewardPeriod period = RewardPeriod.getPeriodOfTime(rewardSettings, date);
-    assertEquals(1641013200l, period.getStartDateInSeconds());
-    assertEquals("1 Jan 2022", period.getStartDateFormatted("en"));
-    assertEquals(1672549200l, period.getEndDateInSeconds());
-    assertEquals("1 Jan 2023", period.getEndDateFormatted("en"));
-    assertEquals(RewardPeriodType.YEAR, period.getRewardPeriodType());
-    assertEquals(zoneId.getId(), period.getTimeZone());
-    assertEquals(LocalDate.of(2022, Month.JULY, 2), period.getPeriodMedianDate());
-  }
-
 }
diff --git a/wallet-api/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java b/wallet-api/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java
new file mode 100644
index 000000000..dd062fb2e
--- /dev/null
+++ b/wallet-api/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java
@@ -0,0 +1,262 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package io.meeds.wallet.reward.rest;
+
+import static org.mockito.Mockito.*;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import com.fasterxml.jackson.core.json.JsonReadFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import lombok.SneakyThrows;
+import io.meeds.wallet.wallet.model.reward.RewardPeriod;
+import io.meeds.wallet.reward.service.RewardReportService;
+import io.meeds.wallet.reward.service.RewardSettingsService;
+import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
+import io.meeds.wallet.wallet.model.reward.RewardReport;
+import io.meeds.wallet.wallet.model.reward.RewardSettings;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.MediaType;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.RequestPostProcessor;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import io.meeds.spring.web.security.PortalAuthenticationManager;
+import io.meeds.spring.web.security.WebSecurityConfiguration;
+import jakarta.servlet.Filter;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.List;
+
+@SpringBootTest(classes = { RewardReportREST.class, PortalAuthenticationManager.class, })
+@ContextConfiguration(classes = { WebSecurityConfiguration.class })
+@AutoConfigureWebMvc
+@AutoConfigureMockMvc(addFilters = false)
+@ExtendWith(MockitoExtension.class)
+class TestRewardReportREST {
+
+  private static final String REST_PATH     = "/reward";     // NOSONAR
+
+  private static final String SIMPLE_USER   = "simple";
+
+  private static final String ADMIN_USER    = "admin";
+
+  private static final String TEST_PASSWORD = "testPassword";
+
+  static final ObjectMapper   OBJECT_MAPPER;
+
+  static {
+    // Workaround when Jackson is defined in shared library with different
+    // version and without artifact jackson-datatype-jsr310
+    OBJECT_MAPPER = JsonMapper.builder()
+                              .configure(JsonReadFeature.ALLOW_MISSING_VALUES, true)
+                              .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)
+                              .build();
+    OBJECT_MAPPER.registerModule(new JavaTimeModule());
+  }
+
+  @MockBean
+  private RewardReportService   rewardReportService;
+
+  @MockBean
+  private RewardSettingsService rewardSettingsService;
+
+  @Autowired
+  private SecurityFilterChain   filterChain;
+
+  @Autowired
+  private WebApplicationContext context;
+
+  private MockMvc               mockMvc;
+
+  @BeforeEach
+  void setup() {
+    mockMvc = MockMvcBuilders.webAppContextSetup(context).addFilters(filterChain.getFilters().toArray(new Filter[0])).build();
+  }
+
+  @Test
+  void computeRewardsAnonymously() throws Exception {
+    ResultActions response = mockMvc.perform(get(REST_PATH + "/compute").param("page", "0").param("size", "12"));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void computeRewardsSimpleUser() throws Exception {
+    ResultActions response = mockMvc.perform(get(REST_PATH + "/compute").param("page", "0").param("size", "12").with(testSimpleUser()));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void computeRewardsByPeriodAnonymously() throws Exception {
+    ResultActions response = mockMvc.perform(post(REST_PATH + "/period/compute").content(asJsonString(rewardPeriod()))
+                                                                                .contentType(MediaType.APPLICATION_JSON)
+                                                                                .accept(MediaType.APPLICATION_JSON));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void computeRewardsByPeriodSimpleUser() throws Exception {
+    ResultActions response = mockMvc.perform(post(REST_PATH + "/period/compute").content(asJsonString(rewardPeriod()))
+                                                                                .contentType(MediaType.APPLICATION_JSON)
+                                                                                .accept(MediaType.APPLICATION_JSON)
+                                                                                .with(testSimpleUser()));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void computeRewardsByPeriodAdmin() throws Exception {
+    when(rewardSettingsService.getSettings()).thenReturn(new RewardSettings());
+    RewardPeriod rewardPeriod = new RewardPeriod();
+    RewardReport rewardReport = new RewardReport();
+    rewardReport.setPeriod(rewardPeriod);
+    when(rewardReportService.computeRewards(any(LocalDate.class))).thenReturn(rewardReport);
+    ResultActions response = mockMvc.perform(post(REST_PATH + "/period/compute").content(asJsonString(rewardPeriod))
+                                                                                .contentType(MediaType.APPLICATION_JSON)
+                                                                                .accept(MediaType.APPLICATION_JSON)
+                                                                                .with(testAdminUser()));
+    response.andExpect(status().isOk());
+  }
+
+  @Test
+  void computeRewardsAdmin() throws Exception {
+    when(rewardSettingsService.getSettings()).thenReturn(new RewardSettings());
+    RewardPeriod rewardPeriod = new RewardPeriod();
+    RewardReport rewardReport = new RewardReport();
+    rewardReport.setPeriod(rewardPeriod);
+    when(rewardReportService.computeRewards(any(LocalDate.class))).thenReturn(rewardReport);
+    ResultActions response = mockMvc.perform(get(REST_PATH + "/compute").param("page", "0").param("size", "12").with(testAdminUser()));
+    verify(rewardSettingsService, times(1)).getSettings();
+    response.andExpect(status().isOk());
+  }
+
+  @Test
+  void computeRewardsByUserAnonymously() throws Exception {
+    ResultActions response = mockMvc.perform(get(REST_PATH + "/compute/user").param("date", "2024-09-10"));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void computeRewardsByUserSimpleUser() throws Exception {
+    ResultActions response = mockMvc.perform(get(REST_PATH + "/compute/user").param("date", "2024-09-10").with(testSimpleUser()));
+    response.andExpect(status().isOk());
+  }
+
+  @Test
+  void sendRewardsAnonymously() throws Exception {
+    ResultActions response = mockMvc.perform(post(REST_PATH + "/send").content(asJsonString(rewardPeriod()))
+            .contentType(MediaType.APPLICATION_JSON)
+            .accept(MediaType.APPLICATION_JSON));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void sendRewardsSimpleUser() throws Exception {
+    ResultActions response = mockMvc.perform(post(REST_PATH + "/send").content(asJsonString(rewardPeriod()))
+            .contentType(MediaType.APPLICATION_JSON)
+            .accept(MediaType.APPLICATION_JSON).with(testSimpleUser()));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void sendRewardsAdmin() throws Exception {
+    ResultActions response = mockMvc.perform(post(REST_PATH + "/send").content(asJsonString(rewardPeriod()))
+            .contentType(MediaType.APPLICATION_JSON)
+            .accept(MediaType.APPLICATION_JSON).with(testAdminUser()));
+    verify(rewardReportService, times(1)).sendRewards(any(LocalDate.class), anyString());
+    response.andExpect(status().isOk());
+  }
+
+  @Test
+  void listRewardsAnonymously() throws Exception {
+    ResultActions response = mockMvc.perform(get(REST_PATH + "/list").param("limit", "10"));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void listRewardsSimpleUser() throws Exception {
+    ResultActions response = mockMvc.perform(get(REST_PATH + "/list").param("limit", "10").with(testSimpleUser()));
+    response.andExpect(status().isOk());
+  }
+
+  @Test
+  void getRewardReportPeriodsAnonymously() throws Exception {
+    ResultActions response = mockMvc.perform(get(REST_PATH + "/periods").param("from", "0").param("to", "10"));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void getRewardReportPeriodsSimpleUser() throws Exception {
+    ResultActions response = mockMvc.perform(get(REST_PATH + "/periods").param("from", "0")
+                                                                        .param("to", "10")
+                                                                        .with(testSimpleUser()));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void getRewardReportPeriodsAdmin() throws Exception {
+    when(rewardReportService.findRewardReportPeriods(any(Pageable.class))).thenReturn(new PageImpl<>(List.of(newRewardPeriod())));
+
+    ResultActions response = mockMvc.perform(get(REST_PATH + "/periods").param("from", "0")
+            .param("to", "0")
+                                                                    .with(testAdminUser()));
+    response.andExpect(status().isOk());
+  }
+
+  private RequestPostProcessor testAdminUser() {
+    return user(ADMIN_USER).password(TEST_PASSWORD).authorities(new SimpleGrantedAuthority("rewarding"));
+  }
+
+  private RequestPostProcessor testSimpleUser() {
+    return user(SIMPLE_USER).password(TEST_PASSWORD).authorities(new SimpleGrantedAuthority("users"));
+  }
+
+  private RewardPeriod newRewardPeriod() {
+    return new RewardPeriod();
+  }
+
+  private RewardPeriod rewardPeriod() {
+    return new RewardPeriod(RewardPeriodType.WEEK, ZoneId.systemDefault().getId(), 1725832800, 1726437600);
+  }
+
+  @SneakyThrows
+  public static String asJsonString(final Object obj) {
+    return OBJECT_MAPPER.writeValueAsString(obj);
+  }
+
+}
diff --git a/wallet-api/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java b/wallet-api/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java
new file mode 100644
index 000000000..a0805135f
--- /dev/null
+++ b/wallet-api/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java
@@ -0,0 +1,204 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package io.meeds.wallet.reward.rest;
+
+import static org.mockito.Mockito.*;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import com.fasterxml.jackson.core.json.JsonReadFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import lombok.SneakyThrows;
+import io.meeds.wallet.wallet.model.reward.RewardBudgetType;
+import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
+import io.meeds.wallet.wallet.model.reward.RewardSettings;
+import io.meeds.wallet.reward.service.RewardSettingsService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.MediaType;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.RequestPostProcessor;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import io.meeds.spring.web.security.PortalAuthenticationManager;
+import io.meeds.spring.web.security.WebSecurityConfiguration;
+import jakarta.servlet.Filter;
+
+import java.time.ZoneId;
+
+@SpringBootTest(classes = { RewardSettingsREST.class, PortalAuthenticationManager.class, })
+@ContextConfiguration(classes = { WebSecurityConfiguration.class })
+@AutoConfigureWebMvc
+@AutoConfigureMockMvc(addFilters = false)
+@ExtendWith(MockitoExtension.class)
+class TestRewardSettingsREST {
+
+  private static final String REST_PATH     = "/settings/reward"; // NOSONAR
+
+  private static final String SIMPLE_USER   = "simple";
+
+  private static final String ADMIN_USER    = "admin";
+
+  private static final String TEST_PASSWORD = "testPassword";
+
+  static final ObjectMapper   OBJECT_MAPPER;
+
+  static {
+    // Workaround when Jackson is defined in shared library with different
+    // version and without artifact jackson-datatype-jsr310
+    OBJECT_MAPPER = JsonMapper.builder()
+                              .configure(JsonReadFeature.ALLOW_MISSING_VALUES, true)
+                              .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)
+                              .build();
+    OBJECT_MAPPER.registerModule(new JavaTimeModule());
+  }
+
+  @MockBean
+  private RewardSettingsService rewardSettingsService;
+
+  @Autowired
+  private SecurityFilterChain   filterChain;
+
+  @Autowired
+  private WebApplicationContext context;
+
+  private MockMvc               mockMvc;
+
+  @BeforeEach
+  void setup() {
+    mockMvc = MockMvcBuilders.webAppContextSetup(context).addFilters(filterChain.getFilters().toArray(new Filter[0])).build();
+  }
+
+  @Test
+  void getSettingsAnonymously() throws Exception {
+    ResultActions response = mockMvc.perform(get(REST_PATH));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void getSettingsSimpleUser() throws Exception {
+    ResultActions response = mockMvc.perform(get(REST_PATH).with(testSimpleUser()));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void getSettingsAdmin() throws Exception {
+    ResultActions response = mockMvc.perform(get(REST_PATH).with(testAdminUser()));
+    verify(rewardSettingsService, times(1)).getSettings();
+    response.andExpect(status().isOk());
+  }
+
+  @Test
+  void saveSettingsAnonymously() throws Exception {
+    ResultActions response = mockMvc.perform(post(REST_PATH).content(asJsonString(rewardSettings()))
+                                                                      .contentType(MediaType.APPLICATION_JSON)
+                                                                      .accept(MediaType.APPLICATION_JSON));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void saveSettingsSimpleUser() throws Exception {
+    ResultActions response = mockMvc.perform(post(REST_PATH).content(asJsonString(rewardSettings()))
+                                                                      .with(testSimpleUser())
+                                                                      .contentType(MediaType.APPLICATION_JSON)
+                                                                      .accept(MediaType.APPLICATION_JSON));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void saveSettingsAdmin() throws Exception {
+    ResultActions response = mockMvc.perform(post(REST_PATH).content(asJsonString(rewardSettings()))
+                                                                      .with(testAdminUser())
+                                                                      .contentType(MediaType.APPLICATION_JSON)
+                                                                      .accept(MediaType.APPLICATION_JSON));
+    response.andExpect(status().isOk());
+  }
+
+  @Test
+  void deleteSettingsAnonymously() throws Exception {
+    ResultActions response = mockMvc.perform(delete(REST_PATH));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void deleteSettingsSimpleUser() throws Exception {
+    ResultActions response = mockMvc.perform(delete(REST_PATH).with(testSimpleUser()));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void deleteSettingsAdmin() throws Exception {
+    ResultActions response = mockMvc.perform(delete(REST_PATH).with(testAdminUser()));
+    response.andExpect(status().isOk());
+  }
+
+  @Test
+  void getRewardDatesAnonymously() throws Exception {
+    ResultActions response = mockMvc.perform(get(REST_PATH + "/getDates").param("date", "2024-09-10"));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void getRewardDatesSimpleUser() throws Exception {
+    ResultActions response = mockMvc.perform(get(REST_PATH + "/getDates").param("date", "").with(testSimpleUser()));
+    response.andExpect(status().isBadRequest());
+    when(rewardSettingsService.getSettings()).thenReturn(rewardSettings());
+    response = mockMvc.perform(get(REST_PATH + "/getDates").param("date", "2024-09-10").with(testSimpleUser()));
+    response.andExpect(status().isOk());
+  }
+
+  private RequestPostProcessor testAdminUser() {
+    return user(ADMIN_USER).password(TEST_PASSWORD).authorities(new SimpleGrantedAuthority("rewarding"));
+  }
+
+  private RequestPostProcessor testSimpleUser() {
+    return user(SIMPLE_USER).password(TEST_PASSWORD).authorities(new SimpleGrantedAuthority("users"));
+  }
+
+  private RewardSettings rewardSettings() {
+    return new RewardSettings(RewardPeriodType.MONTH,
+                              ZoneId.systemDefault().getId(),
+                              RewardBudgetType.FIXED_PER_MEMBER,
+                              200,
+                              200,
+                              true);
+  }
+
+  @SneakyThrows
+  public static String asJsonString(final Object obj) {
+    return OBJECT_MAPPER.writeValueAsString(obj);
+  }
+
+}
diff --git a/wallet-api/src/test/java/org/exoplatform/wallet/statistic/StatisticUtilsTest.java b/wallet-api/src/test/java/io/meeds/wallet/statistic/StatisticUtilsTest.java
similarity index 90%
rename from wallet-api/src/test/java/org/exoplatform/wallet/statistic/StatisticUtilsTest.java
rename to wallet-api/src/test/java/io/meeds/wallet/statistic/StatisticUtilsTest.java
index 9afe97ab3..0220d7548 100644
--- a/wallet-api/src/test/java/org/exoplatform/wallet/statistic/StatisticUtilsTest.java
+++ b/wallet-api/src/test/java/io/meeds/wallet/statistic/StatisticUtilsTest.java
@@ -14,15 +14,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.statistic;
+package io.meeds.wallet.statistic;
 
-import static org.exoplatform.wallet.statistic.StatisticUtils.DURATION;
-import static org.exoplatform.wallet.statistic.StatisticUtils.ERROR_MSG;
-import static org.exoplatform.wallet.statistic.StatisticUtils.LOCAL_SERVICE;
-import static org.exoplatform.wallet.statistic.StatisticUtils.OPERATION;
-import static org.exoplatform.wallet.statistic.StatisticUtils.REMOTE_SERVICE;
-import static org.exoplatform.wallet.statistic.StatisticUtils.STATUS;
-import static org.exoplatform.wallet.statistic.StatisticUtils.STATUS_CODE;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.DURATION;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.ERROR_MSG;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.LOCAL_SERVICE;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.OPERATION;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.REMOTE_SERVICE;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.STATUS;
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.STATUS_CODE;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThrows;
@@ -33,6 +33,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.meeds.wallet.wallet.statistic.StatisticUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -40,7 +41,7 @@
 import io.meeds.analytics.model.StatisticData;
 import io.meeds.analytics.model.StatisticData.StatisticStatus;
 import io.meeds.analytics.utils.AnalyticsUtils;
-import org.exoplatform.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.Wallet;
 
 @RunWith(MockitoJUnitRunner.class)
 public class StatisticUtilsTest {
diff --git a/wallet-api/src/test/java/org/exoplatform/wallet/utils/WalletUtilsTest.java b/wallet-api/src/test/java/io/meeds/wallet/utils/WalletUtilsTest.java
similarity index 96%
rename from wallet-api/src/test/java/org/exoplatform/wallet/utils/WalletUtilsTest.java
rename to wallet-api/src/test/java/io/meeds/wallet/utils/WalletUtilsTest.java
index 2aee2969c..2511446f6 100644
--- a/wallet-api/src/test/java/org/exoplatform/wallet/utils/WalletUtilsTest.java
+++ b/wallet-api/src/test/java/io/meeds/wallet/utils/WalletUtilsTest.java
@@ -14,12 +14,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.utils;
+package io.meeds.wallet.utils;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.Locale;
 
+import io.meeds.wallet.wallet.utils.WalletUtils;
 import org.junit.Test;
 
 public class WalletUtilsTest {
diff --git a/wallet-api/src/test/java/org/exoplatform/wallet/reward/rest/TestRewardSettingsREST.java b/wallet-api/src/test/java/org/exoplatform/wallet/reward/rest/TestRewardSettingsREST.java
deleted file mode 100644
index da44ccea9..000000000
--- a/wallet-api/src/test/java/org/exoplatform/wallet/reward/rest/TestRewardSettingsREST.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2022 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.rest;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.when;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import org.exoplatform.container.ExoContainer;
-import org.exoplatform.container.ExoContainerContext;
-import org.exoplatform.services.rest.RequestHandler;
-import org.exoplatform.services.rest.impl.ContainerResponse;
-import org.exoplatform.services.rest.impl.EnvironmentContext;
-import org.exoplatform.services.rest.impl.ProvidersRegistry;
-import org.exoplatform.services.rest.impl.RequestDispatcher;
-import org.exoplatform.services.rest.impl.RequestHandlerImpl;
-import org.exoplatform.services.rest.impl.ResourceBinder;
-import org.exoplatform.services.rest.tools.ResourceLauncher;
-import org.exoplatform.services.test.mock.MockHttpServletRequest;
-import org.exoplatform.wallet.model.reward.RewardPeriodType;
-import org.exoplatform.wallet.model.reward.RewardPeriodWithFullDate;
-import org.exoplatform.wallet.model.reward.RewardSettings;
-import org.exoplatform.wallet.reward.service.RewardSettingsService;
-
-@RunWith(MockitoJUnitRunner.class)
-public class TestRewardSettingsREST {
-
-  @Mock
-  private RewardSettingsService rewardSettingsService;
-
-  @Mock
-  private ExoContainerContext   containerContext;
-
-  @Mock
-  private ExoContainer          container;
-
-  private ResourceLauncher      launcher;
-
-  private RewardSettingsREST    rewardSettingsREST;
-
-  @Before
-  public void setUp() {
-    if (rewardSettingsREST == null) {
-      rewardSettingsREST = new RewardSettingsREST(rewardSettingsService);
-    }
-    when(containerContext.getName()).thenReturn("portal");
-    ExoContainerContext.setCurrentContainer(container);
-  }
-
-  @Test
-  public void testGetNegativeTimeZone() throws Exception {
-    String restPath = "/wallet/api/reward/settings/getDates?date=2022-09-20"; // NOSONAR
-    String timeZone = "America/Rio_Branco";
-
-    RewardSettings settings = new RewardSettings();
-    settings.setTimeZone(timeZone);
-    when(rewardSettingsService.getSettings()).thenReturn(settings);
-
-    EnvironmentContext envctx = new EnvironmentContext();
-    HttpServletRequest httpRequest = new MockHttpServletRequest(restPath, null, 0, "GET", null);
-    envctx.put(HttpServletRequest.class, httpRequest);
-    ContainerResponse response = getLauncher().service("GET", restPath, "", null, null, envctx);
-    assertNotNull(response);
-    assertEquals(200, response.getStatus());
-    RewardPeriodWithFullDate periodWithFullDate = (RewardPeriodWithFullDate) response.getEntity();
-    assertNotNull(periodWithFullDate);
-    assertEquals("2022-09-01T00:00:00.000-05:00", periodWithFullDate.getStartDate());
-    assertEquals(1662008400l, periodWithFullDate.getStartDateInSeconds());
-    assertEquals("2022-09-30T23:59:59.000-05:00", periodWithFullDate.getEndDate());
-    assertEquals(1664600400l, periodWithFullDate.getEndDateInSeconds());
-    assertEquals(RewardPeriodType.DEFAULT, periodWithFullDate.getRewardPeriodType());
-    assertEquals(timeZone, periodWithFullDate.getTimeZone());
-  }
-
-  @Test
-  public void testGetPositiveTimeZone() throws Exception {
-    String restPath = "/wallet/api/reward/settings/getDates?date=2022-09-20"; // NOSONAR
-    String timeZone = "Asia/Tokyo";
-
-    RewardSettings settings = new RewardSettings();
-    settings.setTimeZone(timeZone);
-    settings.setPeriodType(RewardPeriodType.WEEK);
-    when(rewardSettingsService.getSettings()).thenReturn(settings);
-
-    EnvironmentContext envctx = new EnvironmentContext();
-    HttpServletRequest httpRequest = new MockHttpServletRequest(restPath, null, 0, "GET", null);
-    envctx.put(HttpServletRequest.class, httpRequest);
-    ContainerResponse response = getLauncher().service("GET", restPath, "", null, null, envctx);
-    assertNotNull(response);
-    assertEquals(200, response.getStatus());
-    RewardPeriodWithFullDate periodWithFullDate = (RewardPeriodWithFullDate) response.getEntity();
-    assertNotNull(periodWithFullDate);
-    assertEquals("2022-09-19T00:00:00.000+09:00", periodWithFullDate.getStartDate());
-    assertEquals(1663513200l, periodWithFullDate.getStartDateInSeconds());
-    assertEquals("2022-09-25T23:59:59.000+09:00", periodWithFullDate.getEndDate());
-    assertEquals(1664118000l, periodWithFullDate.getEndDateInSeconds());
-    assertEquals(RewardPeriodType.WEEK, periodWithFullDate.getRewardPeriodType());
-    assertEquals(timeZone, periodWithFullDate.getTimeZone());
-  }
-
-  @Test
-  public void testGetDSTTimeZone() throws Exception {
-    String restPath = "/wallet/api/reward/settings/getDates?date=2022-10-25"; // NOSONAR
-    String timeZone = "Europe/Paris";
-
-    RewardSettings settings = new RewardSettings();
-    settings.setTimeZone(timeZone);
-    settings.setPeriodType(RewardPeriodType.WEEK);
-    when(rewardSettingsService.getSettings()).thenReturn(settings);
-
-    EnvironmentContext envctx = new EnvironmentContext();
-    HttpServletRequest httpRequest = new MockHttpServletRequest(restPath, null, 0, "GET", null);
-    envctx.put(HttpServletRequest.class, httpRequest);
-    ContainerResponse response = getLauncher().service("GET", restPath, "", null, null, envctx);
-    assertNotNull(response);
-    assertEquals(200, response.getStatus());
-    RewardPeriodWithFullDate periodWithFullDate = (RewardPeriodWithFullDate) response.getEntity();
-    assertNotNull(periodWithFullDate);
-    assertEquals("2022-10-24T00:00:00.000+02:00", periodWithFullDate.getStartDate());
-    assertEquals(1666562400l, periodWithFullDate.getStartDateInSeconds());
-    assertEquals("2022-10-30T23:59:59.000+01:00", periodWithFullDate.getEndDate());
-    assertEquals(1667170800l, periodWithFullDate.getEndDateInSeconds());
-    assertEquals(RewardPeriodType.WEEK, periodWithFullDate.getRewardPeriodType());
-    assertEquals(timeZone, periodWithFullDate.getTimeZone());
-  }
-
-  private ResourceLauncher getLauncher() throws Exception {
-    if (launcher == null) {
-      ResourceBinder resourceBinder = new ResourceBinder(containerContext);
-      resourceBinder.addResource(rewardSettingsREST, null);
-      ProvidersRegistry providers = new ProvidersRegistry();
-      RequestDispatcher requestDispatcher = new RequestDispatcher(resourceBinder, providers);
-      RequestHandler requestHandler = new RequestHandlerImpl(requestDispatcher, null);
-      launcher = new ResourceLauncher(requestHandler);
-    }
-    return launcher;
-  }
-
-}
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/dao/RewardDAO.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/dao/RewardDAO.java
new file mode 100644
index 000000000..d3dcd93e5
--- /dev/null
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/dao/RewardDAO.java
@@ -0,0 +1,55 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package io.meeds.wallet.reward.dao;
+
+import java.util.List;
+
+import jakarta.transaction.Transactional;
+import io.meeds.wallet.reward.entity.WalletRewardEntity;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Component;
+
+@Component
+public interface RewardDAO extends JpaRepository<WalletRewardEntity, Long> {
+
+  @Query("""
+          SELECT rw FROM Reward rw WHERE rw.period.id = :periodId
+      """)
+  List<WalletRewardEntity> findRewardsByPeriodId(@Param("periodId") long periodId);
+
+  List<WalletRewardEntity> findWalletRewardEntitiesByIdentityId(long identityId, Pageable pageable);
+
+  double countWalletRewardEntitiesByIdentityId(long identityId);
+
+  @Query("""
+          SELECT rw FROM Reward rw WHERE rw.identityId = :identityId AND rw.period.id = :periodId
+      """)
+  List<WalletRewardEntity> findRewardByIdentityIdAndPeriodId(@Param("identityId") long identityId, @Param("periodId") long periodId);
+
+  @Modifying
+  @Transactional
+  @Query("""
+      UPDATE Reward rw SET rw.transactionHash = :newHash WHERE rw.transactionHash = :oldHash
+      """)
+  void replaceRewardTransactions(@Param("oldHash") String oldHash, @Param("newHash") String newHash);
+}
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/dao/RewardPeriodDAO.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/dao/RewardPeriodDAO.java
new file mode 100644
index 000000000..f5c01bcbb
--- /dev/null
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/dao/RewardPeriodDAO.java
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package io.meeds.wallet.reward.dao;
+
+import java.util.List;
+
+import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
+import io.meeds.wallet.wallet.model.reward.RewardStatus;
+import io.meeds.wallet.reward.entity.WalletRewardPeriodEntity;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Component;
+
+@Component
+public interface RewardPeriodDAO extends JpaRepository<WalletRewardPeriodEntity, Long> {
+
+  @Query("""
+          SELECT rp FROM RewardPeriod rp WHERE (rp.startTime >= :from AND rp.startTime <= :to) OR (rp.endTime >= :from AND rp.endTime <= :to) ORDER BY rp.startTime DESC
+      """)
+  Page<WalletRewardPeriodEntity> findRewardPeriodsBetween(@Param("from") long from, @Param("to") long to, Pageable pageable);
+
+  @Query("""
+          SELECT rp FROM RewardPeriod rp WHERE rp.periodType = :periodType AND rp.startTime <= :periodTime AND rp.endTime > :periodTime
+      """)
+  WalletRewardPeriodEntity findRewardPeriodByTypeAndTime(@Param("periodType") RewardPeriodType periodType, @Param("periodTime") long periodTime);
+
+  List<WalletRewardPeriodEntity> findWalletRewardPeriodEntitiesByStatus(RewardStatus status);
+
+}
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/entity/WalletRewardEntity.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/entity/WalletRewardEntity.java
new file mode 100644
index 000000000..f840c7fac
--- /dev/null
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/entity/WalletRewardEntity.java
@@ -0,0 +1,61 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ * Copyright (C) 2020 Meeds Association
+ * contact@meeds.io
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package io.meeds.wallet.reward.entity;
+
+import java.io.Serializable;
+
+import jakarta.persistence.*;
+
+import lombok.Data;
+import org.hibernate.annotations.DynamicUpdate;
+
+@Entity(name = "Reward")
+@DynamicUpdate
+@Table(name = "ADDONS_WALLET_REWARD")
+@Data
+public class WalletRewardEntity implements Serializable {
+
+  private static final long        serialVersionUID = 4475704534821391132L;
+
+  @Id
+  @SequenceGenerator(name = "SEQ_WALLET_REWARD_ID", sequenceName = "SEQ_WALLET_REWARD_ID", allocationSize = 1)
+  @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEQ_WALLET_REWARD_ID")
+  @Column(name = "REWARD_ID")
+  private Long                     id;
+
+  @Column(name = "IDENTITY_ID", nullable = false)
+  private long                     identityId;
+
+  @Column(name = "TRANSACTION_HASH")
+  private String                   transactionHash;
+
+  @Column(name = "ENABLED")
+  private boolean                  enabled;
+
+  @Column(name = "TOKENS_SENT")
+  private double                   tokensSent;
+
+  @Column(name = "TOKENS_TO_SEND")
+  private double                   tokensToSend;
+
+  @Column(name = "POINTS")
+  private double                   points;
+
+  @ManyToOne(fetch = FetchType.EAGER, optional = false)
+  @JoinColumn(name = "REWARD_PERIOD_ID", referencedColumnName = "REWARD_PERIOD_ID")
+  private WalletRewardPeriodEntity period;
+}
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/WalletRewardPeriodEntity.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/entity/WalletRewardPeriodEntity.java
similarity index 56%
rename from wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/WalletRewardPeriodEntity.java
rename to wallet-reward-services/src/main/java/io/meeds/wallet/reward/entity/WalletRewardPeriodEntity.java
index 5866e49a8..b806a52b3 100644
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/WalletRewardPeriodEntity.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/entity/WalletRewardPeriodEntity.java
@@ -14,24 +14,22 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.reward.entity;
+package io.meeds.wallet.reward.entity;
 
 import java.io.Serializable;
 
 import jakarta.persistence.*;
 
+import lombok.Data;
 import org.hibernate.annotations.DynamicUpdate;
 
-import org.exoplatform.wallet.model.reward.RewardPeriodType;
-import org.exoplatform.wallet.model.reward.RewardStatus;
+import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
+import io.meeds.wallet.wallet.model.reward.RewardStatus;
 
 @Entity(name = "RewardPeriod")
 @DynamicUpdate
 @Table(name = "ADDONS_WALLET_REWARD_PERIOD")
-@NamedQuery(name = "RewardPeriod.findRewardPeriods", query = "SELECT rp FROM RewardPeriod rp ORDER BY rp.startTime DESC")
-@NamedQuery(name = "RewardPeriod.findRewardPeriodsBetween", query = "SELECT rp FROM RewardPeriod rp WHERE (rp.startTime >= :from AND rp.startTime <= :to) OR (rp.endTime >= :from AND rp.endTime <= :to) ORDER BY rp.startTime DESC")
-@NamedQuery(name = "RewardPeriod.findRewardPeriodByTypeAndTime", query = "SELECT rp FROM RewardPeriod rp WHERE rp.periodType = :periodType AND rp.startTime <= :periodTime AND rp.endTime > :periodTime")
-@NamedQuery(name = "RewardPlugin.findRewardPeriodsByStatus", query = "SELECT rp FROM RewardPeriod rp WHERE rp.status = :status")
+@Data
 public class WalletRewardPeriodEntity implements Serializable {
 
   private static final long serialVersionUID = -6286934482105645678L;
@@ -59,54 +57,6 @@ public class WalletRewardPeriodEntity implements Serializable {
   @Column(name = "STATUS", nullable = false)
   private RewardStatus      status;
 
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public RewardPeriodType getPeriodType() {
-    return periodType;
-  }
-
-  public void setPeriodType(RewardPeriodType periodType) {
-    this.periodType = periodType;
-  }
-
-  public long getStartTime() {
-    return startTime;
-  }
-
-  public void setStartTime(long startTime) {
-    this.startTime = startTime;
-  }
-
-  public long getEndTime() {
-    return endTime;
-  }
-
-  public void setEndTime(long endTime) {
-    this.endTime = endTime;
-  }
-
-  public String getTimeZone() {
-    return timeZone;
-  }
-
-  public void setTimeZone(String timeZone) {
-    this.timeZone = timeZone;
-  }
-
-  public RewardStatus getStatus() {
-    return status;
-  }
-
-  public void setStatus(RewardStatus status) {
-    this.status = status;
-  }
-
   @Override
   public String toString() {
     return "WalletRewardPeriodEntity [id=" + id + ", periodType=" + periodType + ", startTime=" + startTime + ", endTime="
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/listener/RewardSucceedAnalyticsListener.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListener.java
similarity index 56%
rename from wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/listener/RewardSucceedAnalyticsListener.java
rename to wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListener.java
index 52f8c2375..9b0abec5d 100644
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/listener/RewardSucceedAnalyticsListener.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListener.java
@@ -17,15 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.reward.listener;
+package io.meeds.wallet.reward.listener;
 
 import java.time.Instant;
 import java.util.Date;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.StringUtils;
+import jakarta.annotation.PostConstruct;
 
 import io.meeds.analytics.model.StatisticData;
 import io.meeds.analytics.utils.AnalyticsUtils;
@@ -33,19 +30,32 @@
 import org.exoplatform.services.listener.Asynchronous;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
-import org.exoplatform.wallet.model.reward.RewardReport;
-import org.exoplatform.wallet.model.reward.WalletPluginReward;
-import org.exoplatform.wallet.model.reward.WalletReward;
+import org.exoplatform.services.listener.ListenerService;
+import io.meeds.wallet.wallet.model.reward.RewardReport;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * A listener that is triggered when rewards has been successfully sent. This
  * will collect reward statistics.
  */
 @Asynchronous
+@Component
 public class RewardSucceedAnalyticsListener extends Listener<RewardReport, Object> {
 
+  private static final String EVENT_NAME = "exo.wallet.reward.report.success";
+
+  @Autowired
+  private ListenerService     listenerService;
+
+  @PostConstruct
+  public void init() {
+    listenerService.addListener(EVENT_NAME, this);
+  }
+
+  @Override
   @ExoTransactional
-  public void onEvent(Event<RewardReport, Object> event) throws Exception {
+  public void onEvent(Event<RewardReport, Object> event) {
     RewardReport rewardReport = event.getSource();
     StatisticData statisticData = new StatisticData();
     statisticData.setModule("wallet");
@@ -63,27 +73,6 @@ public void onEvent(Event<RewardReport, Object> event) throws Exception {
     statisticData.addParameter("rewardRecipientWalletCount", rewardReport.getValidRewardCount());
     statisticData.addParameter("rewardParticipantWalletCount", rewardReport.getRewards().size());
 
-    Map<String, Double> rewardPluginPoints = rewardReport.getValidRewards()
-                                                         .stream()
-                                                         .map(WalletReward::getRewards)
-                                                         .flatMap(Set::stream)
-                                                         .collect(Collectors.toMap(WalletPluginReward::getPluginId,
-                                                                                   WalletPluginReward::getPoints,
-                                                                                   Double::sum));
-    rewardPluginPoints.forEach((pId,
-                                points) -> statisticData.addParameter("rewardPlugin" + StringUtils.capitalize(pId) + "Points",
-                                                                      points));
-    Map<String, Double> rewardPluginAmounts = rewardReport.getValidRewards()
-                                                          .stream()
-                                                          .map(WalletReward::getRewards)
-                                                          .flatMap(Set::stream)
-                                                          .collect(Collectors.toMap(WalletPluginReward::getPluginId,
-                                                                                    WalletPluginReward::getAmount,
-                                                                                    Double::sum));
-    rewardPluginAmounts.forEach((pId,
-                                 amount) -> statisticData.addParameter("rewardPlugin" + StringUtils.capitalize(pId) + "Amount",
-                                                                       amount));
-
     AnalyticsUtils.addStatisticData(statisticData);
   }
 
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/listener/RewardSucceedNotificationListener.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListener.java
similarity index 72%
rename from wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/listener/RewardSucceedNotificationListener.java
rename to wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListener.java
index c4792f67b..04b5d21d2 100644
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/listener/RewardSucceedNotificationListener.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListener.java
@@ -14,11 +14,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.reward.listener;
+package io.meeds.wallet.reward.listener;
 
-import static org.exoplatform.wallet.utils.RewardUtils.REWARD_REPORT_NOTIFICATION_PARAM;
-import static org.exoplatform.wallet.utils.RewardUtils.REWARD_SUCCESS_NOTIFICATION_ID;
+import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_REPORT_NOTIFICATION_PARAM;
+import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_SUCCESS_NOTIFICATION_ID;
 
+import jakarta.annotation.PostConstruct;
 import org.exoplatform.commons.api.notification.NotificationContext;
 import org.exoplatform.commons.api.notification.model.PluginKey;
 import org.exoplatform.commons.api.persistence.ExoTransactional;
@@ -26,18 +27,32 @@
 import org.exoplatform.services.listener.Asynchronous;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
-import org.exoplatform.wallet.model.reward.RewardReport;
+import org.exoplatform.services.listener.ListenerService;
+import io.meeds.wallet.wallet.model.reward.RewardReport;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * A listener that is triggered when rewards has been successfully sent. This
  * will send notifications about final reward report.
  */
 @Asynchronous
+@Component
 public class RewardSucceedNotificationListener extends Listener<RewardReport, Object> {
 
+  private static final String EVENT_NAME = "exo.wallet.reward.report.success";
+
+  @Autowired
+  private ListenerService listenerService;
+
+  @PostConstruct
+  public void init() {
+    listenerService.addListener(EVENT_NAME, this);
+  }
+
   @Override
   @ExoTransactional
-  public void onEvent(Event<RewardReport, Object> event) throws Exception {
+  public void onEvent(Event<RewardReport, Object> event) {
     RewardReport rewardReport = event.getSource();
     NotificationContext ctx = NotificationContextImpl.cloneInstance();
     ctx.append(REWARD_REPORT_NOTIFICATION_PARAM, rewardReport);
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/listener/TransactionReplacedListener.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/TransactionReplacedListener.java
similarity index 55%
rename from wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/listener/TransactionReplacedListener.java
rename to wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/TransactionReplacedListener.java
index 8d2fb36a2..fb350fcc8 100644
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/listener/TransactionReplacedListener.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/TransactionReplacedListener.java
@@ -1,47 +1,54 @@
-package org.exoplatform.wallet.reward.listener;
+package io.meeds.wallet.reward.listener;
 
 import java.util.Map;
 
+import io.meeds.common.ContainerTransactional;
+import jakarta.annotation.PostConstruct;
 import org.exoplatform.container.ExoContainerContext;
 import org.exoplatform.container.PortalContainer;
 import org.exoplatform.container.component.RequestLifeCycle;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
+import org.exoplatform.services.listener.ListenerService;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.reward.service.WalletRewardReportService;
+import io.meeds.wallet.reward.service.WalletRewardReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * A listener that is triggered when a transaction gets replaced/boosted
  */
+@Component
 public class TransactionReplacedListener extends Listener<Object, Map<String, String>> {
-  private static final Log          LOG = ExoLogger.getLogger(TransactionReplacedListener.class);
 
+  private static final Log          LOG        = ExoLogger.getLogger(TransactionReplacedListener.class);
+
+  private static final String       EVENT_NAME = "exo.wallet.transaction.replaced";
+
+  @Autowired
   private WalletRewardReportService walletRewardReportService;
 
+  @Autowired
+  private ListenerService           listenerService;
+
+  @PostConstruct
+  public void init() {
+    listenerService.addListener(EVENT_NAME, this);
+  }
+
+  @ContainerTransactional
   @Override
-  public void onEvent(Event<Object, Map<String, String>> event) throws Exception {
+  public void onEvent(Event<Object, Map<String, String>> event) {
     String oldHash = null;
     String newHash = null;
-    PortalContainer container = PortalContainer.getInstance();
-    ExoContainerContext.setCurrentContainer(container);
-    RequestLifeCycle.begin(container);
     try {
       Map<String, String> transaction = event.getData();
       oldHash = transaction.get("oldHash");
       newHash = transaction.get("hash");
-      getWalletRewardReportService().replaceRewardTransactions(oldHash, newHash);
+      walletRewardReportService.replaceRewardTransactions(oldHash, newHash);
     } catch (Exception e) {
       LOG.error("Error while replacing Reward transaction from old hash {} to new hash {}", oldHash, newHash, e);
-    } finally {
-      RequestLifeCycle.end();
-    }
-  }
-
-  private WalletRewardReportService getWalletRewardReportService() {
-    if (walletRewardReportService == null) {
-      walletRewardReportService = ExoContainerContext.getService(WalletRewardReportService.class);
     }
-    return walletRewardReportService;
   }
 }
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessNotificationPlugin.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessNotificationPlugin.java
new file mode 100644
index 000000000..4e6befa41
--- /dev/null
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessNotificationPlugin.java
@@ -0,0 +1,86 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ * Copyright (C) 2020 Meeds Association
+ * contact@meeds.io
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package io.meeds.wallet.reward.notification;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+import org.exoplatform.commons.api.notification.NotificationContext;
+import org.exoplatform.commons.api.notification.model.NotificationInfo;
+import org.exoplatform.commons.api.notification.plugin.BaseNotificationPlugin;
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.reward.RewardPeriod;
+import io.meeds.wallet.wallet.model.reward.RewardReport;
+
+import static io.meeds.wallet.wallet.utils.RewardUtils.*;
+import static io.meeds.wallet.wallet.utils.WalletUtils.*;
+
+public class RewardSuccessNotificationPlugin extends BaseNotificationPlugin {
+    private static final Log LOG = ExoLogger.getLogger(RewardSuccessNotificationPlugin.class);
+
+    public RewardSuccessNotificationPlugin(InitParams initParams) {
+        super(initParams);
+    }
+
+    @Override
+    public String getId() {
+        return REWARD_SUCCESS_NOTIFICATION_ID;
+    }
+
+    @Override
+    public boolean isValid(NotificationContext ctx) {
+        return true;
+    }
+
+    @Override
+    protected NotificationInfo makeNotification(NotificationContext ctx) {
+        RewardReport rewardReport = ctx.value(REWARD_REPORT_NOTIFICATION_PARAM);
+
+        Set<String> recipients;
+        try {
+            recipients = getRewardAdministrators();
+        } catch (Exception e) {
+            LOG.error("Error making notification of reward report " + rewardReport, e);
+            return null;
+        }
+        if (recipients.isEmpty()) {
+            return null;
+        }
+
+        ContractDetail contractDetail = getContractDetail();
+        RewardPeriod period = rewardReport.getPeriod();
+
+        return NotificationInfo.instance()
+                .to(new ArrayList<>(recipients))
+                .with(TOKEN_NAME, contractDetail.getName())
+                .with(SYMBOL, contractDetail.getSymbol())
+                .with(REWARD_PERIOD_TYPE, period.getRewardPeriodType().name())
+                .with(REWARD_START_PERIOD_DATE, String.valueOf(period.getStartDateInSeconds()))
+                .with(REWARD_END_PERIOD_DATE, String.valueOf(period.getEndDateInSeconds()))
+                .with(REWARD_SUCCESS_COUNT, String.valueOf(rewardReport.getSuccessTransactionCount()))
+                .with(REWARD_FAIL_COUNT, String.valueOf(rewardReport.getFailedTransactionCount()))
+                .with(REWARD_PENDING_COUNT, String.valueOf(rewardReport.getPendingTransactionCount()))
+                .with(REWARD_TRANSACTION_COUNT, String.valueOf(rewardReport.getTransactionsCount()))
+                .with(REWARD_VALID_MEMBERS_COUNT, String.valueOf(rewardReport.getValidRewardCount()))
+                .with(AMOUNT, String.valueOf(rewardReport.getTokensSent()))
+                .key(getKey())
+                .end();
+    }
+}
\ No newline at end of file
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateBuilder.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateBuilder.java
similarity index 56%
rename from wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateBuilder.java
rename to wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateBuilder.java
index 4c8b03a7b..665f3333c 100644
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateBuilder.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateBuilder.java
@@ -14,17 +14,19 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.reward.notification;
+package io.meeds.wallet.reward.notification;
 
-import static org.exoplatform.wallet.utils.RewardUtils.*;
-import static org.exoplatform.wallet.utils.WalletUtils.AMOUNT;
-import static org.exoplatform.wallet.utils.WalletUtils.formatNumber;
+import static io.meeds.wallet.wallet.utils.RewardUtils.*;
+import static io.meeds.wallet.wallet.utils.WalletUtils.AMOUNT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.formatNumber;
 
 import java.io.Writer;
 import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.Locale;
 
+import io.meeds.common.ContainerTransactional;
+import io.meeds.wallet.reward.service.RewardSettingsService;
 import org.apache.commons.codec.binary.StringUtils;
 
 import org.exoplatform.commons.api.notification.NotificationContext;
@@ -33,18 +35,15 @@
 import org.exoplatform.commons.api.notification.service.template.TemplateContext;
 import org.exoplatform.commons.notification.template.TemplateUtils;
 import org.exoplatform.container.ExoContainer;
-import org.exoplatform.container.PortalContainer;
-import org.exoplatform.container.component.RequestLifeCycle;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.notification.plugin.SocialNotificationUtils;
-import org.exoplatform.wallet.model.reward.RewardSettings;
-import org.exoplatform.wallet.reward.service.RewardSettingsService;
+import io.meeds.wallet.wallet.model.reward.RewardSettings;
 import org.exoplatform.webui.utils.TimeConvertUtils;
 
 public class RewardSuccessTemplateBuilder extends AbstractTemplateBuilder {
 
-  private static final Log LOG = ExoLogger.getLogger(RewardSuccessTemplateBuilder.class);
+  private static final Log      LOG = ExoLogger.getLogger(RewardSuccessTemplateBuilder.class);
 
   private ChannelKey            channelKey;
 
@@ -54,14 +53,14 @@ public class RewardSuccessTemplateBuilder extends AbstractTemplateBuilder {
 
   private RewardSettingsService rewardSettingsService;
 
-  public RewardSuccessTemplateBuilder(PortalContainer container, RewardSettingsService rewardSettingsService, ChannelKey channelKey) {
-    this.container = container;
+  public RewardSuccessTemplateBuilder(RewardSettingsService rewardSettingsService, ChannelKey channelKey) {
     this.rewardSettingsService = rewardSettingsService;
     this.channelKey = channelKey;
     this.pushNotification = StringUtils.equals(channelKey.getId(), "PUSH_CHANNEL");
   }
 
   @Override
+  @ContainerTransactional
   protected MessageInfo makeMessage(NotificationContext ctx) {
     NotificationInfo notification = ctx.getNotificationInfo();
     String pluginId = notification.getKey().getId();
@@ -69,46 +68,37 @@ protected MessageInfo makeMessage(NotificationContext ctx) {
     String language = getLanguage(notification);
     TemplateContext templateContext = TemplateContext.newChannelInstance(channelKey, pluginId, language);
 
-    RequestLifeCycle.begin(container);
-    try {
-      RewardSettings rewardSettings = rewardSettingsService.getSettings();
-      ZoneId zoneId = rewardSettings.zoneId();
-
-      templateContext.putAll(notification.getOwnerParameter());
-      templateContext.put("NOTIFICATION_ID", notification.getId());
-      String amount = (String) templateContext.get(AMOUNT);
-      templateContext.put(AMOUNT, formatNumber(amount, language));
-
-      String rewardStartPeriodDate = (String) templateContext.get(REWARD_START_PERIOD_DATE);
-      templateContext.put(REWARD_START_PERIOD_DATE_FORMATTED, formatTime(rewardStartPeriodDate, zoneId, language));
-
-      String rewardEndPeriodDate = (String) templateContext.get(REWARD_END_PERIOD_DATE);
-      templateContext.put(REWARD_END_PERIOD_DATE_FORMATTED, formatTime(Long.parseLong(rewardEndPeriodDate) - 1, zoneId, language));
-
-      setLastModifiedDate(notification, language, templateContext);
-      SocialNotificationUtils.addFooterAndFirstName(notification.getTo(), templateContext);
-
-      String body = TemplateUtils.processGroovy(templateContext);
-      if (templateContext.getException() != null) {
-        throw new IllegalStateException("An error occurred while building message", templateContext.getException());
-      }
-      MessageInfo messageInfo = new MessageInfo();
-      messageInfo.to(notification.getTo());
-      messageInfo.from(notification.getFrom());
-      messageInfo.pluginId(pluginId);
-      if (this.pushNotification) {
-        messageInfo.subject("/");
-      } else {
-        messageInfo.subject(TemplateUtils.processSubject(templateContext));
-      }
-      return messageInfo.body(body).end();
-    } catch (Exception e) {
-      // Exception gets swallowed by upper services, thus log it here
-      LOG.warn("An error occurred while building notification message", e);
-      throw e;
-    } finally {
-      RequestLifeCycle.end();
+    RewardSettings rewardSettings = rewardSettingsService.getSettings();
+    ZoneId zoneId = rewardSettings.zoneId();
+
+    templateContext.putAll(notification.getOwnerParameter());
+    templateContext.put("NOTIFICATION_ID", notification.getId());
+    String amount = (String) templateContext.get(AMOUNT);
+    templateContext.put(AMOUNT, formatNumber(amount, language));
+
+    String rewardStartPeriodDate = (String) templateContext.get(REWARD_START_PERIOD_DATE);
+    templateContext.put(REWARD_START_PERIOD_DATE_FORMATTED, formatTime(rewardStartPeriodDate, zoneId, language));
+
+    String rewardEndPeriodDate = (String) templateContext.get(REWARD_END_PERIOD_DATE);
+    templateContext.put(REWARD_END_PERIOD_DATE_FORMATTED, formatTime(Long.parseLong(rewardEndPeriodDate) - 1, zoneId, language));
+
+    setLastModifiedDate(notification, language, templateContext);
+    SocialNotificationUtils.addFooterAndFirstName(notification.getTo(), templateContext);
+
+    String body = TemplateUtils.processGroovy(templateContext);
+    if (templateContext.getException() != null) {
+      throw new IllegalStateException("An error occurred while building message", templateContext.getException());
+    }
+    MessageInfo messageInfo = new MessageInfo();
+    messageInfo.to(notification.getTo());
+    messageInfo.from(notification.getFrom());
+    messageInfo.pluginId(pluginId);
+    if (this.pushNotification) {
+      messageInfo.subject("/");
+    } else {
+      messageInfo.subject(TemplateUtils.processSubject(templateContext));
     }
+    return messageInfo.body(body).end();
   }
 
   @Override
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateProvider.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateProvider.java
similarity index 74%
rename from wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateProvider.java
rename to wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateProvider.java
index d9077d229..b5243eb65 100644
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateProvider.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateProvider.java
@@ -14,21 +14,22 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.reward.notification;
+package io.meeds.wallet.reward.notification;
 
-import static org.exoplatform.wallet.utils.RewardUtils.REWARD_SUCCESS_NOTIFICATION_ID;
+import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_SUCCESS_NOTIFICATION_ID;
 
 import java.util.Collections;
 import java.util.Map;
 
+import io.meeds.wallet.reward.service.RewardSettingsService;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.codec.binary.StringUtils;
 
 import org.exoplatform.commons.api.notification.channel.template.TemplateProvider;
 import org.exoplatform.commons.api.notification.model.ChannelKey;
 import org.exoplatform.commons.api.notification.model.PluginKey;
-import org.exoplatform.container.PortalContainer;
 import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.wallet.reward.service.RewardSettingsService;
 
 public class RewardSuccessTemplateProvider extends TemplateProvider {
 
@@ -36,13 +37,17 @@ public class RewardSuccessTemplateProvider extends TemplateProvider {
 
   private RewardSuccessTemplateBuilder builder          = null;
 
+  @Setter
+  @Getter
   private String                       pushTemplatePath = null;
 
+  @Setter
+  @Getter
   private String                       mailTemplatePath = null;
 
-  public RewardSuccessTemplateProvider(PortalContainer container, RewardSettingsService rewardSettingsService, InitParams initParams) {
+  public RewardSuccessTemplateProvider(RewardSettingsService rewardSettingsService, InitParams initParams) {
     super(initParams);
-    builder = new RewardSuccessTemplateBuilder(container, rewardSettingsService, getChannelKey());
+    builder = new RewardSuccessTemplateBuilder(rewardSettingsService, getChannelKey());
 
     this.templateBuilders.put(PLUGIN_KEY, builder);
 
@@ -61,22 +66,6 @@ public Map<PluginKey, String> getTemplateFilePathConfigs() {
     return Collections.emptyMap();
   }
 
-  public String getPushTemplatePath() {
-    return pushTemplatePath;
-  }
-
-  public void setPushTemplatePath(String pushTemplatePath) {
-    this.pushTemplatePath = pushTemplatePath;
-  }
-
-  public String getMailTemplatePath() {
-    return mailTemplatePath;
-  }
-
-  public void setMailTemplatePath(String mailTemplatePath) {
-    this.mailTemplatePath = mailTemplatePath;
-  }
-
   public RewardSuccessTemplateBuilder getBuilder() {
     return builder;
   }
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/SchedulingConfig.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/SchedulingConfig.java
new file mode 100644
index 000000000..d838646f5
--- /dev/null
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/SchedulingConfig.java
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Lab contact@meedslab.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package io.meeds.wallet.reward.scheduling;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@Configuration
+@EnableScheduling
+public class SchedulingConfig {
+}
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/task/RewardStatusVerifierTask.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/task/RewardStatusVerifierTask.java
new file mode 100644
index 000000000..6cf099a19
--- /dev/null
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/task/RewardStatusVerifierTask.java
@@ -0,0 +1,82 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Lab contact@meedslab.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package io.meeds.wallet.reward.scheduling.task;
+
+import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_SUCCESS_EVENT_NAME;
+
+import java.util.List;
+
+import io.meeds.common.ContainerTransactional;
+import org.quartz.DisallowConcurrentExecution;
+
+import org.exoplatform.services.listener.ListenerService;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.reward.RewardPeriod;
+import io.meeds.wallet.wallet.model.reward.RewardReport;
+import io.meeds.wallet.reward.service.RewardReportService;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * This job is used to check pending rewards sent for periods. When all
+ * transaction rewards are sent correctly without error, an event is triggered
+ * through {@link ListenerService}
+ */
+@DisallowConcurrentExecution
+@Component
+public class RewardStatusVerifierTask {
+
+  @Autowired
+  private RewardReportService  rewardReportService;
+
+  @Autowired
+  private WalletAccountService walletAccountService;
+
+  @Autowired
+  private ListenerService      listenerService;
+
+  @ContainerTransactional
+  @Scheduled(cron = "${exo.wallet.RewardStatusVerifierJob.expression:0 * * * * ?}")
+  public void execute() {
+    Wallet adminWallet = walletAccountService.getAdminWallet();
+    if (!walletAccountService.isAdminAccountEnabled() || adminWallet == null || adminWallet.getEtherBalance() == null
+        || adminWallet.getEtherBalance() == 0 || adminWallet.getTokenBalance() == null || adminWallet.getTokenBalance() == 0) {
+      return;
+    }
+    List<RewardPeriod> rewardPeriodsInProgress = rewardReportService.getRewardPeriodsInProgress();
+    if (rewardPeriodsInProgress != null && !rewardPeriodsInProgress.isEmpty()) {
+      for (RewardPeriod rewardPeriod : rewardPeriodsInProgress) {
+        if (!rewardReportService.isRewardSendingInProgress()) {
+          // Avoid saving rewards while transaction status storage is in
+          // progress
+          RewardReport rewardReport = rewardReportService.computeRewards(rewardPeriod.getPeriodMedianDate());
+          if (rewardReport != null) {
+            if (rewardReport.isCompletelyProceeded()) {
+              listenerService.broadcast(REWARD_SUCCESS_EVENT_NAME, rewardReport, null);
+              rewardReportService.saveRewardReport(rewardReport);
+            } else if (rewardReport.getPendingTransactionCount() == 0 && rewardReport.getTokensSent() == 0) {
+              rewardReportService.saveRewardReport(rewardReport);
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardReportService.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
similarity index 64%
rename from wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardReportService.java
rename to wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
index 0f0cf1f92..c1ad85948 100644
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardReportService.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
@@ -1,33 +1,35 @@
 /*
  * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package org.exoplatform.wallet.reward.service;
-
-import static org.exoplatform.wallet.utils.RewardUtils.REWARD_TRANSACTION_LABEL_KEY;
-import static org.exoplatform.wallet.utils.RewardUtils.REWARD_TRANSACTION_NO_POOL_MESSAGE_KEY;
-import static org.exoplatform.wallet.utils.RewardUtils.TRANSACTION_STATUS_PENDING;
-import static org.exoplatform.wallet.utils.RewardUtils.TRANSACTION_STATUS_SUCCESS;
-import static org.exoplatform.wallet.utils.RewardUtils.formatTime;
-import static org.exoplatform.wallet.utils.WalletUtils.convertFromDecimals;
-import static org.exoplatform.wallet.utils.WalletUtils.formatNumber;
-import static org.exoplatform.wallet.utils.WalletUtils.getContractDetail;
-import static org.exoplatform.wallet.utils.WalletUtils.getIdentityByTypeAndId;
-import static org.exoplatform.wallet.utils.WalletUtils.getLocale;
-import static org.exoplatform.wallet.utils.WalletUtils.getResourceBundleKey;
-import static org.exoplatform.wallet.utils.WalletUtils.isUserRewardingAdmin;
+package io.meeds.wallet.reward.service;
+
+import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_TRANSACTION_LABEL_KEY;
+import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_TRANSACTION_NO_POOL_MESSAGE_KEY;
+import static io.meeds.wallet.wallet.utils.RewardUtils.TRANSACTION_STATUS_PENDING;
+import static io.meeds.wallet.wallet.utils.RewardUtils.TRANSACTION_STATUS_SUCCESS;
+import static io.meeds.wallet.wallet.utils.RewardUtils.formatTime;
+import static io.meeds.wallet.wallet.utils.WalletUtils.convertFromDecimals;
+import static io.meeds.wallet.wallet.utils.WalletUtils.formatNumber;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getContractDetail;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getIdentityByTypeAndId;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getLocale;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getResourceBundleKey;
+import static io.meeds.wallet.wallet.utils.WalletUtils.isUserRewardingAdmin;
 
 import java.math.BigInteger;
 import java.time.LocalDate;
@@ -36,6 +38,8 @@
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
+import io.meeds.gamification.constant.IdentityType;
+import io.meeds.gamification.model.filter.RealizationFilter;
 import io.meeds.gamification.service.RealizationService;
 import org.apache.commons.lang3.StringUtils;
 
@@ -43,25 +47,25 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.identity.model.Identity;
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.WalletType;
-import org.exoplatform.wallet.model.reward.RewardBudgetType;
-import org.exoplatform.wallet.model.reward.RewardPeriod;
-import org.exoplatform.wallet.model.reward.RewardPeriodType;
-import org.exoplatform.wallet.model.reward.RewardReport;
-import org.exoplatform.wallet.model.reward.RewardSettings;
-import org.exoplatform.wallet.model.reward.RewardStatus;
-import org.exoplatform.wallet.model.reward.RewardTeam;
-import org.exoplatform.wallet.model.reward.RewardTeamMember;
-import org.exoplatform.wallet.model.reward.WalletPluginReward;
-import org.exoplatform.wallet.model.reward.WalletReward;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.reward.storage.WalletRewardReportStorage;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.wallet.model.reward.RewardBudgetType;
+import io.meeds.wallet.wallet.model.reward.RewardPeriod;
+import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
+import io.meeds.wallet.wallet.model.reward.RewardReport;
+import io.meeds.wallet.wallet.model.reward.RewardSettings;
+import io.meeds.wallet.wallet.model.reward.RewardStatus;
+import io.meeds.wallet.wallet.model.reward.WalletReward;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.reward.storage.WalletRewardReportStorage;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletTokenAdminService;
 
 import lombok.Setter;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
@@ -69,26 +73,23 @@
 /**
  * A service to manage reward reports
  */
-@Service
 @Primary
+@Service
 public class WalletRewardReportService implements RewardReportService {
 
-  private static final Log                LOG            = ExoLogger.getLogger(WalletRewardReportService.class);
+  private static final Log          LOG            = ExoLogger.getLogger(WalletRewardReportService.class);
 
-  private static final String             EMPTY_SETTINGS = "Error computing rewards using empty settings";
+  private static final String       EMPTY_SETTINGS = "Error computing rewards using empty settings";
 
   @Autowired
   private WalletAccountService      walletAccountService;
 
   @Autowired
-  private WalletTokenAdminService         walletTokenAdminService;
+  private WalletTokenAdminService   walletTokenAdminService;
 
   @Autowired
   private RewardSettingsService     rewardSettingsService;
 
-  @Autowired
-  private RewardTeamService         rewardTeamService;
-
   @Autowired
   private WalletRewardReportStorage rewardReportStorage;
 
@@ -96,7 +97,7 @@ public class WalletRewardReportService implements RewardReportService {
   private RealizationService        realizationService;
 
   @Setter
-  private boolean                         rewardSendingInProgress;
+  private boolean                   rewardSendingInProgress;
 
   @Override
   public void sendRewards(LocalDate date, String username) throws Exception { // NOSONAR
@@ -128,16 +129,16 @@ public void sendRewards(LocalDate date, String username) throws Exception { // N
     Iterator<WalletReward> rewardedWalletsIterator = rewards.iterator();
     while (rewardedWalletsIterator.hasNext()) {
       WalletReward walletReward = rewardedWalletsIterator.next();
-      if (walletReward == null || !walletReward.isEnabled() || walletReward.getRewards() == null
-          || walletReward.getTokensToSend() == 0 || (walletReward.getTransaction() != null
+      if (walletReward == null || !walletReward.isEnabled() || walletReward.getAmount() == 0
+          || (walletReward.getTransaction() != null
               && (walletReward.getTransaction().isPending() || walletReward.getTransaction().isSucceeded()))) {
         rewardedWalletsIterator.remove();
         continue;
       }
 
-      if (walletReward.getTokensToSend() < 0) {
+      if (walletReward.getAmount() < 0) {
         throw new IllegalStateException("Can't send reward transaction for wallet of " + walletReward.getWallet().getType() + " "
-            + walletReward.getWallet().getId() + " with a negative amount" + walletReward.getTokensToSend());
+            + walletReward.getWallet().getId() + " with a negative amount" + walletReward.getAmount());
       }
       // If the tokens are already sent, then ignore sending rewards to user
       // If the sent transaction is pending, an exception is thrown ate the
@@ -168,8 +169,8 @@ public void sendRewards(LocalDate date, String username) throws Exception { // N
         TransactionDetail transactionDetail = new TransactionDetail();
         transactionDetail.setFrom(adminWalletAddress);
         transactionDetail.setTo(walletReward.getWallet().getAddress());
-        transactionDetail.setContractAmount(walletReward.getTokensToSend());
-        transactionDetail.setValue(walletReward.getTokensToSend());
+        transactionDetail.setContractAmount(walletReward.getAmount());
+        transactionDetail.setValue(walletReward.getAmount());
         String transactionLabel = getTransactionLabel(walletReward, contractDetail, rewardPeriod);
         transactionDetail.setLabel(transactionLabel);
         String transactionMessage = getTransactionMessage(walletReward, contractDetail, rewardPeriod);
@@ -198,15 +199,36 @@ public RewardReport computeRewards(LocalDate date) {
     if (date == null) {
       throw new IllegalArgumentException("date is mandatory");
     }
+    RewardPeriod rewardPeriod = getRewardPeriod(date);
+    Date start = new Date(rewardPeriod.getStartDateInSeconds() * 1000L);
+    Date end = new Date(rewardPeriod.getEndDateInSeconds() * 1000L);
 
-    RewardReport rewardReport = getRewardReport(date);
-    if (rewardReport == null) {
-      rewardReport = new RewardReport();
+    RealizationFilter realizationFilter = new RealizationFilter();
+    realizationFilter.setEarnerType(IdentityType.USER);
+    realizationFilter.setFromDate(start);
+    realizationFilter.setToDate(end);
+
+    int participationsCount = realizationService.countRealizationsByFilter(realizationFilter);
+
+    if (participationsCount == 0) {
+      RewardReport rewardReport = new RewardReport();
       rewardReport.setPeriod(getRewardPeriod(date));
+      rewardReport.setParticipationsCount(0);
+      return rewardReport;
     }
 
+    RewardReport rewardReport = getRewardReport(date);
+    if (rewardReport != null) {
+      rewardReport.setParticipationsCount(realizationService.countRealizationsByFilter(realizationFilter));
+      return rewardReport;
+    }
+    rewardReport = new RewardReport();
+    rewardReport.setPeriod(getRewardPeriod(date));
+    rewardReport.setParticipationsCount(realizationService.countRealizationsByFilter(realizationFilter));
+
+    List<Long> participants = realizationService.getParticipantsBetweenDates(start, end);
     // Only user wallets benefits from rewards
-    Set<Wallet> wallets = walletAccountService.listWallets()
+    Set<Wallet> wallets = walletAccountService.listWalletsByIdentityIds(participants)
                                               .stream()
                                               .filter(wallet -> WalletType.isUser(wallet.getType()))
                                               .collect(Collectors.toSet());
@@ -259,13 +281,13 @@ public void saveRewardReport(RewardReport rewardReport) {
   }
 
   @Override
-  public List<RewardPeriod> findRewardReportPeriods(int offset, int limit) {
-    return rewardReportStorage.findRewardReportPeriods(offset, limit);
+  public Page<RewardPeriod> findRewardReportPeriods(Pageable pageable) {
+    return rewardReportStorage.findRewardReportPeriods(pageable);
   }
 
   @Override
-  public List<RewardPeriod> findRewardPeriodsBetween(long from, long to, int offset, int limit) {
-    return rewardReportStorage.findRewardPeriodsBetween(from, to, offset, limit);
+  public Page<RewardPeriod> findRewardPeriodsBetween(long from, long to, Pageable pageable) {
+    return rewardReportStorage.findRewardPeriodsBetween(from, to, pageable);
   }
 
   @Override
@@ -316,24 +338,12 @@ private void computeRewardDetails(RewardReport rewardReport, Set<Wallet> wallets
     Set<WalletReward> walletRewards = retrieveWalletRewards(rewardReport, wallets);
     Set<WalletReward> enabledRewards = walletRewards.stream().filter(WalletReward::isEnabled).collect(Collectors.toSet());
 
-    // Compute rewards per plugin
-    Set<WalletPluginReward> walletRewardsByPlugin = new HashSet<>();
     RewardSettings rewardSettings = rewardSettingsService.getSettings();
 
     Set<Long> identityIds = walletRewards.stream().map(WalletReward::getIdentityId).collect(Collectors.toSet());
     Map<Long, Double> earnedPoints = getEarnedPoints(identityIds, period.getStartDateInSeconds(), period.getEndDateInSeconds());
 
-    computeReward(rewardSettings, earnedPoints, enabledRewards, walletRewardsByPlugin);
-
-    // Assign rewards objects for each wallet,a wallet can have multiple rewards
-    // one per plugin
-    for (WalletReward walletReward : walletRewards) {
-      Set<WalletPluginReward> rewardDetails =
-                                            walletRewardsByPlugin.stream()
-                                                                 .filter(rewardByPlugin -> rewardByPlugin.getIdentityId() == walletReward.getIdentityId())
-                                                                 .collect(Collectors.toSet());
-      walletReward.setRewards(rewardDetails);
-    }
+    computeReward(rewardSettings, earnedPoints, enabledRewards);
   }
 
   private Map<Long, Double> getEarnedPoints(Set<Long> identityIds, long startDateInSeconds, long endDateInSeconds) {
@@ -361,7 +371,6 @@ private Set<WalletReward> retrieveWalletRewards(RewardReport rewardReport, Set<W
       rewardReport.setRewards(walletRewards);
     }
 
-    boolean completelyProceeded = rewardReport.isCompletelyProceeded();
     for (Wallet wallet : wallets) {
       List<WalletReward> walletRewardList = walletRewards.stream()
                                                          .filter(wr -> wallet != null && wr.getWallet() != null
@@ -377,19 +386,11 @@ private Set<WalletReward> retrieveWalletRewards(RewardReport rewardReport, Set<W
         walletRewards.add(walletReward);
       }
       walletReward.setWallet(wallet);
-
-      if (!completelyProceeded) {
-        List<RewardTeam> rewardTeams = rewardTeamService.findTeamsByMemberId(walletReward.getIdentityId());
-        walletReward.setTeams(rewardTeams);
-      }
     }
     return walletRewards;
   }
 
-  private void computeReward(RewardSettings rewardSettings,
-                             Map<Long, Double> earnedPoints,
-                             Set<WalletReward> enabledRewards,
-                             Set<WalletPluginReward> rewardMemberDetails) {
+  private void computeReward(RewardSettings rewardSettings, Map<Long, Double> earnedPoints, Set<WalletReward> enabledRewards) {
     RewardBudgetType budgetType = rewardSettings.getBudgetType();
     if (budgetType == null) {
       LOG.warn("Budget type of reward is empty, thus no computing is possible");
@@ -400,34 +401,31 @@ private void computeReward(RewardSettings rewardSettings,
       throw new IllegalStateException("reward amount has a configured negative (" + configuredPluginAmount + ")");
     }
 
-    Set<Long> validIdentityIdsToUse = enabledRewards.stream().map(WalletReward::getIdentityId).collect(Collectors.toSet());
     // Filter non-eligible users switch threshold
-    filterEligibleMembers(earnedPoints.entrySet(), validIdentityIdsToUse, rewardSettings, rewardMemberDetails);
+    filterEligibleMembers(earnedPoints.entrySet(), enabledRewards, rewardSettings);
 
     double amountPerPoint;
     double totalFixedBudget;
     switch (budgetType) {
     case FIXED_PER_POINT:
       amountPerPoint = configuredPluginAmount;
-      addRewardsSwitchPointAmount(rewardMemberDetails, earnedPoints.entrySet(), amountPerPoint);
+      addRewardsSwitchPointAmount(enabledRewards, earnedPoints.entrySet(), amountPerPoint);
       break;
     case FIXED:
       totalFixedBudget = configuredPluginAmount;
-      addTeamMembersReward(earnedPoints, totalFixedBudget, rewardMemberDetails);
+      addTeamMembersReward(earnedPoints, totalFixedBudget, enabledRewards);
       break;
     case FIXED_PER_MEMBER:
       int totalEligibleMembersCount = earnedPoints.size();
       totalFixedBudget = configuredPluginAmount * totalEligibleMembersCount;
-      addTeamMembersReward(earnedPoints, totalFixedBudget, rewardMemberDetails);
+      addTeamMembersReward(earnedPoints, totalFixedBudget, enabledRewards);
       break;
     default:
       throw new IllegalStateException("Budget type is not recognized, budget type = " + budgetType);
     }
   }
 
-  private void addTeamMembersReward(Map<Long, Double> earnedPoints,
-                                    double totalFixedBudget,
-                                    Set<WalletPluginReward> rewardMemberDetails) {
+  private void addTeamMembersReward(Map<Long, Double> earnedPoints, double totalFixedBudget, Set<WalletReward> enabledRewards) {
     if (totalFixedBudget <= 0) {
       return;
     }
@@ -437,10 +435,10 @@ private void addTeamMembersReward(Map<Long, Double> earnedPoints,
       return;
     }
     amountPerPoint = totalFixedBudget / totalPoints;
-    addRewardsSwitchPointAmount(rewardMemberDetails, earnedPoints.entrySet(), amountPerPoint);
+    addRewardsSwitchPointAmount(enabledRewards, earnedPoints.entrySet(), amountPerPoint);
   }
 
-  private void addRewardsSwitchPointAmount(Set<WalletPluginReward> rewardMemberDetails,
+  private void addRewardsSwitchPointAmount(Set<WalletReward> enabledRewards,
                                            Set<Entry<Long, Double>> identitiesPointsEntries,
                                            double amountPerPoint) {
     for (Entry<Long, Double> identitiyPointsEntry : identitiesPointsEntries) {
@@ -448,18 +446,23 @@ private void addRewardsSwitchPointAmount(Set<WalletPluginReward> rewardMemberDet
       Double points = identitiyPointsEntry.getValue();
       double amount = points * amountPerPoint;
 
-      WalletPluginReward rewardMemberDetail = new WalletPluginReward();
-      rewardMemberDetail.setIdentityId(identityId);
-      rewardMemberDetail.setPoints(points);
-      rewardMemberDetail.setAmount(amount);
-      rewardMemberDetails.add(rewardMemberDetail);
+      WalletReward walletReward = enabledRewards.stream()
+                                                .filter(enabledReward -> enabledReward.getIdentityId() == identityId)
+                                                .findFirst()
+                                                .orElse(null);
+      if (walletReward != null) {
+        walletReward.setIdentityId(identityId);
+        walletReward.setPoints(points);
+        walletReward.setAmount(amount);
+      }
     }
   }
 
   private void filterEligibleMembers(Set<Entry<Long, Double>> identitiesPointsEntries,
-                                     Set<Long> validIdentityIdsToUse,
-                                     RewardSettings rewardSettings,
-                                     Set<WalletPluginReward> rewardMemberDetails) {
+                                     Set<WalletReward> enabledRewards,
+                                     RewardSettings rewardSettings) {
+
+    Set<Long> validIdentityIdsToUse = enabledRewards.stream().map(WalletReward::getIdentityId).collect(Collectors.toSet());
     double threshold = rewardSettings.getThreshold();
 
     Iterator<Entry<Long, Double>> identitiesPointsIterator = identitiesPointsEntries.iterator();
@@ -478,61 +481,17 @@ private void filterEligibleMembers(Set<Entry<Long, Double>> identitiesPointsEntr
         identitiesPointsIterator.remove();
 
         if (points > 0) {
-          // Add member with earned points for information on UI
-          WalletPluginReward rewardMemberDetail = new WalletPluginReward();
-          rewardMemberDetail.setIdentityId(identityId);
-          rewardMemberDetail.setPoints(points);
-          rewardMemberDetail.setAmount(0);
-          rewardMemberDetails.add(rewardMemberDetail);
-        }
-      }
-    }
-  }
-
-  private void buildNoPoolUsers(Map<Long, Double> earnedPoints, List<RewardTeam> teams, Set<Long> identityIds) {
-    // Build "No pool" users
-    ArrayList<Long> noPoolsIdentityIds = new ArrayList<>(earnedPoints.keySet());
-    noPoolsIdentityIds.removeAll(identityIds);
-    if (!noPoolsIdentityIds.isEmpty()) {
-      RewardTeam noPoolRewardTeam = new RewardTeam();
-      noPoolRewardTeam.setDisabled(false);
-      List<RewardTeamMember> noPoolRewardTeamList = noPoolsIdentityIds.stream().map(identityId -> {
-        RewardTeamMember rewardTeamMember = new RewardTeamMember();
-        rewardTeamMember.setIdentityId(identityId);
-        return rewardTeamMember;
-      }).toList();
-      noPoolRewardTeam.setMembers(noPoolRewardTeamList);
-      noPoolRewardTeam.setId(0L);
-      noPoolRewardTeam.setRewardType(RewardBudgetType.COMPUTED);
-      teams.add(noPoolRewardTeam);
-    }
-  }
-
-  private Set<Long> filterEligibleMembersAndTeams(List<RewardTeam> teams, Map<Long, Double> earnedPoints) {
-    Set<Long> identityIds = new HashSet<>();
-
-    // Search for duplicated users and retain only elligible members in
-    // Teams
-    Iterator<RewardTeam> teamsIterator = teams.iterator();
-    while (teamsIterator.hasNext()) {
-      RewardTeam rewardTeam = teamsIterator.next();
-      List<RewardTeamMember> members = rewardTeam.getMembers();
-      if (members == null || members.isEmpty()) {
-        teamsIterator.remove();
-      } else {
-        Iterator<RewardTeamMember> membersIterator = members.iterator();
-        while (membersIterator.hasNext()) {
-          RewardTeamMember member = membersIterator.next();
-          Long identityId = member.getIdentityId();
-          identityIds.add(identityId);
-          // Retain in Teams collection only elligible members
-          if (!earnedPoints.containsKey(identityId)) {
-            membersIterator.remove();
+          WalletReward walletReward = enabledRewards.stream()
+                                                    .filter(enabledReward -> enabledReward.getIdentityId() == identityId)
+                                                    .findFirst()
+                                                    .orElse(null);
+          if (walletReward != null) {
+            walletReward.setPoints(points);
+            walletReward.setAmount(0);
           }
         }
       }
     }
-    return identityIds;
   }
 
   private String getTransactionLabel(WalletReward walletReward, ContractDetail contractDetail, RewardPeriod periodOfTime) {
@@ -544,7 +503,7 @@ private String getTransactionLabel(WalletReward walletReward, ContractDetail con
     }
     RewardSettings rewardSettings = rewardSettingsService.getSettings();
     return label.replace("{0}", wallet.getName())
-                .replace("{1}", formatNumber(walletReward.getTokensToSend(), locale.getLanguage()))
+                .replace("{1}", formatNumber(walletReward.getAmount(), locale.getLanguage()))
                 .replace("{2}", contractDetail.getSymbol())
                 .replace("{3}", formatTime(periodOfTime.getStartDateInSeconds(), rewardSettings.zoneId(), locale.getLanguage()))
                 .replace("{4}",
@@ -553,51 +512,25 @@ private String getTransactionLabel(WalletReward walletReward, ContractDetail con
 
   private String getTransactionMessage(WalletReward walletReward, ContractDetail contractDetail, RewardPeriod periodOfTime) {
     StringBuilder transactionMessage = new StringBuilder();
-    Set<WalletPluginReward> walletRewardsByPlugin = walletReward.getRewards();
     Locale locale = getLocale(walletReward.getWallet());
     RewardSettings rewardSettings = rewardSettingsService.getSettings();
     ZoneId zoneId = rewardSettings.zoneId();
-
-    for (WalletPluginReward walletPluginReward : walletRewardsByPlugin) {// NOSONAR
-      String transactionMessagePart;
-      String label = getResourceBundleKey(locale, REWARD_TRANSACTION_NO_POOL_MESSAGE_KEY);
-      if (StringUtils.isBlank(label)) {
-        continue;
-      }
-      transactionMessagePart =
-                             label.replace("{0}", formatNumber(walletPluginReward.getAmount(), locale.getLanguage()))
-                                  .replace("{1}", contractDetail.getSymbol())
-                                  .replace("{2}", formatNumber(walletPluginReward.getPoints(), locale.getLanguage()))
-                                  .replace("{4}", formatTime(periodOfTime.getStartDateInSeconds(), zoneId, locale.getLanguage()))
-                                  .replace("{5}",
-                                           formatTime(periodOfTime.getEndDateInSeconds() - 1, zoneId, locale.getLanguage()));
-
-      transactionMessage.append(transactionMessagePart);
-      transactionMessage.append("\r\n");
-    }
-    return transactionMessage.toString();
-  }
-
-  private void addTeamRewardRepartition(RewardTeam rewardTeam,
-                                        double totalTeamBudget,
-                                        double totalTeamPoints,
-                                        Map<Long, Double> earnedPoints,
-                                        Set<WalletPluginReward> rewardMemberDetails) {
-    if (rewardTeam.getMembers() == null || rewardTeam.getMembers().isEmpty() || totalTeamBudget <= 0 || totalTeamPoints <= 0) {
-      return;
+    String transactionMessagePart;
+    String label = getResourceBundleKey(locale, REWARD_TRANSACTION_NO_POOL_MESSAGE_KEY);
+    if (StringUtils.isBlank(label)) {
+      return null;
     }
+    transactionMessagePart =
+                           label.replace("{0}", formatNumber(walletReward.getAmount(), locale.getLanguage()))
+                                .replace("{1}", contractDetail.getSymbol())
+                                .replace("{2}", formatNumber(walletReward.getPoints(), locale.getLanguage()))
+                                .replace("{4}", formatTime(periodOfTime.getStartDateInSeconds(), zoneId, locale.getLanguage()))
+                                .replace("{5}", formatTime(periodOfTime.getEndDateInSeconds() - 1, zoneId, locale.getLanguage()));
 
-    double amountPerPoint = totalTeamBudget / totalTeamPoints;
-    rewardTeam.getMembers().forEach(member -> {
-      Long identityId = member.getIdentityId();
-      Double points = earnedPoints.get(identityId);
+    transactionMessage.append(transactionMessagePart);
+    transactionMessage.append("\r\n");
 
-      WalletPluginReward rewardMemberDetail = new WalletPluginReward();
-      rewardMemberDetail.setIdentityId(identityId);
-      rewardMemberDetail.setPoints(points);
-      rewardMemberDetail.setAmount(points * amountPerPoint);
-      rewardMemberDetails.add(rewardMemberDetail);
-    });
+    return transactionMessage.toString();
   }
 
   /**
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardSettingsService.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardSettingsService.java
similarity index 73%
rename from wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardSettingsService.java
rename to wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardSettingsService.java
index f991e6e77..5b92b6b76 100644
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardSettingsService.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardSettingsService.java
@@ -1,30 +1,32 @@
 /*
  * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package org.exoplatform.wallet.reward.service;
+package io.meeds.wallet.reward.service;
 
-import static org.exoplatform.wallet.utils.RewardUtils.*;
-import static org.exoplatform.wallet.utils.WalletUtils.fromJsonString;
-import static org.exoplatform.wallet.utils.WalletUtils.toJsonString;
+import static io.meeds.wallet.wallet.utils.RewardUtils.*;
+import static io.meeds.wallet.wallet.utils.WalletUtils.fromJsonString;
+import static io.meeds.wallet.wallet.utils.WalletUtils.toJsonString;
 
 import java.util.*;
 
+import io.meeds.wallet.wallet.model.reward.RewardSettings;
 import org.exoplatform.commons.api.settings.SettingService;
 import org.exoplatform.commons.api.settings.SettingValue;
-import org.exoplatform.wallet.model.reward.*;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
@@ -37,10 +39,9 @@
 public class WalletRewardSettingsService implements RewardSettingsService {
 
   @Autowired
-  private SettingService            settingService;
-
-  private RewardSettings            configuredRewardSettings;
+  private SettingService settingService;
 
+  private RewardSettings configuredRewardSettings;
 
   @Override
   public RewardSettings getSettings() { // NOSONAR
@@ -49,8 +50,7 @@ public RewardSettings getSettings() { // NOSONAR
       return this.configuredRewardSettings.clone();
     }
 
-    SettingValue<?> settingsValue =
-                                  settingService.get(REWARD_CONTEXT, REWARD_SCOPE, REWARD_SETTINGS_KEY_NAME);
+    SettingValue<?> settingsValue = settingService.get(REWARD_CONTEXT, REWARD_SCOPE, REWARD_SETTINGS_KEY_NAME);
 
     String settingsValueString = settingsValue == null || settingsValue.getValue() == null ? null
                                                                                            : settingsValue.getValue().toString();
@@ -81,4 +81,12 @@ public void saveSettings(RewardSettings rewardSettingsToStore) {
     // Purge cached settings
     this.configuredRewardSettings = null;
   }
+
+  @Override
+  public void deleteSettings() {
+    settingService.remove(REWARD_CONTEXT, REWARD_SCOPE, REWARD_SETTINGS_KEY_NAME);
+
+    // Purge cached settings
+    this.configuredRewardSettings = null;
+  }
 }
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/storage/WalletRewardReportStorage.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/storage/WalletRewardReportStorage.java
similarity index 55%
rename from wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/storage/WalletRewardReportStorage.java
rename to wallet-reward-services/src/main/java/io/meeds/wallet/reward/storage/WalletRewardReportStorage.java
index fdd1e20e6..fc9ebacc6 100644
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/storage/WalletRewardReportStorage.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/storage/WalletRewardReportStorage.java
@@ -1,114 +1,100 @@
 /*
  * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package org.exoplatform.wallet.reward.storage;
+package io.meeds.wallet.reward.storage;
 
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.reward.RewardPeriod;
-import org.exoplatform.wallet.model.reward.RewardPeriodType;
-import org.exoplatform.wallet.model.reward.RewardReport;
-import org.exoplatform.wallet.model.reward.RewardStatus;
-import org.exoplatform.wallet.model.reward.RewardTeam;
-import org.exoplatform.wallet.model.reward.WalletPluginReward;
-import org.exoplatform.wallet.model.reward.WalletReward;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.reward.dao.RewardDAO;
-import org.exoplatform.wallet.reward.dao.RewardPeriodDAO;
-import org.exoplatform.wallet.reward.dao.RewardPluginDAO;
-import org.exoplatform.wallet.reward.dao.RewardTeamDAO;
-import org.exoplatform.wallet.reward.entity.RewardTeamEntity;
-import org.exoplatform.wallet.reward.entity.WalletRewardEntity;
-import org.exoplatform.wallet.reward.entity.WalletRewardPeriodEntity;
-import org.exoplatform.wallet.reward.entity.WalletRewardPluginEntity;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.service.WalletTransactionService;
-
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.reward.RewardPeriod;
+import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
+import io.meeds.wallet.wallet.model.reward.RewardReport;
+import io.meeds.wallet.wallet.model.reward.RewardStatus;
+import io.meeds.wallet.wallet.model.reward.WalletReward;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.reward.dao.RewardDAO;
+import io.meeds.wallet.reward.dao.RewardPeriodDAO;
+import io.meeds.wallet.reward.entity.WalletRewardEntity;
+import io.meeds.wallet.reward.entity.WalletRewardPeriodEntity;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+@Repository
 public class WalletRewardReportStorage {
 
   private static final Log         LOG = ExoLogger.getLogger(WalletRewardReportStorage.class);
 
-  private RewardPluginDAO          rewardPluginDAO;
-
+  @Autowired
   private RewardDAO                rewardDAO;
 
+  @Autowired
   private RewardPeriodDAO          rewardPeriodDAO;
 
-  private RewardTeamDAO            rewardTeamDAO;
-
-  private WalletRewardTeamStorage  rewardTeamStorage;
-
+  @Autowired
   private WalletAccountService     walletAccountService;
 
+  @Autowired
   private WalletTransactionService walletTransactionService;
 
-  public WalletRewardReportStorage(RewardPluginDAO rewardPluginDAO,
-                                   RewardDAO rewardDAO,
-                                   RewardPeriodDAO rewardPeriodDAO,
-                                   RewardTeamDAO rewardTeamDAO,
-                                   WalletRewardTeamStorage rewardTeamStorage,
-                                   WalletAccountService walletAccountService,
-                                   WalletTransactionService walletTransactionService) {
-    this.rewardPluginDAO = rewardPluginDAO;
-    this.rewardDAO = rewardDAO;
-    this.rewardPeriodDAO = rewardPeriodDAO;
-    this.rewardTeamDAO = rewardTeamDAO;
-    this.rewardTeamStorage = rewardTeamStorage;
-    this.walletAccountService = walletAccountService;
-    this.walletTransactionService = walletTransactionService;
-  }
-
-  public List<RewardPeriod> findRewardReportPeriods(int offset, int limit) {
-    List<WalletRewardPeriodEntity> rewardPeriodEntities = rewardPeriodDAO.findRewardPeriods(offset, limit);
-    return rewardPeriodEntities.stream().map(this::toDTO).toList();
+  public Page<RewardPeriod> findRewardReportPeriods(Pageable pageable) {
+    Page<WalletRewardPeriodEntity> rewardPeriodEntities = rewardPeriodDAO.findAll(pageable);
+    return rewardPeriodEntities.map(this::toDTO);
   }
 
-  public List<RewardPeriod> findRewardPeriodsBetween(long from, long to, int offset, int limit) {
-    List<WalletRewardPeriodEntity> rewardPeriodEntities = rewardPeriodDAO.findRewardPeriodsBetween(from, to, offset, limit);
-    return rewardPeriodEntities.stream().map(this::toDTO).toList();
+  public Page<RewardPeriod> findRewardPeriodsBetween(long from, long to, Pageable pageable) {
+    Page<WalletRewardPeriodEntity> rewardPeriodEntities = rewardPeriodDAO.findRewardPeriodsBetween(from, to, pageable);
+    return rewardPeriodEntities.map(this::toDTO);
   }
 
   public RewardReport getRewardReportByPeriodId(long id, ZoneId zoneId) {
-    return getRewardReport(rewardPeriodDAO.find(id), zoneId);
+    return getRewardReport(rewardPeriodDAO.findById(id).orElse(null), zoneId);
   }
 
   public RewardReport getRewardReport(RewardPeriodType periodType, LocalDate date, ZoneId zoneId) {
     RewardPeriod period = periodType.getPeriodOfTime(date, zoneId);
-    WalletRewardPeriodEntity rewardPeriodEntity = rewardPeriodDAO.findRewardPeriodByTypeAndTime(periodType,
-                                                                                                period.getPeriodMedianDateInSeconds());
+    WalletRewardPeriodEntity rewardPeriodEntity =
+                                                rewardPeriodDAO.findRewardPeriodByTypeAndTime(periodType,
+                                                                                              period.getPeriodMedianDateInSeconds());
     return getRewardReport(rewardPeriodEntity, zoneId);
   }
 
   public RewardPeriod getRewardPeriod(RewardPeriodType periodType, LocalDate date, ZoneId zoneId) {
     RewardPeriod period = periodType.getPeriodOfTime(date, zoneId);
-    WalletRewardPeriodEntity rewardPeriodEntity = rewardPeriodDAO.findRewardPeriodByTypeAndTime(periodType,
-                                                                                                period.getPeriodMedianDateInSeconds());
+    WalletRewardPeriodEntity rewardPeriodEntity =
+                                                rewardPeriodDAO.findRewardPeriodByTypeAndTime(periodType,
+                                                                                              period.getPeriodMedianDateInSeconds());
     return toDTO(rewardPeriodEntity);
   }
 
@@ -134,17 +120,9 @@ private RewardReport getRewardReport(WalletRewardPeriodEntity rewardPeriodEntity
         } else {
           WalletRewardEntity walletRewardEntity = walletRewardList.stream()
                                                                   .filter(r -> r.getTransactionHash() != null)
-                                                                  .sorted((r2, r1) -> {
-                                                                    if (r1.getTokensSent() > r2.getTokensSent()) {
-                                                                      return 1;
-                                                                    } else if (r2.getTokensSent() > r1.getTokensSent()) {
-                                                                      return -1;
-                                                                    } else {
-                                                                      return 0;
-                                                                    }
-                                                                  })
-                                                                  .findFirst()
-                                                                  .orElseGet(() -> walletRewardList.get(0));
+                                                                  .min((r2, r1) -> Double.compare(r1.getTokensSent(),
+                                                                                                  r2.getTokensSent()))
+                                                                  .orElseGet(walletRewardList::getFirst);
           if (walletRewardEntity.getId().longValue() == reward.getId().longValue()) {
             walletRewardEntities.add(reward);
           }
@@ -152,8 +130,8 @@ private RewardReport getRewardReport(WalletRewardPeriodEntity rewardPeriodEntity
       });
 
       Set<WalletReward> rewards = walletRewardEntities.stream()
-                                                       .map(rewardEntity -> toDTO(rewardEntity, zoneId))
-                                                       .collect(Collectors.toSet());
+                                                      .map(rewardEntity -> toDTO(rewardEntity, zoneId))
+                                                      .collect(Collectors.toSet());
       rewardReport.setRewards(rewards);
     }
     return rewardReport;
@@ -168,8 +146,9 @@ public void saveRewardReport(RewardReport rewardReport) { // NOSONAR
              period.getStartDateFormatted("en"),
              period.getEndDateFormatted("en"));
 
-    WalletRewardPeriodEntity rewardPeriodEntity = rewardPeriodDAO.findRewardPeriodByTypeAndTime(period.getRewardPeriodType(),
-                                                                                                period.getPeriodMedianDateInSeconds());
+    WalletRewardPeriodEntity rewardPeriodEntity =
+                                                rewardPeriodDAO.findRewardPeriodByTypeAndTime(period.getRewardPeriodType(),
+                                                                                              period.getPeriodMedianDateInSeconds());
     if (rewardPeriodEntity == null) {
       rewardPeriodEntity = new WalletRewardPeriodEntity();
     } else if (rewardPeriodEntity.getStatus() == RewardStatus.SUCCESS) {
@@ -201,12 +180,7 @@ public void saveRewardReport(RewardReport rewardReport) { // NOSONAR
     } else {
       rewardPeriodEntity.setStatus(RewardStatus.ESTIMATION);
     }
-
-    if (rewardPeriodEntity.getId() == null) {
-      rewardPeriodEntity = rewardPeriodDAO.create(rewardPeriodEntity);
-    } else {
-      rewardPeriodEntity = rewardPeriodDAO.update(rewardPeriodEntity);
-    }
+    rewardPeriodEntity = rewardPeriodDAO.save(rewardPeriodEntity);
 
     // No null check, it has been already checked by
     // rewardReport.countValidRewards()
@@ -216,12 +190,21 @@ public void saveRewardReport(RewardReport rewardReport) { // NOSONAR
         continue;
       }
       long identityId = walletReward.getIdentityId();
-      WalletRewardEntity rewardEntity = rewardDAO.findRewardByIdentityIdAndPeriodId(identityId, rewardPeriodEntity.getId());
+
+      WalletRewardEntity rewardEntity;
+      List<WalletRewardEntity> rewardEntities =
+                                              rewardDAO.findRewardByIdentityIdAndPeriodId(identityId, rewardPeriodEntity.getId());
+      if (CollectionUtils.isEmpty(rewardEntities)) {
+        rewardEntity = null;
+      } else {
+        rewardEntity = getFirstItem(rewardEntities);
+      }
       if (rewardEntity == null) {
         rewardEntity = new WalletRewardEntity();
       }
       rewardEntity.setTokensSent(walletReward.getTokensSent());
-      rewardEntity.setTokensToSend(walletReward.getTokensToSend());
+      rewardEntity.setTokensToSend(walletReward.getAmount());
+      rewardEntity.setPoints(walletReward.getPoints());
       rewardEntity.setEnabled(walletReward.isEnabled());
       rewardEntity.setIdentityId(identityId);
       rewardEntity.setPeriod(rewardPeriodEntity);
@@ -229,56 +212,23 @@ public void saveRewardReport(RewardReport rewardReport) { // NOSONAR
       TransactionDetail rewardTransaction = walletReward.getTransaction();
       rewardEntity.setTransactionHash(rewardTransaction == null ? null : rewardTransaction.getHash());
 
-      RewardTeam team = walletReward.getTeam();
-      if (team == null) {
-        rewardEntity.setTeam(null);
-      } else {
-        RewardTeamEntity teamEntity = rewardTeamDAO.find(team.getId());
-        rewardEntity.setTeam(teamEntity);
-      }
-
-      if (rewardEntity.getId() == null) {
-        rewardEntity = rewardDAO.create(rewardEntity);
-      } else {
-        rewardEntity = rewardDAO.update(rewardEntity);
-      }
-
-      Set<WalletPluginReward> rewardPlugins = walletReward.getRewards();
-      if (rewardPlugins == null || rewardPlugins.isEmpty()) {
-        continue;
-      }
-
-      for (WalletPluginReward rewardPlugin : rewardPlugins) {
-        WalletRewardPluginEntity rewardPluginEntity =
-                                                    rewardPluginDAO.getRewardPluginsByRewardId(rewardEntity.getId()).getFirst();
-        if (rewardPluginEntity == null) {
-          rewardPluginEntity = new WalletRewardPluginEntity();
-        }
-        rewardPluginEntity.setAmount(rewardPlugin.getAmount());
-        rewardPluginEntity.setPoints(rewardPlugin.getPoints());
-        rewardPluginEntity.setReward(rewardEntity);
-
-        if (rewardPluginEntity.getId() == null) {
-          rewardPluginDAO.create(rewardPluginEntity);
-        } else {
-          rewardPluginDAO.update(rewardPluginEntity);
-        }
-      }
+      rewardDAO.save(rewardEntity);
     }
   }
 
   public List<RewardPeriod> findRewardPeriodsByStatus(RewardStatus rewardStatus) {
-    List<WalletRewardPeriodEntity> rewardPeriodEntities = rewardPeriodDAO.findRewardPeriodsByStatus(rewardStatus);
+    List<WalletRewardPeriodEntity> rewardPeriodEntities = rewardPeriodDAO.findWalletRewardPeriodEntitiesByStatus(rewardStatus);
     return rewardPeriodEntities.stream().map(this::toDTO).collect(Collectors.toList());
   }
 
   public List<WalletReward> listRewards(long identityId, ZoneId zoneId, int limit) {
-    List<WalletRewardEntity> rewardEntities = rewardDAO.findRewardsByIdentityId(identityId, limit);
+    Pageable pageable = PageRequest.of(0, limit);
+    List<WalletRewardEntity> rewardEntities = rewardDAO.findWalletRewardEntitiesByIdentityId(identityId, pageable);
     List<WalletReward> walletRewards = rewardEntities.stream()
                                                      .map(rewardEntity -> toDTO(rewardEntity, zoneId))
                                                      .collect(Collectors.toList());
     if (!walletRewards.isEmpty()) {
-      WalletReward walletReward = walletRewards.get(0);
+      WalletReward walletReward = walletRewards.getFirst();
       Wallet wallet = walletReward.getWallet();
       walletAccountService.retrieveWalletBlockchainState(wallet);
       walletRewards.forEach(wr -> wr.setWallet(wallet));
@@ -287,7 +237,7 @@ public List<WalletReward> listRewards(long identityId, ZoneId zoneId, int limit)
   }
 
   public double countRewards(long identityId) {
-    double countRewardsByUser = rewardDAO.countRewardsByIdentityId(identityId);
+    double countRewardsByUser = rewardDAO.countWalletRewardEntitiesByIdentityId(identityId);
     return Double.isNaN(countRewardsByUser) ? 0 : countRewardsByUser;
   }
 
@@ -309,25 +259,12 @@ private RewardPeriod toDTO(WalletRewardPeriodEntity period) {
     return rewardPeriod;
   }
 
-  private void retrieveRewardPlugins(WalletRewardEntity rewardEntity, WalletReward walletReward) {
-    Set<WalletPluginReward> rewardPlugins = getRewardPluginsByRewardId(rewardEntity.getId());
-    walletReward.setRewards(rewardPlugins);
-  }
-
-  private Set<WalletPluginReward> getRewardPluginsByRewardId(Long rewardId) {
-    List<WalletRewardPluginEntity> rewardsPluginEntities = rewardPluginDAO.getRewardPluginsByRewardId(rewardId);
-    if (rewardsPluginEntities != null) {
-      return rewardsPluginEntities.stream().map(this::toDTO).collect(Collectors.toSet());
-    }
-    return Collections.emptySet();
-  }
-
   private WalletReward toDTO(WalletRewardEntity rewardEntity, ZoneId zoneId) {
     WalletReward walletReward = new WalletReward();
-    retrieveTeam(rewardEntity, walletReward);
+    walletReward.setAmount(rewardEntity.getTokensSent());
+    walletReward.setPoints(rewardEntity.getPoints());
     retrieveWallet(rewardEntity, walletReward);
     retrieveTransaction(rewardEntity, walletReward);
-    retrieveRewardPlugins(rewardEntity, walletReward);
     WalletRewardPeriodEntity periodEntity = rewardEntity.getPeriod();
     if (periodEntity != null && periodEntity.getPeriodType() != null) {
       RewardPeriodType rewardPeriodType = periodEntity.getPeriodType();
@@ -337,14 +274,6 @@ private WalletReward toDTO(WalletRewardEntity rewardEntity, ZoneId zoneId) {
     return walletReward;
   }
 
-  private WalletPluginReward toDTO(WalletRewardPluginEntity rewardPluginEntity) {
-    WalletPluginReward pluginReward = new WalletPluginReward();
-    pluginReward.setIdentityId(rewardPluginEntity.getReward().getIdentityId());
-    pluginReward.setPoints(rewardPluginEntity.getPoints());
-    pluginReward.setAmount(rewardPluginEntity.getAmount());
-    return pluginReward;
-  }
-
   private void retrieveTransaction(WalletRewardEntity rewardEntity, WalletReward walletReward) {
     String transactionHash = rewardEntity.getTransactionHash();
     if (StringUtils.isNotBlank(transactionHash)) {
@@ -353,17 +282,20 @@ private void retrieveTransaction(WalletRewardEntity rewardEntity, WalletReward w
     }
   }
 
-  private void retrieveTeam(WalletRewardEntity rewardEntity, WalletReward walletReward) {
-    if (rewardEntity.getTeam() != null) {
-      long teamId = rewardEntity.getTeam().getId();
-      RewardTeam team = rewardTeamStorage.getTeamById(teamId);
-      walletReward.setTeams(Collections.singletonList(team));
-    }
-  }
-
   private void retrieveWallet(WalletRewardEntity rewardEntity, WalletReward walletReward) {
     Wallet wallet = walletAccountService.getWalletByIdentityId(rewardEntity.getIdentityId());
     walletReward.setWallet(wallet);
   }
 
+  private static WalletRewardEntity getFirstItem(List<WalletRewardEntity> resultList) {
+    if (CollectionUtils.isEmpty(resultList)) {
+      return null;
+    } else {
+      return resultList.stream()
+                       .filter(r -> StringUtils.isNotBlank(r.getTransactionHash()))
+                       .min((r2, r1) -> Double.compare(r1.getTokensSent(), r2.getTokensSent()))
+                       .orElse(resultList.getFirst());
+    }
+  }
+
 }
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardDAO.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardDAO.java
deleted file mode 100644
index b1055b280..000000000
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardDAO.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.dao;
-
-import java.util.Collections;
-import java.util.List;
-
-import jakarta.persistence.Query;
-import jakarta.persistence.TypedQuery;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import org.exoplatform.commons.api.persistence.ExoTransactional;
-import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.reward.entity.WalletRewardEntity;
-
-public class RewardDAO extends GenericDAOJPAImpl<WalletRewardEntity, Long> {
-  private static final Log    LOG         = ExoLogger.getLogger(RewardDAO.class);
-
-  private static final String IDENTITY_ID = "identityId";
-
-  public List<WalletRewardEntity> findRewardsByPeriodId(long periodId) {
-    TypedQuery<WalletRewardEntity> query = getEntityManager().createNamedQuery("Reward.findRewardsByPeriodId",
-                                                                               WalletRewardEntity.class);
-    query.setParameter("periodId", periodId);
-    List<WalletRewardEntity> result = query.getResultList();
-    return toNotNullList(result);
-  }
-
-  public List<WalletRewardEntity> findRewardsByIdentityId(long identityId, int limit) {
-    TypedQuery<WalletRewardEntity> query = getEntityManager().createNamedQuery("Reward.findRewardsByIdentityId",
-                                                                               WalletRewardEntity.class);
-    query.setParameter(IDENTITY_ID, identityId);
-    if (limit > 0) {
-      query.setMaxResults(limit);
-    }
-    List<WalletRewardEntity> result = query.getResultList();
-    return toNotNullList(result);
-  }
-
-  public double countRewardsByIdentityId(long identityId) {
-    TypedQuery<Double> query = getEntityManager().createNamedQuery("Reward.countRewardsByIdentityId", Double.class);
-    query.setParameter(IDENTITY_ID, identityId);
-    Double result = query.getSingleResult();
-    return toNotNullDouble(result);
-  }
-
-  public WalletRewardEntity findRewardByIdentityIdAndPeriodId(long identityId, long periodId) {
-    TypedQuery<WalletRewardEntity> query = getEntityManager().createNamedQuery("Reward.findRewardByIdentityIdAndPeriodId",
-                                                                               WalletRewardEntity.class);
-    query.setParameter("periodId", periodId);
-    query.setParameter(IDENTITY_ID, identityId);
-    List<WalletRewardEntity> result = query.getResultList();
-    if (result == null || result.isEmpty()) {
-      return null;
-    } else if (result.size() > 1) {
-      LOG.warn("More than one reward was found for identityId {} and periodId {}", identityId, periodId);
-    }
-    return getFirstItem(result);
-  }
-
-  @ExoTransactional
-  public void replaceRewardTransactions(String oldHash, String newHash) {
-    Query query = getEntityManager().createNamedQuery("Reward.updateTransactionHash");
-    query.setParameter("oldHash", oldHash);
-    query.setParameter("newHash", newHash);
-    query.executeUpdate();
-  }
-
-  private List<WalletRewardEntity> toNotNullList(List<WalletRewardEntity> result) {
-    return result == null ? Collections.emptyList() : result;
-  }
-
-  private double toNotNullDouble(Double result) {
-    return result == null ? 0 : result;
-  }
-
-  private static WalletRewardEntity getFirstItem(List<WalletRewardEntity> resultList) {
-    if (CollectionUtils.isEmpty(resultList)) {
-      return null;
-    } else {
-      return resultList.stream().filter(r -> StringUtils.isNotBlank(r.getTransactionHash())).sorted((r2, r1) -> {
-        if (r1.getTokensSent() > r2.getTokensSent()) {
-          return 1;
-        } else if (r2.getTokensSent() > r1.getTokensSent()) {
-          return -1;
-        } else {
-          return 0;
-        }
-      }).findFirst().orElse(resultList.get(0));
-    }
-  }
-
-}
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardPeriodDAO.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardPeriodDAO.java
deleted file mode 100644
index f6018a0ae..000000000
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardPeriodDAO.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.dao;
-
-import java.util.Collections;
-import java.util.List;
-
-import jakarta.persistence.TypedQuery;
-
-import org.apache.commons.collections.CollectionUtils;
-
-import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
-import org.exoplatform.wallet.model.reward.RewardPeriodType;
-import org.exoplatform.wallet.model.reward.RewardStatus;
-import org.exoplatform.wallet.reward.entity.WalletRewardPeriodEntity;
-
-public class RewardPeriodDAO extends GenericDAOJPAImpl<WalletRewardPeriodEntity, Long> {
-
-  public List<WalletRewardPeriodEntity> findRewardPeriods(int offset, int limit) {
-    TypedQuery<WalletRewardPeriodEntity> query = getEntityManager().createNamedQuery("RewardPeriod.findRewardPeriods",
-                                                                                     WalletRewardPeriodEntity.class);
-    if (offset > 0) {
-      query.setFirstResult(offset);
-    }
-    if (limit > 0) {
-      query.setMaxResults(limit);
-    }
-    List<WalletRewardPeriodEntity> result = query.getResultList();
-    return CollectionUtils.isEmpty(result) ? Collections.emptyList() : result;
-  }
-
-  public List<WalletRewardPeriodEntity> findRewardPeriodsBetween(long from, long to, int offset, int limit) {
-    TypedQuery<WalletRewardPeriodEntity> query = getEntityManager().createNamedQuery("RewardPeriod.findRewardPeriodsBetween",
-                                                                                     WalletRewardPeriodEntity.class);
-    if (offset > 0) {
-      query.setFirstResult(offset);
-    }
-    if (limit > 0) {
-      query.setMaxResults(limit);
-    }
-    query.setParameter("from", from);
-    query.setParameter("to", to);
-    List<WalletRewardPeriodEntity> result = query.getResultList();
-    return CollectionUtils.isEmpty(result) ? Collections.emptyList() : result;
-  }
-
-  public WalletRewardPeriodEntity findRewardPeriodByTypeAndTime(RewardPeriodType periodType, long periodTime) {
-    TypedQuery<WalletRewardPeriodEntity> query = getEntityManager().createNamedQuery("RewardPeriod.findRewardPeriodByTypeAndTime",
-                                                                                     WalletRewardPeriodEntity.class);
-    query.setParameter("periodType", periodType);
-    query.setParameter("periodTime", periodTime);
-    List<WalletRewardPeriodEntity> resultList = query.getResultList();
-    return resultList == null || resultList.isEmpty() ? null : resultList.get(0);
-  }
-
-  public List<WalletRewardPeriodEntity> findRewardPeriodsByStatus(RewardStatus status) {
-    TypedQuery<WalletRewardPeriodEntity> query = getEntityManager().createNamedQuery("RewardPlugin.findRewardPeriodsByStatus",
-                                                                                     WalletRewardPeriodEntity.class);
-    query.setParameter("status", status);
-    List<WalletRewardPeriodEntity> resultList = query.getResultList();
-    return resultList == null ? Collections.emptyList() : resultList;
-  }
-
-}
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardPluginDAO.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardPluginDAO.java
deleted file mode 100644
index d2af57820..000000000
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardPluginDAO.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.dao;
-
-import java.util.List;
-
-import jakarta.persistence.TypedQuery;
-
-import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.reward.entity.WalletRewardPluginEntity;
-
-public class RewardPluginDAO extends GenericDAOJPAImpl<WalletRewardPluginEntity, Long> {
-  private static final Log LOG = ExoLogger.getLogger(RewardPluginDAO.class);
-
-  public List<WalletRewardPluginEntity> getRewardPluginsByRewardId(long rewardId) {
-    TypedQuery<WalletRewardPluginEntity> query = getEntityManager().createNamedQuery("RewardPlugin.getRewardPluginsByRewardId",
-                                                                                     WalletRewardPluginEntity.class);
-    query.setParameter("rewardId", rewardId);
-    return query.getResultList();
-  }
-
-  public WalletRewardPluginEntity getRewardPluginsByRewardIdAndPluginId(long rewardId, String pluginId) {
-    TypedQuery<WalletRewardPluginEntity> query =
-                                               getEntityManager().createNamedQuery("RewardPlugin.getRewardPluginsByRewardIdAndPluginId",
-                                                                                   WalletRewardPluginEntity.class);
-    query.setParameter("rewardId", rewardId);
-    query.setParameter("pluginId", pluginId);
-    List<WalletRewardPluginEntity> result = query.getResultList();
-    if (result == null || result.isEmpty()) {
-      return null;
-    } else if (result.size() > 1) {
-      LOG.warn("More than one reward plugin was found for rewardId {} and pluginId {}", rewardId, pluginId);
-    }
-    return result.get(0);
-  }
-
-}
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardTeamDAO.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardTeamDAO.java
deleted file mode 100644
index c4f35db36..000000000
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/dao/RewardTeamDAO.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.dao;
-
-import java.util.Collections;
-import java.util.List;
-
-import jakarta.persistence.TypedQuery;
-
-import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
-import org.exoplatform.wallet.reward.entity.RewardTeamEntity;
-
-public class RewardTeamDAO extends GenericDAOJPAImpl<RewardTeamEntity, Long> {
-
-  public List<RewardTeamEntity> findTeamsByMemberId(long identityId) {
-    TypedQuery<RewardTeamEntity> query = getEntityManager().createNamedQuery("RewardTeam.findTeamsByMemberId",
-                                                                             RewardTeamEntity.class);
-    query.setParameter("identityId", identityId);
-    List<RewardTeamEntity> result = query.getResultList();
-    return result == null ? Collections.emptyList() : result;
-  }
-
-  public List<RewardTeamEntity> findNotDeletedTeams() {
-    TypedQuery<RewardTeamEntity> query = getEntityManager().createNamedQuery("RewardTeam.findNoDeletedTeams",
-                                                                             RewardTeamEntity.class);
-    List<RewardTeamEntity> result = query.getResultList();
-    return result == null ? Collections.emptyList() : result;
-  }
-
-}
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/RewardTeamEntity.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/RewardTeamEntity.java
deleted file mode 100644
index c1d970a2d..000000000
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/RewardTeamEntity.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.entity;
-
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-import jakarta.persistence.*;
-
-import org.hibernate.annotations.DynamicUpdate;
-
-import org.exoplatform.wallet.model.reward.RewardBudgetType;
-
-@Entity(name = "RewardTeam")
-@DynamicUpdate
-@Table(name = "ADDONS_WALLET_GAM_TEAM")
-@NamedQueries({
-    @NamedQuery(name = "RewardTeam.findNoDeletedTeams", query = "SELECT rt FROM RewardTeam rt WHERE rt.deleted = FALSE ORDER BY rt.id DESC"),
-    @NamedQuery(name = "RewardTeam.findTeamsByMemberId", query = "SELECT rt FROM RewardTeam rt JOIN rt.members mem WHERE rt.deleted = FALSE AND mem.identityId = :identityId ORDER BY rt.id DESC"),
-})
-public class RewardTeamEntity implements Serializable {
-
-  private static final long           serialVersionUID = 4475704534821391132L;
-
-  @Id
-  @SequenceGenerator(name = "SEQ_WALLET_GAM_TEAM_ID", sequenceName = "SEQ_WALLET_GAM_TEAM_ID", allocationSize = 1)
-  @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEQ_WALLET_GAM_TEAM_ID")
-  @Column(name = "TEAM_ID")
-  private Long                        id;
-
-  @Column(name = "TEAM_NAME", unique = true, nullable = false)
-  private String                      name;
-
-  @Column(name = "TEAM_DESCRIPTION")
-  private String                      description;
-
-  @Column(name = "TEAM_REWARD_TYPE")
-  private RewardBudgetType            rewardType;
-
-  @Column(name = "TEAM_BUDGET")
-  private Double                      budget;
-
-  @Column(name = "TEAM_SPACE_ID")
-  private Long                        spaceId;
-
-  @Column(name = "TEAM_MANAGER_ID")
-  private Long                        manager;
-
-  @Column(name = "TEAM_DISABLED")
-  private Boolean                     disabled;
-
-  @Column(name = "TEAM_DELETED")
-  private Boolean                     deleted;
-
-  @OneToMany(mappedBy = "team", fetch = FetchType.EAGER, cascade = { CascadeType.ALL }, orphanRemoval = true)
-  private Set<RewardTeamMemberEntity> members          = new HashSet<>();
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public Double getBudget() {
-    return budget;
-  }
-
-  public void setBudget(Double budget) {
-    this.budget = budget;
-  }
-
-  public Long getSpaceId() {
-    return spaceId;
-  }
-
-  public void setSpaceId(Long spaceId) {
-    this.spaceId = spaceId;
-  }
-
-  public Long getManager() {
-    return manager;
-  }
-
-  public void setManager(Long manager) {
-    this.manager = manager;
-  }
-
-  public RewardBudgetType getRewardType() {
-    return rewardType;
-  }
-
-  public void setRewardType(RewardBudgetType rewardType) {
-    this.rewardType = rewardType;
-  }
-
-  public Boolean getDisabled() {
-    return disabled;
-  }
-
-  public void setDisabled(Boolean disabled) {
-    this.disabled = disabled;
-  }
-
-  public void setDeleted(Boolean deleted) {
-    this.deleted = deleted;
-  }
-
-  public Boolean getDeleted() {
-    return deleted;
-  }
-
-  public Set<RewardTeamMemberEntity> getMembers() {
-    return members;
-  }
-
-  public void setMembers(Set<RewardTeamMemberEntity> members) {
-    this.members = members;
-  }
-}
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/RewardTeamMemberEntity.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/RewardTeamMemberEntity.java
deleted file mode 100644
index a7e8d5b6b..000000000
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/RewardTeamMemberEntity.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.entity;
-
-import java.io.Serializable;
-
-import jakarta.persistence.*;
-
-@Entity(name = "RewardTeamMember")
-@Table(name = "ADDONS_WALLET_GAM_TEAM_MEMBER")
-public class RewardTeamMemberEntity implements Serializable {
-
-  private static final long serialVersionUID = 2213798785625662208L;
-
-  @Id
-  @SequenceGenerator(name = "SEQ_WALLET_GAM_TEAM_MEMBER_ID", sequenceName = "SEQ_WALLET_GAM_TEAM_MEMBER_ID", allocationSize = 1)
-  @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEQ_WALLET_GAM_TEAM_MEMBER_ID")
-  @Column(name = "MEMBER_ID")
-  private Long              id;
-
-  @Column(name = "MEMBER_IDENTITY_ID", nullable = false)
-  private Long              identityId;
-
-  @ManyToOne(fetch = FetchType.EAGER, optional = false)
-  @JoinColumn(name = "TEAM_ID", referencedColumnName = "TEAM_ID")
-  private RewardTeamEntity  team;
-
-  public long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public long getIdentityId() {
-    return identityId;
-  }
-
-  public void setIdentityId(Long identityId) {
-    this.identityId = identityId;
-  }
-
-  public RewardTeamEntity getTeam() {
-    return team;
-  }
-
-  public void setTeam(RewardTeamEntity team) {
-    this.team = team;
-  }
-}
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/WalletRewardEntity.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/WalletRewardEntity.java
deleted file mode 100644
index 0462e216a..000000000
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/WalletRewardEntity.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.entity;
-
-import java.io.Serializable;
-
-import jakarta.persistence.*;
-
-import org.hibernate.annotations.DynamicUpdate;
-
-@Entity(name = "Reward")
-@DynamicUpdate
-@Table(name = "ADDONS_WALLET_REWARD")
-@NamedQueries({
-    @NamedQuery(name = "Reward.findRewardsByPeriodId", query = "SELECT rw FROM Reward rw WHERE rw.period.id = :periodId"),
-    @NamedQuery(name = "Reward.findRewardsByIdentityId", query = "SELECT rw FROM Reward rw JOIN rw.period WHERE rw.identityId = :identityId ORDER BY rw.period.startTime DESC, rw.period.endTime ASC"),
-    @NamedQuery(name = "Reward.countRewardsByIdentityId", query = "SELECT SUM(rw.tokensSent) FROM Reward rw WHERE rw.identityId = :identityId"),
-    @NamedQuery(name = "Reward.findRewardByIdentityIdAndPeriodId", query = "SELECT rw FROM Reward rw WHERE rw.identityId = :identityId AND rw.period.id = :periodId"),
-    @NamedQuery(name = "Reward.updateTransactionHash", query = "UPDATE Reward rw SET rw.transactionHash = :newHash WHERE rw.transactionHash = :oldHash"),
-})
-public class WalletRewardEntity implements Serializable {
-
-  private static final long        serialVersionUID = 4475704534821391132L;
-
-  @Id
-  @SequenceGenerator(name = "SEQ_WALLET_REWARD_ID", sequenceName = "SEQ_WALLET_REWARD_ID", allocationSize = 1)
-  @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEQ_WALLET_REWARD_ID")
-  @Column(name = "REWARD_ID")
-  private Long                     id;
-
-  @Column(name = "IDENTITY_ID", nullable = false)
-  private long                     identityId;
-
-  @Column(name = "TRANSACTION_HASH")
-  private String                   transactionHash;
-
-  @Column(name = "ENABLED")
-  private boolean                  enabled;
-
-  @Column(name = "TOKENS_SENT")
-  private double                   tokensSent;
-
-  @Column(name = "TOKENS_TO_SEND")
-  private double                   tokensToSend;
-
-  @ManyToOne(fetch = FetchType.EAGER, optional = false)
-  @JoinColumn(name = "REWARD_PERIOD_ID", referencedColumnName = "REWARD_PERIOD_ID")
-  private WalletRewardPeriodEntity period;
-
-  @ManyToOne(fetch = FetchType.EAGER, optional = true)
-  @JoinColumn(name = "TEAM_ID", referencedColumnName = "TEAM_ID")
-  private RewardTeamEntity         team;
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public long getIdentityId() {
-    return identityId;
-  }
-
-  public void setIdentityId(long identityId) {
-    this.identityId = identityId;
-  }
-
-  public String getTransactionHash() {
-    return transactionHash;
-  }
-
-  public void setTransactionHash(String transactionHash) {
-    this.transactionHash = transactionHash;
-  }
-
-  public boolean isEnabled() {
-    return enabled;
-  }
-
-  public void setEnabled(boolean enabled) {
-    this.enabled = enabled;
-  }
-
-  public double getTokensSent() {
-    return tokensSent;
-  }
-
-  public void setTokensSent(double tokensSent) {
-    this.tokensSent = tokensSent;
-  }
-
-  public double getTokensToSend() {
-    return tokensToSend;
-  }
-
-  public void setTokensToSend(double tokensToSend) {
-    this.tokensToSend = tokensToSend;
-  }
-
-  public WalletRewardPeriodEntity getPeriod() {
-    return period;
-  }
-
-  public void setPeriod(WalletRewardPeriodEntity period) {
-    this.period = period;
-  }
-
-  public RewardTeamEntity getTeam() {
-    return team;
-  }
-
-  public void setTeam(RewardTeamEntity team) {
-    this.team = team;
-  }
-
-}
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/WalletRewardPluginEntity.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/WalletRewardPluginEntity.java
deleted file mode 100644
index 87ffb40ae..000000000
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/entity/WalletRewardPluginEntity.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.entity;
-
-import java.io.Serializable;
-
-import jakarta.persistence.*;
-
-import org.hibernate.annotations.DynamicUpdate;
-
-@Entity(name = "RewardPlugin")
-@DynamicUpdate
-@Table(name = "ADDONS_WALLET_REWARD_PLUGIN")
-@NamedQueries({
-    @NamedQuery(name = "RewardPlugin.getRewardPluginsByRewardId", query = "SELECT rp FROM RewardPlugin rp WHERE rp.reward.id = :rewardId"),
-})
-public class WalletRewardPluginEntity implements Serializable {
-
-  private static final long  serialVersionUID = 4475704534821391132L;
-
-  @Id
-  @SequenceGenerator(name = "SEQ_WALLET_REWARD_PLUGIN_ID", sequenceName = "SEQ_WALLET_REWARD_PLUGIN_ID", allocationSize = 1)
-  @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEQ_WALLET_REWARD_PLUGIN_ID")
-  @Column(name = "REWARD_PLUGIN_ID")
-  private Long               id;
-
-  @Column(name = "POINTS")
-  private double             points;
-
-  @Column(name = "AMOUNT")
-  private double             amount;
-
-  @ManyToOne(fetch = FetchType.EAGER, optional = false)
-  @JoinColumn(name = "REWARD_ID", referencedColumnName = "REWARD_ID")
-  private WalletRewardEntity reward;
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public double getPoints() {
-    return points;
-  }
-
-  public void setPoints(double points) {
-    this.points = points;
-  }
-
-  public double getAmount() {
-    return amount;
-  }
-
-  public void setAmount(double amount) {
-    this.amount = amount;
-  }
-
-  public WalletRewardEntity getReward() {
-    return reward;
-  }
-
-  public void setReward(WalletRewardEntity reward) {
-    this.reward = reward;
-  }
-
-}
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/job/RewardStatusVerifierJob.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/job/RewardStatusVerifierJob.java
deleted file mode 100644
index f37a28623..000000000
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/job/RewardStatusVerifierJob.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.job;
-
-import static org.exoplatform.wallet.utils.RewardUtils.REWARD_SUCCESS_EVENT_NAME;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.quartz.DisallowConcurrentExecution;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
-import org.exoplatform.commons.utils.CommonsUtils;
-import org.exoplatform.container.ExoContainer;
-import org.exoplatform.container.ExoContainerContext;
-import org.exoplatform.container.PortalContainer;
-import org.exoplatform.container.component.RequestLifeCycle;
-import org.exoplatform.services.listener.ListenerService;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.reward.RewardPeriod;
-import org.exoplatform.wallet.model.reward.RewardReport;
-import org.exoplatform.wallet.reward.service.RewardReportService;
-import org.exoplatform.wallet.service.WalletAccountService;
-
-/**
- * This job is used to check pending rewards sent for periods. When all
- * transaction rewards are sent correctly without error, an event is triggered
- * through {@link ListenerService}
- */
-@DisallowConcurrentExecution
-public class RewardStatusVerifierJob implements Job {
-
-  private static final Log     LOG = ExoLogger.getLogger(RewardStatusVerifierJob.class);
-
-  protected ExoContainer         container;
-
-  protected RewardReportService  rewardReportService;
-
-  protected WalletAccountService walletAccountService;
-
-  protected ListenerService      listenerService;
-
-  public RewardStatusVerifierJob() {
-    this.container = PortalContainer.getInstance();
-  }
-
-  @Override
-  public void execute(JobExecutionContext context) throws JobExecutionException { // NOSONAR
-    ExoContainer currentContainer = ExoContainerContext.getCurrentContainer();
-    ExoContainerContext.setCurrentContainer(container);
-    RequestLifeCycle.begin(this.container);
-    try {
-      Wallet adminWallet = getWalletAccountService().getAdminWallet();
-      if (!getWalletAccountService().isAdminAccountEnabled() || adminWallet == null || adminWallet.getEtherBalance() == null
-          || adminWallet.getEtherBalance() == 0 || adminWallet.getTokenBalance() == null || adminWallet.getTokenBalance() == 0) {
-        return;
-      }
-      List<RewardPeriod> rewardPeriodsInProgress = getRewardReportService().getRewardPeriodsInProgress();
-      if (rewardPeriodsInProgress != null && !rewardPeriodsInProgress.isEmpty()) {
-        Iterator<RewardPeriod> rewardPeriodsIterator = rewardPeriodsInProgress.iterator();
-        while (rewardPeriodsIterator.hasNext()) {
-          RewardPeriod rewardPeriod = rewardPeriodsIterator.next();
-          if (!getRewardReportService().isRewardSendingInProgress()) {
-            // Avoid saving rewards while transaction status storage is in
-            // progress
-            RewardReport rewardReport = getRewardReportService().computeRewards(rewardPeriod.getPeriodMedianDate());
-            if (rewardReport != null) {
-              if (rewardReport.isCompletelyProceeded()) {
-                getListenerService().broadcast(REWARD_SUCCESS_EVENT_NAME, rewardReport, null);
-                getRewardReportService().saveRewardReport(rewardReport);
-              } else if (rewardReport.getPendingTransactionCount() == 0 && rewardReport.getTokensSent() == 0) {
-                getRewardReportService().saveRewardReport(rewardReport);
-              }
-            }
-          }
-        }
-      }
-    } catch (Exception e) {
-      LOG.error("Error while checking pending rewards", e);
-    } finally {
-      RequestLifeCycle.end();
-      ExoContainerContext.setCurrentContainer(currentContainer);
-    }
-  }
-
-  private RewardReportService getRewardReportService() {
-    if (rewardReportService == null) {
-      rewardReportService = CommonsUtils.getService(RewardReportService.class);
-    }
-    return rewardReportService;
-  }
-
-  private WalletAccountService getWalletAccountService() {
-    if (walletAccountService == null) {
-      walletAccountService = CommonsUtils.getService(WalletAccountService.class);
-    }
-    return walletAccountService;
-  }
-
-  private ListenerService getListenerService() {
-    if (listenerService == null) {
-      listenerService = CommonsUtils.getService(ListenerService.class);
-    }
-    return listenerService;
-  }
-}
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPlugin.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPlugin.java
deleted file mode 100644
index 1bcafbc66..000000000
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPlugin.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.notification;
-
-import static org.exoplatform.wallet.utils.RewardUtils.*;
-import static org.exoplatform.wallet.utils.WalletUtils.*;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-import org.exoplatform.commons.api.notification.NotificationContext;
-import org.exoplatform.commons.api.notification.model.NotificationInfo;
-import org.exoplatform.commons.api.notification.plugin.BaseNotificationPlugin;
-import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.model.reward.RewardPeriod;
-import org.exoplatform.wallet.model.reward.RewardReport;
-import org.exoplatform.wallet.model.settings.GlobalSettings;
-import org.exoplatform.wallet.service.WalletService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class RewardSuccessNotificationPlugin extends BaseNotificationPlugin {
-
-  @Autowired
-  protected WalletService walletService;
-
-  private static final Log LOG = ExoLogger.getLogger(RewardSuccessNotificationPlugin.class);
-
-  public RewardSuccessNotificationPlugin(InitParams initParams) {
-    super(initParams);
-  }
-
-  @Override
-  public String getId() {
-    return REWARD_SUCCESS_NOTIFICATION_ID;
-  }
-
-  @Override
-  public boolean isValid(NotificationContext ctx) {
-    return true;
-  }
-
-  @Override
-  protected NotificationInfo makeNotification(NotificationContext ctx) {
-    RewardReport rewardReport = ctx.value(REWARD_REPORT_NOTIFICATION_PARAM);
-
-    Set<String> recipients;
-    try {
-      recipients = getRewardAdministrators();
-    } catch (Exception e) {
-      LOG.error("Error making notification of reward report " + rewardReport, e);
-      return null;
-    }
-    if (recipients.isEmpty()) {
-      return null;
-    }
-
-    GlobalSettings globalSettings = walletService.getSettings();
-    if (globalSettings == null || globalSettings.getContractDetail() == null) {
-      return null;
-    }
-    ContractDetail contractDetail = globalSettings.getContractDetail();
-    RewardPeriod period = rewardReport.getPeriod();
-
-    return NotificationInfo.instance()
-                           .to(new ArrayList<>(recipients))
-                           .with(TOKEN_NAME, contractDetail.getName())
-                           .with(SYMBOL, contractDetail.getSymbol())
-                           .with(REWARD_PERIOD_TYPE, period.getRewardPeriodType().name())
-                           .with(REWARD_START_PERIOD_DATE, String.valueOf(period.getStartDateInSeconds()))
-                           .with(REWARD_END_PERIOD_DATE, String.valueOf(period.getEndDateInSeconds()))
-                           .with(REWARD_SUCCESS_COUNT, String.valueOf(rewardReport.getSuccessTransactionCount()))
-                           .with(REWARD_FAIL_COUNT, String.valueOf(rewardReport.getFailedTransactionCount()))
-                           .with(REWARD_PENDING_COUNT, String.valueOf(rewardReport.getPendingTransactionCount()))
-                           .with(REWARD_TRANSACTION_COUNT, String.valueOf(rewardReport.getTransactionsCount()))
-                           .with(REWARD_VALID_MEMBERS_COUNT, String.valueOf(rewardReport.getValidRewardCount()))
-                           .with(AMOUNT, String.valueOf(rewardReport.getTokensSent()))
-                           .key(getKey())
-                           .end();
-  }
-}
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/plugin/GamificationRewardPlugin.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/plugin/GamificationRewardPlugin.java
deleted file mode 100644
index f69d9abfc..000000000
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/plugin/GamificationRewardPlugin.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.plugin;
-
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import org.exoplatform.container.ExoContainer;
-import org.exoplatform.container.PortalContainer;
-import org.exoplatform.container.configuration.ConfigurationManager;
-import org.exoplatform.container.xml.Component;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.reward.api.RewardPlugin;
-import org.exoplatform.wallet.utils.RewardUtils;
-
-public class GamificationRewardPlugin extends RewardPlugin {
-
-  private static final Log     LOG                          = ExoLogger.getLogger(GamificationRewardPlugin.class);
-
-  private static final String  GAMIFICATION_SERVICE_FQN     = "io.meeds.gamification.service.RealizationService";
-
-  private static final String  FIND_USER_POINTS_METHOD_NAME = "getScoresByIdentityIdsAndBetweenDates";
-
-  private ConfigurationManager configurationManager;
-
-  private ExoContainer         container;
-
-  private Object               serviceInstance;
-
-  private Method               retrievePointsMethod;
-
-  private boolean              enabled;
-
-  public GamificationRewardPlugin(PortalContainer container, ConfigurationManager configurationManager) {
-    this.container = container;
-    this.configurationManager = configurationManager;
-
-    Component component = this.configurationManager.getComponent(GAMIFICATION_SERVICE_FQN);
-    enabled = component != null;
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return enabled;
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public Map<Long, Double> getEarnedPoints(Set<Long> identityIds, long startDateInSeconds, long endDateInSeconds) {
-    HashMap<Long, Double> earnedPoints = new HashMap<>();
-    if (identityIds == null || identityIds.isEmpty()) {
-      return earnedPoints;
-    }
-    Date startDate = new Date(startDateInSeconds * 1000);
-    Date endDate = new Date(endDateInSeconds * 1000);
-    Method method = getMethod();
-    if (method == null) {
-      throw new IllegalStateException("Can't find gamification service method to retrieve user points");
-    }
-    Map<Long, Long> points = new HashMap<>();
-    try {
-      points = (Map<Long, Long>) method.invoke(getService(),
-                                               identityIds.stream().map(Object::toString).toList(),
-                                               startDate,
-                                               endDate);
-    } catch (Exception e) {
-      LOG.warn("Error getting gamification points for user with ids {}", identityIds, e);
-    }
-    return points.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().doubleValue()));
-  }
-
-  private Method getMethod() {
-    if (this.retrievePointsMethod != null) {
-      return retrievePointsMethod;
-    }
-    retrievePointsMethod = RewardUtils.getMethod(container, GAMIFICATION_SERVICE_FQN, FIND_USER_POINTS_METHOD_NAME);
-    return retrievePointsMethod;
-  }
-
-  private Object getService() {
-    if (this.serviceInstance != null) {
-      return serviceInstance;
-    }
-    serviceInstance = RewardUtils.getService(container, GAMIFICATION_SERVICE_FQN);
-    return serviceInstance;
-  }
-
-}
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/plugin/KudosRewardPlugin.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/plugin/KudosRewardPlugin.java
deleted file mode 100644
index 56c131238..000000000
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/plugin/KudosRewardPlugin.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.plugin;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.exoplatform.container.ExoContainer;
-import org.exoplatform.container.configuration.ConfigurationManager;
-import org.exoplatform.container.xml.Component;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.reward.api.RewardPlugin;
-import org.exoplatform.wallet.utils.RewardUtils;
-
-public class KudosRewardPlugin extends RewardPlugin {
-
-  private static final Log     LOG                           = ExoLogger.getLogger(KudosRewardPlugin.class);
-
-  private static final String  KUDOS_SERVICE_FQN             = "io.meeds.kudos.service.KudosService";
-
-  private static final String  COUNT_USERS_KUDOS_METHOD_NAME = "countKudosByPeriodAndReceivers";
-
-  private ConfigurationManager configurationManager;
-
-  private ExoContainer         container;
-
-  private Object               serviceInstance;
-
-  private Method               retrievePointsMethod;
-
-  private boolean              enabled;
-
-  public KudosRewardPlugin(ExoContainer container, ConfigurationManager configurationManager) {
-    this.container = container;
-    this.configurationManager = configurationManager;
-
-    Component component = this.configurationManager.getComponent(KUDOS_SERVICE_FQN);
-    enabled = component != null;
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return enabled;
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public Map<Long, Double> getEarnedPoints(Set<Long> identityIds, long startDateInSeconds, long endDateInSeconds) {
-    HashMap<Long, Double> earnedPoints = new HashMap<>();
-    if (identityIds == null || identityIds.isEmpty()) {
-      return earnedPoints;
-    }
-    Method method = getMethod();
-    if (method == null) {
-      throw new IllegalStateException("Can't find kudos service method to retrieve user points");
-    }
-    Map<Long, Long> points = new HashMap<>();
-    try {
-      points = (Map<Long, Long>) method.invoke(getService(),
-                                               identityIds.stream().toList(),
-                                               startDateInSeconds,
-                                               endDateInSeconds);
-    } catch (Exception e) {
-      LOG.warn("Error getting kudos count for users with ids {}", identityIds, e);
-    }
-    return points.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().doubleValue()));
-
-  }
-
-  private Method getMethod() {
-    if (this.retrievePointsMethod != null) {
-      return retrievePointsMethod;
-    }
-    retrievePointsMethod = RewardUtils.getMethod(container, KUDOS_SERVICE_FQN, COUNT_USERS_KUDOS_METHOD_NAME);
-    return retrievePointsMethod;
-  }
-
-  private Object getService() {
-    if (this.serviceInstance != null) {
-      return serviceInstance;
-    }
-    serviceInstance = RewardUtils.getService(container, KUDOS_SERVICE_FQN);
-    return serviceInstance;
-  }
-
-}
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardTeamService.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardTeamService.java
deleted file mode 100644
index 458564c5f..000000000
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/service/WalletRewardTeamService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.service;
-
-import java.util.List;
-
-import org.exoplatform.wallet.model.reward.RewardTeam;
-import org.exoplatform.wallet.reward.storage.WalletRewardTeamStorage;
-
-/**
- * A service to manage reward teams
- */
-public class WalletRewardTeamService implements RewardTeamService {
-
-  private WalletRewardTeamStorage rewardTeamStorage;
-
-  public WalletRewardTeamService(WalletRewardTeamStorage rewardTeamStorage) {
-    this.rewardTeamStorage = rewardTeamStorage;
-  }
-
-  @Override
-  public List<RewardTeam> getTeams() {
-    return this.rewardTeamStorage.getTeams();
-  }
-
-  @Override
-  public RewardTeam saveTeam(RewardTeam rewardTeam) {
-    if (rewardTeam == null) {
-      throw new IllegalArgumentException("Empty team to save");
-    }
-    return this.rewardTeamStorage.saveTeam(rewardTeam);
-  }
-
-  @Override
-  public RewardTeam removeTeam(Long id) {
-    if (id == null || id == 0) {
-      throw new IllegalArgumentException("Team id is required");
-    }
-    return this.rewardTeamStorage.removeTeam(id);
-  }
-
-  @Override
-  public List<RewardTeam> findTeamsByMemberId(long identityId) {
-    if (identityId == 0) {
-      throw new IllegalArgumentException("User identity id is required");
-    }
-    return this.rewardTeamStorage.findTeamsByMemberId(identityId);
-  }
-
-  public RewardTeam getTeamsById(long teamId) {
-    if (teamId == 0) {
-      throw new IllegalArgumentException("Team id is required");
-    }
-    return this.rewardTeamStorage.getTeamsById(teamId);
-  }
-
-}
diff --git a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/storage/WalletRewardTeamStorage.java b/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/storage/WalletRewardTeamStorage.java
deleted file mode 100644
index f9c1b859c..000000000
--- a/wallet-reward-services/src/main/java/org/exoplatform/wallet/reward/storage/WalletRewardTeamStorage.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.storage;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.exoplatform.commons.utils.CommonsUtils;
-import org.exoplatform.social.core.identity.model.Identity;
-import org.exoplatform.social.core.manager.IdentityManager;
-import org.exoplatform.social.core.space.model.Space;
-import org.exoplatform.social.core.space.spi.SpaceService;
-import org.exoplatform.wallet.model.reward.RewardTeam;
-import org.exoplatform.wallet.model.reward.RewardTeamMember;
-import org.exoplatform.wallet.reward.dao.RewardTeamDAO;
-import org.exoplatform.wallet.reward.entity.RewardTeamEntity;
-import org.exoplatform.wallet.reward.entity.RewardTeamMemberEntity;
-
-/**
- * A storage service to save/load reward teams
- */
-public class WalletRewardTeamStorage {
-
-  private RewardTeamDAO rewardTeamDAO;
-
-  public WalletRewardTeamStorage(RewardTeamDAO rewardTeamDAO) {
-    this.rewardTeamDAO = rewardTeamDAO;
-  }
-
-  public List<RewardTeam> getTeams() {
-    List<RewardTeamEntity> teamEntities = rewardTeamDAO.findNotDeletedTeams();
-    return teamEntities.stream().map(WalletRewardTeamStorage::toDTO).collect(Collectors.toList());
-  }
-
-  public RewardTeam saveTeam(RewardTeam rewardTeam) {
-    if (rewardTeam == null) {
-      throw new IllegalArgumentException("Empty team to save");
-    }
-    RewardTeamEntity teamEntity = fromDTO(rewardTeam);
-    if (teamEntity.getId() == null || teamEntity.getId() == 0) {
-      teamEntity = rewardTeamDAO.create(teamEntity);
-    } else {
-      teamEntity = rewardTeamDAO.update(teamEntity);
-    }
-    return toDTO(rewardTeamDAO.find(teamEntity.getId()));
-  }
-
-  public RewardTeam removeTeam(Long teamId) {
-    if (teamId == null || teamId == 0) {
-      throw new IllegalArgumentException("Team id is required");
-    }
-    RewardTeamEntity entity = rewardTeamDAO.find(teamId);
-    if (entity != null) {
-      entity.setDeleted(true);
-      rewardTeamDAO.update(entity);
-    }
-    return toDTO(entity);
-  }
-
-  public RewardTeam getTeamById(long teamId) {
-    if (teamId == 0) {
-      throw new IllegalArgumentException("Team id is required");
-    }
-    RewardTeamEntity entity = rewardTeamDAO.find(teamId);
-    return toDTO(entity);
-  }
-
-  public List<RewardTeam> findTeamsByMemberId(long identityId) {
-    List<RewardTeamEntity> entities = rewardTeamDAO.findTeamsByMemberId(identityId);
-    return entities.stream().map(WalletRewardTeamStorage::toDTO).collect(Collectors.toList());
-  }
-
-  public RewardTeam getTeamsById(long teamId) {
-    RewardTeamEntity teamEntity = rewardTeamDAO.find(teamId);
-    return toDTO(teamEntity);
-  }
-
-  private static RewardTeamEntity fromDTO(RewardTeam rewardTeam) {
-    if (rewardTeam == null) {
-      return null;
-    }
-    RewardTeamEntity teamEntity = new RewardTeamEntity();
-    teamEntity.setId(rewardTeam.getId() == null || rewardTeam.getId() == 0 ? null : rewardTeam.getId());
-    teamEntity.setName(rewardTeam.getName());
-    teamEntity.setDescription(rewardTeam.getDescription());
-    teamEntity.setBudget(rewardTeam.getBudget());
-    teamEntity.setRewardType(rewardTeam.getRewardType());
-    teamEntity.setDisabled(rewardTeam.isDisabled());
-    teamEntity.setDeleted(rewardTeam.isDeleted());
-    if (rewardTeam.getManager() != null && rewardTeam.getManager().getIdentityId() != 0) {
-      teamEntity.setManager(rewardTeam.getManager().getIdentityId());
-    }
-    if (rewardTeam.getSpaceId() != null && rewardTeam.getSpaceId() != 0) {
-      teamEntity.setSpaceId(rewardTeam.getSpaceId());
-    }
-    if (rewardTeam.getMembers() != null && !rewardTeam.getMembers().isEmpty()) {
-      teamEntity.setMembers(rewardTeam.getMembers()
-                                      .stream()
-                                      .map(rewardTeamMember -> getRewardTeamMemberEntity(teamEntity,
-                                                                                         rewardTeamMember))
-                                      .collect(Collectors.toSet()));
-    }
-    return teamEntity;
-  }
-
-  private static RewardTeam toDTO(RewardTeamEntity teamEntity) {
-    if (teamEntity == null) {
-      return null;
-    }
-    RewardTeam rewardTeam = new RewardTeam();
-    rewardTeam.setId(teamEntity.getId());
-    rewardTeam.setName(teamEntity.getName());
-    rewardTeam.setDescription(teamEntity.getDescription());
-    rewardTeam.setBudget(teamEntity.getBudget());
-    rewardTeam.setManager(getRewardTeamMember(teamEntity.getManager()));
-    rewardTeam.setRewardType(teamEntity.getRewardType());
-    rewardTeam.setDisabled(teamEntity.getDisabled());
-    rewardTeam.setDeleted(teamEntity.getDeleted());
-    if (teamEntity.getSpaceId() != null && teamEntity.getSpaceId() != 0) {
-      SpaceService spaceService = CommonsUtils.getService(SpaceService.class);
-      Space space = spaceService.getSpaceById(String.valueOf(teamEntity.getSpaceId()));
-      if (space != null) {
-        rewardTeam.setSpaceId(teamEntity.getSpaceId());
-        rewardTeam.setSpacePrettyName(space.getPrettyName());
-      }
-    }
-    if (teamEntity.getMembers() != null && !teamEntity.getMembers().isEmpty()) {
-      List<RewardTeamMember> list = teamEntity.getMembers()
-                                              .stream()
-                                              .map(WalletRewardTeamStorage::getRewardTeamMember)
-                                              .collect(Collectors.toList());
-      rewardTeam.setMembers(new ArrayList<>(list));
-    }
-    return rewardTeam;
-  }
-
-  private static RewardTeamMemberEntity getRewardTeamMemberEntity(RewardTeamEntity teamEntity,
-                                                                  RewardTeamMember rewardTeamMember) {
-    if (rewardTeamMember == null) {
-      return null;
-    }
-    RewardTeamMemberEntity teamMemberEntity = new RewardTeamMemberEntity();
-    teamMemberEntity.setId(rewardTeamMember.getTechnicalId() == null
-        || rewardTeamMember.getTechnicalId() == 0 ? null : rewardTeamMember.getTechnicalId());
-    teamMemberEntity.setIdentityId(rewardTeamMember.getIdentityId());
-    teamMemberEntity.setTeam(teamEntity);
-    return teamMemberEntity;
-  }
-
-  private static RewardTeamMember getRewardTeamMember(RewardTeamMemberEntity teamMemberEntity) {
-    if (teamMemberEntity == null) {
-      return null;
-    }
-    RewardTeamMember rewardTeamMember = getRewardTeamMember(teamMemberEntity.getIdentityId());
-    if (rewardTeamMember == null) {
-      return null;
-    }
-    rewardTeamMember.setTechnicalId(teamMemberEntity.getId());
-    return rewardTeamMember;
-  }
-
-  private static RewardTeamMember getRewardTeamMember(Long identityId) {
-    if (identityId == null || identityId == 0) {
-      return null;
-    }
-    IdentityManager identityManager = CommonsUtils.getService(IdentityManager.class);
-    Identity identity = identityManager.getIdentity(String.valueOf(identityId));
-    if (identity == null) {
-      return null;
-    }
-    RewardTeamMember rewardTeamMember = new RewardTeamMember();
-    rewardTeamMember.setId(identity.getRemoteId());
-    rewardTeamMember.setProviderId(identity.getProviderId());
-    rewardTeamMember.setIdentityId(Long.parseLong(identity.getId()));
-    return rewardTeamMember;
-  }
-
-}
diff --git a/wallet-reward-services/src/main/resources/conf/portal/wallet-reward-configuration.xml b/wallet-reward-services/src/main/resources/conf/portal/wallet-reward-configuration.xml
index f720ae118..f8489d1a9 100644
--- a/wallet-reward-services/src/main/resources/conf/portal/wallet-reward-configuration.xml
+++ b/wallet-reward-services/src/main/resources/conf/portal/wallet-reward-configuration.xml
@@ -18,61 +18,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 -->
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
 
-  <component>
-    <type>org.exoplatform.wallet.reward.dao.RewardTeamDAO</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.dao.RewardPluginDAO</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.dao.RewardDAO</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.dao.RewardPeriodDAO</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.dao.RewardTeamDAO</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.storage.WalletRewardTeamStorage</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.storage.WalletRewardReportStorage</type>
-  </component>
-
-  <component>
-    <key>org.exoplatform.wallet.reward.service.RewardTeamService</key>
-    <type>org.exoplatform.wallet.reward.service.WalletRewardTeamService</type>
-  </component>
-
-  <component>
-    <key>org.exoplatform.wallet.reward.service.RewardSettingsService</key>
-    <type>org.exoplatform.wallet.reward.service.WalletRewardSettingsService</type>
-  </component>
-
-  <component>
-    <key>org.exoplatform.wallet.reward.service.RewardReportService</key>
-    <type>org.exoplatform.wallet.reward.service.WalletRewardReportService</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.rest.RewardTeamREST</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.rest.RewardSettingsREST</type>
-  </component>
-
-  <component>
-    <type>org.exoplatform.wallet.reward.rest.RewardReportREST</type>
-  </component>
-
   <external-component-plugins>
     <target-component>org.exoplatform.commons.api.persistence.DataInitializer</target-component>
     <component-plugin>
@@ -89,43 +34,4 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     </component-plugin>
   </external-component-plugins>
 
-  <external-component-plugins>
-    <target-component>org.exoplatform.services.scheduler.JobSchedulerService</target-component>
-    <component-plugin>
-      <name>AddCronJob</name>
-      <set-method>addCronJob</set-method>
-      <type>org.exoplatform.services.scheduler.CronJob</type>
-      <description>Add a job to verify if rewards sent having pending transactions are completely successfully sent</description>
-      <init-params>
-        <properties-param>
-          <name>cronjob.info</name>
-          <description>Configuration for rewards transactions status verifier</description>
-          <property name="jobName" value="RewardStatusVerifierJob"/>
-          <property name="groupName" value="Wallet"/>
-          <property name="job" value="org.exoplatform.wallet.reward.job.RewardStatusVerifierJob"/>
-          <property name="expression" value="${exo.wallet.RewardStatusVerifierJob.expression:0 * * * * ?}"/>
-        </properties-param>
-      </init-params>
-    </component-plugin>
-  </external-component-plugins>
-
-  <external-component-plugins>
-    <target-component>org.exoplatform.services.listener.ListenerService</target-component>
-    <component-plugin>
-      <name>exo.wallet.reward.report.success</name>
-      <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.reward.listener.RewardSucceedNotificationListener</type>
-    </component-plugin>
-    <component-plugin>
-      <name>exo.wallet.reward.report.success</name>
-      <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.reward.listener.RewardSucceedAnalyticsListener</type>
-    </component-plugin>
-    <component-plugin>
-      <name>exo.wallet.transaction.replaced</name>
-      <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.reward.listener.TransactionReplacedListener</type>
-    </component-plugin>
-  </external-component-plugins>
-
 </configuration>
diff --git a/wallet-reward-services/src/main/resources/db/changelog/reward-rdbms.db.changelog-1.0.0.xml b/wallet-reward-services/src/main/resources/db/changelog/reward-rdbms.db.changelog-1.0.0.xml
index 56f6d5cdc..299cad16e 100644
--- a/wallet-reward-services/src/main/resources/db/changelog/reward-rdbms.db.changelog-1.0.0.xml
+++ b/wallet-reward-services/src/main/resources/db/changelog/reward-rdbms.db.changelog-1.0.0.xml
@@ -185,4 +185,17 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     </addColumn>
   </changeSet>
 
+  <changeSet author="reward" id="1.0.0-15">
+    <addColumn tableName="ADDONS_WALLET_REWARD">
+      <column name="POINTS" type="DOUBLE" />
+    </addColumn>
+  </changeSet>
+
+  <changeSet id="reward" author="1.0.0-16">
+    <sql>UPDATE ADDONS_WALLET_REWARD
+         SET POINTS=(SELECT POINTS FROM ADDONS_WALLET_REWARD_PLUGIN WHERE ADDONS_WALLET_REWARD.REWARD_ID = ADDONS_WALLET_REWARD_PLUGIN.REWARD_ID LIMIT 1)
+    </sql>
+
+  </changeSet>
+
 </databaseChangeLog>
diff --git a/wallet-reward-services/src/main/resources/jpa-entities.idx b/wallet-reward-services/src/main/resources/jpa-entities.idx
index 3cfa40637..727698e88 100644
--- a/wallet-reward-services/src/main/resources/jpa-entities.idx
+++ b/wallet-reward-services/src/main/resources/jpa-entities.idx
@@ -1,5 +1,2 @@
-org.exoplatform.wallet.reward.entity.RewardTeamMemberEntity
-org.exoplatform.wallet.reward.entity.RewardTeamEntity
-org.exoplatform.wallet.reward.entity.WalletRewardPeriodEntity
-org.exoplatform.wallet.reward.entity.WalletRewardEntity
-org.exoplatform.wallet.reward.entity.WalletRewardPluginEntity
+io.meeds.wallet.reward.entity.WalletRewardPeriodEntity
+io.meeds.wallet.reward.entity.WalletRewardEntity
\ No newline at end of file
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/BaseRewardTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseRewardTest.java
similarity index 73%
rename from wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/BaseRewardTest.java
rename to wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseRewardTest.java
index 89774b2a9..12b620d3a 100644
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/BaseRewardTest.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseRewardTest.java
@@ -17,12 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package org.exoplatform.wallet.reward;
+package io.meeds.wallet.reward;
 
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.service.WalletService;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import org.exoplatform.component.test.ConfigurationUnit;
@@ -41,9 +43,6 @@
         AvailableIntegration.JPA_MODULE,
         AvailableIntegration.WEB_MODULE,
 })
-@TestPropertySource(properties = {
-        "spring.liquibase.change-log=" + BaseRewardTest.CHANGELOG_PATH,
-})
 @ConfiguredBy({
   @ConfigurationUnit(scope = ContainerScope.ROOT, path = "conf/configuration.xml"),
   @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/portal/configuration.xml"),
@@ -51,14 +50,24 @@
 })
 public abstract class BaseRewardTest extends AbstractSpringTest {
 
-  public static final String MODULE_NAME      = "io.meeds.kudos";
-
-  public static final String CHANGELOG_PATH   = "classpath:db/changelog/reward-rdbms.db.changelog-master.xml";
+  public static final String MODULE_NAME      = "io.meeds.wallet";
 
   @BeforeEach
   public void setUp() {
     getContainer();
+    setContractDetails();
     begin();
   }
+  private void setContractDetails() {
+    WalletService walletService = getContainer().getComponentInstanceOfType(WalletService.class);
+    ContractDetail contractDetail = new ContractDetail();
+    contractDetail.setName("name");
+    contractDetail.setSymbol("symbol");
+    contractDetail.setDecimals(12);
+    contractDetail.setAddress(WalletUtils.getContractAddress());
+    contractDetail.setContractType("3");
+    contractDetail.setNetworkId(1L);
+    walletService.setConfiguredContractDetail(contractDetail);
+  }
 
 }
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseWalletRewardTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseWalletRewardTest.java
new file mode 100644
index 000000000..1ca3872ff
--- /dev/null
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseWalletRewardTest.java
@@ -0,0 +1,305 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ * Copyright (C) 2020 Meeds Association
+ * contact@meeds.io
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package io.meeds.wallet.reward;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import io.meeds.wallet.reward.dao.RewardDAO;
+import io.meeds.wallet.reward.dao.RewardPeriodDAO;
+import io.meeds.wallet.reward.service.RewardSettingsService;
+import io.meeds.wallet.reward.service.WalletRewardSettingsService;
+import org.junit.After;
+import org.junit.Before;
+import org.mockito.Mockito;
+
+import org.exoplatform.commons.utils.MapResourceBundle;
+import org.exoplatform.component.test.AbstractKernelTest;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+import org.exoplatform.services.resources.ResourceBundleService;
+import org.exoplatform.social.core.manager.IdentityManager;
+import org.exoplatform.social.core.space.spi.SpaceService;
+import io.meeds.wallet.dao.AddressLabelDAO;
+import io.meeds.wallet.dao.WalletAccountDAO;
+import io.meeds.wallet.dao.WalletBlockchainStateDAO;
+import io.meeds.wallet.dao.WalletPrivateKeyDAO;
+import io.meeds.wallet.dao.WalletTransactionDAO;
+import io.meeds.wallet.entity.AddressLabelEntity;
+import io.meeds.wallet.entity.TransactionEntity;
+import io.meeds.wallet.entity.WalletEntity;
+import io.meeds.wallet.entity.WalletPrivateKeyEntity;
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.WalletAddressLabel;
+import io.meeds.wallet.wallet.model.WalletProvider;
+import io.meeds.wallet.wallet.model.WalletState;
+import io.meeds.wallet.wallet.model.reward.RewardBudgetType;
+import io.meeds.wallet.wallet.model.reward.RewardSettings;
+import io.meeds.wallet.wallet.model.reward.RewardTeam;
+import io.meeds.wallet.wallet.model.reward.RewardTeamMember;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.WalletService;
+import io.meeds.wallet.wallet.utils.RewardUtils;
+import io.meeds.wallet.wallet.utils.WalletUtils;
+
+public abstract class BaseWalletRewardTest extends AbstractKernelTest {
+
+    private static final Log                LOG                  = ExoLogger.getLogger(BaseWalletRewardTest.class);
+
+    protected static final long             IDENTITY_ID          = 1L;
+
+    protected static final String           ADDRESS              = "walletAddress";
+
+    protected static final String           PHRASE               = "passphrase";
+
+    protected static final String           INITIALIZATION_STATE = WalletState.INITIALIZED.name();
+
+    protected static final boolean          IS_ENABLED           = true;
+
+    protected static final String           CURRENT_USER         = "root1";
+
+    protected static final long             MANAGER_IDENTITY_ID  = IDENTITY_ID;
+
+    protected static final long             MEMBER_IDENTITY_ID   = 2l;
+
+    protected static final long             SPACE_ID             = 5l;
+
+    protected static final String           TEAM_NAME            = "name";
+
+    protected static final String           TEAM_DESCRIPTION     = "Team description";
+
+    protected static final double           TEAM_BUDGET          = 2d;
+
+    protected static final RewardBudgetType TEAM_BUDGET_TYPE     = RewardBudgetType.COMPUTED;
+
+    protected static final String           CUSTOM_PLUGIN_NAME   = "plugin name";
+
+    protected static final String           CUSTOM_PLUGIN_ID     = "custom";
+
+    protected static final String           PROVIDER             = WalletProvider.INTERNAL_WALLET.name();
+
+    protected PortalContainer               container;
+
+    private static RewardSettings           defaultSettings      = null;
+
+    public static Map<Long, Double> getEarnedPoints(Set<Long> identityIds) {
+        return identityIds.stream().collect(Collectors.toMap(Function.identity(), x -> x.doubleValue()));
+    }
+
+    private Random               random          = new Random(1);
+
+    protected List<Serializable> entitiesToClean = new ArrayList<>();
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        if (container == null) {
+            assertNotNull("Container shouldn't be null", getContainer());
+            assertTrue("Container should have been started", getContainer().isStarted());
+            IdentityManager identityManager = getContainer().getComponentInstanceOfType(IdentityManager.class);
+            SpaceService spaceService = getContainer().getComponentInstanceOfType(SpaceService.class);
+
+            container = getContainer();
+            registerResourceBundleService();
+
+            RewardSettingsService rewardSettingsService = getService(RewardSettingsService.class);
+            defaultSettings = rewardSettingsService.getSettings();
+            setContractDetails();
+        }
+        begin();
+    }
+
+    @Override
+    @After
+    public void tearDown() throws Exception {
+        super.tearDown();
+        RewardDAO rewardDAO = getService(RewardDAO.class);
+        RewardPeriodDAO rewardPeriodDAO = getService(RewardPeriodDAO.class);
+        WalletAccountDAO walletAccountDAO = getService(WalletAccountDAO.class);
+        AddressLabelDAO addressLabelDAO = getService(AddressLabelDAO.class);
+        WalletPrivateKeyDAO walletPrivateKeyDAO = getService(WalletPrivateKeyDAO.class);
+        WalletTransactionDAO walletTransactionDAO = getService(WalletTransactionDAO.class);
+        WalletBlockchainStateDAO walletBlockchainStateDAO = getService(WalletBlockchainStateDAO.class);
+        WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
+
+        RewardSettings storedSettings = rewardSettingsService.getSettings();
+        assertEquals(defaultSettings, storedSettings);
+
+        restartTransaction();
+
+        rewardDAO.deleteAll();
+        rewardPeriodDAO.deleteAll();
+        walletBlockchainStateDAO.deleteAll();
+
+        if (!entitiesToClean.isEmpty()) {
+            for (Serializable entity : entitiesToClean) {
+                if (entity instanceof WalletEntity) {
+                    walletAccountDAO.delete((WalletEntity) entity);
+                } else if (entity instanceof WalletPrivateKeyEntity) {
+                    walletPrivateKeyDAO.delete((WalletPrivateKeyEntity) entity);
+                } else if (entity instanceof TransactionEntity) {
+                    walletTransactionDAO.delete((TransactionEntity) entity);
+                } else if (entity instanceof AddressLabelEntity) {
+                    addressLabelDAO.delete((AddressLabelEntity) entity);
+                } else if (entity instanceof WalletAddressLabel) {
+                    AddressLabelEntity labelEntity = addressLabelDAO.find(((WalletAddressLabel) entity).getId());
+                    addressLabelDAO.delete(labelEntity);
+                } else if (entity instanceof TransactionDetail) {
+                    TransactionEntity transactionEntity = walletTransactionDAO.find(((TransactionDetail) entity).getId());
+                    walletTransactionDAO.delete(transactionEntity);
+                } else if (entity instanceof Wallet) {
+                    long walletId = ((Wallet) entity).getTechnicalId();
+                    WalletEntity walletEntity = walletAccountDAO.find(walletId);
+                    walletAccountDAO.delete(walletEntity);
+
+                    WalletPrivateKeyEntity walletPrivateKey = walletPrivateKeyDAO.find(walletId);
+                    if (walletPrivateKey != null) {
+                        walletPrivateKeyDAO.delete(walletPrivateKey);
+                    }
+                } else {
+                    throw new IllegalStateException("Entity not managed" + entity);
+                }
+            }
+        }
+
+        int walletCount = walletAccountDAO.findAll().size();
+        int walletPrivateKeyCount = walletPrivateKeyDAO.findAll().size();
+        int walletAddressLabelsCount = addressLabelDAO.findAll().size();
+        int walletTransactionsCount = walletTransactionDAO.findAll().size();
+
+        LOG.info("objects count wallets = {}, private keys = {}, address labels = {}, transactions count = {}",
+                walletCount,
+                walletPrivateKeyCount,
+                walletAddressLabelsCount,
+                walletTransactionsCount);
+        assertEquals("The previous test didn't cleaned wallets entities correctly, should add entities to clean into 'entitiesToClean' list.",
+                0,
+                walletCount);
+        assertEquals("The previous test didn't cleaned wallet addresses labels correctly, should add entities to clean into 'entitiesToClean' list.",
+                0,
+                walletAddressLabelsCount);
+        assertEquals("The previous test didn't cleaned wallets private keys entities correctly, should add entities to clean into 'entitiesToClean' list.",
+                0,
+                walletPrivateKeyCount);
+        assertEquals("The previous test didn't cleaned wallets transactions entities correctly, should add entities to clean into 'entitiesToClean' list.",
+                0,
+                walletTransactionsCount);
+
+        end();
+    }
+
+    protected <T> T getService(Class<T> componentType) {
+        return container.getComponentInstanceOfType(componentType);
+    }
+
+    protected RewardTeam newRewardTeam() {
+        long[] memberIdentityIds = {
+                MEMBER_IDENTITY_ID
+        };
+
+        return newRewardTeam(memberIdentityIds);
+    }
+
+    protected RewardTeam newRewardTeam(long[] memberIdentityIds) {
+        RewardTeam rewardTeam = new RewardTeam();
+        rewardTeam.setBudget(TEAM_BUDGET);
+        rewardTeam.setDescription(TEAM_DESCRIPTION);
+        rewardTeam.setDisabled(false);
+
+        RewardTeamMember manager = new RewardTeamMember();
+        manager.setIdentityId(MANAGER_IDENTITY_ID);
+        rewardTeam.setManager(manager);
+
+        List<RewardTeamMember> members = new ArrayList<>();
+        for (long memberIdentityId : memberIdentityIds) {
+            RewardTeamMember member = new RewardTeamMember();
+            member.setIdentityId(memberIdentityId);
+            members.add(member);
+        }
+        rewardTeam.setMembers(members);
+
+        rewardTeam.setName(TEAM_NAME);
+        rewardTeam.setRewardType(TEAM_BUDGET_TYPE);
+        rewardTeam.setSpaceId(SPACE_ID);
+        return rewardTeam;
+    }
+
+    protected Wallet newWallet(long identityId) {
+        Wallet wallet = new Wallet();
+        wallet.setTechnicalId(identityId);
+        wallet.setAddress(ADDRESS + identityId);
+        wallet.setPassPhrase(PHRASE);
+        wallet.setEnabled(IS_ENABLED);
+        wallet.setIsInitialized(true);
+        wallet.setEtherBalance(0d);
+        wallet.setTokenBalance(0d);
+        wallet.setInitializationState(INITIALIZATION_STATE);
+        return wallet;
+    }
+
+    protected void updateWalletBlockchainState(Wallet wallet) {
+        wallet.setIsInitialized(true);
+        wallet.setEtherBalance(0d);
+        wallet.setTokenBalance(0d);
+        wallet.setInitializationState(INITIALIZATION_STATE);
+    }
+
+    protected String generateTransactionHash() {
+        StringBuilder hashStringBuffer = new StringBuilder("0x");
+        for (int i = 0; i < 64; i++) {
+            hashStringBuffer.append(Integer.toHexString(random.nextInt(16)));
+        }
+        return hashStringBuffer.toString();
+    }
+
+    private void registerResourceBundleService() {
+        ResourceBundleService resourceBundleService = Mockito.mock(ResourceBundleService.class);
+        MapResourceBundle resourceBundle = new MapResourceBundle(Locale.getDefault());
+        resourceBundle.add(RewardUtils.REWARD_TRANSACTION_LABEL_KEY, "{0} is rewarded {1} {2} for period: {3} to {4}");
+        resourceBundle.add(RewardUtils.REWARD_TRANSACTION_WITH_POOL_MESSAGE_KEY,
+                "You have earned {0} {1} in reward for your {2} {3} earned in pool {4} for period: {5} to {6}");
+        resourceBundle.add(RewardUtils.REWARD_TRANSACTION_NO_POOL_MESSAGE_KEY,
+                "You have earned {0} {1} in reward for your {2} {3} for period: {4} to {5}");
+        Mockito.when(resourceBundleService.getResourceBundle(Mockito.anyString(), Mockito.any())).thenReturn(resourceBundle);
+        if (container.getComponentInstanceOfType(ResourceBundleService.class) != null) {
+            container.unregisterComponent(ResourceBundleService.class);
+        }
+        container.registerComponentInstance(ResourceBundleService.class, resourceBundleService);
+    }
+
+    private void setContractDetails() {
+        WalletService walletService = getService(WalletService.class);
+        ContractDetail contractDetail = new ContractDetail();
+        contractDetail.setName("name");
+        contractDetail.setSymbol("symbol");
+        contractDetail.setDecimals(12);
+        contractDetail.setAddress(WalletUtils.getContractAddress());
+        contractDetail.setContractType("3");
+        contractDetail.setNetworkId(1l);
+        walletService.setConfiguredContractDetail(contractDetail);
+    }
+}
\ No newline at end of file
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListenerTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListenerTest.java
new file mode 100644
index 000000000..3c26b12d0
--- /dev/null
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListenerTest.java
@@ -0,0 +1,98 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Lab contact@meedslab.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package io.meeds.wallet.reward.listener;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import io.meeds.wallet.wallet.model.reward.RewardPeriod;
+import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
+import io.meeds.wallet.wallet.model.reward.WalletReward;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import org.exoplatform.services.listener.Event;
+import org.exoplatform.services.listener.ListenerService;
+import io.meeds.wallet.wallet.model.reward.RewardReport;
+
+import io.meeds.analytics.model.StatisticData;
+import io.meeds.analytics.utils.AnalyticsUtils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.*;
+
+@SpringBootTest(classes = { RewardSucceedAnalyticsListener.class, })
+class RewardSucceedAnalyticsListenerTest {
+
+  @MockBean
+  private ListenerService                    listenerService;
+
+  @MockBean
+  private Event<RewardReport, Object>  event;
+
+  @Autowired
+  private RewardSucceedAnalyticsListener               rewardSucceedAnalyticsListener;
+
+
+  @Test
+  void createEvent() {
+    RewardReport rewardReport = mock(RewardReport.class);
+    RewardPeriod rewardPeriod = mock(RewardPeriod.class);
+    when(rewardReport.getPeriod()).thenReturn(rewardPeriod);
+    when(rewardPeriod.getStartDateInSeconds()).thenReturn(1609459200L);
+    when(rewardPeriod.getEndDateInSeconds()).thenReturn(1612137600L);
+    when(rewardPeriod.getTimeZone()).thenReturn("UTC");
+    when(rewardPeriod.getRewardPeriodType()).thenReturn(RewardPeriodType.MONTH);
+    when(rewardReport.getSuccessTransactionCount()).thenReturn(10L);
+    when(rewardReport.getTokensSent()).thenReturn(500.0);
+    when(rewardReport.getTokensToSend()).thenReturn(1000.0);
+    when(rewardReport.getValidRewardCount()).thenReturn(5L);
+
+    Set<WalletReward> rewards = new HashSet<>();
+    rewards.add(new WalletReward());
+    when(rewardReport.getRewards()).thenReturn(rewards);
+
+    when(event.getSource()).thenReturn(rewardReport);
+
+    try (MockedStatic<AnalyticsUtils> mockedAnalyticsUtils = Mockito.mockStatic(AnalyticsUtils.class)) {
+      rewardSucceedAnalyticsListener.onEvent(event);
+      ArgumentCaptor<StatisticData> captor = ArgumentCaptor.forClass(StatisticData.class);
+      mockedAnalyticsUtils.verify(() -> AnalyticsUtils.addStatisticData(captor.capture()), times(1));
+
+      StatisticData actualStatisticData = captor.getValue();
+
+      // Verify the content of the StatisticData
+      assertEquals("wallet", actualStatisticData.getModule());
+      assertEquals("reward", actualStatisticData.getSubModule());
+      assertEquals("sendPeriodRewards", actualStatisticData.getOperation());
+      assertEquals("UTC", actualStatisticData.getParameters().get("rewardPeriodTimeZone"));
+      assertEquals("month", actualStatisticData.getParameters().get("rewardPeriodType"));
+      assertEquals("10", actualStatisticData.getParameters().get("rewardTransactionsCount"));
+      assertEquals("500.0", actualStatisticData.getParameters().get("rewardTokensSent"));
+      assertEquals("1000.0", actualStatisticData.getParameters().get("rewardTokensToSend"));
+      assertEquals("5", actualStatisticData.getParameters().get("rewardRecipientWalletCount"));
+      assertEquals("1", actualStatisticData.getParameters().get("rewardParticipantWalletCount"));
+    }
+  }
+}
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java
new file mode 100644
index 000000000..90b147d52
--- /dev/null
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java
@@ -0,0 +1,96 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Lab contact@meedslab.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package io.meeds.wallet.reward.listener;
+
+import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_REPORT_NOTIFICATION_PARAM;
+import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_SUCCESS_NOTIFICATION_ID;
+import static org.mockito.Mockito.*;
+
+import org.exoplatform.commons.api.notification.command.NotificationCommand;
+import org.exoplatform.commons.api.notification.command.NotificationExecutor;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import org.exoplatform.commons.api.notification.NotificationContext;
+import org.exoplatform.commons.api.notification.model.PluginKey;
+import org.exoplatform.commons.notification.impl.NotificationContextImpl;
+import org.exoplatform.services.listener.Event;
+import org.exoplatform.services.listener.ListenerService;
+import io.meeds.wallet.wallet.model.reward.RewardReport;
+
+@SpringBootTest(classes = { RewardSucceedNotificationListener.class })
+class RewardSucceedNotificationListenerTest {
+
+  private static final String               EVENT_NAME = "exo.wallet.reward.report.success";
+
+  @MockBean
+  private Event<RewardReport, Object>       event;
+
+  @MockBean
+  private RewardReport                      rewardReport;
+
+  @MockBean
+  private NotificationContext               notificationContext;
+
+  @MockBean
+  private ListenerService                   listenerService;
+
+  @Autowired
+  private RewardSucceedNotificationListener rewardSucceedNotificationListener;
+
+  @BeforeEach
+  void setUp() {
+    rewardSucceedNotificationListener.init();
+  }
+
+  @Test
+  void testInit() {
+    verify(listenerService).addListener(EVENT_NAME, rewardSucceedNotificationListener);
+  }
+
+  @Test
+  void testOnEvent() {
+    when(event.getSource()).thenReturn(rewardReport);
+
+    try (MockedStatic<NotificationContextImpl> mockedStatic = Mockito.mockStatic(NotificationContextImpl.class)) {
+      mockedStatic.when(NotificationContextImpl::cloneInstance).thenReturn(notificationContext);
+
+      NotificationExecutor notificationExecutor = mock(NotificationExecutor.class);
+      when(notificationContext.getNotificationExecutor()).thenReturn(notificationExecutor);
+
+      NotificationCommand notificationCommand = mock(NotificationCommand.class);
+      when(notificationContext.makeCommand(PluginKey.key(REWARD_SUCCESS_NOTIFICATION_ID))).thenReturn(notificationCommand);
+
+      when(notificationExecutor.with(notificationCommand)).thenReturn(notificationExecutor);
+
+      rewardSucceedNotificationListener.onEvent(event);
+
+      verify(notificationContext).append(eq(REWARD_REPORT_NOTIFICATION_PARAM), eq(rewardReport));
+
+      // Verify that the notification command was created and executed
+      verify(notificationExecutor).with(notificationCommand);
+      verify(notificationExecutor).execute(notificationContext);
+    }
+  }
+}
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/TransactionReplacedListenerTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/TransactionReplacedListenerTest.java
new file mode 100644
index 000000000..3cf3018a6
--- /dev/null
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/TransactionReplacedListenerTest.java
@@ -0,0 +1,80 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Lab contact@meedslab.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package io.meeds.wallet.reward.listener;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import org.exoplatform.services.listener.Event;
+import org.exoplatform.services.listener.ListenerService;
+
+import io.meeds.wallet.reward.service.WalletRewardReportService;
+
+import static org.mockito.Mockito.*;
+
+@SpringBootTest(classes = {TransactionReplacedListener.class})
+class TransactionReplacedListenerTest {
+
+  private static final String EVENT_NAME = "exo.wallet.transaction.replaced";
+
+  @MockBean
+  private ListenerService listenerService;
+
+  @MockBean
+  private WalletRewardReportService walletRewardReportService;
+
+  @MockBean
+  private Event<Object, Map<String, String>> event;
+
+  @Autowired
+  private TransactionReplacedListener transactionReplacedListener;
+
+  @BeforeEach
+  void setUp() {
+    transactionReplacedListener.init();
+  }
+
+  @Test
+  void testInit() {
+    verify(listenerService).addListener(EVENT_NAME, transactionReplacedListener);
+  }
+
+  @Test
+  void testOnEvent() {
+    Map<String, String> transactionData = new HashMap<>();
+    transactionData.put("oldHash", "oldHashValue");
+    transactionData.put("hash", "newHashValue");
+
+    when(event.getData()).thenReturn(transactionData);
+
+    // When
+    transactionReplacedListener.onEvent(event);
+
+    // Then
+    verify(walletRewardReportService).replaceRewardTransactions("oldHashValue", "newHashValue");
+  }
+}
+
+
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardReportServiceTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardReportServiceTest.java
similarity index 69%
rename from wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardReportServiceTest.java
rename to wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardReportServiceTest.java
index 8f9e735be..6c9a4f9e0 100644
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardReportServiceTest.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardReportServiceTest.java
@@ -16,32 +16,30 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package org.exoplatform.wallet.reward.service;
+package io.meeds.wallet.reward.service;
 
 import java.time.LocalDate;
 import java.time.YearMonth;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.IntStream;
+import java.util.*;
 
+import io.meeds.gamification.model.filter.RealizationFilter;
 import io.meeds.gamification.service.RealizationService;
-import org.exoplatform.wallet.model.WalletState;
+import io.meeds.wallet.wallet.model.WalletState;
 import org.junit.jupiter.api.Test;
 
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.reward.RewardReport;
-import org.exoplatform.wallet.model.reward.RewardSettings;
-import org.exoplatform.wallet.reward.storage.WalletRewardReportStorage;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.reward.RewardReport;
+import io.meeds.wallet.wallet.model.reward.RewardSettings;
+import io.meeds.wallet.reward.storage.WalletRewardReportStorage;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletTokenAdminService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 @SpringBootTest(classes = { WalletRewardReportService.class })
@@ -54,10 +52,7 @@ public class WalletRewardReportServiceTest { // NOSONAR
   private WalletTokenAdminService   walletTokenAdminService;
 
   @MockBean
-  private RewardSettingsService     rewardSettingsService;
-
-  @MockBean
-  private RewardTeamService         rewardTeamService;
+  private RewardSettingsService rewardSettingsService;
 
   @MockBean
   private WalletRewardReportStorage rewardReportStorage;
@@ -66,7 +61,7 @@ public class WalletRewardReportServiceTest { // NOSONAR
   private RealizationService        realizationService;
 
   @Autowired
-  private RewardReportService       rewardReportService;
+  private RewardReportService rewardReportService;
 
   @Test
   public void testComputeRewards() {
@@ -78,18 +73,18 @@ public void testComputeRewards() {
     assertNotNull(rewardReport.getRewards());
     assertEquals(0, rewardReport.getRewards().size());
 
-    int enabledWalletsCount = 59;
-    Set<Wallet> wallets = Collections.newSetFromMap(new ConcurrentHashMap<>());
-    IntStream.range(0, enabledWalletsCount).parallel().forEach(i -> {
-      Wallet wallet = newWallet(i + 1L);
-      wallets.add(wallet);
-    });
-    when(walletAccountService.listWallets()).thenReturn(wallets);
+    when(realizationService.getParticipantsBetweenDates(any(Date.class), any(Date.class))).thenReturn(List.of(1L, 4L, 5L));
+    when(realizationService.countRealizationsByFilter(any(RealizationFilter.class))).thenReturn(10);
+    Set<Wallet> participantsWallet = new HashSet<>();
+    participantsWallet.add(newWallet(1L));
+    participantsWallet.add(newWallet(4L));
+    participantsWallet.add(newWallet(5L));
+    when(walletAccountService.listWalletsByIdentityIds(List.of(1L, 4L, 5L))).thenReturn(participantsWallet);
 
     rewardReport = rewardReportService.computeRewards(date);
     assertNotNull(rewardReport);
     // Even if settings are null, the returned rewards shouldn't be empty
-    assertEquals(enabledWalletsCount, rewardReport.getRewards().size());
+    assertEquals(participantsWallet.size(), rewardReport.getRewards().size());
   }
 
   protected Wallet newWallet(long identityId) {
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardSettingsServiceTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardSettingsServiceTest.java
similarity index 92%
rename from wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardSettingsServiceTest.java
rename to wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardSettingsServiceTest.java
index 0fd8b953f..b126f2a80 100644
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardSettingsServiceTest.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardSettingsServiceTest.java
@@ -16,21 +16,21 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package org.exoplatform.wallet.reward.service;
+package io.meeds.wallet.reward.service;
 
 import com.google.javascript.jscomp.jarjar.com.google.common.base.Objects;
 import org.exoplatform.commons.api.settings.SettingService;
 import org.exoplatform.commons.api.settings.SettingValue;
 import org.junit.jupiter.api.Test;
 
-import org.exoplatform.wallet.model.reward.RewardBudgetType;
-import org.exoplatform.wallet.model.reward.RewardPeriodType;
-import org.exoplatform.wallet.model.reward.RewardSettings;
+import io.meeds.wallet.wallet.model.reward.RewardBudgetType;
+import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
+import io.meeds.wallet.wallet.model.reward.RewardSettings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
-import static org.exoplatform.wallet.utils.WalletUtils.toJsonString;
+import static io.meeds.wallet.wallet.utils.WalletUtils.toJsonString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
@@ -66,7 +66,7 @@ public void testSaveSettings() {
     long amount = 1L;
     long threshold = 2L;
     RewardBudgetType budgetType = RewardBudgetType.FIXED_PER_POINT;
-    RewardPeriodType periodType = RewardPeriodType.SEMESTER;
+    RewardPeriodType periodType = RewardPeriodType.MONTH;
 
     newSettings.setPeriodType(periodType);
     newSettings.setAmount(amount);
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/BaseWalletRewardTest.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/BaseWalletRewardTest.java
deleted file mode 100644
index 37279f921..000000000
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/BaseWalletRewardTest.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.junit.After;
-import org.junit.Before;
-import org.mockito.Mockito;
-
-import org.exoplatform.commons.utils.MapResourceBundle;
-import org.exoplatform.component.test.AbstractKernelTest;
-import org.exoplatform.container.PortalContainer;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.services.resources.ResourceBundleService;
-import org.exoplatform.social.core.manager.IdentityManager;
-import org.exoplatform.social.core.space.spi.SpaceService;
-import org.exoplatform.wallet.dao.AddressLabelDAO;
-import org.exoplatform.wallet.dao.WalletAccountDAO;
-import org.exoplatform.wallet.dao.WalletBlockchainStateDAO;
-import org.exoplatform.wallet.dao.WalletPrivateKeyDAO;
-import org.exoplatform.wallet.dao.WalletTransactionDAO;
-import org.exoplatform.wallet.entity.AddressLabelEntity;
-import org.exoplatform.wallet.entity.TransactionEntity;
-import org.exoplatform.wallet.entity.WalletEntity;
-import org.exoplatform.wallet.entity.WalletPrivateKeyEntity;
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.WalletAddressLabel;
-import org.exoplatform.wallet.model.WalletProvider;
-import org.exoplatform.wallet.model.WalletState;
-import org.exoplatform.wallet.model.reward.RewardBudgetType;
-import org.exoplatform.wallet.model.reward.RewardPluginSettings;
-import org.exoplatform.wallet.model.reward.RewardSettings;
-import org.exoplatform.wallet.model.reward.RewardTeam;
-import org.exoplatform.wallet.model.reward.RewardTeamMember;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.reward.api.RewardPlugin;
-import org.exoplatform.wallet.reward.dao.RewardDAO;
-import org.exoplatform.wallet.reward.dao.RewardPeriodDAO;
-import org.exoplatform.wallet.reward.dao.RewardPluginDAO;
-import org.exoplatform.wallet.reward.dao.RewardTeamDAO;
-import org.exoplatform.wallet.reward.entity.RewardTeamEntity;
-import org.exoplatform.wallet.reward.service.WalletRewardSettingsService;
-import org.exoplatform.wallet.reward.service.WalletRewardSettingsServiceTest;
-import org.exoplatform.wallet.reward.test.mock.IdentityManagerMock;
-import org.exoplatform.wallet.reward.test.mock.SpaceServiceMock;
-import org.exoplatform.wallet.service.WalletService;
-import org.exoplatform.wallet.utils.RewardUtils;
-import org.exoplatform.wallet.utils.WalletUtils;
-
-public abstract class BaseWalletRewardTest extends AbstractKernelTest {
-
-  private static final Log                LOG                  = ExoLogger.getLogger(BaseWalletRewardTest.class);
-
-  protected static final long             IDENTITY_ID          = 1L;
-
-  protected static final String           ADDRESS              = "walletAddress";
-
-  protected static final String           PHRASE               = "passphrase";
-
-  protected static final String           INITIALIZATION_STATE = WalletState.INITIALIZED.name();
-
-  protected static final boolean          IS_ENABLED           = true;
-
-  protected static final String           CURRENT_USER         = "root1";
-
-  protected static final long             MANAGER_IDENTITY_ID  = IDENTITY_ID;
-
-  protected static final long             MEMBER_IDENTITY_ID   = 2l;
-
-  protected static final long             SPACE_ID             = 5l;
-
-  protected static final String           TEAM_NAME            = "name";
-
-  protected static final String           TEAM_DESCRIPTION     = "Team description";
-
-  protected static final double           TEAM_BUDGET          = 2d;
-
-  protected static final RewardBudgetType TEAM_BUDGET_TYPE     = RewardBudgetType.COMPUTED;
-
-  protected static final String           CUSTOM_PLUGIN_NAME   = "plugin name";
-
-  protected static final String           CUSTOM_PLUGIN_ID     = "custom";
-
-  protected static final String           PROVIDER             = WalletProvider.INTERNAL_WALLET.name();
-
-  protected PortalContainer               container;
-
-  private static RewardSettings           defaultSettings      = null;
-
-  public static Map<Long, Double> getEarnedPoints(Set<Long> identityIds) {
-    return identityIds.stream().collect(Collectors.toMap(Function.identity(), x -> x.doubleValue()));
-  }
-
-  private Random               random          = new Random(1);
-
-  protected List<Serializable> entitiesToClean = new ArrayList<>();
-
-  @Override
-  @Before
-  public void setUp() throws Exception {
-    super.setUp();
-    if (container == null) {
-      assertNotNull("Container shouldn't be null", getContainer());
-      assertTrue("Container should have been started", getContainer().isStarted());
-      IdentityManager identityManager = getContainer().getComponentInstanceOfType(IdentityManager.class);
-      assertTrue("Identity Manager should be mocked, found: " + identityManager.getClass().getName(), identityManager instanceof IdentityManagerMock);
-      SpaceService spaceService = getContainer().getComponentInstanceOfType(SpaceService.class);
-      assertTrue("SpaceService should be mocked, found: " + spaceService.getClass().getName(), spaceService instanceof SpaceServiceMock);
-
-      container = getContainer();
-      registerResourceBundleService();
-
-      WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-      defaultSettings = rewardSettingsService.getSettings();
-      setContractDetails();
-    }
-    begin();
-  }
-
-  @Override
-  @After
-  public void tearDown() throws Exception {
-    super.tearDown();
-    RewardDAO rewardDAO = getService(RewardDAO.class);
-    RewardPeriodDAO rewardPeriodDAO = getService(RewardPeriodDAO.class);
-    RewardPluginDAO rewardPluginDAO = getService(RewardPluginDAO.class);
-    WalletAccountDAO walletAccountDAO = getService(WalletAccountDAO.class);
-    AddressLabelDAO addressLabelDAO = getService(AddressLabelDAO.class);
-    WalletPrivateKeyDAO walletPrivateKeyDAO = getService(WalletPrivateKeyDAO.class);
-    WalletTransactionDAO walletTransactionDAO = getService(WalletTransactionDAO.class);
-    RewardTeamDAO rewardTeamDAO = getService(RewardTeamDAO.class);
-    WalletBlockchainStateDAO walletBlockchainStateDAO = getService(WalletBlockchainStateDAO.class);
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-
-    RewardSettings storedSettings = rewardSettingsService.getSettings();
-    assertEquals(defaultSettings, storedSettings);
-
-    restartTransaction();
-
-    rewardPluginDAO.deleteAll();
-    rewardDAO.deleteAll();
-    rewardPeriodDAO.deleteAll();
-    walletBlockchainStateDAO.deleteAll();
-
-    if (!entitiesToClean.isEmpty()) {
-      for (Serializable entity : entitiesToClean) {
-        if (entity instanceof WalletEntity) {
-          walletAccountDAO.delete((WalletEntity) entity);
-        } else if (entity instanceof WalletPrivateKeyEntity) {
-          walletPrivateKeyDAO.delete((WalletPrivateKeyEntity) entity);
-        } else if (entity instanceof TransactionEntity) {
-          walletTransactionDAO.delete((TransactionEntity) entity);
-        } else if (entity instanceof AddressLabelEntity) {
-          addressLabelDAO.delete((AddressLabelEntity) entity);
-        } else if (entity instanceof WalletAddressLabel) {
-          AddressLabelEntity labelEntity = addressLabelDAO.find(((WalletAddressLabel) entity).getId());
-          addressLabelDAO.delete(labelEntity);
-        } else if (entity instanceof TransactionDetail) {
-          TransactionEntity transactionEntity = walletTransactionDAO.find(((TransactionDetail) entity).getId());
-          walletTransactionDAO.delete(transactionEntity);
-        } else if (entity instanceof Wallet) {
-          long walletId = ((Wallet) entity).getTechnicalId();
-          WalletEntity walletEntity = walletAccountDAO.find(walletId);
-          walletAccountDAO.delete(walletEntity);
-
-          WalletPrivateKeyEntity walletPrivateKey = walletPrivateKeyDAO.find(walletId);
-          if (walletPrivateKey != null) {
-            walletPrivateKeyDAO.delete(walletPrivateKey);
-          }
-        } else if (entity instanceof RewardTeamEntity) {
-          rewardTeamDAO.delete((RewardTeamEntity) entity);
-        } else if (entity instanceof RewardTeam) {
-          RewardTeamEntity teamEntity = rewardTeamDAO.find(((RewardTeam) entity).getId());
-          rewardTeamDAO.delete(teamEntity);
-        } else {
-          throw new IllegalStateException("Entity not managed" + entity);
-        }
-      }
-    }
-
-    int walletCount = walletAccountDAO.findAll().size();
-    int walletPrivateKeyCount = walletPrivateKeyDAO.findAll().size();
-    int walletAddressLabelsCount = addressLabelDAO.findAll().size();
-    int walletTransactionsCount = walletTransactionDAO.findAll().size();
-
-    LOG.info("objects count wallets = {}, private keys = {}, address labels = {}, transactions count = {}",
-             walletCount,
-             walletPrivateKeyCount,
-             walletAddressLabelsCount,
-             walletTransactionsCount);
-    assertEquals("The previous test didn't cleaned wallets entities correctly, should add entities to clean into 'entitiesToClean' list.",
-                 0,
-                 walletCount);
-    assertEquals("The previous test didn't cleaned wallet addresses labels correctly, should add entities to clean into 'entitiesToClean' list.",
-                 0,
-                 walletAddressLabelsCount);
-    assertEquals("The previous test didn't cleaned wallets private keys entities correctly, should add entities to clean into 'entitiesToClean' list.",
-                 0,
-                 walletPrivateKeyCount);
-    assertEquals("The previous test didn't cleaned wallets transactions entities correctly, should add entities to clean into 'entitiesToClean' list.",
-                 0,
-                 walletTransactionsCount);
-
-    end();
-  }
-
-  protected <T> T getService(Class<T> componentType) {
-    return container.getComponentInstanceOfType(componentType);
-  }
-
-  protected RewardTeam newRewardTeam() {
-    long[] memberIdentityIds = {
-        MEMBER_IDENTITY_ID
-    };
-
-    return newRewardTeam(memberIdentityIds);
-  }
-
-  protected RewardTeam newRewardTeam(long[] memberIdentityIds) {
-    RewardTeam rewardTeam = new RewardTeam();
-    rewardTeam.setBudget(TEAM_BUDGET);
-    rewardTeam.setDescription(TEAM_DESCRIPTION);
-    rewardTeam.setDisabled(false);
-
-    RewardTeamMember manager = new RewardTeamMember();
-    manager.setIdentityId(MANAGER_IDENTITY_ID);
-    rewardTeam.setManager(manager);
-
-    List<RewardTeamMember> members = new ArrayList<>();
-    for (long memberIdentityId : memberIdentityIds) {
-      RewardTeamMember member = new RewardTeamMember();
-      member.setIdentityId(memberIdentityId);
-      members.add(member);
-    }
-    rewardTeam.setMembers(members);
-
-    rewardTeam.setName(TEAM_NAME);
-    rewardTeam.setRewardType(TEAM_BUDGET_TYPE);
-    rewardTeam.setSpaceId(SPACE_ID);
-    return rewardTeam;
-  }
-
-  protected Wallet newWallet(long identityId) {
-    Wallet wallet = new Wallet();
-    wallet.setTechnicalId(identityId);
-    wallet.setAddress(ADDRESS + identityId);
-    wallet.setPassPhrase(PHRASE);
-    wallet.setEnabled(IS_ENABLED);
-    wallet.setIsInitialized(true);
-    wallet.setEtherBalance(0d);
-    wallet.setTokenBalance(0d);
-    wallet.setInitializationState(INITIALIZATION_STATE);
-    return wallet;
-  }
-
-  protected void updateWalletBlockchainState(Wallet wallet) {
-    wallet.setIsInitialized(true);
-    wallet.setEtherBalance(0d);
-    wallet.setTokenBalance(0d);
-    wallet.setInitializationState(INITIALIZATION_STATE);
-  }
-
-  protected String generateTransactionHash() {
-    StringBuilder hashStringBuffer = new StringBuilder("0x");
-    for (int i = 0; i < 64; i++) {
-      hashStringBuffer.append(Integer.toHexString(random.nextInt(16)));
-    }
-    return hashStringBuffer.toString();
-  }
-
-  private void registerResourceBundleService() {
-    ResourceBundleService resourceBundleService = Mockito.mock(ResourceBundleService.class);
-    MapResourceBundle resourceBundle = new MapResourceBundle(Locale.getDefault());
-    resourceBundle.add(RewardUtils.REWARD_TRANSACTION_LABEL_KEY, "{0} is rewarded {1} {2} for period: {3} to {4}");
-    resourceBundle.add(RewardUtils.REWARD_TRANSACTION_WITH_POOL_MESSAGE_KEY,
-                       "You have earned {0} {1} in reward for your {2} {3} earned in pool {4} for period: {5} to {6}");
-    resourceBundle.add(RewardUtils.REWARD_TRANSACTION_NO_POOL_MESSAGE_KEY,
-                       "You have earned {0} {1} in reward for your {2} {3} for period: {4} to {5}");
-    Mockito.when(resourceBundleService.getResourceBundle(Mockito.anyString(), Mockito.any())).thenReturn(resourceBundle);
-    if (container.getComponentInstanceOfType(ResourceBundleService.class) != null) {
-      container.unregisterComponent(ResourceBundleService.class);
-    }
-    container.registerComponentInstance(ResourceBundleService.class, resourceBundleService);
-  }
-
-  private void setContractDetails() {
-    WalletService walletService = getService(WalletService.class);
-    ContractDetail contractDetail = new ContractDetail();
-    contractDetail.setName("name");
-    contractDetail.setSymbol("symbol");
-    contractDetail.setDecimals(12);
-    contractDetail.setAddress(WalletUtils.getContractAddress());
-    contractDetail.setContractType("3");
-    contractDetail.setNetworkId(1l);
-    walletService.setConfiguredContractDetail(contractDetail);
-  }
-}
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/dao/RewardTeamDAOTest.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/dao/RewardTeamDAOTest.java
deleted file mode 100644
index eb54d4229..000000000
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/dao/RewardTeamDAOTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.dao;
-
-import java.util.List;
-
-import org.junit.Test;
-
-import org.exoplatform.wallet.reward.BaseWalletRewardTest;
-import org.exoplatform.wallet.reward.entity.RewardTeamEntity;
-
-public class RewardTeamDAOTest extends BaseWalletRewardTest {
-
-  /**
-   * Check that service is instantiated and functional
-   */
-  @Test
-  public void testServiceInstantiated() {
-    RewardTeamDAO rewardTeamDAO = getService(RewardTeamDAO.class);
-    assertNotNull(rewardTeamDAO);
-
-    List<RewardTeamEntity> teamEntities = rewardTeamDAO.findAll();
-    assertNotNull("Returned teams list shouldn't be null", teamEntities);
-    assertEquals("Returned teams should be empty", 0, teamEntities.size());
-  }
-
-}
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/job/WalletRewardJobTest.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/job/WalletRewardJobTest.java
deleted file mode 100644
index a9ef5fffa..000000000
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/job/WalletRewardJobTest.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.job;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.YearMonth;
-import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.LongStream;
-
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-import org.exoplatform.container.component.RequestLifeCycle;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.reward.RewardBudgetType;
-import org.exoplatform.wallet.model.reward.RewardPeriod;
-import org.exoplatform.wallet.model.reward.RewardPeriodType;
-import org.exoplatform.wallet.model.reward.RewardPluginSettings;
-import org.exoplatform.wallet.model.reward.RewardReport;
-import org.exoplatform.wallet.model.reward.RewardSettings;
-import org.exoplatform.wallet.model.reward.RewardTeam;
-import org.exoplatform.wallet.model.reward.WalletReward;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.reward.BaseWalletRewardTest;
-import org.exoplatform.wallet.reward.api.RewardPlugin;
-import org.exoplatform.wallet.reward.service.WalletRewardReportService;
-import org.exoplatform.wallet.reward.service.WalletRewardSettingsService;
-import org.exoplatform.wallet.reward.service.WalletRewardTeamService;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.service.WalletTokenAdminService;
-import org.exoplatform.wallet.service.WalletTransactionService;
-import org.exoplatform.wallet.storage.WalletStorage;
-import org.exoplatform.wallet.utils.WalletUtils;
-
-public class WalletRewardJobTest extends BaseWalletRewardTest {
-
-  @Test
-  public void testSendRewards() throws Exception {
-    WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-    WalletTransactionService walletTransactionService = getService(WalletTransactionService.class);
-
-    WalletRewardReportService walletRewardService = getService(WalletRewardReportService.class);
-    WalletTokenAdminService tokenAdminService = Mockito.mock(WalletTokenAdminService.class);
-    resetTokenAdminService(walletTransactionService, tokenAdminService, true, false);
-
-    int contractDecimals = WalletUtils.getContractDetail().getDecimals();
-    LocalDate date = YearMonth.of(2019, 07).atEndOfMonth();
-
-    RewardSettings defaultSettings = rewardSettingsService.getSettings();
-    try {
-      // Build new settings
-      RewardSettings newSettings = defaultSettings.clone();
-
-      newSettings.setPeriodType(RewardPeriodType.MONTH);
-
-      double sumOfTokensToSend = 5490d;
-      newSettings.setBudgetType(RewardBudgetType.FIXED);
-      newSettings.setAmount(sumOfTokensToSend);
-      newSettings.setThreshold(0);
-      rewardSettingsService.saveSettings(newSettings);
-
-      WalletStorage walletStorage = getService(WalletStorage.class);
-      int enabledWalletsCount = 60;
-      for (int i = 0; i < enabledWalletsCount; i++) {
-        Wallet wallet = newWallet(i + 1l);
-        wallet = walletStorage.saveWallet(wallet, true);
-        updateWalletBlockchainState(wallet);
-        walletStorage.saveWalletBlockchainState(wallet, WalletUtils.getContractAddress());
-        entitiesToClean.add(wallet);
-      }
-
-      // Build teams
-      List<RewardTeam> teams = new ArrayList<>();
-      RewardTeam rewardTeam1 = createTeamWithMembers(1, 10, RewardBudgetType.COMPUTED, false);
-      teams.add(rewardTeam1);
-      RewardTeam rewardTeam2 = createTeamWithMembers(11, 20, RewardBudgetType.FIXED, false);
-      teams.add(rewardTeam2);
-      RewardTeam rewardTeam3 = createTeamWithMembers(21, 30, RewardBudgetType.FIXED_PER_MEMBER, false);
-      teams.add(rewardTeam3);
-      RewardTeam rewardTeam4 = createTeamWithMembers(31, 40, RewardBudgetType.FIXED_PER_MEMBER, false);
-      teams.add(rewardTeam4);
-      RewardTeam rewardTeam5 = createTeamWithMembers(41, 50, RewardBudgetType.COMPUTED, false);
-      teams.add(rewardTeam5);
-      RewardTeam rewardTeam6 = createTeamWithMembers(51, 60, RewardBudgetType.COMPUTED, false);
-      teams.add(rewardTeam6);
-
-      List<RewardPeriod> initialRewardPeriodsInProgress = walletRewardService.getRewardPeriodsInProgress();
-      assertNotNull(initialRewardPeriodsInProgress);
-
-      // Admin having enough funds
-      Mockito.when(tokenAdminService.getTokenBalanceOf("adminAddress"))
-             .thenReturn(BigInteger.valueOf((long) sumOfTokensToSend + 1).pow(contractDecimals));
-      walletRewardService.sendRewards(date, "root");
-      Mockito.verify(tokenAdminService, Mockito.times(60)).reward(Mockito.any(), Mockito.any());
-
-      List<RewardPeriod> rewardPeriodsInProgress = walletRewardService.getRewardPeriodsInProgress();
-      assertNotNull(rewardPeriodsInProgress);
-      assertEquals(initialRewardPeriodsInProgress.size() + 1l, rewardPeriodsInProgress.size());
-
-      RewardStatusVerifierJob rewardReportNotificationJob = new RewardStatusVerifierJob();
-
-      // Executing job shouldn't mark reward transactions as sent until
-      // transactions are marked as success and not pending
-      rewardReportNotificationJob.execute(null);
-      rewardPeriodsInProgress = walletRewardService.getRewardPeriodsInProgress();
-      assertNotNull(rewardPeriodsInProgress);
-      assertEquals(initialRewardPeriodsInProgress.size() + 1l, rewardPeriodsInProgress.size());
-
-      RewardReport rewardReport = walletRewardService.computeRewards(date);
-      Set<WalletReward> rewards = rewardReport.getRewards();
-      for (WalletReward walletReward : rewards) {
-        String hash = walletReward.getTransaction().getHash();
-        TransactionDetail transactionDetail = walletTransactionService.getTransactionByHash(hash);
-        transactionDetail.setPending(false);
-        transactionDetail.setSucceeded(true);
-        walletTransactionService.saveTransactionDetail(transactionDetail, true);
-      }
-
-      WalletAccountService walletAccountServiceMock = mock(WalletAccountService.class);
-      when(walletAccountServiceMock.isAdminAccountEnabled()).thenReturn(true);
-
-      rewardReportNotificationJob.execute(null);
-
-      rewardPeriodsInProgress = walletRewardService.getRewardPeriodsInProgress();
-      assertNotNull(rewardPeriodsInProgress);
-      assertEquals(1, rewardPeriodsInProgress.size());
-
-      rewardReportNotificationJob.walletAccountService = walletAccountServiceMock;
-      Wallet adminWallet = new Wallet();
-      when(walletAccountServiceMock.getAdminWallet()).thenReturn(adminWallet);
-      adminWallet.setEtherBalance(2d);
-      adminWallet.setTokenBalance(3d);
-      adminWallet.setEnabled(true);
-
-      rewardPeriodsInProgress = walletRewardService.getRewardPeriodsInProgress();
-      assertNotNull(rewardPeriodsInProgress);
-      assertEquals(1, rewardPeriodsInProgress.size());
-
-      walletRewardService.setRewardSendingInProgress(true);
-      rewardReportNotificationJob.execute(null);
-
-      rewardPeriodsInProgress = walletRewardService.getRewardPeriodsInProgress();
-      assertNotNull(rewardPeriodsInProgress);
-      assertEquals(1, rewardPeriodsInProgress.size());
-
-      walletRewardService.setRewardSendingInProgress(false);
-      rewardReportNotificationJob.execute(null);
-
-      rewardPeriodsInProgress = walletRewardService.getRewardPeriodsInProgress();
-      assertNotNull(rewardPeriodsInProgress);
-      assertEquals(0, rewardPeriodsInProgress.size());
-    } finally {
-      rewardSettingsService.saveSettings(defaultSettings);
-    }
-  }
-
-  private void resetTokenAdminService(WalletTransactionService walletTransactionService,
-                                      WalletTokenAdminService tokenAdminService,
-                                      boolean pendingTransactions,
-                                      boolean successTransactions) throws Exception { // NOSONAR
-    if (container.getComponentInstanceOfType(WalletTokenAdminService.class) != null) {
-      container.unregisterComponent(WalletTokenAdminService.class);
-    }
-    container.registerComponentInstance(WalletTokenAdminService.class, tokenAdminService);
-    Mockito.reset(tokenAdminService);
-    Mockito.when(tokenAdminService.getAdminWalletAddress()).thenReturn("adminAddress");
-    Mockito.when(tokenAdminService.reward(Mockito.any(), Mockito.any())).thenAnswer(new Answer<TransactionDetail>() {
-      @Override
-      public TransactionDetail answer(InvocationOnMock invocation) throws Throwable {
-        TransactionDetail transactionDetail = invocation.getArgument(0, TransactionDetail.class);
-        transactionDetail.setHash(generateTransactionHash());
-        transactionDetail.setPending(pendingTransactions);
-        transactionDetail.setSucceeded(successTransactions);
-        transactionDetail.setContractMethodName("reward");
-        RequestLifeCycle.begin(container);
-        try {
-          walletTransactionService.saveTransactionDetail(transactionDetail, false);
-        } finally {
-          RequestLifeCycle.end();
-        }
-        entitiesToClean.add(transactionDetail);
-        return transactionDetail;
-      }
-    });
-  }
-
-  private RewardTeam createTeamWithMembers(int startInclusive, int endInclusive, RewardBudgetType budgetType, boolean disabled) {
-    WalletRewardTeamService rewardTeamService = getService(WalletRewardTeamService.class);
-    long[] memberIds = LongStream.rangeClosed(startInclusive, endInclusive).toArray();
-    RewardTeam rewardTeam = newRewardTeam(memberIds);
-    rewardTeam.setName("Name" + startInclusive);
-    rewardTeam.setDisabled(disabled);
-    rewardTeam.setRewardType(budgetType);
-    double totalBudget = (double) LongStream.rangeClosed(startInclusive, endInclusive).sum() * 3d;
-    if (budgetType == RewardBudgetType.COMPUTED || budgetType == RewardBudgetType.FIXED) {
-      rewardTeam.setBudget(totalBudget);
-    } else {
-      rewardTeam.setBudget(totalBudget / memberIds.length);
-    }
-    rewardTeam = rewardTeamService.saveTeam(rewardTeam);
-    entitiesToClean.add(rewardTeam);
-    return rewardTeam;
-  }
-
-}
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPluginTest.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPluginTest.java
deleted file mode 100644
index 306f9749a..000000000
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessNotificationPluginTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- *
- * Copyright (C) 2020 - 2024 Meeds Lab contact@meedslab.com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.notification;
-
-import static org.exoplatform.wallet.utils.RewardUtils.REWARD_FAIL_COUNT;
-import static org.exoplatform.wallet.utils.RewardUtils.REWARD_PENDING_COUNT;
-import static org.exoplatform.wallet.utils.RewardUtils.REWARD_REPORT_NOTIFICATION_PARAM;
-import static org.exoplatform.wallet.utils.RewardUtils.REWARD_SUCCESS_COUNT;
-import static org.exoplatform.wallet.utils.RewardUtils.REWARD_TRANSACTION_COUNT;
-import static org.exoplatform.wallet.utils.RewardUtils.REWARD_VALID_MEMBERS_COUNT;
-import static org.exoplatform.wallet.utils.WalletUtils.AMOUNT;
-import static org.mockito.Mockito.when;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.exoplatform.wallet.model.reward.RewardSettings;
-import org.exoplatform.wallet.model.settings.GlobalSettings;
-import org.exoplatform.wallet.reward.BaseRewardTest;
-import org.exoplatform.wallet.service.WalletService;
-import org.junit.jupiter.api.Test;
-
-import org.exoplatform.commons.api.notification.NotificationContext;
-import org.exoplatform.commons.api.notification.model.NotificationInfo;
-import org.exoplatform.commons.notification.impl.NotificationContextImpl;
-import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.wallet.model.reward.RewardPeriod;
-import org.exoplatform.wallet.model.reward.RewardReport;
-import org.exoplatform.wallet.model.reward.WalletReward;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.mockito.Mock;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@SpringJUnitConfig(BaseRewardTest.class)
-public class RewardSuccessNotificationPluginTest extends BaseRewardTest {
-
-  @Mock
-  private InitParams    initParams;
-
-  @Mock
-  private WalletService walletService;
-
-  @Test
-  public void testMakeMessage() {
-    GlobalSettings globalSettings = new GlobalSettings();
-    when(walletService.getSettings()).thenReturn(globalSettings);
-    RewardSuccessNotificationPlugin plugin = new RewardSuccessNotificationPlugin(initParams);
-    plugin.walletService = walletService;
-    NotificationContext ctx = NotificationContextImpl.cloneInstance();
-
-    RewardReport rewardReport = new RewardReport();
-    RewardSettings rewardSettings = new RewardSettings();
-    RewardPeriod rewardPeriod = RewardPeriod.getCurrentPeriod(rewardSettings);
-    rewardReport.setPeriod(rewardPeriod);
-
-    Set<WalletReward> rewards = new HashSet<>();
-    for (int i = 0; i < 30; i++) {
-      TransactionDetail transaction = new TransactionDetail();
-      transaction.setHash("hash");
-      transaction.setContractAmount(2);
-      transaction.setPending(true);
-      rewards.add(new WalletReward(null, null, transaction, null, null));
-    }
-    rewardReport.setRewards(rewards);
-
-    ctx.append(REWARD_REPORT_NOTIFICATION_PARAM, rewardReport);
-    assertTrue(plugin.isValid(ctx));
-
-    NotificationInfo notification = plugin.buildNotification(ctx);
-    assertNotNull(notification);
-    assertEquals(String.valueOf(rewardReport.getFailedTransactionCount()),
-                 notification.getValueOwnerParameter(REWARD_FAIL_COUNT));
-    assertEquals(String.valueOf(rewardReport.getSuccessTransactionCount()),
-                 notification.getValueOwnerParameter(REWARD_SUCCESS_COUNT));
-    assertEquals(String.valueOf(rewardReport.getPendingTransactionCount()),
-                 notification.getValueOwnerParameter(REWARD_PENDING_COUNT));
-    assertEquals(String.valueOf(rewardReport.getTransactionsCount()),
-                 notification.getValueOwnerParameter(REWARD_TRANSACTION_COUNT));
-    assertEquals(String.valueOf(rewardReport.getValidRewardCount()),
-                 notification.getValueOwnerParameter(REWARD_VALID_MEMBERS_COUNT));
-    assertEquals(String.valueOf(rewardReport.getTokensSent()), notification.getValueOwnerParameter(AMOUNT));
-  }
-}
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateBuilderTest.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateBuilderTest.java
deleted file mode 100644
index 6e281a05d..000000000
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateBuilderTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- *
- * Copyright (C) 2020 - 2024 Meeds Lab contact@meedslab.com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.notification;
-
-import static org.exoplatform.wallet.utils.RewardUtils.REWARD_REPORT_NOTIFICATION_PARAM;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.exoplatform.container.PortalContainer;
-import org.exoplatform.wallet.model.reward.RewardSettings;
-import org.exoplatform.wallet.model.settings.GlobalSettings;
-import org.exoplatform.wallet.reward.BaseRewardTest;
-import org.exoplatform.wallet.reward.service.RewardSettingsService;
-import org.exoplatform.wallet.service.WalletService;
-import org.junit.jupiter.api.Test;
-
-import org.exoplatform.commons.api.notification.NotificationContext;
-import org.exoplatform.commons.api.notification.channel.ChannelManager;
-import org.exoplatform.commons.api.notification.model.MessageInfo;
-import org.exoplatform.commons.api.notification.model.NotificationInfo;
-import org.exoplatform.commons.api.notification.plugin.config.PluginConfig;
-import org.exoplatform.commons.api.notification.service.setting.PluginContainer;
-import org.exoplatform.commons.api.notification.service.setting.PluginSettingService;
-import org.exoplatform.commons.notification.impl.NotificationContextImpl;
-import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.container.xml.ObjectParameter;
-import org.exoplatform.container.xml.ValueParam;
-import org.exoplatform.wallet.model.reward.RewardPeriod;
-import org.exoplatform.wallet.model.reward.RewardReport;
-import org.exoplatform.wallet.model.reward.WalletReward;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-
-import org.mockito.Mock;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.Mockito.when;
-
-@SpringJUnitConfig(BaseRewardTest.class)
-public class RewardSuccessTemplateBuilderTest extends BaseRewardTest {
-
-  @Mock
-  private WalletService               walletService;
-
-  @Mock
-  private RewardSettingsService       rewardSettingsService;
-
-  @Test
-  public void testBuildMessage() {
-    PortalContainer container = PortalContainer.getInstance();
-    GlobalSettings globalSettings = new GlobalSettings();
-    when(walletService.getSettings()).thenReturn(globalSettings);
-    when(rewardSettingsService.getSettings()).thenReturn(new RewardSettings());
-    InitParams params = getParams();
-    RewardSuccessNotificationPlugin plugin = new RewardSuccessNotificationPlugin(params);
-    plugin.walletService = walletService;
-
-    RewardSuccessTemplateProvider templateProvider = new RewardSuccessTemplateProvider(container, rewardSettingsService, params);
-    templateProvider.setMailTemplatePath("jar:/template/RewardSuccessReward.gtmpl");
-
-    NotificationContext ctx = NotificationContextImpl.cloneInstance();
-
-    RewardReport rewardReport = new RewardReport();
-    RewardSettings rewardSettings = new RewardSettings();
-    RewardPeriod rewardPeriod = RewardPeriod.getCurrentPeriod(rewardSettings);
-    rewardReport.setPeriod(rewardPeriod);
-
-    Set<WalletReward> rewards = new HashSet<>();
-    for (int i = 0; i < 30; i++) {
-      TransactionDetail transaction = new TransactionDetail();
-      transaction.setHash("hash");
-      transaction.setContractAmount(2);
-      transaction.setPending(true);
-      rewards.add(new WalletReward(null, null, transaction, null, null));
-    }
-    rewardReport.setRewards(rewards);
-    ctx.append(REWARD_REPORT_NOTIFICATION_PARAM, rewardReport);
-    NotificationInfo notification = plugin.buildNotification(ctx);
-    ctx.setNotificationInfo(notification);
-    notification.to(notification.getSendToUserIds().get(0));
-
-    container.getComponentInstanceOfType(PluginSettingService.class).registerPluginConfig(getPluginConfig());
-    container.getComponentInstanceOfType(PluginContainer.class).addPlugin(plugin);
-    container.getComponentInstanceOfType(ChannelManager.class).registerOverrideTemplateProvider(templateProvider);
-
-    MessageInfo message = templateProvider.getBuilder().buildMessage(ctx);
-    assertNotNull(message);
-    assertNotNull(message.getPluginId());
-    assertEquals("Reward success!", message.getBody().replaceAll("(?s)<!--.*?-->", "").trim());
-  }
-
-  private InitParams getParams() {
-    InitParams initParams = new InitParams();
-    ObjectParameter objectParam = new ObjectParameter();
-    objectParam.setName("plugin-config");
-    PluginConfig pluginConfig = getPluginConfig();
-    objectParam.setObject(pluginConfig);
-    initParams.addParam(objectParam);
-
-    ValueParam valueParam = new ValueParam();
-    valueParam.setName("channel-id");
-    valueParam.setValue("MAIL_CHANNEL");
-    initParams.addParam(valueParam);
-    return initParams;
-  }
-
-  private PluginConfig getPluginConfig() {
-    PluginConfig pluginConfig = new PluginConfig();
-    pluginConfig.setPluginId("RewardSuccessNotificationPlugin");
-    pluginConfig.setResourceBundleKey("UINotification.label.RewardSuccessNotificationPlugin");
-    pluginConfig.setOrder("1");
-    pluginConfig.setGroupId("wallet");
-    pluginConfig.setBundlePath("locale.notification.WalletNotification");
-    return pluginConfig;
-  }
-
-}
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateProviderTest.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateProviderTest.java
deleted file mode 100644
index d2ff289ad..000000000
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateProviderTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- *
- * Copyright (C) 2020 - 2024 Meeds Lab contact@meedslab.com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.notification;
-
-import java.util.Map;
-
-import org.exoplatform.container.PortalContainer;
-import org.exoplatform.wallet.model.reward.RewardSettings;
-import org.exoplatform.wallet.reward.BaseRewardTest;
-import org.exoplatform.wallet.reward.service.RewardSettingsService;
-import org.junit.jupiter.api.Test;
-
-import org.exoplatform.commons.api.notification.model.PluginKey;
-import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.container.xml.ValueParam;
-
-import org.mockito.Mock;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.Mockito.when;
-
-@SpringJUnitConfig(BaseRewardTest.class)
-public class RewardSuccessTemplateProviderTest extends BaseRewardTest {
-
-  @Mock
-  private RewardSettingsService rewardSettingsService;
-
-  @Test
-  public void testGetTemplate() {
-    PortalContainer container = PortalContainer.getInstance();
-    when(rewardSettingsService.getSettings()).thenReturn(new RewardSettings());
-    RewardSuccessTemplateProvider provider = new RewardSuccessTemplateProvider(container,
-                                                                               rewardSettingsService,
-                                                                               getParams("MAIL_CHANNEL"));
-    Map<PluginKey, String> templateFilePathConfigs = provider.getTemplateFilePathConfigs();
-    assertNotNull(templateFilePathConfigs);
-    assertEquals(1, templateFilePathConfigs.size());
-    String template = templateFilePathConfigs.values().iterator().next();
-    assertEquals(provider.getMailTemplatePath(), template);
-
-    provider = new RewardSuccessTemplateProvider(container, rewardSettingsService, getParams("MAIL_CHANNEL"));
-    templateFilePathConfigs = provider.getTemplateFilePathConfigs();
-    assertNotNull(templateFilePathConfigs);
-    assertEquals(1, templateFilePathConfigs.size());
-    template = templateFilePathConfigs.values().iterator().next();
-    assertEquals(provider.getMailTemplatePath(), template);
-
-    provider = new RewardSuccessTemplateProvider(container, rewardSettingsService, getParams("PUSH_CHANNEL"));
-    templateFilePathConfigs = provider.getTemplateFilePathConfigs();
-    assertNotNull(templateFilePathConfigs);
-    assertEquals(1, templateFilePathConfigs.size());
-    template = templateFilePathConfigs.values().iterator().next();
-    assertEquals(provider.getPushTemplatePath(), template);
-  }
-
-  private InitParams getParams(String channelId) {
-    InitParams initParams = new InitParams();
-    ValueParam valueParam = new ValueParam();
-    valueParam.setName("channel-id");
-    valueParam.setValue(channelId);
-    initParams.addParam(valueParam);
-    return initParams;
-  }
-
-}
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardTeamServiceTest.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardTeamServiceTest.java
deleted file mode 100644
index 910c4369b..000000000
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/service/WalletRewardTeamServiceTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.service;
-
-import java.util.List;
-
-import org.junit.Test;
-
-import org.exoplatform.wallet.model.reward.RewardTeam;
-import org.exoplatform.wallet.reward.BaseWalletRewardTest;
-
-public class WalletRewardTeamServiceTest extends BaseWalletRewardTest {
-
-  /**
-   * Check that service is instantiated
-   */
-  @Test
-  public void testServiceInstantiated() {
-    WalletRewardTeamService rewardTeamService = getService(WalletRewardTeamService.class);
-    assertNotNull(rewardTeamService);
-  }
-
-  @Test
-  public void testGetTeams() {
-    WalletRewardTeamService rewardTeamService = getService(WalletRewardTeamService.class);
-
-    List<RewardTeam> teams = rewardTeamService.getTeams();
-    assertNotNull(teams);
-    assertEquals(0, teams.size());
-  }
-
-  @Test
-  public void testSaveTeam() {
-    WalletRewardTeamService rewardTeamService = getService(WalletRewardTeamService.class);
-
-    RewardTeam rewardTeam = newRewardTeam();
-
-    rewardTeam = rewardTeamService.saveTeam(rewardTeam);
-
-    entitiesToClean.add(rewardTeam);
-
-    List<RewardTeam> teams = rewardTeamService.getTeams();
-    assertEquals(1, teams.size());
-
-    RewardTeam savedTeam = teams.iterator().next();
-    assertNotNull(savedTeam.getId());
-    assertTrue(savedTeam.getId() > 0);
-    assertEquals(TEAM_NAME, savedTeam.getName());
-    assertEquals(TEAM_DESCRIPTION, savedTeam.getDescription());
-    assertNull(savedTeam.getSpaceId());
-    assertEquals(TEAM_BUDGET, savedTeam.getBudget(), 0);
-    assertEquals(TEAM_BUDGET_TYPE, savedTeam.getRewardType());
-    assertNotNull(savedTeam.getManager());
-    assertEquals(MANAGER_IDENTITY_ID, savedTeam.getManager().getIdentityId(), 0);
-
-    assertNotNull(savedTeam.getMembers());
-    assertEquals(1, savedTeam.getMembers().size());
-    assertNotNull(savedTeam.getMembers().get(0));
-    assertEquals(MEMBER_IDENTITY_ID, savedTeam.getMembers().get(0).getIdentityId(), 0);
-  }
-
-  @Test
-  public void testRemoveTeam() {
-    WalletRewardTeamService rewardTeamService = getService(WalletRewardTeamService.class);
-
-    RewardTeam rewardTeam = newRewardTeam();
-
-    rewardTeam = rewardTeamService.saveTeam(rewardTeam);
-    assertFalse(rewardTeam.isDeleted());
-    List<RewardTeam> teams = rewardTeamService.getTeams();
-    assertEquals(1, teams.size());
-
-    rewardTeamService.removeTeam(rewardTeam.getId());
-    teams = rewardTeamService.getTeams();
-    assertEquals(0, teams.size());
-
-    rewardTeam = rewardTeamService.getTeamsById(rewardTeam.getId());
-    assertTrue(rewardTeam.isDeleted());
-
-    entitiesToClean.add(rewardTeam);
-  }
-
-}
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/test/mock/IdentityManagerMock.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/test/mock/IdentityManagerMock.java
deleted file mode 100644
index 88329ef3e..000000000
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/test/mock/IdentityManagerMock.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.test.mock;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.codec.binary.StringUtils;
-
-import org.exoplatform.commons.utils.ListAccess;
-import org.exoplatform.social.core.identity.IdentityProvider;
-import org.exoplatform.social.core.identity.IdentityProviderPlugin;
-import org.exoplatform.social.core.identity.SpaceMemberFilterListAccess.Type;
-import org.exoplatform.social.core.identity.model.Identity;
-import org.exoplatform.social.core.identity.model.Profile;
-import org.exoplatform.social.core.identity.provider.OrganizationIdentityProvider;
-import org.exoplatform.social.core.identity.provider.SpaceIdentityProvider;
-import org.exoplatform.social.core.manager.IdentityManager;
-import org.exoplatform.social.core.profile.*;
-import org.exoplatform.social.core.space.model.Space;
-import org.exoplatform.social.core.storage.api.IdentityStorage;
-
-public class IdentityManagerMock implements IdentityManager {
-  List<Identity> identities = new ArrayList<>();
-
-  public IdentityManagerMock() {
-    for (int i = 0; i < 100; i++) {
-      Identity identity = new Identity(String.valueOf(i));
-      identity.setDeleted(false);
-      identity.setEnable(true);
-      identity.setProviderId(OrganizationIdentityProvider.NAME);
-      identity.setRemoteId("root" + i);
-      Profile profile = new Profile(identity);
-      identity.setProfile(profile);
-      identities.add(identity);
-    }
-
-    for (int i = 0; i < 100; i++) {
-      Identity identity = new Identity(String.valueOf(i));
-      identity.setDeleted(false);
-      identity.setEnable(true);
-      identity.setProviderId(SpaceIdentityProvider.NAME);
-      identity.setRemoteId("space" + i);
-      Profile profile = new Profile(identity);
-      identity.setProfile(profile);
-      identities.add(identity);
-    }
-  }
-
-  public Identity getOrCreateIdentity(String providerId, String remoteId, boolean isProfileLoaded) {
-    return identities.stream()
-                     .filter(identity -> StringUtils.equals(identity.getProviderId(), providerId)
-                         && StringUtils.equals(identity.getRemoteId(), remoteId))
-                     .findFirst()
-                     .orElse(null);
-  }
-
-  public Identity getIdentity(String identityId, boolean isProfileLoaded) {
-    return identities.stream()
-                     .filter(identity -> StringUtils.equals(identity.getId(), identityId))
-                     .findFirst()
-                     .orElse(null);
-  }
-
-  public void registerIdentityProviders(IdentityProviderPlugin plugin) {
-    // NOOP
-  }
-
-  public void addProfileListener(ProfileListenerPlugin plugin) {
-    // NOOP
-  }
-
-  public Identity getIdentity(String providerId, String remoteId, boolean loadProfile) {
-    return getOrCreateIdentity(providerId, remoteId, loadProfile);
-  }
-
-  public boolean identityExisted(String providerId, String remoteId) {
-    return getOrCreateIdentity(providerId, remoteId, true) != null;
-  }
-
-  public Identity getIdentity(String id) {
-    return getIdentity(id, true);
-  }
-
-  public Identity getOrCreateIdentity(String providerId, String remoteId) {
-    return getOrCreateIdentity(providerId, remoteId, true);
-  }
-
-  public Identity updateIdentity(Identity identity) {
-    return identity;
-  }
-
-  public List<Identity> getLastIdentities(int limit) {
-    throw new UnsupportedOperationException();
-  }
-
-  public void deleteIdentity(Identity identity) {
-    throw new UnsupportedOperationException();
-  }
-
-  public void hardDeleteIdentity(Identity identity) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Identity> getConnectionsWithListAccess(Identity identity) {
-    throw new UnsupportedOperationException();
-  }
-
-  public Profile getProfile(Identity identity) {
-    return identity.getProfile();
-  }
-
-  public InputStream getAvatarInputStream(Identity identity) throws IOException {
-    throw new UnsupportedOperationException();
-  }
-
-  public InputStream getBannerInputStream(Identity identity) throws IOException {
-    throw new UnsupportedOperationException();
-  }
-
-  public void updateProfile(Profile specificProfile) {
-    // empty
-  }
-
-  public ListAccess<Identity> getIdentitiesByProfileFilter(String providerId,
-                                                           ProfileFilter profileFilter,
-                                                           boolean isProfileLoaded) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Identity> getIdentitiesForUnifiedSearch(String providerId, ProfileFilter profileFilter) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Identity> getSpaceIdentityByProfileFilter(Space space,
-                                                              ProfileFilter profileFilter,
-                                                              Type type,
-                                                              boolean isProfileLoaded) {
-    throw new UnsupportedOperationException();
-  }
-
-  public void addIdentityProvider(IdentityProvider<?> identityProvider) {
-    throw new UnsupportedOperationException();
-  }
-
-  public void removeIdentityProvider(IdentityProvider<?> identityProvider) {
-    throw new UnsupportedOperationException();
-  }
-
-  public void registerProfileListener(ProfileListenerPlugin profileListenerPlugin) {
-    throw new UnsupportedOperationException();
-  }
-
-  public void processEnabledIdentity(String remoteId, boolean isEnable) {
-    throw new UnsupportedOperationException();
-  }
-
-  public List<Identity> getIdentitiesByProfileFilter(String providerId, ProfileFilter profileFilter) throws Exception {
-    throw new UnsupportedOperationException();
-  }
-
-  public List<Identity> getIdentitiesByProfileFilter(String providerId,
-                                                     ProfileFilter profileFilter,
-                                                     long offset,
-                                                     long limit) throws Exception {
-    throw new UnsupportedOperationException();
-  }
-
-  public List<Identity> getIdentitiesByProfileFilter(ProfileFilter profileFilter) throws Exception {
-    throw new UnsupportedOperationException();
-  }
-
-  public List<Identity> getIdentitiesByProfileFilter(ProfileFilter profileFilter, long offset, long limit) throws Exception {
-    throw new UnsupportedOperationException();
-  }
-
-  public List<Identity> getIdentitiesFilterByAlphaBet(String providerId, ProfileFilter profileFilter) throws Exception {
-    throw new UnsupportedOperationException();
-  }
-
-  public List<Identity> getIdentitiesFilterByAlphaBet(String providerId,
-                                                      ProfileFilter profileFilter,
-                                                      long offset,
-                                                      long limit) throws Exception {
-    throw new UnsupportedOperationException();
-  }
-
-  public List<Identity> getIdentitiesFilterByAlphaBet(ProfileFilter profileFilter) throws Exception {
-    throw new UnsupportedOperationException();
-  }
-
-  public long getIdentitiesCount(String providerId) {
-    throw new UnsupportedOperationException();
-  }
-
-  public List<Identity> getConnections(Identity ownerIdentity) throws Exception {
-    throw new UnsupportedOperationException();
-  }
-
-  public IdentityStorage getIdentityStorage() {
-    throw new UnsupportedOperationException();
-  }
-
-  public IdentityStorage getStorage() {
-    throw new UnsupportedOperationException();
-  }
-
-  public void registerProfileListener(ProfileListener listener) {
-    throw new UnsupportedOperationException();
-  }
-
-  public void unregisterProfileListener(ProfileListener listener) {
-    throw new UnsupportedOperationException();
-  }
-
-}
diff --git a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/test/mock/SpaceServiceMock.java b/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/test/mock/SpaceServiceMock.java
deleted file mode 100644
index 365d35b29..000000000
--- a/wallet-reward-services/src/test/java/org/exoplatform/wallet/reward/test/mock/SpaceServiceMock.java
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.exoplatform.wallet.reward.test.mock;
-
-import java.util.List;
-
-import org.exoplatform.commons.utils.ListAccess;
-import org.exoplatform.services.security.MembershipEntry;
-import org.exoplatform.social.core.application.PortletPreferenceRequiredPlugin;
-import org.exoplatform.social.core.identity.model.Identity;
-import org.exoplatform.social.core.space.*;
-import org.exoplatform.social.core.space.model.Space;
-import org.exoplatform.social.core.space.spi.SpaceLifeCycleListener;
-import org.exoplatform.social.core.space.spi.SpaceService;
-
-@SuppressWarnings("all")
-public class SpaceServiceMock implements SpaceService {
-
-  public Space getSpaceByDisplayName(String spaceDisplayName) {
-    throw new UnsupportedOperationException();
-  }
-
-  public Space getSpaceByPrettyName(String spacePrettyName) {
-    throw new UnsupportedOperationException();
-  }
-
-  public Space getSpaceByGroupId(String groupId) {
-    throw new UnsupportedOperationException();
-  }
-
-  public Space getSpaceById(String spaceId) {
-    return null;
-  }
-
-  public Space getSpaceByUrl(String spaceUrl) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Space> getAllSpacesWithListAccess() {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Space> getAllSpacesByFilter(SpaceFilter spaceFilter) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Space> getMemberSpaces(String userId) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Space> getMemberSpacesByFilter(String userId, SpaceFilter spaceFilter) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Space> getAccessibleSpacesWithListAccess(String userId) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Space> getAccessibleSpacesByFilter(String userId, SpaceFilter spaceFilter) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Space> getSettingableSpaces(String userId) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Space> getSettingabledSpacesByFilter(String userId, SpaceFilter spaceFilter) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Space> getInvitedSpacesWithListAccess(String userId) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Space> getInvitedSpacesByFilter(String userId, SpaceFilter spaceFilter) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Space> getPublicSpacesWithListAccess(String userId) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Space> getPublicSpacesByFilter(String userId, SpaceFilter spaceFilter) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Space> getPendingSpacesWithListAccess(String userId) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Space> getPendingSpacesByFilter(String userId, SpaceFilter spaceFilter) {
-    throw new UnsupportedOperationException();
-  }
-
-  public Space createSpace(Space space, String creatorUserId) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Space createSpace(Space space, String creatorUserId, List<Identity> identitiesToInvite) throws SpaceException {
-    throw new UnsupportedOperationException();
-  }
-
-  public Space updateSpace(Space existingSpace) {
-    throw new UnsupportedOperationException();
-  }
-
-  public Space updateSpaceAvatar(Space existingSpace, String username) {
-    throw new UnsupportedOperationException();
-  }
-
-  public Space updateSpaceBanner(Space existingSpace, String username) {
-    throw new UnsupportedOperationException();
-  }
-
-  public void deleteSpace(Space space) {
-    throw new UnsupportedOperationException();
-  }
-
-  public void addPendingUser(Space space, String userId) {
-    throw new UnsupportedOperationException();
-  }
-
-  public void removePendingUser(Space space, String userId) {
-    throw new UnsupportedOperationException();
-  }
-
-  public boolean isPendingUser(Space space, String userId) {
-    throw new UnsupportedOperationException();
-  }
-
-  public void addInvitedUser(Space space, String userId) {
-    throw new UnsupportedOperationException();
-  }
-
-  public void removeInvitedUser(Space space, String userId) {
-    throw new UnsupportedOperationException();
-  }
-
-  public boolean isInvitedUser(Space space, String userId) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void addMember(Space space, String userId) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void removeMember(Space space, String userId) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public boolean isMember(Space space, String userId) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void setManager(Space space, String userId, boolean isManager) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public boolean isManager(Space space, String userId) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public boolean isOnlyManager(Space space, String userId) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public boolean hasAccessPermission(Space space, String userId) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public boolean hasSettingPermission(Space space, String userId) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void registerSpaceListenerPlugin(SpaceListenerPlugin spaceListenerPlugin) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void unregisterSpaceListenerPlugin(SpaceListenerPlugin spaceListenerPlugin) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void setSpaceApplicationConfigPlugin(SpaceApplicationConfigPlugin spaceApplicationConfigPlugin) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public SpaceApplicationConfigPlugin getSpaceApplicationConfigPlugin() {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public List<Space> getAllSpaces() throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public Space getSpaceByName(String spaceName) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public List<Space> getSpacesByFirstCharacterOfName(String firstCharacterOfName) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public List<Space> getSpacesBySearchCondition(String condition) throws Exception {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public List<Space> getSpaces(String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public List<Space> getAccessibleSpaces(String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public List<Space> getVisibleSpaces(String userId, SpaceFilter spaceFilter) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public SpaceListAccess getVisibleSpacesWithListAccess(String userId, SpaceFilter spaceFilter) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public SpaceListAccess getUnifiedSearchSpacesWithListAccess(String userId, SpaceFilter spaceFilter) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public List<Space> getEditableSpaces(String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public List<Space> getInvitedSpaces(String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public List<Space> getPublicSpaces(String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public List<Space> getPendingSpaces(String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public Space createSpace(Space space, String creator, String invitedGroupId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void saveSpace(Space space, boolean isNew) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void renameSpace(Space space, String newDisplayName) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void renameSpace(Space space, String newDisplayName, String remoteId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void deleteSpace(String spaceId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void initApp(Space space) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void initApps(Space space) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void deInitApps(Space space) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void addMember(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void removeMember(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public List<String> getMembers(Space space) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public List<String> getMembers(String spaceId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void setLeader(Space space, String userId, boolean isLeader) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void setLeader(String spaceId, String userId, boolean isLeader) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public boolean isLeader(Space space, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public boolean isLeader(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public boolean isOnlyLeader(Space space, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public boolean isOnlyLeader(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-  }
-
-  public boolean isMember(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public boolean hasAccessPermission(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-  }
-
-  public boolean hasEditPermission(Space space, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-  }
-
-  public boolean hasEditPermission(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-  }
-
-  public boolean isInvited(Space space, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-  }
-
-  public boolean isInvited(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-  }
-
-  public boolean isPending(Space space, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-  }
-
-  public boolean isPending(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void installApplication(String spaceId, String appId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void installApplication(Space space, String appId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void activateApplication(Space space, String appId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void activateApplication(String spaceId, String appId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void deactivateApplication(Space space, String appId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void deactivateApplication(String spaceId, String appId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void removeApplication(Space space, String appId, String appName) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void removeApplication(String spaceId, String appId, String appName) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void updateSpaceAccessed(String remoteId, Space space) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public List<Space> getLastAccessedSpace(String remoteId, String appId, int offset, int limit) throws SpaceException {
-    throw new UnsupportedOperationException();
-  }
-
-  public List<Space> getLastSpaces(int limit) {
-    throw new UnsupportedOperationException();
-  }
-
-  public ListAccess<Space> getLastAccessedSpace(String remoteId, String appId) {
-    throw new UnsupportedOperationException();
-  }
-
-  public void requestJoin(Space space, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void requestJoin(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void revokeRequestJoin(Space space, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void revokeRequestJoin(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void inviteMember(Space space, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void inviteMember(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void revokeInvitation(Space space, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void revokeInvitation(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void acceptInvitation(Space space, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void acceptInvitation(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void denyInvitation(Space space, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void denyInvitation(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void validateRequest(Space space, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void validateRequest(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void declineRequest(Space space, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void declineRequest(String spaceId, String userId) throws SpaceException {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void registerSpaceLifeCycleListener(SpaceLifeCycleListener listener) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public void unregisterSpaceLifeCycleListener(SpaceLifeCycleListener listener) {
-    throw new UnsupportedOperationException();
-
-  }
-
-  public ListAccess<Space> getVisitedSpaces(String remoteId, String appId) {
-    throw new UnsupportedOperationException();
-  }
-
-  public boolean isSuperManager(String userId) {
-    throw new UnsupportedOperationException();
-  }
-
-}
diff --git a/wallet-services/pom.xml b/wallet-services/pom.xml
index a993af281..fc717804c 100644
--- a/wallet-services/pom.xml
+++ b/wallet-services/pom.xml
@@ -25,7 +25,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <artifactId>wallet-services</artifactId>
   <name>Meeds:: Add-on:: Wallet - Services</name>
   <properties>
-    <exo.test.coverage.ratio>0.62</exo.test.coverage.ratio>
+    <exo.test.coverage.ratio>0.60</exo.test.coverage.ratio>
   </properties>
   <dependencies>
     <dependency>
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/BlockchainRequestException.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/BlockchainRequestException.java
similarity index 96%
rename from wallet-services/src/main/java/org/exoplatform/wallet/blockchain/BlockchainRequestException.java
rename to wallet-services/src/main/java/io/meeds/wallet/blockchain/BlockchainRequestException.java
index 038b2a0aa..ee0d42425 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/BlockchainRequestException.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/BlockchainRequestException.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain;
+package io.meeds.wallet.blockchain;
 
 public class BlockchainRequestException extends RuntimeException {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/MaxRequestRateReachedException.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/MaxRequestRateReachedException.java
similarity index 96%
rename from wallet-services/src/main/java/org/exoplatform/wallet/blockchain/MaxRequestRateReachedException.java
rename to wallet-services/src/main/java/io/meeds/wallet/blockchain/MaxRequestRateReachedException.java
index dacac59c2..ae4982d05 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/MaxRequestRateReachedException.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/MaxRequestRateReachedException.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain;
+package io.meeds.wallet.blockchain;
 
 public class MaxRequestRateReachedException extends RuntimeException {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/ContractTransactionMinedListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/ContractTransactionMinedListener.java
similarity index 91%
rename from wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/ContractTransactionMinedListener.java
rename to wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/ContractTransactionMinedListener.java
index 3e9541f62..a98c1bc03 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/ContractTransactionMinedListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/ContractTransactionMinedListener.java
@@ -14,17 +14,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.listener;
+package io.meeds.wallet.blockchain.listener;
 
 import org.exoplatform.services.listener.Asynchronous;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.model.ContractTransactionEvent;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.BlockchainTransactionService;
-import org.exoplatform.wallet.service.WalletTransactionService;
+import io.meeds.wallet.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
 
 /**
  * Triggered when a contract transaction is mined. This listener will not be
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/TransactionMinedAndUpdatedListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionMinedAndUpdatedListener.java
similarity index 92%
rename from wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/TransactionMinedAndUpdatedListener.java
rename to wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionMinedAndUpdatedListener.java
index 95e7f9388..44e148d7e 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/TransactionMinedAndUpdatedListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionMinedAndUpdatedListener.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.listener;
+package io.meeds.wallet.blockchain.listener;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
@@ -25,9 +25,9 @@
 import org.exoplatform.services.listener.Asynchronous;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.BlockchainTransactionService;
-import org.exoplatform.wallet.service.WalletTransactionService;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
 
 /**
  * This listener will be triggered when a transaction is mined and updated on
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/TransactionMinedListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionMinedListener.java
similarity index 91%
rename from wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/TransactionMinedListener.java
rename to wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionMinedListener.java
index 7a0432c1e..82a985a70 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/TransactionMinedListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionMinedListener.java
@@ -14,10 +14,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.listener;
+package io.meeds.wallet.blockchain.listener;
 
-import static org.exoplatform.wallet.utils.WalletUtils.ETHER_FUNC_SEND_FUNDS;
-import static org.exoplatform.wallet.utils.WalletUtils.TRANSACTION_MINED_AND_UPDATED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.ETHER_FUNC_SEND_FUNDS;
+import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_MINED_AND_UPDATED_EVENT;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -31,10 +31,10 @@
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.listener.ListenerService;
 import org.exoplatform.wallet.contract.MeedsToken;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.service.WalletTransactionService;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
 
 /**
  * A listener that is triggered once a transaction is mined. It will update the
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/TransactionSentToBlockchainListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionSentToBlockchainListener.java
similarity index 81%
rename from wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/TransactionSentToBlockchainListener.java
rename to wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionSentToBlockchainListener.java
index ca849d6d9..7677a62fe 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/TransactionSentToBlockchainListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionSentToBlockchainListener.java
@@ -1,10 +1,10 @@
-package org.exoplatform.wallet.blockchain.listener;
+package io.meeds.wallet.blockchain.listener;
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.BlockchainTransactionService;
-import org.exoplatform.wallet.service.WalletTransactionService;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
 
 /**
  * A listener that will be triggered when a transaction is effectively sent to
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/TransactionWithNonceVerifierListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionWithNonceVerifierListener.java
similarity index 92%
rename from wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/TransactionWithNonceVerifierListener.java
rename to wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionWithNonceVerifierListener.java
index cd7d8c282..47218424b 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/TransactionWithNonceVerifierListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionWithNonceVerifierListener.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.listener;
+package io.meeds.wallet.blockchain.listener;
 
 import java.util.List;
 import java.util.Map;
@@ -25,10 +25,10 @@
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.BlockchainTransactionService;
-import org.exoplatform.wallet.service.WalletTransactionService;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
 
 /**
  * A listener that is triggered once a contract transaction is mined. It will
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/WebSocketContractListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketContractListener.java
similarity index 90%
rename from wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/WebSocketContractListener.java
rename to wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketContractListener.java
index 85791444c..26502a1e2 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/WebSocketContractListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketContractListener.java
@@ -14,13 +14,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.listener;
+package io.meeds.wallet.blockchain.listener;
 
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.service.WalletWebSocketService;
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.service.WalletWebSocketService;
 
 public class WebSocketContractListener extends Listener<Object, ContractDetail> {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/WebSocketTransactionListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketTransactionListener.java
similarity index 90%
rename from wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/WebSocketTransactionListener.java
rename to wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketTransactionListener.java
index 31ba061ae..56c887669 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/WebSocketTransactionListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketTransactionListener.java
@@ -14,13 +14,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.listener;
+package io.meeds.wallet.blockchain.listener;
 
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.WalletWebSocketService;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.service.WalletWebSocketService;
 
 public class WebSocketTransactionListener extends Listener<Object, TransactionDetail> {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/WebSocketWalletListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketWalletListener.java
similarity index 91%
rename from wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/WebSocketWalletListener.java
rename to wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketWalletListener.java
index f17b06f2f..a9a270911 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/listener/WebSocketWalletListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketWalletListener.java
@@ -14,13 +14,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.listener;
+package io.meeds.wallet.blockchain.listener;
 
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.service.WalletWebSocketService;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.service.WalletWebSocketService;
 
 public class WebSocketWalletListener extends Listener<Object, Object> {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/service/EthereumBlockchainTransactionService.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumBlockchainTransactionService.java
similarity index 96%
rename from wallet-services/src/main/java/org/exoplatform/wallet/blockchain/service/EthereumBlockchainTransactionService.java
rename to wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumBlockchainTransactionService.java
index fe1cd3453..f75443354 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/service/EthereumBlockchainTransactionService.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumBlockchainTransactionService.java
@@ -14,18 +14,18 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.service;
-
-import static org.exoplatform.wallet.utils.WalletUtils.EMPTY_HASH;
-import static org.exoplatform.wallet.utils.WalletUtils.ETHER_TO_WEI_DECIMALS;
-import static org.exoplatform.wallet.utils.WalletUtils.LAST_BLOCK_NUMBER_KEY_NAME;
-import static org.exoplatform.wallet.utils.WalletUtils.TRANSACTION_EFFECTIVELY_SENT_CODE;
-import static org.exoplatform.wallet.utils.WalletUtils.TRANSACTION_SENT_TO_BLOCKCHAIN_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_CONTEXT;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_SCOPE;
-import static org.exoplatform.wallet.utils.WalletUtils.getContractDetail;
-import static org.exoplatform.wallet.utils.WalletUtils.getNetworkId;
-import static org.exoplatform.wallet.utils.WalletUtils.isWalletEmpty;
+package io.meeds.wallet.blockchain.service;
+
+import static io.meeds.wallet.wallet.utils.WalletUtils.EMPTY_HASH;
+import static io.meeds.wallet.wallet.utils.WalletUtils.ETHER_TO_WEI_DECIMALS;
+import static io.meeds.wallet.wallet.utils.WalletUtils.LAST_BLOCK_NUMBER_KEY_NAME;
+import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_EFFECTIVELY_SENT_CODE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_SENT_TO_BLOCKCHAIN_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_CONTEXT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_SCOPE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getContractDetail;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getNetworkId;
+import static io.meeds.wallet.wallet.utils.WalletUtils.isWalletEmpty;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -69,17 +69,17 @@
 import org.exoplatform.services.listener.ListenerService;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.blockchain.BlockchainRequestException;
-import org.exoplatform.wallet.blockchain.MaxRequestRateReachedException;
+import io.meeds.wallet.blockchain.BlockchainRequestException;
+import io.meeds.wallet.blockchain.MaxRequestRateReachedException;
 import org.exoplatform.wallet.contract.MeedsToken;
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.model.ContractTransactionEvent;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.BlockchainTransactionService;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.service.WalletService;
-import org.exoplatform.wallet.service.WalletTransactionService;
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
 
 public class EthereumBlockchainTransactionService implements BlockchainTransactionService, Startable {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/service/EthereumClientConnector.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumClientConnector.java
similarity index 95%
rename from wallet-services/src/main/java/org/exoplatform/wallet/blockchain/service/EthereumClientConnector.java
rename to wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumClientConnector.java
index b8fc908fb..5c6047062 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/service/EthereumClientConnector.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumClientConnector.java
@@ -14,25 +14,25 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.service;
-
-import static org.exoplatform.wallet.utils.WalletUtils.CONTRACT_TRANSACTION_MINED_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.GWEI_TO_WEI_DECIMALS;
-import static org.exoplatform.wallet.utils.WalletUtils.OPERATION_GET_ETHER_BALANCE;
-import static org.exoplatform.wallet.utils.WalletUtils.OPERATION_GET_FILTER_CHANGES;
-import static org.exoplatform.wallet.utils.WalletUtils.OPERATION_GET_FILTER_LOGS;
-import static org.exoplatform.wallet.utils.WalletUtils.OPERATION_GET_GAS_PRICE;
-import static org.exoplatform.wallet.utils.WalletUtils.OPERATION_GET_LAST_BLOCK_NUMBER;
-import static org.exoplatform.wallet.utils.WalletUtils.OPERATION_GET_TRANSACTION;
-import static org.exoplatform.wallet.utils.WalletUtils.OPERATION_GET_TRANSACTION_COUNT;
-import static org.exoplatform.wallet.utils.WalletUtils.OPERATION_GET_TRANSACTION_RECEIPT;
-import static org.exoplatform.wallet.utils.WalletUtils.OPERATION_NEW_FILTER;
-import static org.exoplatform.wallet.utils.WalletUtils.OPERATION_SEND_TRANSACTION;
-import static org.exoplatform.wallet.utils.WalletUtils.OPERATION_UNINSTALL_FILTER;
-import static org.exoplatform.wallet.utils.WalletUtils.convertFromDecimals;
-import static org.exoplatform.wallet.utils.WalletUtils.getContractAddress;
-import static org.exoplatform.wallet.utils.WalletUtils.getNetworkId;
-import static org.exoplatform.wallet.utils.WalletUtils.getWebsocketURL;
+package io.meeds.wallet.blockchain.service;
+
+import static io.meeds.wallet.wallet.utils.WalletUtils.CONTRACT_TRANSACTION_MINED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GWEI_TO_WEI_DECIMALS;
+import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_ETHER_BALANCE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_FILTER_CHANGES;
+import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_FILTER_LOGS;
+import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_GAS_PRICE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_LAST_BLOCK_NUMBER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_TRANSACTION;
+import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_TRANSACTION_COUNT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_TRANSACTION_RECEIPT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_NEW_FILTER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_SEND_TRANSACTION;
+import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_UNINSTALL_FILTER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.convertFromDecimals;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getContractAddress;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getNetworkId;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getWebsocketURL;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -75,10 +75,10 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.wallet.contract.MeedsToken;
-import org.exoplatform.wallet.model.ContractTransactionEvent;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.statistic.ExoWalletStatistic;
-import org.exoplatform.wallet.statistic.ExoWalletStatisticService;
+import io.meeds.wallet.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.statistic.ExoWalletStatistic;
+import io.meeds.wallet.wallet.statistic.ExoWalletStatisticService;
 
 import io.meeds.wallet.lock.Lock;
 import io.reactivex.Flowable;
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/service/EthereumWalletTokenAdminService.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumWalletTokenAdminService.java
similarity index 95%
rename from wallet-services/src/main/java/org/exoplatform/wallet/blockchain/service/EthereumWalletTokenAdminService.java
rename to wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumWalletTokenAdminService.java
index f7001977e..a5f1b1327 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/blockchain/service/EthereumWalletTokenAdminService.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumWalletTokenAdminService.java
@@ -14,20 +14,20 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.service;
-
-import static org.exoplatform.wallet.utils.WalletUtils.ETHER_TO_WEI_DECIMALS;
-import static org.exoplatform.wallet.utils.WalletUtils.OPERATION_READ_FROM_TOKEN;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_ADMIN_REMOTE_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.convertFromDecimals;
-import static org.exoplatform.wallet.utils.WalletUtils.getContractDetail;
-import static org.exoplatform.wallet.utils.WalletUtils.getGasLimit;
-import static org.exoplatform.wallet.utils.WalletUtils.getIdentityByTypeAndId;
-import static org.exoplatform.wallet.utils.WalletUtils.getNetworkId;
-import static org.exoplatform.wallet.utils.WalletUtils.getSettings;
-import static org.exoplatform.wallet.utils.WalletUtils.getWebsocketURL;
-import static org.exoplatform.wallet.utils.WalletUtils.isUserRewardingAdmin;
-import static org.exoplatform.wallet.utils.WalletUtils.toJsonString;
+package io.meeds.wallet.blockchain.service;
+
+import static io.meeds.wallet.wallet.utils.WalletUtils.ETHER_TO_WEI_DECIMALS;
+import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_READ_FROM_TOKEN;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_ADMIN_REMOTE_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.convertFromDecimals;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getContractDetail;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getGasLimit;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getIdentityByTypeAndId;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getNetworkId;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getSettings;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getWebsocketURL;
+import static io.meeds.wallet.wallet.utils.WalletUtils.isUserRewardingAdmin;
+import static io.meeds.wallet.wallet.utils.WalletUtils.toJsonString;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -83,19 +83,19 @@
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.identity.model.Identity;
 import org.exoplatform.wallet.contract.MeedsToken;
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.WalletType;
-import org.exoplatform.wallet.model.settings.GlobalSettings;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.service.WalletContractService;
-import org.exoplatform.wallet.service.WalletService;
-import org.exoplatform.wallet.service.WalletTokenAdminService;
-import org.exoplatform.wallet.service.WalletTransactionService;
-import org.exoplatform.wallet.statistic.ExoWalletStatistic;
-import org.exoplatform.wallet.statistic.ExoWalletStatisticService;
-import org.exoplatform.wallet.storage.WalletStorage;
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.wallet.model.settings.GlobalSettings;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletContractService;
+import io.meeds.wallet.wallet.service.WalletService;
+import io.meeds.wallet.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
+import io.meeds.wallet.wallet.statistic.ExoWalletStatistic;
+import io.meeds.wallet.wallet.statistic.ExoWalletStatisticService;
+import io.meeds.wallet.storage.WalletStorage;
 
 public class EthereumWalletTokenAdminService implements WalletTokenAdminService, Startable, ExoWalletStatisticService {
   private static final Log                        LOG                                     =
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/dao/AddressLabelDAO.java b/wallet-services/src/main/java/io/meeds/wallet/dao/AddressLabelDAO.java
similarity index 91%
rename from wallet-services/src/main/java/org/exoplatform/wallet/dao/AddressLabelDAO.java
rename to wallet-services/src/main/java/io/meeds/wallet/dao/AddressLabelDAO.java
index 2a8263808..2249878bb 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/dao/AddressLabelDAO.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/dao/AddressLabelDAO.java
@@ -14,10 +14,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.dao;
+package io.meeds.wallet.dao;
 
 import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
-import org.exoplatform.wallet.entity.AddressLabelEntity;
+import io.meeds.wallet.entity.AddressLabelEntity;
 
 public class AddressLabelDAO extends GenericDAOJPAImpl<AddressLabelEntity, Long> {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/dao/WalletAccountBackupDAO.java b/wallet-services/src/main/java/io/meeds/wallet/dao/WalletAccountBackupDAO.java
similarity index 95%
rename from wallet-services/src/main/java/org/exoplatform/wallet/dao/WalletAccountBackupDAO.java
rename to wallet-services/src/main/java/io/meeds/wallet/dao/WalletAccountBackupDAO.java
index 842bb297a..df4aaa4c9 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/dao/WalletAccountBackupDAO.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/dao/WalletAccountBackupDAO.java
@@ -14,10 +14,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.dao;
+package io.meeds.wallet.dao;
 
 import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
-import org.exoplatform.wallet.entity.WalletBackupEntity;
+import io.meeds.wallet.entity.WalletBackupEntity;
 
 import jakarta.persistence.NoResultException;
 import jakarta.persistence.TypedQuery;
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/dao/WalletAccountDAO.java b/wallet-services/src/main/java/io/meeds/wallet/dao/WalletAccountDAO.java
similarity index 85%
rename from wallet-services/src/main/java/org/exoplatform/wallet/dao/WalletAccountDAO.java
rename to wallet-services/src/main/java/io/meeds/wallet/dao/WalletAccountDAO.java
index ddd726f56..4cbd742d0 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/dao/WalletAccountDAO.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/dao/WalletAccountDAO.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.dao;
+package io.meeds.wallet.dao;
 
 import java.util.List;
 
@@ -23,7 +23,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
-import org.exoplatform.wallet.entity.WalletEntity;
+import io.meeds.wallet.entity.WalletEntity;
 
 public class WalletAccountDAO extends GenericDAOJPAImpl<WalletEntity, Long> {
 
@@ -37,6 +37,12 @@ public void deleteAll(List<WalletEntity> entities) {
     throw new UnsupportedOperationException();
   }
 
+  public List<WalletEntity> findListByIdentityIds(List<Long> identityIds) {
+    TypedQuery<WalletEntity> query = getEntityManager().createNamedQuery("Wallet.findListByIdentityIds", WalletEntity.class);
+    query.setParameter("identityIds", identityIds);
+    return query.getResultList();
+  }
+
   public WalletEntity findByAddress(String address) {
     TypedQuery<WalletEntity> query = getEntityManager().createNamedQuery("Wallet.findByAddress",
                                                                          WalletEntity.class);
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/dao/WalletBlockchainStateDAO.java b/wallet-services/src/main/java/io/meeds/wallet/dao/WalletBlockchainStateDAO.java
similarity index 95%
rename from wallet-services/src/main/java/org/exoplatform/wallet/dao/WalletBlockchainStateDAO.java
rename to wallet-services/src/main/java/io/meeds/wallet/dao/WalletBlockchainStateDAO.java
index 132254afa..0b01027aa 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/dao/WalletBlockchainStateDAO.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/dao/WalletBlockchainStateDAO.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.dao;
+package io.meeds.wallet.dao;
 
 import java.util.List;
 
@@ -24,7 +24,7 @@
 import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.entity.WalletBlockchainStateEntity;
+import io.meeds.wallet.entity.WalletBlockchainStateEntity;
 
 public class WalletBlockchainStateDAO extends GenericDAOJPAImpl<WalletBlockchainStateEntity, Long> {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/dao/WalletPrivateKeyDAO.java b/wallet-services/src/main/java/io/meeds/wallet/dao/WalletPrivateKeyDAO.java
similarity index 94%
rename from wallet-services/src/main/java/org/exoplatform/wallet/dao/WalletPrivateKeyDAO.java
rename to wallet-services/src/main/java/io/meeds/wallet/dao/WalletPrivateKeyDAO.java
index 8d14e7011..5ebba590a 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/dao/WalletPrivateKeyDAO.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/dao/WalletPrivateKeyDAO.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.dao;
+package io.meeds.wallet.dao;
 
 import java.util.List;
 
@@ -22,7 +22,7 @@
 import jakarta.persistence.TypedQuery;
 
 import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
-import org.exoplatform.wallet.entity.WalletPrivateKeyEntity;
+import io.meeds.wallet.entity.WalletPrivateKeyEntity;
 
 public class WalletPrivateKeyDAO extends GenericDAOJPAImpl<WalletPrivateKeyEntity, Long> {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/dao/WalletTransactionDAO.java b/wallet-services/src/main/java/io/meeds/wallet/dao/WalletTransactionDAO.java
similarity index 99%
rename from wallet-services/src/main/java/org/exoplatform/wallet/dao/WalletTransactionDAO.java
rename to wallet-services/src/main/java/io/meeds/wallet/dao/WalletTransactionDAO.java
index cd2896d6a..98ba7bcbb 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/dao/WalletTransactionDAO.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/dao/WalletTransactionDAO.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.dao;
+package io.meeds.wallet.dao;
 
 import java.time.ZonedDateTime;
 import java.util.Collections;
@@ -25,7 +25,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
-import org.exoplatform.wallet.entity.TransactionEntity;
+import io.meeds.wallet.entity.TransactionEntity;
 
 public class WalletTransactionDAO extends GenericDAOJPAImpl<TransactionEntity, Long> {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/entity/AddressLabelEntity.java b/wallet-services/src/main/java/io/meeds/wallet/entity/AddressLabelEntity.java
similarity index 98%
rename from wallet-services/src/main/java/org/exoplatform/wallet/entity/AddressLabelEntity.java
rename to wallet-services/src/main/java/io/meeds/wallet/entity/AddressLabelEntity.java
index 144847665..fc7768637 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/entity/AddressLabelEntity.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/entity/AddressLabelEntity.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.entity;
+package io.meeds.wallet.entity;
 
 import java.io.Serializable;
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/entity/TransactionEntity.java b/wallet-services/src/main/java/io/meeds/wallet/entity/TransactionEntity.java
similarity index 99%
rename from wallet-services/src/main/java/org/exoplatform/wallet/entity/TransactionEntity.java
rename to wallet-services/src/main/java/io/meeds/wallet/entity/TransactionEntity.java
index cd7cb881a..a16292480 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/entity/TransactionEntity.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/entity/TransactionEntity.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.entity;
+package io.meeds.wallet.entity;
 
 import java.io.Serializable;
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/entity/WalletBackupEntity.java b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletBackupEntity.java
similarity index 98%
rename from wallet-services/src/main/java/org/exoplatform/wallet/entity/WalletBackupEntity.java
rename to wallet-services/src/main/java/io/meeds/wallet/entity/WalletBackupEntity.java
index 891a3e640..22c74aa7e 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/entity/WalletBackupEntity.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletBackupEntity.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.entity;
+package io.meeds.wallet.entity;
 
 import java.io.Serializable;
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/entity/WalletBlockchainStateEntity.java b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletBlockchainStateEntity.java
similarity index 98%
rename from wallet-services/src/main/java/org/exoplatform/wallet/entity/WalletBlockchainStateEntity.java
rename to wallet-services/src/main/java/io/meeds/wallet/entity/WalletBlockchainStateEntity.java
index 3f9fad8dc..6fb6819e6 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/entity/WalletBlockchainStateEntity.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletBlockchainStateEntity.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.entity;
+package io.meeds.wallet.entity;
 
 import java.io.Serializable;
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/entity/WalletEntity.java b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletEntity.java
similarity index 93%
rename from wallet-services/src/main/java/org/exoplatform/wallet/entity/WalletEntity.java
rename to wallet-services/src/main/java/io/meeds/wallet/entity/WalletEntity.java
index 7182571cd..fce6e598f 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/entity/WalletEntity.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletEntity.java
@@ -14,25 +14,26 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.entity;
+package io.meeds.wallet.entity;
 
 import java.io.Serializable;
 import java.util.Collection;
 
 import jakarta.persistence.*;
 
-import org.exoplatform.wallet.model.WalletProvider;
-import org.exoplatform.wallet.model.WalletState;
+import io.meeds.wallet.wallet.model.WalletProvider;
+import io.meeds.wallet.wallet.model.WalletState;
 import org.hibernate.annotations.DynamicUpdate;
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
-import org.exoplatform.wallet.model.WalletType;
+import io.meeds.wallet.wallet.model.WalletType;
 
 @Entity(name = "Wallet")
 @ExoEntity
 @DynamicUpdate
 @Table(name = "ADDONS_WALLET_ACCOUNT")
 @NamedQuery(name = "Wallet.findByAddress", query = "SELECT w FROM Wallet w WHERE LOWER(w.address) = :address")
+@NamedQuery(name = "Wallet.findListByIdentityIds", query = "SELECT w FROM Wallet w WHERE w.id IN (:identityIds)")
 public class WalletEntity implements Serializable {
   private static final long                       serialVersionUID = -1622032986992776281L;
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/entity/WalletPrivateKeyEntity.java b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletPrivateKeyEntity.java
similarity index 98%
rename from wallet-services/src/main/java/org/exoplatform/wallet/entity/WalletPrivateKeyEntity.java
rename to wallet-services/src/main/java/io/meeds/wallet/entity/WalletPrivateKeyEntity.java
index 715d735f4..65d082bb4 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/entity/WalletPrivateKeyEntity.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletPrivateKeyEntity.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.entity;
+package io.meeds.wallet.entity;
 
 import java.io.Serializable;
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/job/BoostAdminTransactionJob.java b/wallet-services/src/main/java/io/meeds/wallet/job/BoostAdminTransactionJob.java
similarity index 95%
rename from wallet-services/src/main/java/org/exoplatform/wallet/job/BoostAdminTransactionJob.java
rename to wallet-services/src/main/java/io/meeds/wallet/job/BoostAdminTransactionJob.java
index 04f2948d7..fd61e1569 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/job/BoostAdminTransactionJob.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/job/BoostAdminTransactionJob.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.job;
+package io.meeds.wallet.job;
 
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
@@ -27,7 +27,7 @@
 import org.exoplatform.container.component.RequestLifeCycle;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.wallet.service.WalletTokenAdminService;
 
 @DisallowConcurrentExecution
 public class BoostAdminTransactionJob implements Job {
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/job/PendingEtherTransactionVerifierJob.java b/wallet-services/src/main/java/io/meeds/wallet/job/PendingEtherTransactionVerifierJob.java
similarity index 91%
rename from wallet-services/src/main/java/org/exoplatform/wallet/job/PendingEtherTransactionVerifierJob.java
rename to wallet-services/src/main/java/io/meeds/wallet/job/PendingEtherTransactionVerifierJob.java
index 314e61392..3c2b133b4 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/job/PendingEtherTransactionVerifierJob.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/job/PendingEtherTransactionVerifierJob.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.job;
+package io.meeds.wallet.job;
 
 import java.util.List;
 
@@ -30,11 +30,11 @@
 import org.exoplatform.container.component.RequestLifeCycle;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.BlockchainTransactionService;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.service.WalletTransactionService;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
 
 /**
  * A job that will refresh periodically ether transactions sent by admin wallet
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/job/TransactionSenderJob.java b/wallet-services/src/main/java/io/meeds/wallet/job/TransactionSenderJob.java
similarity index 96%
rename from wallet-services/src/main/java/org/exoplatform/wallet/job/TransactionSenderJob.java
rename to wallet-services/src/main/java/io/meeds/wallet/job/TransactionSenderJob.java
index f4d15e672..890ed71dd 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/job/TransactionSenderJob.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/job/TransactionSenderJob.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.job;
+package io.meeds.wallet.job;
 
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
@@ -27,7 +27,7 @@
 import org.exoplatform.container.component.RequestLifeCycle;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
 
 @DisallowConcurrentExecution
 public class TransactionSenderJob implements Job {
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/listener/AutoTransactionListener.java b/wallet-services/src/main/java/io/meeds/wallet/listener/AutoTransactionListener.java
similarity index 89%
rename from wallet-services/src/main/java/org/exoplatform/wallet/listener/AutoTransactionListener.java
rename to wallet-services/src/main/java/io/meeds/wallet/listener/AutoTransactionListener.java
index 4fb05e4fc..6a9d8a648 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/listener/AutoTransactionListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/listener/AutoTransactionListener.java
@@ -1,4 +1,4 @@
-package org.exoplatform.wallet.listener;
+package io.meeds.wallet.listener;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -8,13 +8,13 @@
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.WalletState;
-import org.exoplatform.wallet.model.settings.InitialFundsSettings;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.service.WalletService;
-import org.exoplatform.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.WalletState;
+import io.meeds.wallet.wallet.model.settings.InitialFundsSettings;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletService;
+import io.meeds.wallet.wallet.service.WalletTokenAdminService;
 
 @Asynchronous
 public class AutoTransactionListener extends Listener<Object, String> {
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/listener/GamificationWalletInitializationListener.java b/wallet-services/src/main/java/io/meeds/wallet/listener/GamificationWalletInitializationListener.java
similarity index 80%
rename from wallet-services/src/main/java/org/exoplatform/wallet/listener/GamificationWalletInitializationListener.java
rename to wallet-services/src/main/java/io/meeds/wallet/listener/GamificationWalletInitializationListener.java
index 98ac4ad11..bff0d370b 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/listener/GamificationWalletInitializationListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/listener/GamificationWalletInitializationListener.java
@@ -15,16 +15,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package org.exoplatform.wallet.listener;
+package io.meeds.wallet.listener;
 
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_BROADCAST_ACTION_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_CREATE_WALLET_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_EARNER_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_EVENT_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_TYPE;
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_RECEIVER_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_WALLET_OBJECT_TYPE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_BROADCAST_ACTION_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_CREATE_WALLET_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_EARNER_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_EVENT_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_TYPE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_RECEIVER_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_WALLET_OBJECT_TYPE;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,7 +33,7 @@
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.listener.ListenerService;
-import org.exoplatform.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.Wallet;
 
 @Asynchronous
 public class GamificationWalletInitializationListener extends Listener<Object, Object> {
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/listener/TransactionCreatedListener.java b/wallet-services/src/main/java/io/meeds/wallet/listener/TransactionCreatedListener.java
similarity index 89%
rename from wallet-services/src/main/java/org/exoplatform/wallet/listener/TransactionCreatedListener.java
rename to wallet-services/src/main/java/io/meeds/wallet/listener/TransactionCreatedListener.java
index 8249907d0..a78bb1f47 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/listener/TransactionCreatedListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/listener/TransactionCreatedListener.java
@@ -14,17 +14,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.listener;
+package io.meeds.wallet.listener;
 
-import static org.exoplatform.wallet.utils.WalletUtils.TRANSACTION_SENT_TO_BLOCKCHAIN_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_SENT_TO_BLOCKCHAIN_EVENT;
 
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.listener.ListenerService;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.WalletTransactionService;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
 
 public class TransactionCreatedListener extends Listener<Object, TransactionDetail> {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/listener/TransactionNotificationListener.java b/wallet-services/src/main/java/io/meeds/wallet/listener/TransactionNotificationListener.java
similarity index 94%
rename from wallet-services/src/main/java/org/exoplatform/wallet/listener/TransactionNotificationListener.java
rename to wallet-services/src/main/java/io/meeds/wallet/listener/TransactionNotificationListener.java
index a664ab859..db3a71b4c 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/listener/TransactionNotificationListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/listener/TransactionNotificationListener.java
@@ -14,9 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.listener;
-
-import static org.exoplatform.wallet.utils.WalletUtils.*;
+package io.meeds.wallet.listener;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -30,12 +28,14 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.service.LinkProvider;
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.model.transaction.TransactionNotificationType;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.service.WalletTransactionService;
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.model.transaction.TransactionNotificationType;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import static io.meeds.wallet.wallet.utils.WalletUtils.*;
 
 /**
  * A listener that is triggered when a watched transaction by the addon is mined
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/listener/WalletDeletedListener.java b/wallet-services/src/main/java/io/meeds/wallet/listener/WalletDeletedListener.java
similarity index 89%
rename from wallet-services/src/main/java/org/exoplatform/wallet/listener/WalletDeletedListener.java
rename to wallet-services/src/main/java/io/meeds/wallet/listener/WalletDeletedListener.java
index 758bcf77d..be2095567 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/listener/WalletDeletedListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/listener/WalletDeletedListener.java
@@ -14,15 +14,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.listener;
+package io.meeds.wallet.listener;
 
 import java.util.List;
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.WalletTransactionService;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
 
 /**
  * This listener is triggered when a user wallet is deleted to remove all its
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/notification/builder/RequestFundsTemplateBuilder.java b/wallet-services/src/main/java/io/meeds/wallet/notification/builder/RequestFundsTemplateBuilder.java
similarity index 98%
rename from wallet-services/src/main/java/org/exoplatform/wallet/notification/builder/RequestFundsTemplateBuilder.java
rename to wallet-services/src/main/java/io/meeds/wallet/notification/builder/RequestFundsTemplateBuilder.java
index f4cef388f..1cd08bb5e 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/notification/builder/RequestFundsTemplateBuilder.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/notification/builder/RequestFundsTemplateBuilder.java
@@ -14,9 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.notification.builder;
-
-import static org.exoplatform.wallet.utils.WalletUtils.*;
+package io.meeds.wallet.notification.builder;
 
 import java.io.Writer;
 import java.util.Calendar;
@@ -40,9 +38,11 @@
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.service.LinkProvider;
 import org.exoplatform.social.notification.plugin.SocialNotificationUtils;
-import org.exoplatform.wallet.model.WalletType;
+import io.meeds.wallet.wallet.model.WalletType;
 import org.exoplatform.webui.utils.TimeConvertUtils;
 
+import static io.meeds.wallet.wallet.utils.WalletUtils.*;
+
 public class RequestFundsTemplateBuilder extends AbstractTemplateBuilder {
 
   private static final Log LOG = ExoLogger.getLogger(RequestFundsTemplateBuilder.class);
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/notification/builder/TemplateBuilder.java b/wallet-services/src/main/java/io/meeds/wallet/notification/builder/TemplateBuilder.java
similarity index 98%
rename from wallet-services/src/main/java/org/exoplatform/wallet/notification/builder/TemplateBuilder.java
rename to wallet-services/src/main/java/io/meeds/wallet/notification/builder/TemplateBuilder.java
index 2e3329412..f2969db82 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/notification/builder/TemplateBuilder.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/notification/builder/TemplateBuilder.java
@@ -14,9 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.notification.builder;
-
-import static org.exoplatform.wallet.utils.WalletUtils.*;
+package io.meeds.wallet.notification.builder;
 
 import java.io.Writer;
 import java.util.Calendar;
@@ -42,9 +40,11 @@
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.service.LinkProvider;
 import org.exoplatform.social.notification.plugin.SocialNotificationUtils;
-import org.exoplatform.wallet.model.WalletType;
+import io.meeds.wallet.wallet.model.WalletType;
 import org.exoplatform.webui.utils.TimeConvertUtils;
 
+import static io.meeds.wallet.wallet.utils.WalletUtils.*;
+
 public class TemplateBuilder extends AbstractTemplateBuilder {
 
   private static final Log LOG = ExoLogger.getLogger(TemplateBuilder.class);
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/notification/plugin/FundsRequestNotificationPlugin.java b/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/FundsRequestNotificationPlugin.java
similarity index 93%
rename from wallet-services/src/main/java/org/exoplatform/wallet/notification/plugin/FundsRequestNotificationPlugin.java
rename to wallet-services/src/main/java/io/meeds/wallet/notification/plugin/FundsRequestNotificationPlugin.java
index 59f775173..0f524109f 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/notification/plugin/FundsRequestNotificationPlugin.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/FundsRequestNotificationPlugin.java
@@ -14,9 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.notification.plugin;
-
-import static org.exoplatform.wallet.utils.WalletUtils.*;
+package io.meeds.wallet.notification.plugin;
 
 import java.util.List;
 
@@ -30,10 +28,12 @@
 import org.exoplatform.container.xml.InitParams;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.FundsRequest;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.FundsRequest;
+import io.meeds.wallet.wallet.utils.WalletUtils;
+
+import static io.meeds.wallet.wallet.utils.WalletUtils.*;
 
 public class FundsRequestNotificationPlugin extends BaseNotificationPlugin {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/notification/plugin/WalletReceiverNotificationPlugin.java b/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/WalletReceiverNotificationPlugin.java
similarity index 73%
rename from wallet-services/src/main/java/org/exoplatform/wallet/notification/plugin/WalletReceiverNotificationPlugin.java
rename to wallet-services/src/main/java/io/meeds/wallet/notification/plugin/WalletReceiverNotificationPlugin.java
index b8b7354f4..8ef87a985 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/notification/plugin/WalletReceiverNotificationPlugin.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/WalletReceiverNotificationPlugin.java
@@ -14,31 +14,31 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.notification.plugin;
+package io.meeds.wallet.notification.plugin;
 
-import static org.exoplatform.wallet.utils.WalletUtils.ACCOUNT_TYPE;
-import static org.exoplatform.wallet.utils.WalletUtils.AMOUNT;
-import static org.exoplatform.wallet.utils.WalletUtils.AMOUNT_PARAMETER;
-import static org.exoplatform.wallet.utils.WalletUtils.AVATAR;
-import static org.exoplatform.wallet.utils.WalletUtils.CONTRACT_ADDRESS;
-import static org.exoplatform.wallet.utils.WalletUtils.CONTRACT_ADDRESS_PARAMETER;
-import static org.exoplatform.wallet.utils.WalletUtils.HASH;
-import static org.exoplatform.wallet.utils.WalletUtils.HASH_PARAMETER;
-import static org.exoplatform.wallet.utils.WalletUtils.MESSAGE;
-import static org.exoplatform.wallet.utils.WalletUtils.MESSAGE_PARAMETER;
-import static org.exoplatform.wallet.utils.WalletUtils.RECEIVER;
-import static org.exoplatform.wallet.utils.WalletUtils.RECEIVER_ACCOUNT_DETAIL_PARAMETER;
-import static org.exoplatform.wallet.utils.WalletUtils.RECEIVER_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.RECEIVER_TYPE;
-import static org.exoplatform.wallet.utils.WalletUtils.RECEIVER_URL;
-import static org.exoplatform.wallet.utils.WalletUtils.SENDER;
-import static org.exoplatform.wallet.utils.WalletUtils.SENDER_ACCOUNT_DETAIL_PARAMETER;
-import static org.exoplatform.wallet.utils.WalletUtils.SENDER_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.SENDER_URL;
-import static org.exoplatform.wallet.utils.WalletUtils.SYMBOL;
-import static org.exoplatform.wallet.utils.WalletUtils.SYMBOL_PARAMETER;
-import static org.exoplatform.wallet.utils.WalletUtils.getNotificationReceiversUsers;
-import static org.exoplatform.wallet.utils.WalletUtils.getPermanentLink;
+import static io.meeds.wallet.wallet.utils.WalletUtils.ACCOUNT_TYPE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.AMOUNT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.AMOUNT_PARAMETER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.AVATAR;
+import static io.meeds.wallet.wallet.utils.WalletUtils.CONTRACT_ADDRESS;
+import static io.meeds.wallet.wallet.utils.WalletUtils.CONTRACT_ADDRESS_PARAMETER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.HASH;
+import static io.meeds.wallet.wallet.utils.WalletUtils.HASH_PARAMETER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.MESSAGE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.MESSAGE_PARAMETER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.RECEIVER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.RECEIVER_ACCOUNT_DETAIL_PARAMETER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.RECEIVER_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.RECEIVER_TYPE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.RECEIVER_URL;
+import static io.meeds.wallet.wallet.utils.WalletUtils.SENDER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.SENDER_ACCOUNT_DETAIL_PARAMETER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.SENDER_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.SENDER_URL;
+import static io.meeds.wallet.wallet.utils.WalletUtils.SYMBOL;
+import static io.meeds.wallet.wallet.utils.WalletUtils.SYMBOL_PARAMETER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getNotificationReceiversUsers;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getPermanentLink;
 
 import java.util.List;
 
@@ -53,8 +53,8 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.service.LinkProvider;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionNotificationType;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionNotificationType;
 
 public class WalletReceiverNotificationPlugin extends BaseNotificationPlugin {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/notification/plugin/WalletSenderNotificationPlugin.java b/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/WalletSenderNotificationPlugin.java
similarity index 95%
rename from wallet-services/src/main/java/org/exoplatform/wallet/notification/plugin/WalletSenderNotificationPlugin.java
rename to wallet-services/src/main/java/io/meeds/wallet/notification/plugin/WalletSenderNotificationPlugin.java
index b8203f472..5a6f4f749 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/notification/plugin/WalletSenderNotificationPlugin.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/WalletSenderNotificationPlugin.java
@@ -14,9 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.notification.plugin;
-
-import static org.exoplatform.wallet.utils.WalletUtils.*;
+package io.meeds.wallet.notification.plugin;
 
 import java.util.List;
 
@@ -31,8 +29,10 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.service.LinkProvider;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionNotificationType;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionNotificationType;
+
+import static io.meeds.wallet.wallet.utils.WalletUtils.*;
 
 public class WalletSenderNotificationPlugin extends BaseNotificationPlugin {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/notification/provider/MailTemplateProvider.java b/wallet-services/src/main/java/io/meeds/wallet/notification/provider/MailTemplateProvider.java
similarity index 90%
rename from wallet-services/src/main/java/org/exoplatform/wallet/notification/provider/MailTemplateProvider.java
rename to wallet-services/src/main/java/io/meeds/wallet/notification/provider/MailTemplateProvider.java
index 53817db38..a9ed30e5e 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/notification/provider/MailTemplateProvider.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/notification/provider/MailTemplateProvider.java
@@ -14,9 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.notification.provider;
-
-import static org.exoplatform.wallet.utils.WalletUtils.*;
+package io.meeds.wallet.notification.provider;
 
 import org.exoplatform.commons.api.notification.annotation.TemplateConfig;
 import org.exoplatform.commons.api.notification.annotation.TemplateConfigs;
@@ -24,8 +22,10 @@
 import org.exoplatform.commons.api.notification.model.PluginKey;
 import org.exoplatform.container.PortalContainer;
 import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.wallet.notification.builder.RequestFundsTemplateBuilder;
-import org.exoplatform.wallet.notification.builder.TemplateBuilder;
+import io.meeds.wallet.notification.builder.RequestFundsTemplateBuilder;
+import io.meeds.wallet.notification.builder.TemplateBuilder;
+
+import static io.meeds.wallet.wallet.utils.WalletUtils.*;
 
 @TemplateConfigs(templates = {
     @TemplateConfig(pluginId = WALLET_SENDER_NOTIFICATION_ID, template = "war:/conf/wallet/templates/notification/mail/WalletSenderMailPlugin.gtmpl"),
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/notification/provider/MobilePushTemplateProvider.java b/wallet-services/src/main/java/io/meeds/wallet/notification/provider/MobilePushTemplateProvider.java
similarity index 90%
rename from wallet-services/src/main/java/org/exoplatform/wallet/notification/provider/MobilePushTemplateProvider.java
rename to wallet-services/src/main/java/io/meeds/wallet/notification/provider/MobilePushTemplateProvider.java
index 986cede35..d6e90a0b1 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/notification/provider/MobilePushTemplateProvider.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/notification/provider/MobilePushTemplateProvider.java
@@ -14,9 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.notification.provider;
-
-import static org.exoplatform.wallet.utils.WalletUtils.*;
+package io.meeds.wallet.notification.provider;
 
 import org.exoplatform.commons.api.notification.annotation.TemplateConfig;
 import org.exoplatform.commons.api.notification.annotation.TemplateConfigs;
@@ -24,8 +22,10 @@
 import org.exoplatform.commons.api.notification.model.PluginKey;
 import org.exoplatform.container.PortalContainer;
 import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.wallet.notification.builder.RequestFundsTemplateBuilder;
-import org.exoplatform.wallet.notification.builder.TemplateBuilder;
+import io.meeds.wallet.notification.builder.RequestFundsTemplateBuilder;
+import io.meeds.wallet.notification.builder.TemplateBuilder;
+
+import static io.meeds.wallet.wallet.utils.WalletUtils.*;
 
 @TemplateConfigs(templates = {
     @TemplateConfig(pluginId = WALLET_SENDER_NOTIFICATION_ID, template = "war:/conf/wallet/templates/notification/push/WalletSenderPushPlugin.gtmpl"),
diff --git a/wallet-services/src/main/java/io/meeds/wallet/permlink/plugin/WalletPermanentLinkPlugin.java b/wallet-services/src/main/java/io/meeds/wallet/permlink/plugin/WalletPermanentLinkPlugin.java
index 28b167fd3..478a330a9 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/permlink/plugin/WalletPermanentLinkPlugin.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/permlink/plugin/WalletPermanentLinkPlugin.java
@@ -23,10 +23,10 @@
 import org.exoplatform.services.security.Identity;
 import org.exoplatform.social.core.space.model.Space;
 import org.exoplatform.social.core.space.spi.SpaceService;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.WalletType;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 import io.meeds.portal.permlink.model.PermanentLinkObject;
 import io.meeds.portal.permlink.plugin.PermanentLinkPlugin;
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/plugin/WalletFeaturePlugin.java b/wallet-services/src/main/java/io/meeds/wallet/plugin/WalletFeaturePlugin.java
similarity index 92%
rename from wallet-services/src/main/java/org/exoplatform/wallet/plugin/WalletFeaturePlugin.java
rename to wallet-services/src/main/java/io/meeds/wallet/plugin/WalletFeaturePlugin.java
index 7acfa3bc9..ccd2938d5 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/plugin/WalletFeaturePlugin.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/plugin/WalletFeaturePlugin.java
@@ -14,19 +14,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.plugin;
+package io.meeds.wallet.plugin;
 
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
-
 import org.exoplatform.commons.api.settings.ExoFeatureService;
 import org.exoplatform.commons.api.settings.FeaturePlugin;
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.services.security.*;
-import org.exoplatform.wallet.model.settings.GlobalSettings;
-import org.exoplatform.wallet.service.WalletService;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.model.settings.GlobalSettings;
+import io.meeds.wallet.wallet.service.WalletService;
 
 /**
  * A plugin added to {@link ExoFeatureService} that determines if 'wallet' is
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/service/WalletAccountServiceImpl.java b/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java
similarity index 93%
rename from wallet-services/src/main/java/org/exoplatform/wallet/service/WalletAccountServiceImpl.java
rename to wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java
index 2cc9e64e3..35d1e0d92 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/service/WalletAccountServiceImpl.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java
@@ -14,45 +14,42 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.service;
-
-import static org.exoplatform.wallet.statistic.StatisticUtils.OPERATION;
-import static org.exoplatform.wallet.utils.WalletUtils.ADMIN_KEY_PARAMETER;
-import static org.exoplatform.wallet.utils.WalletUtils.MODIFY_ADDRESS_ASSOCIATED_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.NEW_ADDRESS_ASSOCIATED_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.SIMPLE_CHARS;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_ADMIN_REMOTE_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_DELETED_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_DISABLED_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_ENABLED_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_INITIALIZATION_MODIFICATION_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_INITIALIZED_SETTING_PARAM;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_MODIFIED_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_SCOPE;
-import static org.exoplatform.wallet.utils.WalletUtils.canAccessWallet;
-import static org.exoplatform.wallet.utils.WalletUtils.checkUserIsSpaceManager;
-import static org.exoplatform.wallet.utils.WalletUtils.computeWalletFromIdentity;
-import static org.exoplatform.wallet.utils.WalletUtils.computeWalletIdentity;
-import static org.exoplatform.wallet.utils.WalletUtils.getContractAddress;
-import static org.exoplatform.wallet.utils.WalletUtils.getContractDetail;
-import static org.exoplatform.wallet.utils.WalletUtils.getIdentityById;
-import static org.exoplatform.wallet.utils.WalletUtils.getIdentityByTypeAndId;
-import static org.exoplatform.wallet.utils.WalletUtils.getSettings;
-import static org.exoplatform.wallet.utils.WalletUtils.getSpacePrettyName;
-import static org.exoplatform.wallet.utils.WalletUtils.hideWalletOwnerPrivateInformation;
-import static org.exoplatform.wallet.utils.WalletUtils.isUserRewardingAdmin;
-import static org.exoplatform.wallet.utils.WalletUtils.isUserSpaceManager;
+package io.meeds.wallet.service;
+
+import static io.meeds.wallet.wallet.statistic.StatisticUtils.OPERATION;
+import static io.meeds.wallet.wallet.utils.WalletUtils.ADMIN_KEY_PARAMETER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.MODIFY_ADDRESS_ASSOCIATED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.NEW_ADDRESS_ASSOCIATED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.SIMPLE_CHARS;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_ADMIN_REMOTE_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_DELETED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_DISABLED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_ENABLED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_INITIALIZATION_MODIFICATION_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_INITIALIZED_SETTING_PARAM;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_MODIFIED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_SCOPE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.canAccessWallet;
+import static io.meeds.wallet.wallet.utils.WalletUtils.checkUserIsSpaceManager;
+import static io.meeds.wallet.wallet.utils.WalletUtils.computeWalletFromIdentity;
+import static io.meeds.wallet.wallet.utils.WalletUtils.computeWalletIdentity;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getContractAddress;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getContractDetail;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getIdentityById;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getIdentityByTypeAndId;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getSettings;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getSpacePrettyName;
+import static io.meeds.wallet.wallet.utils.WalletUtils.hideWalletOwnerPrivateInformation;
+import static io.meeds.wallet.wallet.utils.WalletUtils.isUserRewardingAdmin;
+import static io.meeds.wallet.wallet.utils.WalletUtils.isUserSpaceManager;
 
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.security.SignatureException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletTokenAdminService;
 import jakarta.servlet.ServletContext;
 
 import org.apache.commons.lang3.RandomStringUtils;
@@ -76,16 +73,16 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.identity.model.Identity;
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.WalletAddressLabel;
-import org.exoplatform.wallet.model.WalletProvider;
-import org.exoplatform.wallet.model.WalletState;
-import org.exoplatform.wallet.model.WalletType;
-import org.exoplatform.wallet.statistic.ExoWalletStatistic;
-import org.exoplatform.wallet.statistic.ExoWalletStatisticService;
-import org.exoplatform.wallet.storage.AddressLabelStorage;
-import org.exoplatform.wallet.storage.WalletStorage;
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.WalletAddressLabel;
+import io.meeds.wallet.wallet.model.WalletProvider;
+import io.meeds.wallet.wallet.model.WalletState;
+import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.wallet.statistic.ExoWalletStatistic;
+import io.meeds.wallet.wallet.statistic.ExoWalletStatisticService;
+import io.meeds.wallet.storage.AddressLabelStorage;
+import io.meeds.wallet.storage.WalletStorage;
 
 public class WalletAccountServiceImpl implements WalletAccountService, ExoWalletStatisticService, Startable {
 
@@ -176,6 +173,16 @@ public Set<Wallet> listWallets() {
     return wallets;
   }
 
+  @Override
+  public Set<Wallet> listWalletsByIdentityIds(List<Long> identityIds) {
+    Set<Wallet> wallets = accountStorage.findListByIdentityIds(identityIds);
+    wallets.forEach(wallet -> {
+      retrieveWalletBlockchainState(wallet);
+      hideWalletOwnerPrivateInformation(wallet);
+    });
+    return wallets;
+  }
+
   @Override
   public void refreshWalletsFromBlockchain(Map<String, Set<String>> walletsModifications) {
     if (walletsModifications == null) {
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/service/WalletContractServiceImpl.java b/wallet-services/src/main/java/io/meeds/wallet/service/WalletContractServiceImpl.java
similarity index 92%
rename from wallet-services/src/main/java/org/exoplatform/wallet/service/WalletContractServiceImpl.java
rename to wallet-services/src/main/java/io/meeds/wallet/service/WalletContractServiceImpl.java
index 8f7c5d7c3..2f4d25d35 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/service/WalletContractServiceImpl.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/service/WalletContractServiceImpl.java
@@ -14,19 +14,21 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.service;
+package io.meeds.wallet.service;
 
-import static org.exoplatform.wallet.utils.WalletUtils.ABI_PATH_PARAMETER;
-import static org.exoplatform.wallet.utils.WalletUtils.BIN_PATH_PARAMETER;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_CONTEXT;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_SCOPE;
-import static org.exoplatform.wallet.utils.WalletUtils.fromJsonString;
-import static org.exoplatform.wallet.utils.WalletUtils.toJsonString;
+import static io.meeds.wallet.wallet.utils.WalletUtils.ABI_PATH_PARAMETER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.BIN_PATH_PARAMETER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_CONTEXT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_SCOPE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.fromJsonString;
+import static io.meeds.wallet.wallet.utils.WalletUtils.toJsonString;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 
+import io.meeds.wallet.wallet.service.WalletContractService;
+import io.meeds.wallet.wallet.service.WalletService;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
@@ -41,7 +43,7 @@
 import org.exoplatform.container.xml.InitParams;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.ContractDetail;
 
 public class WalletContractServiceImpl implements WalletContractService, Startable {
 
@@ -65,7 +67,7 @@ public class WalletContractServiceImpl implements WalletContractService, Startab
 
   private SettingService       settingService;
 
-  private WalletService        walletService;
+  private WalletService walletService;
 
   public WalletContractServiceImpl(SettingService settingService, ConfigurationManager configurationManager, InitParams params) {
     this.configurationManager = configurationManager;
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/service/WalletServiceImpl.java b/wallet-services/src/main/java/io/meeds/wallet/service/WalletServiceImpl.java
similarity index 87%
rename from wallet-services/src/main/java/org/exoplatform/wallet/service/WalletServiceImpl.java
rename to wallet-services/src/main/java/io/meeds/wallet/service/WalletServiceImpl.java
index 928d19181..9b5024960 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/service/WalletServiceImpl.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/service/WalletServiceImpl.java
@@ -14,45 +14,49 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.service;
-
-import static org.exoplatform.wallet.utils.WalletUtils.DEFAULT_INITIAL_USER_FUND;
-import static org.exoplatform.wallet.utils.WalletUtils.DEFAULT_MIN_GAS_PRICE;
-import static org.exoplatform.wallet.utils.WalletUtils.ETHER_TO_WEI_DECIMALS;
-import static org.exoplatform.wallet.utils.WalletUtils.FUNDS_REQUEST_NOTIFICATION_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.FUNDS_REQUEST_PARAMETER;
-import static org.exoplatform.wallet.utils.WalletUtils.FUNDS_REQUEST_SENDER_DETAIL_PARAMETER;
-import static org.exoplatform.wallet.utils.WalletUtils.FUNDS_REQUEST_SENT;
-import static org.exoplatform.wallet.utils.WalletUtils.GAS_LIMIT;
-import static org.exoplatform.wallet.utils.WalletUtils.GWEI_TO_WEI_DECIMALS;
-import static org.exoplatform.wallet.utils.WalletUtils.INITIAL_FUNDS_KEY_NAME;
-import static org.exoplatform.wallet.utils.WalletUtils.MAX_GAS_PRICE;
-import static org.exoplatform.wallet.utils.WalletUtils.MIN_GAS_PRICE;
-import static org.exoplatform.wallet.utils.WalletUtils.NETWORK_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.NETWORK_URL;
-import static org.exoplatform.wallet.utils.WalletUtils.NETWORK_WS_URL;
-import static org.exoplatform.wallet.utils.WalletUtils.NORMAL_GAS_PRICE;
-import static org.exoplatform.wallet.utils.WalletUtils.RECEIVER_ACCOUNT_DETAIL_PARAMETER;
-import static org.exoplatform.wallet.utils.WalletUtils.REWARDINGS_GROUP;
-import static org.exoplatform.wallet.utils.WalletUtils.SENDER_ACCOUNT_DETAIL_PARAMETER;
-import static org.exoplatform.wallet.utils.WalletUtils.SETTINGS_KEY_NAME;
-import static org.exoplatform.wallet.utils.WalletUtils.TOKEN_ADDRESS;
-import static org.exoplatform.wallet.utils.WalletUtils.DYNAMIC_GAS_PRICE_UPDATE_INTERVAL;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_CONTEXT;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_SCOPE;
-import static org.exoplatform.wallet.utils.WalletUtils.canAccessWallet;
-import static org.exoplatform.wallet.utils.WalletUtils.convertFromDecimals;
-import static org.exoplatform.wallet.utils.WalletUtils.fromJsonString;
-import static org.exoplatform.wallet.utils.WalletUtils.hideWalletOwnerPrivateInformation;
-import static org.exoplatform.wallet.utils.WalletUtils.isUserMemberOfGroupOrUser;
-import static org.exoplatform.wallet.utils.WalletUtils.isUserSpaceMember;
-import static org.exoplatform.wallet.utils.WalletUtils.toJsonString;
+package io.meeds.wallet.service;
+
+import static io.meeds.wallet.wallet.utils.WalletUtils.DEFAULT_INITIAL_USER_FUND;
+import static io.meeds.wallet.wallet.utils.WalletUtils.DEFAULT_MIN_GAS_PRICE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.ETHER_TO_WEI_DECIMALS;
+import static io.meeds.wallet.wallet.utils.WalletUtils.FUNDS_REQUEST_NOTIFICATION_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.FUNDS_REQUEST_PARAMETER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.FUNDS_REQUEST_SENDER_DETAIL_PARAMETER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.FUNDS_REQUEST_SENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAS_LIMIT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GWEI_TO_WEI_DECIMALS;
+import static io.meeds.wallet.wallet.utils.WalletUtils.INITIAL_FUNDS_KEY_NAME;
+import static io.meeds.wallet.wallet.utils.WalletUtils.MAX_GAS_PRICE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.MIN_GAS_PRICE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.NETWORK_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.NETWORK_URL;
+import static io.meeds.wallet.wallet.utils.WalletUtils.NETWORK_WS_URL;
+import static io.meeds.wallet.wallet.utils.WalletUtils.NORMAL_GAS_PRICE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.RECEIVER_ACCOUNT_DETAIL_PARAMETER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.REWARDINGS_GROUP;
+import static io.meeds.wallet.wallet.utils.WalletUtils.SENDER_ACCOUNT_DETAIL_PARAMETER;
+import static io.meeds.wallet.wallet.utils.WalletUtils.SETTINGS_KEY_NAME;
+import static io.meeds.wallet.wallet.utils.WalletUtils.TOKEN_ADDRESS;
+import static io.meeds.wallet.wallet.utils.WalletUtils.DYNAMIC_GAS_PRICE_UPDATE_INTERVAL;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_CONTEXT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_SCOPE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.canAccessWallet;
+import static io.meeds.wallet.wallet.utils.WalletUtils.convertFromDecimals;
+import static io.meeds.wallet.wallet.utils.WalletUtils.fromJsonString;
+import static io.meeds.wallet.wallet.utils.WalletUtils.hideWalletOwnerPrivateInformation;
+import static io.meeds.wallet.wallet.utils.WalletUtils.isUserMemberOfGroupOrUser;
+import static io.meeds.wallet.wallet.utils.WalletUtils.isUserSpaceMember;
+import static io.meeds.wallet.wallet.utils.WalletUtils.toJsonString;
 
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.concurrent.TimeUnit;
 
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletContractService;
+import io.meeds.wallet.wallet.service.WalletService;
 import org.apache.commons.lang3.StringUtils;
 import org.picocontainer.Startable;
 
@@ -73,15 +77,15 @@
 import org.exoplatform.container.xml.InitParams;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.WalletType;
-import org.exoplatform.wallet.model.settings.GlobalSettings;
-import org.exoplatform.wallet.model.settings.InitialFundsSettings;
-import org.exoplatform.wallet.model.settings.NetworkSettings;
-import org.exoplatform.wallet.model.settings.UserSettings;
-import org.exoplatform.wallet.model.settings.WalletSettings;
-import org.exoplatform.wallet.model.transaction.FundsRequest;
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.wallet.model.settings.GlobalSettings;
+import io.meeds.wallet.wallet.model.settings.InitialFundsSettings;
+import io.meeds.wallet.wallet.model.settings.NetworkSettings;
+import io.meeds.wallet.wallet.model.settings.UserSettings;
+import io.meeds.wallet.wallet.model.settings.WalletSettings;
+import io.meeds.wallet.wallet.model.transaction.FundsRequest;
 
 import io.meeds.wallet.lock.Lock;
 
@@ -96,9 +100,9 @@ public class WalletServiceImpl implements WalletService, Startable {
 
   private ExoContainer                 container;
 
-  private WalletContractService        contractService;
+  private WalletContractService contractService;
 
-  private WalletAccountService         accountService;
+  private WalletAccountService accountService;
 
   private SettingService               settingService;
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/service/WalletTransactionServiceImpl.java b/wallet-services/src/main/java/io/meeds/wallet/service/WalletTransactionServiceImpl.java
similarity index 97%
rename from wallet-services/src/main/java/org/exoplatform/wallet/service/WalletTransactionServiceImpl.java
rename to wallet-services/src/main/java/io/meeds/wallet/service/WalletTransactionServiceImpl.java
index cd38b343e..aa44c8d0c 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/service/WalletTransactionServiceImpl.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/service/WalletTransactionServiceImpl.java
@@ -14,9 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.service;
-
-import static org.exoplatform.wallet.utils.WalletUtils.*;
+package io.meeds.wallet.service;
 
 import java.time.*;
 import java.time.format.TextStyle;
@@ -24,6 +22,12 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletContractService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -34,10 +38,13 @@
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.space.model.Space;
 import org.exoplatform.social.core.space.spi.SpaceService;
-import org.exoplatform.wallet.model.*;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.model.transaction.TransactionStatistics;
-import org.exoplatform.wallet.storage.TransactionStorage;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.model.transaction.TransactionStatistics;
+import io.meeds.wallet.storage.TransactionStorage;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+
+import static io.meeds.wallet.wallet.utils.WalletUtils.*;
 
 public class WalletTransactionServiceImpl implements WalletTransactionService {
 
@@ -52,7 +59,7 @@ public class WalletTransactionServiceImpl implements WalletTransactionService {
 
   private static final long     DEFAULT_MAX_SENDING_TRANSACTIONS_ATTEMPTS = 3;
 
-  private WalletAccountService  accountService;
+  private WalletAccountService accountService;
 
   private WalletContractService contractService;
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/service/WalletWebSocketService.java b/wallet-services/src/main/java/io/meeds/wallet/service/WalletWebSocketService.java
similarity index 93%
rename from wallet-services/src/main/java/org/exoplatform/wallet/service/WalletWebSocketService.java
rename to wallet-services/src/main/java/io/meeds/wallet/service/WalletWebSocketService.java
index fe526b04a..6fc54e107 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/service/WalletWebSocketService.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/service/WalletWebSocketService.java
@@ -14,10 +14,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.service;
+package io.meeds.wallet.service;
 
-import static org.exoplatform.wallet.utils.WalletUtils.COMETD_CHANNEL;
-import static org.exoplatform.wallet.utils.WalletUtils.toJsonString;
+import static io.meeds.wallet.wallet.utils.WalletUtils.COMETD_CHANNEL;
+import static io.meeds.wallet.wallet.utils.WalletUtils.toJsonString;
 
 import java.util.Collection;
 
@@ -26,7 +26,7 @@
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.model.WebSocketMessage;
+import io.meeds.wallet.wallet.model.WebSocketMessage;
 import org.exoplatform.ws.frameworks.cometd.ContinuationService;
 
 public class WalletWebSocketService {
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/storage/AddressLabelStorage.java b/wallet-services/src/main/java/io/meeds/wallet/storage/AddressLabelStorage.java
similarity index 93%
rename from wallet-services/src/main/java/org/exoplatform/wallet/storage/AddressLabelStorage.java
rename to wallet-services/src/main/java/io/meeds/wallet/storage/AddressLabelStorage.java
index 7b97cd617..aa43d0db9 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/storage/AddressLabelStorage.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/storage/AddressLabelStorage.java
@@ -14,14 +14,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.storage;
+package io.meeds.wallet.storage;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
-import org.exoplatform.wallet.dao.AddressLabelDAO;
-import org.exoplatform.wallet.entity.AddressLabelEntity;
-import org.exoplatform.wallet.model.WalletAddressLabel;
+import io.meeds.wallet.dao.AddressLabelDAO;
+import io.meeds.wallet.entity.AddressLabelEntity;
+import io.meeds.wallet.wallet.model.WalletAddressLabel;
 
 public class AddressLabelStorage {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/storage/TransactionStorage.java b/wallet-services/src/main/java/io/meeds/wallet/storage/TransactionStorage.java
similarity index 97%
rename from wallet-services/src/main/java/org/exoplatform/wallet/storage/TransactionStorage.java
rename to wallet-services/src/main/java/io/meeds/wallet/storage/TransactionStorage.java
index 669979928..20e0f718a 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/storage/TransactionStorage.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/storage/TransactionStorage.java
@@ -14,11 +14,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.storage;
+package io.meeds.wallet.storage;
 
-import static org.exoplatform.wallet.utils.WalletUtils.TRANSACTION_CREATED_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.TRANSACTION_MODIFIED_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.formatTransactionHash;
+import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_CREATED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_MODIFIED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.formatTransactionHash;
 
 import java.time.ZonedDateTime;
 import java.util.Collections;
@@ -30,10 +30,10 @@
 import org.exoplatform.services.listener.ListenerService;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.wallet.dao.WalletTransactionDAO;
-import org.exoplatform.wallet.entity.TransactionEntity;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.dao.WalletTransactionDAO;
+import io.meeds.wallet.entity.TransactionEntity;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
 
 public class TransactionStorage {
 
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/storage/WalletStorage.java b/wallet-services/src/main/java/io/meeds/wallet/storage/WalletStorage.java
similarity index 91%
rename from wallet-services/src/main/java/org/exoplatform/wallet/storage/WalletStorage.java
rename to wallet-services/src/main/java/io/meeds/wallet/storage/WalletStorage.java
index 160ab4eb4..4262b6f17 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/storage/WalletStorage.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/storage/WalletStorage.java
@@ -14,14 +14,23 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.storage;
+package io.meeds.wallet.storage;
 
-import static org.exoplatform.wallet.utils.WalletUtils.computeWalletFromIdentity;
-import static org.exoplatform.wallet.utils.WalletUtils.getIdentityById;
+import static io.meeds.wallet.wallet.utils.WalletUtils.computeWalletFromIdentity;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getIdentityById;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
+import io.meeds.wallet.dao.WalletAccountBackupDAO;
+import io.meeds.wallet.dao.WalletAccountDAO;
+import io.meeds.wallet.dao.WalletBlockchainStateDAO;
+import io.meeds.wallet.dao.WalletPrivateKeyDAO;
+import io.meeds.wallet.entity.WalletBackupEntity;
+import io.meeds.wallet.entity.WalletBlockchainStateEntity;
+import io.meeds.wallet.entity.WalletEntity;
+import io.meeds.wallet.entity.WalletPrivateKeyEntity;
+import io.meeds.wallet.wallet.model.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -29,20 +38,17 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.identity.model.Identity;
-import org.exoplatform.wallet.dao.*;
-import org.exoplatform.wallet.entity.*;
-import org.exoplatform.wallet.model.*;
 import org.exoplatform.web.security.codec.AbstractCodec;
 import org.exoplatform.web.security.codec.CodecInitializer;
 
 public class WalletStorage {
   private static final Log         LOG = ExoLogger.getLogger(WalletStorage.class);
 
-  private final WalletAccountDAO         walletAccountDAO;
+  private final WalletAccountDAO walletAccountDAO;
 
-  private final WalletAccountBackupDAO   walletAccountBackupDAO;
+  private final WalletAccountBackupDAO walletAccountBackupDAO;
 
-  private final WalletPrivateKeyDAO      privateKeyDAO;
+  private final WalletPrivateKeyDAO privateKeyDAO;
 
   private final WalletBlockchainStateDAO blockchainStateDAO;
 
@@ -83,6 +89,23 @@ public Set<Wallet> listWallets() {
     }
   }
 
+  /**
+   * Retrieves the list registered wallets identified by identities list
+   *
+   * @return {@link Set} of {@link Wallet} details with associated addresses
+   */
+  public Set<Wallet> findListByIdentityIds(List<Long> identityIds) {
+    List<WalletEntity> walletEntities = walletAccountDAO.findListByIdentityIds(identityIds);
+    if (walletEntities == null || walletEntities.isEmpty()) {
+      return Collections.emptySet();
+    } else {
+      return walletEntities.stream()
+              .map(this::fromEntity)
+              .filter(wallet -> StringUtils.isNotBlank(wallet.getType()))
+              .collect(Collectors.toSet());
+    }
+  }
+
   /**
    * @return associated wallets counts
    */
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/storage/cached/CachedAccountStorage.java b/wallet-services/src/main/java/io/meeds/wallet/storage/cached/CachedAccountStorage.java
similarity index 93%
rename from wallet-services/src/main/java/org/exoplatform/wallet/storage/cached/CachedAccountStorage.java
rename to wallet-services/src/main/java/io/meeds/wallet/storage/cached/CachedAccountStorage.java
index 7ba9e3870..949cf9dff 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/storage/cached/CachedAccountStorage.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/storage/cached/CachedAccountStorage.java
@@ -14,17 +14,23 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.storage.cached;
-
+package io.meeds.wallet.storage.cached;
+
+import io.meeds.wallet.dao.WalletAccountBackupDAO;
+import io.meeds.wallet.dao.WalletAccountDAO;
+import io.meeds.wallet.dao.WalletBlockchainStateDAO;
+import io.meeds.wallet.dao.WalletPrivateKeyDAO;
+import io.meeds.wallet.wallet.model.AddressAlreadyInUseException;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.WalletCacheKey;
+import io.meeds.wallet.wallet.model.WalletProvider;
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.cache.future.FutureExoCache;
 import org.exoplatform.commons.cache.future.Loader;
 import org.exoplatform.services.cache.CacheService;
 import org.exoplatform.services.cache.ExoCache;
-import org.exoplatform.wallet.dao.*;
-import org.exoplatform.wallet.model.*;
-import org.exoplatform.wallet.storage.WalletStorage;
+import io.meeds.wallet.storage.WalletStorage;
 import org.exoplatform.web.security.codec.CodecInitializer;
 
 public class CachedAccountStorage extends WalletStorage {
diff --git a/wallet-services/src/main/java/org/exoplatform/wallet/storage/cached/CachedTransactionStorage.java b/wallet-services/src/main/java/io/meeds/wallet/storage/cached/CachedTransactionStorage.java
similarity index 91%
rename from wallet-services/src/main/java/org/exoplatform/wallet/storage/cached/CachedTransactionStorage.java
rename to wallet-services/src/main/java/io/meeds/wallet/storage/cached/CachedTransactionStorage.java
index e88b290c0..c09302902 100644
--- a/wallet-services/src/main/java/org/exoplatform/wallet/storage/cached/CachedTransactionStorage.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/storage/cached/CachedTransactionStorage.java
@@ -14,16 +14,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.storage.cached;
+package io.meeds.wallet.storage.cached;
 
 import org.exoplatform.commons.cache.future.FutureExoCache;
 import org.exoplatform.commons.cache.future.Loader;
 import org.exoplatform.services.cache.CacheService;
 import org.exoplatform.services.cache.ExoCache;
 import org.exoplatform.services.listener.ListenerService;
-import org.exoplatform.wallet.dao.WalletTransactionDAO;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.storage.TransactionStorage;
+import io.meeds.wallet.dao.WalletTransactionDAO;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.storage.TransactionStorage;
 
 public class CachedTransactionStorage extends TransactionStorage {
 
diff --git a/wallet-services/src/main/resources/conf/portal/wallet-configuration.xml b/wallet-services/src/main/resources/conf/portal/wallet-configuration.xml
index c447396c6..a6a35c96c 100644
--- a/wallet-services/src/main/resources/conf/portal/wallet-configuration.xml
+++ b/wallet-services/src/main/resources/conf/portal/wallet-configuration.xml
@@ -37,45 +37,45 @@
   </component>
 
   <component>
-    <type>org.exoplatform.wallet.dao.AddressLabelDAO</type>
+    <type>io.meeds.wallet.dao.AddressLabelDAO</type>
   </component>
 
   <component>
-    <type>org.exoplatform.wallet.dao.WalletAccountDAO</type>
+    <type>io.meeds.wallet.dao.WalletAccountDAO</type>
   </component>
   <component>
-    <type>org.exoplatform.wallet.dao.WalletAccountBackupDAO</type>
+    <type>io.meeds.wallet.dao.WalletAccountBackupDAO</type>
   </component>
 
   <component>
-    <type>org.exoplatform.wallet.dao.WalletTransactionDAO</type>
+    <type>io.meeds.wallet.dao.WalletTransactionDAO</type>
   </component>
 
   <component>
-    <type>org.exoplatform.wallet.dao.WalletPrivateKeyDAO</type>
+    <type>io.meeds.wallet.dao.WalletPrivateKeyDAO</type>
   </component>
 
   <component>
-    <type>org.exoplatform.wallet.dao.WalletBlockchainStateDAO</type>
+    <type>io.meeds.wallet.dao.WalletBlockchainStateDAO</type>
   </component>
 
   <component>
-    <key>org.exoplatform.wallet.storage.WalletStorage</key>
-    <type>org.exoplatform.wallet.storage.cached.CachedAccountStorage</type>
+    <key>io.meeds.wallet.storage.WalletStorage</key>
+    <type>io.meeds.wallet.storage.cached.CachedAccountStorage</type>
   </component>
 
   <component>
-    <key>org.exoplatform.wallet.storage.TransactionStorage</key>
-    <type>org.exoplatform.wallet.storage.cached.CachedTransactionStorage</type>
+    <key>io.meeds.wallet.storage.TransactionStorage</key>
+    <type>io.meeds.wallet.storage.cached.CachedTransactionStorage</type>
   </component>
 
   <component>
-    <type>org.exoplatform.wallet.storage.AddressLabelStorage</type>
+    <type>io.meeds.wallet.storage.AddressLabelStorage</type>
   </component>
 
   <component>
-    <key>org.exoplatform.wallet.service.WalletAccountService</key>
-    <type>org.exoplatform.wallet.service.WalletAccountServiceImpl</type>
+    <key>io.meeds.wallet.wallet.service.WalletAccountService</key>
+    <type>io.meeds.wallet.service.WalletAccountServiceImpl</type>
     <init-params>
       <value-param>
         <name>admin.wallet.key</name>
@@ -86,8 +86,8 @@
   </component>
 
   <component>
-    <key>org.exoplatform.wallet.service.WalletTransactionService</key>
-    <type>org.exoplatform.wallet.service.WalletTransactionServiceImpl</type>
+    <key>io.meeds.wallet.wallet.service.WalletTransactionService</key>
+    <type>io.meeds.wallet.service.WalletTransactionServiceImpl</type>
     <init-params>
       <value-param>
         <name>transaction.pending.maxDays</name>
@@ -108,8 +108,8 @@
   </component>
 
   <component>
-    <key>org.exoplatform.wallet.service.WalletContractService</key>
-    <type>org.exoplatform.wallet.service.WalletContractServiceImpl</type>
+    <key>io.meeds.wallet.wallet.service.WalletContractService</key>
+    <type>io.meeds.wallet.service.WalletContractServiceImpl</type>
     <init-params>
       <value-param>
         <name>contract.abi.path</name>
@@ -125,8 +125,8 @@
   </component>
 
   <component>
-    <key>org.exoplatform.wallet.service.WalletService</key>
-    <type>org.exoplatform.wallet.service.WalletServiceImpl</type>
+    <key>io.meeds.wallet.wallet.service.WalletService</key>
+    <type>io.meeds.wallet.service.WalletServiceImpl</type>
     <init-params>
       <value-param>
         <name>networkId</name>
@@ -182,31 +182,31 @@
   </component>
 
   <component>
-    <type>org.exoplatform.wallet.service.WalletWebSocketService</type>
+    <type>io.meeds.wallet.service.WalletWebSocketService</type>
   </component>
 
   <component>
-    <type>org.exoplatform.wallet.rest.WalletSettingsREST</type>
+    <type>io.meeds.wallet.wallet.rest.WalletSettingsREST</type>
   </component>
 
   <component>
-    <type>org.exoplatform.wallet.rest.WalletAccountREST</type>
+    <type>io.meeds.wallet.wallet.rest.WalletAccountREST</type>
   </component>
 
   <component>
-    <type>org.exoplatform.wallet.rest.WalletContractREST</type>
+    <type>io.meeds.wallet.wallet.rest.WalletContractREST</type>
   </component>
 
   <component>
-    <type>org.exoplatform.wallet.rest.WalletTransactionREST</type>
+    <type>io.meeds.wallet.wallet.rest.WalletTransactionREST</type>
   </component>
 
   <component>
-    <type>org.exoplatform.wallet.rest.WalletAdminTransactionREST</type>
+    <type>io.meeds.wallet.wallet.rest.WalletAdminTransactionREST</type>
   </component>
 
   <component>
-    <type>org.exoplatform.wallet.plugin.WalletAdminIdentityProvider</type>
+    <type>io.meeds.wallet.wallet.plugin.WalletAdminIdentityProvider</type>
   </component>
 
   <external-component-plugins>
@@ -218,7 +218,7 @@
       <init-params>
         <values-param>
           <name>providers</name>
-          <value>org.exoplatform.wallet.plugin.WalletAdminIdentityProvider</value>
+          <value>io.meeds.wallet.wallet.plugin.WalletAdminIdentityProvider</value>
         </values-param>
       </init-params>
     </component-plugin>
@@ -229,7 +229,7 @@
     <component-plugin>
       <name>wallet</name>
       <set-method>addFeaturePlugin</set-method>
-      <type>org.exoplatform.wallet.plugin.WalletFeaturePlugin</type>
+      <type>io.meeds.wallet.plugin.WalletFeaturePlugin</type>
     </component-plugin>
   </external-component-plugins>
 
diff --git a/wallet-services/src/main/resources/jpa-entities.idx b/wallet-services/src/main/resources/jpa-entities.idx
index a0c675667..c859c843f 100644
--- a/wallet-services/src/main/resources/jpa-entities.idx
+++ b/wallet-services/src/main/resources/jpa-entities.idx
@@ -1,6 +1,6 @@
-org.exoplatform.wallet.entity.AddressLabelEntity
-org.exoplatform.wallet.entity.TransactionEntity
-org.exoplatform.wallet.entity.WalletBackupEntity
-org.exoplatform.wallet.entity.WalletBlockchainStateEntity
-org.exoplatform.wallet.entity.WalletEntity
-org.exoplatform.wallet.entity.WalletPrivateKeyEntity
+io.meeds.wallet.entity.AddressLabelEntity
+io.meeds.wallet.entity.TransactionEntity
+io.meeds.wallet.entity.WalletBackupEntity
+io.meeds.wallet.entity.WalletBlockchainStateEntity
+io.meeds.wallet.entity.WalletEntity
+io.meeds.wallet.entity.WalletPrivateKeyEntity
diff --git a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
index 08496f80c..b41688148 100644
--- a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
+++ b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
@@ -408,6 +408,8 @@ exoplatform.wallet.button.send=Send
 exoplatform.wallet.button.sendfunds=Send funds
 exoplatform.wallet.button.edit=Edit
 exoplatform.wallet.button.ok=OK
+exoplatform.wallet.button.yes=Yes
+exoplatform.wallet.button.no=NO
 exoplatform.wallet.button.save=Save
 exoplatform.wallet.button.qrCode=QRCode
 exoplatform.wallet.button.refresh=Refresh
@@ -506,6 +508,17 @@ wallet.administration.budgetConfiguration.timeZone.title=If contributions are do
 wallet.administration.budgetConfiguration.threshold.title=For contributors with a minimum of
 wallet.administration.budgetConfiguration.budgetFixed.title=Budget is fixed
 wallet.administration.budgetConfiguration.budgetPerContributor.title=Budget is per Contributor
+wallet.administration.budgetConfiguration.deleteConfiguration=Delete Configuration
+wallet.administration.budgetConfiguration.confirmDeleteConfiguration=Delete Budget Configuration?
+wallet.administration.budgetConfiguration.message.confirmDeleteConfiguration=You have requested to delete the budget configuration. Do you confirm the deletion?
+wallet.administration.rewardCard.status.inPeriod=Waiting for the period to end
+wallet.administration.rewardCard.status.toReward=To Reward
+wallet.administration.rewardCard.status.noParticipant=No Participant to reward
+wallet.administration.rewardCard.status.rewardsSent=Rewards sent
+wallet.administration.rewardCard.status.setYourBudget=Please, set your budget first
+wallet.administration.rewardCard.label.contributions=Contributions
+wallet.administration.cancel.label=Cancel
+wallet.administration.confirm.label=Confirm
 
 wallet.administration.budgetConfigurationDrawer.title=Set Global Budget
 wallet.administration.budgetConfigurationDrawer.periodType=Rewarding Periodicity
@@ -531,7 +544,20 @@ wallet.administration.periodType.label.month=Monthly
 wallet.administration.periodType.label.quarter=Quarterly
 
 wallet.administration.rewardManagement=Reward Management
-wallet.administration.rewardManagement.noContributionsYet=No contributions to reward yet
+
+wallet.administration.rewardDetails.rewardsSent=No contributions to reward yet
+wallet.administration.rewardDetails.successfullyProceeded=Successfully proceeded
+wallet.administration.rewardDetails.transactionInProgress=Transaction in progress
+wallet.administration.rewardDetails.transactionError=Transaction error
+wallet.administration.rewardDetails.searchLabel=search in names, wallet address
+wallet.administration.rewardDetails.sendingProgress=Sending in progress
+wallet.administration.rewardDetails.label.name=Name
+wallet.administration.rewardDetails.label.status=Status
+wallet.administration.rewardDetails.label.points=Points
+wallet.administration.rewardDetails.label.rewards=Rewards
+wallet.administration.rewardDetails.label.actions=Actions
+wallet.administration.rewardDetails.label.openTransaction=Open Transaction
+wallet.administration.rewardDetails.label.seeHistory=See History
 
 wallet.overview.rewards.title=Wallet History
 wallet.overview.points=Points
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/blockchain/listener/ContractTransactionMinedListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/ContractTransactionMinedListenerTest.java
similarity index 91%
rename from wallet-services/src/test/java/org/exoplatform/wallet/blockchain/listener/ContractTransactionMinedListenerTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/ContractTransactionMinedListenerTest.java
index 48ccd4510..04633b47d 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/blockchain/listener/ContractTransactionMinedListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/ContractTransactionMinedListenerTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.listener;
+package io.meeds.wallet.blockchain.listener;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
@@ -32,12 +32,12 @@
 import org.mockito.junit.MockitoJUnitRunner;
 
 import org.exoplatform.services.listener.Event;
-import org.exoplatform.wallet.model.ContractTransactionEvent;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.BlockchainTransactionService;
-import org.exoplatform.wallet.service.WalletTransactionService;
-import org.exoplatform.wallet.test.BaseWalletTest;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
+import io.meeds.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ContractTransactionMinedListenerTest extends BaseWalletTest {
@@ -48,7 +48,7 @@ public class ContractTransactionMinedListenerTest extends BaseWalletTest {
   @Mock
   private BlockchainTransactionService            blockchainTransactionService;
 
-  private ContractTransactionMinedListener        listener;
+  private ContractTransactionMinedListener listener;
 
   private Event<String, ContractTransactionEvent> event;
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/blockchain/listener/TransactionMinedAndUpdatedListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionMinedAndUpdatedListenerTest.java
similarity index 90%
rename from wallet-services/src/test/java/org/exoplatform/wallet/blockchain/listener/TransactionMinedAndUpdatedListenerTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionMinedAndUpdatedListenerTest.java
index 886b674de..804b57fc7 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/blockchain/listener/TransactionMinedAndUpdatedListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionMinedAndUpdatedListenerTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.listener;
+package io.meeds.wallet.blockchain.listener;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.timeout;
@@ -29,11 +29,11 @@
 
 import org.exoplatform.container.PortalContainer;
 import org.exoplatform.services.listener.Event;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.BlockchainTransactionService;
-import org.exoplatform.wallet.service.WalletTransactionService;
-import org.exoplatform.wallet.test.BaseWalletTest;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
+import io.meeds.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TransactionMinedAndUpdatedListenerTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/blockchain/listener/TransactionMinedListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionMinedListenerTest.java
similarity index 93%
rename from wallet-services/src/test/java/org/exoplatform/wallet/blockchain/listener/TransactionMinedListenerTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionMinedListenerTest.java
index 2f5a60255..fa7a9a31e 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/blockchain/listener/TransactionMinedListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionMinedListenerTest.java
@@ -14,9 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.listener;
+package io.meeds.wallet.blockchain.listener;
 
-import static org.exoplatform.wallet.utils.WalletUtils.TRANSACTION_MINED_AND_UPDATED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_MINED_AND_UPDATED_EVENT;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
@@ -38,12 +38,12 @@
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.ListenerService;
 import org.exoplatform.wallet.contract.MeedsToken;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.service.WalletTransactionService;
-import org.exoplatform.wallet.test.BaseWalletTest;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
+import io.meeds.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TransactionMinedListenerTest extends BaseWalletTest {
@@ -57,7 +57,7 @@ public class TransactionMinedListenerTest extends BaseWalletTest {
   @Mock
   private ListenerService                    listenerService;
 
-  private TransactionMinedListener           listener;
+  private TransactionMinedListener listener;
 
   private Event<Object, Map<String, Object>> event;
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/blockchain/listener/TransactionSentToBlockchainListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionSentToBlockchainListenerTest.java
similarity index 87%
rename from wallet-services/src/test/java/org/exoplatform/wallet/blockchain/listener/TransactionSentToBlockchainListenerTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionSentToBlockchainListenerTest.java
index 0a2ae13eb..030153876 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/blockchain/listener/TransactionSentToBlockchainListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionSentToBlockchainListenerTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.listener;
+package io.meeds.wallet.blockchain.listener;
 
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -28,11 +28,11 @@
 import org.mockito.junit.MockitoJUnitRunner;
 
 import org.exoplatform.services.listener.Event;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.BlockchainTransactionService;
-import org.exoplatform.wallet.service.WalletTransactionService;
-import org.exoplatform.wallet.test.BaseWalletTest;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
+import io.meeds.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TransactionSentToBlockchainListenerTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/blockchain/listener/TransactionWithNonceVerifierListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionWithNonceVerifierListenerTest.java
similarity index 92%
rename from wallet-services/src/test/java/org/exoplatform/wallet/blockchain/listener/TransactionWithNonceVerifierListenerTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionWithNonceVerifierListenerTest.java
index 392ba9153..0d6928e7b 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/blockchain/listener/TransactionWithNonceVerifierListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionWithNonceVerifierListenerTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.listener;
+package io.meeds.wallet.blockchain.listener;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
@@ -35,12 +35,12 @@
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.wallet.contract.MeedsToken;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.BlockchainTransactionService;
-import org.exoplatform.wallet.service.WalletTransactionService;
-import org.exoplatform.wallet.test.BaseWalletTest;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
+import io.meeds.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TransactionWithNonceVerifierListenerTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/blockchain/service/EthereumBlockchainTransactionServiceTest.java b/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumBlockchainTransactionServiceTest.java
similarity index 98%
rename from wallet-services/src/test/java/org/exoplatform/wallet/blockchain/service/EthereumBlockchainTransactionServiceTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumBlockchainTransactionServiceTest.java
index 7c4495e48..7b760b690 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/blockchain/service/EthereumBlockchainTransactionServiceTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumBlockchainTransactionServiceTest.java
@@ -14,11 +14,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.service;
+package io.meeds.wallet.blockchain.service;
 
-import static org.exoplatform.wallet.utils.WalletUtils.LAST_BLOCK_NUMBER_KEY_NAME;
-import static org.exoplatform.wallet.utils.WalletUtils.TRANSACTION_EFFECTIVELY_SENT_CODE;
-import static org.exoplatform.wallet.utils.WalletUtils.TRANSACTION_SENT_TO_BLOCKCHAIN_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.LAST_BLOCK_NUMBER_KEY_NAME;
+import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_EFFECTIVELY_SENT_CODE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_SENT_TO_BLOCKCHAIN_EVENT;
 import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -59,16 +59,16 @@
 import org.exoplatform.commons.api.settings.SettingService;
 import org.exoplatform.commons.api.settings.SettingValue;
 import org.exoplatform.services.listener.ListenerService;
-import org.exoplatform.wallet.blockchain.BlockchainRequestException;
-import org.exoplatform.wallet.blockchain.MaxRequestRateReachedException;
+import io.meeds.wallet.blockchain.BlockchainRequestException;
+import io.meeds.wallet.blockchain.MaxRequestRateReachedException;
 import org.exoplatform.wallet.contract.MeedsToken;
-import org.exoplatform.wallet.model.ContractTransactionEvent;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.service.WalletTransactionService;
-import org.exoplatform.wallet.test.BaseWalletTest;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
+import io.meeds.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class EthereumBlockchainTransactionServiceTest extends BaseWalletTest {
@@ -86,7 +86,7 @@ public class EthereumBlockchainTransactionServiceTest extends BaseWalletTest {
   private SettingService                       settingService;
 
   @Mock
-  private EthereumClientConnector              ethereumClientConnector;
+  private EthereumClientConnector ethereumClientConnector;
 
   private EthereumBlockchainTransactionService service;
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/blockchain/service/EthereumClientConnectorTest.java b/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumClientConnectorTest.java
similarity index 98%
rename from wallet-services/src/test/java/org/exoplatform/wallet/blockchain/service/EthereumClientConnectorTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumClientConnectorTest.java
index 28a2f68ac..5fed198cd 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/blockchain/service/EthereumClientConnectorTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumClientConnectorTest.java
@@ -14,9 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.blockchain.service;
+package io.meeds.wallet.blockchain.service;
 
-import static org.exoplatform.wallet.utils.WalletUtils.CONTRACT_TRANSACTION_MINED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.CONTRACT_TRANSACTION_MINED_EVENT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -60,9 +60,9 @@
 import org.exoplatform.services.cache.CacheService;
 import org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache;
 import org.exoplatform.services.listener.ListenerService;
-import org.exoplatform.wallet.model.ContractTransactionEvent;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.test.BaseWalletTest;
 
 import io.reactivex.Flowable;
 import io.reactivex.disposables.Disposable;
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/dao/AddressLabelDAOTest.java b/wallet-services/src/test/java/io/meeds/wallet/dao/AddressLabelDAOTest.java
similarity index 91%
rename from wallet-services/src/test/java/org/exoplatform/wallet/dao/AddressLabelDAOTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/dao/AddressLabelDAOTest.java
index 56aa7d187..6fd30bdbd 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/dao/AddressLabelDAOTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/dao/AddressLabelDAOTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.dao;
+package io.meeds.wallet.dao;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -23,8 +23,8 @@
 
 import org.junit.Test;
 
-import org.exoplatform.wallet.entity.AddressLabelEntity;
-import org.exoplatform.wallet.test.BaseWalletTest;
+import io.meeds.wallet.entity.AddressLabelEntity;
+import io.meeds.wallet.test.BaseWalletTest;
 
 public class AddressLabelDAOTest extends BaseWalletTest {
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/dao/WalletAccountBackupDAOTest.java b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountBackupDAOTest.java
similarity index 92%
rename from wallet-services/src/test/java/org/exoplatform/wallet/dao/WalletAccountBackupDAOTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountBackupDAOTest.java
index f2c86ffec..ff1c0862e 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/dao/WalletAccountBackupDAOTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountBackupDAOTest.java
@@ -15,7 +15,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-package org.exoplatform.wallet.dao;
+package io.meeds.wallet.dao;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -26,11 +26,11 @@
 
 import org.junit.Test;
 
-import org.exoplatform.wallet.entity.WalletBackupEntity;
-import org.exoplatform.wallet.entity.WalletEntity;
-import org.exoplatform.wallet.model.WalletProvider;
-import org.exoplatform.wallet.model.WalletType;
-import org.exoplatform.wallet.test.BaseWalletTest;
+import io.meeds.wallet.entity.WalletBackupEntity;
+import io.meeds.wallet.entity.WalletEntity;
+import io.meeds.wallet.wallet.model.WalletProvider;
+import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.test.BaseWalletTest;
 
 public class WalletAccountBackupDAOTest extends BaseWalletTest {
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/dao/WalletAccountDAOTest.java b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountDAOTest.java
similarity index 93%
rename from wallet-services/src/test/java/org/exoplatform/wallet/dao/WalletAccountDAOTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountDAOTest.java
index d25e0577f..8f8a78399 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/dao/WalletAccountDAOTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountDAOTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.dao;
+package io.meeds.wallet.dao;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -25,9 +25,9 @@
 
 import org.junit.Test;
 
-import org.exoplatform.wallet.entity.WalletEntity;
-import org.exoplatform.wallet.model.WalletType;
-import org.exoplatform.wallet.test.BaseWalletTest;
+import io.meeds.wallet.entity.WalletEntity;
+import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.test.BaseWalletTest;
 
 public class WalletAccountDAOTest extends BaseWalletTest {
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/dao/WalletBlockchainStateDAOTest.java b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletBlockchainStateDAOTest.java
similarity index 92%
rename from wallet-services/src/test/java/org/exoplatform/wallet/dao/WalletBlockchainStateDAOTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/dao/WalletBlockchainStateDAOTest.java
index b35016c5b..49398f8a1 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/dao/WalletBlockchainStateDAOTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletBlockchainStateDAOTest.java
@@ -14,16 +14,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.dao;
+package io.meeds.wallet.dao;
 
 import java.util.List;
 
 import org.junit.Test;
 
-import org.exoplatform.wallet.entity.WalletBlockchainStateEntity;
-import org.exoplatform.wallet.entity.WalletEntity;
-import org.exoplatform.wallet.model.WalletType;
-import org.exoplatform.wallet.test.BaseWalletTest;
+import io.meeds.wallet.entity.WalletBlockchainStateEntity;
+import io.meeds.wallet.entity.WalletEntity;
+import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.test.BaseWalletTest;
 
 public class WalletBlockchainStateDAOTest extends BaseWalletTest {
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/dao/WalletPrivateKeyDAOTest.java b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletPrivateKeyDAOTest.java
similarity index 93%
rename from wallet-services/src/test/java/org/exoplatform/wallet/dao/WalletPrivateKeyDAOTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/dao/WalletPrivateKeyDAOTest.java
index 545f8161d..3445486fb 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/dao/WalletPrivateKeyDAOTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletPrivateKeyDAOTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.dao;
+package io.meeds.wallet.dao;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -25,8 +25,8 @@
 
 import org.junit.Test;
 
-import org.exoplatform.wallet.entity.WalletPrivateKeyEntity;
-import org.exoplatform.wallet.test.BaseWalletTest;
+import io.meeds.wallet.entity.WalletPrivateKeyEntity;
+import io.meeds.wallet.test.BaseWalletTest;
 
 public class WalletPrivateKeyDAOTest extends BaseWalletTest {
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/dao/WalletTransactionDAOTest.java b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletTransactionDAOTest.java
similarity index 98%
rename from wallet-services/src/test/java/org/exoplatform/wallet/dao/WalletTransactionDAOTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/dao/WalletTransactionDAOTest.java
index 4d93d75fd..1a9d4169c 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/dao/WalletTransactionDAOTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletTransactionDAOTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.dao;
+package io.meeds.wallet.dao;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -25,9 +25,9 @@
 
 import org.junit.Test;
 
-import org.exoplatform.wallet.entity.TransactionEntity;
-import org.exoplatform.wallet.test.BaseWalletTest;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.entity.TransactionEntity;
+import io.meeds.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 public class WalletTransactionDAOTest extends BaseWalletTest {
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/job/BoostAdminTransactionJobTest.java b/wallet-services/src/test/java/io/meeds/wallet/job/BoostAdminTransactionJobTest.java
similarity index 93%
rename from wallet-services/src/test/java/org/exoplatform/wallet/job/BoostAdminTransactionJobTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/job/BoostAdminTransactionJobTest.java
index 03b16a2f6..479ea0305 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/job/BoostAdminTransactionJobTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/job/BoostAdminTransactionJobTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.job;
+package io.meeds.wallet.job;
 
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.times;
@@ -26,8 +26,8 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import org.exoplatform.wallet.service.WalletTokenAdminService;
-import org.exoplatform.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.test.BaseWalletTest;
 
 @RunWith(MockitoJUnitRunner.class)
 public class BoostAdminTransactionJobTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/job/PendingEtherTransactionVerifierJobTest.java b/wallet-services/src/test/java/io/meeds/wallet/job/PendingEtherTransactionVerifierJobTest.java
similarity index 92%
rename from wallet-services/src/test/java/org/exoplatform/wallet/job/PendingEtherTransactionVerifierJobTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/job/PendingEtherTransactionVerifierJobTest.java
index 1e9de7919..0b17f71b5 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/job/PendingEtherTransactionVerifierJobTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/job/PendingEtherTransactionVerifierJobTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.job;
+package io.meeds.wallet.job;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doThrow;
@@ -31,12 +31,12 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.BlockchainTransactionService;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.service.WalletTransactionService;
-import org.exoplatform.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
+import io.meeds.wallet.test.BaseWalletTest;
 
 @RunWith(MockitoJUnitRunner.class)
 public class PendingEtherTransactionVerifierJobTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/job/TransactionSenderJobTest.java b/wallet-services/src/test/java/io/meeds/wallet/job/TransactionSenderJobTest.java
similarity index 93%
rename from wallet-services/src/test/java/org/exoplatform/wallet/job/TransactionSenderJobTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/job/TransactionSenderJobTest.java
index 8f8873038..a34af8fb4 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/job/TransactionSenderJobTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/job/TransactionSenderJobTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.job;
+package io.meeds.wallet.job;
 
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.times;
@@ -26,8 +26,8 @@
 import org.mockito.junit.MockitoJUnitRunner;
 import org.quartz.JobExecutionException;
 
-import org.exoplatform.wallet.service.BlockchainTransactionService;
-import org.exoplatform.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.test.BaseWalletTest;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TransactionSenderJobTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/listener/GamificationWalletInitializationListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/listener/GamificationWalletInitializationListenerTest.java
similarity index 83%
rename from wallet-services/src/test/java/org/exoplatform/wallet/listener/GamificationWalletInitializationListenerTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/listener/GamificationWalletInitializationListenerTest.java
index cef0c78e9..29b665d1c 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/listener/GamificationWalletInitializationListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/listener/GamificationWalletInitializationListenerTest.java
@@ -15,16 +15,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package org.exoplatform.wallet.listener;
+package io.meeds.wallet.listener;
 
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_BROADCAST_ACTION_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_CREATE_WALLET_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_EARNER_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_EVENT_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_TYPE;
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_RECEIVER_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.GAMIFICATION_WALLET_OBJECT_TYPE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_BROADCAST_ACTION_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_CREATE_WALLET_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_EARNER_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_EVENT_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_TYPE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_RECEIVER_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_WALLET_OBJECT_TYPE;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
@@ -33,6 +33,7 @@
 
 import java.util.Map;
 
+import io.meeds.wallet.listener.GamificationWalletInitializationListener;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -40,7 +41,7 @@
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.ListenerService;
-import org.exoplatform.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.Wallet;
 
 @RunWith(MockitoJUnitRunner.class)
 public class GamificationWalletInitializationListenerTest {
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/listener/TransactionCreatedListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/listener/TransactionCreatedListenerTest.java
similarity index 92%
rename from wallet-services/src/test/java/org/exoplatform/wallet/listener/TransactionCreatedListenerTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/listener/TransactionCreatedListenerTest.java
index 9db219aa5..3c71e1dec 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/listener/TransactionCreatedListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/listener/TransactionCreatedListenerTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.listener;
+package io.meeds.wallet.listener;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -30,10 +30,10 @@
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.ListenerService;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.WalletTransactionService;
-import org.exoplatform.wallet.test.BaseWalletTest;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
+import io.meeds.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TransactionCreatedListenerTest extends BaseWalletTest {
@@ -44,7 +44,7 @@ public class TransactionCreatedListenerTest extends BaseWalletTest {
   @Mock
   private ListenerService                  listenerService;
 
-  private TransactionCreatedListener       listener;
+  private TransactionCreatedListener listener;
 
   private Event<Object, TransactionDetail> event;
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/listener/WalletDeletedListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/listener/WalletDeletedListenerTest.java
similarity index 88%
rename from wallet-services/src/test/java/org/exoplatform/wallet/listener/WalletDeletedListenerTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/listener/WalletDeletedListenerTest.java
index d350dbd3d..54b78e829 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/listener/WalletDeletedListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/listener/WalletDeletedListenerTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.listener;
+package io.meeds.wallet.listener;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -35,11 +35,11 @@
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.ListenerService;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.WalletTransactionService;
-import org.exoplatform.wallet.test.BaseWalletTest;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
+import io.meeds.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class WalletDeletedListenerTest extends BaseWalletTest {
@@ -52,7 +52,7 @@ public class WalletDeletedListenerTest extends BaseWalletTest {
   @Mock
   private ListenerService          listenerService;
 
-  private WalletDeletedListener    listener;
+  private WalletDeletedListener listener;
 
   private Event<Wallet, String>    event;
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/service/WalletAccountServiceTest.java b/wallet-services/src/test/java/io/meeds/wallet/service/WalletAccountServiceTest.java
similarity index 97%
rename from wallet-services/src/test/java/org/exoplatform/wallet/service/WalletAccountServiceTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/service/WalletAccountServiceTest.java
index aaf44bce6..b3607f240 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/service/WalletAccountServiceTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/service/WalletAccountServiceTest.java
@@ -14,12 +14,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.service;
+package io.meeds.wallet.service;
 
-import static org.exoplatform.wallet.utils.WalletUtils.NEW_ADDRESS_ASSOCIATED_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_INITIALIZED_SETTING_PARAM;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_MODIFIED_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.WALLET_SCOPE;
+import static io.meeds.wallet.wallet.utils.WalletUtils.NEW_ADDRESS_ASSOCIATED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_INITIALIZED_SETTING_PARAM;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_MODIFIED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_SCOPE;
 import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -39,6 +39,8 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletTokenAdminService;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 
@@ -51,18 +53,18 @@
 import org.exoplatform.services.listener.ListenerService;
 import org.exoplatform.services.security.IdentityRegistry;
 import org.exoplatform.services.security.MembershipEntry;
-import org.exoplatform.wallet.dao.AddressLabelDAO;
-import org.exoplatform.wallet.entity.AddressLabelEntity;
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.WalletAddressLabel;
-import org.exoplatform.wallet.model.WalletProvider;
-import org.exoplatform.wallet.model.WalletState;
-import org.exoplatform.wallet.model.WalletType;
-import org.exoplatform.wallet.storage.AddressLabelStorage;
-import org.exoplatform.wallet.storage.WalletStorage;
-import org.exoplatform.wallet.test.BaseWalletTest;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.dao.AddressLabelDAO;
+import io.meeds.wallet.entity.AddressLabelEntity;
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.WalletAddressLabel;
+import io.meeds.wallet.wallet.model.WalletProvider;
+import io.meeds.wallet.wallet.model.WalletState;
+import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.storage.AddressLabelStorage;
+import io.meeds.wallet.storage.WalletStorage;
+import io.meeds.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 public class WalletAccountServiceTest extends BaseWalletTest {
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/service/WalletServiceTest.java b/wallet-services/src/test/java/io/meeds/wallet/service/WalletServiceTest.java
similarity index 93%
rename from wallet-services/src/test/java/org/exoplatform/wallet/service/WalletServiceTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/service/WalletServiceTest.java
index 07dfc05ab..03318511b 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/service/WalletServiceTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/service/WalletServiceTest.java
@@ -14,10 +14,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.service;
+package io.meeds.wallet.service;
 
-import static org.exoplatform.wallet.utils.WalletUtils.FUNDS_REQUEST_NOTIFICATION_ID;
-import static org.exoplatform.wallet.utils.WalletUtils.getWalletService;
+import static io.meeds.wallet.wallet.utils.WalletUtils.FUNDS_REQUEST_NOTIFICATION_ID;
+import static io.meeds.wallet.wallet.utils.WalletUtils.getWalletService;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -25,7 +25,10 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.apache.commons.lang3.StringUtils;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletContractService;
+import io.meeds.wallet.wallet.service.WalletService;
+import io.meeds.wallet.wallet.service.WalletTransactionService;
 import org.junit.Test;
 import org.picocontainer.Startable;
 
@@ -34,15 +37,15 @@
 import org.exoplatform.commons.api.notification.service.storage.WebNotificationStorage;
 import org.exoplatform.services.security.IdentityRegistry;
 import org.exoplatform.social.core.identity.provider.OrganizationIdentityProvider;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.settings.GlobalSettings;
-import org.exoplatform.wallet.model.settings.InitialFundsSettings;
-import org.exoplatform.wallet.model.settings.NetworkSettings;
-import org.exoplatform.wallet.model.settings.UserSettings;
-import org.exoplatform.wallet.model.settings.WalletSettings;
-import org.exoplatform.wallet.model.transaction.FundsRequest;
-import org.exoplatform.wallet.test.BaseWalletTest;
-import org.exoplatform.wallet.test.mock.IdentityManagerMock;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.settings.GlobalSettings;
+import io.meeds.wallet.wallet.model.settings.InitialFundsSettings;
+import io.meeds.wallet.wallet.model.settings.NetworkSettings;
+import io.meeds.wallet.wallet.model.settings.UserSettings;
+import io.meeds.wallet.wallet.model.settings.WalletSettings;
+import io.meeds.wallet.wallet.model.transaction.FundsRequest;
+import io.meeds.wallet.test.BaseWalletTest;
+import io.meeds.wallet.test.mock.IdentityManagerMock;
 
 public class WalletServiceTest extends BaseWalletTest {
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/service/WalletTransactionServiceTest.java b/wallet-services/src/test/java/io/meeds/wallet/service/WalletTransactionServiceTest.java
similarity index 98%
rename from wallet-services/src/test/java/org/exoplatform/wallet/service/WalletTransactionServiceTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/service/WalletTransactionServiceTest.java
index f0fecb731..4c60be632 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/service/WalletTransactionServiceTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/service/WalletTransactionServiceTest.java
@@ -14,10 +14,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.service;
+package io.meeds.wallet.service;
 
-import static org.exoplatform.wallet.utils.WalletUtils.TRANSACTION_CREATED_EVENT;
-import static org.exoplatform.wallet.utils.WalletUtils.TRANSACTION_MODIFIED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_CREATED_EVENT;
+import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_MODIFIED_EVENT;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertThrows;
 
@@ -26,15 +26,16 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import io.meeds.wallet.wallet.service.WalletTransactionService;
 import org.junit.Test;
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.listener.ListenerService;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.model.transaction.TransactionStatistics;
-import org.exoplatform.wallet.test.BaseWalletTest;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.model.transaction.TransactionStatistics;
+import io.meeds.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 public class WalletTransactionServiceTest extends BaseWalletTest {
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/storage/AddressLabelStorageTest.java b/wallet-services/src/test/java/io/meeds/wallet/storage/AddressLabelStorageTest.java
similarity index 97%
rename from wallet-services/src/test/java/org/exoplatform/wallet/storage/AddressLabelStorageTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/storage/AddressLabelStorageTest.java
index 5f0382e9e..8a8c8a31f 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/storage/AddressLabelStorageTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/storage/AddressLabelStorageTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.storage;
+package io.meeds.wallet.storage;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -26,8 +26,8 @@
 
 import org.junit.Test;
 
-import org.exoplatform.wallet.model.WalletAddressLabel;
-import org.exoplatform.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.model.WalletAddressLabel;
+import io.meeds.wallet.test.BaseWalletTest;
 
 public class AddressLabelStorageTest extends BaseWalletTest {
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/storage/TransactionStorageTest.java b/wallet-services/src/test/java/io/meeds/wallet/storage/TransactionStorageTest.java
similarity index 98%
rename from wallet-services/src/test/java/org/exoplatform/wallet/storage/TransactionStorageTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/storage/TransactionStorageTest.java
index 9e494f3a4..fb750d784 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/storage/TransactionStorageTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/storage/TransactionStorageTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.storage;
+package io.meeds.wallet.storage;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -27,10 +27,10 @@
 
 import org.junit.Test;
 
-import org.exoplatform.wallet.entity.TransactionEntity;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.test.BaseWalletTest;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.entity.TransactionEntity;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 public class TransactionStorageTest extends BaseWalletTest {
 
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/storage/WalletStorageTest.java b/wallet-services/src/test/java/io/meeds/wallet/storage/WalletStorageTest.java
similarity index 97%
rename from wallet-services/src/test/java/org/exoplatform/wallet/storage/WalletStorageTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/storage/WalletStorageTest.java
index ef4baf6a2..7d6adcf61 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/storage/WalletStorageTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/storage/WalletStorageTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.storage;
+package io.meeds.wallet.storage;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -27,14 +27,14 @@
 
 import org.junit.Test;
 
-import org.exoplatform.wallet.dao.WalletAccountBackupDAO;
-import org.exoplatform.wallet.entity.WalletBackupEntity;
-import org.exoplatform.wallet.entity.WalletEntity;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.WalletProvider;
-import org.exoplatform.wallet.model.WalletState;
-import org.exoplatform.wallet.test.BaseWalletTest;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.dao.WalletAccountBackupDAO;
+import io.meeds.wallet.entity.WalletBackupEntity;
+import io.meeds.wallet.entity.WalletEntity;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.WalletProvider;
+import io.meeds.wallet.wallet.model.WalletState;
+import io.meeds.wallet.test.BaseWalletTest;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 public class WalletStorageTest extends BaseWalletTest {
   private static final String WALLET_PRIVATE_KEY_CONTENT = "Wallet-Private-Key-Encrypted-With-Password";
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/test/BaseWalletTest.java b/wallet-services/src/test/java/io/meeds/wallet/test/BaseWalletTest.java
similarity index 93%
rename from wallet-services/src/test/java/org/exoplatform/wallet/test/BaseWalletTest.java
rename to wallet-services/src/test/java/io/meeds/wallet/test/BaseWalletTest.java
index 18937abdd..400fdc142 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/test/BaseWalletTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/test/BaseWalletTest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.test;
+package io.meeds.wallet.test;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -49,36 +49,36 @@
 import org.exoplatform.services.security.MembershipEntry;
 import org.exoplatform.social.core.manager.IdentityManager;
 import org.exoplatform.social.core.space.spi.SpaceService;
-import org.exoplatform.wallet.dao.AddressLabelDAO;
-import org.exoplatform.wallet.dao.WalletAccountBackupDAO;
-import org.exoplatform.wallet.dao.WalletAccountDAO;
-import org.exoplatform.wallet.dao.WalletBlockchainStateDAO;
-import org.exoplatform.wallet.dao.WalletPrivateKeyDAO;
-import org.exoplatform.wallet.dao.WalletTransactionDAO;
-import org.exoplatform.wallet.entity.AddressLabelEntity;
-import org.exoplatform.wallet.entity.TransactionEntity;
-import org.exoplatform.wallet.entity.WalletBackupEntity;
-import org.exoplatform.wallet.entity.WalletBlockchainStateEntity;
-import org.exoplatform.wallet.entity.WalletEntity;
-import org.exoplatform.wallet.entity.WalletPrivateKeyEntity;
-import org.exoplatform.wallet.model.ContractDetail;
-import org.exoplatform.wallet.model.ContractTransactionEvent;
-import org.exoplatform.wallet.model.Wallet;
-import org.exoplatform.wallet.model.WalletAddressLabel;
-import org.exoplatform.wallet.model.WalletState;
-import org.exoplatform.wallet.model.WalletType;
-import org.exoplatform.wallet.model.transaction.TransactionDetail;
-import org.exoplatform.wallet.service.BlockchainTransactionService;
-import org.exoplatform.wallet.service.WalletAccountService;
-import org.exoplatform.wallet.service.WalletService;
-import org.exoplatform.wallet.storage.AddressLabelStorage;
-import org.exoplatform.wallet.storage.TransactionStorage;
-import org.exoplatform.wallet.storage.WalletStorage;
-import org.exoplatform.wallet.storage.cached.CachedAccountStorage;
-import org.exoplatform.wallet.storage.cached.CachedTransactionStorage;
-import org.exoplatform.wallet.test.mock.IdentityManagerMock;
-import org.exoplatform.wallet.test.mock.SpaceServiceMock;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.dao.AddressLabelDAO;
+import io.meeds.wallet.dao.WalletAccountBackupDAO;
+import io.meeds.wallet.dao.WalletAccountDAO;
+import io.meeds.wallet.dao.WalletBlockchainStateDAO;
+import io.meeds.wallet.dao.WalletPrivateKeyDAO;
+import io.meeds.wallet.dao.WalletTransactionDAO;
+import io.meeds.wallet.entity.AddressLabelEntity;
+import io.meeds.wallet.entity.TransactionEntity;
+import io.meeds.wallet.entity.WalletBackupEntity;
+import io.meeds.wallet.entity.WalletBlockchainStateEntity;
+import io.meeds.wallet.entity.WalletEntity;
+import io.meeds.wallet.entity.WalletPrivateKeyEntity;
+import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.wallet.model.WalletAddressLabel;
+import io.meeds.wallet.wallet.model.WalletState;
+import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.wallet.service.WalletService;
+import io.meeds.wallet.storage.AddressLabelStorage;
+import io.meeds.wallet.storage.TransactionStorage;
+import io.meeds.wallet.storage.WalletStorage;
+import io.meeds.wallet.storage.cached.CachedAccountStorage;
+import io.meeds.wallet.storage.cached.CachedTransactionStorage;
+import io.meeds.wallet.test.mock.IdentityManagerMock;
+import io.meeds.wallet.test.mock.SpaceServiceMock;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 @ConfiguredBy({
   @ConfigurationUnit(scope = ContainerScope.ROOT, path = "conf/configuration.xml"),
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/test/mock/IdentityManagerMock.java b/wallet-services/src/test/java/io/meeds/wallet/test/mock/IdentityManagerMock.java
similarity index 98%
rename from wallet-services/src/test/java/org/exoplatform/wallet/test/mock/IdentityManagerMock.java
rename to wallet-services/src/test/java/io/meeds/wallet/test/mock/IdentityManagerMock.java
index 9f443e332..bb1c2d780 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/test/mock/IdentityManagerMock.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/test/mock/IdentityManagerMock.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.test.mock;
+package io.meeds.wallet.test.mock;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -35,8 +35,8 @@
 import org.exoplatform.social.core.profile.*;
 import org.exoplatform.social.core.space.model.Space;
 import org.exoplatform.social.core.storage.api.IdentityStorage;
-import org.exoplatform.wallet.plugin.WalletAdminIdentityProvider;
-import org.exoplatform.wallet.utils.WalletUtils;
+import io.meeds.wallet.wallet.plugin.WalletAdminIdentityProvider;
+import io.meeds.wallet.wallet.utils.WalletUtils;
 
 public class IdentityManagerMock implements IdentityManager {
   List<Identity> identities = new ArrayList<>();
diff --git a/wallet-services/src/test/java/org/exoplatform/wallet/test/mock/SpaceServiceMock.java b/wallet-services/src/test/java/io/meeds/wallet/test/mock/SpaceServiceMock.java
similarity index 99%
rename from wallet-services/src/test/java/org/exoplatform/wallet/test/mock/SpaceServiceMock.java
rename to wallet-services/src/test/java/io/meeds/wallet/test/mock/SpaceServiceMock.java
index 827e88bbc..a0711f312 100644
--- a/wallet-services/src/test/java/org/exoplatform/wallet/test/mock/SpaceServiceMock.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/test/mock/SpaceServiceMock.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.exoplatform.wallet.test.mock;
+package io.meeds.wallet.test.mock;
 
 import java.util.List;
 
diff --git a/wallet-services/src/test/resources/conf/wallet-services-test-local-configuration.xml b/wallet-services/src/test/resources/conf/wallet-services-test-local-configuration.xml
index 6329efed8..95cc14647 100644
--- a/wallet-services/src/test/resources/conf/wallet-services-test-local-configuration.xml
+++ b/wallet-services/src/test/resources/conf/wallet-services-test-local-configuration.xml
@@ -22,12 +22,12 @@
 
   <component>
     <key>org.exoplatform.social.core.space.spi.SpaceService</key>
-    <type>org.exoplatform.wallet.test.mock.SpaceServiceMock</type>
+    <type>io.meeds.wallet.test.mock.SpaceServiceMock</type>
   </component>
 
   <component>
     <key>org.exoplatform.social.core.manager.IdentityManager</key>
-    <type>org.exoplatform.wallet.test.mock.IdentityManagerMock</type>
+    <type>io.meeds.wallet.test.mock.IdentityManagerMock</type>
   </component>
 
 </configuration>
diff --git a/wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java b/wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java
index 32a7049bc..c14c408d2 100644
--- a/wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java
+++ b/wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java
@@ -24,6 +24,7 @@
 
 import io.meeds.spring.AvailableIntegration;
 import io.meeds.spring.kernel.PortalApplicationContextInitializer;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication(scanBasePackages = { 
         WalletApplication.MODULE_NAME,
@@ -34,6 +35,7 @@
 exclude = {
         LiquibaseAutoConfiguration.class,
 })
+@EnableJpaRepositories(basePackages = WalletApplication.MODULE_NAME)
 @PropertySource("classpath:application.properties")
 @PropertySource("classpath:application-common.properties")
 public class WalletApplication extends PortalApplicationContextInitializer {
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/blockchain-configuration.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/blockchain-configuration.xml
index ac863bb05..b2fcae410 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/blockchain-configuration.xml
+++ b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/blockchain-configuration.xml
@@ -19,18 +19,18 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
 
   <component>
-    <key>org.exoplatform.wallet.blockchain.service.EthereumClientConnector</key>
-    <type>org.exoplatform.wallet.blockchain.service.EthereumClientConnector</type>
+    <key>io.meeds.wallet.blockchain.service.EthereumClientConnector</key>
+    <type>io.meeds.wallet.blockchain.service.EthereumClientConnector</type>
   </component>
 
   <component>
-    <key>org.exoplatform.wallet.service.BlockchainTransactionService</key>
-    <type>org.exoplatform.wallet.blockchain.service.EthereumBlockchainTransactionService</type>
+    <key>io.meeds.wallet.wallet.service.BlockchainTransactionService</key>
+    <type>io.meeds.wallet.blockchain.service.EthereumBlockchainTransactionService</type>
   </component>
 
   <component>
-    <key>org.exoplatform.wallet.service.WalletTokenAdminService</key>
-    <type>org.exoplatform.wallet.blockchain.service.EthereumWalletTokenAdminService</type>
+    <key>io.meeds.wallet.wallet.service.WalletTokenAdminService</key>
+    <type>io.meeds.wallet.blockchain.service.EthereumWalletTokenAdminService</type>
   </component>
 
   <external-component-plugins>
@@ -38,62 +38,62 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <component-plugin>
       <name>exo.wallet.addressAssociation.new</name>
       <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.listener.AutoTransactionListener</type>
+      <type>io.meeds.wallet.listener.AutoTransactionListener</type>
     </component-plugin>
     <component-plugin>
       <name>exo.wallet.transaction.mined</name>
       <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.blockchain.listener.TransactionMinedListener</type>
+      <type>io.meeds.wallet.blockchain.listener.TransactionMinedListener</type>
     </component-plugin>
     <component-plugin>
       <name>exo.wallet.transaction.mined</name>
       <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.blockchain.listener.TransactionWithNonceVerifierListener</type>
+      <type>io.meeds.wallet.blockchain.listener.TransactionWithNonceVerifierListener</type>
     </component-plugin>
     <component-plugin>
       <name>exo.wallet.transaction.minedForContract</name>
       <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.blockchain.listener.ContractTransactionMinedListener</type>
+      <type>io.meeds.wallet.blockchain.listener.ContractTransactionMinedListener</type>
     </component-plugin>
     <component-plugin>
       <name>exo.wallet.transaction.minedAndUpdated</name>
       <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.listener.TransactionNotificationListener</type>
+      <type>io.meeds.wallet.listener.TransactionNotificationListener</type>
     </component-plugin>
     <component-plugin>
       <name>exo.wallet.transaction.minedAndUpdated</name>
       <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.blockchain.listener.WebSocketTransactionListener</type>
+      <type>io.meeds.wallet.blockchain.listener.WebSocketTransactionListener</type>
     </component-plugin>
     <component-plugin>
       <name>exo.wallet.transaction.minedAndUpdated</name>
       <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.blockchain.listener.TransactionMinedAndUpdatedListener</type>
+      <type>io.meeds.wallet.blockchain.listener.TransactionMinedAndUpdatedListener</type>
     </component-plugin>
     <component-plugin>
       <name>exo.wallet.transaction.created</name>
       <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.listener.TransactionCreatedListener</type>
+      <type>io.meeds.wallet.listener.TransactionCreatedListener</type>
     </component-plugin>
     <component-plugin>
       <name>exo.wallet.transaction.sent</name>
       <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.blockchain.listener.TransactionSentToBlockchainListener</type>
+      <type>io.meeds.wallet.blockchain.listener.TransactionSentToBlockchainListener</type>
     </component-plugin>
     <component-plugin>
       <name>exo.wallet.modified</name>
       <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.blockchain.listener.WebSocketWalletListener</type>
+      <type>io.meeds.wallet.blockchain.listener.WebSocketWalletListener</type>
     </component-plugin>
     <component-plugin>
       <name>exo.wallet.contract.modified</name>
       <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.blockchain.listener.WebSocketContractListener</type>
+      <type>io.meeds.wallet.blockchain.listener.WebSocketContractListener</type>
     </component-plugin>
     <component-plugin>
       <name>exo.wallet.deleted</name>
       <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.listener.WalletDeletedListener</type>
+      <type>io.meeds.wallet.listener.WalletDeletedListener</type>
     </component-plugin>
   </external-component-plugins>
 
@@ -110,7 +110,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
           <description>details of the execution of the bulk indexing job</description>
           <property name="jobName" value="TransactionSenderJob"/>
           <property name="groupName" value="Wallet"/>
-          <property name="job" value="org.exoplatform.wallet.job.TransactionSenderJob"/>
+          <property name="job" value="io.meeds.wallet.job.TransactionSenderJob"/>
           <property name="repeatCount" value="0"/>
           <property name="period" value="${exo.wallet.TransactionSenderJob.interval:30000}"/><!-- default 30 seconds -->
           <property name="startTime" value="+60000"/><!-- start after 1 minute delay -->
@@ -129,7 +129,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
           <description>Configuration for the Job that boost transaction sending to blockchain</description>
           <property name="jobName" value="BoostAdminTransactionJob"/>
           <property name="groupName" value="Wallet"/>
-          <property name="job" value="org.exoplatform.wallet.job.BoostAdminTransactionJob"/>
+          <property name="job" value="io.meeds.wallet.job.BoostAdminTransactionJob"/>
           <property name="expression" value="${exo.wallet.BoostAdminTransactionJob.expression:0 30 7 * * ?}"/>
         </properties-param>
       </init-params>
@@ -145,7 +145,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
           <description>A job to refresh ether transactions sent by admin wallet</description>
           <property name="jobName" value="PendingEtherTransactionVerifierJob"/>
           <property name="groupName" value="Wallet"/>
-          <property name="job" value="org.exoplatform.wallet.job.PendingEtherTransactionVerifierJob"/>
+          <property name="job" value="io.meeds.wallet.job.PendingEtherTransactionVerifierJob"/>
           <property name="expression" value="${exo.wallet.PendingEtherTransactionVerifierJob.expression:0 0/15 * * * ?}"/>
         </properties-param>
       </init-params>
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/gamification-configuration.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/gamification-configuration.xml
index 2feb5a39c..1729c6139 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/gamification-configuration.xml
+++ b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/gamification-configuration.xml
@@ -28,12 +28,12 @@
     <component-plugin>
       <name>exo.wallet.addressAssociation.new</name>
       <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.listener.GamificationWalletInitializationListener</type>
+      <type>io.meeds.wallet.listener.GamificationWalletInitializationListener</type>
     </component-plugin>
     <component-plugin>
       <name>exo.wallet.addressAssociation.modification</name>
       <set-method>addListener</set-method>
-      <type>org.exoplatform.wallet.listener.GamificationWalletInitializationListener</type>
+      <type>io.meeds.wallet.listener.GamificationWalletInitializationListener</type>
     </component-plugin>
   </external-component-plugins>
 
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/notification-configuration.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/notification-configuration.xml
index fd46734b8..9ce125da6 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/notification-configuration.xml
+++ b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/notification-configuration.xml
@@ -52,7 +52,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <component-plugin>
       <name>notification.plugins</name>
       <set-method>addPlugin</set-method>
-      <type>org.exoplatform.wallet.notification.plugin.WalletReceiverNotificationPlugin</type>
+      <type>io.meeds.wallet.notification.plugin.WalletReceiverNotificationPlugin</type>
       <init-params>
         <object-param>
           <name>template.WalletReceiverNotificationPlugin</name>
@@ -89,7 +89,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <component-plugin>
       <name>notification.plugins</name>
       <set-method>addPlugin</set-method>
-      <type>org.exoplatform.wallet.notification.plugin.WalletSenderNotificationPlugin</type>
+      <type>io.meeds.wallet.notification.plugin.WalletSenderNotificationPlugin</type>
       <init-params>
         <object-param>
           <name>template.WalletSenderNotificationPlugin</name>
@@ -126,7 +126,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <component-plugin>
       <name>notification.plugins</name>
       <set-method>addPlugin</set-method>
-      <type>org.exoplatform.wallet.notification.plugin.FundsRequestNotificationPlugin</type>
+      <type>io.meeds.wallet.notification.plugin.FundsRequestNotificationPlugin</type>
       <init-params>
         <object-param>
           <name>template.FundsRequestNotificationPlugin</name>
@@ -163,7 +163,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <component-plugin>
       <name>notification.plugins</name>
       <set-method>addPlugin</set-method>
-      <type>org.exoplatform.wallet.reward.notification.RewardSuccessNotificationPlugin</type>
+      <type>io.meeds.wallet.reward.notification.RewardSuccessNotificationPlugin</type>
       <init-params>
         <object-param>
           <name>template.RewardSuccessNotificationPlugin</name>
@@ -202,7 +202,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <component-plugin>
       <name>mail.channel.wallet.template</name>
       <set-method>registerTemplateProvider</set-method>
-      <type>org.exoplatform.wallet.notification.provider.MailTemplateProvider</type>
+      <type>io.meeds.wallet.notification.provider.MailTemplateProvider</type>
       <init-params>
         <value-param>
           <name>channel-id</name>
@@ -213,7 +213,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <component-plugin profiles="push-notifications">
       <name>push.channel.wallet.template</name>
       <set-method>registerTemplateProvider</set-method>
-      <type>org.exoplatform.wallet.notification.provider.MobilePushTemplateProvider</type>
+      <type>io.meeds.wallet.notification.provider.MobilePushTemplateProvider</type>
       <init-params>
         <value-param>
           <name>channel-id</name>
@@ -224,7 +224,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <component-plugin>
       <name>mail.channel.wallet.reward.template</name>
       <set-method>registerTemplateProvider</set-method>
-      <type>org.exoplatform.wallet.reward.notification.RewardSuccessTemplateProvider</type>
+      <type>io.meeds.wallet.reward.notification.RewardSuccessTemplateProvider</type>
       <init-params>
         <value-param>
           <name>channel-id</name>
@@ -235,7 +235,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <component-plugin profiles="push-notifications">
       <name>push.channel.wallet.reward.template</name>
       <set-method>registerTemplateProvider</set-method>
-      <type>org.exoplatform.wallet.reward.notification.RewardSuccessTemplateProvider</type>
+      <type>io.meeds.wallet.reward.notification.RewardSuccessTemplateProvider</type>
       <init-params>
         <value-param>
           <name>channel-id</name>
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/gatein-resources.xml b/wallet-webapps/src/main/webapp/WEB-INF/gatein-resources.xml
index c225617e9..948147d88 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/gatein-resources.xml
+++ b/wallet-webapps/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -398,6 +398,9 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <module>walletCommon</module>
         <as>WalletCommon</as>
       </depends>
+      <depends>
+        <module>applicationToolbarComponent</module>
+      </depends>
       <depends>
         <module>vue</module>
       </depends>
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/jsp/wallet.jsp b/wallet-webapps/src/main/webapp/WEB-INF/jsp/wallet.jsp
index 7245d6d96..668b4a9ee 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/jsp/wallet.jsp
+++ b/wallet-webapps/src/main/webapp/WEB-INF/jsp/wallet.jsp
@@ -2,7 +2,7 @@
 <%@ page import="jakarta.servlet.http.HttpSession" %>
 <%@ page import="org.exoplatform.webui.application.WebuiRequestContext" %>
 <%@ page import="org.exoplatform.web.application.RequestContext" %>
-<%@ page import="org.exoplatform.wallet.utils.WalletUtils" %>
+<%@ page import="io.meeds.wallet.wallet.utils.WalletUtils" %>
 <%
     HttpServletRequest httpRequest = ((WebuiRequestContext) RequestContext.getCurrentInstance()).getRequest();
     HttpSession httpSession = httpRequest.getSession();
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletBalance.jsp b/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletBalance.jsp
index 79d025c6b..aed518a7b 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletBalance.jsp
+++ b/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletBalance.jsp
@@ -4,15 +4,15 @@
 <%@ page import="org.exoplatform.webui.application.WebuiRequestContext"%>
 <%@ page import="org.exoplatform.web.application.RequestContext"%>
 <%@ page import="org.exoplatform.container.ExoContainerContext"%>
-<%@ page import="org.exoplatform.wallet.service.WalletService"%>
-<%@ page import="org.exoplatform.wallet.service.WalletAccountService"%>
+<%@ page import="io.meeds.wallet.wallet.service.WalletService"%>
+<%@ page import="io.meeds.wallet.wallet.service.WalletAccountService"%>
 <%@ page import="org.exoplatform.services.resources.ResourceBundleService"%>
-<%@ page import="org.exoplatform.wallet.model.settings.GlobalSettings"%>
-<%@ page import="org.exoplatform.wallet.model.ContractDetail"%>
-<%@ page import="org.exoplatform.wallet.model.Wallet"%>
-<%@ page import="org.exoplatform.wallet.model.WalletType"%>
+<%@ page import="io.meeds.wallet.wallet.model.settings.GlobalSettings"%>
+<%@ page import="io.meeds.wallet.wallet.model.ContractDetail"%>
+<%@ page import="io.meeds.wallet.wallet.model.Wallet"%>
+<%@ page import="io.meeds.wallet.wallet.model.WalletType"%>
+<%@ page import="io.meeds.wallet.wallet.utils.WalletUtils"%>
 <%@ page import="org.exoplatform.social.core.service.LinkProvider"%>
-<%@ page import="org.exoplatform.wallet.utils.WalletUtils"%>
 
 <%
   String title = "Wallet";
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletSettings.jsp b/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletSettings.jsp
index 2db2ddf12..af375947e 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletSettings.jsp
+++ b/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletSettings.jsp
@@ -2,7 +2,7 @@
 <%@ page import="jakarta.servlet.http.HttpSession" %>
 <%@ page import="org.exoplatform.webui.application.WebuiRequestContext" %>
 <%@ page import="org.exoplatform.web.application.RequestContext" %>
-<%@ page import="org.exoplatform.wallet.utils.WalletUtils" %>
+<%@ page import="io.meeds.wallet.wallet.utils.WalletUtils" %>
 <%
 /*
 This file is part of the Meeds project (https://meeds.io/).
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/components/ProfileChip.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/components/ProfileChip.vue
index 7376d1c8e..c461ece6c 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/components/ProfileChip.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/components/ProfileChip.vue
@@ -37,9 +37,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <template v-else-if="!enabled">
       <del class="red--text">{{ displayName }}</del> ({{ $t('exoplatform.wallet.label.disabledWallet') }})
     </template>
-    <template v-else-if="disabledInRewardPool">
-      {{ displayName }} <span class="red--text">({{ $t('exoplatform.wallet.label.disabledPool') }})</span>
-    </template>
     <template v-else-if="isNotInitialized">
       {{ displayName }} <span class="orange--text">({{ $t('exoplatform.wallet.label.notInitialized') }})</span>
     </template>
@@ -94,12 +91,6 @@ export default {
         return true;
       },
     },
-    disabledInRewardPool: {
-      type: Boolean,
-      default: function() {
-        return false;
-      },
-    },
     displayNoAddress: {
       type: Boolean,
       default: function() {
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/RewardService.js b/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/RewardService.js
index cb28c2070..b3af4ef70 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/RewardService.js
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/RewardService.js
@@ -16,7 +16,7 @@
  */
 
 export function getRewardSettings() {
-  return fetch('/portal/rest/wallet/api/reward/settings', {
+  return fetch('/wallet/rest/settings/reward', {
     method: 'GET',
     credentials: 'include',
   })
@@ -24,7 +24,7 @@ export function getRewardSettings() {
 }
 
 export function saveRewardSettings(settings) {
-  return fetch('/portal/rest/wallet/api/reward/settings/save', {
+  return fetch('/wallet/rest/settings/reward', {
     method: 'POST',
     credentials: 'include',
     headers: {
@@ -36,45 +36,44 @@ export function saveRewardSettings(settings) {
   });
 }
 
-export function getRewardTeams() {
-  return fetch('/portal/rest/wallet/api/reward/team/list', {
-    method: 'GET',
+export function deleteRewardSettings() {
+  return fetch('/wallet/rest/settings/reward', {
+    method: 'DELETE',
     credentials: 'include',
-  }).then((resp) => resp && resp.ok && resp.json());
+  }).then(resp => {
+    if (resp && resp.ok) {
+      return resp.json;
+    } else {
+      throw new Error('Error when deleting rewarding settings');
+    }
+  });
 }
 
-export function saveRewardTeam(team) {
-  return fetch('/portal/rest/wallet/api/reward/team/save', {
-    method: 'POST',
+export function getRewardDates(date) {
+  return fetch(`/wallet/rest/settings/reward/getDates?date=${date}`, {
     credentials: 'include',
     headers: {
+      Accept: 'application/json',
       'Content-Type': 'application/json',
     },
-    body: JSON.stringify(team),
   }).then((resp) => resp && resp.ok && resp.json());
 }
 
-export function removeRewardTeam(id) {
-  return fetch(`/portal/rest/wallet/api/reward/team/remove?id=${id}`, {
-    method: 'GET',
-    credentials: 'include',
-  }).then((resp) => resp && resp.ok);
-}
-
-export function getRewardDates(date) {
-  return fetch(`/portal/rest/wallet/api/reward/settings/getDates?date=${date}`, {
+export function sendRewards(period) {
+  return fetch('/wallet/rest/reward/send', {
     credentials: 'include',
     headers: {
       Accept: 'application/json',
-      'Content-Type': 'application/json',
+      'Content-Type': 'application/json'
     },
-  }).then((resp) => resp && resp.ok && resp.json());
-}
-
-export function sendRewards(date) {
-  return fetch(`/portal/rest/wallet/api/reward/send?date=${date}`, {
-    method: 'GET',
-    credentials: 'include',
+    method: 'POST',
+    body: JSON.stringify({
+      id: period?.id,
+      rewardPeriodType: period?.rewardPeriodType,
+      timeZone: period?.timeZone,
+      startDateInSeconds: period?.startDateInSeconds,
+      endDateInSeconds: period?.endDateInSeconds
+    })
   }).then((resp) => {
     if (!resp || !resp.ok) {
       try {
@@ -95,8 +94,8 @@ export function sendRewards(date) {
   });
 }
 
-export function computeRewards(date) {
-  return fetch(`/portal/rest/wallet/api/reward/compute?date=${date}`, {
+export function computeRewards(page, size) {
+  return fetch(`/wallet/rest/reward/compute?page=${page}&size=${size}`, {
     method: 'GET',
     credentials: 'include',
     headers: {
@@ -118,8 +117,38 @@ export function computeRewards(date) {
   });
 }
 
+export function computeRewardsByPeriod(period) {
+  return fetch('/wallet/rest/reward/period/compute', {
+    method: 'POST',
+    credentials: 'include',
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({
+      id: period?.id,
+      rewardPeriodType: period?.rewardPeriodType,
+      timeZone: period?.timeZone,
+      startDateInSeconds: period?.startDateInSeconds,
+      endDateInSeconds: period?.endDateInSeconds
+    })
+  }).then((resp) => {
+    if (resp) {
+      try {
+        return resp.json().catch(() => {
+          throw new Error('Error computing rewards');
+        });
+      } catch (e) {
+        throw new Error('Error computing rewards');
+      }
+    } else {
+      throw new Error('Error computing rewards');
+    }
+  });
+}
+
 export function computeRewardsByUser(date) {
-  return fetch(`/portal/rest/wallet/api/reward/compute/user?date=${date}`, {
+  return fetch(`/wallet/rest/reward/compute/user?date=${date}`, {
     method: 'GET',
     credentials: 'include',
     headers: {
@@ -136,7 +165,7 @@ export function computeRewardsByUser(date) {
 }
 
 export function getRewardsByUser(limit) {
-  return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/wallet/api/reward/list?limit=${limit || 10}`, {
+  return fetch(`/wallet/rest/reward/list?limit=${limit || 10}`, {
     method: 'GET',
     credentials: 'include',
   }).then(resp => {
@@ -147,3 +176,28 @@ export function getRewardsByUser(limit) {
     }
   });
 }
+
+export function getRewardReportPeriods(paramsObj) {
+  const formData = new FormData();
+  if (paramsObj) {
+    Object.keys(paramsObj).forEach(key => {
+      const value = paramsObj[key];
+      if (window.Array && Array.isArray && Array.isArray(value)) {
+        value.forEach(val => formData.append(key, val));
+      } else {
+        formData.append(key, value);
+      }
+    });
+  }
+  const params = new URLSearchParams(formData).toString();
+  return fetch(`/wallet/rest/reward/periods?${params}`, {
+    method: 'GET',
+    credentials: 'include',
+  }).then((resp) => {
+    if (resp?.ok) {
+      return resp.json();
+    } else {
+      throw new Error('Error when getting report periods');
+    }
+  });
+}
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
index ef9b12297..05c1acf26 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
@@ -22,25 +22,38 @@
   <v-app
     id="RewardApp"
     flat>
-    <div class="d-flex flex-row">
-      <v-card
-        class="d-flex flex-column justify-space-between"
-        width="40%"
-        flat>
-        <wallet-current-balance />
-      </v-card>
-      <wallet-budget-configuration
-        :loading="loading"
+    <template v-if="!showRewardDetails">
+      <div class="d-flex flex-row">
+        <v-card
+          class="d-flex flex-column justify-space-between"
+          width="40%"
+          flat>
+          <wallet-current-balance />
+        </v-card>
+        <wallet-budget-configuration
+          :loading="loading"
+          :reward-settings="rewardSettings"
+          :reward-report="rewardReport"
+          @openConfiguration="openBudgetConfigurationDrawer"
+          @deleteSetting="deleteRewardSettings" />
+      </div>
+      <wallet-reward-management
+        :loading="loadingRewards"
+        :reward-reports="rewardReports"
+        :reward-settings="rewardSettings"
+        @openDetails="openDetails"
+        @loadMore="loadMore" />
+      <wallet-budget-configuration-drawer
         :reward-settings="rewardSettings"
         :reward-report="rewardReport"
-        @openConfiguration="openBudgetConfigurationDrawer" />
-    </div>
-    <wallet-reward-management />
-    <wallet-budget-configuration-drawer
-      :reward-settings="rewardSettings"
-      :reward-report="rewardReport"
-      @setting-updated="refreshRewardSettings"
-      ref="budgetConfiguration" />
+        @setting-updated="settingUpdated"
+        ref="budgetConfiguration" />
+    </template>
+    <template v-else>
+      <wallet-reward-details
+        :reward-report="selectedRewardReport"
+        @back="showRewardDetails = false" />
+    </template>
   </v-app>
 </template>
 
@@ -50,9 +63,17 @@ export default {
   data: () => ({
     rewardSettings: {},
     loading: false,
-    rewardReport: null,
+    loadingRewards: false,
+    rewardReports: [],
+    selectedRewardReport: null,
+    showRewardDetails: false,
+    rewardsPage: 0,
+    rewardsPageSize: 12,
   }),
   computed: {
+    rewardReport() {
+      return this.rewardReports[0];
+    },
     rewardPeriod() {
       return this.rewardReport?.period;
     },
@@ -80,14 +101,33 @@ export default {
       if (period) {
         this.period = period;
       }
-      this.loading = true;
-      return this.$rewardService.computeRewards(this.selectedDate)
-        .then(rewardReport => {
-          this.rewardReport = rewardReport;
+      this.loadingRewards = true;
+
+      return this.$rewardService.computeRewards(this.rewardsPage, this.rewardsPageSize)
+        .then(rewardReports => {
+          this.rewardReports.push(...rewardReports);
           return this.$nextTick();
-        })
-        .finally(() => this.loading = false);
+        }).finally(() => this.loadingRewards = false);
+    },
+    deleteRewardSettings() {
+      return this.$rewardService.deleteRewardSettings()
+        .then(() => {
+          this.rewardReports = [];
+          return this.refreshRewardSettings();
+        });
+    },
+    openDetails(rewardReport) {
+      this.showRewardDetails = true;
+      this.selectedRewardReport = rewardReport;
+    },
+    loadMore() {
+      this.rewardsPage += 1;
+      this.refreshRewards();
     },
+    settingUpdated() {
+      this.rewardReports = [];
+      this.refreshRewardSettings();
+    }
   },
 };
 </script>
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
index 010062293..7966bcad3 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
@@ -39,7 +39,6 @@
               <div v-on="on">
                 <v-btn
                   :aria-label="$t('wallet.administration.budgetConfiguration.editConfiguration')"
-                  target="_blank"
                   small
                   icon
                   @click="openConfigurationDrawer">
@@ -50,6 +49,25 @@
             <span>{{ $t('wallet.administration.budgetConfiguration.editConfiguration') }}</span>
           </v-tooltip>
         </v-list-item-action>
+        <v-list-item-action v-if="!loading && hasConfiguredBudget" class="ma-auto">
+          <v-tooltip
+            :disabled="$root.isMobile"
+            bottom>
+            <template #activator="{ on }">
+              <div v-on="on">
+                <v-btn
+                  :aria-label="$t('wallet.administration.budgetConfiguration.deleteConfiguration')"
+                  color="error"
+                  small
+                  icon
+                  @click="deleteConfirmDialog">
+                  <v-icon size="18">fas fa-trash</v-icon>
+                </v-btn>
+              </div>
+            </template>
+            <span>{{ $t('wallet.administration.budgetConfiguration.editConfiguration') }}</span>
+          </v-tooltip>
+        </v-list-item-action>
       </v-list-item>
       <v-spacer />
       <template v-if="!loading && hasConfiguredBudget">
@@ -108,10 +126,18 @@
         </v-btn>
       </template>
     </div>
+    <exo-confirm-dialog
+      ref="deleteConfirmDialog"
+      :message="$t('wallet.administration.budgetConfiguration.message.confirmDeleteConfiguration')"
+      :title="$t('wallet.administration.budgetConfiguration.confirmDeleteConfiguration')"
+      :ok-label="$t('wallet.administration.confirm.label')"
+      :cancel-label="$t('wallet.administration.cancel.label')"
+      @ok="$emit('deleteSetting')" />
   </v-card>
 </template>
 
 <script>
+
 export default {
   props: {
     loading: {
@@ -188,6 +214,9 @@ export default {
     openConfigurationDrawer() {
       this.$emit('openConfiguration');
     },
+    deleteConfirmDialog() {
+      this.$refs.deleteConfirmDialog.open();
+    },
     valueFormatted(max) {
       return new Intl.NumberFormat(eXo.env.portal.language, {
         style: 'decimal',
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue
new file mode 100644
index 000000000..3c3d2102e
--- /dev/null
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue
@@ -0,0 +1,251 @@
+<!--
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-card
+    class="d-flex flex-column overflow-hidden"
+    height="160"
+    max-height="160"
+    outlined
+    hover>
+    <div v-if="!isValid">
+      <div
+        class="d-flex position-absolute full-width full-height mask-color z-index-one">
+        <wallet-reward-card-mask-content :range-date="rangeDateTimeTitle" />
+      </div>
+    </div>
+    <v-card
+      class="d-flex flex-column full-height"
+      width="300"
+      flat
+      @click="openDetails">
+      <v-card-title class="px-2 py-1">
+        <v-icon
+          class="secondary--text"
+          left>
+          fas fa-calendar
+        </v-icon>
+        <span class="text-header font-weight-light">{{ rangeDateTimeTitle }}</span>
+      </v-card-title>
+      <template v-if="isValid">
+        <template v-if="hasConfiguredBudget || completelyProceeded">
+          <v-card-title class="px-2 py-1">
+            <v-icon
+              :class="statusIconClass"
+              :color="statusIconColor"
+              size="32"
+              left>
+              {{ statusIcon }}
+            </v-icon>
+            <span class="text-body font-weight-bold">{{ statusMessage }}</span>
+          </v-card-title>
+        </template>
+        <v-card-title v-else class="px-2 py-1">
+          <v-icon
+            color="error"
+            size="30"
+            left>
+            fas fa-times
+          </v-icon>
+          <span class="text-body font-weight-bold">{{ $t('wallet.administration.rewardCard.status.setYourBudget') }}</span>
+        </v-card-title>
+      </template>
+      <v-card-actions class="mt-auto">
+        <v-list-item class="px-0">
+          <div class="d-flex row no-gutters">
+            <div class="col-12 col-sm-4 mb-2">
+              <v-icon
+                color="primary"
+                class="mr-1"
+                size="20">
+                fas fa-users
+              </v-icon>
+              <span class="subheading mr-2">{{ participants }}</span>
+            </div>
+            <div class="col-12 col-sm-8 mb-2">
+              <v-icon
+                color="primary"
+                class="mr-1"
+                size="20">
+                fas fa-trophy
+              </v-icon>
+              <span class="subheading">{{ participationsCount }} {{ $t('wallet.administration.rewardCard.label.contributions') }}</span>
+            </div>
+            <div class="col-12 col-sm-4">
+              <v-icon
+                color="primary"
+                class="mr-1"
+                size="20">
+                fas fa-user-check
+              </v-icon>
+              <span class="subheading mr-2">{{ eligibleContributorsCount }}</span>
+            </div>
+            <div class="col-12 col-sm-8">
+              <v-icon
+                color="primary"
+                class="mr-1"
+                size="20">
+                fas fa-coins
+              </v-icon>
+              <span class="subheading">{{ budget }}</span>
+            </div>
+          </div>
+        </v-list-item>
+      </v-card-actions>
+    </v-card>
+  </v-card>
+</template>
+
+<script>
+export default {
+  props: {
+    loading: {
+      type: Boolean,
+      default: false,
+    },
+    rewardSettings: {
+      type: Object,
+      default: null
+    },
+    rewardReport: {
+      type: Object,
+      default: null
+    }
+  },
+  data: () => ({
+    currentTimeInSeconds: Date.now() / 1000,
+    lang: eXo.env.portal.language,
+    dateFormat: {
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric',
+    },
+  }),
+  computed: {
+    completelyProceeded() {
+      return this.rewardReport?.completelyProceeded;
+    },
+    isNotPastPeriod() {
+      return !this.period || this.period.endDateInSeconds > this.currentTimeInSeconds;
+    },
+    isValid() {
+      return this.isNotPastPeriod || (!this.isNotPastPeriod && this.eligibleContributorsCount > 0);
+    },
+    status() {
+      if (this.isNotPastPeriod) {
+        return {
+          icon: 'fas fa-hourglass-half',
+          iconClass: 'secondary--text',
+          iconColor: null,
+          message: this.$t('wallet.administration.rewardCard.status.inPeriod'),
+        };
+      }
+      if (!this.completelyProceeded) {
+        return {
+          icon: 'fas fa-exclamation-triangle',
+          iconClass: null,
+          iconColor: 'orange',
+          message: this.$t('wallet.administration.rewardCard.status.toReward'),
+        };
+      }
+      if (!this.isValid) {
+        return {
+          icon: 'fas fa-exclamation-triangle',
+          iconClass: null,
+          iconColor: 'orange',
+          message: this.$t('wallet.administration.rewardCard.status.noParticipant'),
+        };
+      }
+      return {
+        icon: 'fas fa-check-circle',
+        iconClass: null,
+        iconColor: 'success',
+        message: this.$t('wallet.administration.rewardCard.status.rewardsSent'),
+      };
+    },
+    statusIcon() {
+      return this.status.icon;
+    },
+    statusIconClass() {
+      return this.status.iconClass;
+    },
+    statusIconColor() {
+      return this.status.iconColor;
+    },
+    statusMessage() {
+      return this.status.message;
+    },
+    hasConfiguredBudget() {
+      return this.rewardSettings?.storedSetting;
+    },
+    eligibleContributorsCount() {
+      return this.hasConfiguredBudget ? this.rewardReport?.validRewards?.length : this.participants;
+    },
+    walletRewards() {
+      return this.rewardReport?.rewards;
+    },
+    participants() {
+      return this.rewardReport?.rewards?.length;
+    },
+    participationsCount() {
+      return this.rewardReport?.participationsCount < 1000 ? this.rewardReport?.participationsCount : `${(this.rewardReport?.participationsCount / 1000).toFixed(1)}K`;
+    },
+    tokensToSend() {
+      return this.rewardReport?.tokensToSend;
+    },
+    tokensSent() {
+      return this.rewardReport?.tokensSent;
+    },
+    formatedTokensToSend() {
+      return Number.isFinite(Number(this.tokensToSend)) ? Math.trunc(this.tokensToSend) : 0;
+    },
+    formatedTokensSent() {
+      return Number.isFinite(Number(this.tokensSent)) ? Math.round(this.tokensSent) : 0;
+    },
+    budget() {
+      return this.completelyProceeded ? `${this.formatedTokensSent} MEED` : (this.hasConfiguredBudget ? `${this.formatedTokensToSend} MEED` : '-');
+    },
+    period() {
+      return this.rewardReport?.period;
+    },
+    rangeDateTimeTitle() {
+      return `${this.starDateFormat} ${this.$t('exoplatform.wallet.label.to')} ${this.toDateFormat}`;
+    },
+    starDateFormat() {
+      return this.startDate?.toLocaleString(this.lang, this.dateFormat);
+    },
+    toDateFormat() {
+      return this.endDate?.toLocaleString(this.lang, this.dateFormat);
+    },
+    startDate() {
+      return new Date(this.period?.startDate);
+    },
+    endDate() {
+      return new Date(this.period?.endDate);
+    },
+
+  },
+  methods: {
+    openDetails() {
+      this.$emit('openDetails', this.rewardReport);
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCardMaskContent.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCardMaskContent.vue
new file mode 100644
index 000000000..943fb5273
--- /dev/null
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCardMaskContent.vue
@@ -0,0 +1,45 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <div class="d-flex flex-column full-width full-height align-center">
+    <v-list-item class="px-2 py-1">
+      <v-list-item-icon class="align-self-center ma-1">
+        <v-icon
+          class="white--text"
+          size="32"
+          left>
+          fas fa-slash
+        </v-icon>
+      </v-list-item-icon>
+      <span class="text-body white--text font-weight-bold">{{ $t('wallet.administration.rewardCard.status.noParticipant') }}</span>
+    </v-list-item>
+  </div>
+</template>
+<script >
+export default {
+  props: {
+    rangeDate: {
+      type: String,
+      default: '',
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
new file mode 100644
index 000000000..be77f2fed
--- /dev/null
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
@@ -0,0 +1,210 @@
+<!--
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-card flat>
+    <v-toolbar flat>
+      <v-card
+        class="d-flex align-center"
+        flat
+        @click="$emit('back')">
+        <v-btn
+          class="width-auto ms-n3"
+          icon>
+          <v-icon size="18" class="icon-default-color mx-2">fa-arrow-left</v-icon>
+        </v-btn>
+        <v-card-title class="px-2 py-1">
+          <v-icon
+            class="secondary--text"
+            left>
+            fas fa-calendar
+          </v-icon>
+          <span class="font-weight-bold">{{ rangeDateTimeTitle }}</span>
+        </v-card-title>
+      </v-card>
+      <v-spacer />
+      <span v-if="sendingInProgress" class="text-subtitle pe-2"> {{ $t('wallet.administration.rewardDetails.sendingProgress') }}... </span>
+      <v-tooltip
+        v-if="!completelyProceeded"
+        bottom
+        :disabled="!isNotPastPeriod">
+        <template #activator="{ on }">
+          <div v-on="on" class="d-inline-block">
+            <v-btn
+              :loading="loadingSending"
+              :disabled="isNotPastPeriod || sendingInProgress"
+              class="btn btn-primary"
+              @click="sendRewards">
+              Reward
+            </v-btn>
+          </div>
+        </template>
+        <span>{{ $t('wallet.administration.rewardCard.status.inPeriod') }}</span>
+      </v-tooltip>
+    </v-toolbar>
+    <application-toolbar
+      :left-button="{
+        icon: 'fa-file-excel',
+        text: 'Export',
+      }"
+      :right-text-filter="{
+        minCharacters: 3,
+        placeholder: this.$t('wallet.administration.rewardDetails.searchLabel'),
+        tooltip: this.$t('wallet.administration.rewardDetails.searchLabel')
+      }"
+      @filter-text-input-end-typing="search = $event" />
+    <v-data-table
+      :headers="identitiesHeaders"
+      :items="filteredIdentitiesList"
+      :items-per-page="1000"
+      :loading="loading"
+      item-key="identityId"
+      hide-default-footer
+      sortable>
+      <template #item="{item}">
+        <wallet-reward-details-item
+          :key="item.wallet.id"
+          :reward="item"
+          :token-symbol="tokenSymbol"
+          :completely-proceeded="completelyProceeded" />
+      </template>
+    </v-data-table>
+  </v-card>
+</template>
+
+<script>
+export default {
+  props: {
+    loading: {
+      type: Boolean,
+      default: false,
+    },
+    rewardReport: {
+      type: Object,
+      default: null
+    }
+  },
+  data: () => ({
+    search: null,
+    loadingSending: false,
+    currentTimeInSeconds: Date.now() / 1000,
+    lang: eXo.env.portal.language,
+    dateFormat: {
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric',
+    },
+  }),
+  computed: {
+    identitiesHeaders() {
+      return [
+        {
+          text: this.$t('wallet.administration.rewardDetails.label.name'),
+          align: 'start',
+          sortable: false,
+        },
+        {
+          text: this.$t('wallet.administration.rewardDetails.label.points'),
+          align: 'center',
+          sortable: false,
+        },
+        {
+          text: this.$t('wallet.administration.rewardDetails.label.status'),
+          align: 'center',
+          sortable: false,
+        },
+        {
+          text: this.$t('wallet.administration.rewardDetails.label.rewards'),
+          align: 'center',
+          sortable: false,
+        },
+        {
+          text: this.$t('wallet.administration.rewardDetails.label.actions'),
+          align: 'center',
+          sortable: false,
+        },
+      ];
+    },
+    rangeDateTimeTitle() {
+      return `${this.starDateFormat} to ${this.toDateFormat}`;
+    },
+    period() {
+      return this.rewardReport?.period;
+    },
+    startDate() {
+      return new Date(this.period?.startDate);
+    },
+    endDate() {
+      return new Date(this.period?.endDate);
+    },
+    starDateFormat() {
+      return this.startDate?.toLocaleString(this.lang, this.dateFormat);
+    },
+    toDateFormat() {
+      return this.endDate?.toLocaleString(this.lang, this.dateFormat);
+    },
+    completelyProceeded() {
+      return this.rewardReport?.completelyProceeded;
+    },
+    isNotPastPeriod() {
+      return !this.period || this.period.endDateInSeconds > this.currentTimeInSeconds;
+    },
+    walletRewards() {
+      return (this.rewardReport && this.rewardReport.rewards) || [];
+    },
+    filteredIdentitiesList() {
+      return (this.walletRewards && this.walletRewards.filter((wallet) => (wallet.enabled || wallet.tokensSent || wallet.tokensToSend) && this.filterItemFromList(wallet, this.search))) || [];
+    },
+    tokenSymbol() {
+      return window.walletSettings.contractDetail?.symbol;
+    },
+    sendingInProgress() {
+      return this.rewardReport?.rewards?.some(item => item.status === 'pending');
+    }
+  },
+  methods: {
+    filterItemFromList(walletReward, searchText) {
+      if (!searchText || !searchText.length) {
+        return true;
+      }
+      searchText = searchText.trim().toLowerCase();
+      const name = walletReward?.wallet?.name?.toLowerCase();
+      if (name.indexOf(searchText) > -1) {
+        return true;
+      }
+      const address = walletReward?.wallet?.address?.toLowerCase();
+      if (address.indexOf(searchText) > -1) {
+        return true;
+      }
+    },
+    sendRewards() {
+      this.loadingSending = true;
+      return this.$rewardService.sendRewards(this.period).then(() => {
+        this.$rewardService.computeRewardsByPeriod(this.period)
+          .then(rewardReport => {
+            this.rewardReport = rewardReport;
+          }).finally(() => {
+            this.loadingSending = false;
+          });
+      });
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue
new file mode 100644
index 000000000..f35c04301
--- /dev/null
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue
@@ -0,0 +1,263 @@
+<!--
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <tr>
+    <td class="text-start">
+      <v-avatar size="36px">
+        <img
+          :src="walletAvatar"
+          onerror="this.src = '/platform-ui/skin/images/avatar/DefaultSpaceAvatar.png'"
+          alt="">
+      </v-avatar>
+      <wallet-reward-profile-chip
+        :address="walletAddress"
+        :profile-id="walletId"
+        :profile-technical-id="walletTechnicalId"
+        :space-id="walletSpaceId"
+        :profile-type="walletType"
+        :display-name="walletName"
+        :enabled="enabled"
+        :deleted-user="deletedUser"
+        :disabled-user="disabledUser"
+        :avatar="walletAvatar"
+        :initialization-state="initializationState"
+        display-no-address />
+    </td>
+    <td class="text-center">
+      <span>
+        {{ points }}
+      </span>
+    </td>
+    <td class="text-center">
+      <template v-if="!status">
+        <v-tooltip
+          v-if="!walletAddress"
+          bottom>
+          <template #activator="{ on, attrs }">
+            <v-icon
+              color="orange darken-2"
+              size="16"
+              v-bind="attrs"
+              v-on="on">
+              fas fa-exclamation-triangle
+            </v-icon>
+          </template>
+          <span>{{ $t('exoplatform.wallet.label.noAddress') }}</span>
+        </v-tooltip>
+        <v-tooltip
+          v-else-if="!amount"
+          bottom>
+          <template #activator="{ on, attrs }">
+            <v-icon
+              color="orange darken-2"
+              size="16"
+              v-bind="attrs"
+              v-on="on">
+              fas fa-exclamation-triangle
+            </v-icon>
+          </template>
+          <span>{{ $t('exoplatform.wallet.label.noEnoughEarnedPoints') }}</span>
+        </v-tooltip>
+        <div v-else>
+          -
+        </div>
+      </template>
+      <v-progress-circular
+        v-else-if="status === 'pending'"
+        color="primary"
+        indeterminate
+        size="20" />
+      <v-tooltip
+        v-else
+        bottom>
+        <template #activator="{ on, attrs }">
+          <v-icon
+            :color="statusIconColor"
+            size="16"
+            v-bind="attrs"
+            v-on="on">
+            {{ statusIcon }}
+          </v-icon>
+        </template>
+        <span>{{ statusIconTitle }}</span>
+      </v-tooltip>
+    </td>
+    <td class="text-center">
+      <span
+        v-if="amount"
+        :title="$t('exoplatform.wallet.label.amountSent')"
+        class="grey--text text--darken-1">
+        <span class="symbol fundsLabels"> {{ tokenSymbol }} </span>{{ walletUtils.toFixed(amount) }}
+      </span>
+      <span
+        v-else
+        :title="$t('exoplatform.wallet.label.noRewardsForPeriod')"
+        class="grey--text text--darken-1">
+        <span class="symbol fundsLabels"> {{ tokenSymbol }} </span> 0
+      </span>
+    </td>
+    <td class="text-center">
+      <v-menu
+        v-model="showMenu"
+        :close-on-content-click="false"
+        :nudge-left="0"
+        :max-width="300"
+        attach
+        transition="scale-transition"
+        offset-y
+        allow-overflow
+        eager>
+        <template #activator="{ on }">
+          <v-btn
+            icon
+            class="ml-2"
+            v-on="on"
+            @blur="closeMenu()">
+            <v-icon>mdi-dots-vertical</v-icon>
+          </v-btn>
+        </template>
+        <v-list class="pa-0">
+          <v-list-item
+            dense
+            @mousedown="$event.preventDefault()"
+            @click="openTransaction">
+            <v-list-item-icon class="me-2 my-auto">
+              <v-icon size="14" class="icon-default-color">fas fa-external-link-alt</v-icon>
+            </v-list-item-icon>
+            <v-list-item-title class="d-flex">{{ $t('wallet.administration.rewardDetails.label.openTransaction') }}</v-list-item-title>
+          </v-list-item>
+          <v-list-item
+            dense
+            @mousedown="$event.preventDefault()"
+            @click="seeHistory">
+            <v-list-item-icon class="me-2 my-auto">
+              <v-icon size="14" class="icon-default-color">fas fa-history</v-icon>
+            </v-list-item-icon>
+            <v-list-item-title class="d-flex">{{ $t('wallet.administration.rewardDetails.label.seeHistory') }}</v-list-item-title>
+          </v-list-item>
+        </v-list>
+      </v-menu>
+    </td>
+  </tr>
+</template>
+
+<script>
+export default {
+  props: {
+    reward: {
+      type: Object,
+      default: null
+    },
+    tokenSymbol: {
+      type: String,
+      default: ''
+    },
+    completelyProceeded: {
+      type: Boolean,
+      default: false
+    },
+  },
+  data: () => ({
+    term: null,
+    showMenu: false,
+    currentTimeInSeconds: Date.now() / 1000,
+    lang: eXo.env.portal.language,
+    dateFormat: {
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric',
+    },
+    sendingInProgress: false
+  }),
+  computed: {
+    walletAvatar() {
+      return this.reward?.wallet?.avatar;
+    },
+    walletAddress() {
+      return this.reward?.wallet?.address;
+    },
+    walletId() {
+      return this.reward?.wallet?.id;
+    },
+    walletTechnicalId() {
+      return this.reward?.wallet?.technicalId;
+    },
+    walletSpaceId() {
+      return this.reward?.wallet?.spaceId;
+    },
+    walletType() {
+      return this.reward?.wallet?.type;
+    },
+    walletName() {
+      return this.reward?.wallet?.name;
+    },
+    enabled() {
+      return this.reward?.wallet?.enabled;
+    },
+    deletedUser() {
+      return this.reward?.wallet?.deletedUser;
+    },
+    disabledUser() {
+      return this.reward?.wallet?.disabledUser;
+    },
+    initializationState() {
+      return this.reward?.wallet?.initializationState;
+    },
+    points() {
+      return this.reward?.points;
+    },
+    status() {
+      return this.reward?.status;
+    },
+    success() {
+      return this.status === 'success';
+    },
+    pending() {
+      return this.status === 'pending';
+    },
+    statusIcon() {
+      return this.success ? 'fa-check-circle' : 'fa-exclamation-circle';
+    },
+    statusIconColor() {
+      return this.success ? 'success' : 'error';
+    },
+    statusIconTitle() {
+      return this.success ? this.$t('wallet.administration.rewardDetails.successfullyProceeded') :
+        this.pending ? this.$t('wallet.administration.rewardDetails.transactionInProgress') : this.$t('wallet.administration.rewardDetails.transactionError');
+    },
+    amount() {
+      return this.completelyProceeded ? this.reward?.tokensSent : this.reward?.amount;
+    },
+  },
+  methods: {
+    closeMenu(){
+      this.showMenu = false;
+    },
+    openTransaction() {
+      // TO DO
+    },
+    seeHistory() {
+      // TO DO
+    }
+  }
+};
+
+</script>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardManagement.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardManagement.vue
index 3861414e5..366a8123c 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardManagement.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardManagement.vue
@@ -20,18 +20,66 @@
 -->
 <template>
   <div class="mx-5">
-    <div class="pt-6 text-title">{{ $t('wallet.administration.rewardManagement') }}</div>
-    <div class="pt-8 d-flex align-center justify-center">
-      <v-icon
-        color="orange darken-2"
-        size="50">
-        fa-money-bill
-      </v-icon>
-    </div>
-    <div class="d-flex flex-column justify-center align-center pb-8 pt-3 col-sm-8 mx-auto">
-      <p class="text-header mb-8">
-        {{ $t('wallet.administration.rewardManagement.noContributionsYet') }}
-      </p>
+    <div class="py-6 text-title">{{ $t('wallet.administration.rewardManagement') }}</div>
+    <v-progress-linear
+      v-if="rewardReportsCount === 0 && loading"
+      indeterminate
+      height="2"
+      color="primary" />
+    <v-container v-else class="pa-0 ma-0">
+      <v-row class="mx-n3">
+        <v-col
+          v-for="rewardReport in rewardReports"
+          :key="rewardReport.period.id">
+          <wallet-reward-card
+            @openDetails="openDetails"
+            :reward-report="rewardReport"
+            :reward-settings="rewardSettings" />
+        </v-col>
+      </v-row>
+    </v-container>
+    <div class="d-flex justify-center py-4">
+      <v-btn
+        v-if="rewardReportsCount > 0"
+        :loading="loading"
+        min-width="95%"
+        class="btn"
+        text
+        @click="$emit('loadMore')">
+        Load More
+      </v-btn>
     </div>
   </div>
-</template>
\ No newline at end of file
+</template>
+
+<script>
+export default {
+  props: {
+    loading: {
+      type: Boolean,
+      default: false,
+    },
+    rewardSettings: {
+      type: Object,
+      default: null
+    },
+    rewardReports: {
+      type: Array,
+      default: () => [],
+    }
+  },
+  data: () => ({
+
+  }),
+  computed: {
+    rewardReportsCount() {
+      return this.rewardReports?.length || 0;
+    }
+  },
+  methods: {
+    openDetails(rewardReport) {
+      this.$emit('openDetails', rewardReport);
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js
index eace79ade..cfd247f5b 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/initComponents.js
@@ -1,19 +1,27 @@
 import RewardApp from './components/RewardApp.vue';
 import RewardManagement from './components/reward/RewardManagement.vue';
+import RewardCard from './components/reward/RewardCard.vue';
+import RewardDetails from './components/reward/RewardDetails.vue';
+import RewardDetailsItem from './components/reward/RewardDetailsItem.vue';
 import CurrentBalance from './components/reward/CurrentBalance.vue';
 import BudgetConfiguration from './components/reward/BudgetConfiguration.vue';
 import BudgetConfigurationDrawer from './components/reward/BudgetConfigurationDrawer.vue';
 import DistributionForecast from './components/reward/DistributionForecast.vue';
 import TimeZoneSelectBox from './components/reward/TimeZoneSelectBox.vue';
+import RewardCardMaskContent from './components/reward/RewardCardMaskContent.vue';
 
 const components = {
   'wallet-reward-app': RewardApp,
   'wallet-reward-management': RewardManagement,
+  'wallet-reward-card': RewardCard,
+  'wallet-reward-details': RewardDetails,
+  'wallet-reward-details-item': RewardDetailsItem,
   'wallet-current-balance': CurrentBalance,
   'wallet-budget-configuration': BudgetConfiguration,
   'wallet-budget-configuration-drawer': BudgetConfigurationDrawer,
   'wallet-budget-distribution-forecast': DistributionForecast,
   'wallet-reward-timezone-selectbox': TimeZoneSelectBox,
+  'wallet-reward-card-mask-content': RewardCardMaskContent,
 };
 
 for (const key in components) {

From dd1588c5df0454dac690004bf4ace570dd29812a Mon Sep 17 00:00:00 2001
From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com>
Date: Mon, 30 Sep 2024 10:24:24 +0200
Subject: [PATCH 04/16] feat: Display Detail of a rewarding for different cases
 - MEED-7479 - Meeds-io/MIPs#154 (#566)

---
 .../wallet/reward/rest/RewardReportREST.java  | 17 ++---
 .../service/WalletRewardReportService.java    | 13 ++--
 .../locale/addon/Wallet_en.properties         |  4 ++
 .../components/reward/BudgetConfiguration.vue |  2 +-
 .../components/reward/RewardDetails.vue       | 69 ++++++++++++++-----
 .../components/reward/RewardDetailsItem.vue   | 37 ++++++----
 6 files changed, 97 insertions(+), 45 deletions(-)

diff --git a/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java b/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
index b281430b2..6672b32aa 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
@@ -100,14 +100,15 @@ public List<RewardReport> computeRewards(@Parameter(description = "Page")
                                            @Parameter(description = "Page size")
                                            @RequestParam(value = "size", defaultValue = "12", required = false)
                                            int size) {
-
-    int numberOfPeriods = (page + 1) * size;
-    List<RewardPeriod> periods = generatePreviousPeriods(numberOfPeriods);
-
-    List<RewardReport> rewardReports = periods.stream()
-                                              .skip((long) page * size)
-                                              .limit(size)
-                                              .map(rewardPeriod -> rewardReportService.computeRewards(rewardPeriod.getPeriodMedianDate()))
+    int skip = page * size;
+    List<RewardPeriod> periods = generatePreviousPeriods(skip + size).subList(skip, skip + size);
+    List<RewardReport> rewardReports = periods.parallelStream()
+                                              .map(period -> {
+                                                RewardReport rewardReport =
+                                                                          rewardReportService.computeRewards(period.getPeriodMedianDate());
+                                                rewardReport.setPeriod(new RewardPeriodWithFullDate(rewardReport.getPeriod()));
+                                                return rewardReport;
+                                              })
                                               .toList();
     rewardReports.forEach(rewardReport -> rewardReport.setPeriod(new RewardPeriodWithFullDate(rewardReport.getPeriod())));
     return rewardReports;
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
index c1ad85948..ea8771703 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
@@ -41,8 +41,10 @@
 import io.meeds.gamification.constant.IdentityType;
 import io.meeds.gamification.model.filter.RealizationFilter;
 import io.meeds.gamification.service.RealizationService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import org.exoplatform.commons.api.persistence.ExoTransactional;
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
@@ -63,7 +65,6 @@
 import io.meeds.wallet.wallet.service.WalletTokenAdminService;
 
 import lombok.Setter;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -195,6 +196,7 @@ public boolean isRewardSendingInProgress() {
   }
 
   @Override
+  @ExoTransactional
   public RewardReport computeRewards(LocalDate date) {
     if (date == null) {
       throw new IllegalArgumentException("date is mandatory");
@@ -228,11 +230,10 @@ public RewardReport computeRewards(LocalDate date) {
 
     List<Long> participants = realizationService.getParticipantsBetweenDates(start, end);
     // Only user wallets benefits from rewards
-    Set<Wallet> wallets = walletAccountService.listWalletsByIdentityIds(participants)
-                                              .stream()
-                                              .filter(wallet -> WalletType.isUser(wallet.getType()))
-                                              .collect(Collectors.toSet());
-    computeRewardDetails(rewardReport, wallets);
+    if (CollectionUtils.isNotEmpty(participants)) {
+      Set<Wallet> wallets = walletAccountService.listWalletsByIdentityIds(participants);
+      computeRewardDetails(rewardReport, wallets);
+    }
     return rewardReport;
   }
 
diff --git a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
index b41688148..133f03fa3 100644
--- a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
+++ b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
@@ -558,6 +558,10 @@ wallet.administration.rewardDetails.label.rewards=Rewards
 wallet.administration.rewardDetails.label.actions=Actions
 wallet.administration.rewardDetails.label.openTransaction=Open Transaction
 wallet.administration.rewardDetails.label.seeHistory=See History
+wallet.administration.rewardDetails.label.latestRewardsSent=Latest Rewards Sent on:
+wallet.administration.rewardDetails.label.rewardsToSend={0} MEED for {1} points
+wallet.administration.rewardDetails.label.reward=Reward
+wallet.administration.rewardDetails.label.notSentYet=Not sent yet
 
 wallet.overview.rewards.title=Wallet History
 wallet.overview.points=Points
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
index 7966bcad3..081dbaaf7 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
@@ -65,7 +65,7 @@
                 </v-btn>
               </div>
             </template>
-            <span>{{ $t('wallet.administration.budgetConfiguration.editConfiguration') }}</span>
+            <span>{{ $t('wallet.administration.budgetConfiguration.deleteConfiguration') }}</span>
           </v-tooltip>
         </v-list-item-action>
       </v-list-item>
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
index be77f2fed..71792c095 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
@@ -41,23 +41,28 @@
       </v-card>
       <v-spacer />
       <span v-if="sendingInProgress" class="text-subtitle pe-2"> {{ $t('wallet.administration.rewardDetails.sendingProgress') }}... </span>
-      <v-tooltip
-        v-if="!completelyProceeded"
-        bottom
-        :disabled="!isNotPastPeriod">
-        <template #activator="{ on }">
-          <div v-on="on" class="d-inline-block">
-            <v-btn
-              :loading="loadingSending"
-              :disabled="isNotPastPeriod || sendingInProgress"
-              class="btn btn-primary"
-              @click="sendRewards">
-              Reward
-            </v-btn>
-          </div>
-        </template>
-        <span>{{ $t('wallet.administration.rewardCard.status.inPeriod') }}</span>
-      </v-tooltip>
+      <template v-if="!completelyProceeded">
+        <div v-if="tokensToSend > 0" class="text-subtitle pe-2">{{ rewardsToSend }}</div>
+        <v-tooltip
+          bottom
+          :disabled="!isNotPastPeriod">
+          <template #activator="{ on }">
+            <div v-on="on" class="d-inline-block">
+              <v-btn
+                :loading="loadingSending"
+                :disabled="isNotPastPeriod || sendingInProgress"
+                class="btn btn-primary"
+                @click="sendRewards">
+                {{ $t('wallet.administration.rewardDetails.label.reward') }}
+              </v-btn>
+            </div>
+          </template>
+          <span>{{ $t('wallet.administration.rewardCard.status.inPeriod') }}</span>
+        </v-tooltip>
+      </template>
+      <div v-else>
+        {{ $t('wallet.administration.rewardDetails.label.latestRewardsSent') }} {{ sendDate }}
+      </div>
     </v-toolbar>
     <application-toolbar
       :left-button="{
@@ -148,6 +153,11 @@ export default {
     period() {
       return this.rewardReport?.period;
     },
+    sendDate() {
+      const reward = this.rewardReport?.rewards?.find(reward => reward?.transaction?.succeeded);
+      const sentDate = new Date(reward?.transaction?.timestamp);
+      return sentDate?.toLocaleString(this.lang, this.dateFormat);
+    },
     startDate() {
       return new Date(this.period?.startDate);
     },
@@ -169,6 +179,9 @@ export default {
     walletRewards() {
       return (this.rewardReport && this.rewardReport.rewards) || [];
     },
+    validRewards() {
+      return (this.rewardReport && this.rewardReport.validRewards) || [];
+    },
     filteredIdentitiesList() {
       return (this.walletRewards && this.walletRewards.filter((wallet) => (wallet.enabled || wallet.tokensSent || wallet.tokensToSend) && this.filterItemFromList(wallet, this.search))) || [];
     },
@@ -177,6 +190,21 @@ export default {
     },
     sendingInProgress() {
       return this.rewardReport?.rewards?.some(item => item.status === 'pending');
+    },
+    tokensToSend() {
+      return this.rewardReport?.tokensToSend;
+    },
+    formattedTokensToSend() {
+      return this.valueFormatted(this.tokensToSend);
+    },
+    points() {
+      return this.valueFormatted(this.validRewards?.map(x => x?.points || 0).reduce((x, y) => x + y, 0), 0);
+    },
+    rewardsToSend() {
+      return this.$t('wallet.administration.rewardDetails.label.rewardsToSend', {
+        0: this.formattedTokensToSend,
+        1: this.points
+      });
     }
   },
   methods: {
@@ -194,6 +222,13 @@ export default {
         return true;
       }
     },
+    valueFormatted(max) {
+      return new Intl.NumberFormat(this.lang, {
+        style: 'decimal',
+        minimumFractionDigits: 0,
+        maximumFractionDigits: 0,
+      }).format(max);
+    },
     sendRewards() {
       this.loadingSending = true;
       return this.$rewardService.sendRewards(this.period).then(() => {
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue
index f35c04301..04a3b837b 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue
@@ -118,12 +118,8 @@
       <v-menu
         v-model="showMenu"
         :close-on-content-click="false"
-        :nudge-left="0"
-        :max-width="300"
-        attach
         transition="scale-transition"
         offset-y
-        allow-overflow
         eager>
         <template #activator="{ on }">
           <v-btn
@@ -135,15 +131,30 @@
           </v-btn>
         </template>
         <v-list class="pa-0">
-          <v-list-item
-            dense
-            @mousedown="$event.preventDefault()"
-            @click="openTransaction">
-            <v-list-item-icon class="me-2 my-auto">
-              <v-icon size="14" class="icon-default-color">fas fa-external-link-alt</v-icon>
-            </v-list-item-icon>
-            <v-list-item-title class="d-flex">{{ $t('wallet.administration.rewardDetails.label.openTransaction') }}</v-list-item-title>
-          </v-list-item>
+          <v-tooltip
+            bottom
+            :disabled="status">
+            <template #activator="{ on }">
+              <div v-on="on" class="d-inline-block">
+                <v-list-item
+                  :disabled="!status"
+                  dense
+                  @mousedown="$event.preventDefault()"
+                  @click="openTransaction">
+                  <v-list-item-icon class="me-2 my-auto">
+                    <v-icon
+                      :disabled="!status"
+                      size="14"
+                      class="icon-default-color">
+                      fas fa-external-link-alt
+                    </v-icon>
+                  </v-list-item-icon>
+                  <v-list-item-title class="d-flex">{{ $t('wallet.administration.rewardDetails.label.openTransaction') }}</v-list-item-title>
+                </v-list-item>
+              </div>
+            </template>
+            <span>{{ $t('wallet.administration.rewardDetails.label.notSentYet') }}</span>
+          </v-tooltip>
           <v-list-item
             dense
             @mousedown="$event.preventDefault()"

From 27e6e956344dde927ece56b8005910e51d18dd25 Mon Sep 17 00:00:00 2001
From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com>
Date: Tue, 1 Oct 2024 14:39:33 +0200
Subject: [PATCH 05/16] feat: Detail of a rewarding period when reward sent +
 UEM - MEED-7478 - Meeds-io/MIPs#154 (#568)

---
 .../components/reward/RewardDetails.vue              | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
index 71792c095..59be92724 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
@@ -42,7 +42,7 @@
       <v-spacer />
       <span v-if="sendingInProgress" class="text-subtitle pe-2"> {{ $t('wallet.administration.rewardDetails.sendingProgress') }}... </span>
       <template v-if="!completelyProceeded">
-        <div v-if="tokensToSend > 0" class="text-subtitle pe-2">{{ rewardsToSend }}</div>
+        <div v-if="tokensToSend > 0 && !sendingInProgress" class="text-subtitle pe-2">{{ rewardsToSend }}</div>
         <v-tooltip
           bottom
           :disabled="!isNotPastPeriod">
@@ -60,9 +60,13 @@
           <span>{{ $t('wallet.administration.rewardCard.status.inPeriod') }}</span>
         </v-tooltip>
       </template>
-      <div v-else>
-        {{ $t('wallet.administration.rewardDetails.label.latestRewardsSent') }} {{ sendDate }}
-      </div>
+      <extension-registry-components
+        v-else
+        :params="{rewardReport}"
+        name="WalletRewarding"
+        type="wallet-reward-send-header-extensions"
+        parent-element="div"
+        element="div" />
     </v-toolbar>
     <application-toolbar
       :left-button="{

From 4e7dabcf5e71ff05c69ed4d667722fe8988d70f2 Mon Sep 17 00:00:00 2001
From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com>
Date: Wed, 2 Oct 2024 10:41:39 +0200
Subject: [PATCH 06/16] feat: Update rewarding admin extensions - MEED-7381 -
 Meeds-io/MIPs#154 (#569)

---
 .../main/webapp/vue-app/wallet-reward/components/RewardApp.vue | 3 +++
 .../vue-app/wallet-reward/components/reward/CurrentBalance.vue | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
index 05c1acf26..59553310c 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
@@ -29,6 +29,9 @@
           width="40%"
           flat>
           <wallet-current-balance />
+          <extension-registry-components
+            name="WalletRewardingCard"
+            type="wallet-reward-cards-extensions" />
         </v-card>
         <wallet-budget-configuration
           :loading="loading"
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue
index f7fb13f4a..c7dd504c7 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue
@@ -21,7 +21,7 @@
 <template>
   <v-card
     :loading="loading"
-    class="border-radius border-color ma-5"
+    class="border-radius border-color ma-5 mb-2"
     flat>
     <div class="d-flex flex-column flex-grow-1">
       <v-list-item>

From bace2f88b29394fc775977c48fb5eb4f971ed395 Mon Sep 17 00:00:00 2001
From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com>
Date: Wed, 2 Oct 2024 13:24:10 +0200
Subject: [PATCH 07/16] feat: Manage Error when rewards not sent - MEED-7389 -
 Meeds-io/MIPs#154 (#570)

---
 .../locale/addon/Wallet_en.properties         |  1 +
 .../components/reward/RewardDetails.vue       | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
index 133f03fa3..d0ac10358 100644
--- a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
+++ b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
@@ -551,6 +551,7 @@ wallet.administration.rewardDetails.transactionInProgress=Transaction in progres
 wallet.administration.rewardDetails.transactionError=Transaction error
 wallet.administration.rewardDetails.searchLabel=search in names, wallet address
 wallet.administration.rewardDetails.sendingProgress=Sending in progress
+wallet.administration.rewardDetails.sendingError=Rewards not sent. Try again
 wallet.administration.rewardDetails.label.name=Name
 wallet.administration.rewardDetails.label.status=Status
 wallet.administration.rewardDetails.label.points=Points
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
index 59be92724..e42945358 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
@@ -42,7 +42,16 @@
       <v-spacer />
       <span v-if="sendingInProgress" class="text-subtitle pe-2"> {{ $t('wallet.administration.rewardDetails.sendingProgress') }}... </span>
       <template v-if="!completelyProceeded">
-        <div v-if="tokensToSend > 0 && !sendingInProgress" class="text-subtitle pe-2">{{ rewardsToSend }}</div>
+        <div v-if="hasErrorTransactions" class="text-subtitle pe-2 align-self-center">
+          <v-icon
+            color="orange darken-2"
+            class="pe-2"
+            size="16">
+            fas fa-exclamation-triangle
+          </v-icon>
+          {{ $t('wallet.administration.rewardDetails.sendingError') }}
+        </div>
+        <div v-else-if="tokensToSend > 0 && !sendingInProgress" class="text-subtitle pe-2">{{ rewardsToSend }}</div>
         <v-tooltip
           bottom
           :disabled="!isNotPastPeriod">
@@ -157,11 +166,6 @@ export default {
     period() {
       return this.rewardReport?.period;
     },
-    sendDate() {
-      const reward = this.rewardReport?.rewards?.find(reward => reward?.transaction?.succeeded);
-      const sentDate = new Date(reward?.transaction?.timestamp);
-      return sentDate?.toLocaleString(this.lang, this.dateFormat);
-    },
     startDate() {
       return new Date(this.period?.startDate);
     },
@@ -193,7 +197,10 @@ export default {
       return window.walletSettings.contractDetail?.symbol;
     },
     sendingInProgress() {
-      return this.rewardReport?.rewards?.some(item => item.status === 'pending');
+      return this.walletRewards?.some(item => item.status === 'pending');
+    },
+    hasErrorTransactions() {
+      return this.rewardReport?.failedTransactionCount > 0;
     },
     tokensToSend() {
       return this.rewardReport?.tokensToSend;

From c3c19ece02a1d51474e6a8e71c26e71843dcb23f Mon Sep 17 00:00:00 2001
From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com>
Date: Thu, 3 Oct 2024 10:36:29 +0200
Subject: [PATCH 08/16] feat: Distribution Forecast  view when updating the
 budget conf - MEED-7476 - Meeds-io/MIPs#154 (#574)

---
 .../wallet/reward/rest/RewardReportREST.java  | 23 ++++++--
 .../reward/service/RewardReportService.java   | 13 +++--
 .../model/reward/DistributionForecast.java    | 33 +++++++++++
 .../service/WalletRewardReportService.java    | 55 ++++++++++++++++---
 .../vue-app/wallet-common/js/RewardService.js | 24 ++++++++
 .../reward/BudgetConfigurationDrawer.vue      | 38 ++++++++++++-
 .../reward/DistributionForecast.vue           | 44 +++++----------
 7 files changed, 181 insertions(+), 49 deletions(-)
 create mode 100644 wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/DistributionForecast.java

diff --git a/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java b/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
index 6672b32aa..0d351ac90 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
@@ -29,6 +29,7 @@
 
 import javax.ws.rs.core.*;
 
+import io.meeds.wallet.wallet.model.reward.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -43,12 +44,6 @@
 import org.exoplatform.common.http.HTTPStatus;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import io.meeds.wallet.wallet.model.reward.RewardPeriod;
-import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
-import io.meeds.wallet.wallet.model.reward.RewardPeriodWithFullDate;
-import io.meeds.wallet.wallet.model.reward.RewardReport;
-import io.meeds.wallet.wallet.model.reward.RewardSettings;
-import io.meeds.wallet.wallet.model.reward.WalletReward;
 import io.meeds.wallet.reward.service.RewardReportService;
 import io.meeds.wallet.reward.service.RewardSettingsService;
 import io.meeds.wallet.wallet.utils.RewardUtils;
@@ -132,6 +127,22 @@ public RewardReport computeRewardsByPeriod(@RequestBody
     return rewardReport;
   }
 
+  @PostMapping(path = "forecast")
+  @Secured("rewarding")
+  @Operation(
+          summary = "Compute a distribution forecast corresponding to a chosen reward settings",
+          method = "POST",
+          description = "returns a distribution forecast corresponding to a chosen reward settings")
+  @ApiResponses(value = {
+          @ApiResponse(responseCode = "200", description = "Request fulfilled"),
+          @ApiResponse(responseCode = "400", description = "Invalid query input"),
+          @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
+          @ApiResponse(responseCode = "500", description = "Internal server error") })
+  public DistributionForecast computeDistributionForecast(@RequestBody
+                                             RewardSettings rewardSettings) {
+    return rewardReportService.computeDistributionForecast(rewardSettings);
+  }
+
   @GetMapping(path = "compute/user")
   @Secured("users")
   @Operation(
diff --git a/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java
index 4b944842a..9a8f666d8 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java
@@ -20,10 +20,7 @@
 import java.util.List;
 import java.util.Set;
 
-import io.meeds.wallet.wallet.model.reward.RewardPeriod;
-import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
-import io.meeds.wallet.wallet.model.reward.RewardReport;
-import io.meeds.wallet.wallet.model.reward.WalletReward;
+import io.meeds.wallet.wallet.model.reward.*;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -99,6 +96,14 @@ public interface RewardReportService {
    */
   void saveRewardReport(RewardReport rewardReport);
 
+  /**
+   * Compute a {@link DistributionForecast} corresponding to a {@link RewardSettings}
+   *
+   * @param rewardSettings {@link RewardSettings}
+   * @return {@link RewardReport}
+   */
+  DistributionForecast computeDistributionForecast(RewardSettings rewardSettings);
+
   /**
    * @return true if reward sending status storage is in progress, else return false
    */
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/DistributionForecast.java b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/DistributionForecast.java
new file mode 100644
index 000000000..726b5bc13
--- /dev/null
+++ b/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/DistributionForecast.java
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Lab contact@meedslab.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package io.meeds.wallet.wallet.model.reward;
+
+import lombok.Data;
+
+@Data
+public class DistributionForecast {
+
+  private int    participantsCount;
+
+  private int    eligibleContributorsCount;
+
+  private double acceptedContributions;
+
+  private double Budget;
+}
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
index ea8771703..a95302337 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
@@ -18,6 +18,7 @@
  */
 package io.meeds.wallet.reward.service;
 
+import static io.meeds.wallet.wallet.model.reward.RewardBudgetType.FIXED_PER_MEMBER;
 import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_TRANSACTION_LABEL_KEY;
 import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_TRANSACTION_NO_POOL_MESSAGE_KEY;
 import static io.meeds.wallet.wallet.utils.RewardUtils.TRANSACTION_STATUS_PENDING;
@@ -41,6 +42,7 @@
 import io.meeds.gamification.constant.IdentityType;
 import io.meeds.gamification.model.filter.RealizationFilter;
 import io.meeds.gamification.service.RealizationService;
+import io.meeds.wallet.wallet.model.reward.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -52,13 +54,6 @@
 import io.meeds.wallet.wallet.model.ContractDetail;
 import io.meeds.wallet.wallet.model.Wallet;
 import io.meeds.wallet.wallet.model.WalletType;
-import io.meeds.wallet.wallet.model.reward.RewardBudgetType;
-import io.meeds.wallet.wallet.model.reward.RewardPeriod;
-import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
-import io.meeds.wallet.wallet.model.reward.RewardReport;
-import io.meeds.wallet.wallet.model.reward.RewardSettings;
-import io.meeds.wallet.wallet.model.reward.RewardStatus;
-import io.meeds.wallet.wallet.model.reward.WalletReward;
 import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
 import io.meeds.wallet.reward.storage.WalletRewardReportStorage;
 import io.meeds.wallet.wallet.service.WalletAccountService;
@@ -281,6 +276,48 @@ public void saveRewardReport(RewardReport rewardReport) {
     rewardReportStorage.saveRewardReport(rewardReport);
   }
 
+  @Override
+  public DistributionForecast computeDistributionForecast(RewardSettings rewardSettings) {
+
+    RewardPeriod rewardPeriod = RewardPeriod.getCurrentPeriod(rewardSettings);
+    Date start = new Date(rewardPeriod.getStartDateInSeconds() * 1000L);
+    Date end = new Date(rewardPeriod.getEndDateInSeconds() * 1000L);
+
+    RealizationFilter realizationFilter = new RealizationFilter();
+    realizationFilter.setEarnerType(IdentityType.USER);
+    realizationFilter.setFromDate(start);
+    realizationFilter.setToDate(end);
+
+    List<Long> participants = realizationService.getParticipantsBetweenDates(start, end);
+
+    Set<Wallet> wallets = walletAccountService.listWalletsByIdentityIds(participants)
+                                              .stream()
+                                              .filter(Wallet::isEnabled)
+                                              .collect(Collectors.toSet());
+
+    Map<Long, Double> earnedPoints = getEarnedPoints(wallets.stream().map(Wallet::getTechnicalId).collect(Collectors.toSet()),
+                                                     rewardPeriod.getStartDateInSeconds(),
+                                                     rewardPeriod.getEndDateInSeconds());
+    double acceptedContributions = earnedPoints.values().stream().mapToDouble(Double::doubleValue).sum();
+
+    earnedPoints.entrySet().removeIf(entry -> entry.getValue() < rewardSettings.getThreshold());
+
+    double totalBudget = rewardSettings.getAmount();
+
+    if (FIXED_PER_MEMBER.equals(rewardSettings.getBudgetType())) {
+      double totalEligibleMembersCount = earnedPoints.size();
+      totalBudget = rewardSettings.getAmount() * totalEligibleMembersCount;
+    }
+
+    DistributionForecast distributionForecast = new DistributionForecast();
+    distributionForecast.setBudget(totalBudget);
+    distributionForecast.setAcceptedContributions(acceptedContributions);
+    distributionForecast.setParticipantsCount(participants.size());
+    distributionForecast.setEligibleContributorsCount(earnedPoints.size());
+
+    return distributionForecast;
+  }
+
   @Override
   public Page<RewardPeriod> findRewardReportPeriods(Pageable pageable) {
     return rewardReportStorage.findRewardReportPeriods(pageable);
@@ -362,7 +399,7 @@ private Map<Long, Double> getEarnedPoints(Set<Long> identityIds, long startDateI
     } catch (Exception e) {
       LOG.warn("Error getting points for user with ids {}", identityIds, e);
     }
-    return points.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().doubleValue()));
+    return points.entrySet().stream().collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue().doubleValue()));
   }
 
   private Set<WalletReward> retrieveWalletRewards(RewardReport rewardReport, Set<Wallet> wallets) {
@@ -468,7 +505,7 @@ private void filterEligibleMembers(Set<Entry<Long, Double>> identitiesPointsEntr
 
     Iterator<Entry<Long, Double>> identitiesPointsIterator = identitiesPointsEntries.iterator();
     while (identitiesPointsIterator.hasNext()) {
-      Map.Entry<java.lang.Long, java.lang.Double> entry = identitiesPointsIterator.next();
+      Entry<Long, Double> entry = identitiesPointsIterator.next();
       Long identityId = entry.getKey();
       Double points = entry.getValue();
       points = points == null ? 0 : points;
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/RewardService.js b/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/RewardService.js
index b3af4ef70..d209a9daa 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/RewardService.js
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/RewardService.js
@@ -94,6 +94,30 @@ export function sendRewards(period) {
   });
 }
 
+export function computeDistributionForecast(rewardSettings) {
+  return fetch('/wallet/rest/reward/forecast', {
+    credentials: 'include',
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json'
+    },
+    method: 'POST',
+    body: JSON.stringify({
+      periodType: rewardSettings?.periodType,
+      timeZone: rewardSettings?.timeZone,
+      budgetType: rewardSettings?.budgetType,
+      threshold: rewardSettings?.threshold,
+      amount: rewardSettings?.amount
+    })
+  }).then((resp) => {
+    if (resp?.ok) {
+      return resp.json();
+    } else {
+      throw new Error('Error when computing Distribution Forecast');
+    }
+  });
+}
+
 export function computeRewards(page, size) {
   return fetch(`/wallet/rest/reward/compute?page=${page}&size=${size}`, {
     method: 'GET',
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfigurationDrawer.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfigurationDrawer.vue
index a301b28c3..02911524c 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfigurationDrawer.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfigurationDrawer.vue
@@ -70,6 +70,7 @@
       </v-card-title>
       <div class="d-flex align-center px-4">
         <number-input
+          v-if="settingsToSave.threshold"
           v-model="settingsToSave.threshold"
           :step="1"
           :max="1000"
@@ -107,7 +108,10 @@
       <span v-if="invalidAmount" class="error-color d-flex px-4">{{ $t('wallet.administration.budgetConfigurationDrawer.invalidAmount', {
         0: maxValueFormatted(5000),
       }) }}</span>
-      <wallet-budget-distribution-forecast :reward-report="rewardReport" :settings-to-save="settingsToSave" />
+      <wallet-budget-distribution-forecast
+        v-if="distributionForecast"
+        :distribution-forecast="distributionForecast"
+        :loading-forecast="loadingForecast" />
     </template>
     <template #footer>
       <div class="d-flex">
@@ -147,6 +151,9 @@ export default {
     loading: false,
     invalidThreshold: false,
     invalidAmount: false,
+    distributionForecast: null,
+    loadingForecast: false,
+    timeoutId: null
   }),
   computed: {
     hasConfiguredBudget() {
@@ -195,6 +202,21 @@ export default {
       ];
     },
   },
+  watch: {
+    settingsToSave: {
+      handler() {
+        if (this.timeoutId) {
+          clearTimeout(this.timeoutId);
+        }
+        if (!this.disableApply) {
+          this.timeoutId = setTimeout(() => {
+            this.computeDistributionForecast();
+          }, 1000);
+        }
+      },
+      deep: true,
+    },
+  },
   methods: {
     open() {
       if (this.rewardSettings) {
@@ -203,12 +225,14 @@ export default {
         this.settingsToSave.amount = this.hasConfiguredBudget ? this.settingsToSave?.amount : 1000;
         this.settingsToSave.threshold = this.hasConfiguredBudget ? this.settingsToSave?.threshold : 50;
         this.settingsToSave.budgetType = this.hasConfiguredBudget ? this.settingsToSave?.budgetType : 'FIXED';
+        this.computeDistributionForecast();
       } else {
         this.settingsToSave = {};
       }
       this.$refs.drawer.open();
     },
     close() {
+      this.settingsToSave = {};
       this.$refs.drawer.close();
     },
     apply() {
@@ -231,6 +255,18 @@ export default {
         maximumFractionDigits: 0,
       }).format(max);
     },
+    computeDistributionForecast() {
+      this.loadingForecast = true;
+      if (this.settingsToSave?.periodType?.value) {
+        this.settingsToSave.periodType = this.settingsToSave.periodType.value;
+      }
+      return this.$rewardService.computeDistributionForecast(this.settingsToSave)
+        .then(distributionForecast => {
+          this.distributionForecast = distributionForecast;
+        }).finally(() => {
+          this.loadingForecast = false;
+        });
+    },
   },
 };
 </script>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/DistributionForecast.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/DistributionForecast.vue
index 91fa093ca..064fe5a4e 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/DistributionForecast.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/DistributionForecast.vue
@@ -20,6 +20,7 @@
 -->
 <template>
   <v-card
+    :loading="loadingForecast"
     class="ma-5"
     flat
     outlined>
@@ -43,13 +44,13 @@
 
 export default {
   props: {
-    rewardReport: {
+    distributionForecast: {
       type: Object,
       default: null
     },
-    settingsToSave: {
-      type: Object,
-      default: null
+    loadingForecast: {
+      type: Boolean,
+      default: false
     },
   },
   data: () => ({
@@ -58,47 +59,32 @@ export default {
   computed: {
     forecast() {
       return [
-        { title: this.$t('wallet.administration.distributionForecast.participants'), value: this.participants },
+        { title: this.$t('wallet.administration.distributionForecast.participants'), value: this.participantsCount },
         { title: this.$t('wallet.administration.distributionForecast.eligibleContributors'), value: this.eligibleContributorsCount },
-        { title: this.$t('wallet.administration.distributionForecast.acceptedContributions'), value: `${this.totalRewardsToDisplay} ${this.$t('wallet.administration.budgetConfiguration.points')}` },
+        { title: this.$t('wallet.administration.distributionForecast.acceptedContributions'), value: `${this.acceptedContributionsToDisplay} ${this.$t('wallet.administration.budgetConfiguration.points')}` },
         { title: this.$t('wallet.administration.distributionForecast.budget'), value: this.budgetToDisplay , class: 'font-weight-bold' , unit: this.tokenSymbol, unitClass: 'symbol fundsLabels'},
       ];
     },
     eligibleContributorsCount() {
-      return this.rewardReport?.validRewards?.length;
-    },
-    walletRewards() {
-      return this.rewardReport?.rewards;
+      return this.distributionForecast?.eligibleContributorsCount;
     },
-    participants() {
-      return this.rewardReport?.rewards?.length;
+    participantsCount() {
+      return this.distributionForecast?.participantsCount;
     },
     tokenSymbol() {
       return window.walletSettings?.contractDetail?.symbol;
     },
-    budgetType() {
-      return this.settingsToSave?.budgetType;
-    },
-    amount() {
-      return this.settingsToSave?.amount;
-    },
     budget() {
-      return this.budgetType === 'FIXED' ? this.amount : this.amount * this.eligibleContributorsCount;
+      return this.distributionForecast?.budget;
     },
     budgetToDisplay() {
       return this.valueFormatted(this.budget);
     },
-    totalRewards() {
-      let totalRewards = 0;
-      this.walletRewards.forEach(walletReward => {
-        if (walletReward && walletReward.rewards) {
-          walletReward.rewards.forEach(rewardDetail => totalRewards += rewardDetail.points);
-        }
-      });
-      return totalRewards;
+    acceptedContributions() {
+      return this.distributionForecast?.acceptedContributions;
     },
-    totalRewardsToDisplay() {
-      return this.valueFormatted(this.totalRewards);
+    acceptedContributionsToDisplay() {
+      return this.valueFormatted(this.acceptedContributions);
     },
   },
   methods: {

From 8c146c83dfd3abbab07c49068f8a801b9ab49e7c Mon Sep 17 00:00:00 2001
From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com>
Date: Thu, 3 Oct 2024 12:04:04 +0200
Subject: [PATCH 09/16] feat: Update status icons in the rewards detail -
 MEED-7532 - Meeds-io/MIPs#154 (#576)

---
 .../components/reward/RewardDetailsItem.vue   | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue
index 04a3b837b..0560028ea 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue
@@ -67,18 +67,29 @@
           bottom>
           <template #activator="{ on, attrs }">
             <v-icon
-              color="orange darken-2"
+              color="grey"
               size="16"
               v-bind="attrs"
               v-on="on">
-              fas fa-exclamation-triangle
+              fas fa-slash
             </v-icon>
           </template>
           <span>{{ $t('exoplatform.wallet.label.noEnoughEarnedPoints') }}</span>
         </v-tooltip>
-        <div v-else>
-          -
-        </div>
+        <v-tooltip
+          v-else
+          bottom>
+          <template #activator="{ on, attrs }">
+            <v-icon
+              color="warning"
+              size="16"
+              v-bind="attrs"
+              v-on="on">
+              fas fa-exclamation-triangle
+            </v-icon>
+          </template>
+          <span>{{ $t('wallet.administration.rewardCard.status.toReward') }}</span>
+        </v-tooltip>
       </template>
       <v-progress-circular
         v-else-if="status === 'pending'"

From 1505c6bf78656f9a6ecadda2490815ada7ca303d Mon Sep 17 00:00:00 2001
From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com>
Date: Thu, 3 Oct 2024 14:59:07 +0200
Subject: [PATCH 10/16] feat: Update Display of rewards list  + reward detail -
 MEED-7577 - MEED-7467 - Meeds-io/MIPs#154 (#577)

---
 .../wallet-reward/components/RewardApp.vue       |  1 +
 .../components/reward/BudgetConfiguration.vue    |  2 +-
 .../components/reward/RewardDetails.vue          |  4 ++--
 .../components/reward/RewardDetailsItem.vue      | 16 +---------------
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
index 59553310c..a258ebf78 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
@@ -21,6 +21,7 @@
 <template>
   <v-app
     id="RewardApp"
+    class="application-body position-static"
     flat>
     <template v-if="!showRewardDetails">
       <div class="d-flex flex-row">
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
index 081dbaaf7..630a2e9fb 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
@@ -114,7 +114,7 @@
       </template>
       <template v-else-if="!loading">
         <div class="d-flex flex-column align-center justify-center full-width full-height pt-5">
-          <v-icon color="orange darken-2" size="50">fas fa-coins</v-icon>
+          <v-icon color="tertiary" size="50">fas fa-coins</v-icon>
           <span class="mt-5">{{ $t('wallet.administration.budgetConfiguration.setUp') }}</span>
         </div>
         <v-btn
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
index e42945358..cb30cee16 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
@@ -19,7 +19,7 @@
 
 -->
 <template>
-  <v-card flat>
+  <v-card class="application-body position-static pb-5" flat>
     <v-toolbar flat>
       <v-card
         class="d-flex align-center"
@@ -44,7 +44,7 @@
       <template v-if="!completelyProceeded">
         <div v-if="hasErrorTransactions" class="text-subtitle pe-2 align-self-center">
           <v-icon
-            color="orange darken-2"
+            color="warning"
             class="pe-2"
             size="16">
             fas fa-exclamation-triangle
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue
index 0560028ea..980eeba6c 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue
@@ -49,21 +49,7 @@
     <td class="text-center">
       <template v-if="!status">
         <v-tooltip
-          v-if="!walletAddress"
-          bottom>
-          <template #activator="{ on, attrs }">
-            <v-icon
-              color="orange darken-2"
-              size="16"
-              v-bind="attrs"
-              v-on="on">
-              fas fa-exclamation-triangle
-            </v-icon>
-          </template>
-          <span>{{ $t('exoplatform.wallet.label.noAddress') }}</span>
-        </v-tooltip>
-        <v-tooltip
-          v-else-if="!amount"
+          v-if="!amount"
           bottom>
           <template #activator="{ on, attrs }">
             <v-icon

From 18b1171499071346d2964ea36d629e6a13ca5be0 Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <boubaker.khanfir@exoplatform.com>
Date: Fri, 4 Oct 2024 09:32:24 +0100
Subject: [PATCH 11/16] fix: Adjust Spring Configurations - MEED-7576 -
 Meeds-io/MIPs#154 (#575)

---
 wallet-api/pom.xml                            | 33 +------
 .../model/AddressAlreadyInUseException.java   |  2 +-
 .../{wallet => }/model/ContractDetail.java    |  2 +-
 .../model/ContractTransactionEvent.java       |  2 +-
 .../DistributionForecast.java                 |  2 +-
 .../transaction => model}/FundsRequest.java   |  2 +-
 .../settings => model}/GlobalSettings.java    |  4 +-
 .../InitialFundsSettings.java                 |  2 +-
 .../settings => model}/NetworkSettings.java   |  2 +-
 .../reward => model}/RewardBudgetType.java    |  2 +-
 .../model/reward => model}/RewardPeriod.java  |  4 +-
 .../reward => model}/RewardPeriodType.java    |  4 +-
 .../RewardPeriodWithFullDate.java             |  4 +-
 .../RewardPluginSettings.java                 |  2 +-
 .../model/reward => model}/RewardReport.java  |  4 +-
 .../reward => model}/RewardSettings.java      |  2 +-
 .../model/reward => model}/RewardStatus.java  |  2 +-
 .../model/reward => model}/RewardTeam.java    |  2 +-
 .../reward => model}/RewardTeamMember.java    |  2 +-
 .../reward => model}/RewardTransaction.java   |  5 +-
 .../TransactionDetail.java                    |  8 +-
 .../TransactionNotificationType.java          |  6 +-
 .../TransactionStatistics.java                |  2 +-
 .../settings => model}/UserSettings.java      |  5 +-
 .../wallet/{wallet => }/model/Wallet.java     |  2 +-
 .../model/WalletAddressLabel.java             |  2 +-
 .../{wallet => }/model/WalletCacheKey.java    |  2 +-
 .../reward => model}/WalletPluginReward.java  |  2 +-
 .../{wallet => }/model/WalletProvider.java    |  2 +-
 .../model/reward => model}/WalletReward.java  |  7 +-
 .../settings => model}/WalletSettings.java    |  4 +-
 .../{wallet => }/model/WalletState.java       |  2 +-
 .../wallet/{wallet => }/model/WalletType.java |  5 +-
 .../{wallet => }/model/WebSocketMessage.java  |  2 +-
 .../plugin/WalletAdminIdentityProvider.java   |  2 +-
 .../meeds/wallet/reward/api/RewardPlugin.java | 58 -----------
 .../reward/service/RewardReportService.java   |  5 +-
 .../reward/service/RewardSettingsService.java |  5 +-
 .../service/BlockchainTransactionService.java |  6 +-
 .../service/WalletAccountService.java         |  6 +-
 .../service/WalletContractService.java        |  4 +-
 .../{wallet => }/service/WalletService.java   | 16 ++--
 .../service/WalletTokenAdminService.java      |  8 +-
 .../service/WalletTransactionService.java     |  9 +-
 .../statistic/ExoWalletStatistic.java         |  2 +-
 .../statistic/ExoWalletStatisticAspect.java   | 20 ++--
 .../statistic/ExoWalletStatisticService.java  |  2 +-
 .../statistic/StatisticUtils.java             |  7 +-
 .../{wallet => }/utils/RewardUtils.java       |  7 +-
 .../{wallet => }/utils/WalletUtils.java       | 34 +++----
 .../wallet/model/reward/RewardPeriodTest.java | 17 ++--
 .../wallet/statistic/StatisticUtilsTest.java  | 25 +++--
 .../meeds/wallet/utils/WalletUtilsTest.java   |  3 +-
 wallet-reward-services/pom.xml                | 16 +---
 .../wallet/reward/dao/RewardPeriodDAO.java    |  5 +-
 .../entity/WalletRewardPeriodEntity.java      |  4 +-
 .../RewardSucceedAnalyticsListener.java       |  4 +-
 .../RewardSucceedNotificationListener.java    | 10 +-
 .../listener/TransactionReplacedListener.java | 26 ++---
 .../RewardSuccessNotificationPlugin.java      | 11 ++-
 .../RewardSuccessTemplateBuilder.java         |  8 +-
 .../RewardSuccessTemplateProvider.java        |  2 +-
 .../wallet/reward/rest/RewardReportREST.java  | 12 ++-
 .../reward/rest/RewardSettingsREST.java       | 63 ++++++------
 .../task/RewardStatusVerifierTask.java        | 12 ++-
 .../service/WalletRewardReportService.java    | 95 +++++++++++--------
 .../service/WalletRewardSettingsService.java  | 22 +++--
 .../storage/WalletRewardReportStorage.java    | 20 ++--
 .../meeds/wallet/reward/BaseRewardTest.java   |  7 +-
 .../wallet/reward/BaseWalletRewardTest.java   | 27 +++---
 .../RewardSucceedAnalyticsListenerTest.java   |  8 +-
 ...RewardSucceedNotificationListenerTest.java |  7 +-
 .../TransactionReplacedListenerTest.java      | 16 ++--
 .../reward/rest/TestRewardReportREST.java     | 43 +++++----
 .../reward/rest/TestRewardSettingsREST.java   | 34 ++++---
 .../WalletRewardReportServiceTest.java        | 18 ++--
 .../WalletRewardSettingsServiceTest.java      | 11 ++-
 wallet-services/pom.xml                       |  2 +-
 .../ContractTransactionMinedListener.java     |  9 +-
 .../TransactionMinedAndUpdatedListener.java   |  7 +-
 .../listener/TransactionMinedListener.java    | 13 +--
 .../TransactionSentToBlockchainListener.java  |  7 +-
 .../TransactionWithNonceVerifierListener.java |  9 +-
 .../listener/WebSocketContractListener.java   |  3 +-
 .../WebSocketTransactionListener.java         |  3 +-
 .../listener/WebSocketWalletListener.java     |  3 +-
 .../EthereumBlockchainTransactionService.java | 37 ++++----
 .../service/EthereumClientConnector.java      | 43 +++++----
 .../EthereumWalletTokenAdminService.java      | 49 +++++-----
 .../io/meeds/wallet/entity/WalletEntity.java  |  7 +-
 .../wallet/job/BoostAdminTransactionJob.java  |  3 +-
 .../PendingEtherTransactionVerifierJob.java   | 11 ++-
 .../wallet/job/TransactionSenderJob.java      |  3 +-
 .../listener/AutoTransactionListener.java     | 15 +--
 ...ificationWalletInitializationListener.java | 19 ++--
 .../listener/TransactionCreatedListener.java  |  7 +-
 .../TransactionNotificationListener.java      | 17 ++--
 .../listener/WalletDeletedListener.java       |  7 +-
 .../builder/RequestFundsTemplateBuilder.java  |  5 +-
 .../notification/builder/TemplateBuilder.java |  5 +-
 .../FundsRequestNotificationPlugin.java       | 11 ++-
 .../WalletReceiverNotificationPlugin.java     | 51 +++++-----
 .../WalletSenderNotificationPlugin.java       |  7 +-
 .../provider/MailTemplateProvider.java        |  4 +-
 .../provider/MobilePushTemplateProvider.java  |  4 +-
 .../plugin/WalletPermanentLinkPlugin.java     |  8 +-
 .../wallet/plugin/WalletFeaturePlugin.java    |  5 +-
 .../meeds}/wallet/rest/WalletAccountREST.java | 14 +--
 .../rest/WalletAdminTransactionREST.java      |  9 +-
 .../wallet/rest/WalletContractREST.java       |  9 +-
 .../wallet/rest/WalletSettingsREST.java       | 11 ++-
 .../wallet/rest/WalletTransactionREST.java    | 17 ++--
 .../service/WalletAccountServiceImpl.java     | 73 +++++++-------
 .../service/WalletContractServiceImpl.java    | 19 ++--
 .../wallet/service/WalletServiceImpl.java     | 88 ++++++++---------
 .../service/WalletTransactionServiceImpl.java | 22 +++--
 .../service/WalletWebSocketService.java       |  7 +-
 .../wallet/storage/AddressLabelStorage.java   |  2 +-
 .../wallet/storage/TransactionStorage.java    | 10 +-
 .../meeds/wallet/storage/WalletStorage.java   |  7 +-
 .../storage/cached/CachedAccountStorage.java  |  9 +-
 .../cached/CachedTransactionStorage.java      |  2 +-
 .../conf/portal/wallet-configuration.xml      | 22 ++---
 .../ContractTransactionMinedListenerTest.java | 11 ++-
 ...ransactionMinedAndUpdatedListenerTest.java |  9 +-
 .../TransactionMinedListenerTest.java         | 13 +--
 ...ansactionSentToBlockchainListenerTest.java |  9 +-
 ...nsactionWithNonceVerifierListenerTest.java | 11 ++-
 ...ereumBlockchainTransactionServiceTest.java | 20 ++--
 .../service/EthereumClientConnectorTest.java  |  7 +-
 .../dao/WalletAccountBackupDAOTest.java       |  4 +-
 .../wallet/dao/WalletAccountDAOTest.java      |  2 +-
 .../dao/WalletBlockchainStateDAOTest.java     |  2 +-
 .../wallet/dao/WalletTransactionDAOTest.java  |  2 +-
 .../job/BoostAdminTransactionJobTest.java     |  2 +-
 ...endingEtherTransactionVerifierJobTest.java | 10 +-
 .../wallet/job/TransactionSenderJobTest.java  |  2 +-
 ...ationWalletInitializationListenerTest.java | 19 ++--
 .../TransactionCreatedListenerTest.java       |  7 +-
 .../listener/WalletDeletedListenerTest.java   |  9 +-
 .../service/WalletAccountServiceTest.java     | 26 ++---
 .../wallet/service/WalletServiceTest.java     | 27 +++---
 .../service/WalletTransactionServiceTest.java | 13 +--
 .../storage/AddressLabelStorageTest.java      |  2 +-
 .../storage/TransactionStorageTest.java       |  4 +-
 .../wallet/storage/WalletStorageTest.java     |  8 +-
 .../io/meeds/wallet/test/BaseWalletTest.java  | 22 ++---
 .../wallet/test/mock/IdentityManagerMock.java |  5 +-
 .../io/meeds/wallet/WalletApplication.java    | 10 +-
 .../conf/wallet/blockchain-configuration.xml  |  4 +-
 .../src/main/webapp/WEB-INF/jsp/wallet.jsp    |  2 +-
 .../main/webapp/WEB-INF/jsp/walletBalance.jsp | 14 +--
 .../webapp/WEB-INF/jsp/walletSettings.jsp     |  2 +-
 153 files changed, 909 insertions(+), 916 deletions(-)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/model/AddressAlreadyInUseException.java (96%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/model/ContractDetail.java (97%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/model/ContractTransactionEvent.java (96%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/reward => model}/DistributionForecast.java (96%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/transaction => model}/FundsRequest.java (96%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/settings => model}/GlobalSettings.java (95%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/settings => model}/InitialFundsSettings.java (97%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/settings => model}/NetworkSettings.java (97%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/reward => model}/RewardBudgetType.java (95%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/reward => model}/RewardPeriod.java (96%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/reward => model}/RewardPeriodType.java (95%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/reward => model}/RewardPeriodWithFullDate.java (95%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/reward => model}/RewardPluginSettings.java (97%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/reward => model}/RewardReport.java (97%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/reward => model}/RewardSettings.java (97%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/reward => model}/RewardStatus.java (95%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/reward => model}/RewardTeam.java (97%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/reward => model}/RewardTeamMember.java (96%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/reward => model}/RewardTransaction.java (96%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/transaction => model}/TransactionDetail.java (95%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/transaction => model}/TransactionNotificationType.java (84%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/transaction => model}/TransactionStatistics.java (95%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/settings => model}/UserSettings.java (93%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/model/Wallet.java (98%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/model/WalletAddressLabel.java (97%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/model/WalletCacheKey.java (97%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/reward => model}/WalletPluginReward.java (96%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/model/WalletProvider.java (96%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/reward => model}/WalletReward.java (91%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet/model/settings => model}/WalletSettings.java (94%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/model/WalletState.java (96%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/model/WalletType.java (96%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/model/WebSocketMessage.java (97%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/plugin/WalletAdminIdentityProvider.java (97%)
 delete mode 100644 wallet-api/src/main/java/io/meeds/wallet/reward/api/RewardPlugin.java
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/service/BlockchainTransactionService.java (94%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/service/WalletAccountService.java (99%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/service/WalletContractService.java (96%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/service/WalletService.java (91%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/service/WalletTokenAdminService.java (96%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/service/WalletTransactionService.java (97%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/statistic/ExoWalletStatistic.java (96%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/statistic/ExoWalletStatisticAspect.java (87%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/statistic/ExoWalletStatisticService.java (96%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/statistic/StatisticUtils.java (97%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/utils/RewardUtils.java (98%)
 rename wallet-api/src/main/java/io/meeds/wallet/{wallet => }/utils/WalletUtils.java (98%)
 rename {wallet-api => wallet-reward-services}/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java (98%)
 rename {wallet-api => wallet-reward-services}/src/main/java/io/meeds/wallet/reward/rest/RewardSettingsREST.java (64%)
 rename {wallet-api => wallet-reward-services}/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java (95%)
 rename {wallet-api => wallet-reward-services}/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java (94%)
 rename {wallet-api/src/main/java/io/meeds/wallet => wallet-services/src/main/java/io/meeds}/wallet/rest/WalletAccountREST.java (98%)
 rename {wallet-api/src/main/java/io/meeds/wallet => wallet-services/src/main/java/io/meeds}/wallet/rest/WalletAdminTransactionREST.java (96%)
 rename {wallet-api/src/main/java/io/meeds/wallet => wallet-services/src/main/java/io/meeds}/wallet/rest/WalletContractREST.java (96%)
 rename {wallet-api/src/main/java/io/meeds/wallet => wallet-services/src/main/java/io/meeds}/wallet/rest/WalletSettingsREST.java (93%)
 rename {wallet-api/src/main/java/io/meeds/wallet => wallet-services/src/main/java/io/meeds}/wallet/rest/WalletTransactionREST.java (96%)

diff --git a/wallet-api/pom.xml b/wallet-api/pom.xml
index 5dc6a691f..2ba3ed932 100644
--- a/wallet-api/pom.xml
+++ b/wallet-api/pom.xml
@@ -25,11 +25,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <artifactId>wallet-api</artifactId>
   <name>Meeds:: Add-on:: Wallet - API</name>
   <properties>
-    <rest.api.doc.title>Wallet Rest Api</rest.api.doc.title>
-    <rest.api.doc.version>1.0</rest.api.doc.version>
-    <rest.api.doc.description>Wallet addon rest endpoints</rest.api.doc.description>
-
-    <exo.test.coverage.ratio>0.12</exo.test.coverage.ratio>
+    <exo.test.coverage.ratio>0.21</exo.test.coverage.ratio>
   </properties>
   <dependencies>
     <dependency>
@@ -55,31 +51,4 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       </exclusions>
     </dependency>
   </dependencies>
-  <build>
-    <finalName>wallet-api</finalName>
-    <plugins>
-      <plugin>
-        <groupId>io.openapitools.swagger</groupId>
-        <artifactId>swagger-maven-plugin</artifactId>
-        <configuration>
-          <useResourcePackagesChildren>true</useResourcePackagesChildren>
-          <resourcePackages>
-            <locations>io.meeds.wallet.wallet.rest</locations>
-            <locations>io.meeds.wallet.reward.rest</locations>
-          </resourcePackages>
-          <swaggerConfig>
-            <info>
-              <title>${rest.api.doc.title}</title>
-              <version>${rest.api.doc.version}</version>
-              <description>${rest.api.doc.description}</description>
-              <license>
-                <url>https://www.gnu.org/licenses/lgpl-3.0.en.html</url>
-                <name>LGPL</name>
-              </license>
-            </info>
-          </swaggerConfig>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/AddressAlreadyInUseException.java b/wallet-api/src/main/java/io/meeds/wallet/model/AddressAlreadyInUseException.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/AddressAlreadyInUseException.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/AddressAlreadyInUseException.java
index ea8c2de46..efba8c857 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/AddressAlreadyInUseException.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/AddressAlreadyInUseException.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model;
+package io.meeds.wallet.model;
 
 public class AddressAlreadyInUseException extends RuntimeException {
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/ContractDetail.java b/wallet-api/src/main/java/io/meeds/wallet/model/ContractDetail.java
similarity index 97%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/ContractDetail.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/ContractDetail.java
index 3c1f9299b..bafb14bee 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/ContractDetail.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/ContractDetail.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model;
+package io.meeds.wallet.model;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/ContractTransactionEvent.java b/wallet-api/src/main/java/io/meeds/wallet/model/ContractTransactionEvent.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/ContractTransactionEvent.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/ContractTransactionEvent.java
index bdeb466ed..6967f7bbb 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/ContractTransactionEvent.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/ContractTransactionEvent.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model;
+package io.meeds.wallet.model;
 
 import java.util.List;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/DistributionForecast.java b/wallet-api/src/main/java/io/meeds/wallet/model/DistributionForecast.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/DistributionForecast.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/DistributionForecast.java
index 726b5bc13..5413e5996 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/DistributionForecast.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/DistributionForecast.java
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.reward;
+package io.meeds.wallet.model;
 
 import lombok.Data;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/FundsRequest.java b/wallet-api/src/main/java/io/meeds/wallet/model/FundsRequest.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/FundsRequest.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/FundsRequest.java
index 7627d6ac3..b8ade6325 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/FundsRequest.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/FundsRequest.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.transaction;
+package io.meeds.wallet.model;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/GlobalSettings.java b/wallet-api/src/main/java/io/meeds/wallet/model/GlobalSettings.java
similarity index 95%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/GlobalSettings.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/GlobalSettings.java
index 2ddd42d21..8532527fa 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/GlobalSettings.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/GlobalSettings.java
@@ -14,14 +14,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.settings;
+package io.meeds.wallet.model;
 
 import java.io.Serializable;
 
 import org.apache.commons.beanutils.BeanUtils;
 
-import io.meeds.wallet.wallet.model.ContractDetail;
-
 import lombok.*;
 import lombok.EqualsAndHashCode.Exclude;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/InitialFundsSettings.java b/wallet-api/src/main/java/io/meeds/wallet/model/InitialFundsSettings.java
similarity index 97%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/InitialFundsSettings.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/InitialFundsSettings.java
index 152c1faf0..43205a3cb 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/InitialFundsSettings.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/InitialFundsSettings.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.settings;
+package io.meeds.wallet.model;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/NetworkSettings.java b/wallet-api/src/main/java/io/meeds/wallet/model/NetworkSettings.java
similarity index 97%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/NetworkSettings.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/NetworkSettings.java
index ad7f6cf0f..2cb29c289 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/NetworkSettings.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/NetworkSettings.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.settings;
+package io.meeds.wallet.model;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardBudgetType.java b/wallet-api/src/main/java/io/meeds/wallet/model/RewardBudgetType.java
similarity index 95%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardBudgetType.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/RewardBudgetType.java
index 11b89ae38..5859b7539 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardBudgetType.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/RewardBudgetType.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.reward;
+package io.meeds.wallet.model;
 
 public enum RewardBudgetType {
   COMPUTED,
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriod.java b/wallet-api/src/main/java/io/meeds/wallet/model/RewardPeriod.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriod.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/RewardPeriod.java
index f8a435d85..064b90802 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriod.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/RewardPeriod.java
@@ -14,9 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.reward;
+package io.meeds.wallet.model;
 
-import static io.meeds.wallet.wallet.utils.RewardUtils.formatTime;
+import static io.meeds.wallet.utils.RewardUtils.formatTime;
 
 import java.io.Serializable;
 import java.time.Instant;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriodType.java b/wallet-api/src/main/java/io/meeds/wallet/model/RewardPeriodType.java
similarity index 95%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriodType.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/RewardPeriodType.java
index a02b832e1..5debc2586 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriodType.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/RewardPeriodType.java
@@ -14,9 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.reward;
+package io.meeds.wallet.model;
 
-import static io.meeds.wallet.wallet.utils.RewardUtils.timeToSecondsAtDayStart;
+import static io.meeds.wallet.utils.RewardUtils.timeToSecondsAtDayStart;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriodWithFullDate.java b/wallet-api/src/main/java/io/meeds/wallet/model/RewardPeriodWithFullDate.java
similarity index 95%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriodWithFullDate.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/RewardPeriodWithFullDate.java
index 9c3b94374..b923d583f 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPeriodWithFullDate.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/RewardPeriodWithFullDate.java
@@ -14,13 +14,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.reward;
+package io.meeds.wallet.model;
 
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
-import io.meeds.wallet.wallet.utils.RewardUtils;
+import io.meeds.wallet.utils.RewardUtils;
 
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode.Exclude;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPluginSettings.java b/wallet-api/src/main/java/io/meeds/wallet/model/RewardPluginSettings.java
similarity index 97%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPluginSettings.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/RewardPluginSettings.java
index 698936fc5..b5c1fc4dc 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardPluginSettings.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/RewardPluginSettings.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.reward;
+package io.meeds.wallet.model;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardReport.java b/wallet-api/src/main/java/io/meeds/wallet/model/RewardReport.java
similarity index 97%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardReport.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/RewardReport.java
index 29201c970..84f3a27ca 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardReport.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/RewardReport.java
@@ -14,9 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.reward;
+package io.meeds.wallet.model;
 
-import static io.meeds.wallet.wallet.utils.RewardUtils.*;
+import static io.meeds.wallet.utils.RewardUtils.*;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardSettings.java b/wallet-api/src/main/java/io/meeds/wallet/model/RewardSettings.java
similarity index 97%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardSettings.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/RewardSettings.java
index c31ef36c2..34cba79d2 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardSettings.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/RewardSettings.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.reward;
+package io.meeds.wallet.model;
 
 import java.io.Serializable;
 import java.time.ZoneId;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardStatus.java b/wallet-api/src/main/java/io/meeds/wallet/model/RewardStatus.java
similarity index 95%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardStatus.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/RewardStatus.java
index 9ec4e01b5..d614ebee1 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardStatus.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/RewardStatus.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.reward;
+package io.meeds.wallet.model;
 
 public enum RewardStatus {
   ESTIMATION,
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTeam.java b/wallet-api/src/main/java/io/meeds/wallet/model/RewardTeam.java
similarity index 97%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTeam.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/RewardTeam.java
index 26f3e6c8b..c30c2f216 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTeam.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/RewardTeam.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.reward;
+package io.meeds.wallet.model;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTeamMember.java b/wallet-api/src/main/java/io/meeds/wallet/model/RewardTeamMember.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTeamMember.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/RewardTeamMember.java
index ecf574edc..518266921 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTeamMember.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/RewardTeamMember.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.reward;
+package io.meeds.wallet.model;
 
 import java.io.Serializable;
 import org.exoplatform.social.core.identity.provider.OrganizationIdentityProvider;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTransaction.java b/wallet-api/src/main/java/io/meeds/wallet/model/RewardTransaction.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTransaction.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/RewardTransaction.java
index 0b5c4fdbe..fbc097324 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/RewardTransaction.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/RewardTransaction.java
@@ -14,16 +14,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.reward;
+package io.meeds.wallet.model;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.*;
+import static io.meeds.wallet.utils.WalletUtils.*;
 
 import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.social.core.identity.model.Identity;
-import io.meeds.wallet.wallet.model.WalletType;
 
 import lombok.*;
 import lombok.EqualsAndHashCode.Exclude;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionDetail.java b/wallet-api/src/main/java/io/meeds/wallet/model/TransactionDetail.java
similarity index 95%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionDetail.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/TransactionDetail.java
index 3a6ce8474..c3731f441 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionDetail.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/TransactionDetail.java
@@ -14,16 +14,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.transaction;
+package io.meeds.wallet.model;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.convertFromDecimals;
-import static io.meeds.wallet.wallet.utils.WalletUtils.convertToDecimals;
+import static io.meeds.wallet.utils.WalletUtils.convertFromDecimals;
+import static io.meeds.wallet.utils.WalletUtils.convertToDecimals;
 
 import java.io.Serializable;
 import java.math.BigInteger;
 
-import io.meeds.wallet.wallet.model.Wallet;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionNotificationType.java b/wallet-api/src/main/java/io/meeds/wallet/model/TransactionNotificationType.java
similarity index 84%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionNotificationType.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/TransactionNotificationType.java
index 94c5be88f..90506398a 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionNotificationType.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/TransactionNotificationType.java
@@ -14,10 +14,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.transaction;
+package io.meeds.wallet.model;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_RECEIVER_NOTIFICATION_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_SENDER_NOTIFICATION_ID;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_RECEIVER_NOTIFICATION_ID;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_SENDER_NOTIFICATION_ID;
 
 public enum TransactionNotificationType {
   RECEIVER(WALLET_RECEIVER_NOTIFICATION_ID),
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionStatistics.java b/wallet-api/src/main/java/io/meeds/wallet/model/TransactionStatistics.java
similarity index 95%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionStatistics.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/TransactionStatistics.java
index fc4b10fcb..800e2b4a8 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/transaction/TransactionStatistics.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/TransactionStatistics.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.transaction;
+package io.meeds.wallet.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/UserSettings.java b/wallet-api/src/main/java/io/meeds/wallet/model/UserSettings.java
similarity index 93%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/UserSettings.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/UserSettings.java
index 1fefc647d..bcb823190 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/UserSettings.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/UserSettings.java
@@ -14,10 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.settings;
+package io.meeds.wallet.model;
 
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.WalletUtils;
 
 import lombok.*;
 import lombok.EqualsAndHashCode.Exclude;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/Wallet.java b/wallet-api/src/main/java/io/meeds/wallet/model/Wallet.java
similarity index 98%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/Wallet.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/Wallet.java
index 2b4b31201..80e1702cd 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/Wallet.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/Wallet.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model;
+package io.meeds.wallet.model;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletAddressLabel.java b/wallet-api/src/main/java/io/meeds/wallet/model/WalletAddressLabel.java
similarity index 97%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletAddressLabel.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/WalletAddressLabel.java
index 644dff8ed..b4533713a 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletAddressLabel.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/WalletAddressLabel.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model;
+package io.meeds.wallet.model;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletCacheKey.java b/wallet-api/src/main/java/io/meeds/wallet/model/WalletCacheKey.java
similarity index 97%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletCacheKey.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/WalletCacheKey.java
index a50fcf53d..173c3c14b 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletCacheKey.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/WalletCacheKey.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model;
+package io.meeds.wallet.model;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/WalletPluginReward.java b/wallet-api/src/main/java/io/meeds/wallet/model/WalletPluginReward.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/WalletPluginReward.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/WalletPluginReward.java
index e99dde272..70eea275c 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/WalletPluginReward.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/WalletPluginReward.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.reward;
+package io.meeds.wallet.model;
 
 import java.io.Serializable;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletProvider.java b/wallet-api/src/main/java/io/meeds/wallet/model/WalletProvider.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletProvider.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/WalletProvider.java
index 4685fa5fc..18c1753de 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletProvider.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/WalletProvider.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model;
+package io.meeds.wallet.model;
 
 public enum WalletProvider {
     INTERNAL_WALLET,
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/WalletReward.java b/wallet-api/src/main/java/io/meeds/wallet/model/WalletReward.java
similarity index 91%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/WalletReward.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/WalletReward.java
index b35f9b8e2..502718729 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/reward/WalletReward.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/WalletReward.java
@@ -14,17 +14,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.reward;
+package io.meeds.wallet.model;
 
-import static io.meeds.wallet.wallet.utils.RewardUtils.*;
+import static io.meeds.wallet.utils.RewardUtils.*;
 
 import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
 
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-
 import lombok.*;
 import lombok.EqualsAndHashCode.Exclude;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/WalletSettings.java b/wallet-api/src/main/java/io/meeds/wallet/model/WalletSettings.java
similarity index 94%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/WalletSettings.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/WalletSettings.java
index dd9621e32..33f8c4476 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/settings/WalletSettings.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/WalletSettings.java
@@ -14,13 +14,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model.settings;
+package io.meeds.wallet.model;
 
 import java.io.Serializable;
 import java.util.Set;
 
-import io.meeds.wallet.wallet.model.WalletAddressLabel;
-
 import lombok.*;
 import lombok.EqualsAndHashCode.Exclude;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletState.java b/wallet-api/src/main/java/io/meeds/wallet/model/WalletState.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletState.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/WalletState.java
index 204aca335..ff5a96d12 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletState.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/WalletState.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model;
+package io.meeds.wallet.model;
 
 public enum WalletState {
   NEW,
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletType.java b/wallet-api/src/main/java/io/meeds/wallet/model/WalletType.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletType.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/WalletType.java
index ff23322dc..1c4e378b7 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WalletType.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/WalletType.java
@@ -14,13 +14,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model;
+package io.meeds.wallet.model;
 
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.social.core.identity.provider.OrganizationIdentityProvider;
 import org.exoplatform.social.core.identity.provider.SpaceIdentityProvider;
-import io.meeds.wallet.wallet.plugin.WalletAdminIdentityProvider;
+
+import io.meeds.wallet.plugin.WalletAdminIdentityProvider;
 
 public enum WalletType {
   USER,
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WebSocketMessage.java b/wallet-api/src/main/java/io/meeds/wallet/model/WebSocketMessage.java
similarity index 97%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/model/WebSocketMessage.java
rename to wallet-api/src/main/java/io/meeds/wallet/model/WebSocketMessage.java
index 70a3cb124..3b167214e 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/model/WebSocketMessage.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/WebSocketMessage.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.model;
+package io.meeds.wallet.model;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/plugin/WalletAdminIdentityProvider.java b/wallet-api/src/main/java/io/meeds/wallet/plugin/WalletAdminIdentityProvider.java
similarity index 97%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/plugin/WalletAdminIdentityProvider.java
rename to wallet-api/src/main/java/io/meeds/wallet/plugin/WalletAdminIdentityProvider.java
index 2693d5a33..e7f5b6270 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/plugin/WalletAdminIdentityProvider.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/plugin/WalletAdminIdentityProvider.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.plugin;
+package io.meeds.wallet.plugin;
 
 import org.exoplatform.social.core.identity.IdentityProvider;
 import org.exoplatform.social.core.identity.model.Identity;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/reward/api/RewardPlugin.java b/wallet-api/src/main/java/io/meeds/wallet/reward/api/RewardPlugin.java
deleted file mode 100644
index 1db9a595f..000000000
--- a/wallet-api/src/main/java/io/meeds/wallet/reward/api/RewardPlugin.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package io.meeds.wallet.reward.api;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.exoplatform.container.component.BaseComponentPlugin;
-
-/**
- * A reward plugin to manage rewarded points
- */
-public abstract class RewardPlugin extends BaseComponentPlugin {
-
-  /**
-   * get reward plugin unique identifier
-   * 
-   * @return reward plugin ID
-   */
-  public String getPluginId() {
-    return getName();
-  }
-
-  /**
-   * Checks is the plugin is enabled
-   * 
-   * @return whether the plugin is enabled or not
-   */
-  public boolean isEnabled() {
-    return true;
-  }
-
-  /**
-   * Retrieves earned points for identities in a selected period of time
-   * 
-   * @param identityIds identity ids of wallets to consider in computation
-   * @param startDateInSeconds start timestamp in seconds of reward period
-   * @param endDateInSeconds end timestamp in seconds of reward period
-   * @return a {@link Map} of identity ID with the sum of tokens to send as
-   *         reward
-   */
-  public abstract Map<Long, Double> getEarnedPoints(Set<Long> identityIds, long startDateInSeconds, long endDateInSeconds);
-
-}
diff --git a/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java
index 9a8f666d8..8c47efdce 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java
@@ -20,16 +20,17 @@
 import java.util.List;
 import java.util.Set;
 
-import io.meeds.wallet.wallet.model.reward.*;
+import io.meeds.wallet.model.*;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+
 import org.exoplatform.social.core.identity.model.Identity;
 
 /**
  * A storage service to save/load reward settings
  */
-@Service
+@Service("rewardReportService")
 public interface RewardReportService {
 
   /**
diff --git a/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardSettingsService.java b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardSettingsService.java
index 93fd5ee84..baab93b2c 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardSettingsService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardSettingsService.java
@@ -18,12 +18,13 @@
 
 
 import org.springframework.stereotype.Service;
-import io.meeds.wallet.wallet.model.reward.RewardSettings;
+
+import io.meeds.wallet.model.RewardSettings;
 
 /**
  * A storage service to save/load reward transactions
  */
-@Service
+@Service("rewardSettingsService")
 public interface RewardSettingsService {
 
   /**
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/service/BlockchainTransactionService.java b/wallet-api/src/main/java/io/meeds/wallet/service/BlockchainTransactionService.java
similarity index 94%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/service/BlockchainTransactionService.java
rename to wallet-api/src/main/java/io/meeds/wallet/service/BlockchainTransactionService.java
index 25b4759ba..942ddb22d 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/service/BlockchainTransactionService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/service/BlockchainTransactionService.java
@@ -14,15 +14,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.service;
+package io.meeds.wallet.service;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.Future;
 
-import io.meeds.wallet.wallet.model.ContractTransactionEvent;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.model.TransactionDetail;
 
 public interface BlockchainTransactionService {
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletAccountService.java b/wallet-api/src/main/java/io/meeds/wallet/service/WalletAccountService.java
similarity index 99%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletAccountService.java
rename to wallet-api/src/main/java/io/meeds/wallet/service/WalletAccountService.java
index 1c6198176..da33ee84f 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletAccountService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/service/WalletAccountService.java
@@ -14,14 +14,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package io.meeds.wallet.wallet.service;
+package io.meeds.wallet.service;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import io.meeds.wallet.wallet.model.*;
 import org.exoplatform.social.core.identity.model.Identity;
+
+import io.meeds.wallet.model.*;
+
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletContractService.java b/wallet-api/src/main/java/io/meeds/wallet/service/WalletContractService.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletContractService.java
rename to wallet-api/src/main/java/io/meeds/wallet/service/WalletContractService.java
index 9dd616dad..1a9f2df3d 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletContractService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/service/WalletContractService.java
@@ -14,13 +14,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.service;
+package io.meeds.wallet.service;
 
 import java.io.IOException;
 
 import org.json.JSONArray;
 
-import io.meeds.wallet.wallet.model.ContractDetail;
+import io.meeds.wallet.model.ContractDetail;
 
 /**
  * Manages token contract properties
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletService.java b/wallet-api/src/main/java/io/meeds/wallet/service/WalletService.java
similarity index 91%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletService.java
rename to wallet-api/src/main/java/io/meeds/wallet/service/WalletService.java
index 5f6c3ceb5..5cf34e96c 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/service/WalletService.java
@@ -14,14 +14,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.service;
-
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.model.settings.GlobalSettings;
-import io.meeds.wallet.wallet.model.settings.InitialFundsSettings;
-import io.meeds.wallet.wallet.model.settings.UserSettings;
-import io.meeds.wallet.wallet.model.settings.WalletSettings;
-import io.meeds.wallet.wallet.model.transaction.FundsRequest;
+package io.meeds.wallet.service;
+
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.FundsRequest;
+import io.meeds.wallet.model.GlobalSettings;
+import io.meeds.wallet.model.InitialFundsSettings;
+import io.meeds.wallet.model.UserSettings;
+import io.meeds.wallet.model.WalletSettings;
 
 /**
  * A storage service to save/load information used by users and spaces wallets
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletTokenAdminService.java b/wallet-api/src/main/java/io/meeds/wallet/service/WalletTokenAdminService.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletTokenAdminService.java
rename to wallet-api/src/main/java/io/meeds/wallet/service/WalletTokenAdminService.java
index 689555345..57baba65b 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletTokenAdminService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/service/WalletTokenAdminService.java
@@ -14,14 +14,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.service;
+package io.meeds.wallet.service;
 
 import java.math.BigInteger;
 import java.util.Set;
 
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
 
 /**
  * Communicates with blockchain to send transactions and retrieve information
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletTransactionService.java b/wallet-api/src/main/java/io/meeds/wallet/service/WalletTransactionService.java
similarity index 97%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletTransactionService.java
rename to wallet-api/src/main/java/io/meeds/wallet/service/WalletTransactionService.java
index 2ba13cc15..1ae59cee2 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/service/WalletTransactionService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/service/WalletTransactionService.java
@@ -14,16 +14,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.service;
+package io.meeds.wallet.service;
 
 import java.util.List;
 import java.util.Locale;
 
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.model.transaction.TransactionStatistics;
 import org.springframework.stereotype.Service;
 
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.TransactionStatistics;
+import io.meeds.wallet.model.Wallet;
+
 /**
  * Manage stored transaction details in eXo internal datasource
  */
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatistic.java b/wallet-api/src/main/java/io/meeds/wallet/statistic/ExoWalletStatistic.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatistic.java
rename to wallet-api/src/main/java/io/meeds/wallet/statistic/ExoWalletStatistic.java
index a1b6a8a65..1d4922e13 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatistic.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/statistic/ExoWalletStatistic.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.statistic;
+package io.meeds.wallet.statistic;
 
 import java.lang.annotation.*;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatisticAspect.java b/wallet-api/src/main/java/io/meeds/wallet/statistic/ExoWalletStatisticAspect.java
similarity index 87%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatisticAspect.java
rename to wallet-api/src/main/java/io/meeds/wallet/statistic/ExoWalletStatisticAspect.java
index 7d5c57a5f..8c2bf89ef 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatisticAspect.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/statistic/ExoWalletStatisticAspect.java
@@ -14,16 +14,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.statistic;
+package io.meeds.wallet.statistic;
 
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.DURATION;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.ERROR_MSG;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.LOCAL_SERVICE;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.OPERATION;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.REMOTE_SERVICE;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.STATUS;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.STATUS_CODE;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.addStatisticEntry;
+import static io.meeds.wallet.statistic.StatisticUtils.DURATION;
+import static io.meeds.wallet.statistic.StatisticUtils.ERROR_MSG;
+import static io.meeds.wallet.statistic.StatisticUtils.LOCAL_SERVICE;
+import static io.meeds.wallet.statistic.StatisticUtils.OPERATION;
+import static io.meeds.wallet.statistic.StatisticUtils.REMOTE_SERVICE;
+import static io.meeds.wallet.statistic.StatisticUtils.STATUS;
+import static io.meeds.wallet.statistic.StatisticUtils.STATUS_CODE;
+import static io.meeds.wallet.statistic.StatisticUtils.addStatisticEntry;
 
 import java.lang.reflect.Method;
 import java.util.Map;
@@ -55,7 +55,7 @@ public class ExoWalletStatisticAspect {
    * @return result of processing point after its execution
    * @throws Throwable if processing point throws an exception
    */
-  @Around("execution(* *(..)) && @annotation(io.meeds.wallet.wallet.statistic.ExoWalletStatistic)")
+  @Around("execution(* *(..)) && @annotation(io.meeds.wallet.statistic.ExoWalletStatistic)")
   public Object around(ProceedingJoinPoint point) throws Throwable { // NOSONAR
     ExoWalletStatisticService statisticService = (ExoWalletStatisticService) point.getThis();
     MethodSignature methodSignature = (MethodSignature) point.getSignature();
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatisticService.java b/wallet-api/src/main/java/io/meeds/wallet/statistic/ExoWalletStatisticService.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatisticService.java
rename to wallet-api/src/main/java/io/meeds/wallet/statistic/ExoWalletStatisticService.java
index 258b41e66..c1d2c8330 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/ExoWalletStatisticService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/statistic/ExoWalletStatisticService.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.statistic;
+package io.meeds.wallet.statistic;
 
 import java.util.Map;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/StatisticUtils.java b/wallet-api/src/main/java/io/meeds/wallet/statistic/StatisticUtils.java
similarity index 97%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/StatisticUtils.java
rename to wallet-api/src/main/java/io/meeds/wallet/statistic/StatisticUtils.java
index a51935f25..57659c281 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/statistic/StatisticUtils.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/statistic/StatisticUtils.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.statistic;
+package io.meeds.wallet.statistic;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -30,8 +30,9 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.security.ConversationState;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.utils.WalletUtils;
 
 public class StatisticUtils {
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/utils/RewardUtils.java b/wallet-api/src/main/java/io/meeds/wallet/utils/RewardUtils.java
similarity index 98%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/utils/RewardUtils.java
rename to wallet-api/src/main/java/io/meeds/wallet/utils/RewardUtils.java
index b1ed64f49..9884f95ae 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/utils/RewardUtils.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/utils/RewardUtils.java
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.utils;
+package io.meeds.wallet.utils;
 
 import java.lang.reflect.Method;
 import java.time.*;
@@ -30,8 +30,9 @@
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.container.ExoContainer;
 import org.exoplatform.services.security.ConversationState;
-import io.meeds.wallet.wallet.model.reward.RewardReport;
-import io.meeds.wallet.wallet.model.reward.RewardSettings;
+
+import io.meeds.wallet.model.RewardReport;
+import io.meeds.wallet.model.RewardSettings;
 import io.meeds.wallet.reward.service.RewardSettingsService;
 
 public class RewardUtils {
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/utils/WalletUtils.java b/wallet-api/src/main/java/io/meeds/wallet/utils/WalletUtils.java
similarity index 98%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/utils/WalletUtils.java
rename to wallet-api/src/main/java/io/meeds/wallet/utils/WalletUtils.java
index 0a273beff..d3d4a5eb1 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/utils/WalletUtils.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/utils/WalletUtils.java
@@ -14,13 +14,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.utils;
+package io.meeds.wallet.utils;
 
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.LOCAL_SERVICE;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.OPERATION;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.STATUS;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.STATUS_CODE;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.transformCapitalWithUnderscore;
+import static io.meeds.wallet.statistic.StatisticUtils.LOCAL_SERVICE;
+import static io.meeds.wallet.statistic.StatisticUtils.OPERATION;
+import static io.meeds.wallet.statistic.StatisticUtils.STATUS;
+import static io.meeds.wallet.statistic.StatisticUtils.STATUS_CODE;
+import static io.meeds.wallet.statistic.StatisticUtils.transformCapitalWithUnderscore;
 
 import java.io.ByteArrayInputStream;
 import java.math.BigDecimal;
@@ -74,16 +74,18 @@
 import org.exoplatform.social.core.service.LinkProvider;
 import org.exoplatform.social.core.space.model.Space;
 import org.exoplatform.social.core.space.spi.SpaceService;
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.WalletState;
-import io.meeds.wallet.wallet.model.WalletType;
-import io.meeds.wallet.wallet.model.settings.GlobalSettings;
-import io.meeds.wallet.wallet.model.transaction.FundsRequest;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.WalletService;
-import io.meeds.wallet.wallet.service.WalletTokenAdminService;
-import io.meeds.wallet.wallet.statistic.StatisticUtils;
+
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.FundsRequest;
+import io.meeds.wallet.model.GlobalSettings;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletState;
+import io.meeds.wallet.model.WalletType;
+import io.meeds.wallet.service.WalletService;
+import io.meeds.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.statistic.StatisticUtils;
+
 import org.exoplatform.ws.frameworks.json.JsonGenerator;
 import org.exoplatform.ws.frameworks.json.JsonParser;
 import org.exoplatform.ws.frameworks.json.impl.JsonDefaultHandler;
diff --git a/wallet-api/src/test/java/io/meeds/wallet/model/reward/RewardPeriodTest.java b/wallet-api/src/test/java/io/meeds/wallet/model/reward/RewardPeriodTest.java
index 60ea995cd..c1b273c38 100644
--- a/wallet-api/src/test/java/io/meeds/wallet/model/reward/RewardPeriodTest.java
+++ b/wallet-api/src/test/java/io/meeds/wallet/model/reward/RewardPeriodTest.java
@@ -24,14 +24,15 @@
 import java.time.YearMonth;
 import java.time.ZoneId;
 
-import io.meeds.wallet.wallet.model.reward.RewardPeriod;
-import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
-import io.meeds.wallet.wallet.model.reward.RewardSettings;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import io.meeds.wallet.model.RewardPeriod;
+import io.meeds.wallet.model.RewardPeriodType;
+import io.meeds.wallet.model.RewardSettings;
+
+@ExtendWith(MockitoExtension.class)
 public class RewardPeriodTest {
 
   @Test
diff --git a/wallet-api/src/test/java/io/meeds/wallet/statistic/StatisticUtilsTest.java b/wallet-api/src/test/java/io/meeds/wallet/statistic/StatisticUtilsTest.java
index 0220d7548..494ff09f8 100644
--- a/wallet-api/src/test/java/io/meeds/wallet/statistic/StatisticUtilsTest.java
+++ b/wallet-api/src/test/java/io/meeds/wallet/statistic/StatisticUtilsTest.java
@@ -16,13 +16,13 @@
  */
 package io.meeds.wallet.statistic;
 
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.DURATION;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.ERROR_MSG;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.LOCAL_SERVICE;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.OPERATION;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.REMOTE_SERVICE;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.STATUS;
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.STATUS_CODE;
+import static io.meeds.wallet.statistic.StatisticUtils.DURATION;
+import static io.meeds.wallet.statistic.StatisticUtils.ERROR_MSG;
+import static io.meeds.wallet.statistic.StatisticUtils.LOCAL_SERVICE;
+import static io.meeds.wallet.statistic.StatisticUtils.OPERATION;
+import static io.meeds.wallet.statistic.StatisticUtils.REMOTE_SERVICE;
+import static io.meeds.wallet.statistic.StatisticUtils.STATUS;
+import static io.meeds.wallet.statistic.StatisticUtils.STATUS_CODE;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThrows;
@@ -33,17 +33,16 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.meeds.wallet.wallet.statistic.StatisticUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import io.meeds.analytics.model.StatisticData;
 import io.meeds.analytics.model.StatisticData.StatisticStatus;
 import io.meeds.analytics.utils.AnalyticsUtils;
-import io.meeds.wallet.wallet.model.Wallet;
+import io.meeds.wallet.model.Wallet;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class StatisticUtilsTest {
 
   @Test
diff --git a/wallet-api/src/test/java/io/meeds/wallet/utils/WalletUtilsTest.java b/wallet-api/src/test/java/io/meeds/wallet/utils/WalletUtilsTest.java
index 2511446f6..661b618b9 100644
--- a/wallet-api/src/test/java/io/meeds/wallet/utils/WalletUtilsTest.java
+++ b/wallet-api/src/test/java/io/meeds/wallet/utils/WalletUtilsTest.java
@@ -20,8 +20,7 @@
 
 import java.util.Locale;
 
-import io.meeds.wallet.wallet.utils.WalletUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class WalletUtilsTest {
 
diff --git a/wallet-reward-services/pom.xml b/wallet-reward-services/pom.xml
index 703c89b95..3f945c261 100644
--- a/wallet-reward-services/pom.xml
+++ b/wallet-reward-services/pom.xml
@@ -30,12 +30,12 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>wallet-services</artifactId>
+      <artifactId>wallet-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>wallet-api</artifactId>
+      <artifactId>wallet-services</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -60,18 +60,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     </dependency>
 
     <!-- Test dependencies -->
-    <dependency>
-      <groupId>io.meeds.social</groupId>
-      <artifactId>social-component-service</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.meeds.social</groupId>
-      <artifactId>social-component-notification</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/dao/RewardPeriodDAO.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/dao/RewardPeriodDAO.java
index f5c01bcbb..2e0d53cc5 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/dao/RewardPeriodDAO.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/dao/RewardPeriodDAO.java
@@ -20,9 +20,10 @@
 
 import java.util.List;
 
-import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
-import io.meeds.wallet.wallet.model.reward.RewardStatus;
+import io.meeds.wallet.model.RewardPeriodType;
+import io.meeds.wallet.model.RewardStatus;
 import io.meeds.wallet.reward.entity.WalletRewardPeriodEntity;
+
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/entity/WalletRewardPeriodEntity.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/entity/WalletRewardPeriodEntity.java
index b806a52b3..1e6518acf 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/entity/WalletRewardPeriodEntity.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/entity/WalletRewardPeriodEntity.java
@@ -23,8 +23,8 @@
 import lombok.Data;
 import org.hibernate.annotations.DynamicUpdate;
 
-import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
-import io.meeds.wallet.wallet.model.reward.RewardStatus;
+import io.meeds.wallet.model.RewardPeriodType;
+import io.meeds.wallet.model.RewardStatus;
 
 @Entity(name = "RewardPeriod")
 @DynamicUpdate
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListener.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListener.java
index 9b0abec5d..99abfe5c9 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListener.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListener.java
@@ -26,12 +26,14 @@
 
 import io.meeds.analytics.model.StatisticData;
 import io.meeds.analytics.utils.AnalyticsUtils;
+import io.meeds.wallet.model.RewardReport;
+
 import org.exoplatform.commons.api.persistence.ExoTransactional;
 import org.exoplatform.services.listener.Asynchronous;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.listener.ListenerService;
-import io.meeds.wallet.wallet.model.reward.RewardReport;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListener.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListener.java
index 04b5d21d2..5fb309c71 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListener.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListener.java
@@ -16,9 +16,6 @@
  */
 package io.meeds.wallet.reward.listener;
 
-import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_REPORT_NOTIFICATION_PARAM;
-import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_SUCCESS_NOTIFICATION_ID;
-
 import jakarta.annotation.PostConstruct;
 import org.exoplatform.commons.api.notification.NotificationContext;
 import org.exoplatform.commons.api.notification.model.PluginKey;
@@ -28,7 +25,12 @@
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.listener.ListenerService;
-import io.meeds.wallet.wallet.model.reward.RewardReport;
+
+import io.meeds.wallet.model.RewardReport;
+
+import static io.meeds.wallet.utils.RewardUtils.REWARD_REPORT_NOTIFICATION_PARAM;
+import static io.meeds.wallet.utils.RewardUtils.REWARD_SUCCESS_NOTIFICATION_ID;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/TransactionReplacedListener.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/TransactionReplacedListener.java
index fb350fcc8..60c97cae6 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/TransactionReplacedListener.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/listener/TransactionReplacedListener.java
@@ -2,19 +2,19 @@
 
 import java.util.Map;
 
-import io.meeds.common.ContainerTransactional;
-import jakarta.annotation.PostConstruct;
-import org.exoplatform.container.ExoContainerContext;
-import org.exoplatform.container.PortalContainer;
-import org.exoplatform.container.component.RequestLifeCycle;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.listener.ListenerService;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import io.meeds.wallet.reward.service.WalletRewardReportService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+
+import io.meeds.common.ContainerTransactional;
+import io.meeds.wallet.reward.service.RewardReportService;
+
+import jakarta.annotation.PostConstruct;
 
 /**
  * A listener that is triggered when a transaction gets replaced/boosted
@@ -22,15 +22,15 @@
 @Component
 public class TransactionReplacedListener extends Listener<Object, Map<String, String>> {
 
-  private static final Log          LOG        = ExoLogger.getLogger(TransactionReplacedListener.class);
+  private static final Log    LOG        = ExoLogger.getLogger(TransactionReplacedListener.class);
 
-  private static final String       EVENT_NAME = "exo.wallet.transaction.replaced";
+  private static final String EVENT_NAME = "exo.wallet.transaction.replaced";
 
   @Autowired
-  private WalletRewardReportService walletRewardReportService;
+  private RewardReportService rewardReportService;
 
   @Autowired
-  private ListenerService           listenerService;
+  private ListenerService     listenerService;
 
   @PostConstruct
   public void init() {
@@ -46,7 +46,7 @@ public void onEvent(Event<Object, Map<String, String>> event) {
       Map<String, String> transaction = event.getData();
       oldHash = transaction.get("oldHash");
       newHash = transaction.get("hash");
-      walletRewardReportService.replaceRewardTransactions(oldHash, newHash);
+      rewardReportService.replaceRewardTransactions(oldHash, newHash);
     } catch (Exception e) {
       LOG.error("Error while replacing Reward transaction from old hash {} to new hash {}", oldHash, newHash, e);
     }
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessNotificationPlugin.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessNotificationPlugin.java
index 4e6befa41..45916019e 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessNotificationPlugin.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessNotificationPlugin.java
@@ -16,6 +16,9 @@
  */
 package io.meeds.wallet.reward.notification;
 
+import static io.meeds.wallet.utils.RewardUtils.*;
+import static io.meeds.wallet.utils.WalletUtils.*;
+
 import java.util.ArrayList;
 import java.util.Set;
 
@@ -25,12 +28,10 @@
 import org.exoplatform.container.xml.InitParams;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.model.reward.RewardPeriod;
-import io.meeds.wallet.wallet.model.reward.RewardReport;
 
-import static io.meeds.wallet.wallet.utils.RewardUtils.*;
-import static io.meeds.wallet.wallet.utils.WalletUtils.*;
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.RewardPeriod;
+import io.meeds.wallet.model.RewardReport;
 
 public class RewardSuccessNotificationPlugin extends BaseNotificationPlugin {
     private static final Log LOG = ExoLogger.getLogger(RewardSuccessNotificationPlugin.class);
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateBuilder.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateBuilder.java
index 665f3333c..479bf0bf8 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateBuilder.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateBuilder.java
@@ -16,9 +16,9 @@
  */
 package io.meeds.wallet.reward.notification;
 
-import static io.meeds.wallet.wallet.utils.RewardUtils.*;
-import static io.meeds.wallet.wallet.utils.WalletUtils.AMOUNT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.formatNumber;
+import static io.meeds.wallet.utils.RewardUtils.*;
+import static io.meeds.wallet.utils.WalletUtils.AMOUNT;
+import static io.meeds.wallet.utils.WalletUtils.formatNumber;
 
 import java.io.Writer;
 import java.time.ZoneId;
@@ -26,6 +26,7 @@
 import java.util.Locale;
 
 import io.meeds.common.ContainerTransactional;
+import io.meeds.wallet.model.RewardSettings;
 import io.meeds.wallet.reward.service.RewardSettingsService;
 import org.apache.commons.codec.binary.StringUtils;
 
@@ -38,7 +39,6 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.notification.plugin.SocialNotificationUtils;
-import io.meeds.wallet.wallet.model.reward.RewardSettings;
 import org.exoplatform.webui.utils.TimeConvertUtils;
 
 public class RewardSuccessTemplateBuilder extends AbstractTemplateBuilder {
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateProvider.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateProvider.java
index b5243eb65..c7cdcecf6 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateProvider.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateProvider.java
@@ -16,7 +16,7 @@
  */
 package io.meeds.wallet.reward.notification;
 
-import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_SUCCESS_NOTIFICATION_ID;
+import static io.meeds.wallet.utils.RewardUtils.REWARD_SUCCESS_NOTIFICATION_ID;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
similarity index 98%
rename from wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
rename to wallet-reward-services/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
index 0d351ac90..0f4a61fd1 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
@@ -16,6 +16,8 @@
  */
 package io.meeds.wallet.reward.rest;
 
+import static io.meeds.wallet.utils.RewardUtils.timeToSecondsAtDayStart;
+
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -29,7 +31,7 @@
 
 import javax.ws.rs.core.*;
 
-import io.meeds.wallet.wallet.model.reward.*;
+import io.meeds.wallet.model.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -44,10 +46,12 @@
 import org.exoplatform.common.http.HTTPStatus;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
+
 import io.meeds.wallet.reward.service.RewardReportService;
 import io.meeds.wallet.reward.service.RewardSettingsService;
-import io.meeds.wallet.wallet.utils.RewardUtils;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.RewardUtils;
+import io.meeds.wallet.utils.WalletUtils;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.bind.DefaultValue;
 import org.springframework.data.domain.Page;
@@ -58,8 +62,6 @@
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.*;
 
-import static io.meeds.wallet.wallet.utils.RewardUtils.timeToSecondsAtDayStart;
-
 
 @RestController
 @RequestMapping("reward")
diff --git a/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardSettingsREST.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/rest/RewardSettingsREST.java
similarity index 64%
rename from wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardSettingsREST.java
rename to wallet-reward-services/src/main/java/io/meeds/wallet/reward/rest/RewardSettingsREST.java
index dd7239d9d..4891e6417 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/reward/rest/RewardSettingsREST.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/rest/RewardSettingsREST.java
@@ -16,7 +16,6 @@
  */
 package io.meeds.wallet.reward.rest;
 
-
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
@@ -24,12 +23,13 @@
 import org.apache.commons.lang3.StringUtils;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import io.meeds.wallet.wallet.model.reward.RewardPeriod;
-import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
-import io.meeds.wallet.wallet.model.reward.RewardPeriodWithFullDate;
-import io.meeds.wallet.wallet.model.reward.RewardSettings;
+
+import io.meeds.wallet.model.RewardPeriod;
+import io.meeds.wallet.model.RewardPeriodType;
+import io.meeds.wallet.model.RewardPeriodWithFullDate;
+import io.meeds.wallet.model.RewardSettings;
 import io.meeds.wallet.reward.service.RewardSettingsService;
-import io.meeds.wallet.wallet.utils.RewardUtils;
+import io.meeds.wallet.utils.RewardUtils;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -42,7 +42,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
-
 @RestController
 @RequestMapping("settings/reward")
 @Tag(name = "reward/settings", description = "Manage reward module settings") // NOSONAR
@@ -56,13 +55,13 @@ public class RewardSettingsREST {
   @GetMapping
   @Secured("rewarding")
   @Operation(
-          summary = "Get reward settings",
-          method = "GET",
-          description = "returns reward settings object")
+             summary = "Get reward settings",
+             method = "GET",
+             description = "returns reward settings object")
   @ApiResponses(value = {
-      @ApiResponse(responseCode = "200", description = "Request fulfilled"),
-      @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
-      @ApiResponse(responseCode = "500", description = "Internal server error") })
+                          @ApiResponse(responseCode = "200", description = "Request fulfilled"),
+                          @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
+                          @ApiResponse(responseCode = "500", description = "Internal server error") })
   public RewardSettings getSettings() {
     return rewardSettingsService.getSettings();
   }
@@ -70,16 +69,16 @@ public RewardSettings getSettings() {
   @PostMapping
   @Secured("rewarding")
   @Operation(
-          summary = "Get reward settings",
-          method = "POST",
-          description = "returns reward settings object")
+             summary = "Get reward settings",
+             method = "POST",
+             description = "returns reward settings object")
   @ApiResponses(value = {
-      @ApiResponse(responseCode = "200", description = "Request fulfilled"),
-      @ApiResponse(responseCode = "400", description = "Invalid query input"),
-      @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
-      @ApiResponse(responseCode = "500", description = "Internal server error") })
+                          @ApiResponse(responseCode = "200", description = "Request fulfilled"),
+                          @ApiResponse(responseCode = "400", description = "Invalid query input"),
+                          @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
+                          @ApiResponse(responseCode = "500", description = "Internal server error") })
   public Response saveSettings(@RequestBody
-                               RewardSettings rewardSettings) {
+  RewardSettings rewardSettings) {
     try {
       rewardSettingsService.saveSettings(rewardSettings);
       return Response.noContent().build();
@@ -92,8 +91,8 @@ public Response saveSettings(@RequestBody
   @Secured("rewarding")
   @Operation(summary = "Deletes reward settings.", description = "Deletes reward settings.", method = "DELETE")
   @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Request fulfilled"),
-          @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
-          @ApiResponse(responseCode = "500", description = "Internal server error"), })
+                          @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
+                          @ApiResponse(responseCode = "500", description = "Internal server error"), })
   public void deleteSettings() {
     rewardSettingsService.deleteSettings();
   }
@@ -101,17 +100,17 @@ public void deleteSettings() {
   @GetMapping(path = "getDates")
   @Secured("users")
   @Operation(
-          summary = "Get dates corresponding to chosen period type and start date",
-          method = "GET",
-          description = "returns reward period dates object")
+             summary = "Get dates corresponding to chosen period type and start date",
+             method = "GET",
+             description = "returns reward period dates object")
   @ApiResponses(value = {
-      @ApiResponse(responseCode = "200", description = "Request fulfilled"),
-      @ApiResponse(responseCode = "400", description = "Invalid query input"),
-      @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
-      @ApiResponse(responseCode = "500", description = "Internal server error") })
+                          @ApiResponse(responseCode = "200", description = "Request fulfilled"),
+                          @ApiResponse(responseCode = "400", description = "Invalid query input"),
+                          @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
+                          @ApiResponse(responseCode = "500", description = "Internal server error") })
   public Response getRewardDates(@Parameter(description = "A date with format yyyy-MM-dd", required = true)
-                                 @RequestParam("date")
-                                 String date) {
+  @RequestParam("date")
+  String date) {
     if (StringUtils.isBlank(date)) {
       throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Bad request sent to server with empty 'date' parameter");
     }
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/task/RewardStatusVerifierTask.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/task/RewardStatusVerifierTask.java
index 6cf099a19..2b4511008 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/task/RewardStatusVerifierTask.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/task/RewardStatusVerifierTask.java
@@ -17,7 +17,7 @@
  */
 package io.meeds.wallet.reward.scheduling.task;
 
-import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_SUCCESS_EVENT_NAME;
+import static io.meeds.wallet.utils.RewardUtils.REWARD_SUCCESS_EVENT_NAME;
 
 import java.util.List;
 
@@ -25,11 +25,13 @@
 import org.quartz.DisallowConcurrentExecution;
 
 import org.exoplatform.services.listener.ListenerService;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.reward.RewardPeriod;
-import io.meeds.wallet.wallet.model.reward.RewardReport;
+
+import io.meeds.wallet.model.RewardPeriod;
+import io.meeds.wallet.model.RewardReport;
+import io.meeds.wallet.model.Wallet;
 import io.meeds.wallet.reward.service.RewardReportService;
-import io.meeds.wallet.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletAccountService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
index a95302337..b76216097 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
@@ -18,83 +18,95 @@
  */
 package io.meeds.wallet.reward.service;
 
-import static io.meeds.wallet.wallet.model.reward.RewardBudgetType.FIXED_PER_MEMBER;
-import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_TRANSACTION_LABEL_KEY;
-import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_TRANSACTION_NO_POOL_MESSAGE_KEY;
-import static io.meeds.wallet.wallet.utils.RewardUtils.TRANSACTION_STATUS_PENDING;
-import static io.meeds.wallet.wallet.utils.RewardUtils.TRANSACTION_STATUS_SUCCESS;
-import static io.meeds.wallet.wallet.utils.RewardUtils.formatTime;
-import static io.meeds.wallet.wallet.utils.WalletUtils.convertFromDecimals;
-import static io.meeds.wallet.wallet.utils.WalletUtils.formatNumber;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getContractDetail;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getIdentityByTypeAndId;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getLocale;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getResourceBundleKey;
-import static io.meeds.wallet.wallet.utils.WalletUtils.isUserRewardingAdmin;
+import static io.meeds.wallet.model.RewardBudgetType.FIXED_PER_MEMBER;
+import static io.meeds.wallet.utils.RewardUtils.REWARD_TRANSACTION_LABEL_KEY;
+import static io.meeds.wallet.utils.RewardUtils.REWARD_TRANSACTION_NO_POOL_MESSAGE_KEY;
+import static io.meeds.wallet.utils.RewardUtils.TRANSACTION_STATUS_PENDING;
+import static io.meeds.wallet.utils.RewardUtils.TRANSACTION_STATUS_SUCCESS;
+import static io.meeds.wallet.utils.RewardUtils.formatTime;
+import static io.meeds.wallet.utils.WalletUtils.convertFromDecimals;
+import static io.meeds.wallet.utils.WalletUtils.formatNumber;
+import static io.meeds.wallet.utils.WalletUtils.getContractDetail;
+import static io.meeds.wallet.utils.WalletUtils.getIdentityByTypeAndId;
+import static io.meeds.wallet.utils.WalletUtils.getLocale;
+import static io.meeds.wallet.utils.WalletUtils.getResourceBundleKey;
+import static io.meeds.wallet.utils.WalletUtils.isUserRewardingAdmin;
 
 import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.*;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.stream.Collectors;
 
-import io.meeds.gamification.constant.IdentityType;
-import io.meeds.gamification.model.filter.RealizationFilter;
-import io.meeds.gamification.service.RealizationService;
-import io.meeds.wallet.wallet.model.reward.*;
+
+import io.meeds.wallet.model.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
 
 import org.exoplatform.commons.api.persistence.ExoTransactional;
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.identity.model.Identity;
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.WalletType;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+
+import io.meeds.gamification.constant.IdentityType;
+import io.meeds.gamification.model.filter.RealizationFilter;
+import io.meeds.gamification.service.RealizationService;
 import io.meeds.wallet.reward.storage.WalletRewardReportStorage;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletTokenAdminService;
 
 import lombok.Setter;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
 
 /**
  * A service to manage reward reports
  */
 @Primary
-@Service
+@Service("rewardReportService")
 public class WalletRewardReportService implements RewardReportService {
 
   private static final Log          LOG            = ExoLogger.getLogger(WalletRewardReportService.class);
 
   private static final String       EMPTY_SETTINGS = "Error computing rewards using empty settings";
 
-  @Autowired
   private WalletAccountService      walletAccountService;
 
-  @Autowired
   private WalletTokenAdminService   walletTokenAdminService;
 
-  @Autowired
   private RewardSettingsService     rewardSettingsService;
 
-  @Autowired
   private WalletRewardReportStorage rewardReportStorage;
 
-  @Autowired
   private RealizationService        realizationService;
 
   @Setter
   private boolean                   rewardSendingInProgress;
 
+  public WalletRewardReportService(WalletAccountService walletAccountService,
+                                   WalletTokenAdminService walletTokenAdminService,
+                                   RewardSettingsService rewardSettingsService,
+                                   WalletRewardReportStorage rewardReportStorage,
+                                   RealizationService realizationService) {
+    this.walletAccountService = walletAccountService;
+    this.walletTokenAdminService = walletTokenAdminService;
+    this.rewardSettingsService = rewardSettingsService;
+    this.rewardReportStorage = rewardReportStorage;
+    this.realizationService = realizationService;
+  }
+
   @Override
   public void sendRewards(LocalDate date, String username) throws Exception { // NOSONAR
     if (!isUserRewardingAdmin(username)) {
@@ -112,8 +124,8 @@ public void sendRewards(LocalDate date, String username) throws Exception { // N
     if (rewardReport.getPendingTransactionCount() > 0) {
       String startDateFormatted = rewardReport.getPeriod().getStartDateFormatted(Locale.getDefault().getLanguage());
       String endDateFormatted = rewardReport.getPeriod().getEndDateFormatted(Locale.getDefault().getLanguage());
-      throw new IllegalStateException("There are some pending transactions for rewards of period between " + startDateFormatted
-          + " and " + endDateFormatted + ", thus no reward sending is allowed until the transactions finishes");
+      throw new IllegalStateException("There are some pending transactions for rewards of period between " + startDateFormatted +
+          " and " + endDateFormatted + ", thus no reward sending is allowed until the transactions finishes");
     }
 
     String adminWalletAddress = getTokenAdminService().getAdminWalletAddress();
@@ -125,7 +137,8 @@ public void sendRewards(LocalDate date, String username) throws Exception { // N
     Iterator<WalletReward> rewardedWalletsIterator = rewards.iterator();
     while (rewardedWalletsIterator.hasNext()) {
       WalletReward walletReward = rewardedWalletsIterator.next();
-      if (walletReward == null || !walletReward.isEnabled() || walletReward.getAmount() == 0
+      if (walletReward == null || !walletReward.isEnabled()
+          || walletReward.getAmount() == 0
           || (walletReward.getTransaction() != null
               && (walletReward.getTransaction().isPending() || walletReward.getTransaction().isSucceeded()))) {
         rewardedWalletsIterator.remove();
@@ -133,8 +146,8 @@ public void sendRewards(LocalDate date, String username) throws Exception { // N
       }
 
       if (walletReward.getAmount() < 0) {
-        throw new IllegalStateException("Can't send reward transaction for wallet of " + walletReward.getWallet().getType() + " "
-            + walletReward.getWallet().getId() + " with a negative amount" + walletReward.getAmount());
+        throw new IllegalStateException("Can't send reward transaction for wallet of " + walletReward.getWallet().getType() +
+            " " + walletReward.getWallet().getId() + " with a negative amount" + walletReward.getAmount());
       }
       // If the tokens are already sent, then ignore sending rewards to user
       // If the sent transaction is pending, an exception is thrown ate the
@@ -412,7 +425,7 @@ private Set<WalletReward> retrieveWalletRewards(RewardReport rewardReport, Set<W
     for (Wallet wallet : wallets) {
       List<WalletReward> walletRewardList = walletRewards.stream()
                                                          .filter(wr -> wallet != null && wr.getWallet() != null
-                                                             && wr.getIdentityId() == wallet.getTechnicalId())
+                                                                       && wr.getIdentityId() == wallet.getTechnicalId())
                                                          .toList();
       WalletReward walletReward =
                                 walletRewardList.stream()
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardSettingsService.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardSettingsService.java
index 5b92b6b76..7e101d3c1 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardSettingsService.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardSettingsService.java
@@ -18,24 +18,28 @@
  */
 package io.meeds.wallet.reward.service;
 
-import static io.meeds.wallet.wallet.utils.RewardUtils.*;
-import static io.meeds.wallet.wallet.utils.WalletUtils.fromJsonString;
-import static io.meeds.wallet.wallet.utils.WalletUtils.toJsonString;
+import static io.meeds.wallet.utils.RewardUtils.REWARD_CONTEXT;
+import static io.meeds.wallet.utils.RewardUtils.REWARD_SCOPE;
+import static io.meeds.wallet.utils.RewardUtils.REWARD_SETTINGS_KEY_NAME;
+import static io.meeds.wallet.utils.WalletUtils.fromJsonString;
+import static io.meeds.wallet.utils.WalletUtils.toJsonString;
 
-import java.util.*;
+import java.util.Objects;
 
-import io.meeds.wallet.wallet.model.reward.RewardSettings;
-import org.exoplatform.commons.api.settings.SettingService;
-import org.exoplatform.commons.api.settings.SettingValue;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+
+import org.exoplatform.commons.api.settings.SettingService;
+import org.exoplatform.commons.api.settings.SettingValue;
+
+import io.meeds.wallet.model.RewardSettings;
 
 /**
  * A storage service to save/load reward transactions
  */
-@Service
 @Primary
+@Service("rewardSettingsService")
 public class WalletRewardSettingsService implements RewardSettingsService {
 
   @Autowired
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/storage/WalletRewardReportStorage.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/storage/WalletRewardReportStorage.java
index fc9ebacc6..45a8d1cc0 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/storage/WalletRewardReportStorage.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/storage/WalletRewardReportStorage.java
@@ -32,19 +32,21 @@
 
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.reward.RewardPeriod;
-import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
-import io.meeds.wallet.wallet.model.reward.RewardReport;
-import io.meeds.wallet.wallet.model.reward.RewardStatus;
-import io.meeds.wallet.wallet.model.reward.WalletReward;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+
+import io.meeds.wallet.model.RewardPeriod;
+import io.meeds.wallet.model.RewardPeriodType;
+import io.meeds.wallet.model.RewardReport;
+import io.meeds.wallet.model.RewardStatus;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletReward;
 import io.meeds.wallet.reward.dao.RewardDAO;
 import io.meeds.wallet.reward.dao.RewardPeriodDAO;
 import io.meeds.wallet.reward.entity.WalletRewardEntity;
 import io.meeds.wallet.reward.entity.WalletRewardPeriodEntity;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletTransactionService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseRewardTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseRewardTest.java
index 12b620d3a..15718a386 100644
--- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseRewardTest.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseRewardTest.java
@@ -19,9 +19,10 @@
  */
 package io.meeds.wallet.reward;
 
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.service.WalletService;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.service.WalletService;
+import io.meeds.wallet.utils.WalletUtils;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseWalletRewardTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseWalletRewardTest.java
index 1ca3872ff..bfbf4fc19 100644
--- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseWalletRewardTest.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseWalletRewardTest.java
@@ -30,6 +30,10 @@
 import io.meeds.wallet.reward.dao.RewardPeriodDAO;
 import io.meeds.wallet.reward.service.RewardSettingsService;
 import io.meeds.wallet.reward.service.WalletRewardSettingsService;
+import io.meeds.wallet.service.WalletService;
+import io.meeds.wallet.utils.RewardUtils;
+import io.meeds.wallet.utils.WalletUtils;
+
 import org.junit.After;
 import org.junit.Before;
 import org.mockito.Mockito;
@@ -51,19 +55,16 @@
 import io.meeds.wallet.entity.TransactionEntity;
 import io.meeds.wallet.entity.WalletEntity;
 import io.meeds.wallet.entity.WalletPrivateKeyEntity;
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.WalletAddressLabel;
-import io.meeds.wallet.wallet.model.WalletProvider;
-import io.meeds.wallet.wallet.model.WalletState;
-import io.meeds.wallet.wallet.model.reward.RewardBudgetType;
-import io.meeds.wallet.wallet.model.reward.RewardSettings;
-import io.meeds.wallet.wallet.model.reward.RewardTeam;
-import io.meeds.wallet.wallet.model.reward.RewardTeamMember;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.WalletService;
-import io.meeds.wallet.wallet.utils.RewardUtils;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.RewardBudgetType;
+import io.meeds.wallet.model.RewardSettings;
+import io.meeds.wallet.model.RewardTeam;
+import io.meeds.wallet.model.RewardTeamMember;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletAddressLabel;
+import io.meeds.wallet.model.WalletProvider;
+import io.meeds.wallet.model.WalletState;
 
 public abstract class BaseWalletRewardTest extends AbstractKernelTest {
 
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListenerTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListenerTest.java
index 3c26b12d0..3ecc33c61 100644
--- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListenerTest.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListenerTest.java
@@ -21,9 +21,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import io.meeds.wallet.wallet.model.reward.RewardPeriod;
-import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
-import io.meeds.wallet.wallet.model.reward.WalletReward;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.MockedStatic;
@@ -34,10 +31,13 @@
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.ListenerService;
-import io.meeds.wallet.wallet.model.reward.RewardReport;
 
 import io.meeds.analytics.model.StatisticData;
 import io.meeds.analytics.utils.AnalyticsUtils;
+import io.meeds.wallet.model.RewardPeriod;
+import io.meeds.wallet.model.RewardPeriodType;
+import io.meeds.wallet.model.RewardReport;
+import io.meeds.wallet.model.WalletReward;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.*;
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java
index 90b147d52..bda70bd51 100644
--- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java
@@ -18,8 +18,8 @@
  */
 package io.meeds.wallet.reward.listener;
 
-import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_REPORT_NOTIFICATION_PARAM;
-import static io.meeds.wallet.wallet.utils.RewardUtils.REWARD_SUCCESS_NOTIFICATION_ID;
+import static io.meeds.wallet.utils.RewardUtils.REWARD_REPORT_NOTIFICATION_PARAM;
+import static io.meeds.wallet.utils.RewardUtils.REWARD_SUCCESS_NOTIFICATION_ID;
 import static org.mockito.Mockito.*;
 
 import org.exoplatform.commons.api.notification.command.NotificationCommand;
@@ -37,7 +37,8 @@
 import org.exoplatform.commons.notification.impl.NotificationContextImpl;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.ListenerService;
-import io.meeds.wallet.wallet.model.reward.RewardReport;
+
+import io.meeds.wallet.model.RewardReport;
 
 @SpringBootTest(classes = { RewardSucceedNotificationListener.class })
 class RewardSucceedNotificationListenerTest {
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/TransactionReplacedListenerTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/TransactionReplacedListenerTest.java
index 3cf3018a6..930c0f1af 100644
--- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/TransactionReplacedListenerTest.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/TransactionReplacedListenerTest.java
@@ -30,26 +30,26 @@
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.ListenerService;
 
-import io.meeds.wallet.reward.service.WalletRewardReportService;
+import io.meeds.wallet.reward.service.RewardReportService;
 
 import static org.mockito.Mockito.*;
 
-@SpringBootTest(classes = {TransactionReplacedListener.class})
+@SpringBootTest(classes = { TransactionReplacedListener.class })
 class TransactionReplacedListenerTest {
 
-  private static final String EVENT_NAME = "exo.wallet.transaction.replaced";
+  private static final String                EVENT_NAME = "exo.wallet.transaction.replaced";
 
   @MockBean
-  private ListenerService listenerService;
+  private ListenerService                    listenerService;
 
   @MockBean
-  private WalletRewardReportService walletRewardReportService;
+  private RewardReportService                rewardReportService;
 
   @MockBean
   private Event<Object, Map<String, String>> event;
 
   @Autowired
-  private TransactionReplacedListener transactionReplacedListener;
+  private TransactionReplacedListener        transactionReplacedListener;
 
   @BeforeEach
   void setUp() {
@@ -73,8 +73,6 @@ void testOnEvent() {
     transactionReplacedListener.onEvent(event);
 
     // Then
-    verify(walletRewardReportService).replaceRewardTransactions("oldHashValue", "newHashValue");
+    verify(rewardReportService).replaceRewardTransactions("oldHashValue", "newHashValue");
   }
 }
-
-
diff --git a/wallet-api/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java
similarity index 95%
rename from wallet-api/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java
rename to wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java
index dd062fb2e..140756618 100644
--- a/wallet-api/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java
@@ -18,23 +18,20 @@
  */
 package io.meeds.wallet.reward.rest;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import com.fasterxml.jackson.core.json.JsonReadFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import lombok.SneakyThrows;
-import io.meeds.wallet.wallet.model.reward.RewardPeriod;
-import io.meeds.wallet.reward.service.RewardReportService;
-import io.meeds.wallet.reward.service.RewardSettingsService;
-import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
-import io.meeds.wallet.wallet.model.reward.RewardReport;
-import io.meeds.wallet.wallet.model.reward.RewardSettings;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.List;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -56,13 +53,23 @@
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
+import com.fasterxml.jackson.core.json.JsonReadFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
 import io.meeds.spring.web.security.PortalAuthenticationManager;
 import io.meeds.spring.web.security.WebSecurityConfiguration;
-import jakarta.servlet.Filter;
+import io.meeds.wallet.model.RewardPeriod;
+import io.meeds.wallet.model.RewardPeriodType;
+import io.meeds.wallet.model.RewardReport;
+import io.meeds.wallet.model.RewardSettings;
+import io.meeds.wallet.reward.service.RewardReportService;
+import io.meeds.wallet.reward.service.RewardSettingsService;
 
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.util.List;
+import jakarta.servlet.Filter;
+import lombok.SneakyThrows;
 
 @SpringBootTest(classes = { RewardReportREST.class, PortalAuthenticationManager.class, })
 @ContextConfiguration(classes = { WebSecurityConfiguration.class })
diff --git a/wallet-api/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java
similarity index 94%
rename from wallet-api/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java
rename to wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java
index a0805135f..dd880e61d 100644
--- a/wallet-api/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java
@@ -18,21 +18,17 @@
  */
 package io.meeds.wallet.reward.rest;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import com.fasterxml.jackson.core.json.JsonReadFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import lombok.SneakyThrows;
-import io.meeds.wallet.wallet.model.reward.RewardBudgetType;
-import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
-import io.meeds.wallet.wallet.model.reward.RewardSettings;
-import io.meeds.wallet.reward.service.RewardSettingsService;
+import java.time.ZoneId;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -52,11 +48,21 @@
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
+import com.fasterxml.jackson.core.json.JsonReadFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
 import io.meeds.spring.web.security.PortalAuthenticationManager;
 import io.meeds.spring.web.security.WebSecurityConfiguration;
-import jakarta.servlet.Filter;
+import io.meeds.wallet.model.RewardBudgetType;
+import io.meeds.wallet.model.RewardPeriodType;
+import io.meeds.wallet.model.RewardSettings;
+import io.meeds.wallet.reward.service.RewardSettingsService;
 
-import java.time.ZoneId;
+import jakarta.servlet.Filter;
+import lombok.SneakyThrows;
 
 @SpringBootTest(classes = { RewardSettingsREST.class, PortalAuthenticationManager.class, })
 @ContextConfiguration(classes = { WebSecurityConfiguration.class })
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardReportServiceTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardReportServiceTest.java
index 6c9a4f9e0..2f3e9a5fb 100644
--- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardReportServiceTest.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardReportServiceTest.java
@@ -24,15 +24,17 @@
 
 import io.meeds.gamification.model.filter.RealizationFilter;
 import io.meeds.gamification.service.RealizationService;
-import io.meeds.wallet.wallet.model.WalletState;
+
 import org.junit.jupiter.api.Test;
 
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.reward.RewardReport;
-import io.meeds.wallet.wallet.model.reward.RewardSettings;
+import io.meeds.wallet.model.RewardReport;
+import io.meeds.wallet.model.RewardSettings;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletState;
 import io.meeds.wallet.reward.storage.WalletRewardReportStorage;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletTokenAdminService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -52,7 +54,7 @@ public class WalletRewardReportServiceTest { // NOSONAR
   private WalletTokenAdminService   walletTokenAdminService;
 
   @MockBean
-  private RewardSettingsService rewardSettingsService;
+  private RewardSettingsService     rewardSettingsService;
 
   @MockBean
   private WalletRewardReportStorage rewardReportStorage;
@@ -61,7 +63,7 @@ public class WalletRewardReportServiceTest { // NOSONAR
   private RealizationService        realizationService;
 
   @Autowired
-  private RewardReportService rewardReportService;
+  private RewardReportService       rewardReportService;
 
   @Test
   public void testComputeRewards() {
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardSettingsServiceTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardSettingsServiceTest.java
index b126f2a80..338990414 100644
--- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardSettingsServiceTest.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardSettingsServiceTest.java
@@ -21,16 +21,17 @@
 import com.google.javascript.jscomp.jarjar.com.google.common.base.Objects;
 import org.exoplatform.commons.api.settings.SettingService;
 import org.exoplatform.commons.api.settings.SettingValue;
-import org.junit.jupiter.api.Test;
 
-import io.meeds.wallet.wallet.model.reward.RewardBudgetType;
-import io.meeds.wallet.wallet.model.reward.RewardPeriodType;
-import io.meeds.wallet.wallet.model.reward.RewardSettings;
+import io.meeds.wallet.model.RewardBudgetType;
+import io.meeds.wallet.model.RewardPeriodType;
+import io.meeds.wallet.model.RewardSettings;
+
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.toJsonString;
+import static io.meeds.wallet.utils.WalletUtils.toJsonString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/wallet-services/pom.xml b/wallet-services/pom.xml
index fc717804c..edc274075 100644
--- a/wallet-services/pom.xml
+++ b/wallet-services/pom.xml
@@ -25,7 +25,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <artifactId>wallet-services</artifactId>
   <name>Meeds:: Add-on:: Wallet - Services</name>
   <properties>
-    <exo.test.coverage.ratio>0.60</exo.test.coverage.ratio>
+    <exo.test.coverage.ratio>0.54</exo.test.coverage.ratio>
   </properties>
   <dependencies>
     <dependency>
diff --git a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/ContractTransactionMinedListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/ContractTransactionMinedListener.java
index a98c1bc03..f6d5cc4dd 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/ContractTransactionMinedListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/ContractTransactionMinedListener.java
@@ -21,10 +21,11 @@
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import io.meeds.wallet.wallet.model.ContractTransactionEvent;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import io.meeds.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.service.WalletTransactionService;
 
 /**
  * Triggered when a contract transaction is mined. This listener will not be
diff --git a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionMinedAndUpdatedListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionMinedAndUpdatedListener.java
index 44e148d7e..c24b94233 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionMinedAndUpdatedListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionMinedAndUpdatedListener.java
@@ -25,9 +25,10 @@
 import org.exoplatform.services.listener.Asynchronous;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.service.WalletTransactionService;
 
 /**
  * This listener will be triggered when a transaction is mined and updated on
diff --git a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionMinedListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionMinedListener.java
index 82a985a70..b3cfc97df 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionMinedListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionMinedListener.java
@@ -16,8 +16,8 @@
  */
 package io.meeds.wallet.blockchain.listener;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.ETHER_FUNC_SEND_FUNDS;
-import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_MINED_AND_UPDATED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.ETHER_FUNC_SEND_FUNDS;
+import static io.meeds.wallet.utils.WalletUtils.TRANSACTION_MINED_AND_UPDATED_EVENT;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -31,10 +31,11 @@
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.listener.ListenerService;
 import org.exoplatform.wallet.contract.MeedsToken;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletTransactionService;
 
 /**
  * A listener that is triggered once a transaction is mined. It will update the
diff --git a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionSentToBlockchainListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionSentToBlockchainListener.java
index 7677a62fe..cd704a4b0 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionSentToBlockchainListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionSentToBlockchainListener.java
@@ -2,9 +2,10 @@
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.service.WalletTransactionService;
 
 /**
  * A listener that will be triggered when a transaction is effectively sent to
diff --git a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionWithNonceVerifierListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionWithNonceVerifierListener.java
index 47218424b..bd2cf3b30 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionWithNonceVerifierListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/TransactionWithNonceVerifierListener.java
@@ -25,10 +25,11 @@
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.service.WalletTransactionService;
 
 /**
  * A listener that is triggered once a contract transaction is mined. It will
diff --git a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketContractListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketContractListener.java
index 26502a1e2..bfcc0709f 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketContractListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketContractListener.java
@@ -19,7 +19,8 @@
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
-import io.meeds.wallet.wallet.model.ContractDetail;
+
+import io.meeds.wallet.model.ContractDetail;
 import io.meeds.wallet.service.WalletWebSocketService;
 
 public class WebSocketContractListener extends Listener<Object, ContractDetail> {
diff --git a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketTransactionListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketTransactionListener.java
index 56c887669..b0d28776b 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketTransactionListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketTransactionListener.java
@@ -19,7 +19,8 @@
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+
+import io.meeds.wallet.model.TransactionDetail;
 import io.meeds.wallet.service.WalletWebSocketService;
 
 public class WebSocketTransactionListener extends Listener<Object, TransactionDetail> {
diff --git a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketWalletListener.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketWalletListener.java
index a9a270911..9a48e7479 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketWalletListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/listener/WebSocketWalletListener.java
@@ -19,7 +19,8 @@
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
-import io.meeds.wallet.wallet.model.Wallet;
+
+import io.meeds.wallet.model.Wallet;
 import io.meeds.wallet.service.WalletWebSocketService;
 
 public class WebSocketWalletListener extends Listener<Object, Object> {
diff --git a/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumBlockchainTransactionService.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumBlockchainTransactionService.java
index f75443354..a3a5de4a8 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumBlockchainTransactionService.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumBlockchainTransactionService.java
@@ -16,16 +16,16 @@
  */
 package io.meeds.wallet.blockchain.service;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.EMPTY_HASH;
-import static io.meeds.wallet.wallet.utils.WalletUtils.ETHER_TO_WEI_DECIMALS;
-import static io.meeds.wallet.wallet.utils.WalletUtils.LAST_BLOCK_NUMBER_KEY_NAME;
-import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_EFFECTIVELY_SENT_CODE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_SENT_TO_BLOCKCHAIN_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_CONTEXT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_SCOPE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getContractDetail;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getNetworkId;
-import static io.meeds.wallet.wallet.utils.WalletUtils.isWalletEmpty;
+import static io.meeds.wallet.utils.WalletUtils.EMPTY_HASH;
+import static io.meeds.wallet.utils.WalletUtils.ETHER_TO_WEI_DECIMALS;
+import static io.meeds.wallet.utils.WalletUtils.LAST_BLOCK_NUMBER_KEY_NAME;
+import static io.meeds.wallet.utils.WalletUtils.TRANSACTION_EFFECTIVELY_SENT_CODE;
+import static io.meeds.wallet.utils.WalletUtils.TRANSACTION_SENT_TO_BLOCKCHAIN_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_CONTEXT;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_SCOPE;
+import static io.meeds.wallet.utils.WalletUtils.getContractDetail;
+import static io.meeds.wallet.utils.WalletUtils.getNetworkId;
+import static io.meeds.wallet.utils.WalletUtils.isWalletEmpty;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -71,15 +71,16 @@
 import org.exoplatform.services.log.Log;
 import io.meeds.wallet.blockchain.BlockchainRequestException;
 import io.meeds.wallet.blockchain.MaxRequestRateReachedException;
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletService;
+import io.meeds.wallet.service.WalletTransactionService;
+
 import org.exoplatform.wallet.contract.MeedsToken;
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.model.ContractTransactionEvent;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
 
 public class EthereumBlockchainTransactionService implements BlockchainTransactionService, Startable {
 
diff --git a/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumClientConnector.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumClientConnector.java
index 5c6047062..8d9bb4323 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumClientConnector.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumClientConnector.java
@@ -16,23 +16,23 @@
  */
 package io.meeds.wallet.blockchain.service;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.CONTRACT_TRANSACTION_MINED_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GWEI_TO_WEI_DECIMALS;
-import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_ETHER_BALANCE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_FILTER_CHANGES;
-import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_FILTER_LOGS;
-import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_GAS_PRICE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_LAST_BLOCK_NUMBER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_TRANSACTION;
-import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_TRANSACTION_COUNT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_GET_TRANSACTION_RECEIPT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_NEW_FILTER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_SEND_TRANSACTION;
-import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_UNINSTALL_FILTER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.convertFromDecimals;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getContractAddress;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getNetworkId;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getWebsocketURL;
+import static io.meeds.wallet.utils.WalletUtils.CONTRACT_TRANSACTION_MINED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.GWEI_TO_WEI_DECIMALS;
+import static io.meeds.wallet.utils.WalletUtils.OPERATION_GET_ETHER_BALANCE;
+import static io.meeds.wallet.utils.WalletUtils.OPERATION_GET_FILTER_CHANGES;
+import static io.meeds.wallet.utils.WalletUtils.OPERATION_GET_FILTER_LOGS;
+import static io.meeds.wallet.utils.WalletUtils.OPERATION_GET_GAS_PRICE;
+import static io.meeds.wallet.utils.WalletUtils.OPERATION_GET_LAST_BLOCK_NUMBER;
+import static io.meeds.wallet.utils.WalletUtils.OPERATION_GET_TRANSACTION;
+import static io.meeds.wallet.utils.WalletUtils.OPERATION_GET_TRANSACTION_COUNT;
+import static io.meeds.wallet.utils.WalletUtils.OPERATION_GET_TRANSACTION_RECEIPT;
+import static io.meeds.wallet.utils.WalletUtils.OPERATION_NEW_FILTER;
+import static io.meeds.wallet.utils.WalletUtils.OPERATION_SEND_TRANSACTION;
+import static io.meeds.wallet.utils.WalletUtils.OPERATION_UNINSTALL_FILTER;
+import static io.meeds.wallet.utils.WalletUtils.convertFromDecimals;
+import static io.meeds.wallet.utils.WalletUtils.getContractAddress;
+import static io.meeds.wallet.utils.WalletUtils.getNetworkId;
+import static io.meeds.wallet.utils.WalletUtils.getWebsocketURL;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -75,12 +75,13 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.wallet.contract.MeedsToken;
-import io.meeds.wallet.wallet.model.ContractTransactionEvent;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.statistic.ExoWalletStatistic;
-import io.meeds.wallet.wallet.statistic.ExoWalletStatisticService;
 
 import io.meeds.wallet.lock.Lock;
+import io.meeds.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.statistic.ExoWalletStatistic;
+import io.meeds.wallet.statistic.ExoWalletStatisticService;
+
 import io.reactivex.Flowable;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.exceptions.UndeliverableException;
diff --git a/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumWalletTokenAdminService.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumWalletTokenAdminService.java
index a5f1b1327..5ef996f97 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumWalletTokenAdminService.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumWalletTokenAdminService.java
@@ -16,18 +16,18 @@
  */
 package io.meeds.wallet.blockchain.service;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.ETHER_TO_WEI_DECIMALS;
-import static io.meeds.wallet.wallet.utils.WalletUtils.OPERATION_READ_FROM_TOKEN;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_ADMIN_REMOTE_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.convertFromDecimals;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getContractDetail;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getGasLimit;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getIdentityByTypeAndId;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getNetworkId;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getSettings;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getWebsocketURL;
-import static io.meeds.wallet.wallet.utils.WalletUtils.isUserRewardingAdmin;
-import static io.meeds.wallet.wallet.utils.WalletUtils.toJsonString;
+import static io.meeds.wallet.utils.WalletUtils.ETHER_TO_WEI_DECIMALS;
+import static io.meeds.wallet.utils.WalletUtils.OPERATION_READ_FROM_TOKEN;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_ADMIN_REMOTE_ID;
+import static io.meeds.wallet.utils.WalletUtils.convertFromDecimals;
+import static io.meeds.wallet.utils.WalletUtils.getContractDetail;
+import static io.meeds.wallet.utils.WalletUtils.getGasLimit;
+import static io.meeds.wallet.utils.WalletUtils.getIdentityByTypeAndId;
+import static io.meeds.wallet.utils.WalletUtils.getNetworkId;
+import static io.meeds.wallet.utils.WalletUtils.getSettings;
+import static io.meeds.wallet.utils.WalletUtils.getWebsocketURL;
+import static io.meeds.wallet.utils.WalletUtils.isUserRewardingAdmin;
+import static io.meeds.wallet.utils.WalletUtils.toJsonString;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -83,18 +83,19 @@
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.identity.model.Identity;
 import org.exoplatform.wallet.contract.MeedsToken;
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.WalletType;
-import io.meeds.wallet.wallet.model.settings.GlobalSettings;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletContractService;
-import io.meeds.wallet.wallet.service.WalletService;
-import io.meeds.wallet.wallet.service.WalletTokenAdminService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
-import io.meeds.wallet.wallet.statistic.ExoWalletStatistic;
-import io.meeds.wallet.wallet.statistic.ExoWalletStatisticService;
+
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.GlobalSettings;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletType;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletContractService;
+import io.meeds.wallet.service.WalletService;
+import io.meeds.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.service.WalletTransactionService;
+import io.meeds.wallet.statistic.ExoWalletStatistic;
+import io.meeds.wallet.statistic.ExoWalletStatisticService;
 import io.meeds.wallet.storage.WalletStorage;
 
 public class EthereumWalletTokenAdminService implements WalletTokenAdminService, Startable, ExoWalletStatisticService {
diff --git a/wallet-services/src/main/java/io/meeds/wallet/entity/WalletEntity.java b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletEntity.java
index fce6e598f..437e48ce6 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/entity/WalletEntity.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletEntity.java
@@ -21,12 +21,13 @@
 
 import jakarta.persistence.*;
 
-import io.meeds.wallet.wallet.model.WalletProvider;
-import io.meeds.wallet.wallet.model.WalletState;
 import org.hibernate.annotations.DynamicUpdate;
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
-import io.meeds.wallet.wallet.model.WalletType;
+
+import io.meeds.wallet.model.WalletProvider;
+import io.meeds.wallet.model.WalletState;
+import io.meeds.wallet.model.WalletType;
 
 @Entity(name = "Wallet")
 @ExoEntity
diff --git a/wallet-services/src/main/java/io/meeds/wallet/job/BoostAdminTransactionJob.java b/wallet-services/src/main/java/io/meeds/wallet/job/BoostAdminTransactionJob.java
index fd61e1569..3d41c2682 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/job/BoostAdminTransactionJob.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/job/BoostAdminTransactionJob.java
@@ -27,7 +27,8 @@
 import org.exoplatform.container.component.RequestLifeCycle;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import io.meeds.wallet.wallet.service.WalletTokenAdminService;
+
+import io.meeds.wallet.service.WalletTokenAdminService;
 
 @DisallowConcurrentExecution
 public class BoostAdminTransactionJob implements Job {
diff --git a/wallet-services/src/main/java/io/meeds/wallet/job/PendingEtherTransactionVerifierJob.java b/wallet-services/src/main/java/io/meeds/wallet/job/PendingEtherTransactionVerifierJob.java
index 3c2b133b4..d4a056b81 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/job/PendingEtherTransactionVerifierJob.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/job/PendingEtherTransactionVerifierJob.java
@@ -30,11 +30,12 @@
 import org.exoplatform.container.component.RequestLifeCycle;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletTransactionService;
 
 /**
  * A job that will refresh periodically ether transactions sent by admin wallet
diff --git a/wallet-services/src/main/java/io/meeds/wallet/job/TransactionSenderJob.java b/wallet-services/src/main/java/io/meeds/wallet/job/TransactionSenderJob.java
index 890ed71dd..d6434cb9c 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/job/TransactionSenderJob.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/job/TransactionSenderJob.java
@@ -27,7 +27,8 @@
 import org.exoplatform.container.component.RequestLifeCycle;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+
+import io.meeds.wallet.service.BlockchainTransactionService;
 
 @DisallowConcurrentExecution
 public class TransactionSenderJob implements Job {
diff --git a/wallet-services/src/main/java/io/meeds/wallet/listener/AutoTransactionListener.java b/wallet-services/src/main/java/io/meeds/wallet/listener/AutoTransactionListener.java
index 6a9d8a648..2238087ca 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/listener/AutoTransactionListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/listener/AutoTransactionListener.java
@@ -8,13 +8,14 @@
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.WalletState;
-import io.meeds.wallet.wallet.model.settings.InitialFundsSettings;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletService;
-import io.meeds.wallet.wallet.service.WalletTokenAdminService;
+
+import io.meeds.wallet.model.InitialFundsSettings;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletState;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletService;
+import io.meeds.wallet.service.WalletTokenAdminService;
 
 @Asynchronous
 public class AutoTransactionListener extends Listener<Object, String> {
diff --git a/wallet-services/src/main/java/io/meeds/wallet/listener/GamificationWalletInitializationListener.java b/wallet-services/src/main/java/io/meeds/wallet/listener/GamificationWalletInitializationListener.java
index bff0d370b..d0044061e 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/listener/GamificationWalletInitializationListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/listener/GamificationWalletInitializationListener.java
@@ -17,14 +17,14 @@
  */
 package io.meeds.wallet.listener;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_BROADCAST_ACTION_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_CREATE_WALLET_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_EARNER_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_EVENT_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_TYPE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_RECEIVER_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_WALLET_OBJECT_TYPE;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_BROADCAST_ACTION_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_CREATE_WALLET_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_EARNER_ID;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_EVENT_ID;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_ID;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_TYPE;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_RECEIVER_ID;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_WALLET_OBJECT_TYPE;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,7 +33,8 @@
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.listener.ListenerService;
-import io.meeds.wallet.wallet.model.Wallet;
+
+import io.meeds.wallet.model.Wallet;
 
 @Asynchronous
 public class GamificationWalletInitializationListener extends Listener<Object, Object> {
diff --git a/wallet-services/src/main/java/io/meeds/wallet/listener/TransactionCreatedListener.java b/wallet-services/src/main/java/io/meeds/wallet/listener/TransactionCreatedListener.java
index a78bb1f47..4f109bff2 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/listener/TransactionCreatedListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/listener/TransactionCreatedListener.java
@@ -16,15 +16,16 @@
  */
 package io.meeds.wallet.listener;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_SENT_TO_BLOCKCHAIN_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.TRANSACTION_SENT_TO_BLOCKCHAIN_EVENT;
 
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.listener.ListenerService;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.service.WalletTransactionService;
 
 public class TransactionCreatedListener extends Listener<Object, TransactionDetail> {
 
diff --git a/wallet-services/src/main/java/io/meeds/wallet/listener/TransactionNotificationListener.java b/wallet-services/src/main/java/io/meeds/wallet/listener/TransactionNotificationListener.java
index db3a71b4c..fc8d532fe 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/listener/TransactionNotificationListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/listener/TransactionNotificationListener.java
@@ -16,6 +16,8 @@
  */
 package io.meeds.wallet.listener;
 
+import static io.meeds.wallet.utils.WalletUtils.*;
+
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.api.notification.NotificationContext;
@@ -28,14 +30,13 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.service.LinkProvider;
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.model.transaction.TransactionNotificationType;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
-
-import static io.meeds.wallet.wallet.utils.WalletUtils.*;
+
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.TransactionNotificationType;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletTransactionService;
 
 /**
  * A listener that is triggered when a watched transaction by the addon is mined
diff --git a/wallet-services/src/main/java/io/meeds/wallet/listener/WalletDeletedListener.java b/wallet-services/src/main/java/io/meeds/wallet/listener/WalletDeletedListener.java
index be2095567..c27fadcec 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/listener/WalletDeletedListener.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/listener/WalletDeletedListener.java
@@ -20,9 +20,10 @@
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.service.WalletTransactionService;
 
 /**
  * This listener is triggered when a user wallet is deleted to remove all its
diff --git a/wallet-services/src/main/java/io/meeds/wallet/notification/builder/RequestFundsTemplateBuilder.java b/wallet-services/src/main/java/io/meeds/wallet/notification/builder/RequestFundsTemplateBuilder.java
index 1cd08bb5e..0d568132b 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/notification/builder/RequestFundsTemplateBuilder.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/notification/builder/RequestFundsTemplateBuilder.java
@@ -16,6 +16,8 @@
  */
 package io.meeds.wallet.notification.builder;
 
+import static io.meeds.wallet.utils.WalletUtils.*;
+
 import java.io.Writer;
 import java.util.Calendar;
 import java.util.Locale;
@@ -38,10 +40,9 @@
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.service.LinkProvider;
 import org.exoplatform.social.notification.plugin.SocialNotificationUtils;
-import io.meeds.wallet.wallet.model.WalletType;
 import org.exoplatform.webui.utils.TimeConvertUtils;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.*;
+import io.meeds.wallet.model.WalletType;
 
 public class RequestFundsTemplateBuilder extends AbstractTemplateBuilder {
 
diff --git a/wallet-services/src/main/java/io/meeds/wallet/notification/builder/TemplateBuilder.java b/wallet-services/src/main/java/io/meeds/wallet/notification/builder/TemplateBuilder.java
index f2969db82..069a53c24 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/notification/builder/TemplateBuilder.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/notification/builder/TemplateBuilder.java
@@ -16,6 +16,8 @@
  */
 package io.meeds.wallet.notification.builder;
 
+import static io.meeds.wallet.utils.WalletUtils.*;
+
 import java.io.Writer;
 import java.util.Calendar;
 import java.util.Locale;
@@ -40,10 +42,9 @@
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.service.LinkProvider;
 import org.exoplatform.social.notification.plugin.SocialNotificationUtils;
-import io.meeds.wallet.wallet.model.WalletType;
 import org.exoplatform.webui.utils.TimeConvertUtils;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.*;
+import io.meeds.wallet.model.WalletType;
 
 public class TemplateBuilder extends AbstractTemplateBuilder {
 
diff --git a/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/FundsRequestNotificationPlugin.java b/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/FundsRequestNotificationPlugin.java
index 0f524109f..0990fc2c3 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/FundsRequestNotificationPlugin.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/FundsRequestNotificationPlugin.java
@@ -16,6 +16,8 @@
  */
 package io.meeds.wallet.notification.plugin;
 
+import static io.meeds.wallet.utils.WalletUtils.*;
+
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -28,12 +30,11 @@
 import org.exoplatform.container.xml.InitParams;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.FundsRequest;
-import io.meeds.wallet.wallet.utils.WalletUtils;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.*;
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.FundsRequest;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.utils.WalletUtils;
 
 public class FundsRequestNotificationPlugin extends BaseNotificationPlugin {
 
diff --git a/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/WalletReceiverNotificationPlugin.java b/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/WalletReceiverNotificationPlugin.java
index 8ef87a985..b0c37cebb 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/WalletReceiverNotificationPlugin.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/WalletReceiverNotificationPlugin.java
@@ -16,29 +16,29 @@
  */
 package io.meeds.wallet.notification.plugin;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.ACCOUNT_TYPE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.AMOUNT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.AMOUNT_PARAMETER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.AVATAR;
-import static io.meeds.wallet.wallet.utils.WalletUtils.CONTRACT_ADDRESS;
-import static io.meeds.wallet.wallet.utils.WalletUtils.CONTRACT_ADDRESS_PARAMETER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.HASH;
-import static io.meeds.wallet.wallet.utils.WalletUtils.HASH_PARAMETER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.MESSAGE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.MESSAGE_PARAMETER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.RECEIVER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.RECEIVER_ACCOUNT_DETAIL_PARAMETER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.RECEIVER_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.RECEIVER_TYPE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.RECEIVER_URL;
-import static io.meeds.wallet.wallet.utils.WalletUtils.SENDER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.SENDER_ACCOUNT_DETAIL_PARAMETER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.SENDER_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.SENDER_URL;
-import static io.meeds.wallet.wallet.utils.WalletUtils.SYMBOL;
-import static io.meeds.wallet.wallet.utils.WalletUtils.SYMBOL_PARAMETER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getNotificationReceiversUsers;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getPermanentLink;
+import static io.meeds.wallet.utils.WalletUtils.ACCOUNT_TYPE;
+import static io.meeds.wallet.utils.WalletUtils.AMOUNT;
+import static io.meeds.wallet.utils.WalletUtils.AMOUNT_PARAMETER;
+import static io.meeds.wallet.utils.WalletUtils.AVATAR;
+import static io.meeds.wallet.utils.WalletUtils.CONTRACT_ADDRESS;
+import static io.meeds.wallet.utils.WalletUtils.CONTRACT_ADDRESS_PARAMETER;
+import static io.meeds.wallet.utils.WalletUtils.HASH;
+import static io.meeds.wallet.utils.WalletUtils.HASH_PARAMETER;
+import static io.meeds.wallet.utils.WalletUtils.MESSAGE;
+import static io.meeds.wallet.utils.WalletUtils.MESSAGE_PARAMETER;
+import static io.meeds.wallet.utils.WalletUtils.RECEIVER;
+import static io.meeds.wallet.utils.WalletUtils.RECEIVER_ACCOUNT_DETAIL_PARAMETER;
+import static io.meeds.wallet.utils.WalletUtils.RECEIVER_ID;
+import static io.meeds.wallet.utils.WalletUtils.RECEIVER_TYPE;
+import static io.meeds.wallet.utils.WalletUtils.RECEIVER_URL;
+import static io.meeds.wallet.utils.WalletUtils.SENDER;
+import static io.meeds.wallet.utils.WalletUtils.SENDER_ACCOUNT_DETAIL_PARAMETER;
+import static io.meeds.wallet.utils.WalletUtils.SENDER_ID;
+import static io.meeds.wallet.utils.WalletUtils.SENDER_URL;
+import static io.meeds.wallet.utils.WalletUtils.SYMBOL;
+import static io.meeds.wallet.utils.WalletUtils.SYMBOL_PARAMETER;
+import static io.meeds.wallet.utils.WalletUtils.getNotificationReceiversUsers;
+import static io.meeds.wallet.utils.WalletUtils.getPermanentLink;
 
 import java.util.List;
 
@@ -53,8 +53,9 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.service.LinkProvider;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionNotificationType;
+
+import io.meeds.wallet.model.TransactionNotificationType;
+import io.meeds.wallet.model.Wallet;
 
 public class WalletReceiverNotificationPlugin extends BaseNotificationPlugin {
 
diff --git a/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/WalletSenderNotificationPlugin.java b/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/WalletSenderNotificationPlugin.java
index 5a6f4f749..213afe14f 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/WalletSenderNotificationPlugin.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/notification/plugin/WalletSenderNotificationPlugin.java
@@ -16,6 +16,8 @@
  */
 package io.meeds.wallet.notification.plugin;
 
+import static io.meeds.wallet.utils.WalletUtils.*;
+
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -29,10 +31,9 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.service.LinkProvider;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionNotificationType;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.*;
+import io.meeds.wallet.model.TransactionNotificationType;
+import io.meeds.wallet.model.Wallet;
 
 public class WalletSenderNotificationPlugin extends BaseNotificationPlugin {
 
diff --git a/wallet-services/src/main/java/io/meeds/wallet/notification/provider/MailTemplateProvider.java b/wallet-services/src/main/java/io/meeds/wallet/notification/provider/MailTemplateProvider.java
index a9ed30e5e..475a6d57a 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/notification/provider/MailTemplateProvider.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/notification/provider/MailTemplateProvider.java
@@ -16,6 +16,8 @@
  */
 package io.meeds.wallet.notification.provider;
 
+import static io.meeds.wallet.utils.WalletUtils.*;
+
 import org.exoplatform.commons.api.notification.annotation.TemplateConfig;
 import org.exoplatform.commons.api.notification.annotation.TemplateConfigs;
 import org.exoplatform.commons.api.notification.channel.template.TemplateProvider;
@@ -25,8 +27,6 @@
 import io.meeds.wallet.notification.builder.RequestFundsTemplateBuilder;
 import io.meeds.wallet.notification.builder.TemplateBuilder;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.*;
-
 @TemplateConfigs(templates = {
     @TemplateConfig(pluginId = WALLET_SENDER_NOTIFICATION_ID, template = "war:/conf/wallet/templates/notification/mail/WalletSenderMailPlugin.gtmpl"),
     @TemplateConfig(pluginId = WALLET_RECEIVER_NOTIFICATION_ID, template = "war:/conf/wallet/templates/notification/mail/WalletReceiverMailPlugin.gtmpl"),
diff --git a/wallet-services/src/main/java/io/meeds/wallet/notification/provider/MobilePushTemplateProvider.java b/wallet-services/src/main/java/io/meeds/wallet/notification/provider/MobilePushTemplateProvider.java
index d6e90a0b1..2e0146e13 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/notification/provider/MobilePushTemplateProvider.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/notification/provider/MobilePushTemplateProvider.java
@@ -16,6 +16,8 @@
  */
 package io.meeds.wallet.notification.provider;
 
+import static io.meeds.wallet.utils.WalletUtils.*;
+
 import org.exoplatform.commons.api.notification.annotation.TemplateConfig;
 import org.exoplatform.commons.api.notification.annotation.TemplateConfigs;
 import org.exoplatform.commons.api.notification.channel.template.TemplateProvider;
@@ -25,8 +27,6 @@
 import io.meeds.wallet.notification.builder.RequestFundsTemplateBuilder;
 import io.meeds.wallet.notification.builder.TemplateBuilder;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.*;
-
 @TemplateConfigs(templates = {
     @TemplateConfig(pluginId = WALLET_SENDER_NOTIFICATION_ID, template = "war:/conf/wallet/templates/notification/push/WalletSenderPushPlugin.gtmpl"),
     @TemplateConfig(pluginId = WALLET_RECEIVER_NOTIFICATION_ID, template = "war:/conf/wallet/templates/notification/push/WalletReceiverPushPlugin.gtmpl"),
diff --git a/wallet-services/src/main/java/io/meeds/wallet/permlink/plugin/WalletPermanentLinkPlugin.java b/wallet-services/src/main/java/io/meeds/wallet/permlink/plugin/WalletPermanentLinkPlugin.java
index 478a330a9..5e314fbca 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/permlink/plugin/WalletPermanentLinkPlugin.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/permlink/plugin/WalletPermanentLinkPlugin.java
@@ -23,11 +23,11 @@
 import org.exoplatform.services.security.Identity;
 import org.exoplatform.social.core.space.model.Space;
 import org.exoplatform.social.core.space.spi.SpaceService;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.WalletType;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.utils.WalletUtils;
 
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletType;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.utils.WalletUtils;
 import io.meeds.portal.permlink.model.PermanentLinkObject;
 import io.meeds.portal.permlink.plugin.PermanentLinkPlugin;
 
diff --git a/wallet-services/src/main/java/io/meeds/wallet/plugin/WalletFeaturePlugin.java b/wallet-services/src/main/java/io/meeds/wallet/plugin/WalletFeaturePlugin.java
index ccd2938d5..429cf0a6f 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/plugin/WalletFeaturePlugin.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/plugin/WalletFeaturePlugin.java
@@ -22,8 +22,9 @@
 import org.exoplatform.commons.api.settings.FeaturePlugin;
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.services.security.*;
-import io.meeds.wallet.wallet.model.settings.GlobalSettings;
-import io.meeds.wallet.wallet.service.WalletService;
+
+import io.meeds.wallet.model.GlobalSettings;
+import io.meeds.wallet.service.WalletService;
 
 /**
  * A plugin added to {@link ExoFeatureService} that determines if 'wallet' is
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletAccountREST.java b/wallet-services/src/main/java/io/meeds/wallet/rest/WalletAccountREST.java
similarity index 98%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletAccountREST.java
rename to wallet-services/src/main/java/io/meeds/wallet/rest/WalletAccountREST.java
index b7ef856a4..46b9d28cc 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletAccountREST.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/rest/WalletAccountREST.java
@@ -14,15 +14,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.rest;
+package io.meeds.wallet.rest;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.*;
+import static io.meeds.wallet.utils.WalletUtils.*;
 
 import java.util.Set;
 
 import javax.annotation.security.RolesAllowed;
 
-import io.meeds.wallet.wallet.model.*;
 import jakarta.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
 import javax.ws.rs.core.Context;
@@ -41,10 +40,11 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.rest.resource.ResourceContainer;
-import io.meeds.wallet.wallet.model.transaction.FundsRequest;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletService;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+
+import io.meeds.wallet.model.*;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletService;
+import io.meeds.wallet.utils.WalletUtils;
 
 
 @Path("/wallet/api/account")
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletAdminTransactionREST.java b/wallet-services/src/main/java/io/meeds/wallet/rest/WalletAdminTransactionREST.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletAdminTransactionREST.java
rename to wallet-services/src/main/java/io/meeds/wallet/rest/WalletAdminTransactionREST.java
index 7a86adcac..40f4d90b9 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletAdminTransactionREST.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/rest/WalletAdminTransactionREST.java
@@ -14,9 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.rest;
+package io.meeds.wallet.rest;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.getCurrentUserId;
+import static io.meeds.wallet.utils.WalletUtils.getCurrentUserId;
 
 import javax.annotation.security.RolesAllowed;
 import javax.ws.rs.FormParam;
@@ -31,8 +31,9 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.rest.resource.ResourceContainer;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.WalletTokenAdminService;
+
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.service.WalletTokenAdminService;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletContractREST.java b/wallet-services/src/main/java/io/meeds/wallet/rest/WalletContractREST.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletContractREST.java
rename to wallet-services/src/main/java/io/meeds/wallet/rest/WalletContractREST.java
index c9fb369b2..e75458628 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletContractREST.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/rest/WalletContractREST.java
@@ -14,9 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.rest;
+package io.meeds.wallet.rest;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.getCurrentUserId;
+import static io.meeds.wallet.utils.WalletUtils.getCurrentUserId;
 
 import javax.annotation.security.RolesAllowed;
 import javax.ws.rs.*;
@@ -34,8 +34,9 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.rest.resource.ResourceContainer;
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.service.WalletContractService;
+
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.service.WalletContractService;
 
 
 @Path("/wallet/api/contract")
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletSettingsREST.java b/wallet-services/src/main/java/io/meeds/wallet/rest/WalletSettingsREST.java
similarity index 93%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletSettingsREST.java
rename to wallet-services/src/main/java/io/meeds/wallet/rest/WalletSettingsREST.java
index 383592f70..8aad53d68 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletSettingsREST.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/rest/WalletSettingsREST.java
@@ -14,9 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.rest;
+package io.meeds.wallet.rest;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.getCurrentUserId;
+import static io.meeds.wallet.utils.WalletUtils.getCurrentUserId;
 
 import javax.annotation.security.RolesAllowed;
 import javax.ws.rs.*;
@@ -32,9 +32,10 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.rest.resource.ResourceContainer;
-import io.meeds.wallet.wallet.model.settings.InitialFundsSettings;
-import io.meeds.wallet.wallet.model.settings.UserSettings;
-import io.meeds.wallet.wallet.service.WalletService;
+
+import io.meeds.wallet.model.InitialFundsSettings;
+import io.meeds.wallet.model.UserSettings;
+import io.meeds.wallet.service.WalletService;
 
 
 @Path("/wallet/api/settings")
diff --git a/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletTransactionREST.java b/wallet-services/src/main/java/io/meeds/wallet/rest/WalletTransactionREST.java
similarity index 96%
rename from wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletTransactionREST.java
rename to wallet-services/src/main/java/io/meeds/wallet/rest/WalletTransactionREST.java
index 17289d483..5a25d8e8d 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/wallet/rest/WalletTransactionREST.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/rest/WalletTransactionREST.java
@@ -14,9 +14,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package io.meeds.wallet.wallet.rest;
+package io.meeds.wallet.rest;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.getCurrentUserId;
+import static io.meeds.wallet.utils.WalletUtils.getCurrentUserId;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -27,10 +27,13 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
-import io.meeds.wallet.wallet.service.WalletService;
-import io.meeds.wallet.wallet.service.WalletTokenAdminService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.TransactionStatistics;
+import io.meeds.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.service.WalletService;
+import io.meeds.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.service.WalletTransactionService;
+
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
@@ -44,8 +47,6 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.rest.resource.ResourceContainer;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.model.transaction.TransactionStatistics;
 
 @Path("/wallet/api/transaction")
 @RolesAllowed("users")
diff --git a/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java b/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java
index 35d1e0d92..55690aa9a 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java
@@ -16,40 +16,38 @@
  */
 package io.meeds.wallet.service;
 
-import static io.meeds.wallet.wallet.statistic.StatisticUtils.OPERATION;
-import static io.meeds.wallet.wallet.utils.WalletUtils.ADMIN_KEY_PARAMETER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.MODIFY_ADDRESS_ASSOCIATED_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.NEW_ADDRESS_ASSOCIATED_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.SIMPLE_CHARS;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_ADMIN_REMOTE_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_DELETED_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_DISABLED_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_ENABLED_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_INITIALIZATION_MODIFICATION_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_INITIALIZED_SETTING_PARAM;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_MODIFIED_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_SCOPE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.canAccessWallet;
-import static io.meeds.wallet.wallet.utils.WalletUtils.checkUserIsSpaceManager;
-import static io.meeds.wallet.wallet.utils.WalletUtils.computeWalletFromIdentity;
-import static io.meeds.wallet.wallet.utils.WalletUtils.computeWalletIdentity;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getContractAddress;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getContractDetail;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getIdentityById;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getIdentityByTypeAndId;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getSettings;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getSpacePrettyName;
-import static io.meeds.wallet.wallet.utils.WalletUtils.hideWalletOwnerPrivateInformation;
-import static io.meeds.wallet.wallet.utils.WalletUtils.isUserRewardingAdmin;
-import static io.meeds.wallet.wallet.utils.WalletUtils.isUserSpaceManager;
+import static io.meeds.wallet.statistic.StatisticUtils.OPERATION;
+import static io.meeds.wallet.utils.WalletUtils.ADMIN_KEY_PARAMETER;
+import static io.meeds.wallet.utils.WalletUtils.MODIFY_ADDRESS_ASSOCIATED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.NEW_ADDRESS_ASSOCIATED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.SIMPLE_CHARS;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_ADMIN_REMOTE_ID;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_DELETED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_DISABLED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_ENABLED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_INITIALIZATION_MODIFICATION_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_INITIALIZED_SETTING_PARAM;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_MODIFIED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_SCOPE;
+import static io.meeds.wallet.utils.WalletUtils.canAccessWallet;
+import static io.meeds.wallet.utils.WalletUtils.checkUserIsSpaceManager;
+import static io.meeds.wallet.utils.WalletUtils.computeWalletFromIdentity;
+import static io.meeds.wallet.utils.WalletUtils.computeWalletIdentity;
+import static io.meeds.wallet.utils.WalletUtils.getContractAddress;
+import static io.meeds.wallet.utils.WalletUtils.getContractDetail;
+import static io.meeds.wallet.utils.WalletUtils.getIdentityById;
+import static io.meeds.wallet.utils.WalletUtils.getIdentityByTypeAndId;
+import static io.meeds.wallet.utils.WalletUtils.getSettings;
+import static io.meeds.wallet.utils.WalletUtils.getSpacePrettyName;
+import static io.meeds.wallet.utils.WalletUtils.hideWalletOwnerPrivateInformation;
+import static io.meeds.wallet.utils.WalletUtils.isUserRewardingAdmin;
+import static io.meeds.wallet.utils.WalletUtils.isUserSpaceManager;
 
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.security.SignatureException;
 import java.util.*;
 
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletTokenAdminService;
 import jakarta.servlet.ServletContext;
 
 import org.apache.commons.lang3.RandomStringUtils;
@@ -73,14 +71,17 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.identity.model.Identity;
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.WalletAddressLabel;
-import io.meeds.wallet.wallet.model.WalletProvider;
-import io.meeds.wallet.wallet.model.WalletState;
-import io.meeds.wallet.wallet.model.WalletType;
-import io.meeds.wallet.wallet.statistic.ExoWalletStatistic;
-import io.meeds.wallet.wallet.statistic.ExoWalletStatisticService;
+
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletAddressLabel;
+import io.meeds.wallet.model.WalletProvider;
+import io.meeds.wallet.model.WalletState;
+import io.meeds.wallet.model.WalletType;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.statistic.ExoWalletStatistic;
+import io.meeds.wallet.statistic.ExoWalletStatisticService;
 import io.meeds.wallet.storage.AddressLabelStorage;
 import io.meeds.wallet.storage.WalletStorage;
 
diff --git a/wallet-services/src/main/java/io/meeds/wallet/service/WalletContractServiceImpl.java b/wallet-services/src/main/java/io/meeds/wallet/service/WalletContractServiceImpl.java
index 2f4d25d35..9f8d92a08 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/service/WalletContractServiceImpl.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/service/WalletContractServiceImpl.java
@@ -16,19 +16,21 @@
  */
 package io.meeds.wallet.service;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.ABI_PATH_PARAMETER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.BIN_PATH_PARAMETER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_CONTEXT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_SCOPE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.fromJsonString;
-import static io.meeds.wallet.wallet.utils.WalletUtils.toJsonString;
+import static io.meeds.wallet.utils.WalletUtils.ABI_PATH_PARAMETER;
+import static io.meeds.wallet.utils.WalletUtils.BIN_PATH_PARAMETER;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_CONTEXT;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_SCOPE;
+import static io.meeds.wallet.utils.WalletUtils.fromJsonString;
+import static io.meeds.wallet.utils.WalletUtils.toJsonString;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 
-import io.meeds.wallet.wallet.service.WalletContractService;
-import io.meeds.wallet.wallet.service.WalletService;
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.service.WalletContractService;
+import io.meeds.wallet.service.WalletService;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
@@ -43,7 +45,6 @@
 import org.exoplatform.container.xml.InitParams;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import io.meeds.wallet.wallet.model.ContractDetail;
 
 public class WalletContractServiceImpl implements WalletContractService, Startable {
 
diff --git a/wallet-services/src/main/java/io/meeds/wallet/service/WalletServiceImpl.java b/wallet-services/src/main/java/io/meeds/wallet/service/WalletServiceImpl.java
index 9b5024960..09b562de7 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/service/WalletServiceImpl.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/service/WalletServiceImpl.java
@@ -16,47 +16,43 @@
  */
 package io.meeds.wallet.service;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.DEFAULT_INITIAL_USER_FUND;
-import static io.meeds.wallet.wallet.utils.WalletUtils.DEFAULT_MIN_GAS_PRICE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.ETHER_TO_WEI_DECIMALS;
-import static io.meeds.wallet.wallet.utils.WalletUtils.FUNDS_REQUEST_NOTIFICATION_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.FUNDS_REQUEST_PARAMETER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.FUNDS_REQUEST_SENDER_DETAIL_PARAMETER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.FUNDS_REQUEST_SENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAS_LIMIT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GWEI_TO_WEI_DECIMALS;
-import static io.meeds.wallet.wallet.utils.WalletUtils.INITIAL_FUNDS_KEY_NAME;
-import static io.meeds.wallet.wallet.utils.WalletUtils.MAX_GAS_PRICE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.MIN_GAS_PRICE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.NETWORK_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.NETWORK_URL;
-import static io.meeds.wallet.wallet.utils.WalletUtils.NETWORK_WS_URL;
-import static io.meeds.wallet.wallet.utils.WalletUtils.NORMAL_GAS_PRICE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.RECEIVER_ACCOUNT_DETAIL_PARAMETER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.REWARDINGS_GROUP;
-import static io.meeds.wallet.wallet.utils.WalletUtils.SENDER_ACCOUNT_DETAIL_PARAMETER;
-import static io.meeds.wallet.wallet.utils.WalletUtils.SETTINGS_KEY_NAME;
-import static io.meeds.wallet.wallet.utils.WalletUtils.TOKEN_ADDRESS;
-import static io.meeds.wallet.wallet.utils.WalletUtils.DYNAMIC_GAS_PRICE_UPDATE_INTERVAL;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_CONTEXT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_SCOPE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.canAccessWallet;
-import static io.meeds.wallet.wallet.utils.WalletUtils.convertFromDecimals;
-import static io.meeds.wallet.wallet.utils.WalletUtils.fromJsonString;
-import static io.meeds.wallet.wallet.utils.WalletUtils.hideWalletOwnerPrivateInformation;
-import static io.meeds.wallet.wallet.utils.WalletUtils.isUserMemberOfGroupOrUser;
-import static io.meeds.wallet.wallet.utils.WalletUtils.isUserSpaceMember;
-import static io.meeds.wallet.wallet.utils.WalletUtils.toJsonString;
+import static io.meeds.wallet.utils.WalletUtils.DEFAULT_INITIAL_USER_FUND;
+import static io.meeds.wallet.utils.WalletUtils.DEFAULT_MIN_GAS_PRICE;
+import static io.meeds.wallet.utils.WalletUtils.DYNAMIC_GAS_PRICE_UPDATE_INTERVAL;
+import static io.meeds.wallet.utils.WalletUtils.ETHER_TO_WEI_DECIMALS;
+import static io.meeds.wallet.utils.WalletUtils.FUNDS_REQUEST_NOTIFICATION_ID;
+import static io.meeds.wallet.utils.WalletUtils.FUNDS_REQUEST_PARAMETER;
+import static io.meeds.wallet.utils.WalletUtils.FUNDS_REQUEST_SENDER_DETAIL_PARAMETER;
+import static io.meeds.wallet.utils.WalletUtils.FUNDS_REQUEST_SENT;
+import static io.meeds.wallet.utils.WalletUtils.GAS_LIMIT;
+import static io.meeds.wallet.utils.WalletUtils.GWEI_TO_WEI_DECIMALS;
+import static io.meeds.wallet.utils.WalletUtils.INITIAL_FUNDS_KEY_NAME;
+import static io.meeds.wallet.utils.WalletUtils.MAX_GAS_PRICE;
+import static io.meeds.wallet.utils.WalletUtils.MIN_GAS_PRICE;
+import static io.meeds.wallet.utils.WalletUtils.NETWORK_ID;
+import static io.meeds.wallet.utils.WalletUtils.NETWORK_URL;
+import static io.meeds.wallet.utils.WalletUtils.NETWORK_WS_URL;
+import static io.meeds.wallet.utils.WalletUtils.NORMAL_GAS_PRICE;
+import static io.meeds.wallet.utils.WalletUtils.RECEIVER_ACCOUNT_DETAIL_PARAMETER;
+import static io.meeds.wallet.utils.WalletUtils.REWARDINGS_GROUP;
+import static io.meeds.wallet.utils.WalletUtils.SENDER_ACCOUNT_DETAIL_PARAMETER;
+import static io.meeds.wallet.utils.WalletUtils.SETTINGS_KEY_NAME;
+import static io.meeds.wallet.utils.WalletUtils.TOKEN_ADDRESS;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_CONTEXT;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_SCOPE;
+import static io.meeds.wallet.utils.WalletUtils.canAccessWallet;
+import static io.meeds.wallet.utils.WalletUtils.convertFromDecimals;
+import static io.meeds.wallet.utils.WalletUtils.fromJsonString;
+import static io.meeds.wallet.utils.WalletUtils.hideWalletOwnerPrivateInformation;
+import static io.meeds.wallet.utils.WalletUtils.isUserMemberOfGroupOrUser;
+import static io.meeds.wallet.utils.WalletUtils.isUserSpaceMember;
+import static io.meeds.wallet.utils.WalletUtils.toJsonString;
 
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.concurrent.TimeUnit;
 
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletContractService;
-import io.meeds.wallet.wallet.service.WalletService;
 import org.apache.commons.lang3.StringUtils;
 import org.picocontainer.Startable;
 
@@ -77,17 +73,21 @@
 import org.exoplatform.container.xml.InitParams;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.WalletType;
-import io.meeds.wallet.wallet.model.settings.GlobalSettings;
-import io.meeds.wallet.wallet.model.settings.InitialFundsSettings;
-import io.meeds.wallet.wallet.model.settings.NetworkSettings;
-import io.meeds.wallet.wallet.model.settings.UserSettings;
-import io.meeds.wallet.wallet.model.settings.WalletSettings;
-import io.meeds.wallet.wallet.model.transaction.FundsRequest;
 
 import io.meeds.wallet.lock.Lock;
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.FundsRequest;
+import io.meeds.wallet.model.GlobalSettings;
+import io.meeds.wallet.model.InitialFundsSettings;
+import io.meeds.wallet.model.NetworkSettings;
+import io.meeds.wallet.model.UserSettings;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletSettings;
+import io.meeds.wallet.model.WalletType;
+import io.meeds.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletContractService;
+import io.meeds.wallet.service.WalletService;
 
 /**
  * A storage service to save/load information used by users and spaces wallets
diff --git a/wallet-services/src/main/java/io/meeds/wallet/service/WalletTransactionServiceImpl.java b/wallet-services/src/main/java/io/meeds/wallet/service/WalletTransactionServiceImpl.java
index aa44c8d0c..516f8195b 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/service/WalletTransactionServiceImpl.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/service/WalletTransactionServiceImpl.java
@@ -16,18 +16,14 @@
  */
 package io.meeds.wallet.service;
 
+import static io.meeds.wallet.utils.WalletUtils.*;
+
 import java.time.*;
 import java.time.format.TextStyle;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.WalletType;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletContractService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -38,14 +34,20 @@
 import org.exoplatform.services.log.Log;
 import org.exoplatform.social.core.space.model.Space;
 import org.exoplatform.social.core.space.spi.SpaceService;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.model.transaction.TransactionStatistics;
+
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.TransactionStatistics;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletType;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletContractService;
+import io.meeds.wallet.service.WalletTransactionService;
 import io.meeds.wallet.storage.TransactionStorage;
+
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.*;
-
 public class WalletTransactionServiceImpl implements WalletTransactionService {
 
   private static final Log      LOG                                       =
diff --git a/wallet-services/src/main/java/io/meeds/wallet/service/WalletWebSocketService.java b/wallet-services/src/main/java/io/meeds/wallet/service/WalletWebSocketService.java
index 6fc54e107..1fe54643e 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/service/WalletWebSocketService.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/service/WalletWebSocketService.java
@@ -16,8 +16,8 @@
  */
 package io.meeds.wallet.service;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.COMETD_CHANNEL;
-import static io.meeds.wallet.wallet.utils.WalletUtils.toJsonString;
+import static io.meeds.wallet.utils.WalletUtils.COMETD_CHANNEL;
+import static io.meeds.wallet.utils.WalletUtils.toJsonString;
 
 import java.util.Collection;
 
@@ -26,9 +26,10 @@
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import io.meeds.wallet.wallet.model.WebSocketMessage;
 import org.exoplatform.ws.frameworks.cometd.ContinuationService;
 
+import io.meeds.wallet.model.WebSocketMessage;
+
 public class WalletWebSocketService {
 
   private static final Log      LOG = ExoLogger.getLogger(WalletWebSocketService.class);
diff --git a/wallet-services/src/main/java/io/meeds/wallet/storage/AddressLabelStorage.java b/wallet-services/src/main/java/io/meeds/wallet/storage/AddressLabelStorage.java
index aa43d0db9..7c3378944 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/storage/AddressLabelStorage.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/storage/AddressLabelStorage.java
@@ -21,7 +21,7 @@
 
 import io.meeds.wallet.dao.AddressLabelDAO;
 import io.meeds.wallet.entity.AddressLabelEntity;
-import io.meeds.wallet.wallet.model.WalletAddressLabel;
+import io.meeds.wallet.model.WalletAddressLabel;
 
 public class AddressLabelStorage {
 
diff --git a/wallet-services/src/main/java/io/meeds/wallet/storage/TransactionStorage.java b/wallet-services/src/main/java/io/meeds/wallet/storage/TransactionStorage.java
index 20e0f718a..33c3fe34b 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/storage/TransactionStorage.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/storage/TransactionStorage.java
@@ -16,9 +16,9 @@
  */
 package io.meeds.wallet.storage;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_CREATED_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_MODIFIED_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.formatTransactionHash;
+import static io.meeds.wallet.utils.WalletUtils.TRANSACTION_CREATED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.TRANSACTION_MODIFIED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.formatTransactionHash;
 
 import java.time.ZonedDateTime;
 import java.util.Collections;
@@ -32,8 +32,8 @@
 import org.exoplatform.services.log.Log;
 import io.meeds.wallet.dao.WalletTransactionDAO;
 import io.meeds.wallet.entity.TransactionEntity;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
 
 public class TransactionStorage {
 
diff --git a/wallet-services/src/main/java/io/meeds/wallet/storage/WalletStorage.java b/wallet-services/src/main/java/io/meeds/wallet/storage/WalletStorage.java
index 4262b6f17..83e2966f0 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/storage/WalletStorage.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/storage/WalletStorage.java
@@ -16,8 +16,8 @@
  */
 package io.meeds.wallet.storage;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.computeWalletFromIdentity;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getIdentityById;
+import static io.meeds.wallet.utils.WalletUtils.computeWalletFromIdentity;
+import static io.meeds.wallet.utils.WalletUtils.getIdentityById;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -30,7 +30,8 @@
 import io.meeds.wallet.entity.WalletBlockchainStateEntity;
 import io.meeds.wallet.entity.WalletEntity;
 import io.meeds.wallet.entity.WalletPrivateKeyEntity;
-import io.meeds.wallet.wallet.model.*;
+import io.meeds.wallet.model.*;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/wallet-services/src/main/java/io/meeds/wallet/storage/cached/CachedAccountStorage.java b/wallet-services/src/main/java/io/meeds/wallet/storage/cached/CachedAccountStorage.java
index 949cf9dff..2a53c8294 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/storage/cached/CachedAccountStorage.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/storage/cached/CachedAccountStorage.java
@@ -20,10 +20,11 @@
 import io.meeds.wallet.dao.WalletAccountDAO;
 import io.meeds.wallet.dao.WalletBlockchainStateDAO;
 import io.meeds.wallet.dao.WalletPrivateKeyDAO;
-import io.meeds.wallet.wallet.model.AddressAlreadyInUseException;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.WalletCacheKey;
-import io.meeds.wallet.wallet.model.WalletProvider;
+import io.meeds.wallet.model.AddressAlreadyInUseException;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletCacheKey;
+import io.meeds.wallet.model.WalletProvider;
+
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.cache.future.FutureExoCache;
diff --git a/wallet-services/src/main/java/io/meeds/wallet/storage/cached/CachedTransactionStorage.java b/wallet-services/src/main/java/io/meeds/wallet/storage/cached/CachedTransactionStorage.java
index c09302902..225ab8ebc 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/storage/cached/CachedTransactionStorage.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/storage/cached/CachedTransactionStorage.java
@@ -22,7 +22,7 @@
 import org.exoplatform.services.cache.ExoCache;
 import org.exoplatform.services.listener.ListenerService;
 import io.meeds.wallet.dao.WalletTransactionDAO;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.model.TransactionDetail;
 import io.meeds.wallet.storage.TransactionStorage;
 
 public class CachedTransactionStorage extends TransactionStorage {
diff --git a/wallet-services/src/main/resources/conf/portal/wallet-configuration.xml b/wallet-services/src/main/resources/conf/portal/wallet-configuration.xml
index a6a35c96c..372fcf667 100644
--- a/wallet-services/src/main/resources/conf/portal/wallet-configuration.xml
+++ b/wallet-services/src/main/resources/conf/portal/wallet-configuration.xml
@@ -74,7 +74,7 @@
   </component>
 
   <component>
-    <key>io.meeds.wallet.wallet.service.WalletAccountService</key>
+    <key>io.meeds.wallet.service.WalletAccountService</key>
     <type>io.meeds.wallet.service.WalletAccountServiceImpl</type>
     <init-params>
       <value-param>
@@ -86,7 +86,7 @@
   </component>
 
   <component>
-    <key>io.meeds.wallet.wallet.service.WalletTransactionService</key>
+    <key>io.meeds.wallet.service.WalletTransactionService</key>
     <type>io.meeds.wallet.service.WalletTransactionServiceImpl</type>
     <init-params>
       <value-param>
@@ -108,7 +108,7 @@
   </component>
 
   <component>
-    <key>io.meeds.wallet.wallet.service.WalletContractService</key>
+    <key>io.meeds.wallet.service.WalletContractService</key>
     <type>io.meeds.wallet.service.WalletContractServiceImpl</type>
     <init-params>
       <value-param>
@@ -125,7 +125,7 @@
   </component>
 
   <component>
-    <key>io.meeds.wallet.wallet.service.WalletService</key>
+    <key>io.meeds.wallet.service.WalletService</key>
     <type>io.meeds.wallet.service.WalletServiceImpl</type>
     <init-params>
       <value-param>
@@ -186,27 +186,27 @@
   </component>
 
   <component>
-    <type>io.meeds.wallet.wallet.rest.WalletSettingsREST</type>
+    <type>io.meeds.wallet.rest.WalletSettingsREST</type>
   </component>
 
   <component>
-    <type>io.meeds.wallet.wallet.rest.WalletAccountREST</type>
+    <type>io.meeds.wallet.rest.WalletAccountREST</type>
   </component>
 
   <component>
-    <type>io.meeds.wallet.wallet.rest.WalletContractREST</type>
+    <type>io.meeds.wallet.rest.WalletContractREST</type>
   </component>
 
   <component>
-    <type>io.meeds.wallet.wallet.rest.WalletTransactionREST</type>
+    <type>io.meeds.wallet.rest.WalletTransactionREST</type>
   </component>
 
   <component>
-    <type>io.meeds.wallet.wallet.rest.WalletAdminTransactionREST</type>
+    <type>io.meeds.wallet.rest.WalletAdminTransactionREST</type>
   </component>
 
   <component>
-    <type>io.meeds.wallet.wallet.plugin.WalletAdminIdentityProvider</type>
+    <type>io.meeds.wallet.plugin.WalletAdminIdentityProvider</type>
   </component>
 
   <external-component-plugins>
@@ -218,7 +218,7 @@
       <init-params>
         <values-param>
           <name>providers</name>
-          <value>io.meeds.wallet.wallet.plugin.WalletAdminIdentityProvider</value>
+          <value>io.meeds.wallet.plugin.WalletAdminIdentityProvider</value>
         </values-param>
       </init-params>
     </component-plugin>
diff --git a/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/ContractTransactionMinedListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/ContractTransactionMinedListenerTest.java
index 04633b47d..7c71ef59f 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/ContractTransactionMinedListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/ContractTransactionMinedListenerTest.java
@@ -32,12 +32,13 @@
 import org.mockito.junit.MockitoJUnitRunner;
 
 import org.exoplatform.services.listener.Event;
-import io.meeds.wallet.wallet.model.ContractTransactionEvent;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import io.meeds.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.service.WalletTransactionService;
 import io.meeds.wallet.test.BaseWalletTest;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ContractTransactionMinedListenerTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionMinedAndUpdatedListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionMinedAndUpdatedListenerTest.java
index 804b57fc7..2e7c620a7 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionMinedAndUpdatedListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionMinedAndUpdatedListenerTest.java
@@ -29,11 +29,12 @@
 
 import org.exoplatform.container.PortalContainer;
 import org.exoplatform.services.listener.Event;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.service.WalletTransactionService;
 import io.meeds.wallet.test.BaseWalletTest;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TransactionMinedAndUpdatedListenerTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionMinedListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionMinedListenerTest.java
index fa7a9a31e..611771db1 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionMinedListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionMinedListenerTest.java
@@ -16,7 +16,7 @@
  */
 package io.meeds.wallet.blockchain.listener;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_MINED_AND_UPDATED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.TRANSACTION_MINED_AND_UPDATED_EVENT;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
@@ -38,12 +38,13 @@
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.ListenerService;
 import org.exoplatform.wallet.contract.MeedsToken;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletTransactionService;
 import io.meeds.wallet.test.BaseWalletTest;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TransactionMinedListenerTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionSentToBlockchainListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionSentToBlockchainListenerTest.java
index 030153876..7b7c1b70f 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionSentToBlockchainListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionSentToBlockchainListenerTest.java
@@ -28,11 +28,12 @@
 import org.mockito.junit.MockitoJUnitRunner;
 
 import org.exoplatform.services.listener.Event;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.service.WalletTransactionService;
 import io.meeds.wallet.test.BaseWalletTest;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TransactionSentToBlockchainListenerTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionWithNonceVerifierListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionWithNonceVerifierListenerTest.java
index 0d6928e7b..441a34277 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionWithNonceVerifierListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/blockchain/listener/TransactionWithNonceVerifierListenerTest.java
@@ -35,12 +35,13 @@
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.wallet.contract.MeedsToken;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.service.WalletTransactionService;
 import io.meeds.wallet.test.BaseWalletTest;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TransactionWithNonceVerifierListenerTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumBlockchainTransactionServiceTest.java b/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumBlockchainTransactionServiceTest.java
index 7b760b690..4b37a7508 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumBlockchainTransactionServiceTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumBlockchainTransactionServiceTest.java
@@ -16,9 +16,9 @@
  */
 package io.meeds.wallet.blockchain.service;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.LAST_BLOCK_NUMBER_KEY_NAME;
-import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_EFFECTIVELY_SENT_CODE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_SENT_TO_BLOCKCHAIN_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.LAST_BLOCK_NUMBER_KEY_NAME;
+import static io.meeds.wallet.utils.WalletUtils.TRANSACTION_EFFECTIVELY_SENT_CODE;
+import static io.meeds.wallet.utils.WalletUtils.TRANSACTION_SENT_TO_BLOCKCHAIN_EVENT;
 import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -61,14 +61,16 @@
 import org.exoplatform.services.listener.ListenerService;
 import io.meeds.wallet.blockchain.BlockchainRequestException;
 import io.meeds.wallet.blockchain.MaxRequestRateReachedException;
+import io.meeds.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletTransactionService;
+
 import org.exoplatform.wallet.contract.MeedsToken;
-import io.meeds.wallet.wallet.model.ContractTransactionEvent;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
 import io.meeds.wallet.test.BaseWalletTest;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class EthereumBlockchainTransactionServiceTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumClientConnectorTest.java b/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumClientConnectorTest.java
index 5fed198cd..8163b17a7 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumClientConnectorTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumClientConnectorTest.java
@@ -16,7 +16,7 @@
  */
 package io.meeds.wallet.blockchain.service;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.CONTRACT_TRANSACTION_MINED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.CONTRACT_TRANSACTION_MINED_EVENT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -60,8 +60,9 @@
 import org.exoplatform.services.cache.CacheService;
 import org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache;
 import org.exoplatform.services.listener.ListenerService;
-import io.meeds.wallet.wallet.model.ContractTransactionEvent;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+
+import io.meeds.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.model.TransactionDetail;
 import io.meeds.wallet.test.BaseWalletTest;
 
 import io.reactivex.Flowable;
diff --git a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountBackupDAOTest.java b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountBackupDAOTest.java
index ff1c0862e..3145ddd40 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountBackupDAOTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountBackupDAOTest.java
@@ -28,8 +28,8 @@
 
 import io.meeds.wallet.entity.WalletBackupEntity;
 import io.meeds.wallet.entity.WalletEntity;
-import io.meeds.wallet.wallet.model.WalletProvider;
-import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.model.WalletProvider;
+import io.meeds.wallet.model.WalletType;
 import io.meeds.wallet.test.BaseWalletTest;
 
 public class WalletAccountBackupDAOTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountDAOTest.java b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountDAOTest.java
index 8f8a78399..4a11bcaf5 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountDAOTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountDAOTest.java
@@ -26,7 +26,7 @@
 import org.junit.Test;
 
 import io.meeds.wallet.entity.WalletEntity;
-import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.model.WalletType;
 import io.meeds.wallet.test.BaseWalletTest;
 
 public class WalletAccountDAOTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletBlockchainStateDAOTest.java b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletBlockchainStateDAOTest.java
index 49398f8a1..e34e4ca0a 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletBlockchainStateDAOTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletBlockchainStateDAOTest.java
@@ -22,7 +22,7 @@
 
 import io.meeds.wallet.entity.WalletBlockchainStateEntity;
 import io.meeds.wallet.entity.WalletEntity;
-import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.model.WalletType;
 import io.meeds.wallet.test.BaseWalletTest;
 
 public class WalletBlockchainStateDAOTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletTransactionDAOTest.java b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletTransactionDAOTest.java
index 1a9d4169c..3ef00c5c0 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletTransactionDAOTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletTransactionDAOTest.java
@@ -27,7 +27,7 @@
 
 import io.meeds.wallet.entity.TransactionEntity;
 import io.meeds.wallet.test.BaseWalletTest;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.WalletUtils;
 
 public class WalletTransactionDAOTest extends BaseWalletTest {
 
diff --git a/wallet-services/src/test/java/io/meeds/wallet/job/BoostAdminTransactionJobTest.java b/wallet-services/src/test/java/io/meeds/wallet/job/BoostAdminTransactionJobTest.java
index 479ea0305..2e401538d 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/job/BoostAdminTransactionJobTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/job/BoostAdminTransactionJobTest.java
@@ -26,7 +26,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import io.meeds.wallet.wallet.service.WalletTokenAdminService;
+import io.meeds.wallet.service.WalletTokenAdminService;
 import io.meeds.wallet.test.BaseWalletTest;
 
 @RunWith(MockitoJUnitRunner.class)
diff --git a/wallet-services/src/test/java/io/meeds/wallet/job/PendingEtherTransactionVerifierJobTest.java b/wallet-services/src/test/java/io/meeds/wallet/job/PendingEtherTransactionVerifierJobTest.java
index 0b17f71b5..40ac7ba99 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/job/PendingEtherTransactionVerifierJobTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/job/PendingEtherTransactionVerifierJobTest.java
@@ -31,11 +31,11 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletTransactionService;
 import io.meeds.wallet.test.BaseWalletTest;
 
 @RunWith(MockitoJUnitRunner.class)
diff --git a/wallet-services/src/test/java/io/meeds/wallet/job/TransactionSenderJobTest.java b/wallet-services/src/test/java/io/meeds/wallet/job/TransactionSenderJobTest.java
index a34af8fb4..b639112fb 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/job/TransactionSenderJobTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/job/TransactionSenderJobTest.java
@@ -26,7 +26,7 @@
 import org.mockito.junit.MockitoJUnitRunner;
 import org.quartz.JobExecutionException;
 
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.service.BlockchainTransactionService;
 import io.meeds.wallet.test.BaseWalletTest;
 
 @RunWith(MockitoJUnitRunner.class)
diff --git a/wallet-services/src/test/java/io/meeds/wallet/listener/GamificationWalletInitializationListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/listener/GamificationWalletInitializationListenerTest.java
index 29b665d1c..80315bc70 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/listener/GamificationWalletInitializationListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/listener/GamificationWalletInitializationListenerTest.java
@@ -17,14 +17,14 @@
  */
 package io.meeds.wallet.listener;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_BROADCAST_ACTION_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_CREATE_WALLET_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_EARNER_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_EVENT_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_TYPE;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_RECEIVER_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.GAMIFICATION_WALLET_OBJECT_TYPE;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_BROADCAST_ACTION_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_CREATE_WALLET_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_EARNER_ID;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_EVENT_ID;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_ID;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_OBJECT_TYPE;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_RECEIVER_ID;
+import static io.meeds.wallet.utils.WalletUtils.GAMIFICATION_WALLET_OBJECT_TYPE;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
@@ -34,6 +34,8 @@
 import java.util.Map;
 
 import io.meeds.wallet.listener.GamificationWalletInitializationListener;
+import io.meeds.wallet.model.Wallet;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -41,7 +43,6 @@
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.ListenerService;
-import io.meeds.wallet.wallet.model.Wallet;
 
 @RunWith(MockitoJUnitRunner.class)
 public class GamificationWalletInitializationListenerTest {
diff --git a/wallet-services/src/test/java/io/meeds/wallet/listener/TransactionCreatedListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/listener/TransactionCreatedListenerTest.java
index 3c71e1dec..cc8857745 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/listener/TransactionCreatedListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/listener/TransactionCreatedListenerTest.java
@@ -30,10 +30,11 @@
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.ListenerService;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.service.WalletTransactionService;
 import io.meeds.wallet.test.BaseWalletTest;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TransactionCreatedListenerTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/io/meeds/wallet/listener/WalletDeletedListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/listener/WalletDeletedListenerTest.java
index 54b78e829..ca330d8f4 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/listener/WalletDeletedListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/listener/WalletDeletedListenerTest.java
@@ -35,11 +35,12 @@
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.ListenerService;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
+
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.service.WalletTransactionService;
 import io.meeds.wallet.test.BaseWalletTest;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.WalletUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class WalletDeletedListenerTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/io/meeds/wallet/service/WalletAccountServiceTest.java b/wallet-services/src/test/java/io/meeds/wallet/service/WalletAccountServiceTest.java
index b3607f240..60c119764 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/service/WalletAccountServiceTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/service/WalletAccountServiceTest.java
@@ -16,10 +16,10 @@
  */
 package io.meeds.wallet.service;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.NEW_ADDRESS_ASSOCIATED_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_INITIALIZED_SETTING_PARAM;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_MODIFIED_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.WALLET_SCOPE;
+import static io.meeds.wallet.utils.WalletUtils.NEW_ADDRESS_ASSOCIATED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_INITIALIZED_SETTING_PARAM;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_MODIFIED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.WALLET_SCOPE;
 import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -39,8 +39,6 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletTokenAdminService;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 
@@ -55,16 +53,18 @@
 import org.exoplatform.services.security.MembershipEntry;
 import io.meeds.wallet.dao.AddressLabelDAO;
 import io.meeds.wallet.entity.AddressLabelEntity;
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.WalletAddressLabel;
-import io.meeds.wallet.wallet.model.WalletProvider;
-import io.meeds.wallet.wallet.model.WalletState;
-import io.meeds.wallet.wallet.model.WalletType;
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletAddressLabel;
+import io.meeds.wallet.model.WalletProvider;
+import io.meeds.wallet.model.WalletState;
+import io.meeds.wallet.model.WalletType;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletTokenAdminService;
 import io.meeds.wallet.storage.AddressLabelStorage;
 import io.meeds.wallet.storage.WalletStorage;
 import io.meeds.wallet.test.BaseWalletTest;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.WalletUtils;
 
 public class WalletAccountServiceTest extends BaseWalletTest {
 
diff --git a/wallet-services/src/test/java/io/meeds/wallet/service/WalletServiceTest.java b/wallet-services/src/test/java/io/meeds/wallet/service/WalletServiceTest.java
index 03318511b..5a3e670d8 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/service/WalletServiceTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/service/WalletServiceTest.java
@@ -16,8 +16,8 @@
  */
 package io.meeds.wallet.service;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.FUNDS_REQUEST_NOTIFICATION_ID;
-import static io.meeds.wallet.wallet.utils.WalletUtils.getWalletService;
+import static io.meeds.wallet.utils.WalletUtils.FUNDS_REQUEST_NOTIFICATION_ID;
+import static io.meeds.wallet.utils.WalletUtils.getWalletService;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -25,10 +25,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletContractService;
-import io.meeds.wallet.wallet.service.WalletService;
-import io.meeds.wallet.wallet.service.WalletTransactionService;
 import org.junit.Test;
 import org.picocontainer.Startable;
 
@@ -37,13 +33,18 @@
 import org.exoplatform.commons.api.notification.service.storage.WebNotificationStorage;
 import org.exoplatform.services.security.IdentityRegistry;
 import org.exoplatform.social.core.identity.provider.OrganizationIdentityProvider;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.settings.GlobalSettings;
-import io.meeds.wallet.wallet.model.settings.InitialFundsSettings;
-import io.meeds.wallet.wallet.model.settings.NetworkSettings;
-import io.meeds.wallet.wallet.model.settings.UserSettings;
-import io.meeds.wallet.wallet.model.settings.WalletSettings;
-import io.meeds.wallet.wallet.model.transaction.FundsRequest;
+
+import io.meeds.wallet.model.FundsRequest;
+import io.meeds.wallet.model.GlobalSettings;
+import io.meeds.wallet.model.InitialFundsSettings;
+import io.meeds.wallet.model.NetworkSettings;
+import io.meeds.wallet.model.UserSettings;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletSettings;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletContractService;
+import io.meeds.wallet.service.WalletService;
+import io.meeds.wallet.service.WalletTransactionService;
 import io.meeds.wallet.test.BaseWalletTest;
 import io.meeds.wallet.test.mock.IdentityManagerMock;
 
diff --git a/wallet-services/src/test/java/io/meeds/wallet/service/WalletTransactionServiceTest.java b/wallet-services/src/test/java/io/meeds/wallet/service/WalletTransactionServiceTest.java
index 4c60be632..0f098ac43 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/service/WalletTransactionServiceTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/service/WalletTransactionServiceTest.java
@@ -16,8 +16,8 @@
  */
 package io.meeds.wallet.service;
 
-import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_CREATED_EVENT;
-import static io.meeds.wallet.wallet.utils.WalletUtils.TRANSACTION_MODIFIED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.TRANSACTION_CREATED_EVENT;
+import static io.meeds.wallet.utils.WalletUtils.TRANSACTION_MODIFIED_EVENT;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertThrows;
 
@@ -26,16 +26,17 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.meeds.wallet.wallet.service.WalletTransactionService;
 import org.junit.Test;
 
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.listener.ListenerService;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.model.transaction.TransactionStatistics;
+
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.TransactionStatistics;
+import io.meeds.wallet.service.WalletTransactionService;
 import io.meeds.wallet.test.BaseWalletTest;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.WalletUtils;
 
 public class WalletTransactionServiceTest extends BaseWalletTest {
 
diff --git a/wallet-services/src/test/java/io/meeds/wallet/storage/AddressLabelStorageTest.java b/wallet-services/src/test/java/io/meeds/wallet/storage/AddressLabelStorageTest.java
index 8a8c8a31f..3b454560e 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/storage/AddressLabelStorageTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/storage/AddressLabelStorageTest.java
@@ -26,7 +26,7 @@
 
 import org.junit.Test;
 
-import io.meeds.wallet.wallet.model.WalletAddressLabel;
+import io.meeds.wallet.model.WalletAddressLabel;
 import io.meeds.wallet.test.BaseWalletTest;
 
 public class AddressLabelStorageTest extends BaseWalletTest {
diff --git a/wallet-services/src/test/java/io/meeds/wallet/storage/TransactionStorageTest.java b/wallet-services/src/test/java/io/meeds/wallet/storage/TransactionStorageTest.java
index fb750d784..9f327f3bc 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/storage/TransactionStorageTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/storage/TransactionStorageTest.java
@@ -28,9 +28,9 @@
 import org.junit.Test;
 
 import io.meeds.wallet.entity.TransactionEntity;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
+import io.meeds.wallet.model.TransactionDetail;
 import io.meeds.wallet.test.BaseWalletTest;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.WalletUtils;
 
 public class TransactionStorageTest extends BaseWalletTest {
 
diff --git a/wallet-services/src/test/java/io/meeds/wallet/storage/WalletStorageTest.java b/wallet-services/src/test/java/io/meeds/wallet/storage/WalletStorageTest.java
index 7d6adcf61..e201f338c 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/storage/WalletStorageTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/storage/WalletStorageTest.java
@@ -30,11 +30,11 @@
 import io.meeds.wallet.dao.WalletAccountBackupDAO;
 import io.meeds.wallet.entity.WalletBackupEntity;
 import io.meeds.wallet.entity.WalletEntity;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.WalletProvider;
-import io.meeds.wallet.wallet.model.WalletState;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletProvider;
+import io.meeds.wallet.model.WalletState;
 import io.meeds.wallet.test.BaseWalletTest;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.WalletUtils;
 
 public class WalletStorageTest extends BaseWalletTest {
   private static final String WALLET_PRIVATE_KEY_CONTENT = "Wallet-Private-Key-Encrypted-With-Password";
diff --git a/wallet-services/src/test/java/io/meeds/wallet/test/BaseWalletTest.java b/wallet-services/src/test/java/io/meeds/wallet/test/BaseWalletTest.java
index 400fdc142..fac8c0a9a 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/test/BaseWalletTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/test/BaseWalletTest.java
@@ -61,16 +61,16 @@
 import io.meeds.wallet.entity.WalletBlockchainStateEntity;
 import io.meeds.wallet.entity.WalletEntity;
 import io.meeds.wallet.entity.WalletPrivateKeyEntity;
-import io.meeds.wallet.wallet.model.ContractDetail;
-import io.meeds.wallet.wallet.model.ContractTransactionEvent;
-import io.meeds.wallet.wallet.model.Wallet;
-import io.meeds.wallet.wallet.model.WalletAddressLabel;
-import io.meeds.wallet.wallet.model.WalletState;
-import io.meeds.wallet.wallet.model.WalletType;
-import io.meeds.wallet.wallet.model.transaction.TransactionDetail;
-import io.meeds.wallet.wallet.service.BlockchainTransactionService;
-import io.meeds.wallet.wallet.service.WalletAccountService;
-import io.meeds.wallet.wallet.service.WalletService;
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.ContractTransactionEvent;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletAddressLabel;
+import io.meeds.wallet.model.WalletState;
+import io.meeds.wallet.model.WalletType;
+import io.meeds.wallet.service.BlockchainTransactionService;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletService;
 import io.meeds.wallet.storage.AddressLabelStorage;
 import io.meeds.wallet.storage.TransactionStorage;
 import io.meeds.wallet.storage.WalletStorage;
@@ -78,7 +78,7 @@
 import io.meeds.wallet.storage.cached.CachedTransactionStorage;
 import io.meeds.wallet.test.mock.IdentityManagerMock;
 import io.meeds.wallet.test.mock.SpaceServiceMock;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+import io.meeds.wallet.utils.WalletUtils;
 
 @ConfiguredBy({
   @ConfigurationUnit(scope = ContainerScope.ROOT, path = "conf/configuration.xml"),
diff --git a/wallet-services/src/test/java/io/meeds/wallet/test/mock/IdentityManagerMock.java b/wallet-services/src/test/java/io/meeds/wallet/test/mock/IdentityManagerMock.java
index bb1c2d780..e5af5b9a2 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/test/mock/IdentityManagerMock.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/test/mock/IdentityManagerMock.java
@@ -35,8 +35,9 @@
 import org.exoplatform.social.core.profile.*;
 import org.exoplatform.social.core.space.model.Space;
 import org.exoplatform.social.core.storage.api.IdentityStorage;
-import io.meeds.wallet.wallet.plugin.WalletAdminIdentityProvider;
-import io.meeds.wallet.wallet.utils.WalletUtils;
+
+import io.meeds.wallet.plugin.WalletAdminIdentityProvider;
+import io.meeds.wallet.utils.WalletUtils;
 
 public class IdentityManagerMock implements IdentityManager {
   List<Identity> identities = new ArrayList<>();
diff --git a/wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java b/wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java
index c14c408d2..842fd01af 100644
--- a/wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java
+++ b/wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java
@@ -27,13 +27,13 @@
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication(scanBasePackages = { 
-        WalletApplication.MODULE_NAME,
-        AvailableIntegration.KERNEL_MODULE,
-        AvailableIntegration.JPA_MODULE, 
-        AvailableIntegration.WEB_MODULE, 
+  WalletApplication.MODULE_NAME,
+  AvailableIntegration.KERNEL_MODULE,
+  AvailableIntegration.JPA_MODULE, 
+  AvailableIntegration.WEB_MODULE, 
 }, 
 exclude = {
-        LiquibaseAutoConfiguration.class,
+  LiquibaseAutoConfiguration.class,
 })
 @EnableJpaRepositories(basePackages = WalletApplication.MODULE_NAME)
 @PropertySource("classpath:application.properties")
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/blockchain-configuration.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/blockchain-configuration.xml
index b2fcae410..7beb986b9 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/blockchain-configuration.xml
+++ b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/blockchain-configuration.xml
@@ -24,12 +24,12 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   </component>
 
   <component>
-    <key>io.meeds.wallet.wallet.service.BlockchainTransactionService</key>
+    <key>io.meeds.wallet.service.BlockchainTransactionService</key>
     <type>io.meeds.wallet.blockchain.service.EthereumBlockchainTransactionService</type>
   </component>
 
   <component>
-    <key>io.meeds.wallet.wallet.service.WalletTokenAdminService</key>
+    <key>io.meeds.wallet.service.WalletTokenAdminService</key>
     <type>io.meeds.wallet.blockchain.service.EthereumWalletTokenAdminService</type>
   </component>
 
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/jsp/wallet.jsp b/wallet-webapps/src/main/webapp/WEB-INF/jsp/wallet.jsp
index 668b4a9ee..52747c854 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/jsp/wallet.jsp
+++ b/wallet-webapps/src/main/webapp/WEB-INF/jsp/wallet.jsp
@@ -2,7 +2,7 @@
 <%@ page import="jakarta.servlet.http.HttpSession" %>
 <%@ page import="org.exoplatform.webui.application.WebuiRequestContext" %>
 <%@ page import="org.exoplatform.web.application.RequestContext" %>
-<%@ page import="io.meeds.wallet.wallet.utils.WalletUtils" %>
+<%@ page import="io.meeds.wallet.utils.WalletUtils" %>
 <%
     HttpServletRequest httpRequest = ((WebuiRequestContext) RequestContext.getCurrentInstance()).getRequest();
     HttpSession httpSession = httpRequest.getSession();
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletBalance.jsp b/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletBalance.jsp
index aed518a7b..856693a56 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletBalance.jsp
+++ b/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletBalance.jsp
@@ -4,14 +4,14 @@
 <%@ page import="org.exoplatform.webui.application.WebuiRequestContext"%>
 <%@ page import="org.exoplatform.web.application.RequestContext"%>
 <%@ page import="org.exoplatform.container.ExoContainerContext"%>
-<%@ page import="io.meeds.wallet.wallet.service.WalletService"%>
-<%@ page import="io.meeds.wallet.wallet.service.WalletAccountService"%>
+<%@ page import="io.meeds.wallet.service.WalletService"%>
+<%@ page import="io.meeds.wallet.service.WalletAccountService"%>
 <%@ page import="org.exoplatform.services.resources.ResourceBundleService"%>
-<%@ page import="io.meeds.wallet.wallet.model.settings.GlobalSettings"%>
-<%@ page import="io.meeds.wallet.wallet.model.ContractDetail"%>
-<%@ page import="io.meeds.wallet.wallet.model.Wallet"%>
-<%@ page import="io.meeds.wallet.wallet.model.WalletType"%>
-<%@ page import="io.meeds.wallet.wallet.utils.WalletUtils"%>
+<%@ page import="io.meeds.wallet.model.settings.GlobalSettings"%>
+<%@ page import="io.meeds.wallet.model.ContractDetail"%>
+<%@ page import="io.meeds.wallet.model.Wallet"%>
+<%@ page import="io.meeds.wallet.model.WalletType"%>
+<%@ page import="io.meeds.wallet.utils.WalletUtils"%>
 <%@ page import="org.exoplatform.social.core.service.LinkProvider"%>
 
 <%
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletSettings.jsp b/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletSettings.jsp
index af375947e..0c4d27fc1 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletSettings.jsp
+++ b/wallet-webapps/src/main/webapp/WEB-INF/jsp/walletSettings.jsp
@@ -2,7 +2,7 @@
 <%@ page import="jakarta.servlet.http.HttpSession" %>
 <%@ page import="org.exoplatform.webui.application.WebuiRequestContext" %>
 <%@ page import="org.exoplatform.web.application.RequestContext" %>
-<%@ page import="io.meeds.wallet.wallet.utils.WalletUtils" %>
+<%@ page import="io.meeds.wallet.utils.WalletUtils" %>
 <%
 /*
 This file is part of the Meeds project (https://meeds.io/).

From 15f43fe83e6714658d61aa94cf0f2dc18d686bef Mon Sep 17 00:00:00 2001
From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com>
Date: Mon, 7 Oct 2024 11:27:09 +0200
Subject: [PATCH 12/16] feat: Access transaction history / Transaction hash -
 MEED-7485 - MEED-7484 - Meeds-io/MIPs#154 (#578)

---
 .../locale/addon/Wallet_en.properties         |  2 +-
 .../vue-app/wallet-common/js/WalletUtils.js   |  2 +
 .../wallet-reward/components/RewardApp.vue    | 33 ++++++++++++++-
 .../components/reward/RewardCard.vue          |  8 +++-
 .../components/reward/RewardDetails.vue       | 14 ++++++-
 .../components/reward/RewardDetailsItem.vue   | 42 +++++++++++++++----
 6 files changed, 87 insertions(+), 14 deletions(-)

diff --git a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
index d0ac10358..6ec33559f 100644
--- a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
+++ b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
@@ -514,7 +514,7 @@ wallet.administration.budgetConfiguration.message.confirmDeleteConfiguration=You
 wallet.administration.rewardCard.status.inPeriod=Waiting for the period to end
 wallet.administration.rewardCard.status.toReward=To Reward
 wallet.administration.rewardCard.status.noParticipant=No Participant to reward
-wallet.administration.rewardCard.status.rewardsSent=Rewards sent
+wallet.administration.rewardCard.status.rewardsSent=Rewards sent on {0}
 wallet.administration.rewardCard.status.setYourBudget=Please, set your budget first
 wallet.administration.rewardCard.label.contributions=Contributions
 wallet.administration.cancel.label=Cancel
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/WalletUtils.js b/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/WalletUtils.js
index 6438191ab..a4be01920 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/WalletUtils.js
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/WalletUtils.js
@@ -436,6 +436,8 @@ export function getTransactionEtherscanlink() {
     return 'https://polygonscan.com/tx/';
   case 80001:
     return 'https://mumbai.polygonscan.com/tx/';
+  case 80002:
+    return 'https://amoy.polygonscan.com/tx/';
   default:
     return '#';
   }
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
index a258ebf78..8371f0aa3 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
@@ -56,6 +56,8 @@
     <template v-else>
       <wallet-reward-details
         :reward-report="selectedRewardReport"
+        :transaction-ether-scan-link="transactionEtherScanLink"
+        :contract-details="contractDetails"
         @back="showRewardDetails = false" />
     </template>
   </v-app>
@@ -73,6 +75,8 @@ export default {
     showRewardDetails: false,
     rewardsPage: 0,
     rewardsPageSize: 12,
+    transactionEtherScanLink: null,
+    contractDetails: null
   }),
   computed: {
     rewardReport() {
@@ -86,12 +90,39 @@ export default {
     },
   },
   created() {
-    this.refreshRewardSettings();
+    this.init()
+      .then(() => {
+        this.transactionEtherScanLink = this.walletUtils.getTransactionEtherscanlink();
+      });
   },
   methods: {
     openBudgetConfigurationDrawer() {
       this.$refs.budgetConfiguration.open();
     },
+    init() {
+      this.loading = true;
+
+      this.error = null;
+      return this.walletUtils.initSettings(false, true, true)
+        .then(() => {
+          this.contractDetails = window.walletSettings.contractDetail;
+        })
+        .then(() => this.walletUtils.initWeb3(false, true))
+        .then(() => {
+          if (this.contractDetails) {
+            return this.tokenUtils.reloadContractDetails(this.walletAddress).then(result => this.contractDetails = result);
+          } else {
+            this.contractDetails = this.tokenUtils.getContractDetails(this.walletAddress);
+          }
+        })
+        .then(() => this.refreshRewardSettings())
+        .catch((e) => {
+          this.error = e ? String(e) : this.$t('exoplatform.wallet.error.unknownError');
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     refreshRewardSettings() {
       this.loading = true;
       return this.$rewardService.getRewardSettings()
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue
index 3c3d2102e..0ac231bf8 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue
@@ -177,7 +177,7 @@ export default {
         icon: 'fas fa-check-circle',
         iconClass: null,
         iconColor: 'success',
-        message: this.$t('wallet.administration.rewardCard.status.rewardsSent'),
+        message: this.$t('wallet.administration.rewardCard.status.rewardsSent', {0: this.rewardSentDate}),
       };
     },
     statusIcon() {
@@ -240,7 +240,11 @@ export default {
     endDate() {
       return new Date(this.period?.endDate);
     },
-
+    rewardSentDate() {
+      const reward = this.rewardReport?.rewards?.find(reward => reward?.transaction?.succeeded);
+      const sentDate = new Date(reward?.transaction?.timestamp);
+      return sentDate?.toLocaleString(this.lang, this.dateFormat);
+    },
   },
   methods: {
     openDetails() {
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
index cb30cee16..38a3ba998 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
@@ -100,8 +100,10 @@
         <wallet-reward-details-item
           :key="item.wallet.id"
           :reward="item"
+          :contract-details="contractDetails"
           :token-symbol="tokenSymbol"
-          :completely-proceeded="completelyProceeded" />
+          :completely-proceeded="completelyProceeded"
+          :transaction-ether-scan-link="transactionEtherScanLink" />
       </template>
     </v-data-table>
   </v-card>
@@ -117,6 +119,16 @@ export default {
     rewardReport: {
       type: Object,
       default: null
+    },
+    contractDetails: {
+      type: Object,
+      default: null
+    },
+    transactionEtherScanLink: {
+      type: String,
+      default: function () {
+        return null;
+      },
     }
   },
   data: () => ({
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue
index 980eeba6c..683ab9150 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue
@@ -38,7 +38,6 @@
         :deleted-user="deletedUser"
         :disabled-user="disabledUser"
         :avatar="walletAvatar"
-        :initialization-state="initializationState"
         display-no-address />
     </td>
     <td class="text-center">
@@ -135,9 +134,10 @@
               <div v-on="on" class="d-inline-block">
                 <v-list-item
                   :disabled="!status"
+                  :href="`${transactionEtherScanLink}${transactionHash}`"
+                  target="_blank"
                   dense
-                  @mousedown="$event.preventDefault()"
-                  @click="openTransaction">
+                  @mousedown="$event.preventDefault()">
                   <v-list-item-icon class="me-2 my-auto">
                     <v-icon
                       :disabled="!status"
@@ -163,6 +163,14 @@
           </v-list-item>
         </v-list>
       </v-menu>
+      <wallet-reward-account-detail
+        ref="accountDetail"
+        :fiat-symbol="fiatSymbol"
+        :contract-details="contractDetails"
+        :wallet="wallet"
+        is-read-only
+        is-display-only
+        is-administration />
     </td>
   </tr>
 </template>
@@ -174,6 +182,10 @@ export default {
       type: Object,
       default: null
     },
+    contractDetails: {
+      type: Object,
+      default: null
+    },
     tokenSymbol: {
       type: String,
       default: ''
@@ -182,6 +194,12 @@ export default {
       type: Boolean,
       default: false
     },
+    transactionEtherScanLink: {
+      type: String,
+      default: function () {
+        return null;
+      },
+    }
   },
   data: () => ({
     term: null,
@@ -193,7 +211,7 @@ export default {
       month: 'short',
       day: 'numeric',
     },
-    sendingInProgress: false
+    sendingInProgress: false,
   }),
   computed: {
     walletAvatar() {
@@ -202,8 +220,11 @@ export default {
     walletAddress() {
       return this.reward?.wallet?.address;
     },
+    wallet() {
+      return this.reward?.wallet;
+    },
     walletId() {
-      return this.reward?.wallet?.id;
+      return this.wallet?.id;
     },
     walletTechnicalId() {
       return this.reward?.wallet?.technicalId;
@@ -254,16 +275,19 @@ export default {
     amount() {
       return this.completelyProceeded ? this.reward?.tokensSent : this.reward?.amount;
     },
+    transactionHash() {
+      return this.reward?.transaction?.hash;
+    },
+    fiatSymbol() {
+      return window.walletSettings.fiatSymbol || '$';
+    }
   },
   methods: {
     closeMenu(){
       this.showMenu = false;
     },
-    openTransaction() {
-      // TO DO
-    },
     seeHistory() {
-      // TO DO
+      this.$refs.accountDetail.open();
     }
   }
 };

From cb0ad6614205c2bee92549cc1a9e401c634b1894 Mon Sep 17 00:00:00 2001
From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com>
Date: Mon, 7 Oct 2024 11:45:02 +0200
Subject: [PATCH 13/16] feat:  Apply Tertiary Color to placeholder icons -
 MEED-7467 - Meeds-io/MIPs#154 (#579)

---
 .../vue-app/wallet-reward/components/reward/RewardCard.vue      | 2 +-
 .../vue-app/wallet-reward/components/reward/RewardDetails.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue
index 0ac231bf8..3dd420b53 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue
@@ -38,7 +38,7 @@
       @click="openDetails">
       <v-card-title class="px-2 py-1">
         <v-icon
-          class="secondary--text"
+          color="tertiary"
           left>
           fas fa-calendar
         </v-icon>
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
index 38a3ba998..070c3a3c6 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
@@ -32,7 +32,7 @@
         </v-btn>
         <v-card-title class="px-2 py-1">
           <v-icon
-            class="secondary--text"
+            color="tertiary"
             left>
             fas fa-calendar
           </v-icon>

From d0deeb4218a41d3a621098c7ec859358bfb339e0 Mon Sep 17 00:00:00 2001
From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com>
Date: Mon, 7 Oct 2024 15:39:35 +0200
Subject: [PATCH 14/16] feat:  Inform when balance below the budget - MEED-7391
 - Meeds-io/MIPs#154 (#580)

---
 .../locale/addon/Wallet_en.properties         |  2 +
 .../wallet-reward/components/RewardApp.vue    |  5 +-
 .../components/reward/BudgetConfiguration.vue |  3 -
 .../components/reward/CurrentBalance.vue      | 68 ++++++++++++++++---
 4 files changed, 64 insertions(+), 14 deletions(-)

diff --git a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
index 6ec33559f..7819712ec 100644
--- a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
+++ b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
@@ -490,6 +490,8 @@ wallet.administration.introduction3=We recommend 10 Meeds to start.
 wallet.administration.introduction4=In addition to this token, {0} gas will be sent to your users to cover the transaction fees on the blockchain network.
 wallet.administration.initialFundsFormLabel=Define initial funds
 wallet.administration.gas=Gas
+wallet.administration.lowEtherBalance=Please add gas for transactions
+wallet.administration.lowTokenBalance=Please fund your wallet
 wallet.administration.meeds=Ɱeeds
 wallet.administration.initialFundsMessageLabel=Set a message to send with initial funds
 wallet.administration.initialFundsMessagePlaceholder=Enter a default message to send with initial funds
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
index 8371f0aa3..5d7c0e405 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
@@ -29,7 +29,7 @@
           class="d-flex flex-column justify-space-between"
           width="40%"
           flat>
-          <wallet-current-balance />
+          <wallet-current-balance :loading="loading" :reward-settings="rewardSettings" />
           <extension-registry-components
             name="WalletRewardingCard"
             type="wallet-reward-cards-extensions" />
@@ -93,7 +93,7 @@ export default {
     this.init()
       .then(() => {
         this.transactionEtherScanLink = this.walletUtils.getTransactionEtherscanlink();
-      });
+      }).then(this.refreshRewardSettings());
   },
   methods: {
     openBudgetConfigurationDrawer() {
@@ -115,7 +115,6 @@ export default {
             this.contractDetails = this.tokenUtils.getContractDetails(this.walletAddress);
           }
         })
-        .then(() => this.refreshRewardSettings())
         .catch((e) => {
           this.error = e ? String(e) : this.$t('exoplatform.wallet.error.unknownError');
         })
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
index 630a2e9fb..c2202f44a 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/BudgetConfiguration.vue
@@ -153,9 +153,6 @@ export default {
       default: null
     }
   },
-  data: () => ({
-
-  }),
   computed: {
     periodType() {
       return this.rewardSettings?.periodType;
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue
index c7dd504c7..0034bae04 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/CurrentBalance.vue
@@ -20,7 +20,7 @@
 -->
 <template>
   <v-card
-    :loading="loading"
+    :loading="loading || loadingWallet"
     class="border-radius border-color ma-5 mb-2"
     flat>
     <div class="d-flex flex-column flex-grow-1">
@@ -30,7 +30,23 @@
             {{ $t('exoplatform.wallet.label.currentBalance') }}
           </v-list-item-title>
         </v-list-item-content>
-        <v-list-item-action v-if="useWalletAdmin" class="ma-auto">
+        <v-list-item-action v-if="!loading && balanceBelowBudget" class="ma-auto">
+          <v-tooltip
+            :disabled="$root.isMobile"
+            bottom>
+            <template #activator="{ on }">
+              <div class="d-flex me-2" v-on="on">
+                <v-icon
+                  color="warning"
+                  size="18">
+                  fas fa-exclamation-triangle
+                </v-icon>
+              </div>
+            </template>
+            <span>{{ balanceBelowBudgetLabel }}</span>
+          </v-tooltip>
+        </v-list-item-action>
+        <v-list-item-action v-if="!loading && useWalletAdmin" class="ma-auto">
           <v-tooltip
             :disabled="$root.isMobile"
             bottom>
@@ -84,21 +100,29 @@
 </template>
 <script>
 export default {
+  props: {
+    rewardSettings: {
+      type: Object,
+      default: null
+    },
+    loading: {
+      type: Boolean,
+      default: false,
+    },
+  },
   data () {
     return {
-      loading: false,
+      loadingWallet: false,
       adminWallet: null,
       contractDetails: null,
       walletAdminUri: '/portal/administration/home/rewards/wallet',
+      configuredBudget: null
     };
   },
   computed: {
     tokenName() {
       return this.contractDetails?.name;
     },
-    tokenSymbol() {
-      return this.contractDetails?.symbol;
-    },
     tokenBalance() {
       return this.adminWallet?.tokenBalance || 0;
     },
@@ -111,13 +135,30 @@ export default {
     useWalletAdmin() {
       return this.etherBalance && Number(this.etherBalance) >= 0.002 && this.tokenBalance && Number(this.tokenBalance) >= 0.02;
     },
+    lowEtherBalance() {
+      return this.etherBalance < 1;
+    },
+    lowTokenBalance() {
+      return this.configuredBudget > this.tokenBalance;
+    },
+    balanceBelowBudget() {
+      return this.lowEtherBalance || this.lowTokenBalance;
+    },
+    balanceBelowBudgetLabel() {
+      return this.lowEtherBalance ? this.$t('wallet.administration.lowEtherBalance') : this.$t('wallet.administration.lowTokenBalance');
+    }
+  },
+  watch: {
+    rewardSettings() {
+      this.computeDistributionForecast();
+    }
   },
   created() {
     this.init();
   },
   methods: {
     init() {
-      this.loading = true;
+      this.loadingWallet = true;
       this.error = null;
       return this.walletUtils.initSettings(false, true)
         .then(() => {
@@ -125,8 +166,19 @@ export default {
           return this.addressRegistry.searchWalletByTypeAndId('admin', 'admin');
         })
         .then((adminWallet) => this.adminWallet = adminWallet)
+        .then(() => {
+          this.$nextTick().then(() => {
+            this.computeDistributionForecast();
+          });
+        })
         .finally(() => {
-          this.loading = false;
+          this.loadingWallet = false;
+        });
+    },
+    computeDistributionForecast() {
+      return this.$rewardService.computeDistributionForecast(this.rewardSettings)
+        .then(distributionForecast => {
+          this.configuredBudget = distributionForecast?.budget || 0;
         });
     },
   }

From 774c2361f54c9741939a6815f1f32d11b90c078e Mon Sep 17 00:00:00 2001
From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com>
Date: Tue, 8 Oct 2024 11:08:39 +0200
Subject: [PATCH 15/16] feat: Ensure Update Actual status of rewarding -
 MEED-7589 - Meeds-io/MIPs#154 (#582)

---
 .../reward/service/RewardReportService.java   | 10 +++++---
 .../reward/service/RewardSettingsService.java |  3 ---
 .../wallet/service/WalletAccountService.java  | 12 ++++-----
 .../service/WalletRewardReportService.java    | 18 +++++++++----
 .../service/WalletRewardSettingsService.java  |  8 +++---
 .../service/WalletAccountServiceImpl.java     | 25 +++++++++----------
 .../wallet-reward/components/RewardApp.vue    |  8 +++++-
 .../components/reward/RewardDetails.vue       |  2 +-
 8 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java
index 8c47efdce..5dbf78972 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java
@@ -20,17 +20,21 @@
 import java.util.List;
 import java.util.Set;
 
-import io.meeds.wallet.model.*;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
 
 import org.exoplatform.social.core.identity.model.Identity;
 
+import io.meeds.wallet.model.DistributionForecast;
+import io.meeds.wallet.model.RewardPeriod;
+import io.meeds.wallet.model.RewardPeriodType;
+import io.meeds.wallet.model.RewardReport;
+import io.meeds.wallet.model.RewardSettings;
+import io.meeds.wallet.model.WalletReward;
+
 /**
  * A storage service to save/load reward settings
  */
-@Service("rewardReportService")
 public interface RewardReportService {
 
   /**
diff --git a/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardSettingsService.java b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardSettingsService.java
index baab93b2c..c6578f066 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardSettingsService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardSettingsService.java
@@ -17,14 +17,11 @@
 package io.meeds.wallet.reward.service;
 
 
-import org.springframework.stereotype.Service;
-
 import io.meeds.wallet.model.RewardSettings;
 
 /**
  * A storage service to save/load reward transactions
  */
-@Service("rewardSettingsService")
 public interface RewardSettingsService {
 
   /**
diff --git a/wallet-api/src/main/java/io/meeds/wallet/service/WalletAccountService.java b/wallet-api/src/main/java/io/meeds/wallet/service/WalletAccountService.java
index da33ee84f..184a169b5 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/service/WalletAccountService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/service/WalletAccountService.java
@@ -22,16 +22,16 @@
 
 import org.exoplatform.social.core.identity.model.Identity;
 
-import io.meeds.wallet.model.*;
-
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Service;
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletAddressLabel;
+import io.meeds.wallet.model.WalletProvider;
+import io.meeds.wallet.model.WalletState;
+import io.meeds.wallet.model.WalletType;
 
 /**
  * A service to manage wallets of different types: user, space, admin
  */
-@Service
-@Primary
 public interface WalletAccountService {
 
   /**
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
index b76216097..7ec150a8f 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
@@ -47,11 +47,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-
-import io.meeds.wallet.model.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.context.annotation.Primary;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -65,6 +62,18 @@
 import io.meeds.gamification.constant.IdentityType;
 import io.meeds.gamification.model.filter.RealizationFilter;
 import io.meeds.gamification.service.RealizationService;
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.DistributionForecast;
+import io.meeds.wallet.model.RewardBudgetType;
+import io.meeds.wallet.model.RewardPeriod;
+import io.meeds.wallet.model.RewardPeriodType;
+import io.meeds.wallet.model.RewardReport;
+import io.meeds.wallet.model.RewardSettings;
+import io.meeds.wallet.model.RewardStatus;
+import io.meeds.wallet.model.TransactionDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletReward;
+import io.meeds.wallet.model.WalletType;
 import io.meeds.wallet.reward.storage.WalletRewardReportStorage;
 import io.meeds.wallet.service.WalletAccountService;
 import io.meeds.wallet.service.WalletTokenAdminService;
@@ -74,8 +83,7 @@
 /**
  * A service to manage reward reports
  */
-@Primary
-@Service("rewardReportService")
+@Service
 public class WalletRewardReportService implements RewardReportService {
 
   private static final Log          LOG            = ExoLogger.getLogger(WalletRewardReportService.class);
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardSettingsService.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardSettingsService.java
index 7e101d3c1..1f85ff956 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardSettingsService.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardSettingsService.java
@@ -27,7 +27,6 @@
 import java.util.Objects;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 import org.exoplatform.commons.api.settings.SettingService;
@@ -38,8 +37,7 @@
 /**
  * A storage service to save/load reward transactions
  */
-@Primary
-@Service("rewardSettingsService")
+@Service
 public class WalletRewardSettingsService implements RewardSettingsService {
 
   @Autowired
@@ -56,8 +54,8 @@ public RewardSettings getSettings() { // NOSONAR
 
     SettingValue<?> settingsValue = settingService.get(REWARD_CONTEXT, REWARD_SCOPE, REWARD_SETTINGS_KEY_NAME);
 
-    String settingsValueString = settingsValue == null || settingsValue.getValue() == null ? null
-                                                                                           : settingsValue.getValue().toString();
+    String settingsValueString = settingsValue == null || settingsValue.getValue() == null ? null :
+                                                                                           settingsValue.getValue().toString();
 
     RewardSettings rewardSettings;
     if (settingsValueString == null) {
diff --git a/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java b/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java
index 55690aa9a..28878777a 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java
@@ -46,13 +46,16 @@
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.security.SignatureException;
-import java.util.*;
-
-import jakarta.servlet.ServletContext;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.picocontainer.Startable;
 import org.web3j.crypto.Keys;
 import org.web3j.crypto.Sign;
 import org.web3j.crypto.Sign.SignatureData;
@@ -78,14 +81,15 @@
 import io.meeds.wallet.model.WalletProvider;
 import io.meeds.wallet.model.WalletState;
 import io.meeds.wallet.model.WalletType;
-import io.meeds.wallet.service.WalletAccountService;
-import io.meeds.wallet.service.WalletTokenAdminService;
 import io.meeds.wallet.statistic.ExoWalletStatistic;
 import io.meeds.wallet.statistic.ExoWalletStatisticService;
 import io.meeds.wallet.storage.AddressLabelStorage;
 import io.meeds.wallet.storage.WalletStorage;
 
-public class WalletAccountServiceImpl implements WalletAccountService, ExoWalletStatisticService, Startable {
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.ServletContext;
+
+public class WalletAccountServiceImpl implements WalletAccountService, ExoWalletStatisticService {
 
   private static final String     ERROR_BROADCASTING_EVENT_FOR_WALLET     = "Error broadcasting event {} for wallet {}";
 
@@ -139,7 +143,7 @@ public WalletAccountServiceImpl(PortalContainer container,
     }
   }
 
-  @Override
+  @PostConstruct
   public void start() {
     // Ensure to make initialization after starting all other services of Wallet
     PortalContainer.addInitTask(container.getPortalContext(), new RootContainer.PortalContainerPostInitTask() {
@@ -159,11 +163,6 @@ public void execute(ServletContext context, PortalContainer portalContainer) {
     });
   }
 
-  @Override
-  public void stop() {
-    // Nothing to stop
-  }
-
   @Override
   public Set<Wallet> listWallets() {
     Set<Wallet> wallets = accountStorage.listWallets();
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
index 5d7c0e405..3241543f5 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
@@ -58,6 +58,7 @@
         :reward-report="selectedRewardReport"
         :transaction-ether-scan-link="transactionEtherScanLink"
         :contract-details="contractDetails"
+        @reward-report-updated="rewardReportUpdated"
         @back="showRewardDetails = false" />
     </template>
   </v-app>
@@ -101,7 +102,6 @@ export default {
     },
     init() {
       this.loading = true;
-
       this.error = null;
       return this.walletUtils.initSettings(false, true, true)
         .then(() => {
@@ -161,6 +161,12 @@ export default {
     settingUpdated() {
       this.rewardReports = [];
       this.refreshRewardSettings();
+    },
+    rewardReportUpdated(rewardReport) {
+      const index = this.rewardReports.findIndex(r => r?.period === rewardReport?.period);
+      if (index !== -1) {
+        this.rewardReports[index] = rewardReport;
+      }
     }
   },
 };
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
index 070c3a3c6..52f5e600d 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
@@ -257,7 +257,7 @@ export default {
       return this.$rewardService.sendRewards(this.period).then(() => {
         this.$rewardService.computeRewardsByPeriod(this.period)
           .then(rewardReport => {
-            this.rewardReport = rewardReport;
+            this.$emit('reward-report-updated', rewardReport);
           }).finally(() => {
             this.loadingSending = false;
           });

From 170a122fb15f76b5122b1ec3c1aaaf21533aa918 Mon Sep 17 00:00:00 2001
From: Azmi TOUIL <42934070+AzmiTouil@users.noreply.github.com>
Date: Wed, 9 Oct 2024 11:04:52 +0200
Subject: [PATCH 16/16] feat: Remove Useless database table / Update UT -
 MEED-7589 - Meeds-io/MIPs#154 (#584)

---
 .../wallet/model/DistributionForecast.java    |   2 +-
 .../io/meeds/wallet/model/RewardSettings.java |   2 +-
 .../reward/service/RewardReportService.java   |   4 +-
 .../service/WalletTokenAdminService.java      |   3 +-
 .../service/WalletTransactionService.java     |  14 +-
 wallet-reward-services/pom.xml                |   2 +-
 .../wallet/reward/rest/RewardReportREST.java  | 106 ++----
 .../reward/rest/RewardSettingsREST.java       |  15 +-
 .../service/WalletRewardReportService.java    |   7 +-
 .../reward-rdbms.db.changelog-1.0.0.xml       |  20 ++
 .../meeds/wallet/reward/BaseRewardTest.java   |  74 -----
 .../wallet/reward/BaseWalletRewardTest.java   | 306 ------------------
 ...RewardSucceedNotificationListenerTest.java |   2 +-
 .../RewardSuccessNotificationPluginTest.java  | 106 ++++++
 .../RewardSuccessTemplateBuilderTest.java     | 129 ++++++++
 .../RewardSuccessTemplateProviderTest.java    |  73 +++++
 .../reward/rest/TestRewardReportREST.java     | 105 +++++-
 .../reward/rest/TestRewardSettingsREST.java   |  22 +-
 .../RewardStatusVerifierTaskTest.java         |  90 ++++++
 .../WalletRewardReportServiceTest.java        | 252 ++++++++++++++-
 .../WalletRewardSettingsServiceTest.java      |   9 +-
 .../WalletRewardReportStorageTest.java        | 208 ++++++++++++
 .../EthereumWalletTokenAdminService.java      |   2 +-
 .../wallet/entity/AddressLabelEntity.java     |   1 -
 .../wallet/entity/TransactionEntity.java      |   1 -
 .../wallet/entity/WalletBackupEntity.java     |   1 -
 .../entity/WalletBlockchainStateEntity.java   |   1 -
 .../io/meeds/wallet/entity/WalletEntity.java  |   1 -
 .../wallet/entity/WalletPrivateKeyEntity.java |   1 -
 .../service/WalletAccountServiceImpl.java     |   6 +-
 .../service/WalletContractServiceImpl.java    |   3 -
 .../wallet/service/WalletServiceImpl.java     |   4 -
 .../service/EthereumClientConnectorTest.java  |  25 +-
 .../meeds/wallet/dao/AddressLabelDAOTest.java |   3 -
 .../dao/WalletAccountBackupDAOTest.java       |   4 -
 .../wallet/dao/WalletAccountDAOTest.java      |   4 -
 .../wallet/dao/WalletPrivateKeyDAOTest.java   |   4 -
 .../wallet/dao/WalletTransactionDAOTest.java  |   4 -
 ...ationWalletInitializationListenerTest.java |   1 -
 .../service/WalletAccountServiceTest.java     |   4 +-
 .../storage/AddressLabelStorageTest.java      |   6 -
 .../storage/TransactionStorageTest.java       |   5 -
 .../wallet/storage/WalletStorageTest.java     |   7 -
 .../io/meeds/wallet/test/BaseWalletTest.java  |   7 +-
 .../achievementsExtensions/extensions.js      |   2 +-
 .../achievementsExtensions/js/service.js      |   2 +-
 .../components/wallet-app/RewardDetail.vue    |  21 +-
 .../wallet-common/js/WalletBalanceAPI.js      |   2 +-
 .../components/WalletOverview.vue             |   2 +-
 .../components/WalletOverviewDrawer.vue       |   4 +-
 .../components/WalletOverviewRewardItem.vue   |  25 +-
 .../WalletOverviewRewardPluginItem.vue        |  54 ----
 .../wallet-overview/initComponents.js         |   2 -
 .../vue-app/wallet-common/walletCommon.js     |   2 -
 .../components/WeeklyEarnings.vue             |   6 +-
 55 files changed, 1073 insertions(+), 695 deletions(-)
 delete mode 100644 wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseRewardTest.java
 delete mode 100644 wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseWalletRewardTest.java
 create mode 100644 wallet-reward-services/src/test/java/io/meeds/wallet/reward/notification/RewardSuccessNotificationPluginTest.java
 create mode 100644 wallet-reward-services/src/test/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateBuilderTest.java
 create mode 100644 wallet-reward-services/src/test/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateProviderTest.java
 create mode 100644 wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardStatusVerifierTaskTest.java
 create mode 100644 wallet-reward-services/src/test/java/io/meeds/wallet/reward/storage/WalletRewardReportStorageTest.java
 delete mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardPluginItem.vue

diff --git a/wallet-api/src/main/java/io/meeds/wallet/model/DistributionForecast.java b/wallet-api/src/main/java/io/meeds/wallet/model/DistributionForecast.java
index 5413e5996..a5118de6a 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/model/DistributionForecast.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/DistributionForecast.java
@@ -29,5 +29,5 @@ public class DistributionForecast {
 
   private double acceptedContributions;
 
-  private double Budget;
+  private double budget;
 }
diff --git a/wallet-api/src/main/java/io/meeds/wallet/model/RewardSettings.java b/wallet-api/src/main/java/io/meeds/wallet/model/RewardSettings.java
index 34cba79d2..2ce33160d 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/model/RewardSettings.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/model/RewardSettings.java
@@ -34,7 +34,7 @@ public class RewardSettings implements Serializable, Cloneable {
 
   private String            timeZone         = ZoneId.systemDefault().getId();
 
-  private RewardBudgetType  budgetType       = RewardBudgetType.DEFAULT;;
+  private RewardBudgetType  budgetType       = RewardBudgetType.DEFAULT;
 
   private double            threshold        = 0;
 
diff --git a/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java
index 5dbf78972..a78385190 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/reward/service/RewardReportService.java
@@ -65,10 +65,10 @@ public interface RewardReportService {
    * @param localDate a {@link LocalDate} inside the period time
    *          that will be retrieved
    * @param username current username sending rewards
-   * @throws Exception if an error occurs while sending the rewards transactions
+   * @throws IllegalAccessException if an error occurs while sending the rewards transactions
    *           on blockchain
    */
-  void sendRewards(LocalDate localDate, String username) throws Exception; // NOSONAR
+  void sendRewards(LocalDate localDate, String username) throws IllegalAccessException; // NOSONAR
 
   /**
    * Retrieve a {@link RewardReport} corresponding to a period of time
diff --git a/wallet-api/src/main/java/io/meeds/wallet/service/WalletTokenAdminService.java b/wallet-api/src/main/java/io/meeds/wallet/service/WalletTokenAdminService.java
index 57baba65b..f7222d834 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/service/WalletTokenAdminService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/service/WalletTokenAdminService.java
@@ -105,9 +105,8 @@ public interface WalletTokenAdminService {
    * @param address
    * @return {@link TransactionDetail} with the hash of the transaction sent in
    *         blockchain
-   * @throws Exception
    */
-  BigInteger getTokenBalanceOf(String address) throws Exception;// NOSONAR
+  BigInteger getTokenBalanceOf(String address);// NOSONAR
 
   /**
    * Get ether balance of a wallet address (on blockchain)
diff --git a/wallet-api/src/main/java/io/meeds/wallet/service/WalletTransactionService.java b/wallet-api/src/main/java/io/meeds/wallet/service/WalletTransactionService.java
index 1ae59cee2..aac84711c 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/service/WalletTransactionService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/service/WalletTransactionService.java
@@ -19,8 +19,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import org.springframework.stereotype.Service;
-
 import io.meeds.wallet.model.TransactionDetail;
 import io.meeds.wallet.model.TransactionStatistics;
 import io.meeds.wallet.model.Wallet;
@@ -37,7 +35,7 @@ public interface WalletTransactionService {
    * @param address {@link Wallet} address
    * @return {@link List} of pending {@link TransactionDetail}
    */
-  public List<TransactionDetail> getPendingWalletTransactionsNotSent(String address);
+  List<TransactionDetail> getPendingWalletTransactionsNotSent(String address);
 
   /**
    * Retrieves the list of pending transactions of a given wallet from database
@@ -46,14 +44,14 @@ public interface WalletTransactionService {
    * @param address {@link Wallet} address
    * @return {@link List} of pending {@link TransactionDetail}
    */
-  public List<TransactionDetail> getPendingWalletTransactionsSent(String address);
+  List<TransactionDetail> getPendingWalletTransactionsSent(String address);
 
   /**
    * @param address {@link Wallet} address
    * @return {@link List} of pending {@link TransactionDetail} of type ether
    *         sending marked as pending in database
    */
-  public List<TransactionDetail> getPendingEtherTransactions(String address);
+  List<TransactionDetail> getPendingEtherTransactions(String address);
 
   /**
    * @return pending contract transactions already sent to blockchain
@@ -207,7 +205,7 @@ List<TransactionDetail> getTransactions(String address, // NOSONAR
    * @param transactionDetail of type {@link TransactionDetail} that boosted a
    *          previous {@link TransactionDetail} having the same nonce
    */
-  public void cancelTransactionsWithSameNonce(TransactionDetail transactionDetail);
+  void cancelTransactionsWithSameNonce(TransactionDetail transactionDetail);
 
   /**
    * Count the number of transactions sent from the same Wallet and having same
@@ -219,11 +217,11 @@ List<TransactionDetail> getTransactions(String address, // NOSONAR
    * @return {@link Long} for transactions having same nonce but the designated
    *         transactionHash
    */
-  public long countPendingTransactionsWithSameNonce(String transactionHash, String fromAddress, long nonce);
+  long countPendingTransactionsWithSameNonce(String transactionHash, String fromAddress, long nonce);
 
   /**
    * @return count of transactions present in database
    */
-  public long countTransactions();
+  long countTransactions();
 
 }
diff --git a/wallet-reward-services/pom.xml b/wallet-reward-services/pom.xml
index 3f945c261..4df92069a 100644
--- a/wallet-reward-services/pom.xml
+++ b/wallet-reward-services/pom.xml
@@ -25,7 +25,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <artifactId>wallet-reward-services</artifactId>
   <name>Meeds:: Add-on:: Wallet - Reward Services</name>
   <properties>
-    <exo.test.coverage.ratio>0.18</exo.test.coverage.ratio>
+    <exo.test.coverage.ratio>0.83</exo.test.coverage.ratio>
   </properties>
   <dependencies>
     <dependency>
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
index 0f4a61fd1..07e465f64 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/rest/RewardReportREST.java
@@ -40,12 +40,6 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import org.exoplatform.common.http.HTTPStatus;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
 
 import io.meeds.wallet.reward.service.RewardReportService;
 import io.meeds.wallet.reward.service.RewardSettingsService;
@@ -59,21 +53,19 @@
 import org.springframework.data.web.PagedResourcesAssembler;
 import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.PagedModel;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ResponseStatusException;
 
 
 @RestController
 @RequestMapping("reward")
 @Tag(name = "rewards", description = "Manage wallet rewards") // NOSONAR
 public class RewardReportREST {
-  
-  private static final String   ERROR_PARAM            = "error";
-
   private static final String   ERROR_EMPTY_PARAM_DATE = "Bad request sent to server with empty 'date' parameter";
 
-  private static final Log      LOG                    = ExoLogger.getLogger(RewardReportREST.class);
-
   @Autowired
   private RewardReportService   rewardReportService;
 
@@ -160,23 +152,13 @@ public Response computeRewardsByUser(@Parameter(description = "A date with forma
                                        @RequestParam("date")
                                        String date) {
     if (StringUtils.isBlank(date)) {
-      return Response.status(HTTPStatus.BAD_REQUEST).entity(ERROR_EMPTY_PARAM_DATE).build();
-    }
-    try {
-      RewardPeriod rewardPeriod = getRewardPeriod(date);
-      RewardReport rewardReport = rewardReportService.computeRewardsByUser(rewardPeriod.getPeriodMedianDate(), WalletUtils.getCurrentUserIdentityId());
-      rewardReport.setPeriod(new RewardPeriodWithFullDate(rewardReport.getPeriod()));
-      return Response.ok(rewardReport).build();
-    } catch (Exception e) {
-      LOG.error("Error getting user's computed reward", e);
-      JSONObject object = new JSONObject();
-      try {
-        object.append(ERROR_PARAM, e.getMessage());
-      } catch (JSONException e1) {
-        // Nothing to do
-      }
-      return Response.status(HTTPStatus.INTERNAL_ERROR).type(MediaType.APPLICATION_JSON).entity(object.toString()).build();
+      throw new ResponseStatusException(HttpStatus.BAD_REQUEST, ERROR_EMPTY_PARAM_DATE);
     }
+    RewardPeriod rewardPeriod = getRewardPeriod(date);
+    RewardReport rewardReport = rewardReportService.computeRewardsByUser(rewardPeriod.getPeriodMedianDate(),
+                                                                         WalletUtils.getCurrentUserIdentityId());
+    rewardReport.setPeriod(new RewardPeriodWithFullDate(rewardReport.getPeriod()));
+    return Response.ok(rewardReport).build();
   }
 
 
@@ -191,21 +173,13 @@ public Response computeRewardsByUser(@Parameter(description = "A date with forma
       @ApiResponse(responseCode = "400", description = "Invalid query input"),
       @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
       @ApiResponse(responseCode = "500", description = "Internal server error") })
-  public Response sendRewards(HttpServletRequest request,
-                              @RequestBody
-                              RewardPeriod rewardPeriod) {
+  public void sendRewards(HttpServletRequest request,
+                          @RequestBody
+                          RewardPeriod rewardPeriod) {
     try {
       rewardReportService.sendRewards(rewardPeriod.getPeriodMedianDate(), request.getRemoteUser());
-      return Response.noContent().build();
-    } catch (Exception e) {
-      LOG.error("Error getting computed reward", e);
-      JSONObject object = new JSONObject();
-      try {
-        object.append(ERROR_PARAM, e.getMessage());
-      } catch (JSONException e1) {
-        // Nothing to do
-      }
-      return Response.status(HTTPStatus.INTERNAL_ERROR).type(MediaType.APPLICATION_JSON).entity(object.toString()).build();
+    } catch (IllegalAccessException e) {
+      throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
     }
   }
 
@@ -222,20 +196,9 @@ public Response sendRewards(HttpServletRequest request,
   public Response listRewards(@Parameter(description = "limit of items to load", required = true)
                               @RequestParam("limit")
                               int limit) {
-    try {
-      List<WalletReward> rewards = rewardReportService.listRewards(WalletUtils.getCurrentUserId(), limit);
-      rewards.forEach(reward -> reward.setPeriod(new RewardPeriodWithFullDate(reward.getPeriod())));
-      return Response.ok(rewards).build();
-    } catch (Exception e) {
-      LOG.error("Error getting list of reward for current user", e);
-      JSONObject object = new JSONObject();
-      try {
-        object.append(ERROR_PARAM, e.getMessage());
-      } catch (JSONException e1) {
-        // Nothing to do
-      }
-      return Response.status(HTTPStatus.INTERNAL_ERROR).type(MediaType.APPLICATION_JSON).entity(object.toString()).build();
-    }
+    List<WalletReward> rewards = rewardReportService.listRewards(WalletUtils.getCurrentUserId(), limit);
+    rewards.forEach(reward -> reward.setPeriod(new RewardPeriodWithFullDate(reward.getPeriod())));
+    return Response.ok(rewards).build();
   }
 
   @GetMapping(path = "countRewards")
@@ -248,31 +211,18 @@ public Response listRewards(@Parameter(description = "limit of items to load", r
           @ApiResponse(responseCode = "200", description = "Request fulfilled"),
           @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
           @ApiResponse(responseCode = "500", description = "Internal server error") })
-  public Response countRewards(@Context Request request,
-                               @Parameter(description = "user id", required = true)
-                               @RequestParam("userId")
-                               String userId) {
-    try {
-      Double sumRewards = rewardReportService.countRewards(userId);
-      EntityTag eTag = new EntityTag(String.valueOf(sumRewards));
-      Response.ResponseBuilder builder = request.evaluatePreconditions(eTag);
-      if (builder == null) {
-        JSONObject result = new JSONObject();
-        result.put("sumRewards", sumRewards);
-        builder = Response.ok(result.toString(), MediaType.APPLICATION_JSON);
-        builder.tag(eTag);
-      }
-      return builder.build();
-    } catch (Exception e) {
-      LOG.error("Error getting sum of reward for current user", e);
-      JSONObject object = new JSONObject();
-      try {
-        object.append(ERROR_PARAM, e.getMessage());
-      } catch (JSONException e1) {
-        // Nothing to do
-      }
-      return Response.status(HTTPStatus.INTERNAL_ERROR).type(MediaType.APPLICATION_JSON).entity(object.toString()).build();
+  public ResponseEntity<Double> countRewards(HttpServletRequest request,
+                                             @Parameter(description = "user id", required = true)
+                                             @RequestParam("userId")
+                                             String userId) {
+    Double sumRewards = rewardReportService.countRewards(userId);
+    String eTagValue = String.valueOf(sumRewards.hashCode());
+
+    String requestETag = request.getHeader(HttpHeaders.IF_NONE_MATCH);
+    if (requestETag != null && requestETag.equals(eTagValue)) {
+      return ResponseEntity.status(HttpStatus.NOT_MODIFIED).build();
     }
+    return ResponseEntity.ok().eTag(eTagValue).body(sumRewards);
   }
 
   @GetMapping(path = "periods")
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/rest/RewardSettingsREST.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/rest/RewardSettingsREST.java
index 4891e6417..d80b8a94c 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/rest/RewardSettingsREST.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/rest/RewardSettingsREST.java
@@ -21,8 +21,6 @@
 
 import javax.ws.rs.core.Response;
 import org.apache.commons.lang3.StringUtils;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
 
 import io.meeds.wallet.model.RewardPeriod;
 import io.meeds.wallet.model.RewardPeriodType;
@@ -47,8 +45,6 @@
 @Tag(name = "reward/settings", description = "Manage reward module settings") // NOSONAR
 public class RewardSettingsREST {
 
-  private static final Log      LOG = ExoLogger.getLogger(RewardSettingsREST.class);
-
   @Autowired
   private RewardSettingsService rewardSettingsService;
 
@@ -77,14 +73,9 @@ public RewardSettings getSettings() {
                           @ApiResponse(responseCode = "400", description = "Invalid query input"),
                           @ApiResponse(responseCode = "401", description = "Unauthorized operation"),
                           @ApiResponse(responseCode = "500", description = "Internal server error") })
-  public Response saveSettings(@RequestBody
-  RewardSettings rewardSettings) {
-    try {
-      rewardSettingsService.saveSettings(rewardSettings);
-      return Response.noContent().build();
-    } catch (IllegalArgumentException e) {
-      throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage());
-    }
+  public void saveSettings(@RequestBody
+                           RewardSettings rewardSettings) {
+    rewardSettingsService.saveSettings(rewardSettings);
   }
 
   @DeleteMapping
diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
index 7ec150a8f..f48b8f8ea 100644
--- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
+++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java
@@ -116,7 +116,7 @@ public WalletRewardReportService(WalletAccountService walletAccountService,
   }
 
   @Override
-  public void sendRewards(LocalDate date, String username) throws Exception { // NOSONAR
+  public void sendRewards(LocalDate date, String username) throws IllegalAccessException { // NOSONAR
     if (!isUserRewardingAdmin(username)) {
       throw new IllegalAccessException("User " + username + " is not allowed to send rewards");
     }
@@ -463,13 +463,8 @@ private void computeReward(RewardSettings rewardSettings, Map<Long, Double> earn
     // Filter non-eligible users switch threshold
     filterEligibleMembers(earnedPoints.entrySet(), enabledRewards, rewardSettings);
 
-    double amountPerPoint;
     double totalFixedBudget;
     switch (budgetType) {
-    case FIXED_PER_POINT:
-      amountPerPoint = configuredPluginAmount;
-      addRewardsSwitchPointAmount(enabledRewards, earnedPoints.entrySet(), amountPerPoint);
-      break;
     case FIXED:
       totalFixedBudget = configuredPluginAmount;
       addTeamMembersReward(earnedPoints, totalFixedBudget, enabledRewards);
diff --git a/wallet-reward-services/src/main/resources/db/changelog/reward-rdbms.db.changelog-1.0.0.xml b/wallet-reward-services/src/main/resources/db/changelog/reward-rdbms.db.changelog-1.0.0.xml
index 299cad16e..b1d0b7be8 100644
--- a/wallet-reward-services/src/main/resources/db/changelog/reward-rdbms.db.changelog-1.0.0.xml
+++ b/wallet-reward-services/src/main/resources/db/changelog/reward-rdbms.db.changelog-1.0.0.xml
@@ -198,4 +198,24 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
   </changeSet>
 
+  <changeSet id="reward" author="1.0.0-17">
+    <preConditions>
+      <tableExists tableName="ADDONS_WALLET_GAM_TEAM"/>
+      <tableExists tableName="ADDONS_WALLET_GAM_TEAM_MEMBER"/>
+      <tableExists tableName="ADDONS_WALLET_REWARD_PLUGIN"/>
+      <foreignKeyConstraintExists foreignKeyTableName="ADDONS_WALLET_GAM_TEAM_MEMBER"
+                                  foreignKeyName="FK_WALLET_GAM_01"/>
+      <foreignKeyConstraintExists foreignKeyTableName="ADDONS_WALLET_REWARD" foreignKeyName="FK_WALLET_GAM_02"/>
+    </preConditions>
+    <dropForeignKeyConstraint
+            baseTableName="ADDONS_WALLET_GAM_TEAM_MEMBER"
+            constraintName="FK_WALLET_GAM_01"/>
+    <dropForeignKeyConstraint
+            baseTableName="ADDONS_WALLET_REWARD"
+            constraintName="FK_WALLET_GAM_02"/>
+    <dropTable tableName="ADDONS_WALLET_GAM_TEAM"/>
+    <dropTable tableName="ADDONS_WALLET_GAM_TEAM_MEMBER"/>
+    <dropTable tableName="ADDONS_WALLET_REWARD_PLUGIN"/>
+  </changeSet>
+
 </databaseChangeLog>
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseRewardTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseRewardTest.java
deleted file mode 100644
index 15718a386..000000000
--- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseRewardTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * This file is part of the Meeds project (https://meeds.io/).
- * 
- * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package io.meeds.wallet.reward;
-
-import io.meeds.wallet.model.ContractDetail;
-import io.meeds.wallet.service.WalletService;
-import io.meeds.wallet.utils.WalletUtils;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-import org.exoplatform.component.test.ConfigurationUnit;
-import org.exoplatform.component.test.ConfiguredBy;
-import org.exoplatform.component.test.ContainerScope;
-
-import io.meeds.kernel.test.AbstractSpringTest;
-import io.meeds.kernel.test.KernelExtension;
-import io.meeds.spring.AvailableIntegration;
-
-@ExtendWith({ SpringExtension.class, KernelExtension.class })
-@SpringBootApplication(scanBasePackages = {
-        BaseRewardTest.MODULE_NAME,
-        AvailableIntegration.KERNEL_TEST_MODULE,
-        AvailableIntegration.LIQUIBASE_MODULE,
-        AvailableIntegration.JPA_MODULE,
-        AvailableIntegration.WEB_MODULE,
-})
-@ConfiguredBy({
-  @ConfigurationUnit(scope = ContainerScope.ROOT, path = "conf/configuration.xml"),
-  @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/portal/configuration.xml"),
-  @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/test-wallet-reward-configuration.xml"),
-})
-public abstract class BaseRewardTest extends AbstractSpringTest {
-
-  public static final String MODULE_NAME      = "io.meeds.wallet";
-
-  @BeforeEach
-  public void setUp() {
-    getContainer();
-    setContractDetails();
-    begin();
-  }
-  private void setContractDetails() {
-    WalletService walletService = getContainer().getComponentInstanceOfType(WalletService.class);
-    ContractDetail contractDetail = new ContractDetail();
-    contractDetail.setName("name");
-    contractDetail.setSymbol("symbol");
-    contractDetail.setDecimals(12);
-    contractDetail.setAddress(WalletUtils.getContractAddress());
-    contractDetail.setContractType("3");
-    contractDetail.setNetworkId(1L);
-    walletService.setConfiguredContractDetail(contractDetail);
-  }
-
-}
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseWalletRewardTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseWalletRewardTest.java
deleted file mode 100644
index bfbf4fc19..000000000
--- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/BaseWalletRewardTest.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package io.meeds.wallet.reward;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import io.meeds.wallet.reward.dao.RewardDAO;
-import io.meeds.wallet.reward.dao.RewardPeriodDAO;
-import io.meeds.wallet.reward.service.RewardSettingsService;
-import io.meeds.wallet.reward.service.WalletRewardSettingsService;
-import io.meeds.wallet.service.WalletService;
-import io.meeds.wallet.utils.RewardUtils;
-import io.meeds.wallet.utils.WalletUtils;
-
-import org.junit.After;
-import org.junit.Before;
-import org.mockito.Mockito;
-
-import org.exoplatform.commons.utils.MapResourceBundle;
-import org.exoplatform.component.test.AbstractKernelTest;
-import org.exoplatform.container.PortalContainer;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.services.resources.ResourceBundleService;
-import org.exoplatform.social.core.manager.IdentityManager;
-import org.exoplatform.social.core.space.spi.SpaceService;
-import io.meeds.wallet.dao.AddressLabelDAO;
-import io.meeds.wallet.dao.WalletAccountDAO;
-import io.meeds.wallet.dao.WalletBlockchainStateDAO;
-import io.meeds.wallet.dao.WalletPrivateKeyDAO;
-import io.meeds.wallet.dao.WalletTransactionDAO;
-import io.meeds.wallet.entity.AddressLabelEntity;
-import io.meeds.wallet.entity.TransactionEntity;
-import io.meeds.wallet.entity.WalletEntity;
-import io.meeds.wallet.entity.WalletPrivateKeyEntity;
-import io.meeds.wallet.model.ContractDetail;
-import io.meeds.wallet.model.RewardBudgetType;
-import io.meeds.wallet.model.RewardSettings;
-import io.meeds.wallet.model.RewardTeam;
-import io.meeds.wallet.model.RewardTeamMember;
-import io.meeds.wallet.model.TransactionDetail;
-import io.meeds.wallet.model.Wallet;
-import io.meeds.wallet.model.WalletAddressLabel;
-import io.meeds.wallet.model.WalletProvider;
-import io.meeds.wallet.model.WalletState;
-
-public abstract class BaseWalletRewardTest extends AbstractKernelTest {
-
-    private static final Log                LOG                  = ExoLogger.getLogger(BaseWalletRewardTest.class);
-
-    protected static final long             IDENTITY_ID          = 1L;
-
-    protected static final String           ADDRESS              = "walletAddress";
-
-    protected static final String           PHRASE               = "passphrase";
-
-    protected static final String           INITIALIZATION_STATE = WalletState.INITIALIZED.name();
-
-    protected static final boolean          IS_ENABLED           = true;
-
-    protected static final String           CURRENT_USER         = "root1";
-
-    protected static final long             MANAGER_IDENTITY_ID  = IDENTITY_ID;
-
-    protected static final long             MEMBER_IDENTITY_ID   = 2l;
-
-    protected static final long             SPACE_ID             = 5l;
-
-    protected static final String           TEAM_NAME            = "name";
-
-    protected static final String           TEAM_DESCRIPTION     = "Team description";
-
-    protected static final double           TEAM_BUDGET          = 2d;
-
-    protected static final RewardBudgetType TEAM_BUDGET_TYPE     = RewardBudgetType.COMPUTED;
-
-    protected static final String           CUSTOM_PLUGIN_NAME   = "plugin name";
-
-    protected static final String           CUSTOM_PLUGIN_ID     = "custom";
-
-    protected static final String           PROVIDER             = WalletProvider.INTERNAL_WALLET.name();
-
-    protected PortalContainer               container;
-
-    private static RewardSettings           defaultSettings      = null;
-
-    public static Map<Long, Double> getEarnedPoints(Set<Long> identityIds) {
-        return identityIds.stream().collect(Collectors.toMap(Function.identity(), x -> x.doubleValue()));
-    }
-
-    private Random               random          = new Random(1);
-
-    protected List<Serializable> entitiesToClean = new ArrayList<>();
-
-    @Override
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-        if (container == null) {
-            assertNotNull("Container shouldn't be null", getContainer());
-            assertTrue("Container should have been started", getContainer().isStarted());
-            IdentityManager identityManager = getContainer().getComponentInstanceOfType(IdentityManager.class);
-            SpaceService spaceService = getContainer().getComponentInstanceOfType(SpaceService.class);
-
-            container = getContainer();
-            registerResourceBundleService();
-
-            RewardSettingsService rewardSettingsService = getService(RewardSettingsService.class);
-            defaultSettings = rewardSettingsService.getSettings();
-            setContractDetails();
-        }
-        begin();
-    }
-
-    @Override
-    @After
-    public void tearDown() throws Exception {
-        super.tearDown();
-        RewardDAO rewardDAO = getService(RewardDAO.class);
-        RewardPeriodDAO rewardPeriodDAO = getService(RewardPeriodDAO.class);
-        WalletAccountDAO walletAccountDAO = getService(WalletAccountDAO.class);
-        AddressLabelDAO addressLabelDAO = getService(AddressLabelDAO.class);
-        WalletPrivateKeyDAO walletPrivateKeyDAO = getService(WalletPrivateKeyDAO.class);
-        WalletTransactionDAO walletTransactionDAO = getService(WalletTransactionDAO.class);
-        WalletBlockchainStateDAO walletBlockchainStateDAO = getService(WalletBlockchainStateDAO.class);
-        WalletRewardSettingsService rewardSettingsService = getService(WalletRewardSettingsService.class);
-
-        RewardSettings storedSettings = rewardSettingsService.getSettings();
-        assertEquals(defaultSettings, storedSettings);
-
-        restartTransaction();
-
-        rewardDAO.deleteAll();
-        rewardPeriodDAO.deleteAll();
-        walletBlockchainStateDAO.deleteAll();
-
-        if (!entitiesToClean.isEmpty()) {
-            for (Serializable entity : entitiesToClean) {
-                if (entity instanceof WalletEntity) {
-                    walletAccountDAO.delete((WalletEntity) entity);
-                } else if (entity instanceof WalletPrivateKeyEntity) {
-                    walletPrivateKeyDAO.delete((WalletPrivateKeyEntity) entity);
-                } else if (entity instanceof TransactionEntity) {
-                    walletTransactionDAO.delete((TransactionEntity) entity);
-                } else if (entity instanceof AddressLabelEntity) {
-                    addressLabelDAO.delete((AddressLabelEntity) entity);
-                } else if (entity instanceof WalletAddressLabel) {
-                    AddressLabelEntity labelEntity = addressLabelDAO.find(((WalletAddressLabel) entity).getId());
-                    addressLabelDAO.delete(labelEntity);
-                } else if (entity instanceof TransactionDetail) {
-                    TransactionEntity transactionEntity = walletTransactionDAO.find(((TransactionDetail) entity).getId());
-                    walletTransactionDAO.delete(transactionEntity);
-                } else if (entity instanceof Wallet) {
-                    long walletId = ((Wallet) entity).getTechnicalId();
-                    WalletEntity walletEntity = walletAccountDAO.find(walletId);
-                    walletAccountDAO.delete(walletEntity);
-
-                    WalletPrivateKeyEntity walletPrivateKey = walletPrivateKeyDAO.find(walletId);
-                    if (walletPrivateKey != null) {
-                        walletPrivateKeyDAO.delete(walletPrivateKey);
-                    }
-                } else {
-                    throw new IllegalStateException("Entity not managed" + entity);
-                }
-            }
-        }
-
-        int walletCount = walletAccountDAO.findAll().size();
-        int walletPrivateKeyCount = walletPrivateKeyDAO.findAll().size();
-        int walletAddressLabelsCount = addressLabelDAO.findAll().size();
-        int walletTransactionsCount = walletTransactionDAO.findAll().size();
-
-        LOG.info("objects count wallets = {}, private keys = {}, address labels = {}, transactions count = {}",
-                walletCount,
-                walletPrivateKeyCount,
-                walletAddressLabelsCount,
-                walletTransactionsCount);
-        assertEquals("The previous test didn't cleaned wallets entities correctly, should add entities to clean into 'entitiesToClean' list.",
-                0,
-                walletCount);
-        assertEquals("The previous test didn't cleaned wallet addresses labels correctly, should add entities to clean into 'entitiesToClean' list.",
-                0,
-                walletAddressLabelsCount);
-        assertEquals("The previous test didn't cleaned wallets private keys entities correctly, should add entities to clean into 'entitiesToClean' list.",
-                0,
-                walletPrivateKeyCount);
-        assertEquals("The previous test didn't cleaned wallets transactions entities correctly, should add entities to clean into 'entitiesToClean' list.",
-                0,
-                walletTransactionsCount);
-
-        end();
-    }
-
-    protected <T> T getService(Class<T> componentType) {
-        return container.getComponentInstanceOfType(componentType);
-    }
-
-    protected RewardTeam newRewardTeam() {
-        long[] memberIdentityIds = {
-                MEMBER_IDENTITY_ID
-        };
-
-        return newRewardTeam(memberIdentityIds);
-    }
-
-    protected RewardTeam newRewardTeam(long[] memberIdentityIds) {
-        RewardTeam rewardTeam = new RewardTeam();
-        rewardTeam.setBudget(TEAM_BUDGET);
-        rewardTeam.setDescription(TEAM_DESCRIPTION);
-        rewardTeam.setDisabled(false);
-
-        RewardTeamMember manager = new RewardTeamMember();
-        manager.setIdentityId(MANAGER_IDENTITY_ID);
-        rewardTeam.setManager(manager);
-
-        List<RewardTeamMember> members = new ArrayList<>();
-        for (long memberIdentityId : memberIdentityIds) {
-            RewardTeamMember member = new RewardTeamMember();
-            member.setIdentityId(memberIdentityId);
-            members.add(member);
-        }
-        rewardTeam.setMembers(members);
-
-        rewardTeam.setName(TEAM_NAME);
-        rewardTeam.setRewardType(TEAM_BUDGET_TYPE);
-        rewardTeam.setSpaceId(SPACE_ID);
-        return rewardTeam;
-    }
-
-    protected Wallet newWallet(long identityId) {
-        Wallet wallet = new Wallet();
-        wallet.setTechnicalId(identityId);
-        wallet.setAddress(ADDRESS + identityId);
-        wallet.setPassPhrase(PHRASE);
-        wallet.setEnabled(IS_ENABLED);
-        wallet.setIsInitialized(true);
-        wallet.setEtherBalance(0d);
-        wallet.setTokenBalance(0d);
-        wallet.setInitializationState(INITIALIZATION_STATE);
-        return wallet;
-    }
-
-    protected void updateWalletBlockchainState(Wallet wallet) {
-        wallet.setIsInitialized(true);
-        wallet.setEtherBalance(0d);
-        wallet.setTokenBalance(0d);
-        wallet.setInitializationState(INITIALIZATION_STATE);
-    }
-
-    protected String generateTransactionHash() {
-        StringBuilder hashStringBuffer = new StringBuilder("0x");
-        for (int i = 0; i < 64; i++) {
-            hashStringBuffer.append(Integer.toHexString(random.nextInt(16)));
-        }
-        return hashStringBuffer.toString();
-    }
-
-    private void registerResourceBundleService() {
-        ResourceBundleService resourceBundleService = Mockito.mock(ResourceBundleService.class);
-        MapResourceBundle resourceBundle = new MapResourceBundle(Locale.getDefault());
-        resourceBundle.add(RewardUtils.REWARD_TRANSACTION_LABEL_KEY, "{0} is rewarded {1} {2} for period: {3} to {4}");
-        resourceBundle.add(RewardUtils.REWARD_TRANSACTION_WITH_POOL_MESSAGE_KEY,
-                "You have earned {0} {1} in reward for your {2} {3} earned in pool {4} for period: {5} to {6}");
-        resourceBundle.add(RewardUtils.REWARD_TRANSACTION_NO_POOL_MESSAGE_KEY,
-                "You have earned {0} {1} in reward for your {2} {3} for period: {4} to {5}");
-        Mockito.when(resourceBundleService.getResourceBundle(Mockito.anyString(), Mockito.any())).thenReturn(resourceBundle);
-        if (container.getComponentInstanceOfType(ResourceBundleService.class) != null) {
-            container.unregisterComponent(ResourceBundleService.class);
-        }
-        container.registerComponentInstance(ResourceBundleService.class, resourceBundleService);
-    }
-
-    private void setContractDetails() {
-        WalletService walletService = getService(WalletService.class);
-        ContractDetail contractDetail = new ContractDetail();
-        contractDetail.setName("name");
-        contractDetail.setSymbol("symbol");
-        contractDetail.setDecimals(12);
-        contractDetail.setAddress(WalletUtils.getContractAddress());
-        contractDetail.setContractType("3");
-        contractDetail.setNetworkId(1l);
-        walletService.setConfiguredContractDetail(contractDetail);
-    }
-}
\ No newline at end of file
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java
index bda70bd51..55211c3f2 100644
--- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java
@@ -87,7 +87,7 @@ void testOnEvent() {
 
       rewardSucceedNotificationListener.onEvent(event);
 
-      verify(notificationContext).append(eq(REWARD_REPORT_NOTIFICATION_PARAM), eq(rewardReport));
+      verify(notificationContext).append(REWARD_REPORT_NOTIFICATION_PARAM, rewardReport);
 
       // Verify that the notification command was created and executed
       verify(notificationExecutor).with(notificationCommand);
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/notification/RewardSuccessNotificationPluginTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/notification/RewardSuccessNotificationPluginTest.java
new file mode 100644
index 000000000..40ba096cb
--- /dev/null
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/notification/RewardSuccessNotificationPluginTest.java
@@ -0,0 +1,106 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package io.meeds.wallet.reward.notification;
+
+import static io.meeds.wallet.utils.RewardUtils.*;
+import static io.meeds.wallet.utils.WalletUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import io.meeds.wallet.model.*;
+
+import io.meeds.wallet.utils.WalletUtils;
+import org.exoplatform.commons.api.notification.NotificationContext;
+import org.exoplatform.commons.api.notification.model.NotificationInfo;
+import org.exoplatform.commons.api.notification.plugin.config.PluginConfig;
+import org.exoplatform.commons.notification.impl.NotificationContextImpl;
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.container.xml.ObjectParam;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+
+public class RewardSuccessNotificationPluginTest {
+
+  /**
+   * Check that provider returns templates correctly
+   */
+  @Test
+  public void testMakeMessage() {
+    try (MockedStatic<WalletUtils> walletUtilsMockedStatic = Mockito.mockStatic(WalletUtils.class)) {
+      ContractDetail mockContractDetail = new ContractDetail();
+      mockContractDetail.setDecimals(12);
+      walletUtilsMockedStatic.when(WalletUtils::getContractDetail).thenReturn(mockContractDetail);
+      Set<String> rewardAdministrators = new HashSet<>();
+      rewardAdministrators.add("admin");
+      walletUtilsMockedStatic.when(WalletUtils::getRewardAdministrators).thenReturn(rewardAdministrators);
+
+      RewardSuccessNotificationPlugin plugin = new RewardSuccessNotificationPlugin(getParams());
+      NotificationContext ctx = NotificationContextImpl.cloneInstance();
+
+      RewardReport rewardReport = new RewardReport();
+      RewardPeriod rewardPeriod = RewardPeriod.getCurrentPeriod(new RewardSettings());
+      rewardReport.setPeriod(rewardPeriod);
+
+      Set<WalletReward> rewards = new HashSet<>();
+      for (int i = 0; i < 30; i++) {
+        TransactionDetail transaction = new TransactionDetail();
+        transaction.setHash("hash");
+        transaction.setContractAmount(2);
+        transaction.setPending(true);
+        rewards.add(new WalletReward(null, transaction, 0, 0, 0, null));
+      }
+      rewardReport.setRewards(rewards);
+
+      ctx.append(REWARD_REPORT_NOTIFICATION_PARAM, rewardReport);
+      assertTrue(plugin.isValid(ctx));
+
+      NotificationInfo notification = plugin.buildNotification(ctx);
+      assertNotNull(notification);
+      assertEquals(String.valueOf(rewardReport.getFailedTransactionCount()),
+                   notification.getValueOwnerParameter(REWARD_FAIL_COUNT));
+      assertEquals(String.valueOf(rewardReport.getSuccessTransactionCount()),
+                   notification.getValueOwnerParameter(REWARD_SUCCESS_COUNT));
+      assertEquals(String.valueOf(rewardReport.getPendingTransactionCount()),
+                   notification.getValueOwnerParameter(REWARD_PENDING_COUNT));
+      assertEquals(String.valueOf(rewardReport.getTransactionsCount()),
+                   notification.getValueOwnerParameter(REWARD_TRANSACTION_COUNT));
+      assertEquals(String.valueOf(rewardReport.getValidRewardCount()),
+                   notification.getValueOwnerParameter(REWARD_VALID_MEMBERS_COUNT));
+      assertEquals(String.valueOf(rewardReport.getTokensSent()), notification.getValueOwnerParameter(AMOUNT));
+    }
+  }
+
+  private InitParams getParams() {
+    InitParams initParams = new InitParams();
+    ObjectParam objectParam = new ObjectParam();
+    objectParam.setName("plugin-config");
+    objectParam.setType(PluginConfig.class.getName());
+    objectParam.addProperty("pluginId", "RewardSuccessNotificationPlugin");
+    objectParam.addProperty("resourceBundleKey", "UINotification.label.RewardSuccessNotificationPlugin");
+    objectParam.addProperty("order", "1");
+    objectParam.addProperty("groupId", "wallet");
+    objectParam.addProperty("bundlePath", "locale.notification.WalletNotification");
+    initParams.addParam(objectParam);
+    return initParams;
+  }
+
+}
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateBuilderTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateBuilderTest.java
new file mode 100644
index 000000000..9192f6dc6
--- /dev/null
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateBuilderTest.java
@@ -0,0 +1,129 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package io.meeds.wallet.reward.notification;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import io.meeds.wallet.model.*;
+
+import io.meeds.wallet.reward.service.RewardSettingsService;
+import io.meeds.wallet.utils.WalletUtils;
+import org.exoplatform.commons.api.notification.NotificationContext;
+import org.exoplatform.commons.api.notification.channel.ChannelManager;
+import org.exoplatform.commons.api.notification.model.MessageInfo;
+import org.exoplatform.commons.api.notification.model.NotificationInfo;
+import org.exoplatform.commons.api.notification.plugin.config.PluginConfig;
+import org.exoplatform.commons.api.notification.service.setting.PluginContainer;
+import org.exoplatform.commons.api.notification.service.setting.PluginSettingService;
+import org.exoplatform.commons.notification.impl.NotificationContextImpl;
+import org.exoplatform.commons.testing.BaseExoTestCase;
+import org.exoplatform.commons.utils.CommonsUtils;
+import org.exoplatform.component.test.ConfigurationUnit;
+import org.exoplatform.component.test.ConfiguredBy;
+import org.exoplatform.component.test.ContainerScope;
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.container.xml.ObjectParameter;
+import org.exoplatform.container.xml.ValueParam;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+
+import static io.meeds.wallet.utils.RewardUtils.REWARD_REPORT_NOTIFICATION_PARAM;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@ConfiguredBy({ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/test-organization-configuration.xml"), })
+public class RewardSuccessTemplateBuilderTest extends BaseExoTestCase {
+
+  @Test
+  public void testBuildMessage() {
+    try (MockedStatic<WalletUtils> walletUtilsMockedStatic = Mockito.mockStatic(WalletUtils.class)) {
+      ContractDetail mockContractDetail = new ContractDetail();
+      mockContractDetail.setDecimals(12);
+      walletUtilsMockedStatic.when(WalletUtils::getContractDetail).thenReturn(mockContractDetail);
+      Set<String> rewardAdministrators = new HashSet<>();
+      rewardAdministrators.add("root");
+      walletUtilsMockedStatic.when(WalletUtils::getRewardAdministrators).thenReturn(rewardAdministrators);
+      RewardSettingsService rewardSettingsService = mock(RewardSettingsService.class);
+      when(rewardSettingsService.getSettings()).thenReturn(new RewardSettings());
+      InitParams params = getParams();
+      RewardSuccessNotificationPlugin plugin = new RewardSuccessNotificationPlugin(params);
+
+      RewardSuccessTemplateProvider templateProvider = new RewardSuccessTemplateProvider(rewardSettingsService, params);
+      templateProvider.setMailTemplatePath("jar:/template/RewardSuccessReward.gtmpl");
+
+      NotificationContext ctx = NotificationContextImpl.cloneInstance();
+
+      RewardReport rewardReport = new RewardReport();
+      RewardPeriod rewardPeriod = RewardPeriod.getCurrentPeriod(new RewardSettings());
+      rewardReport.setPeriod(rewardPeriod);
+
+      Set<WalletReward> rewards = new HashSet<>();
+      for (int i = 0; i < 30; i++) {
+        TransactionDetail transaction = new TransactionDetail();
+        transaction.setHash("hash");
+        transaction.setContractAmount(2);
+        transaction.setPending(true);
+        rewards.add(new WalletReward(null, transaction, 0, 0, 0, null));
+      }
+      rewardReport.setRewards(rewards);
+      ctx.append(REWARD_REPORT_NOTIFICATION_PARAM, rewardReport);
+      NotificationInfo notification = plugin.buildNotification(ctx);
+      ctx.setNotificationInfo(notification);
+      notification.to(notification.getSendToUserIds().getFirst());
+
+      CommonsUtils.getService(PluginSettingService.class).registerPluginConfig(getPluginConfig());
+      CommonsUtils.getService(PluginContainer.class).addPlugin(plugin);
+      CommonsUtils.getService(ChannelManager.class).registerOverrideTemplateProvider(templateProvider);
+
+      MessageInfo message = templateProvider.getBuilder().buildMessage(ctx);
+      assertNotNull(message);
+      assertNotNull(message.getPluginId());
+      assertEquals("Reward success!", message.getBody().replaceAll("(?s)<!--.*?-->", "").trim());
+    }
+
+  }
+
+  private InitParams getParams() {
+    InitParams initParams = new InitParams();
+    ObjectParameter objectParam = new ObjectParameter();
+    objectParam.setName("plugin-config");
+    PluginConfig pluginConfig = getPluginConfig();
+    objectParam.setObject(pluginConfig);
+    initParams.addParam(objectParam);
+
+    ValueParam valueParam = new ValueParam();
+    valueParam.setName("channel-id");
+    valueParam.setValue("MAIL_CHANNEL");
+    initParams.addParam(valueParam);
+    return initParams;
+  }
+
+  private PluginConfig getPluginConfig() {
+    PluginConfig pluginConfig = new PluginConfig();
+    pluginConfig.setPluginId("RewardSuccessNotificationPlugin");
+    pluginConfig.setResourceBundleKey("UINotification.label.RewardSuccessNotificationPlugin");
+    pluginConfig.setOrder("1");
+    pluginConfig.setGroupId("wallet");
+    pluginConfig.setBundlePath("locale.notification.WalletNotification");
+    return pluginConfig;
+  }
+
+}
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateProviderTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateProviderTest.java
new file mode 100644
index 000000000..ffbe19de4
--- /dev/null
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/notification/RewardSuccessTemplateProviderTest.java
@@ -0,0 +1,73 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package io.meeds.wallet.reward.notification;
+
+import java.util.Map;
+
+import io.meeds.wallet.model.RewardSettings;
+import io.meeds.wallet.reward.service.RewardSettingsService;
+
+import org.exoplatform.commons.api.notification.model.PluginKey;
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.container.xml.ValueParam;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class RewardSuccessTemplateProviderTest {
+
+  @Test
+  public void testGetTemplate() {
+    RewardSettingsService rewardSettingsService = mock(RewardSettingsService.class);
+    when(rewardSettingsService.getSettings()).thenReturn(new RewardSettings());
+    RewardSuccessTemplateProvider provider = new RewardSuccessTemplateProvider(rewardSettingsService, getParams("MAIL_CHANNEL"));
+    Map<PluginKey, String> templateFilePathConfigs = provider.getTemplateFilePathConfigs();
+    assertNotNull(templateFilePathConfigs);
+    assertEquals(1, templateFilePathConfigs.size());
+    String template = templateFilePathConfigs.values().iterator().next();
+    assertEquals(provider.getMailTemplatePath(), template);
+
+    provider = new RewardSuccessTemplateProvider(rewardSettingsService, getParams("MAIL_CHANNEL"));
+    templateFilePathConfigs = provider.getTemplateFilePathConfigs();
+    assertNotNull(templateFilePathConfigs);
+    assertEquals(1, templateFilePathConfigs.size());
+    template = templateFilePathConfigs.values().iterator().next();
+    assertEquals(provider.getMailTemplatePath(), template);
+
+    provider = new RewardSuccessTemplateProvider(rewardSettingsService, getParams("PUSH_CHANNEL"));
+    templateFilePathConfigs = provider.getTemplateFilePathConfigs();
+    assertNotNull(templateFilePathConfigs);
+    assertEquals(1, templateFilePathConfigs.size());
+    template = templateFilePathConfigs.values().iterator().next();
+    assertEquals(provider.getPushTemplatePath(), template);
+  }
+
+  private InitParams getParams(String channelId) {
+    InitParams initParams = new InitParams();
+    ValueParam valueParam = new ValueParam();
+    valueParam.setName("channel-id");
+    valueParam.setValue(channelId);
+    initParams.addParam(valueParam);
+    return initParams;
+  }
+
+}
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java
index 140756618..627ff5617 100644
--- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java
@@ -18,11 +18,8 @@
  */
 package io.meeds.wallet.reward.rest;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -32,9 +29,12 @@
 import java.time.ZoneId;
 import java.util.List;
 
+import io.meeds.wallet.utils.WalletUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -129,6 +129,34 @@ void computeRewardsSimpleUser() throws Exception {
     response.andExpect(status().isForbidden());
   }
 
+  @Test
+  void computeRewardsAdmin() throws Exception {
+    when(rewardSettingsService.getSettings()).thenReturn(new RewardSettings());
+    RewardPeriod rewardPeriod = new RewardPeriod();
+    RewardReport rewardReport = new RewardReport();
+    rewardReport.setPeriod(rewardPeriod);
+    when(rewardReportService.computeRewards(any(LocalDate.class))).thenReturn(rewardReport);
+    ResultActions response = mockMvc.perform(get(REST_PATH + "/compute").param("page", "0").param("size", "12").with(testAdminUser()));
+    verify(rewardSettingsService, times(1)).getSettings();
+    response.andExpect(status().isOk());
+
+    RewardSettings rewardSettings = new RewardSettings();
+    rewardSettings.setPeriodType(RewardPeriodType.MONTH);
+    when(rewardSettingsService.getSettings()).thenReturn(rewardSettings);
+
+    response = mockMvc.perform(get(REST_PATH + "/compute").param("page", "0").param("size", "12").with(testAdminUser()));
+    response.andExpect(status().isOk());
+
+
+    rewardSettings = new RewardSettings();
+    rewardSettings.setPeriodType(RewardPeriodType.QUARTER);
+    when(rewardSettingsService.getSettings()).thenReturn(rewardSettings);
+
+    response = mockMvc.perform(get(REST_PATH + "/compute").param("page", "0").param("size", "12").with(testAdminUser()));
+    response.andExpect(status().isOk());
+
+  }
+
   @Test
   void computeRewardsByPeriodAnonymously() throws Exception {
     ResultActions response = mockMvc.perform(post(REST_PATH + "/period/compute").content(asJsonString(rewardPeriod()))
@@ -161,14 +189,33 @@ void computeRewardsByPeriodAdmin() throws Exception {
   }
 
   @Test
-  void computeRewardsAdmin() throws Exception {
+  void computeDistributionForecastAnonymously() throws Exception {
+    ResultActions response = mockMvc.perform(post(REST_PATH + "/forecast").content(asJsonString(rewardPeriod()))
+            .contentType(MediaType.APPLICATION_JSON)
+            .accept(MediaType.APPLICATION_JSON));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void computeDistributionForecastSimpleUser() throws Exception {
+    ResultActions response = mockMvc.perform(post(REST_PATH + "/forecast").content(asJsonString(rewardPeriod()))
+            .contentType(MediaType.APPLICATION_JSON)
+            .accept(MediaType.APPLICATION_JSON)
+            .with(testSimpleUser()));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void computeDistributionForecastAdmin() throws Exception {
     when(rewardSettingsService.getSettings()).thenReturn(new RewardSettings());
     RewardPeriod rewardPeriod = new RewardPeriod();
     RewardReport rewardReport = new RewardReport();
     rewardReport.setPeriod(rewardPeriod);
     when(rewardReportService.computeRewards(any(LocalDate.class))).thenReturn(rewardReport);
-    ResultActions response = mockMvc.perform(get(REST_PATH + "/compute").param("page", "0").param("size", "12").with(testAdminUser()));
-    verify(rewardSettingsService, times(1)).getSettings();
+    ResultActions response = mockMvc.perform(post(REST_PATH + "/forecast").content(asJsonString(rewardPeriod))
+            .contentType(MediaType.APPLICATION_JSON)
+            .accept(MediaType.APPLICATION_JSON)
+            .with(testAdminUser()));
     response.andExpect(status().isOk());
   }
 
@@ -180,8 +227,20 @@ void computeRewardsByUserAnonymously() throws Exception {
 
   @Test
   void computeRewardsByUserSimpleUser() throws Exception {
-    ResultActions response = mockMvc.perform(get(REST_PATH + "/compute/user").param("date", "2024-09-10").with(testSimpleUser()));
-    response.andExpect(status().isOk());
+    when(rewardSettingsService.getSettings()).thenReturn(new RewardSettings());
+    RewardPeriod rewardPeriod = new RewardPeriod();
+    RewardReport rewardReport = new RewardReport();
+    rewardReport.setPeriod(rewardPeriod);
+    when(rewardReportService.computeRewardsByUser(any(LocalDate.class) , anyLong())).thenReturn(rewardReport);
+
+    try (MockedStatic<WalletUtils> walletUtilsMockedStatic = Mockito.mockStatic(WalletUtils.class)) {
+      walletUtilsMockedStatic.when(WalletUtils::getCurrentUserIdentityId).thenReturn(1L);
+      ResultActions response = mockMvc.perform(get(REST_PATH + "/compute/user").param("date", "2024-09-10").with(testSimpleUser()));
+      response.andExpect(status().isOk());
+      response = mockMvc.perform(get(REST_PATH + "/compute/user").param("date", "").with(testSimpleUser()));
+      response.andExpect(status().isBadRequest());
+
+    }
   }
 
   @Test
@@ -207,6 +266,14 @@ void sendRewardsAdmin() throws Exception {
             .accept(MediaType.APPLICATION_JSON).with(testAdminUser()));
     verify(rewardReportService, times(1)).sendRewards(any(LocalDate.class), anyString());
     response.andExpect(status().isOk());
+
+    // When
+    doThrow(new IllegalAccessException()).when(rewardReportService).sendRewards(any(LocalDate.class), anyString());
+    response = mockMvc.perform(post(REST_PATH + "/send").content(asJsonString(rewardPeriod()))
+            .contentType(MediaType.APPLICATION_JSON)
+            .accept(MediaType.APPLICATION_JSON).with(testAdminUser()));
+    response.andExpect(status().isUnauthorized());
+
   }
 
   @Test
@@ -238,11 +305,29 @@ void getRewardReportPeriodsSimpleUser() throws Exception {
   @Test
   void getRewardReportPeriodsAdmin() throws Exception {
     when(rewardReportService.findRewardReportPeriods(any(Pageable.class))).thenReturn(new PageImpl<>(List.of(newRewardPeriod())));
+    when(rewardReportService.findRewardPeriodsBetween(anyLong(), anyLong(), any(Pageable.class))).thenReturn(new PageImpl<>(List.of(newRewardPeriod())));
 
     ResultActions response = mockMvc.perform(get(REST_PATH + "/periods").param("from", "0")
             .param("to", "0")
                                                                     .with(testAdminUser()));
     response.andExpect(status().isOk());
+
+    response = mockMvc.perform(get(REST_PATH + "/periods").param("from", "11211")
+            .param("to", "225255")
+            .with(testAdminUser()));
+    response.andExpect(status().isOk());
+  }
+
+  @Test
+  void countRewardsAnonymously() throws Exception {
+    ResultActions response = mockMvc.perform(get(REST_PATH + "/countRewards").param("userId", "1"));
+    response.andExpect(status().isForbidden());
+  }
+
+  @Test
+  void countRewardsSimpleUser() throws Exception {
+    ResultActions response = mockMvc.perform(get(REST_PATH + "/countRewards").param("userId", "1").with(testSimpleUser()));
+    response.andExpect(status().isOk());
   }
 
   private RequestPostProcessor testAdminUser() {
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java
index dd880e61d..7588e700c 100644
--- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java
@@ -129,27 +129,33 @@ void getSettingsAdmin() throws Exception {
   @Test
   void saveSettingsAnonymously() throws Exception {
     ResultActions response = mockMvc.perform(post(REST_PATH).content(asJsonString(rewardSettings()))
-                                                                      .contentType(MediaType.APPLICATION_JSON)
-                                                                      .accept(MediaType.APPLICATION_JSON));
+                                                            .contentType(MediaType.APPLICATION_JSON)
+                                                            .accept(MediaType.APPLICATION_JSON));
     response.andExpect(status().isForbidden());
   }
 
   @Test
   void saveSettingsSimpleUser() throws Exception {
     ResultActions response = mockMvc.perform(post(REST_PATH).content(asJsonString(rewardSettings()))
-                                                                      .with(testSimpleUser())
-                                                                      .contentType(MediaType.APPLICATION_JSON)
-                                                                      .accept(MediaType.APPLICATION_JSON));
+                                                            .with(testSimpleUser())
+                                                            .contentType(MediaType.APPLICATION_JSON)
+                                                            .accept(MediaType.APPLICATION_JSON));
     response.andExpect(status().isForbidden());
   }
 
   @Test
   void saveSettingsAdmin() throws Exception {
     ResultActions response = mockMvc.perform(post(REST_PATH).content(asJsonString(rewardSettings()))
-                                                                      .with(testAdminUser())
-                                                                      .contentType(MediaType.APPLICATION_JSON)
-                                                                      .accept(MediaType.APPLICATION_JSON));
+                                                            .with(testAdminUser())
+                                                            .contentType(MediaType.APPLICATION_JSON)
+                                                            .accept(MediaType.APPLICATION_JSON));
     response.andExpect(status().isOk());
+
+    response = mockMvc.perform(post(REST_PATH).content(asJsonString(null))
+                                              .with(testAdminUser())
+                                              .contentType(MediaType.APPLICATION_JSON)
+                                              .accept(MediaType.APPLICATION_JSON));
+    response.andExpect(status().isBadRequest());
   }
 
   @Test
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardStatusVerifierTaskTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardStatusVerifierTaskTest.java
new file mode 100644
index 000000000..320637f79
--- /dev/null
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardStatusVerifierTaskTest.java
@@ -0,0 +1,90 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package io.meeds.wallet.reward.scheduling;
+
+import java.util.*;
+
+import io.meeds.wallet.model.*;
+import io.meeds.wallet.reward.scheduling.task.RewardStatusVerifierTask;
+import io.meeds.wallet.reward.service.RewardReportService;
+import io.meeds.wallet.service.WalletAccountService;
+import org.exoplatform.services.listener.ListenerService;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import static io.meeds.wallet.utils.RewardUtils.REWARD_SUCCESS_EVENT_NAME;
+import static org.mockito.Mockito.*;
+
+@SpringBootTest(classes = { RewardStatusVerifierTask.class })
+public class RewardStatusVerifierTaskTest {
+
+  @MockBean
+  private RewardReportService      rewardReportService;
+
+  @MockBean
+  private WalletAccountService     walletAccountService;
+
+  @MockBean
+  private ListenerService          listenerService;
+
+  @Autowired
+  private RewardStatusVerifierTask rewardStatusVerifierTask;
+
+  @Test
+  public void testSendRewards_NoAdminWallet() {
+    // No admin wallet or admin wallet has zero balance
+    when(walletAccountService.getAdminWallet()).thenReturn(null);
+    when(walletAccountService.isAdminAccountEnabled()).thenReturn(true);
+
+    rewardStatusVerifierTask.execute();
+
+    // Verify no interactions with rewardReportService or listenerService
+    verify(rewardReportService, never()).getRewardPeriodsInProgress();
+    verify(listenerService, never()).broadcast(anyString(), any(), any());
+    }
+
+  @Test
+  public void testSendRewards_RewardPeriodsInProgress() {
+    // When
+    Wallet adminWallet = new Wallet();
+    adminWallet.setEtherBalance(100.0);
+    adminWallet.setTokenBalance(100.0);
+
+    when(walletAccountService.getAdminWallet()).thenReturn(adminWallet);
+    when(walletAccountService.isAdminAccountEnabled()).thenReturn(true);
+
+    RewardPeriod rewardPeriod = new RewardPeriod();
+    List<RewardPeriod> rewardPeriodsInProgress = List.of(rewardPeriod);
+    when(rewardReportService.getRewardPeriodsInProgress()).thenReturn(rewardPeriodsInProgress);
+
+    RewardReport rewardReport = mock(RewardReport.class);
+    when(rewardReport.isCompletelyProceeded()).thenReturn(true);
+
+    when(rewardReportService.computeRewards(any())).thenReturn(rewardReport);
+
+    rewardStatusVerifierTask.execute();
+
+    // Then
+    verify(rewardReportService, times(1)).computeRewards(any());
+    verify(listenerService, times(1)).broadcast(REWARD_SUCCESS_EVENT_NAME, rewardReport, null);
+    verify(rewardReportService, times(1)).saveRewardReport(any(RewardReport.class));
+  }
+}
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardReportServiceTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardReportServiceTest.java
index 2f3e9a5fb..576c97899 100644
--- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardReportServiceTest.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardReportServiceTest.java
@@ -18,6 +18,7 @@
  */
 package io.meeds.wallet.reward.service;
 
+import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.YearMonth;
 import java.util.*;
@@ -25,28 +26,35 @@
 import io.meeds.gamification.model.filter.RealizationFilter;
 import io.meeds.gamification.service.RealizationService;
 
+import io.meeds.wallet.model.*;
+import io.meeds.wallet.utils.WalletUtils;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.services.security.Identity;
+import org.exoplatform.services.security.IdentityRegistry;
+import org.exoplatform.services.security.MembershipEntry;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import io.meeds.wallet.model.RewardReport;
-import io.meeds.wallet.model.RewardSettings;
-import io.meeds.wallet.model.Wallet;
-import io.meeds.wallet.model.WalletState;
 import io.meeds.wallet.reward.storage.WalletRewardReportStorage;
 import io.meeds.wallet.service.WalletAccountService;
 import io.meeds.wallet.service.WalletTokenAdminService;
 
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 @SpringBootTest(classes = { WalletRewardReportService.class })
 public class WalletRewardReportServiceTest { // NOSONAR
 
+  private static final String       ADMIN_USER = "root";
+
   @MockBean
   private WalletAccountService      walletAccountService;
 
@@ -65,8 +73,16 @@ public class WalletRewardReportServiceTest { // NOSONAR
   @Autowired
   private RewardReportService       rewardReportService;
 
+  @BeforeEach
+  void setup() {
+    IdentityRegistry identityRegistry = PortalContainer.getInstance().getComponentInstanceOfType(IdentityRegistry.class);
+
+    Identity identity = buildUserIdentityAsAdmin();
+    identityRegistry.register(identity);
+  }
+
   @Test
-  public void testComputeRewards() {
+  void testComputeRewards() {
     LocalDate date = YearMonth.of(2019, 3).atEndOfMonth();
     RewardSettings rewardSettings = new RewardSettings();
     when(rewardSettingsService.getSettings()).thenReturn(rewardSettings);
@@ -89,6 +105,218 @@ public void testComputeRewards() {
     assertEquals(participantsWallet.size(), rewardReport.getRewards().size());
   }
 
+  @Test
+  void testGetRewardReportByPeriodId() {
+
+    RewardSettings rewardSettings = new RewardSettings();
+    when(rewardSettingsService.getSettings()).thenReturn(rewardSettings);
+
+    // When
+    rewardReportService.getRewardReportByPeriodId(1);
+    // Then
+    verify(rewardReportStorage, times(1)).getRewardReportByPeriodId(1, rewardSettings.zoneId());
+
+    // When
+    rewardReportService.getRewardPeriod(RewardPeriodType.MONTH, LocalDate.now());
+    // Then
+    verify(rewardReportStorage, times(1)).getRewardPeriod(RewardPeriodType.MONTH, LocalDate.now(), rewardSettings.zoneId());
+
+  }
+
+  @Test
+  void testSaveRewardReport() {
+    Throwable exception = assertThrows(IllegalArgumentException.class, () -> rewardReportService.saveRewardReport(null));
+    assertEquals("Reward report to save is null", exception.getMessage());
+
+    RewardReport rewardReport = new RewardReport();
+    rewardReportService.saveRewardReport(rewardReport);
+    verify(rewardReportStorage, times(1)).saveRewardReport(rewardReport);
+  }
+
+  @Test
+  void testGetRewardReport() {
+    RewardSettings rewardSettings = new RewardSettings();
+    rewardSettings.setPeriodType(null);
+    when(rewardSettingsService.getSettings()).thenReturn(null);
+    Throwable exception = assertThrows(IllegalStateException.class, () -> rewardReportService.getRewardReport(LocalDate.now()));
+    assertEquals("Error computing rewards using empty settings", exception.getMessage());
+
+    when(rewardSettingsService.getSettings()).thenReturn(rewardSettings);
+    exception = assertThrows(IllegalStateException.class, () -> rewardReportService.getRewardReport(LocalDate.now()));
+    assertEquals("Error computing rewards using empty period type", exception.getMessage());
+
+    when(rewardSettingsService.getSettings()).thenReturn(new RewardSettings());
+
+    // When
+    rewardReportService.getRewardReportByPeriodId(1);
+    // Then
+    verify(rewardReportStorage, times(1)).getRewardReportByPeriodId(1, rewardSettings.zoneId());
+
+  }
+
+  @Test
+  void testComputeRewardsByUser() {
+    LocalDate date = YearMonth.of(2022, 12).atEndOfMonth();
+    RewardSettings rewardSettings = new RewardSettings();
+    when(rewardSettingsService.getSettings()).thenReturn(rewardSettings);
+    when(realizationService.getParticipantsBetweenDates(any(Date.class), any(Date.class))).thenReturn(List.of(1L, 4L, 5L));
+    when(realizationService.countRealizationsByFilter(any(RealizationFilter.class))).thenReturn(10);
+    Set<Wallet> participantsWallet = new HashSet<>();
+    participantsWallet.add(newWallet(1L));
+    participantsWallet.add(newWallet(4L));
+    participantsWallet.add(newWallet(5L));
+    when(walletAccountService.listWalletsByIdentityIds(List.of(1L, 4L, 5L))).thenReturn(participantsWallet);
+
+    RewardReport rewardReport = rewardReportService.computeRewardsByUser(date, 1L);
+    assertNotNull(rewardReport);
+    assertNotNull(rewardReport.getRewards());
+    assertEquals(1, rewardReport.getRewards().size());
+  }
+
+  @Test
+  void testSendRewards() throws Exception {
+    try (MockedStatic<WalletUtils> walletUtilsMockedStatic = Mockito.mockStatic(WalletUtils.class)) {
+      ContractDetail mockContractDetail = new ContractDetail();
+      mockContractDetail.setDecimals(12);
+      walletUtilsMockedStatic.when(WalletUtils::getContractDetail).thenReturn(mockContractDetail);
+      walletUtilsMockedStatic.when(() -> WalletUtils.convertFromDecimals(any(BigInteger.class), anyInt())).thenReturn(10.0);
+
+      int contractDecimals = WalletUtils.getContractDetail().getDecimals();
+
+      LocalDate date = YearMonth.of(2019, 4).atEndOfMonth();
+
+      RewardSettings newSettings = new RewardSettings();
+
+      newSettings.setPeriodType(RewardPeriodType.MONTH);
+      double sumOfTokensToSend = 5490d;
+      newSettings.setBudgetType(RewardBudgetType.FIXED);
+      newSettings.setAmount(sumOfTokensToSend);
+      newSettings.setThreshold(0);
+      when(rewardSettingsService.getSettings()).thenReturn(newSettings);
+
+      Map<Long, Long> points = new HashMap<>();
+      points.put(1L, 50L);
+      points.put(4L, 100L);
+      points.put(5L, 40L);
+      when(realizationService.getScoresByIdentityIdsAndBetweenDates(anyList(),
+                                                                    any(Date.class),
+                                                                    any(Date.class))).thenReturn(points);
+      when(realizationService.getParticipantsBetweenDates(any(Date.class), any(Date.class))).thenReturn(List.of(1L, 4L, 5L));
+      when(realizationService.countRealizationsByFilter(any(RealizationFilter.class))).thenReturn(10);
+      Set<Wallet> participantsWallet = new HashSet<>();
+      Wallet wallet = newWallet(1L);
+      Wallet wallet4 = newWallet(4L);
+      Wallet wallet5 = newWallet(5L);
+      participantsWallet.add(wallet);
+      participantsWallet.add(wallet4);
+      participantsWallet.add(wallet5);
+      when(walletAccountService.listWalletsByIdentityIds(List.of(1L, 4L, 5L))).thenReturn(participantsWallet);
+
+      // Admin having only 10 tokens
+      when(walletTokenAdminService.getTokenBalanceOf("adminAddress")).thenReturn(BigInteger.valueOf(10L).pow(contractDecimals));
+
+      Throwable exception = assertThrows(IllegalAccessException.class, () -> rewardReportService.sendRewards(date, ADMIN_USER));
+      assertEquals("User " + ADMIN_USER + " is not allowed to send rewards", exception.getMessage());
+
+      walletUtilsMockedStatic.when(() -> WalletUtils.isUserRewardingAdmin(ADMIN_USER)).thenReturn(true);
+
+      // Sending when No admin wallet is configured
+      exception = assertThrows(IllegalStateException.class, () -> rewardReportService.sendRewards(date, ADMIN_USER));
+      assertEquals("No admin wallet is configured", exception.getMessage());
+
+      when(walletTokenAdminService.getAdminWalletAddress()).thenReturn("adminAddress");
+
+      exception = assertThrows(IllegalStateException.class, () -> rewardReportService.sendRewards(date, ADMIN_USER));
+      assertEquals("Admin doesn't have enough funds to send rewards", exception.getMessage());
+
+      // Admin having enough funds
+      walletUtilsMockedStatic.when(() -> WalletUtils.convertFromDecimals(any(BigInteger.class), anyInt())).thenReturn(5491.0);
+
+      when(walletTokenAdminService.getTokenBalanceOf("adminAddress")).thenReturn(BigInteger.valueOf((long) sumOfTokensToSend + 1)
+                                                                                           .pow(contractDecimals));
+
+      rewardReportService.sendRewards(date, ADMIN_USER);
+      verify(walletTokenAdminService, times(3)).reward(any(), any());
+
+      // Send reward for the second time for the same period
+      when(walletTokenAdminService.getTokenBalanceOf("adminAddress")).thenReturn(BigInteger.valueOf((long) sumOfTokensToSend + 1)
+                                                                                           .pow(contractDecimals));
+
+      RewardReport rewardReport = new RewardReport();
+      RewardPeriod rewardPeriod = new RewardPeriod();
+      rewardReport.setPeriod(rewardPeriod);
+      rewardReport.setParticipationsCount(10);
+      Set<WalletReward> walletRewards = new HashSet<>();
+      TransactionDetail transactionDetail = new TransactionDetail();
+      transactionDetail.setSucceeded(true);
+      walletRewards.add(new WalletReward(wallet, transactionDetail, 1L, 100, 10, rewardPeriod));
+      walletRewards.add(new WalletReward(wallet4, transactionDetail, 4L, 200, 50, rewardPeriod));
+      walletRewards.add(new WalletReward(wallet5, transactionDetail, 5L, 300, 40, rewardPeriod));
+      rewardReport.setRewards(walletRewards);
+      when(rewardReportStorage.getRewardReport(newSettings.getPeriodType(), date, newSettings.zoneId())).thenReturn(rewardReport);
+
+      exception = assertThrows(IllegalStateException.class, () -> rewardReportService.sendRewards(date, ADMIN_USER));
+      assertEquals("No rewards to send for selected period", exception.getMessage());
+
+      // Sending reward for current period
+      transactionDetail.setSucceeded(false);
+      rewardPeriod.setEndDateInSeconds(System.currentTimeMillis() / 1000 + 1);
+      exception = assertThrows(IllegalStateException.class, () -> rewardReportService.sendRewards(date, ADMIN_USER));
+      assertEquals("Can't send rewards for current period", exception.getMessage());
+
+      // Sending reward for current period
+      transactionDetail.setPending(true);
+      rewardPeriod.setEndDateInSeconds(System.currentTimeMillis() / 1000 - 5);
+      exception = assertThrows(IllegalStateException.class, () -> rewardReportService.sendRewards(date, ADMIN_USER));
+      String startDateFormatted = rewardReport.getPeriod().getStartDateFormatted(Locale.getDefault().getLanguage());
+      String endDateFormatted = rewardReport.getPeriod().getEndDateFormatted(Locale.getDefault().getLanguage());
+      assertEquals("There are some pending transactions for rewards of period between " + startDateFormatted + " and "
+          + endDateFormatted + ", thus no reward sending is allowed until the transactions finishes", exception.getMessage());
+    }
+  }
+
+  @Test
+  void testComputeDistributionForecast() {
+    RewardSettings rewardSettings = new RewardSettings();
+
+    rewardSettings.setThreshold(49);
+    when(realizationService.getParticipantsBetweenDates(any(Date.class), any(Date.class))).thenReturn(List.of(1L, 4L, 5L));
+    when(realizationService.countRealizationsByFilter(any(RealizationFilter.class))).thenReturn(10);
+    Set<Wallet> participantsWallet = new HashSet<>();
+    participantsWallet.add(newWallet(1L));
+    participantsWallet.add(newWallet(4L));
+    participantsWallet.add(newWallet(5L));
+    when(walletAccountService.listWalletsByIdentityIds(List.of(1L, 4L, 5L))).thenReturn(participantsWallet);
+    Map<Long, Long> points = new HashMap<>();
+    points.put(1L, 50L);
+    points.put(4L, 100L);
+    points.put(5L, 40L);
+    when(realizationService.getScoresByIdentityIdsAndBetweenDates(anyList(),
+                                                                  any(Date.class),
+                                                                  any(Date.class))).thenReturn(points);
+    DistributionForecast distributionForecast = rewardReportService.computeDistributionForecast(rewardSettings);
+
+    assertNotNull(distributionForecast);
+    assertEquals(3, distributionForecast.getParticipantsCount());
+    assertEquals(2, distributionForecast.getEligibleContributorsCount());
+    assertEquals(190.0, distributionForecast.getAcceptedContributions());
+  }
+
+  @Test
+  void testListRewards() {
+    // Given
+    RewardSettings rewardSettings = new RewardSettings();
+    when(rewardSettingsService.getSettings()).thenReturn(rewardSettings);
+
+    // When
+    rewardReportService.listRewards("root", 10);
+    rewardReportService.countRewards("root");
+
+    // Then
+    verify(rewardReportStorage, times(1)).listRewards(1, rewardSettings.zoneId(), 10);
+    verify(rewardReportStorage, times(1)).countRewards(1);
+  }
+
   protected Wallet newWallet(long identityId) {
     Wallet wallet = new Wallet();
     wallet.setTechnicalId(identityId);
@@ -101,4 +329,12 @@ protected Wallet newWallet(long identityId) {
     wallet.setInitializationState(WalletState.INITIALIZED.name());
     return wallet;
   }
+
+  protected org.exoplatform.services.security.Identity buildUserIdentityAsAdmin() {
+    String group = "/platform/rewarding";
+    MembershipEntry entry = new MembershipEntry(group, MembershipEntry.ANY_TYPE);
+    Set<MembershipEntry> entryTest = new HashSet<>();
+    entryTest.add(entry);
+    return new org.exoplatform.services.security.Identity(WalletRewardReportServiceTest.ADMIN_USER, entryTest);
+  }
 }
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardSettingsServiceTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardSettingsServiceTest.java
index 338990414..597b61f23 100644
--- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardSettingsServiceTest.java
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardSettingsServiceTest.java
@@ -32,8 +32,7 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 
 import static io.meeds.wallet.utils.WalletUtils.toJsonString;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.*;
@@ -102,4 +101,10 @@ public void testSaveSettings() {
       rewardSettingsService.saveSettings(defaultSettings);
     }
   }
+
+  @Test
+  public void testDeleteSettings() {
+    rewardSettingsService.deleteSettings();
+    verify(settingService, times(1)).remove(any(), any(), any());
+  }
 }
diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/storage/WalletRewardReportStorageTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/storage/WalletRewardReportStorageTest.java
new file mode 100644
index 000000000..1118833d9
--- /dev/null
+++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/storage/WalletRewardReportStorageTest.java
@@ -0,0 +1,208 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package io.meeds.wallet.reward.storage;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.when;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import io.meeds.wallet.model.*;
+import io.meeds.wallet.reward.dao.RewardDAO;
+import io.meeds.wallet.reward.dao.RewardPeriodDAO;
+import io.meeds.wallet.reward.entity.WalletRewardEntity;
+import io.meeds.wallet.reward.entity.WalletRewardPeriodEntity;
+import io.meeds.wallet.service.WalletAccountService;
+import io.meeds.wallet.service.WalletTransactionService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+
+@SpringBootTest(classes = { WalletRewardReportStorage.class, })
+@ExtendWith(MockitoExtension.class)
+class WalletRewardReportStorageTest {
+
+  private static final Long         REWARD_ID        = 2L;
+
+  private static final Long         REWARD_PERIOD_ID = 2L;
+
+  private static final Long         IDENTITY_ID      = 5L;
+
+  private static final Pageable     PAGEABLE         = Pageable.ofSize(2);
+
+  @MockBean
+  private RewardDAO                 rewardDAO;
+
+  @MockBean
+  private RewardPeriodDAO           rewardPeriodDAO;
+
+  @MockBean
+  private WalletAccountService      walletAccountService;
+
+  @MockBean
+  private WalletTransactionService  walletTransactionService;
+
+  @Autowired
+  private WalletRewardReportStorage walletRewardReportStorage;
+
+  @BeforeEach
+  void setup() {
+    when(rewardDAO.save(any())).thenAnswer(invocation -> {
+      WalletRewardEntity rewardEntity = invocation.getArgument(0);
+      if (rewardEntity.getId() == null) {
+        rewardEntity.setId(REWARD_ID);
+      }
+      when(rewardDAO.findById(REWARD_ID)).thenReturn(Optional.of(rewardEntity));
+      when(rewardDAO.findWalletRewardEntitiesByIdentityId(IDENTITY_ID, PAGEABLE)).thenReturn(List.of(rewardEntity));
+      when(rewardDAO.findAll(PAGEABLE)).thenReturn(new PageImpl<>(List.of(rewardEntity)));
+      when(rewardDAO.count()).thenReturn(1L);
+      when(rewardDAO.countWalletRewardEntitiesByIdentityId(IDENTITY_ID)).thenReturn(1.0);
+      when(rewardDAO.findRewardsByPeriodId(REWARD_ID)).thenReturn(List.of(rewardEntity));
+      return rewardEntity;
+    });
+    doAnswer(invocation -> {
+      WalletRewardEntity entity = invocation.getArgument(0);
+      when(rewardDAO.findById(entity.getId())).thenReturn(Optional.empty());
+      return null;
+    }).when(rewardDAO).delete(any());
+
+    when(rewardPeriodDAO.save(any())).thenAnswer(invocation -> {
+      WalletRewardPeriodEntity entity = invocation.getArgument(0);
+      if (entity.getId() == null) {
+        entity.setId(REWARD_PERIOD_ID);
+      }
+      if (entity.getPeriodType() == null) {
+        entity.setPeriodType(RewardPeriodType.WEEK);
+      }
+      when(rewardPeriodDAO.findById(REWARD_PERIOD_ID)).thenReturn(Optional.of(entity));
+      when(rewardPeriodDAO.findRewardPeriodsBetween(12125, 222125, PAGEABLE)).thenReturn(new PageImpl<>(List.of(entity)));
+      when(rewardPeriodDAO.findAll(PAGEABLE)).thenReturn(new PageImpl<>(List.of(entity)));
+      when(rewardPeriodDAO.findRewardPeriodByTypeAndTime(any(RewardPeriodType.class), anyLong())).thenReturn(entity);
+      when(rewardPeriodDAO.findWalletRewardPeriodEntitiesByStatus(any(RewardStatus.class))).thenReturn(List.of(entity));
+      when(rewardPeriodDAO.count()).thenReturn(1L);
+      return entity;
+    });
+    doAnswer(invocation -> {
+      WalletRewardPeriodEntity entity = invocation.getArgument(0);
+      when(rewardPeriodDAO.findById(entity.getId())).thenReturn(Optional.empty());
+      return null;
+    }).when(rewardPeriodDAO).delete(any());
+  }
+
+  @Test
+  void countRewards() {
+    // Given
+    RewardReport rewardReport = createRewardReportInstance();
+
+    // When
+    walletRewardReportStorage.saveRewardReport(rewardReport);
+
+    // Then
+    assertEquals(1.0, walletRewardReportStorage.countRewards(IDENTITY_ID));
+  }
+
+  @Test
+  void listRewards() {
+    // Given
+    RewardReport rewardReport = createRewardReportInstance();
+
+    // When
+    walletRewardReportStorage.saveRewardReport(rewardReport);
+
+    // Then
+    assertNotNull(walletRewardReportStorage.listRewards(IDENTITY_ID, ZoneId.systemDefault(), 2));
+    assertNotNull(walletRewardReportStorage.findRewardReportPeriods(PAGEABLE));
+    assertNotNull(walletRewardReportStorage.findRewardPeriodsBetween(12125, 222125, PAGEABLE));
+    assertNotNull(walletRewardReportStorage.getRewardPeriod(RewardPeriodType.WEEK, LocalDate.now(), ZoneId.systemDefault()));
+  }
+
+  @Test
+  void getRewardReport() {
+    assertNull(walletRewardReportStorage.getRewardReport(RewardPeriodType.WEEK, LocalDate.now(), ZoneId.systemDefault()));
+
+    // Given
+    RewardReport rewardReport = createRewardReportInstance();
+
+    // When
+    walletRewardReportStorage.saveRewardReport(rewardReport);
+
+    // Then
+    assertNotNull(walletRewardReportStorage.getRewardReportByPeriodId(REWARD_PERIOD_ID, ZoneId.systemDefault()));
+    assertNotNull(walletRewardReportStorage.getRewardPeriod(RewardPeriodType.WEEK, LocalDate.now(), ZoneId.systemDefault()));
+  }
+
+  @Test
+  void findRewardPeriodsByStatus() {
+    // Given
+    RewardReport rewardReport = createRewardReportInstance();
+
+    // When
+    walletRewardReportStorage.saveRewardReport(rewardReport);
+
+    // Then
+    assertNotNull(walletRewardReportStorage.findRewardPeriodsByStatus(RewardStatus.SUCCESS));
+  }
+
+  protected RewardReport createRewardReportInstance() {
+    Wallet wallet = newWallet(IDENTITY_ID);
+    Wallet wallet4 = newWallet(4L);
+    Wallet wallet5 = newWallet(5L);
+
+    RewardReport rewardReport = new RewardReport();
+    RewardPeriod rewardPeriod = new RewardPeriod();
+    rewardReport.setPeriod(rewardPeriod);
+    rewardReport.setParticipationsCount(10);
+    Set<WalletReward> walletRewards = new HashSet<>();
+    TransactionDetail transactionDetail = new TransactionDetail();
+    transactionDetail.setSucceeded(true);
+    walletRewards.add(new WalletReward(wallet, transactionDetail, 1L, 100, 10, rewardPeriod));
+    walletRewards.add(new WalletReward(wallet4, transactionDetail, 4L, 200, 50, rewardPeriod));
+    walletRewards.add(new WalletReward(wallet5, transactionDetail, 5L, 300, 40, rewardPeriod));
+    rewardReport.setRewards(walletRewards);
+
+    return rewardReport;
+  }
+
+  protected Wallet newWallet(long identityId) {
+    Wallet wallet = new Wallet();
+    wallet.setTechnicalId(identityId);
+    wallet.setAddress("walletAddress" + identityId);
+    wallet.setPassPhrase("passphrase");
+    wallet.setEnabled(true);
+    wallet.setIsInitialized(true);
+    wallet.setEtherBalance(0d);
+    wallet.setTokenBalance(0d);
+    wallet.setInitializationState(WalletState.INITIALIZED.name());
+    return wallet;
+  }
+}
diff --git a/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumWalletTokenAdminService.java b/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumWalletTokenAdminService.java
index 5ef996f97..e0253b8cd 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumWalletTokenAdminService.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/blockchain/service/EthereumWalletTokenAdminService.java
@@ -303,7 +303,7 @@ public final boolean isInitializedAccount(Wallet wallet) throws Exception {
   }
 
   @Override
-  public final BigInteger getTokenBalanceOf(String address) throws Exception {
+  public final BigInteger getTokenBalanceOf(String address) {
     return tokenBalanceFutureCache.get(null, address.toLowerCase());
   }
 
diff --git a/wallet-services/src/main/java/io/meeds/wallet/entity/AddressLabelEntity.java b/wallet-services/src/main/java/io/meeds/wallet/entity/AddressLabelEntity.java
index fc7768637..3455eea5d 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/entity/AddressLabelEntity.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/entity/AddressLabelEntity.java
@@ -25,7 +25,6 @@
 import org.exoplatform.commons.api.persistence.ExoEntity;
 
 @Entity(name = "Label")
-@ExoEntity
 @DynamicUpdate
 @Table(name = "ADDONS_WALLET_LABEL")
 public class AddressLabelEntity implements Serializable {
diff --git a/wallet-services/src/main/java/io/meeds/wallet/entity/TransactionEntity.java b/wallet-services/src/main/java/io/meeds/wallet/entity/TransactionEntity.java
index a16292480..a1d22a20b 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/entity/TransactionEntity.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/entity/TransactionEntity.java
@@ -25,7 +25,6 @@
 import org.exoplatform.commons.api.persistence.ExoEntity;
 
 @Entity(name = "WalletTransaction")
-@ExoEntity
 @DynamicUpdate
 @Table(name = "ADDONS_WALLET_TRANSACTION")
 @NamedQuery(name = "WalletTransaction.countReceivedContractAmount", query = "SELECT SUM(tx.contractAmount) FROM WalletTransaction tx WHERE tx.contractAddress = :contractAddress AND tx.toAddress = :address AND (tx.contractMethodName = 'reward' OR tx.contractMethodName = 'initializeAccount' OR tx.contractMethodName = 'transfer' OR tx.contractMethodName = 'transferFrom') AND tx.createdDate >= :startDate AND tx.createdDate < :endDate")
diff --git a/wallet-services/src/main/java/io/meeds/wallet/entity/WalletBackupEntity.java b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletBackupEntity.java
index 22c74aa7e..68ffe3471 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/entity/WalletBackupEntity.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletBackupEntity.java
@@ -23,7 +23,6 @@
 import org.exoplatform.commons.api.persistence.ExoEntity;
 
 @Entity(name = "WalletBackupEntity")
-@ExoEntity
 @Table(name = "ADDONS_WALLET_ACCOUNT_BACKUP")
 @NamedQuery(name = "WalletBackupEntity.findByWalletId", query = "SELECT wb FROM WalletBackupEntity wb WHERE wb.wallet.id = :walletId")
 public class WalletBackupEntity implements Serializable {
diff --git a/wallet-services/src/main/java/io/meeds/wallet/entity/WalletBlockchainStateEntity.java b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletBlockchainStateEntity.java
index 6fb6819e6..4865d0add 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/entity/WalletBlockchainStateEntity.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletBlockchainStateEntity.java
@@ -25,7 +25,6 @@
 import org.exoplatform.commons.api.persistence.ExoEntity;
 
 @Entity(name = "WalletBlockchainState")
-@ExoEntity
 @DynamicUpdate
 @Table(name = "ADDONS_WALLET_BLOCKCHAIN_STATE")
 @NamedQueries({
diff --git a/wallet-services/src/main/java/io/meeds/wallet/entity/WalletEntity.java b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletEntity.java
index 437e48ce6..dccd8b30c 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/entity/WalletEntity.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletEntity.java
@@ -30,7 +30,6 @@
 import io.meeds.wallet.model.WalletType;
 
 @Entity(name = "Wallet")
-@ExoEntity
 @DynamicUpdate
 @Table(name = "ADDONS_WALLET_ACCOUNT")
 @NamedQuery(name = "Wallet.findByAddress", query = "SELECT w FROM Wallet w WHERE LOWER(w.address) = :address")
diff --git a/wallet-services/src/main/java/io/meeds/wallet/entity/WalletPrivateKeyEntity.java b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletPrivateKeyEntity.java
index 65d082bb4..d4f2c80bf 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/entity/WalletPrivateKeyEntity.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/entity/WalletPrivateKeyEntity.java
@@ -25,7 +25,6 @@
 import org.exoplatform.commons.api.persistence.ExoEntity;
 
 @Entity(name = "WalletKey")
-@ExoEntity
 @DynamicUpdate
 @Table(name = "ADDONS_WALLET_KEY")
 @NamedQueries({
diff --git a/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java b/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java
index 28878777a..3edbedfa8 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java
@@ -56,6 +56,7 @@
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.picocontainer.Startable;
 import org.web3j.crypto.Keys;
 import org.web3j.crypto.Sign;
 import org.web3j.crypto.Sign.SignatureData;
@@ -86,10 +87,9 @@
 import io.meeds.wallet.storage.AddressLabelStorage;
 import io.meeds.wallet.storage.WalletStorage;
 
-import jakarta.annotation.PostConstruct;
 import jakarta.servlet.ServletContext;
 
-public class WalletAccountServiceImpl implements WalletAccountService, ExoWalletStatisticService {
+public class WalletAccountServiceImpl implements WalletAccountService, ExoWalletStatisticService, Startable {
 
   private static final String     ERROR_BROADCASTING_EVENT_FOR_WALLET     = "Error broadcasting event {} for wallet {}";
 
@@ -143,7 +143,7 @@ public WalletAccountServiceImpl(PortalContainer container,
     }
   }
 
-  @PostConstruct
+  @Override
   public void start() {
     // Ensure to make initialization after starting all other services of Wallet
     PortalContainer.addInitTask(container.getPortalContext(), new RootContainer.PortalContainerPostInitTask() {
diff --git a/wallet-services/src/main/java/io/meeds/wallet/service/WalletContractServiceImpl.java b/wallet-services/src/main/java/io/meeds/wallet/service/WalletContractServiceImpl.java
index 9f8d92a08..d4dbc114a 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/service/WalletContractServiceImpl.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/service/WalletContractServiceImpl.java
@@ -28,9 +28,6 @@
 import java.nio.charset.Charset;
 
 import io.meeds.wallet.model.ContractDetail;
-import io.meeds.wallet.service.WalletContractService;
-import io.meeds.wallet.service.WalletService;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
diff --git a/wallet-services/src/main/java/io/meeds/wallet/service/WalletServiceImpl.java b/wallet-services/src/main/java/io/meeds/wallet/service/WalletServiceImpl.java
index 09b562de7..78f17d9b7 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/service/WalletServiceImpl.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/service/WalletServiceImpl.java
@@ -84,10 +84,6 @@
 import io.meeds.wallet.model.Wallet;
 import io.meeds.wallet.model.WalletSettings;
 import io.meeds.wallet.model.WalletType;
-import io.meeds.wallet.service.BlockchainTransactionService;
-import io.meeds.wallet.service.WalletAccountService;
-import io.meeds.wallet.service.WalletContractService;
-import io.meeds.wallet.service.WalletService;
 
 /**
  * A storage service to save/load information used by users and spaces wallets
diff --git a/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumClientConnectorTest.java b/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumClientConnectorTest.java
index 8163b17a7..7deaa01b7 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumClientConnectorTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/blockchain/service/EthereumClientConnectorTest.java
@@ -17,12 +17,7 @@
 package io.meeds.wallet.blockchain.service;
 
 import static io.meeds.wallet.utils.WalletUtils.CONTRACT_TRANSACTION_MINED_EVENT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
@@ -133,7 +128,7 @@ public void testServiceStartWithPermanentListening() {
   }
 
   @Test
-  public void testServiceStop() throws Exception {
+  public void testServiceStop() {
     service.start();
     assertFalse(service.isConnected());
     setAsConnected();
@@ -201,7 +196,7 @@ public void testRenewTransactionListeningSubscription() throws Exception {
   }
 
   @Test
-  public void testGetNotFoundTransaction() throws Exception {
+  public void testGetNotFoundTransaction() {
     assertNull(service.getTransaction("test"));
   }
 
@@ -221,7 +216,7 @@ public void testGetTransactionWhenThrowException() throws Exception {
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
   @Test
-  public void testGetTransactionTwiceWhenNullUsingCache() throws Exception {
+  public void testGetTransactionTwiceWhenNullUsingCache() {
     String transactionHash = "test";
     Request request = mock(Request.class);
     when(web3j.ethGetTransactionByHash(transactionHash)).thenReturn(request);
@@ -255,7 +250,7 @@ public void testGetTransactionTwiceUsingCacheWithAResult() throws Exception {
   }
 
   @Test
-  public void testGetNotFoundTransactionReceipt() throws Exception {
+  public void testGetNotFoundTransactionReceipt() {
     assertNull(service.getTransactionReceipt("test"));
   }
 
@@ -275,7 +270,7 @@ public void testGetTransactionReceiptWhenThrowException() throws Exception {
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
   @Test
-  public void testGetTransactionReceiptTwiceWhenNullUsingCache() throws Exception {
+  public void testGetTransactionReceiptTwiceWhenNullUsingCache() {
     String transactionHash = "test";
     Request request = mock(Request.class);
     when(web3j.ethGetTransactionReceipt(transactionHash)).thenReturn(request);
@@ -398,24 +393,24 @@ public void testGetNonceByBlock() throws Exception {
   }
 
   @Test
-  public void testSetPollingIntervalWhenLowerThanMinimum() throws Exception {
+  public void testSetPollingIntervalWhenLowerThanMinimum() {
     assertThrows(IllegalStateException.class, () -> service.setPollingInterval(EthereumClientConnector.MINIMUM_POLLING_TIME - 1));
   }
 
   @Test
-  public void testSetPollingIntervalWhenGreaterThanMinimum() throws Exception {
+  public void testSetPollingIntervalWhenGreaterThanMinimum() {
     int pollingInterval = EthereumClientConnector.MINIMUM_POLLING_TIME + 1;
     service.setPollingInterval(pollingInterval);
     assertEquals(pollingInterval, service.getPollingInterval());
   }
 
   @Test
-  public void testGetPollingIntervalDefaultValue() throws Exception {
+  public void testGetPollingIntervalDefaultValue() {
     assertEquals(EthereumClientConnector.DEFAULT_POLLING_TIME, service.getPollingInterval());
   }
 
   @Test
-  public void testSetLastWatchedBlockNumberGreaterThanExisting() throws Exception {
+  public void testSetLastWatchedBlockNumberGreaterThanExisting() {
     long blockNumber = 12l;
     service.setLastWatchedBlockNumber(blockNumber);
     assertEquals(blockNumber, service.getLastWatchedBlockNumber());
@@ -426,7 +421,7 @@ public void testSetLastWatchedBlockNumberGreaterThanExisting() throws Exception
   }
 
   @Test
-  public void testSetLastWatchedBlockNumberLowerThanExisting() throws Exception {
+  public void testSetLastWatchedBlockNumberLowerThanExisting() {
     long blockNumber = 12l;
     service.setLastWatchedBlockNumber(blockNumber);
     assertEquals(blockNumber, service.getLastWatchedBlockNumber());
diff --git a/wallet-services/src/test/java/io/meeds/wallet/dao/AddressLabelDAOTest.java b/wallet-services/src/test/java/io/meeds/wallet/dao/AddressLabelDAOTest.java
index 6fd30bdbd..80bf4d555 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/dao/AddressLabelDAOTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/dao/AddressLabelDAOTest.java
@@ -16,9 +16,6 @@
  */
 package io.meeds.wallet.dao;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 import java.util.List;
 
 import org.junit.Test;
diff --git a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountBackupDAOTest.java b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountBackupDAOTest.java
index 3145ddd40..6d24fedd0 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountBackupDAOTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountBackupDAOTest.java
@@ -17,10 +17,6 @@
 
 package io.meeds.wallet.dao;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
 import java.util.Collections;
 import java.util.List;
 
diff --git a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountDAOTest.java b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountDAOTest.java
index 4a11bcaf5..0d72ee8a7 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountDAOTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletAccountDAOTest.java
@@ -16,10 +16,6 @@
  */
 package io.meeds.wallet.dao;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
 import java.util.Collections;
 import java.util.List;
 
diff --git a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletPrivateKeyDAOTest.java b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletPrivateKeyDAOTest.java
index 3445486fb..b6094447c 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletPrivateKeyDAOTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletPrivateKeyDAOTest.java
@@ -16,10 +16,6 @@
  */
 package io.meeds.wallet.dao;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
 import java.util.Collections;
 import java.util.List;
 
diff --git a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletTransactionDAOTest.java b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletTransactionDAOTest.java
index 3ef00c5c0..f62367433 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/dao/WalletTransactionDAOTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/dao/WalletTransactionDAOTest.java
@@ -16,10 +16,6 @@
  */
 package io.meeds.wallet.dao;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
 import java.time.ZonedDateTime;
 import java.util.List;
 
diff --git a/wallet-services/src/test/java/io/meeds/wallet/listener/GamificationWalletInitializationListenerTest.java b/wallet-services/src/test/java/io/meeds/wallet/listener/GamificationWalletInitializationListenerTest.java
index 80315bc70..a30a5fb67 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/listener/GamificationWalletInitializationListenerTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/listener/GamificationWalletInitializationListenerTest.java
@@ -33,7 +33,6 @@
 
 import java.util.Map;
 
-import io.meeds.wallet.listener.GamificationWalletInitializationListener;
 import io.meeds.wallet.model.Wallet;
 
 import org.junit.Test;
diff --git a/wallet-services/src/test/java/io/meeds/wallet/service/WalletAccountServiceTest.java b/wallet-services/src/test/java/io/meeds/wallet/service/WalletAccountServiceTest.java
index 60c119764..f1e7efb45 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/service/WalletAccountServiceTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/service/WalletAccountServiceTest.java
@@ -59,8 +59,6 @@
 import io.meeds.wallet.model.WalletProvider;
 import io.meeds.wallet.model.WalletState;
 import io.meeds.wallet.model.WalletType;
-import io.meeds.wallet.service.WalletAccountService;
-import io.meeds.wallet.service.WalletTokenAdminService;
 import io.meeds.wallet.storage.AddressLabelStorage;
 import io.meeds.wallet.storage.WalletStorage;
 import io.meeds.wallet.test.BaseWalletTest;
@@ -129,7 +127,7 @@ public void testSaveWalletAddress() throws IllegalAccessException {
   }
 
   @Test
-  public void testSaveWallet() throws IllegalAccessException {
+  public void testSaveWallet() {
     String walletAddress = "0x11111111155511111111111111111111111111";
     WalletAccountService walletAccountService = getService(WalletAccountService.class);
     Wallet userWallet =
diff --git a/wallet-services/src/test/java/io/meeds/wallet/storage/AddressLabelStorageTest.java b/wallet-services/src/test/java/io/meeds/wallet/storage/AddressLabelStorageTest.java
index 3b454560e..ef580cde2 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/storage/AddressLabelStorageTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/storage/AddressLabelStorageTest.java
@@ -16,12 +16,6 @@
  */
 package io.meeds.wallet.storage;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.util.Set;
 
 import org.junit.Test;
diff --git a/wallet-services/src/test/java/io/meeds/wallet/storage/TransactionStorageTest.java b/wallet-services/src/test/java/io/meeds/wallet/storage/TransactionStorageTest.java
index 9f327f3bc..2e01ff092 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/storage/TransactionStorageTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/storage/TransactionStorageTest.java
@@ -16,11 +16,6 @@
  */
 package io.meeds.wallet.storage;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/wallet-services/src/test/java/io/meeds/wallet/storage/WalletStorageTest.java b/wallet-services/src/test/java/io/meeds/wallet/storage/WalletStorageTest.java
index e201f338c..4963bdcb0 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/storage/WalletStorageTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/storage/WalletStorageTest.java
@@ -16,13 +16,6 @@
  */
 package io.meeds.wallet.storage;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.util.Set;
 
 import org.junit.Test;
diff --git a/wallet-services/src/test/java/io/meeds/wallet/test/BaseWalletTest.java b/wallet-services/src/test/java/io/meeds/wallet/test/BaseWalletTest.java
index fac8c0a9a..0dccf5b40 100644
--- a/wallet-services/src/test/java/io/meeds/wallet/test/BaseWalletTest.java
+++ b/wallet-services/src/test/java/io/meeds/wallet/test/BaseWalletTest.java
@@ -583,11 +583,6 @@ protected ContractTransactionEvent newContractTransactionEvent() {
                                         "0x0000000000000000000000002b7e115f52171d164529fdb1ac72571e608a474e",
                                         "0x0000000000000000000000001d94f732223996e9f773261e82340889934a6c03");
     long blockNumber = 28047704;
-    ContractTransactionEvent contractTransactionEvent = new ContractTransactionEvent(hash,
-                                                                                     contractAddress,
-                                                                                     data,
-                                                                                     topics,
-                                                                                     blockNumber);
-    return contractTransactionEvent;
+    return new ContractTransactionEvent(hash, contractAddress, data, topics, blockNumber);
   }
 }
diff --git a/wallet-webapps/src/main/webapp/vue-app/achievementsExtensions/extensions.js b/wallet-webapps/src/main/webapp/vue-app/achievementsExtensions/extensions.js
index c1c0330e4..7e1953bdf 100644
--- a/wallet-webapps/src/main/webapp/vue-app/achievementsExtensions/extensions.js
+++ b/wallet-webapps/src/main/webapp/vue-app/achievementsExtensions/extensions.js
@@ -37,7 +37,7 @@ export function init() {
         this.rewardReportPeriods = (this.rewardReportPeriods === null || typeof this.rewardReportPeriods === 'undefined') ? getRewardReportPeriods(null, null, 0, -1) : this.rewardReportPeriods;
         this.computedCanUpdateStatus[createdDate] = this.rewardReportPeriods
           .then(period => {
-            this.computedCanUpdateStatus[createdDate] = period.filter(rewardPeriod => createdDate >= rewardPeriod?.startDateInSeconds && createdDate <= rewardPeriod?.endDateInSeconds).length === 0;
+            this.computedCanUpdateStatus[createdDate] = period?.entity?.filter(rewardPeriod => createdDate >= rewardPeriod?.startDateInSeconds && createdDate <= rewardPeriod?.endDateInSeconds).length === 0;
             return this.computedCanUpdateStatus[createdDate];
           });
         return this.computedCanUpdateStatus[createdDate];
diff --git a/wallet-webapps/src/main/webapp/vue-app/achievementsExtensions/js/service.js b/wallet-webapps/src/main/webapp/vue-app/achievementsExtensions/js/service.js
index 11d922a7f..f3e9474f8 100644
--- a/wallet-webapps/src/main/webapp/vue-app/achievementsExtensions/js/service.js
+++ b/wallet-webapps/src/main/webapp/vue-app/achievementsExtensions/js/service.js
@@ -17,7 +17,7 @@
  *
  */
 export function getRewardReportPeriods(from, to, offset, limit) {
-  return fetch(`/portal/rest/wallet/api/reward/periods?from=${from || 0}&to=${to || 0}&offset=${offset || 0}&limit=${limit|| 10}`, {
+  return fetch(`/wallet/rest/reward/periods?from=${from || 0}&to=${to || 0}&offset=${offset || 0}&limit=${limit|| 10}`, {
     method: 'GET',
     credentials: 'include',
     headers: {
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-app/components/wallet-app/RewardDetail.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-app/components/wallet-app/RewardDetail.vue
index 0a408020e..8900e9615 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-app/components/wallet-app/RewardDetail.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-app/components/wallet-app/RewardDetail.vue
@@ -211,30 +211,11 @@ export default {
   methods: {
     init() {
       this.loading = true;
-      this.listRewards(this.limit)
+      this.$rewardService.getRewardsByUser(this.limit)
         .then(rewards => this.walletRewards = rewards)
         .catch(e => this.error = String(e))
         .finally(() => this.loading = false);
     },
-    listRewards(limit) {
-      return fetch(`/portal/rest/wallet/api/reward/list?limit=${limit || 10}`, {
-        method: 'GET',
-        credentials: 'include',
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-        },
-      }).then((resp) => {
-        if (resp && resp.ok) {
-          return resp.json();
-        } else {
-          throw new Error('Error listing rewards');
-        }
-      }).catch((error) => {
-        console.error(error);
-        this.error = this.$t('exoplatform.wallet.error.errorListingRewards');
-      });
-    },
     formatDate(timeInSeconds, seconds) {
       if (!timeInSeconds) {
         return '';
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/WalletBalanceAPI.js b/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/WalletBalanceAPI.js
index ccaab8638..a43e55db9 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/WalletBalanceAPI.js
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/WalletBalanceAPI.js
@@ -28,7 +28,7 @@ export function getWalletAccount() {
 }
 
 export  function getCountRewards(userId) {
-  return fetch(`/portal/rest/wallet/api/reward/countRewards?userId=${userId}`, {
+  return fetch(`/wallet/rest/reward/countRewards?userId=${userId}`, {
     method: 'GET',
     credentials: 'include',
     headers: {
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverview.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverview.vue
index 1159458d7..c4433cb81 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverview.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverview.vue
@@ -119,7 +119,7 @@ export default {
     refresh() {
       this.loading = true;
       const earningsPromise = getCountRewards(eXo.env.portal.profileOwner)
-        .then((resp) => this.rewardBalance = resp.sumRewards);
+        .then((sum) => this.rewardBalance = sum);
       const walletDetailsPromise = fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/wallet/api/account/detailsById?id=${this.currentName}&type=user`, {credentials: 'include'})
         .then((resp) => resp && resp.ok && resp.json())
         .then(() => {
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewDrawer.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewDrawer.vue
index 6d1f39a9e..99fcff669 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewDrawer.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewDrawer.vue
@@ -143,8 +143,8 @@ export default {
       this.loading = true;
       return this.$rewardService.getRewardsByUser(this.limit)
         .then(data => {
-          if (data && data.length) {
-            this.rewardsList = data.filter(reward => reward.transaction && reward.status === 'success');
+          if (data && data.entity?.length) {
+            this.rewardsList = data?.entity?.filter(reward => reward.transaction && reward.status === 'success');
           } else {
             this.rewardsList = [];
           }
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardItem.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardItem.vue
index 332aa651b..628da3485 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardItem.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardItem.vue
@@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation,
 Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 -->
 <template>
-  <div v-if="rewards && rewards.length">
+  <div v-if="rewards">
     <v-list-item>
       <v-list-item-content class="align-end text-start">
         <v-list-item-title :title="period">
@@ -31,14 +31,16 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <span>{{ rewardAmount }}</span>
       </v-list-item-icon>
     </v-list-item>
-
-    <wallet-overview-reward-plugin-item
-      v-for="(plugin, i) in rewards"
-      :id="`plugin-${plugin.pluginId}`"
-      :key="i"
-      :reward-item="rewardItem"
-      :plugin="plugin"
-      :symbol="symbol" />
+    <v-list-item dense>
+      <v-list-item-icon class="me-2">
+        <v-icon size="18">fa-trophy</v-icon>
+      </v-list-item-icon>
+      <v-list-item-content class="align-end text-start">
+        <v-list-item-subtitle>
+          <span class="text-sub-title caption">{{ points }} {{ $t('wallet.overview.points') }}</span>
+        </v-list-item-subtitle>
+      </v-list-item-content>
+    </v-list-item>
   </div>
 </template>
 <script>
@@ -61,7 +63,10 @@ export default {
   }),
   computed: {
     rewards() {
-      return this.rewardItem && this.rewardItem.rewards && this.rewardItem.rewards.length && this.rewardItem.rewards.filter(plugin => plugin.amount);
+      return this.rewardItem?.amount;
+    },
+    points() {
+      return this.rewardItem?.points;
     },
     rewardEarnedAmount() {
       return parseInt(this.rewardItem.tokensSent * 100) / 100;
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardPluginItem.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardPluginItem.vue
deleted file mode 100644
index 5e10fd895..000000000
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardPluginItem.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
-This file is part of the Meeds project (https://meeds.io/).
-Copyright (C) 2020 Meeds Association
-contact@meeds.io
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 3 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--->
-<template>
-  <v-list-item v-if="pluginName === 'Gamification'" dense>
-    <v-list-item-icon class="me-2">
-      <v-icon size="18">fa-trophy</v-icon>
-    </v-list-item-icon>
-    <v-list-item-content class="align-end text-start">
-      <v-list-item-subtitle>
-        <span class="text-sub-title caption">{{ plugin.points }} {{ $t('wallet.overview.points') }}</span>
-      </v-list-item-subtitle>
-    </v-list-item-content>
-  </v-list-item>
-</template>
-<script>
-export default {
-  props: {
-    rewardItem: {
-      type: Object,
-      default: () => ({}),
-    },
-    plugin: {
-      type: Object,
-      default: () => ({}),
-    },
-    symbol: {
-      type: String,
-      default: 'sent',
-    },
-  },
-  computed: {
-    pluginName() {
-      return this.plugin.pluginId.charAt(0).toUpperCase() + this.plugin.pluginId.slice(1);
-    },
-    pluginEarnedAmount() {
-      return parseInt(this.plugin.amount * 100) / 100;
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/initComponents.js b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/initComponents.js
index d1adbef84..086101fed 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/initComponents.js
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/initComponents.js
@@ -17,13 +17,11 @@
 import WalletOverview from './components/WalletOverview.vue';
 import WalletOverviewDrawer from './components/WalletOverviewDrawer.vue';
 import WalletOverviewRewardItem from './components/WalletOverviewRewardItem.vue';
-import WalletOverviewRewardPluginItem from './components/WalletOverviewRewardPluginItem.vue';
 
 const components = {
   'wallet-overview': WalletOverview,
   'wallet-overview-drawer': WalletOverviewDrawer,
   'wallet-overview-reward-item': WalletOverviewRewardItem,
-  'wallet-overview-reward-plugin-item': WalletOverviewRewardPluginItem,
 };
 
 for (const key in components) {
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/walletCommon.js b/wallet-webapps/src/main/webapp/vue-app/wallet-common/walletCommon.js
index bcdf99a9f..ab21b5be0 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/walletCommon.js
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/walletCommon.js
@@ -45,7 +45,6 @@ import WalletWelcomeScreen from './components/WalletWelcomeScreen.vue';
 import WalletOverview from './wallet-overview/components/WalletOverview.vue';
 import WalletOverviewDrawer from './wallet-overview/components/WalletOverviewDrawer.vue';
 import WalletOverviewRewardItem from './wallet-overview/components/WalletOverviewRewardItem.vue';
-import WalletOverviewRewardPluginItem from './wallet-overview/components/WalletOverviewRewardPluginItem.vue';
 import WalletUserBalance from './wallet-user-balance/components/WalletUserBalance.vue';
 import WeeklyEarnings from './weekly-earnings/components/WeeklyEarnings.vue';
 
@@ -104,7 +103,6 @@ export const components = {
   'wallet-overview': WalletOverview,
   'wallet-overview-drawer': WalletOverviewDrawer,
   'wallet-overview-reward-item': WalletOverviewRewardItem,
-  'wallet-overview-reward-plugin-item': WalletOverviewRewardPluginItem,
   'wallet-user-balance': WalletUserBalance,
   'wallet-reward-weekly-earnings': WeeklyEarnings,
 };
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue
index fbd9fbdea..c372f28a5 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue
@@ -81,8 +81,10 @@ export default {
     },
     refreshRewards() {
       return this.wallet?.address?.length && this.$rewardService.getRewardsByUser(this.limit)
-        .then(rewards => rewards.find(r => r.transaction && r.status === 'success'))
-        .then(reward => this.lastReward = reward?.tokensToSend || 0);
+        .then(rewards => {
+          const reward = rewards?.entity?.find(r => r.transaction && r.status === 'success');
+          this.lastReward = reward?.amount || 0;
+        });
     },
   },
 };