diff --git a/src/components/Action/ActionCard.tsx b/src/components/Action/ActionCard.tsx
index 277cc481c2b3db715d564f900f76dae86f2d6bf7..119f04b52eb57725231d8f92a6cc930f055c59e4 100644
--- a/src/components/Action/ActionCard.tsx
+++ b/src/components/Action/ActionCard.tsx
@@ -3,7 +3,7 @@ import defaultIcon from 'assets/icons/visu/ecogesture/default.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import EcogestureModal from 'components/Ecogesture/EcogestureModal'
 import { useClient } from 'cozy-client'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
 import { Ecogesture } from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
 import UsageEventService from 'services/usageEvent.service'
diff --git a/src/components/Action/ActionDone.tsx b/src/components/Action/ActionDone.tsx
index 450868a8efe6117160dd6ccfb597a3a95df0eb9d..0fb8bf669abe747d9cb6589a0ae79a38c5627ad6 100644
--- a/src/components/Action/ActionDone.tsx
+++ b/src/components/Action/ActionDone.tsx
@@ -3,8 +3,7 @@ import starFilled from 'assets/icons/visu/challenge/starFilled.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UsageEventType, UserChallengeUpdateFlag } from 'enums'
 import { UserChallenge } from 'models'
 import React, { useCallback } from 'react'
 import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Action/ActionModal.tsx b/src/components/Action/ActionModal.tsx
index 01aa9f3ec10ac2cbd39e060b8a675c481ba153f0..65cf21142faac8539622bf19607153a918336914 100644
--- a/src/components/Action/ActionModal.tsx
+++ b/src/components/Action/ActionModal.tsx
@@ -4,7 +4,7 @@ import chronoMini from 'assets/icons/visu/action/chrono-mini.svg'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UserChallengeUpdateFlag } from 'enums'
 import { Ecogesture, UserChallenge } from 'models'
 import React, { useCallback } from 'react'
 import ChallengeService from 'services/challenge.service'
diff --git a/src/components/Action/ActionOnGoing.spec.tsx b/src/components/Action/ActionOnGoing.spec.tsx
index e4d9d1be16dceebbb953cac3f16a3b879220a87d..67d5b6a92f4ad2ce4cedb647b3a5201135eece49 100644
--- a/src/components/Action/ActionOnGoing.spec.tsx
+++ b/src/components/Action/ActionOnGoing.spec.tsx
@@ -1,6 +1,6 @@
 import { Button } from '@material-ui/core'
 import EcogestureModal from 'components/Ecogesture/EcogestureModal'
-import { UserActionState } from 'enum/userAction.enum'
+import { UserActionState } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import { DateTime } from 'luxon'
diff --git a/src/components/Action/ActionView.spec.tsx b/src/components/Action/ActionView.spec.tsx
index be9251b1467ec1026be2861c9139d42a299721f0..5bf2322c811c47518fdcdf27f84d831b8fa17ab1 100644
--- a/src/components/Action/ActionView.spec.tsx
+++ b/src/components/Action/ActionView.spec.tsx
@@ -1,5 +1,5 @@
 import ActionView from 'components/Action/ActionView'
-import { UserActionState } from 'enum/userAction.enum'
+import { UserActionState } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import React from 'react'
diff --git a/src/components/Action/ActionView.tsx b/src/components/Action/ActionView.tsx
index a530002f1434620308a785df104f08747b0f0f7c..cb38bbb44b88f1b6e4535cb8e53338b00da01545 100644
--- a/src/components/Action/ActionView.tsx
+++ b/src/components/Action/ActionView.tsx
@@ -4,7 +4,7 @@ import ActionOnGoing from 'components/Action/ActionOnGoing'
 import Content from 'components/Content/Content'
 import CozyBar from 'components/Header/CozyBar'
 import Header from 'components/Header/Header'
-import { UserActionState } from 'enum/userAction.enum'
+import { UserActionState } from 'enums'
 import { UserChallenge } from 'models'
 import React, { useState } from 'react'
 import { useAppSelector } from 'store/hooks'
diff --git a/src/components/Analysis/AnalysisView.tsx b/src/components/Analysis/AnalysisView.tsx
index 650eee647d3f009aaf0577b08f8dbf0e753246c2..048a04a54adadbf4a7752a1697f4bf6e5f3e16a6 100644
--- a/src/components/Analysis/AnalysisView.tsx
+++ b/src/components/Analysis/AnalysisView.tsx
@@ -4,8 +4,7 @@ import DateNavigator from 'components/DateNavigator/DateNavigator'
 import CozyBar from 'components/Header/CozyBar'
 import Header from 'components/Header/Header'
 import { useClient } from 'cozy-client'
-import { TimeStep } from 'enum/timeStep.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { TimeStep, UsageEventType } from 'enums'
 import { DateTime } from 'luxon'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useLocation } from 'react-router-dom'
diff --git a/src/components/Analysis/Comparison/Comparison.tsx b/src/components/Analysis/Comparison/Comparison.tsx
index b9bad0ee5613f6e877b8d391b3a7425d2df00e29..f488816e361e183b81eee65bf2b1fc6c512ff24e 100644
--- a/src/components/Analysis/Comparison/Comparison.tsx
+++ b/src/components/Analysis/Comparison/Comparison.tsx
@@ -2,8 +2,7 @@ import { Button } from '@material-ui/core'
 import Loader from 'components/Loader/Loader'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { PerformanceIndicator } from 'models'
 import React, { useEffect, useMemo, useState } from 'react'
 import ConsumptionService from 'services/consumption.service'
diff --git a/src/components/Analysis/Comparison/FluidPerformanceIndicator.tsx b/src/components/Analysis/Comparison/FluidPerformanceIndicator.tsx
index d5af35ce3f974fba88a3ab4f929fa1a0c3e5ce88..195e7f24f9c9537997d36dad777a5c52013b6a59 100644
--- a/src/components/Analysis/Comparison/FluidPerformanceIndicator.tsx
+++ b/src/components/Analysis/Comparison/FluidPerformanceIndicator.tsx
@@ -1,6 +1,6 @@
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { DateTime } from 'luxon'
 import { PerformanceIndicator } from 'models'
 import React from 'react'
diff --git a/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourChart.tsx b/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourChart.tsx
index b63408d3b05ae42ff1fd32550ae16c7b529407c1..1911da91c9b913697383a83c73f6b13aab9b21cb 100644
--- a/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourChart.tsx
+++ b/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourChart.tsx
@@ -3,8 +3,7 @@ import AxisRight from 'components/Charts/AxisRight'
 import Bar from 'components/Charts/Bar'
 import { useChartResize } from 'components/Hooks/useChartResize'
 import { scaleBand, ScaleBand, scaleLinear, ScaleLinear } from 'd3-scale'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { Dataload } from 'models'
 import React, { useRef } from 'react'
diff --git a/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourMonthlyAnalysis.tsx b/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourMonthlyAnalysis.tsx
index a62f302fa0383a4b45ab3c69693ab79c9609ab77..f447f68078cfe6b09ca93c14838eff6fb7655d00 100644
--- a/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourMonthlyAnalysis.tsx
+++ b/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourMonthlyAnalysis.tsx
@@ -7,13 +7,13 @@ import Loader from 'components/Loader/Loader'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { FluidPrice, PerformanceIndicator } from 'models'
+import { FluidType, TimeStep } from 'enums'
 import {
   AggregatedEnedisMonthlyDataloads,
   EnedisMonthlyAnalysisData,
-} from 'models/enedisMonthlyAnalysis'
+  FluidPrice,
+  PerformanceIndicator,
+} from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
 import ConsumptionService from 'services/consumption.service'
 import EnedisMonthlyAnalysisDataService from 'services/enedisMonthlyAnalysisData.service'
diff --git a/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.spec.tsx b/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.spec.tsx
index d1ef094eeb19bc0ce16df5cc4870e09c033c4125..74b19c9c8ef889d2faa92bcf242f4f4c75f28eb1 100644
--- a/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.spec.tsx
+++ b/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import React from 'react'
diff --git a/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.tsx b/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.tsx
index d0296f384b36ff0b5017a7a6a2d39f5b6712326d..cbc3825500b621466f8adfd51bb02379aef7855a 100644
--- a/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.tsx
+++ b/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.tsx
@@ -10,9 +10,7 @@ import Loader from 'components/Loader/Loader'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { DataloadSectionType } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadSectionType, FluidType, TimeStep } from 'enums'
 import { Datachart, Dataload, TimePeriod } from 'models'
 import React, { useEffect, useRef, useState } from 'react'
 import ConsumptionDataManager from 'services/consumption.service'
diff --git a/src/components/Analysis/MonthlyAnalysis.tsx b/src/components/Analysis/MonthlyAnalysis.tsx
index 8c9d8828a7205aeb799f5b7614cda6ce977cfef2..a8b4c3065ae58ddb2a22d4286b53b748306440c5 100644
--- a/src/components/Analysis/MonthlyAnalysis.tsx
+++ b/src/components/Analysis/MonthlyAnalysis.tsx
@@ -1,8 +1,7 @@
 import { Fade } from '@material-ui/core'
 import Loader from 'components/Loader/Loader'
 import { useClient } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { PerformanceIndicator, TimePeriod } from 'models'
 import React, { useEffect, useMemo, useState } from 'react'
 import ConsumptionService from 'services/consumption.service'
diff --git a/src/components/Analysis/ProfileComparator/ProfileComparator.spec.tsx b/src/components/Analysis/ProfileComparator/ProfileComparator.spec.tsx
index ca8ee2671106a95a17ddb5cadff4e863dc6891d7..be5f00a3b7f08261397cec8b2937947290aa9989 100644
--- a/src/components/Analysis/ProfileComparator/ProfileComparator.spec.tsx
+++ b/src/components/Analysis/ProfileComparator/ProfileComparator.spec.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable react/display-name */
 import { Accordion } from '@material-ui/core'
 import Button from '@material-ui/core/Button'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { mount } from 'enzyme'
 import { PerformanceIndicator } from 'models'
 import React from 'react'
diff --git a/src/components/Analysis/ProfileComparator/ProfileComparator.tsx b/src/components/Analysis/ProfileComparator/ProfileComparator.tsx
index dfde6b4abdf41cbe735f1009e79e3f46e7888741..c3c0cf07a8c92fe06141197ae46a294e0c893f9d 100644
--- a/src/components/Analysis/ProfileComparator/ProfileComparator.tsx
+++ b/src/components/Analysis/ProfileComparator/ProfileComparator.tsx
@@ -13,9 +13,8 @@ import Loader from 'components/Loader/Loader'
 import { Client, useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
-import { PerformanceIndicator } from 'models'
-import { MonthlyForecast, ProfileType } from 'models/profileType.model'
+import { FluidType } from 'enums'
+import { MonthlyForecast, PerformanceIndicator, ProfileType } from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import ProfileTypeService from 'services/profileType.service'
diff --git a/src/components/Analysis/ProfileComparator/ProfileComparatorRow.spec.tsx b/src/components/Analysis/ProfileComparator/ProfileComparatorRow.spec.tsx
index 61f3aeac752225a1b5357bc9d055514c47873d33..39632fd0b4fa443b1e360d7c18cfb681a1232978 100644
--- a/src/components/Analysis/ProfileComparator/ProfileComparatorRow.spec.tsx
+++ b/src/components/Analysis/ProfileComparator/ProfileComparatorRow.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { mount } from 'enzyme'
 import { MonthlyForecast } from 'models'
 import React from 'react'
diff --git a/src/components/Analysis/ProfileComparator/ProfileComparatorRow.tsx b/src/components/Analysis/ProfileComparator/ProfileComparatorRow.tsx
index 6091ef854acefb9e8008868a7291311123f915b5..adea63d2cefc1d774c9a6ab354ec8227e64d318e 100644
--- a/src/components/Analysis/ProfileComparator/ProfileComparatorRow.tsx
+++ b/src/components/Analysis/ProfileComparator/ProfileComparatorRow.tsx
@@ -2,7 +2,7 @@ import EuroIcon from 'assets/icons/ico/euro-icon.svg'
 import classNames from 'classnames'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { MonthlyForecast } from 'models'
 import React from 'react'
 import ConverterService from 'services/converter.service'
diff --git a/src/components/Analysis/TotalAnalysisChart/PieChart.spec.tsx b/src/components/Analysis/TotalAnalysisChart/PieChart.spec.tsx
index 1586ba71bcedaf1d886f9a659d049f1989f41a08..064408f847341c177a3126e6e7fc58b9bd978066 100644
--- a/src/components/Analysis/TotalAnalysisChart/PieChart.spec.tsx
+++ b/src/components/Analysis/TotalAnalysisChart/PieChart.spec.tsx
@@ -1,4 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
+import { DataloadState } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import { DataloadValueDetail } from 'models'
diff --git a/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.spec.tsx b/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.spec.tsx
index c3b08b9ea73986ba2b6191901e74e08541090c1b..f2481bfafd4e7366b624e4a6764ec62d3a642ac0 100644
--- a/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.spec.tsx
+++ b/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.spec.tsx
@@ -1,5 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadState, FluidType } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import { DateTime } from 'luxon'
diff --git a/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.tsx b/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.tsx
index 9d682401815dce5e22fe9047bcce24d1e027678f..37dccf55427acae66bc6e36844d26acf75f96062 100644
--- a/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.tsx
+++ b/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.tsx
@@ -3,8 +3,7 @@ import Loader from 'components/Loader/Loader'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { DataloadValueDetail, TimePeriod } from 'models'
 import React, { useEffect, useState } from 'react'
 import ConsumptionDataManager from 'services/consumption.service'
diff --git a/src/components/Challenge/ChallengeCard.tsx b/src/components/Challenge/ChallengeCard.tsx
index a6788d190ade10f3defc8b7bbe3f389b94aa2b2c..0f297d85e93d50f881a7dc5c45382ca5403ed29d 100644
--- a/src/components/Challenge/ChallengeCard.tsx
+++ b/src/components/Challenge/ChallengeCard.tsx
@@ -1,4 +1,4 @@
-import { UserChallengeState } from 'enum/userChallenge.enum'
+import { UserChallengeState } from 'enums'
 import { UserChallenge } from 'models'
 import React from 'react'
 import ChallengeCardDone from './ChallengeCardDone'
diff --git a/src/components/Challenge/ChallengeCardDone.tsx b/src/components/Challenge/ChallengeCardDone.tsx
index dc4d294b7a9fc46816879416312f83485f886145..59e2c9e272a1334bd9a70876578837457e0601c3 100644
--- a/src/components/Challenge/ChallengeCardDone.tsx
+++ b/src/components/Challenge/ChallengeCardDone.tsx
@@ -4,10 +4,7 @@ import classNames from 'classnames'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import {
-  UserChallengeSuccess,
-  UserChallengeUpdateFlag,
-} from 'enum/userChallenge.enum'
+import { UserChallengeSuccess, UserChallengeUpdateFlag } from 'enums'
 import { UserChallenge } from 'models'
 import React, { useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Challenge/ChallengeCardOnGoing.tsx b/src/components/Challenge/ChallengeCardOnGoing.tsx
index 4157be83ea7ad8987725f0302133d840e56cc801..828ef893fb7eb13cf4a58b440fd2fc431bbcaa14 100644
--- a/src/components/Challenge/ChallengeCardOnGoing.tsx
+++ b/src/components/Challenge/ChallengeCardOnGoing.tsx
@@ -10,11 +10,13 @@ import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import Loader from 'components/Loader/Loader'
 import { Client, useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UserActionState } from 'enum/userAction.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
-import { UserExplorationState } from 'enum/userExploration.enum'
-import { UserQuizState } from 'enum/userQuiz.enum'
+import {
+  UserActionState,
+  UserChallengeUpdateFlag,
+  UserDuelState,
+  UserExplorationState,
+  UserQuizState,
+} from 'enums'
 import { UserChallenge } from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Challenge/ChallengeCardUnlocked.spec.tsx b/src/components/Challenge/ChallengeCardUnlocked.spec.tsx
index a5f422cda7c87dd61208ee76dd7b84f5d0b22a2f..c65af921d0984a22b6e4d9895da131e8d2585897 100644
--- a/src/components/Challenge/ChallengeCardUnlocked.spec.tsx
+++ b/src/components/Challenge/ChallengeCardUnlocked.spec.tsx
@@ -1,6 +1,6 @@
 import { Button } from '@material-ui/core'
 import defaultIcon from 'assets/icons/visu/challenge/challengeLocked.svg'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/Challenge/ChallengeCardUnlocked.tsx b/src/components/Challenge/ChallengeCardUnlocked.tsx
index 4276b6d540a85aa20f54d7c59dbc9093a22f9ff6..cfbda19fd4fb3832250fa93dfd5304ea55623ac4 100644
--- a/src/components/Challenge/ChallengeCardUnlocked.tsx
+++ b/src/components/Challenge/ChallengeCardUnlocked.tsx
@@ -3,8 +3,7 @@ import defaultIcon from 'assets/icons/visu/challenge/challengeLocked.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { Client, useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidState } from 'enum/fluid.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { FluidState, UsageEventType } from 'enums'
 import { UserChallenge } from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
 import ChallengeService from 'services/challenge.service'
diff --git a/src/components/Challenge/ChallengeView.tsx b/src/components/Challenge/ChallengeView.tsx
index 0817c84b311d971f116a9d6af49545463d8c5da9..bf2652648226d1c5c98e9472bcfaf91033f641e5 100644
--- a/src/components/Challenge/ChallengeView.tsx
+++ b/src/components/Challenge/ChallengeView.tsx
@@ -5,7 +5,7 @@ import Content from 'components/Content/Content'
 import CozyBar from 'components/Header/CozyBar'
 import Header from 'components/Header/Header'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UserChallengeState } from 'enum/userChallenge.enum'
+import { UserChallengeState } from 'enums'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useAppSelector } from 'store/hooks'
 import ChallengeCard from './ChallengeCard'
diff --git a/src/components/Charts/AxisBottom.spec.tsx b/src/components/Charts/AxisBottom.spec.tsx
index 8e11560598d3c7ee3102b0341205abef4d319362..8bde1184420acb73c93e2e0cdf036f52abbb079f 100644
--- a/src/components/Charts/AxisBottom.spec.tsx
+++ b/src/components/Charts/AxisBottom.spec.tsx
@@ -1,5 +1,5 @@
 import { scaleBand, ScaleBand } from 'd3-scale'
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
 import { mount } from 'enzyme'
 import { DateTime } from 'luxon'
 import React from 'react'
diff --git a/src/components/Charts/AxisBottom.tsx b/src/components/Charts/AxisBottom.tsx
index 4e69f565b86bf1ac47bd575b0d69ec367d069185..11a5410ec0e2b502561538d0edf38d1fa5876ae7 100644
--- a/src/components/Charts/AxisBottom.tsx
+++ b/src/components/Charts/AxisBottom.tsx
@@ -1,5 +1,5 @@
 import { ScaleBand } from 'd3-scale'
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
 import { capitalize } from 'lodash'
 import { DateTime } from 'luxon'
 import { Dataload } from 'models'
diff --git a/src/components/Charts/AxisRight.spec.tsx b/src/components/Charts/AxisRight.spec.tsx
index 66f7230e2289caec50760f4ef6313e20c0a657c5..1e3c9eb391471f3f22a2fb03406b635619656fb5 100644
--- a/src/components/Charts/AxisRight.spec.tsx
+++ b/src/components/Charts/AxisRight.spec.tsx
@@ -1,5 +1,5 @@
 import { scaleLinear } from 'd3'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import AxisRight from './AxisRight'
diff --git a/src/components/Charts/AxisRight.tsx b/src/components/Charts/AxisRight.tsx
index 7ba81a2e94c7a921985dd33332974c52b3d8fcfd..656eb8e822e5e06705d1726b959a54b119c252dd 100644
--- a/src/components/Charts/AxisRight.tsx
+++ b/src/components/Charts/AxisRight.tsx
@@ -2,7 +2,7 @@ import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import { axisRight } from 'd3-axis'
 import { ScaleLinear } from 'd3-scale'
 import { select, selectAll } from 'd3-selection'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import React, { useEffect, useRef } from 'react'
 
 interface AxisRightProps {
diff --git a/src/components/Charts/Bar.spec.tsx b/src/components/Charts/Bar.spec.tsx
index 764fef2381197d5767c2aa61ae8dc86efc1a0dc7..0e7def2e9d788c16b8a67e725bbcd9a00661ab5d 100644
--- a/src/components/Charts/Bar.spec.tsx
+++ b/src/components/Charts/Bar.spec.tsx
@@ -1,6 +1,5 @@
 import { scaleBand, ScaleBand, scaleLinear } from 'd3'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { mount } from 'enzyme'
 import { DateTime } from 'luxon'
 import React from 'react'
diff --git a/src/components/Charts/Bar.tsx b/src/components/Charts/Bar.tsx
index 8b8a12f732647ae222a7c51155b61992a6e1179a..8cadcc67f0c88bddc1f11a182c988692a58e4c9e 100644
--- a/src/components/Charts/Bar.tsx
+++ b/src/components/Charts/Bar.tsx
@@ -1,7 +1,6 @@
 import { ScaleBand, ScaleLinear } from 'd3-scale'
 import { detect } from 'detect-browser'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { Dataload } from 'models'
 import React, { useEffect, useState } from 'react'
diff --git a/src/components/Charts/BarChart.tsx b/src/components/Charts/BarChart.tsx
index fb4378fbe836888b44f24239449317f4b1afeb9b..deebbe46ef77a33db2dc25e301fdb918d1ab4fa4 100644
--- a/src/components/Charts/BarChart.tsx
+++ b/src/components/Charts/BarChart.tsx
@@ -2,9 +2,7 @@ import AxisBottom from 'components/Charts/AxisBottom'
 import AxisRight from 'components/Charts/AxisRight'
 import Bar from 'components/Charts/Bar'
 import { scaleBand, ScaleBand, scaleLinear, ScaleLinear } from 'd3-scale'
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadState, FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { Datachart } from 'models'
 import React from 'react'
diff --git a/src/components/CommonKit/Card/StyledCard.spec.tsx b/src/components/CommonKit/Card/StyledCard.spec.tsx
index e302e4f5c08be287a9fce2982230e7e25cd841cc..26d2bc83d1bd8f790c58d7c7053b707352ebea61 100644
--- a/src/components/CommonKit/Card/StyledCard.spec.tsx
+++ b/src/components/CommonKit/Card/StyledCard.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import StyledCard from './StyledCard'
diff --git a/src/components/CommonKit/Card/StyledCard.tsx b/src/components/CommonKit/Card/StyledCard.tsx
index 39e472c59d9876587c7923c6f51cde1eaa5626a8..562050fb393ef8e2c51225a3cac4f7813f64b59c 100644
--- a/src/components/CommonKit/Card/StyledCard.tsx
+++ b/src/components/CommonKit/Card/StyledCard.tsx
@@ -3,7 +3,7 @@ import CardActionArea, {
 } from '@material-ui/core/CardActionArea'
 import CardContent from '@material-ui/core/CardContent'
 import { withStyles } from '@material-ui/core/styles'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import React, { ReactNode } from 'react'
 import { getFluidName } from 'utils/utils'
 
diff --git a/src/components/CommonKit/Switch/StyledSwitch.spec.tsx b/src/components/CommonKit/Switch/StyledSwitch.spec.tsx
index b3605a86cb94e5fc6e909b6f83b65692c7006bb6..8af7bc846b26a09e14909a28e083b2aaa2fa8de1 100644
--- a/src/components/CommonKit/Switch/StyledSwitch.spec.tsx
+++ b/src/components/CommonKit/Switch/StyledSwitch.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import StyledSwitch from './StyledSwitch'
diff --git a/src/components/CommonKit/Switch/StyledSwitch.tsx b/src/components/CommonKit/Switch/StyledSwitch.tsx
index 87535cd0b1c9a312f4aa54685896f354386e7e62..d8136853ef6452b872454f953f6f3ba6c8db0088 100644
--- a/src/components/CommonKit/Switch/StyledSwitch.tsx
+++ b/src/components/CommonKit/Switch/StyledSwitch.tsx
@@ -1,6 +1,6 @@
 import { withStyles } from '@material-ui/core/styles'
 import Switch, { SwitchProps } from '@material-ui/core/Switch'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import React from 'react'
 
 const SwitchBase = withStyles({
diff --git a/src/components/Connection/Connection.tsx b/src/components/Connection/Connection.tsx
index 9a14f999e68b5fbd32a21faac6079ff6723fc105..7097c8f0c0e87d9293ae722306622060d84098e7 100644
--- a/src/components/Connection/Connection.tsx
+++ b/src/components/Connection/Connection.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { FluidConnection, FluidStatus } from 'models'
 import React, { useCallback } from 'react'
 import { updateFluidConnection } from 'store/global/global.slice'
diff --git a/src/components/Connection/ConnectionResult.tsx b/src/components/Connection/ConnectionResult.tsx
index 2c9684851ec40de434ff93ce8af0e91f5293424f..5c7efaac42888222c5ea4bd853aac4b1c30c1fb9 100644
--- a/src/components/Connection/ConnectionResult.tsx
+++ b/src/components/Connection/ConnectionResult.tsx
@@ -4,8 +4,7 @@ import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import Loader from 'components/Loader/Loader'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
-import { KonnectorUpdate } from 'enum/konnectorUpdate.enum'
+import { FluidType, KonnectorUpdate } from 'enums'
 import { DateTime } from 'luxon'
 import {
   Account,
diff --git a/src/components/Connection/ExpiredConsentModal.spec.tsx b/src/components/Connection/ExpiredConsentModal.spec.tsx
index 0e87a5e2b6b85622ccab0638ff690b18b9359ee6..18f57c69eaed910ec847612becd5a5f64a639daa 100644
--- a/src/components/Connection/ExpiredConsentModal.spec.tsx
+++ b/src/components/Connection/ExpiredConsentModal.spec.tsx
@@ -1,5 +1,5 @@
 import { Button } from '@material-ui/core'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import React from 'react'
diff --git a/src/components/Connection/ExpiredConsentModal.tsx b/src/components/Connection/ExpiredConsentModal.tsx
index 872b048a8b0176d8ba3ae4edc3d346b3736df005..5176b5e0489a209937c8cc0145fccb83fd4622ed 100644
--- a/src/components/Connection/ExpiredConsentModal.tsx
+++ b/src/components/Connection/ExpiredConsentModal.tsx
@@ -5,7 +5,7 @@ import EnedisIcon from 'assets/icons/ico/consent-outdated-enedis.svg'
 import GrdfIcon from 'assets/icons/ico/consent-outdated-grdf.svg'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { AccountSgeData } from 'models'
 import React, { useCallback } from 'react'
 import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Connection/FormLogin.tsx b/src/components/Connection/FormLogin.tsx
index e3c88579cf078e8d94dffb5e154617be6309c1ac..da3470403761e67b33116bacc67042933aae7b3a 100644
--- a/src/components/Connection/FormLogin.tsx
+++ b/src/components/Connection/FormLogin.tsx
@@ -5,7 +5,7 @@ import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
 import useKonnectorAuth from 'components/Hooks/useKonnectorAuth'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { Account, AccountAuthData, FluidStatus } from 'models'
 import React, { useEffect, useState } from 'react'
 import { getPartnerPicto } from 'utils/picto'
diff --git a/src/components/Connection/FormOAuth.tsx b/src/components/Connection/FormOAuth.tsx
index 471fe2eb922cd7c12e52e133962ca9a430c99fae..5bfd9245e6f44de0cdfa5dccdb5830943dcd9e41 100644
--- a/src/components/Connection/FormOAuth.tsx
+++ b/src/components/Connection/FormOAuth.tsx
@@ -2,7 +2,7 @@ import Button from '@material-ui/core/Button'
 import { useClient } from 'cozy-client'
 import { OAuthWindow } from 'cozy-harvest-lib/dist/components/OAuthWindow'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
 import { FluidStatus, Konnector } from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
 import UsageEventService from 'services/usageEvent.service'
diff --git a/src/components/Connection/GRDFConnect/GrdfInit.tsx b/src/components/Connection/GRDFConnect/GrdfInit.tsx
index d86b90fcabc390f3340eb91e893ca2785aac5d23..f6ff3a663c8fd633f3042ca76c6b092dcf393c97 100644
--- a/src/components/Connection/GRDFConnect/GrdfInit.tsx
+++ b/src/components/Connection/GRDFConnect/GrdfInit.tsx
@@ -1,6 +1,6 @@
 import GrdfConnectModal from 'components/Connection/PartnerConnectModal/GrdfConnectModal'
 import { useClient } from 'cozy-client'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
 import { FluidConnection, FluidStatus, Konnector, Trigger } from 'models'
 import React, { useCallback, useState } from 'react'
 import AccountService from 'services/account.service'
diff --git a/src/components/Connection/PartnerConnectModal/EpglConnectModal.tsx b/src/components/Connection/PartnerConnectModal/EpglConnectModal.tsx
index d9f2fe1210227c5ca75970d545dc67459f712019..e465daa66604048383e891b4ace5189aeed7cd46 100644
--- a/src/components/Connection/PartnerConnectModal/EpglConnectModal.tsx
+++ b/src/components/Connection/PartnerConnectModal/EpglConnectModal.tsx
@@ -2,11 +2,11 @@ import { Button, Dialog, IconButton } from '@material-ui/core'
 import CloseIcon from 'assets/icons/ico/close.svg'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { Step } from 'models/step.model'
 import React, { useEffect, useState } from 'react'
 import './PartnerConnectModal.scss'
 import EpglCreateAccount from './Steps/EpglCreateAccount'
 import EpglDoYouHaveAccount from './Steps/EpglDoYouHaveAccount'
+import { StepContent } from './stepContent.interface'
 
 enum StepEnum {
   DoYouHaveAccount,
@@ -48,7 +48,7 @@ const EpglConnectModal = ({
     handleCloseClick()
   }
 
-  const steps: Record<StepEnum, Step> = {
+  const steps: Record<StepEnum, StepContent> = {
     [StepEnum.DoYouHaveAccount]: {
       content: <EpglDoYouHaveAccount />,
       leftButton: (
diff --git a/src/components/Connection/PartnerConnectModal/GrdfConnectModal.tsx b/src/components/Connection/PartnerConnectModal/GrdfConnectModal.tsx
index ee371a7136a8906c914b1110bdd5b6b269fb6190..267225cf9fce9dc591911e070c9fe957c88573d2 100644
--- a/src/components/Connection/PartnerConnectModal/GrdfConnectModal.tsx
+++ b/src/components/Connection/PartnerConnectModal/GrdfConnectModal.tsx
@@ -4,12 +4,12 @@ import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import FormOAuth from 'components/Connection/FormOAuth'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import { FluidStatus, Konnector } from 'models'
-import { Step } from 'models/step.model'
 import React, { useEffect, useState } from 'react'
 import './PartnerConnectModal.scss'
 import GrdfCreateAccount from './Steps/GrdfCreateAccount'
 import GrdfDoYouHaveAccount from './Steps/GrdfDoYouHaveAccount'
 import GiveConsent from './Steps/GrdfGiveConsent'
+import { StepContent } from './stepContent.interface'
 
 enum StepEnum {
   DoYouHaveAccount,
@@ -57,7 +57,7 @@ const GrdfConnectModal = ({
     showForm ? handleCloseClick() : setCurrentStep(StepEnum.DoYouHaveAccount)
   }
 
-  const steps: Record<StepEnum, Step> = {
+  const steps: Record<StepEnum, StepContent> = {
     [StepEnum.DoYouHaveAccount]: {
       content: <GrdfDoYouHaveAccount />,
       leftButton: (
diff --git a/src/models/step.model.ts b/src/components/Connection/PartnerConnectModal/StepContent.interface.ts
similarity index 71%
rename from src/models/step.model.ts
rename to src/components/Connection/PartnerConnectModal/StepContent.interface.ts
index f4255471e7ded797677abddbebc65aea81d1de96..636a1283d26f7a2ff05a211541362bdfb7229a2b 100644
--- a/src/models/step.model.ts
+++ b/src/components/Connection/PartnerConnectModal/StepContent.interface.ts
@@ -1,4 +1,4 @@
-export interface Step {
+export interface StepContent {
   content: JSX.Element
   leftButton: JSX.Element
   rightButton: JSX.Element
diff --git a/src/components/Connection/SGEConnect/SgeConnectView.spec.tsx b/src/components/Connection/SGEConnect/SgeConnectView.spec.tsx
index ed87bc98d338451c668eb44bc26fee4f2c6d0b3c..9b478d18b2a414426f1bf69f5356b7210110f2c7 100644
--- a/src/components/Connection/SGEConnect/SgeConnectView.spec.tsx
+++ b/src/components/Connection/SGEConnect/SgeConnectView.spec.tsx
@@ -1,4 +1,4 @@
-import { SgeStep } from 'enum/sgeStep.enum'
+import { SgeStep } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import React from 'react'
diff --git a/src/components/Connection/SGEConnect/SgeConnectView.tsx b/src/components/Connection/SGEConnect/SgeConnectView.tsx
index 2a0377228b4825e83a487267810d5208ea1a04f5..4b2363e3bd6aea422e2cc8f7ddba467a2dd56f34 100644
--- a/src/components/Connection/SGEConnect/SgeConnectView.tsx
+++ b/src/components/Connection/SGEConnect/SgeConnectView.tsx
@@ -3,8 +3,8 @@ import FormNavigation from 'components/FormGlobal/FormNavigation'
 import FormProgress from 'components/FormGlobal/FormProgress'
 import CozyBar from 'components/Header/CozyBar'
 import Header from 'components/Header/Header'
-import { SgeStep } from 'enum/sgeStep.enum'
-import { SgeStore } from 'models/sgeStore.model'
+import { SgeStep } from 'enums'
+import { SgeStore } from 'models'
 import React, { useCallback, useState } from 'react'
 import { updateSgeStore } from 'store/global/global.slice'
 import { useAppDispatch, useAppSelector } from 'store/hooks'
diff --git a/src/components/Connection/SGEConnect/StepAddress.tsx b/src/components/Connection/SGEConnect/StepAddress.tsx
index 8fe99e04d6d963fcec29b65ff2778f2132375ccc..da040f5010bbc81bc832fd9af18beb223045ee85 100644
--- a/src/components/Connection/SGEConnect/StepAddress.tsx
+++ b/src/components/Connection/SGEConnect/StepAddress.tsx
@@ -1,5 +1,5 @@
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { SgeStore } from 'models/sgeStore.model'
+import { SgeStore } from 'models'
 import React from 'react'
 import { SGEKeysForm } from './SgeConnectView'
 
diff --git a/src/components/Connection/SGEConnect/StepConsent.tsx b/src/components/Connection/SGEConnect/StepConsent.tsx
index 4997b3b812d2664f6dd04c3eea2e141229dc9159..2dec320d88d03c2aa88a79e2710872bbc6300dde 100644
--- a/src/components/Connection/SGEConnect/StepConsent.tsx
+++ b/src/components/Connection/SGEConnect/StepConsent.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { SgeStore } from 'models/sgeStore.model'
+import { SgeStore } from 'models'
 import React from 'react'
 import { decoreText } from 'utils/decoreText'
 import { SGEKeysForm } from './SgeConnectView'
@@ -9,12 +9,7 @@ interface StepConsentProps {
   sgeState: SgeStore
   onChange: (key: SGEKeysForm, value: boolean) => void
 }
-const StepConsent = (
-  {
-    sgeState,
-    onChange
-  }: StepConsentProps
-) => {
+const StepConsent = ({ sgeState, onChange }: StepConsentProps) => {
   const { t } = useI18n()
 
   return (
diff --git a/src/components/Connection/SGEConnect/StepIdentityAndPdl.tsx b/src/components/Connection/SGEConnect/StepIdentityAndPdl.tsx
index 0012020f79887df5097ba64806d96f8ee7b12c0a..b0e067d66c88ff44b32814311e056a8f006b8ebe 100644
--- a/src/components/Connection/SGEConnect/StepIdentityAndPdl.tsx
+++ b/src/components/Connection/SGEConnect/StepIdentityAndPdl.tsx
@@ -1,6 +1,6 @@
 import SgeModalHint from 'components/Connection/SGEConnect/SgeModalHint'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { SgeStore } from 'models/sgeStore.model'
+import { SgeStore } from 'models'
 import React, { useCallback, useState } from 'react'
 import { SGEKeysForm } from './SgeConnectView'
 
diff --git a/src/components/ConsumptionVisualizer/ConsumptionVisualizer.tsx b/src/components/ConsumptionVisualizer/ConsumptionVisualizer.tsx
index 7fffa7d6a0d3b6844498229107b09688c01c2c31..3abf83ce6491136f93ef9c8e1b8c661eff2907ba 100644
--- a/src/components/ConsumptionVisualizer/ConsumptionVisualizer.tsx
+++ b/src/components/ConsumptionVisualizer/ConsumptionVisualizer.tsx
@@ -1,5 +1,5 @@
 import DataloadConsumptionVisualizer from 'components/ConsumptionVisualizer/DataloadConsumptionVisualizer'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { DateTime } from 'luxon'
 import { Dataload } from 'models'
 import React from 'react'
diff --git a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx
index f3ae34bb9ecc28a1e3791e7878a5f717b4001f03..74d7a4c07b04ee6b295aadcb41bcc3dbe651e73e 100644
--- a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx
@@ -1,5 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadState, FluidType } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import { Dataload } from 'models'
diff --git a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx
index af620801af7c88917e8db27f18aae89aa6b2ebcb..837ad051951f4cf6f13d0a85486b65118f094415 100644
--- a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx
@@ -1,5 +1,4 @@
-import { DataloadSectionType, DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadSectionType, DataloadState, FluidType } from 'enums'
 import { Dataload } from 'models'
 import React, { useCallback, useState } from 'react'
 import { useAppSelector } from 'store/hooks'
diff --git a/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx b/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx
index 2c35790bcc884af2238dbcf57ea7a3ebac759833..7a332e4dc7239a3730b44684e68e1d2a09823225 100644
--- a/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx
@@ -1,5 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadState, FluidType } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import { Dataload } from 'models'
diff --git a/src/components/ConsumptionVisualizer/DataloadNoValue.tsx b/src/components/ConsumptionVisualizer/DataloadNoValue.tsx
index 65aee657bcf1604731a8530053e77a10a8264841..d75126664ca2e2e5ca1ff63ee9a318f9ca294369 100644
--- a/src/components/ConsumptionVisualizer/DataloadNoValue.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadNoValue.tsx
@@ -1,7 +1,6 @@
 import classNames from 'classnames'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadState, FluidType } from 'enums'
 import { Dataload } from 'models'
 import React, { useCallback } from 'react'
 import './consumptionVisualizer.scss'
diff --git a/src/components/ConsumptionVisualizer/DataloadSection.spec.tsx b/src/components/ConsumptionVisualizer/DataloadSection.spec.tsx
index ebfbc8f31bbdb0bf6d8d781f3ce8b265b0b4c814..7a679918a0a334b933fda136af4bdf8c3e30b573 100644
--- a/src/components/ConsumptionVisualizer/DataloadSection.spec.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSection.spec.tsx
@@ -1,5 +1,4 @@
-import { DataloadSectionType } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadSectionType, FluidType } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import { Dataload } from 'models'
diff --git a/src/components/ConsumptionVisualizer/DataloadSection.tsx b/src/components/ConsumptionVisualizer/DataloadSection.tsx
index 85ddd0648f5e3fb88217789b499d4bc7d413247e..19d7739bdac8e14ee7fd4a8dff7a654131a40c13 100644
--- a/src/components/ConsumptionVisualizer/DataloadSection.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSection.tsx
@@ -1,7 +1,6 @@
 import classNames from 'classnames'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { DataloadSectionType } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadSectionType, FluidType } from 'enums'
 import { Dataload } from 'models'
 import React from 'react'
 import { getFluidName } from 'utils/utils'
diff --git a/src/components/ConsumptionVisualizer/DataloadSectionDetail.spec.tsx b/src/components/ConsumptionVisualizer/DataloadSectionDetail.spec.tsx
index 25a3ae337b518ce0ffc243493e4bf21622115ef8..6cd870e43ba8bd1d0b8f9757e1c87f995a640fb0 100644
--- a/src/components/ConsumptionVisualizer/DataloadSectionDetail.spec.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSectionDetail.spec.tsx
@@ -1,5 +1,4 @@
-import { DataloadSectionType, DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadSectionType, DataloadState, FluidType } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import { Dataload } from 'models'
diff --git a/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx b/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx
index 78861f7447c7eacecafa07f88a61f561afd9a039..18a607e312cae5990e94fd6c33cd4d02c31e042a 100644
--- a/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx
@@ -2,9 +2,12 @@ import classNames from 'classnames'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { DataloadSectionType, DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import {
+  DataloadSectionType,
+  DataloadState,
+  FluidType,
+  UsageEventType,
+} from 'enums'
 import { Dataload } from 'models'
 import React, { useCallback } from 'react'
 import { NavLink } from 'react-router-dom'
diff --git a/src/components/ConsumptionVisualizer/DataloadSectionValue.spec.tsx b/src/components/ConsumptionVisualizer/DataloadSectionValue.spec.tsx
index 58b511e700a4421723ed9870a5a58c156c8b6e61..c2ea56db03c7ba91d4794c5452220063889ea12b 100644
--- a/src/components/ConsumptionVisualizer/DataloadSectionValue.spec.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSectionValue.spec.tsx
@@ -1,5 +1,4 @@
-import { DataloadSectionType } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadSectionType, FluidType } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import { Dataload } from 'models'
diff --git a/src/components/ConsumptionVisualizer/DataloadSectionValue.tsx b/src/components/ConsumptionVisualizer/DataloadSectionValue.tsx
index 72ed67a78d4c991c0b00965ff0010ae6014464d8..deff168d6d9167c8cee52068d1b86158ca5b34ed 100644
--- a/src/components/ConsumptionVisualizer/DataloadSectionValue.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSectionValue.tsx
@@ -1,6 +1,5 @@
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { DataloadSectionType } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadSectionType, FluidType } from 'enums'
 import { Dataload } from 'models'
 import React from 'react'
 import { formatNumberValues } from 'utils/utils'
diff --git a/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx b/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx
index 94a30953d04311e1a8ba23824bd07a3d2b718e28..53964d08b174f86b757fb058765ae26ad6456971 100644
--- a/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx
+++ b/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx
@@ -4,7 +4,7 @@ import CloseIcon from 'assets/icons/ico/close.svg'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { DateTime } from 'luxon'
 import { FluidPrice } from 'models'
 import React, { useEffect, useState } from 'react'
diff --git a/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.spec.tsx b/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.spec.tsx
index 0c6bffa6d88961455df5a318f9ac327bb53dc074..8f6f4755b88cd5bdb1b92ab785d9d0f75ee1b999 100644
--- a/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.spec.tsx
+++ b/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.spec.tsx
@@ -1,5 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadState, FluidType } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import { DateTime } from 'luxon'
diff --git a/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.tsx b/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.tsx
index 0cb05b33247fa636cb8ed841a72d42120c50b354..0ab530ca8262e60bd9d686e8d67f352c06e1636f 100644
--- a/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.tsx
+++ b/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.tsx
@@ -1,6 +1,5 @@
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadState, FluidType } from 'enums'
 import { DateTime } from 'luxon'
 import { Dataload } from 'models'
 import React, { useCallback, useState } from 'react'
diff --git a/src/components/Content/Content.tsx b/src/components/Content/Content.tsx
index 9597e8229fd05ab5a08ecbb983fc73570b21c81f..3a311ac680d05724f587b7e0cd102ffe0d39ce9c 100644
--- a/src/components/Content/Content.tsx
+++ b/src/components/Content/Content.tsx
@@ -1,5 +1,5 @@
 import FeedbackModal from 'components/Feedback/FeedbackModal'
-import { ScreenType } from 'enum/screen.enum'
+import { ScreenType } from 'enums'
 import React, { useEffect } from 'react'
 import { changeScreenType } from 'store/global/global.slice'
 import { useAppDispatch, useAppSelector } from 'store/hooks'
diff --git a/src/components/CustomPopup/CustomPopupModal.tsx b/src/components/CustomPopup/CustomPopupModal.tsx
index f3e5fb338bd45502119dbd5719abb86d145756e0..c122b125bd902199a2d5f093c1f6e584ce092981 100644
--- a/src/components/CustomPopup/CustomPopupModal.tsx
+++ b/src/components/CustomPopup/CustomPopupModal.tsx
@@ -7,7 +7,7 @@ import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
 import { DateTime } from 'luxon'
-import { CustomPopup } from 'models/customPopup.model'
+import { CustomPopup } from 'models'
 import React from 'react'
 import './customPopupModal.scss'
 
diff --git a/src/components/DateNavigator/DateNavigator.spec.tsx b/src/components/DateNavigator/DateNavigator.spec.tsx
index 8c6691f72898966169114991f266e871dc70e9d3..a624d8907cc4cef3852f69ee1f47abbc24820760 100644
--- a/src/components/DateNavigator/DateNavigator.spec.tsx
+++ b/src/components/DateNavigator/DateNavigator.spec.tsx
@@ -1,5 +1,5 @@
 import { IconButton } from '@material-ui/core'
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import { DateTime } from 'luxon'
diff --git a/src/components/DateNavigator/DateNavigator.tsx b/src/components/DateNavigator/DateNavigator.tsx
index 0d207cbe0e2640f52448b84495370eeaf7a0b15c..b23c9ae51343a0ac6a33044c08da0fb791ecab24 100644
--- a/src/components/DateNavigator/DateNavigator.tsx
+++ b/src/components/DateNavigator/DateNavigator.tsx
@@ -5,7 +5,7 @@ import classNames from 'classnames'
 import DateNavigatorFormat from 'components/DateNavigator/DateNavigatorFormat'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import React from 'react'
 import './datenavigator.scss'
diff --git a/src/components/DateNavigator/DateNavigatorFormat.tsx b/src/components/DateNavigator/DateNavigatorFormat.tsx
index d3052d2440d42674c8bb84d45a0156a99bdaed02..d5c835b35eb04908ab9051f8f92d3ece610abba7 100644
--- a/src/components/DateNavigator/DateNavigatorFormat.tsx
+++ b/src/components/DateNavigator/DateNavigatorFormat.tsx
@@ -1,4 +1,4 @@
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import React from 'react'
 import './datenavigatorformat.scss'
diff --git a/src/components/Duel/DuelBar.tsx b/src/components/Duel/DuelBar.tsx
index 7e2fb3d65224cbc9ac12f8cc55d3813e3c7cea56..803dcf47849ddfaa536e60c1d29bf41b6ec6f86f 100644
--- a/src/components/Duel/DuelBar.tsx
+++ b/src/components/Duel/DuelBar.tsx
@@ -3,8 +3,7 @@ import AxisRight from 'components/Charts/AxisRight'
 import Bar from 'components/Charts/Bar'
 import UncomingBar from 'components/Charts/UncomingBar'
 import { scaleBand, ScaleBand, scaleLinear, ScaleLinear } from 'd3-scale'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { Dataload, UserChallenge } from 'models'
 import React from 'react'
diff --git a/src/components/Duel/DuelChart.tsx b/src/components/Duel/DuelChart.tsx
index 5e3b76882bc691117a73baf1e81ded9a923fb68e..538398c5c04ee9a3860c5dde7902d6d8f9cda30f 100644
--- a/src/components/Duel/DuelChart.tsx
+++ b/src/components/Duel/DuelChart.tsx
@@ -1,5 +1,5 @@
 import DuelBar from 'components/Duel/DuelBar'
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
 import { Dataload, UserChallenge } from 'models'
 import React, { useEffect, useState } from 'react'
 import './duelChart.scss'
diff --git a/src/components/Duel/DuelOngoing.spec.tsx b/src/components/Duel/DuelOngoing.spec.tsx
index 10cacec7de03c26375bf7510068dba69978df024..2b1af71386dc4d6588f695fa022c1272803232c5 100644
--- a/src/components/Duel/DuelOngoing.spec.tsx
+++ b/src/components/Duel/DuelOngoing.spec.tsx
@@ -1,5 +1,5 @@
 import DuelOngoing from 'components/Duel/DuelOngoing'
-import { UserChallengeState } from 'enum/userChallenge.enum'
+import { UserChallengeState } from 'enums'
 import { mount } from 'enzyme'
 import { DateTime } from 'luxon'
 import { UserChallenge } from 'models'
diff --git a/src/components/Duel/DuelOngoing.tsx b/src/components/Duel/DuelOngoing.tsx
index 179dc70f9952787382e26cd497f12b830663d85c..337e45ce4131340db8eab29669155e3e22c8c90e 100644
--- a/src/components/Duel/DuelOngoing.tsx
+++ b/src/components/Duel/DuelOngoing.tsx
@@ -8,12 +8,12 @@ import LastDuelModal from 'components/Duel/lastDuelModal'
 import { useChartResize } from 'components/Hooks/useChartResize'
 import { Client, useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
 import {
+  UsageEventType,
   UserChallengeSuccess,
   UserChallengeUpdateFlag,
-} from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+  UserDuelState,
+} from 'enums'
 import { Dataload, UserChallenge, UserDuel } from 'models'
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Duel/DuelResultModal.tsx b/src/components/Duel/DuelResultModal.tsx
index 509f9628b9912040770fe5275f1b9e889154280f..0eb992461c5700377333b7ec88c03cf964d69a38 100644
--- a/src/components/Duel/DuelResultModal.tsx
+++ b/src/components/Duel/DuelResultModal.tsx
@@ -4,7 +4,7 @@ import challengeWon from 'assets/icons/visu/duelResult/challengeWon.svg'
 import defaultIcon from 'assets/icons/visu/duelResult/default.svg'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { UserChallenge } from 'models/challenge.model'
+import { UserChallenge } from 'models'
 import React, { useEffect, useState } from 'react'
 import { formatNumberValues, importIconById } from 'utils/utils'
 import './duelResultModal.scss'
diff --git a/src/components/Duel/DuelUnlocked.spec.tsx b/src/components/Duel/DuelUnlocked.spec.tsx
index ebe4ee5c931c3660527ba09763eeae61d3c7ae06..f2643e3c077cc9140576f5c8caa6f062fc9f1e01 100644
--- a/src/components/Duel/DuelUnlocked.spec.tsx
+++ b/src/components/Duel/DuelUnlocked.spec.tsx
@@ -2,8 +2,7 @@ import Button from '@material-ui/core/Button'
 import defaultIcon from 'assets/icons/visu/duel/default.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import DuelUnlocked from 'components/Duel/DuelUnlocked'
-import { FluidType } from 'enum/fluid.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { FluidType, UserChallengeUpdateFlag } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/Duel/DuelUnlocked.tsx b/src/components/Duel/DuelUnlocked.tsx
index 138838de9844dfed8194c69492ab398cf9ff1da1..cdbb6b726f6cd058c46f5e79c99dc2bf2c4d3af9 100644
--- a/src/components/Duel/DuelUnlocked.tsx
+++ b/src/components/Duel/DuelUnlocked.tsx
@@ -4,8 +4,7 @@ import defaultIcon from 'assets/icons/visu/duel/default.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { Client, useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UsageEventType, UserChallengeUpdateFlag } from 'enums'
 import { UserChallenge } from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
 import ChallengeService from 'services/challenge.service'
diff --git a/src/components/Duel/DuelView.spec.tsx b/src/components/Duel/DuelView.spec.tsx
index 2c6a3e193045ae77501f3d75fe975d3d352f3da2..990383473a5d453c97089b1f58d74fd927bf0801 100644
--- a/src/components/Duel/DuelView.spec.tsx
+++ b/src/components/Duel/DuelView.spec.tsx
@@ -1,6 +1,5 @@
 import DuelView from 'components/Duel/DuelView'
-import { UserChallengeState } from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+import { UserChallengeState, UserDuelState } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/Duel/DuelView.tsx b/src/components/Duel/DuelView.tsx
index dbf94aeeb5035414a5fff872c00fc786cd9fb9ce..bf19d59d176b1b7ef15962bc6d38812a7f8e0333 100644
--- a/src/components/Duel/DuelView.tsx
+++ b/src/components/Duel/DuelView.tsx
@@ -3,8 +3,7 @@ import DuelError from 'components/Duel/DuelError'
 import DuelUnlocked from 'components/Duel/DuelUnlocked'
 import CozyBar from 'components/Header/CozyBar'
 import Header from 'components/Header/Header'
-import { UserChallengeState } from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+import { UserChallengeState, UserDuelState } from 'enums'
 import { UserChallenge } from 'models'
 import React, { useState } from 'react'
 import { useLocation, useNavigate } from 'react-router-dom'
diff --git a/src/components/Ecogesture/EcogestureList.tsx b/src/components/Ecogesture/EcogestureList.tsx
index 047b325b365a4fddeae7a7515210bf482cc34e00..9d651785ba0c9758f44d48ac9955d5b656cf8e9f 100644
--- a/src/components/Ecogesture/EcogestureList.tsx
+++ b/src/components/Ecogesture/EcogestureList.tsx
@@ -5,7 +5,7 @@ import SortIcon from 'assets/icons/ico/sort.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import EcogestureCard from 'components/Ecogesture/EcogestureCard'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { Usage } from 'enum/ecogesture.enum'
+import { Usage } from 'enums'
 import { Ecogesture } from 'models'
 import React, { useState } from 'react'
 import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Ecogesture/EcogestureView.spec.tsx b/src/components/Ecogesture/EcogestureView.spec.tsx
index b08d1e0139b520fb21b9cb38accf05fcfd79dbfa..4f0a0bf6998593628d9f72715cfa799ce5b75a35 100644
--- a/src/components/Ecogesture/EcogestureView.spec.tsx
+++ b/src/components/Ecogesture/EcogestureView.spec.tsx
@@ -1,6 +1,6 @@
 import { IconButton, Tab } from '@material-ui/core'
 import EcogestureView from 'components/Ecogesture/EcogestureView'
-import { Season } from 'enum/ecogesture.enum'
+import { Season } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import React from 'react'
diff --git a/src/components/Ecogesture/EcogestureView.tsx b/src/components/Ecogesture/EcogestureView.tsx
index fa44a5f18273307023189d2571d31aa032bd3a07..1156841289b79d81898097c9ace630018e673619 100644
--- a/src/components/Ecogesture/EcogestureView.tsx
+++ b/src/components/Ecogesture/EcogestureView.tsx
@@ -7,7 +7,7 @@ import Header from 'components/Header/Header'
 import Loader from 'components/Loader/Loader'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { EcogestureTab } from 'enum/ecogesture.enum'
+import { EcogestureTab } from 'enums'
 import { Ecogesture } from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useLocation, useNavigate } from 'react-router-dom'
diff --git a/src/components/EcogestureForm/EcogestureFormEquipment.tsx b/src/components/EcogestureForm/EcogestureFormEquipment.tsx
index 44e57d700a40dde732f3d3bb24d7b3ba2001d961..1c4ffec4c8b08f216afe9467a0d2df93acac43f3 100644
--- a/src/components/EcogestureForm/EcogestureFormEquipment.tsx
+++ b/src/components/EcogestureForm/EcogestureFormEquipment.tsx
@@ -1,9 +1,7 @@
 import FormNavigation from 'components/FormGlobal/FormNavigation'
 import 'components/ProfileType/profileTypeForm.scss'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { EquipmentType } from 'enum/ecogesture.enum'
-import { EcogestureStepForm } from 'enum/ecogestureForm.enum'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { EcogestureStepForm, EquipmentType, ProfileTypeStepForm } from 'enums'
 import { ProfileEcogesture, ProfileType } from 'models'
 import React, { useCallback, useState } from 'react'
 import { useAppSelector } from 'store/hooks'
diff --git a/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx b/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
index 53a744e82f0fe7a5f6d4fce4dcb102ca2a1f741f..0e62adf372780486ca4e974ea4b76efe08e0a033 100644
--- a/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
+++ b/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
@@ -2,12 +2,12 @@ import classNames from 'classnames'
 import FormNavigation from 'components/FormGlobal/FormNavigation'
 import 'components/ProfileType/profileTypeForm.scss'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { EcogestureStepForm } from 'enum/ecogestureForm.enum'
+import { EcogestureStepForm } from 'enums'
 import {
   ProfileEcogesture,
   ProfileEcogestureAnswer,
   ProfileEcogestureValues,
-} from 'models/profileEcogesture.model'
+} from 'models'
 import React, { useCallback, useState } from 'react'
 import { useAppSelector } from 'store/hooks'
 import './ecogestureFormSingleChoice.scss'
diff --git a/src/components/EcogestureForm/EcogestureFormView.tsx b/src/components/EcogestureForm/EcogestureFormView.tsx
index c912471ab198381dd99dd66aac5cfff0440ab3ec..c95e0c33d09e25be88abd02db207c1a66a1c3402 100644
--- a/src/components/EcogestureForm/EcogestureFormView.tsx
+++ b/src/components/EcogestureForm/EcogestureFormView.tsx
@@ -4,14 +4,8 @@ import CozyBar from 'components/Header/CozyBar'
 import Header from 'components/Header/Header'
 import Loader from 'components/Loader/Loader'
 import ProfileTypeView from 'components/ProfileType/ProfileTypeView'
-import {
-  EcogestureStepForm,
-  ProfileEcogestureAnswerType,
-} from 'enum/ecogestureForm.enum'
-import {
-  ProfileEcogesture,
-  ProfileEcogestureAnswer,
-} from 'models/profileEcogesture.model'
+import { EcogestureStepForm, ProfileEcogestureAnswerType } from 'enums'
+import { ProfileEcogesture, ProfileEcogestureAnswer } from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useLocation, useNavigate } from 'react-router-dom'
 import ProfileEcogestureFormService from 'services/profileEcogestureForm.service'
diff --git a/src/components/EcogestureForm/EquipmentIcon.spec.tsx b/src/components/EcogestureForm/EquipmentIcon.spec.tsx
index 12bc96af6a41fd63cf1f9d7ba8042752120b361e..e06d80896684765c4060e5c75d97256b8657079c 100644
--- a/src/components/EcogestureForm/EquipmentIcon.spec.tsx
+++ b/src/components/EcogestureForm/EquipmentIcon.spec.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable react/display-name */
-import { EquipmentType } from 'enum/ecogesture.enum'
+import { EquipmentType } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import React from 'react'
diff --git a/src/components/Exploration/ExplorationFinished.tsx b/src/components/Exploration/ExplorationFinished.tsx
index 25750ed88c3216ad3e84b680cffc3db49200aa5f..d17fb5e3cfe8237c058bae6a2dd05e41f1a3ad47 100644
--- a/src/components/Exploration/ExplorationFinished.tsx
+++ b/src/components/Exploration/ExplorationFinished.tsx
@@ -3,9 +3,11 @@ import starResult from 'assets/icons/visu/quiz/starResult.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { Client, useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
-import { UserExplorationState } from 'enum/userExploration.enum'
+import {
+  UsageEventType,
+  UserChallengeUpdateFlag,
+  UserExplorationState,
+} from 'enums'
 import { UserChallenge } from 'models'
 import React, { useCallback } from 'react'
 import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Exploration/ExplorationOngoing.tsx b/src/components/Exploration/ExplorationOngoing.tsx
index 2132bae32b766d0f520e623e0441003dd7b1f2e3..142e4a660c520326aaa329b91983f716007914f8 100644
--- a/src/components/Exploration/ExplorationOngoing.tsx
+++ b/src/components/Exploration/ExplorationOngoing.tsx
@@ -4,12 +4,12 @@ import StarsContainer from 'components/Challenge/StarsContainer'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { Client, useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
 import {
+  UsageEventType,
+  UserChallengeUpdateFlag,
   UserExplorationState,
   UserExplorationType,
-} from 'enum/userExploration.enum'
+} from 'enums'
 import { UserChallenge } from 'models'
 import React from 'react'
 import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Exploration/ExplorationView.spec.tsx b/src/components/Exploration/ExplorationView.spec.tsx
index 137f6105d59e613c5d714db70a8321c73116301d..7d535b9ad158ffe80268c708f97c2a5107ffa22a 100644
--- a/src/components/Exploration/ExplorationView.spec.tsx
+++ b/src/components/Exploration/ExplorationView.spec.tsx
@@ -1,4 +1,4 @@
-import { UserExplorationState } from 'enum/userExploration.enum'
+import { UserExplorationState } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/Exploration/ExplorationView.tsx b/src/components/Exploration/ExplorationView.tsx
index 2d58bc6475404177f973cbc0b45df1081d3c43c4..9378a2ad06a088e03f29252ad9704bd430cf7965 100644
--- a/src/components/Exploration/ExplorationView.tsx
+++ b/src/components/Exploration/ExplorationView.tsx
@@ -1,7 +1,7 @@
 import Content from 'components/Content/Content'
 import CozyBar from 'components/Header/CozyBar'
 import Header from 'components/Header/Header'
-import { UserExplorationState } from 'enum/userExploration.enum'
+import { UserExplorationState } from 'enums'
 import { UserChallenge } from 'models'
 import React, { useState } from 'react'
 import { useAppSelector } from 'store/hooks'
diff --git a/src/components/Export/exportLoadingModal.tsx b/src/components/Export/exportLoadingModal.tsx
index dfce4d8676e4c0a3abee26784e20da6033ba2b2b..9f42e475a363c764ccba7e7d44bd2e57969e34ae 100644
--- a/src/components/Export/exportLoadingModal.tsx
+++ b/src/components/Export/exportLoadingModal.tsx
@@ -9,8 +9,7 @@ import * as XLSX from 'xlsx'
 
 import CloseIcon from 'assets/icons/ico/close.svg'
 import Loader from 'components/Loader/Loader'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { Datachart, Dataload, TimePeriod } from 'models'
 import ConsumptionDataManager from 'services/consumption.service'
 import EnedisMonthlyAnalysisDataService from 'services/enedisMonthlyAnalysisData.service'
diff --git a/src/components/Feedback/FeedbackModal.tsx b/src/components/Feedback/FeedbackModal.tsx
index d067e3351e4a25bb5baa0b8e194ce6b01b4fab38..63daf5313be2f521415a9ccfc9741fd5a98ad4e9 100644
--- a/src/components/Feedback/FeedbackModal.tsx
+++ b/src/components/Feedback/FeedbackModal.tsx
@@ -9,7 +9,7 @@ import { Client, useClient } from 'cozy-client'
 // what is the type ?
 import { IuseI18n, useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { UserExplorationID } from 'enum/userExploration.enum'
+import { UserExplorationID } from 'enums'
 import React from 'react'
 import { useAppDispatch, useAppSelector } from 'store/hooks'
 import { openFeedbackModal } from 'store/modal/modal.slice'
diff --git a/src/components/FluidChart/FluidChart.tsx b/src/components/FluidChart/FluidChart.tsx
index 79acccd05c5a43043cc446cfcbf16e0295ccdba9..1d824baa469b2b7618ec30a5e5caf41a37004f8d 100644
--- a/src/components/FluidChart/FluidChart.tsx
+++ b/src/components/FluidChart/FluidChart.tsx
@@ -7,10 +7,7 @@ import useExploration from 'components/Hooks/useExploration'
 import TimeStepSelector from 'components/TimeStepSelector/TimeStepSelector'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserExplorationID } from 'enum/userExploration.enum'
+import { FluidType, TimeStep, UsageEventType, UserExplorationID } from 'enums'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import ConsumptionService from 'services/consumption.service'
diff --git a/src/components/FluidChart/FluidChartSlide.tsx b/src/components/FluidChart/FluidChartSlide.tsx
index e303144470703f2132cc689f937fcf16178d4904..0c3f646d5303b84118ec33337115516bd7e16f4d 100644
--- a/src/components/FluidChart/FluidChartSlide.tsx
+++ b/src/components/FluidChart/FluidChartSlide.tsx
@@ -2,8 +2,7 @@ import BarChart from 'components/Charts/BarChart'
 import ConsumptionVisualizer from 'components/ConsumptionVisualizer/ConsumptionVisualizer'
 import Loader from 'components/Loader/Loader'
 import { useClient } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { Datachart } from 'models'
 import React, { useEffect, useState } from 'react'
diff --git a/src/components/FluidChart/FluidChartSwipe.tsx b/src/components/FluidChart/FluidChartSwipe.tsx
index 0649c71913b61752db8b3609fd02c67e183e2779..540f98edfba01a12b01bbfb93a51a66525b1b5aa 100644
--- a/src/components/FluidChart/FluidChartSwipe.tsx
+++ b/src/components/FluidChart/FluidChartSwipe.tsx
@@ -1,6 +1,6 @@
 import FluidChartSlide from 'components/FluidChart/FluidChartSlide'
 import { useChartResize } from 'components/Hooks/useChartResize'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { DateTime } from 'luxon'
 import React, { useEffect, useRef, useState } from 'react'
 import SwipeableViews from 'react-swipeable-views'
diff --git a/src/components/FormGlobal/FormNavigation.spec.tsx b/src/components/FormGlobal/FormNavigation.spec.tsx
index 9e4a166e62e739cc777c7abe1a2c5cc58c2c53c3..fedd1a5ece2b36b50d39d95231c6219957e83b77 100644
--- a/src/components/FormGlobal/FormNavigation.spec.tsx
+++ b/src/components/FormGlobal/FormNavigation.spec.tsx
@@ -1,5 +1,5 @@
 import Button from '@material-ui/core/Button'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { ProfileTypeStepForm } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/FormGlobal/FormNavigation.tsx b/src/components/FormGlobal/FormNavigation.tsx
index 7fab173bf4a8ba170aa9aca3d90ececc45fb8f71..edc2b844285d8e02d07036c6527922594224accd 100644
--- a/src/components/FormGlobal/FormNavigation.tsx
+++ b/src/components/FormGlobal/FormNavigation.tsx
@@ -2,9 +2,7 @@ import Button from '@material-ui/core/Button'
 import classNames from 'classnames'
 import 'components/FormGlobal/formNavigation.scss'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { EcogestureStepForm } from 'enum/ecogestureForm.enum'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
-import { SgeStep } from 'enum/sgeStep.enum'
+import { EcogestureStepForm, ProfileTypeStepForm, SgeStep } from 'enums'
 import React, { useCallback } from 'react'
 import { useNavigate } from 'react-router-dom'
 
diff --git a/src/components/FormGlobal/FormProgress.tsx b/src/components/FormGlobal/FormProgress.tsx
index 5971e430756d9f4cc4addd159d6a0b6685b4c652..74249dcc5c7e1c2b97291673ca83fd844a258b33 100644
--- a/src/components/FormGlobal/FormProgress.tsx
+++ b/src/components/FormGlobal/FormProgress.tsx
@@ -1,6 +1,5 @@
 import 'components/FormGlobal/formProgress.scss'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
-import { SgeStep } from 'enum/sgeStep.enum'
+import { ProfileTypeStepForm, SgeStep } from 'enums'
 import React from 'react'
 
 interface FormProgressProps {
diff --git a/src/components/Header/CozyBar.spec.tsx b/src/components/Header/CozyBar.spec.tsx
index 8f195ae4b8a6d2d5b60fb58c81279b25d24c34fd..9b7f320080e94b4b97cbaa72b2508231fd78cc17 100644
--- a/src/components/Header/CozyBar.spec.tsx
+++ b/src/components/Header/CozyBar.spec.tsx
@@ -1,5 +1,5 @@
 import CozyBar from 'components/Header/CozyBar'
-import { ScreenType } from 'enum/screen.enum'
+import { ScreenType } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import React from 'react'
diff --git a/src/components/Header/CozyBar.tsx b/src/components/Header/CozyBar.tsx
index 7169d94f891116b76ea851942406f73093cf3b26..d0cccb6005d43438fc1fc1541e68236440318cb5 100644
--- a/src/components/Header/CozyBar.tsx
+++ b/src/components/Header/CozyBar.tsx
@@ -2,7 +2,7 @@ import BackArrowIcon from 'assets/icons/ico/back-arrow.svg'
 import FeedbackIcon from 'assets/icons/ico/feedback.svg'
 import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { ScreenType } from 'enum/screen.enum'
+import { ScreenType } from 'enums'
 import React, { useCallback } from 'react'
 import { useNavigate } from 'react-router-dom'
 import { useAppDispatch, useAppSelector } from 'store/hooks'
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index 907185e2346debe24a88154d4c838cc5fa4b3203..db54fd2971edb157b4fc87cfa9f831477a09ef20 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -3,7 +3,7 @@ import BackArrowIcon from 'assets/icons/ico/back-arrow.svg'
 import FeedbackIcon from 'assets/icons/ico/feedback.svg'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { ScreenType } from 'enum/screen.enum'
+import { ScreenType } from 'enums'
 import React, { useCallback, useEffect, useRef } from 'react'
 import { useNavigate } from 'react-router-dom'
 import { useAppDispatch, useAppSelector } from 'store/hooks'
diff --git a/src/components/Home/ConsumptionDetails.spec.tsx b/src/components/Home/ConsumptionDetails.spec.tsx
index dbe7e2e9db55e7630bbbad4edad59cc41ec88a92..af41672238a23f2c76591a11bb11b5322e272fa4 100644
--- a/src/components/Home/ConsumptionDetails.spec.tsx
+++ b/src/components/Home/ConsumptionDetails.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import React from 'react'
diff --git a/src/components/Home/ConsumptionDetails.tsx b/src/components/Home/ConsumptionDetails.tsx
index 3781a45dabda3d7ff6f5d375c9b76651e45bcd55..01c5077addf3b167981450552b80adeb48e86a91 100644
--- a/src/components/Home/ConsumptionDetails.tsx
+++ b/src/components/Home/ConsumptionDetails.tsx
@@ -1,7 +1,6 @@
 import TotalConsumption from 'components/TotalConsumption/TotalConsumption'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import React from 'react'
 import { useAppSelector } from 'store/hooks'
 import { convertDateToShortDateString } from 'utils/date'
diff --git a/src/components/Home/ConsumptionView.spec.tsx b/src/components/Home/ConsumptionView.spec.tsx
index 9cf225a5777845de671c9e28b0fe9bd771c79ace..f02b52e4a3c055ce83329dd9538059bbe347e7f3 100644
--- a/src/components/Home/ConsumptionView.spec.tsx
+++ b/src/components/Home/ConsumptionView.spec.tsx
@@ -1,6 +1,5 @@
 import Loader from 'components/Loader/Loader'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidState, FluidType, TimeStep } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/Home/ConsumptionView.tsx b/src/components/Home/ConsumptionView.tsx
index d7766c73227bc1d0c51fee244fb2e8111743fe25..10d217683d85ebdd8d87753e0328acf856960839 100644
--- a/src/components/Home/ConsumptionView.tsx
+++ b/src/components/Home/ConsumptionView.tsx
@@ -13,8 +13,7 @@ import KonnectorViewerList from 'components/Konnector/KonnectorViewerList'
 import Loader from 'components/Loader/Loader'
 import PartnerIssueModal from 'components/PartnerIssue/PartnerIssueModal'
 import { useClient } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Home/FluidButton.spec.tsx b/src/components/Home/FluidButton.spec.tsx
index c7451b9e359289176d1b53c46960914b765b5739..5b2a1c7b58b4b079080c8672fd57fe78eccca795 100644
--- a/src/components/Home/FluidButton.spec.tsx
+++ b/src/components/Home/FluidButton.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidState, FluidType } from 'enum/fluid.enum'
+import { FluidState, FluidType } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import { GlobalState } from 'models'
diff --git a/src/components/Home/FluidButton.tsx b/src/components/Home/FluidButton.tsx
index 9346e264fe20bcf2deb002cd85b607f9512baa3d..43d9ea274fc4b74bdc50967cd2bbf29512c71553 100644
--- a/src/components/Home/FluidButton.tsx
+++ b/src/components/Home/FluidButton.tsx
@@ -3,8 +3,7 @@ import PartnerIssueNotif from 'assets/icons/ico/notif_maintenance.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { FluidState, FluidType, UsageEventType } from 'enums'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import DateChartService from 'services/dateChart.service'
diff --git a/src/components/Home/FluidButtons.spec.tsx b/src/components/Home/FluidButtons.spec.tsx
index 065798c729485f85fc2ad133f34c648578fbabd4..a5b28715733fd9769ef5bdcc702b1394e9e035bf 100644
--- a/src/components/Home/FluidButtons.spec.tsx
+++ b/src/components/Home/FluidButtons.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import React from 'react'
diff --git a/src/components/Home/FluidButtons.tsx b/src/components/Home/FluidButtons.tsx
index 62bcae8bfdbf25a7467e19f466f215151dca1b90..09ec44d26b5e6364eb28d3d8ab7de5ae5aa38d18 100644
--- a/src/components/Home/FluidButtons.tsx
+++ b/src/components/Home/FluidButtons.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import React from 'react'
 import FluidButton from './FluidButton'
 import './fluidButtons.scss'
diff --git a/src/components/Hooks/useExploration.spec.tsx b/src/components/Hooks/useExploration.spec.tsx
index 44f3be5635936e5be918723f99a13f8b1bba4d1b..c5ba00f5f8577d63ec91c3e13e51ac252998a09a 100644
--- a/src/components/Hooks/useExploration.spec.tsx
+++ b/src/components/Hooks/useExploration.spec.tsx
@@ -1,6 +1,6 @@
 import { act, renderHook } from '@testing-library/react-hooks'
 import useExploration from 'components/Hooks/useExploration'
-import { UserExplorationID } from 'enum/userExploration.enum'
+import { UserExplorationID } from 'enums'
 import React from 'react'
 import { Provider } from 'react-redux'
 import { createMockEcolyoStore } from '../../../tests/__mocks__/store'
diff --git a/src/components/Hooks/useExploration.tsx b/src/components/Hooks/useExploration.tsx
index cb8dd408b68c4bd54006a7ba1d1368f630b486c1..d661f6fd0e2121b6df392808132a10afef108450 100644
--- a/src/components/Hooks/useExploration.tsx
+++ b/src/components/Hooks/useExploration.tsx
@@ -1,5 +1,5 @@
 import { Client, useClient } from 'cozy-client'
-import { UserExplorationState } from 'enum/userExploration.enum'
+import { UserExplorationState } from 'enums'
 import { UserExploration } from 'models'
 import { Dispatch, SetStateAction, useEffect, useState } from 'react'
 import ExplorationService from 'services/exploration.service'
diff --git a/src/components/Hooks/useKonnectorAuth.tsx b/src/components/Hooks/useKonnectorAuth.tsx
index 10ae4f8bc71afb509a0565d4470b1104240296dc..86692e04ba9e1bde0f1c2bb19462aed23e4fb560 100644
--- a/src/components/Hooks/useKonnectorAuth.tsx
+++ b/src/components/Hooks/useKonnectorAuth.tsx
@@ -1,8 +1,7 @@
 import * as Sentry from '@sentry/react'
 import { Client, useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { FluidSlugType, UsageEventType } from 'enums'
 import {
   AccountAuthData,
   AccountSgeData,
diff --git a/src/components/Konnector/KonnectorModal.spec.tsx b/src/components/Konnector/KonnectorModal.spec.tsx
index 695743361a2beb4ed194d755045caafea630c4df..55a545193d5d348082e06b8e9f1c1db9dd451401 100644
--- a/src/components/Konnector/KonnectorModal.spec.tsx
+++ b/src/components/Konnector/KonnectorModal.spec.tsx
@@ -1,6 +1,5 @@
 import { Button } from '@material-ui/core'
-import { FluidType } from 'enum/fluid.enum'
-import { KonnectorError } from 'enum/konnectorError.enum'
+import { FluidType, KonnectorError } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import React from 'react'
diff --git a/src/components/Konnector/KonnectorModal.tsx b/src/components/Konnector/KonnectorModal.tsx
index f02c94ea6c13400fb9eb708714694d287d0b280f..766ad2952593fdd72cb9482cfaa4398613338d02 100644
--- a/src/components/Konnector/KonnectorModal.tsx
+++ b/src/components/Konnector/KonnectorModal.tsx
@@ -12,8 +12,7 @@ import {
 } from 'cozy-harvest-lib/dist/models/flowEvents'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
-import { KonnectorError } from 'enum/konnectorError.enum'
+import { FluidType, KonnectorError } from 'enums'
 import { shuffle } from 'lodash'
 import { Account } from 'models'
 import React, { useCallback, useEffect, useMemo, useState } from 'react'
diff --git a/src/components/Konnector/KonnectorModalFooter.spec.tsx b/src/components/Konnector/KonnectorModalFooter.spec.tsx
index 4845a8b21661d91a1a8333e3b77ceb566494ad47..12d9c08ec543367dae344638f54d0f2d8c5c4536 100644
--- a/src/components/Konnector/KonnectorModalFooter.spec.tsx
+++ b/src/components/Konnector/KonnectorModalFooter.spec.tsx
@@ -1,7 +1,6 @@
 import { Button } from '@material-ui/core'
 import { ERROR_EVENT } from 'cozy-harvest-lib/dist/models/flowEvents'
-import { FluidType } from 'enum/fluid.enum'
-import { KonnectorError } from 'enum/konnectorError.enum'
+import { FluidType, KonnectorError } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import React from 'react'
diff --git a/src/components/Konnector/KonnectorModalFooter.tsx b/src/components/Konnector/KonnectorModalFooter.tsx
index 7ce01b20503760e4d795c5dd0c7d0cb6de35c594..fa8cedb822a22d5d777546171d9cc668c44cc669 100644
--- a/src/components/Konnector/KonnectorModalFooter.tsx
+++ b/src/components/Konnector/KonnectorModalFooter.tsx
@@ -5,7 +5,7 @@ import {
   SUCCESS_EVENT,
 } from 'cozy-harvest-lib/dist/models/flowEvents'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { KonnectorError } from 'enum/konnectorError.enum'
+import { KonnectorError } from 'enums'
 import { Account } from 'models'
 import React, { useCallback } from 'react'
 import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Konnector/KonnectorViewerCard.tsx b/src/components/Konnector/KonnectorViewerCard.tsx
index cd63558029829e7d1fec1904e817822517c73d96..aeaddbd9a5a30586e8061806ba30548de1f07516 100644
--- a/src/components/Konnector/KonnectorViewerCard.tsx
+++ b/src/components/Konnector/KonnectorViewerCard.tsx
@@ -24,12 +24,15 @@ import {
 } from 'cozy-harvest-lib/dist/models/flowEvents'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
-import { KonnectorError } from 'enum/konnectorError.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserChallengeState } from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+import {
+  FluidSlugType,
+  FluidState,
+  FluidType,
+  KonnectorError,
+  UsageEventType,
+  UserChallengeState,
+  UserDuelState,
+} from 'enums'
 import { DateTime } from 'luxon'
 import {
   Account,
@@ -37,10 +40,10 @@ import {
   FluidConnection,
   FluidStatus,
   Konnector,
+  PartnersInfo,
   Trigger,
   UsageEvent,
 } from 'models'
-import { PartnersInfo } from 'models/partnersInfo.model'
 import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import AccountService from 'services/account.service'
diff --git a/src/components/Konnector/KonnectorViewerList.tsx b/src/components/Konnector/KonnectorViewerList.tsx
index 36e108c2496c5f3e5a8b8e61c387c0153abd19d8..d0fe22ec7a36535d2e0124a0f58ef8584861119e 100644
--- a/src/components/Konnector/KonnectorViewerList.tsx
+++ b/src/components/Konnector/KonnectorViewerList.tsx
@@ -1,7 +1,7 @@
 import StyledCard from 'components/CommonKit/Card/StyledCard'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { FluidStatus } from 'models'
 import React from 'react'
 import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Loader/Loader.spec.tsx b/src/components/Loader/Loader.spec.tsx
index 729e3afb5cd58ca7d7b5a203eaf14ce99a4e5bd8..7fbb634fed45bb60975334e14092029819b4a66d 100644
--- a/src/components/Loader/Loader.spec.tsx
+++ b/src/components/Loader/Loader.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import Loader from './Loader'
diff --git a/src/components/Loader/Loader.tsx b/src/components/Loader/Loader.tsx
index aafdf086d332ed62c967778617929236e909714f..838a7c341ecd768a77f7c10c9f4225a77cdb327c 100644
--- a/src/components/Loader/Loader.tsx
+++ b/src/components/Loader/Loader.tsx
@@ -1,5 +1,5 @@
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import React from 'react'
 import './Loader.scss'
 
diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx
index 23f01ebdabb3d937496f7ee6f37f4dbba93c9e13..bf9bf2510bfdc0df9e7c718eb73a2f7ec634d423 100644
--- a/src/components/Navbar/Navbar.tsx
+++ b/src/components/Navbar/Navbar.tsx
@@ -13,7 +13,7 @@ import logos from 'assets/png/logos_partenaires.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
 import React, { useCallback } from 'react'
 import { NavLink, useLocation } from 'react-router-dom'
 import UsageEventService from 'services/usageEvent.service'
diff --git a/src/components/Options/ExportData/ExportData.tsx b/src/components/Options/ExportData/ExportData.tsx
index 512d627d2406297e1a6d3b1a06603898cc7e3e18..a7195bc974a7c1f3f8c364168fcd47aa0768159f 100644
--- a/src/components/Options/ExportData/ExportData.tsx
+++ b/src/components/Options/ExportData/ExportData.tsx
@@ -13,8 +13,7 @@ import ExportStartModal from 'components/Export/exportStartModal'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { remove } from 'lodash'
 import React, { useEffect, useMemo, useState } from 'react'
 import ConsumptionDataManager from 'services/consumption.service'
diff --git a/src/components/Options/LegalNotice/LegalNoticeLink.tsx b/src/components/Options/LegalNotice/LegalNoticeLink.tsx
index 5475686d5866eff333af781dbb4262a6f68c646e..cdd71ce7026fb051fc40b6660fa0b8d1b10e934d 100644
--- a/src/components/Options/LegalNotice/LegalNoticeLink.tsx
+++ b/src/components/Options/LegalNotice/LegalNoticeLink.tsx
@@ -3,7 +3,7 @@ import LegalNoticeIcon from 'assets/icons/ico/legal-notice.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
 import React, { useCallback } from 'react'
 import { Link as RouterLink } from 'react-router-dom'
 import UsageEventService from 'services/usageEvent.service'
diff --git a/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.spec.tsx b/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.spec.tsx
index cde7d357c0411972d04213aff5adf2eb033bc0e3..b352abb1e5c90405414299f6b6c615af55b21be3 100644
--- a/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.spec.tsx
+++ b/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.spec.tsx
@@ -7,7 +7,7 @@ import {
   IndividualInsulationWork,
   IndividualOrCollective,
   ThreeChoicesAnswer,
-} from 'enum/profileType.enum'
+} from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx b/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx
index 4d18cfef7cf227e5c3baf84bd81a1bae6043cd10..1648f83c82ee3642a9cb3b8687d5fa15d9b35538 100644
--- a/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx
+++ b/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx
@@ -11,14 +11,14 @@ import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import useExploration from 'components/Hooks/useExploration'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
 import {
+  FluidType,
   HousingType,
   IndividualOrCollective,
   OutsideFacingWalls,
   ThreeChoicesAnswer,
-} from 'enum/profileType.enum'
-import { UserExplorationID } from 'enum/userExploration.enum'
+  UserExplorationID,
+} from 'enums'
 import React, { useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import { useAppSelector } from 'store/hooks'
diff --git a/src/components/Options/ReportOptions/ReportOptions.spec.tsx b/src/components/Options/ReportOptions/ReportOptions.spec.tsx
index 646027c019fbfcb4c08808dfe93b28d45c52c989..f4e6f877222fc2ad2b879844477e180b31da8af9 100644
--- a/src/components/Options/ReportOptions/ReportOptions.spec.tsx
+++ b/src/components/Options/ReportOptions/ReportOptions.spec.tsx
@@ -1,7 +1,7 @@
 import { Button } from '@material-ui/core'
 import StyledSwitch from 'components/CommonKit/Switch/StyledSwitch'
 import ReportOptions from 'components/Options/ReportOptions/ReportOptions'
-import { FluidState, FluidType } from 'enum/fluid.enum'
+import { FluidState, FluidType } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/Options/ReportOptions/ReportOptions.tsx b/src/components/Options/ReportOptions/ReportOptions.tsx
index 5853217c6b7b8fdf07cae9514dcd5024c6d6f666..9a3af33185f652241983c977b04916131f065bcf 100644
--- a/src/components/Options/ReportOptions/ReportOptions.tsx
+++ b/src/components/Options/ReportOptions/ReportOptions.tsx
@@ -2,8 +2,7 @@ import { Button } from '@material-ui/core'
 import StyledSwitch from 'components/CommonKit/Switch/StyledSwitch'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidState, FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { Dataload, TimePeriod } from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
diff --git a/src/components/PartnerIssue/PartnerIssueModal.tsx b/src/components/PartnerIssue/PartnerIssueModal.tsx
index 59d4c7842b84cbee2a94db15aaed0791087312ae..85c28abf05c12bdbf7f46f14300287f6db451ac8 100644
--- a/src/components/PartnerIssue/PartnerIssueModal.tsx
+++ b/src/components/PartnerIssue/PartnerIssueModal.tsx
@@ -6,7 +6,7 @@ import OrangeWarn from 'assets/icons/ico/warn-orange.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { FluidStatus } from 'models'
 import React from 'react'
 import './partnerIssueModal.scss'
diff --git a/src/components/ProfileType/ProfileTypeFinished.tsx b/src/components/ProfileType/ProfileTypeFinished.tsx
index e8a2b8fcf54d2c798f92cb06fb76bf7476819f62..63cc2babec41ae4bc7493f584e896c7dbf80a729 100644
--- a/src/components/ProfileType/ProfileTypeFinished.tsx
+++ b/src/components/ProfileType/ProfileTypeFinished.tsx
@@ -7,11 +7,9 @@ import 'components/ProfileType/profileTypeFinished.scss'
 import { Client, useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import { PROFILETYPE_DOCTYPE } from 'doctypes'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserExplorationID } from 'enum/userExploration.enum'
+import { UsageEventType, UserExplorationID } from 'enums'
 import { DateTime } from 'luxon'
-import { TimePeriod } from 'models'
-import { ProfileType } from 'models/profileType.model'
+import { ProfileType, TimePeriod } from 'models'
 import React, { useEffect, useState } from 'react'
 import { useLocation, useNavigate } from 'react-router-dom'
 import ProfileTypeService from 'services/profileType.service'
diff --git a/src/components/ProfileType/ProfileTypeFormDateSelection.tsx b/src/components/ProfileType/ProfileTypeFormDateSelection.tsx
index d9b203f0cc59a06ce30e2893d5158875694bfb66..41279cdbb8f8ba1d2005bbb876829d2f4439737e 100644
--- a/src/components/ProfileType/ProfileTypeFormDateSelection.tsx
+++ b/src/components/ProfileType/ProfileTypeFormDateSelection.tsx
@@ -3,13 +3,9 @@ import FormNavigation from 'components/FormGlobal/FormNavigation'
 import FormProgress from 'components/FormGlobal/FormProgress'
 import 'components/ProfileType/profileTypeForm.scss'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { ProfileTypeStepForm } from 'enums'
 import { DateTime } from 'luxon'
-import {
-  ProfileType,
-  ProfileTypeAnswer,
-  ProfileTypeValues,
-} from 'models/profileType.model'
+import { ProfileType, ProfileTypeAnswer, ProfileTypeValues } from 'models'
 import React, { useCallback, useState } from 'react'
 import { getMonthFullName } from 'utils/utils'
 
diff --git a/src/components/ProfileType/ProfileTypeFormMultiChoice.spec.tsx b/src/components/ProfileType/ProfileTypeFormMultiChoice.spec.tsx
index 631295947246e60144184b35bf95d63dd94aa6bf..d1a811b2612521bcbc837bf2f101d2d5d8e3deb0 100644
--- a/src/components/ProfileType/ProfileTypeFormMultiChoice.spec.tsx
+++ b/src/components/ProfileType/ProfileTypeFormMultiChoice.spec.tsx
@@ -1,4 +1,4 @@
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { ProfileTypeStepForm } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/ProfileType/ProfileTypeFormMultiChoice.tsx b/src/components/ProfileType/ProfileTypeFormMultiChoice.tsx
index ffa3adc18c577852c36c46a4eb2d28529f241c72..008be6979c53e68e27602598733294b0ec2487be 100644
--- a/src/components/ProfileType/ProfileTypeFormMultiChoice.tsx
+++ b/src/components/ProfileType/ProfileTypeFormMultiChoice.tsx
@@ -3,9 +3,9 @@ import FormNavigation from 'components/FormGlobal/FormNavigation'
 import FormProgress from 'components/FormGlobal/FormProgress'
 import 'components/ProfileType/profileTypeForm.scss'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { ProfileTypeStepForm } from 'enums'
 import { remove } from 'lodash'
-import { ProfileType, ProfileTypeAnswer } from 'models/profileType.model'
+import { ProfileType, ProfileTypeAnswer } from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useAppSelector } from 'store/hooks'
 
diff --git a/src/components/ProfileType/ProfileTypeFormNumber.spec.tsx b/src/components/ProfileType/ProfileTypeFormNumber.spec.tsx
index 34aa9e69e3280bae32e5e89d494cde9ea3e6742f..c5ebae6c79045be9b35887020f54d000573db787 100644
--- a/src/components/ProfileType/ProfileTypeFormNumber.spec.tsx
+++ b/src/components/ProfileType/ProfileTypeFormNumber.spec.tsx
@@ -1,4 +1,4 @@
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { ProfileTypeStepForm } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/ProfileType/ProfileTypeFormNumber.tsx b/src/components/ProfileType/ProfileTypeFormNumber.tsx
index bcbee75fdbaa8250fda7a5cb4a9449d4af181439..cb3d4e6a4d6e39ecf5a46135f5a1daee26452a65 100644
--- a/src/components/ProfileType/ProfileTypeFormNumber.tsx
+++ b/src/components/ProfileType/ProfileTypeFormNumber.tsx
@@ -2,12 +2,8 @@ import FormNavigation from 'components/FormGlobal/FormNavigation'
 import FormProgress from 'components/FormGlobal/FormProgress'
 import 'components/ProfileType/profileTypeForm.scss'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
-import {
-  ProfileType,
-  ProfileTypeAnswer,
-  ProfileTypeValues,
-} from 'models/profileType.model'
+import { ProfileTypeStepForm } from 'enums'
+import { ProfileType, ProfileTypeAnswer, ProfileTypeValues } from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useAppSelector } from 'store/hooks'
 
diff --git a/src/components/ProfileType/ProfileTypeFormNumberSelection.spec.tsx b/src/components/ProfileType/ProfileTypeFormNumberSelection.spec.tsx
index 9214b90f5379960844e8f8f638c857af6cc78a1a..10eadf07a3c85fbbc86d4ee7d178b02acba1d6e9 100644
--- a/src/components/ProfileType/ProfileTypeFormNumberSelection.spec.tsx
+++ b/src/components/ProfileType/ProfileTypeFormNumberSelection.spec.tsx
@@ -1,4 +1,4 @@
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { ProfileTypeStepForm } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/ProfileType/ProfileTypeFormNumberSelection.tsx b/src/components/ProfileType/ProfileTypeFormNumberSelection.tsx
index 16734ea06d25cc375877c4b268890513d49d2832..2f1905ad1defd6b41a88428832d4309304241f4f 100644
--- a/src/components/ProfileType/ProfileTypeFormNumberSelection.tsx
+++ b/src/components/ProfileType/ProfileTypeFormNumberSelection.tsx
@@ -3,12 +3,8 @@ import FormNavigation from 'components/FormGlobal/FormNavigation'
 import FormProgress from 'components/FormGlobal/FormProgress'
 import 'components/ProfileType/profileTypeForm.scss'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
-import {
-  ProfileType,
-  ProfileTypeAnswer,
-  ProfileTypeValues,
-} from 'models/profileType.model'
+import { ProfileTypeStepForm } from 'enums'
+import { ProfileType, ProfileTypeAnswer, ProfileTypeValues } from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useAppSelector } from 'store/hooks'
 
diff --git a/src/components/ProfileType/ProfileTypeFormSingleChoice.spec.tsx b/src/components/ProfileType/ProfileTypeFormSingleChoice.spec.tsx
index 2250e2a479257c8c298bbc85a3cac9a5012095d1..293e3fa265dec171c17576715d97cbaab36729b9 100644
--- a/src/components/ProfileType/ProfileTypeFormSingleChoice.spec.tsx
+++ b/src/components/ProfileType/ProfileTypeFormSingleChoice.spec.tsx
@@ -1,4 +1,4 @@
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { ProfileTypeStepForm } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx b/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx
index 7487597c3da3c723abaa9bdf9e9127ad9ab04398..b7cb5f8fa72d39929b3da8e4ff1c0d0165c84f2a 100644
--- a/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx
+++ b/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx
@@ -3,13 +3,13 @@ import FormNavigation from 'components/FormGlobal/FormNavigation'
 import FormProgress from 'components/FormGlobal/FormProgress'
 import 'components/ProfileType/profileTypeForm.scss'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
-import { ProfileEcogesture } from 'models'
+import { ProfileTypeStepForm } from 'enums'
 import {
+  ProfileEcogesture,
   ProfileType,
   ProfileTypeAnswer,
   ProfileTypeValues,
-} from 'models/profileType.model'
+} from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useAppSelector } from 'store/hooks'
 
diff --git a/src/components/ProfileType/ProfileTypeView.tsx b/src/components/ProfileType/ProfileTypeView.tsx
index 127369ad7d817948c4bc1ebdb4e103c16c89a5c0..56db7b246f954d16b60a407fc73575ea58cfbf04 100644
--- a/src/components/ProfileType/ProfileTypeView.tsx
+++ b/src/components/ProfileType/ProfileTypeView.tsx
@@ -9,10 +9,10 @@ import ProfileTypeFormNumber from 'components/ProfileType/ProfileTypeFormNumber'
 import ProfileTypeFormNumberSelection from 'components/ProfileType/ProfileTypeFormNumberSelection'
 import ProfileTypeFormSingleChoice from 'components/ProfileType/ProfileTypeFormSingleChoice'
 import 'components/ProfileType/profileTypeView.scss'
-import { FluidType } from 'enum/fluid.enum'
 import {
   ConstructionYear,
   Floor,
+  FluidType,
   HotWaterEquipment,
   HotWaterFluid,
   HousingType,
@@ -23,7 +23,7 @@ import {
   ProfileTypeStepForm,
   ThreeChoicesAnswer,
   WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
 import { DateTime } from 'luxon'
 import { ProfileType, ProfileTypeAnswer } from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
diff --git a/src/components/Quiz/QuizBegin.spec.tsx b/src/components/Quiz/QuizBegin.spec.tsx
index 20df0a7062c82ae39df0ddc9e0cebfda9c97025a..0bb0dbb7ec6bdbaff2de2b69bd5af0d69758be55 100644
--- a/src/components/Quiz/QuizBegin.spec.tsx
+++ b/src/components/Quiz/QuizBegin.spec.tsx
@@ -1,6 +1,6 @@
 import Button from '@material-ui/core/Button'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UserChallengeUpdateFlag } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/Quiz/QuizBegin.tsx b/src/components/Quiz/QuizBegin.tsx
index 634f3242139954555d6b28fd85c2e24a7f740165..bf7e52aa4f47c0f4526d1226eca06bab57cf458f 100644
--- a/src/components/Quiz/QuizBegin.tsx
+++ b/src/components/Quiz/QuizBegin.tsx
@@ -4,7 +4,7 @@ import StarsContainer from 'components/Challenge/StarsContainer'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { Client, useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UserChallengeUpdateFlag } from 'enums'
 import { UserChallenge } from 'models'
 import React from 'react'
 import ChallengeService from 'services/challenge.service'
diff --git a/src/components/Quiz/QuizCustomQuestionContent.tsx b/src/components/Quiz/QuizCustomQuestionContent.tsx
index 40f78e95f6c5a4d8cfc2959632409c196102879a..98b8c161c7c648504edee38d8f35a80ee672ea49 100644
--- a/src/components/Quiz/QuizCustomQuestionContent.tsx
+++ b/src/components/Quiz/QuizCustomQuestionContent.tsx
@@ -5,8 +5,7 @@ import Loader from 'components/Loader/Loader'
 import QuizExplanationModal from 'components/Quiz/QuizExplanationModal'
 import { Client, useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UsageEventType, UserChallengeUpdateFlag } from 'enums'
 import { Answer, QuestionEntity, UserChallenge, UserQuiz } from 'models'
 import React, { useState } from 'react'
 import ChallengeService from 'services/challenge.service'
diff --git a/src/components/Quiz/QuizFinish.spec.tsx b/src/components/Quiz/QuizFinish.spec.tsx
index f028d62f90b65935eeb4c646e2e9a9e024353ebf..979763f64ffaa9b91ae009b0327324f04319fb62 100644
--- a/src/components/Quiz/QuizFinish.spec.tsx
+++ b/src/components/Quiz/QuizFinish.spec.tsx
@@ -1,6 +1,6 @@
 import Button from '@material-ui/core/Button'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UserChallengeUpdateFlag } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/Quiz/QuizFinish.tsx b/src/components/Quiz/QuizFinish.tsx
index 65eac3431eebdf63dbf2af5a5b3206d1b6dbb197..029ee4c52e37fbb2f38c9d0fe2e7de72ab57d89b 100644
--- a/src/components/Quiz/QuizFinish.tsx
+++ b/src/components/Quiz/QuizFinish.tsx
@@ -3,7 +3,7 @@ import starResult from 'assets/icons/visu/quiz/starResult.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { Client, useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UserChallengeUpdateFlag } from 'enums'
 import { UserChallenge } from 'models'
 import React, { useCallback, useMemo } from 'react'
 import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Quiz/QuizQuestion.spec.tsx b/src/components/Quiz/QuizQuestion.spec.tsx
index 5f145d4dc948e5c393ae1d5579b4aaeeb4b847bc..ee64e535a8d8f22fd05349f7bd8321cdf931b4b0 100644
--- a/src/components/Quiz/QuizQuestion.spec.tsx
+++ b/src/components/Quiz/QuizQuestion.spec.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable react/display-name */
-import { UserQuestionState } from 'enum/userQuiz.enum'
+import { UserQuestionState } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/Quiz/QuizQuestionContent.tsx b/src/components/Quiz/QuizQuestionContent.tsx
index 28842fe8cdf88958fb0b2848acaae6e37b6f4cf8..93c0ddf2022383f4ceabe3e2cc46662c2e04da9f 100644
--- a/src/components/Quiz/QuizQuestionContent.tsx
+++ b/src/components/Quiz/QuizQuestionContent.tsx
@@ -4,7 +4,7 @@ import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
 import QuizExplanationModal from 'components/Quiz/QuizExplanationModal'
 import { Client, useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UserChallengeUpdateFlag } from 'enums'
 import { Answer, UserChallenge, UserQuiz } from 'models'
 import React, { Dispatch, SetStateAction, useCallback, useState } from 'react'
 import ChallengeService from 'services/challenge.service'
diff --git a/src/components/Quiz/QuizView.spec.tsx b/src/components/Quiz/QuizView.spec.tsx
index afa4acf447d78ab75ee822555927550a9908094b..5ba5d28c28415793544210b77c7f840290ee70d0 100644
--- a/src/components/Quiz/QuizView.spec.tsx
+++ b/src/components/Quiz/QuizView.spec.tsx
@@ -1,5 +1,5 @@
 import QuizView from 'components/Quiz/QuizView'
-import { UserQuizState } from 'enum/userQuiz.enum'
+import { UserQuizState } from 'enums'
 import { mount } from 'enzyme'
 import { ChallengeState } from 'models'
 import React from 'react'
diff --git a/src/components/Quiz/QuizView.tsx b/src/components/Quiz/QuizView.tsx
index 9bb016762c88166083bbfa82235f578d2ceeb2bd..7b1dcd04bb2f63083c7bdffcc376e71f1f339a44 100644
--- a/src/components/Quiz/QuizView.tsx
+++ b/src/components/Quiz/QuizView.tsx
@@ -1,7 +1,7 @@
 import Content from 'components/Content/Content'
 import CozyBar from 'components/Header/CozyBar'
 import Header from 'components/Header/Header'
-import { UserQuizState } from 'enum/userQuiz.enum'
+import { UserQuizState } from 'enums'
 import { UserChallenge } from 'models'
 import React, { useState } from 'react'
 import { useAppSelector } from 'store/hooks'
diff --git a/src/components/Routes/Routes.tsx b/src/components/Routes/Routes.tsx
index f795d67a8ad84ed5ba1844b6b413476eeea30dcf..327ed1389126c16dffaa7db15e7adc58a3ad111d 100644
--- a/src/components/Routes/Routes.tsx
+++ b/src/components/Routes/Routes.tsx
@@ -9,7 +9,7 @@ import Loader from 'components/Loader/Loader'
 import UnSubscribe from 'components/Options/Unsubscribe/UnSubscribe'
 import QuizView from 'components/Quiz/QuizView'
 import TermsView from 'components/Terms/TermsView'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { TermsStatus } from 'models'
 import React, { lazy, Suspense } from 'react'
 import { Navigate, Route, Routes } from 'react-router-dom'
diff --git a/src/components/Splash/SplashRoot.tsx b/src/components/Splash/SplashRoot.tsx
index 13969416d78d469ed2c3c09c8cdbb5d70119038b..0cedc5b426369940270690e7cc83dde6aeb9b4c1 100644
--- a/src/components/Splash/SplashRoot.tsx
+++ b/src/components/Splash/SplashRoot.tsx
@@ -2,14 +2,14 @@ import * as Sentry from '@sentry/react'
 import classNames from 'classnames'
 import useExploration from 'components/Hooks/useExploration'
 import { useClient } from 'cozy-client'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserActionState } from 'enum/userAction.enum'
-import { UserChallengeState } from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
 import {
+  UsageEventType,
+  UserActionState,
+  UserChallengeState,
+  UserDuelState,
   UserExplorationID,
   UserExplorationState,
-} from 'enum/userExploration.enum'
+} from 'enums'
 import { DateTime } from 'luxon'
 import { migrations } from 'migrations/migration.data'
 import { MigrationService } from 'migrations/migration.service'
diff --git a/src/components/Splash/SplashScreen.tsx b/src/components/Splash/SplashScreen.tsx
index 468b85b5f9eb5b2a450bf4101e500839f8a857b8..7b068de2e45aabc2e91987975f092b4b02707bf7 100644
--- a/src/components/Splash/SplashScreen.tsx
+++ b/src/components/Splash/SplashScreen.tsx
@@ -1,7 +1,7 @@
 import logoLoading from 'assets/anims/logoLoading.gif'
 import logos from 'assets/png/logos_partenaires.svg'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { InitSteps } from 'models/initialisationSteps.model'
+import { InitSteps } from 'models'
 import React from 'react'
 import './splashScreen.scss'
 
diff --git a/src/components/Splash/SplashScreenError.tsx b/src/components/Splash/SplashScreenError.tsx
index 91eaf7dbac5a299a8bfbf089bdaef94dd8408584..1ebaaac2abd87d83b4931eb31503ee1bdd802010 100644
--- a/src/components/Splash/SplashScreenError.tsx
+++ b/src/components/Splash/SplashScreenError.tsx
@@ -2,7 +2,7 @@ import Button from '@material-ui/core/Button'
 import ecolyoIcon from 'assets/icons/ico/ecolyo.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { InitStepsErrors } from 'models/initialisationSteps.model'
+import { InitStepsErrors } from 'models'
 import React from 'react'
 import './splashScreen.scss'
 
diff --git a/src/components/TimeStepSelector/TimeStepSelector.spec.tsx b/src/components/TimeStepSelector/TimeStepSelector.spec.tsx
index 216566537690a0214df75ea1c990c49ffa229116..e7ae42fa7d690a6e9632fa1b7815b12576dade18 100644
--- a/src/components/TimeStepSelector/TimeStepSelector.spec.tsx
+++ b/src/components/TimeStepSelector/TimeStepSelector.spec.tsx
@@ -1,7 +1,6 @@
 import { Button } from '@material-ui/core'
 import TimeStepSelector from 'components/TimeStepSelector/TimeStepSelector'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import { DateTime } from 'luxon'
diff --git a/src/components/TimeStepSelector/TimeStepSelector.tsx b/src/components/TimeStepSelector/TimeStepSelector.tsx
index ff58ddf61bfcbc7b2671412915589c5cecbb8e03..1fc137ce423bdd70ae52d1431c8286dded0d9316 100644
--- a/src/components/TimeStepSelector/TimeStepSelector.tsx
+++ b/src/components/TimeStepSelector/TimeStepSelector.tsx
@@ -1,9 +1,7 @@
 import { Button } from '@material-ui/core'
 import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { FluidType, TimeStep, UsageEventType } from 'enums'
 import { DateTime } from 'luxon'
 import React from 'react'
 import DateChartService from 'services/dateChart.service'
diff --git a/src/components/TotalConsumption/TotalConsumption.spec.tsx b/src/components/TotalConsumption/TotalConsumption.spec.tsx
index a54492bc22883d69a8f2ff43fe9f358d1a03e214..91f52d6c6566f53d76c9e07a94f8e939ddeb11bd 100644
--- a/src/components/TotalConsumption/TotalConsumption.spec.tsx
+++ b/src/components/TotalConsumption/TotalConsumption.spec.tsx
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { mount } from 'enzyme'
 import React from 'react'
 import { Provider } from 'react-redux'
diff --git a/src/components/TotalConsumption/TotalConsumption.tsx b/src/components/TotalConsumption/TotalConsumption.tsx
index 6f82323b5b83004343c9e1cb75c6cf6a1e07f3b8..eec9e9ab7730e222d0f969a3339c9e75f4d3548a 100644
--- a/src/components/TotalConsumption/TotalConsumption.tsx
+++ b/src/components/TotalConsumption/TotalConsumption.tsx
@@ -2,8 +2,7 @@ import Coin from 'assets/icons/ico/coin.svg'
 import Coins from 'assets/icons/ico/coins.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { useClient } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { Dataload } from 'models'
 import React, { useCallback, useEffect, useState } from 'react'
 import ConsumptionService from 'services/consumption.service'
diff --git a/src/doctypes/index.ts b/src/doctypes/index.ts
index 535698232c1e37d419cbf2445be5dacab0fba96a..3eded16b7eb5ed8c96f57ab34952b702f8c94a03 100644
--- a/src/doctypes/index.ts
+++ b/src/doctypes/index.ts
@@ -216,3 +216,8 @@ export * from './io-cozy-jobs'
 export * from './io-cozy-konnectors'
 export * from './io-cozy-terms'
 export * from './io-cozy-triggers'
+export * from './remote/org.ecolyo.agent'
+export * from './remote/org.ecolyo.agent.custom.popup'
+export * from './remote/org.ecolyo.agent.partners.info'
+export * from './remote/org.ecolyo.agent.prices'
+export * from './remote/org.ecolyo.dju'
diff --git a/src/enum/konnectorUpdate.enum.ts b/src/enum/konnectorUpdate.enum.ts
deleted file mode 100644
index d9b5dd8d71ce6bd1a2220069394358f976f7374e..0000000000000000000000000000000000000000
--- a/src/enum/konnectorUpdate.enum.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export enum KonnectorUpdate {
-  ERROR_UPDATE = 'error_update',
-  ERROR_UPDATE_OAUTH = 'error_update_oauth',
-  LOGIN_FAILED = 'login_failed',
-  ERROR_CONSENT_FORM_GAS = 'error_consent_form_gas',
-}
diff --git a/src/enum/dacc.enum.ts b/src/enums/dacc.enum.ts
similarity index 100%
rename from src/enum/dacc.enum.ts
rename to src/enums/dacc.enum.ts
diff --git a/src/enum/dataload.enum.ts b/src/enums/dataload.enum.ts
similarity index 100%
rename from src/enum/dataload.enum.ts
rename to src/enums/dataload.enum.ts
diff --git a/src/enum/ecogesture.enum.ts b/src/enums/ecogesture.enum.ts
similarity index 100%
rename from src/enum/ecogesture.enum.ts
rename to src/enums/ecogesture.enum.ts
diff --git a/src/enum/ecogestureForm.enum.ts b/src/enums/ecogestureForm.enum.ts
similarity index 100%
rename from src/enum/ecogestureForm.enum.ts
rename to src/enums/ecogestureForm.enum.ts
diff --git a/src/enum/fluid.enum.ts b/src/enums/fluid.enum.ts
similarity index 100%
rename from src/enum/fluid.enum.ts
rename to src/enums/fluid.enum.ts
diff --git a/src/enum/fluidSlug.enum.ts b/src/enums/fluidSlug.enum.ts
similarity index 100%
rename from src/enum/fluidSlug.enum.ts
rename to src/enums/fluidSlug.enum.ts
diff --git a/src/enums/index.ts b/src/enums/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..921ed6776e0b3113c1163fc3dd8437b8032bf144
--- /dev/null
+++ b/src/enums/index.ts
@@ -0,0 +1,19 @@
+export * from './dacc.enum'
+export * from './dataload.enum'
+export * from './ecogesture.enum'
+export * from './ecogestureForm.enum'
+export * from './fluid.enum'
+export * from './fluidSlug.enum'
+export * from './jobState.enum'
+export * from './konnectorStatus.enum'
+export * from './profileType.enum'
+export * from './screen.enum'
+export * from './sgeStep.enum'
+export * from './timeStep.enum'
+export * from './usageEvent.enum'
+export * from './usageEventProperties.enum'
+export * from './userAction.enum'
+export * from './userChallenge.enum'
+export * from './userDuel.enum'
+export * from './userExploration.enum'
+export * from './userQuiz.enum'
diff --git a/src/enum/jobState.enum.ts b/src/enums/jobState.enum.ts
similarity index 100%
rename from src/enum/jobState.enum.ts
rename to src/enums/jobState.enum.ts
diff --git a/src/enum/konnectorError.enum.ts b/src/enums/konnectorStatus.enum.ts
similarity index 57%
rename from src/enum/konnectorError.enum.ts
rename to src/enums/konnectorStatus.enum.ts
index 090a513caafdfc5b964c22c0ec86ab1e0cc98867..ae8cba6476c772d041e34febae807cee00ebfc02 100644
--- a/src/enum/konnectorError.enum.ts
+++ b/src/enums/konnectorStatus.enum.ts
@@ -6,3 +6,10 @@ export enum KonnectorError {
   UNKNOWN_ERROR = 'UNKNOWN_ERROR',
   CRITICAL = 'exit status 1',
 }
+
+export enum KonnectorUpdate {
+  ERROR_UPDATE = 'error_update',
+  ERROR_UPDATE_OAUTH = 'error_update_oauth',
+  LOGIN_FAILED = 'login_failed',
+  ERROR_CONSENT_FORM_GAS = 'error_consent_form_gas',
+}
diff --git a/src/enum/profileType.enum.ts b/src/enums/profileType.enum.ts
similarity index 100%
rename from src/enum/profileType.enum.ts
rename to src/enums/profileType.enum.ts
diff --git a/src/enum/screen.enum.ts b/src/enums/screen.enum.ts
similarity index 100%
rename from src/enum/screen.enum.ts
rename to src/enums/screen.enum.ts
diff --git a/src/enum/sgeStep.enum.ts b/src/enums/sgeStep.enum.ts
similarity index 100%
rename from src/enum/sgeStep.enum.ts
rename to src/enums/sgeStep.enum.ts
diff --git a/src/enum/timeStep.enum.ts b/src/enums/timeStep.enum.ts
similarity index 100%
rename from src/enum/timeStep.enum.ts
rename to src/enums/timeStep.enum.ts
diff --git a/src/enum/usageEvent.enum.ts b/src/enums/usageEvent.enum.ts
similarity index 100%
rename from src/enum/usageEvent.enum.ts
rename to src/enums/usageEvent.enum.ts
diff --git a/src/enum/usageEventProperties.enum.ts b/src/enums/usageEventProperties.enum.ts
similarity index 100%
rename from src/enum/usageEventProperties.enum.ts
rename to src/enums/usageEventProperties.enum.ts
diff --git a/src/enum/userAction.enum.ts b/src/enums/userAction.enum.ts
similarity index 100%
rename from src/enum/userAction.enum.ts
rename to src/enums/userAction.enum.ts
diff --git a/src/enum/userChallenge.enum.ts b/src/enums/userChallenge.enum.ts
similarity index 100%
rename from src/enum/userChallenge.enum.ts
rename to src/enums/userChallenge.enum.ts
diff --git a/src/enum/userDuel.enum.ts b/src/enums/userDuel.enum.ts
similarity index 100%
rename from src/enum/userDuel.enum.ts
rename to src/enums/userDuel.enum.ts
diff --git a/src/enum/userExploration.enum.ts b/src/enums/userExploration.enum.ts
similarity index 100%
rename from src/enum/userExploration.enum.ts
rename to src/enums/userExploration.enum.ts
diff --git a/src/enum/userQuiz.enum.ts b/src/enums/userQuiz.enum.ts
similarity index 100%
rename from src/enum/userQuiz.enum.ts
rename to src/enums/userQuiz.enum.ts
diff --git a/src/migrations/migration.data.ts b/src/migrations/migration.data.ts
index ada83c237aafcf36dbcbb8aaca076b2e5e37312d..abaf259e49dc579d75feda279dceb962c988d873 100644
--- a/src/migrations/migration.data.ts
+++ b/src/migrations/migration.data.ts
@@ -15,7 +15,7 @@ import {
   PROFILE_DOCTYPE,
   USERCHALLENGE_DOCTYPE,
 } from 'doctypes'
-import { UserQuizState } from 'enum/userQuiz.enum'
+import { UserQuizState } from 'enums'
 import { DateTime } from 'luxon'
 import { DataloadEntity, Profile, ProfileType, UserChallenge } from 'models'
 import { Migration } from './migration.type'
diff --git a/src/migrations/migration.service.ts b/src/migrations/migration.service.ts
index 2746f148312d76f019c5910ea088ada15bbb0802..757f9644727b3f045dcfa578f784c4c61432445b 100644
--- a/src/migrations/migration.service.ts
+++ b/src/migrations/migration.service.ts
@@ -1,9 +1,7 @@
 import * as Sentry from '@sentry/react'
 import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
-import { SCHEMAS_DOCTYPE } from 'doctypes/com-grandlyon-ecolyo-schemas'
-import { InitStepsErrors } from 'models/initialisationSteps.model'
-import { ReleaseNotes } from 'models/releaseNotes.model'
-import { Schema } from 'models/schema.models'
+import { SCHEMAS_DOCTYPE } from 'doctypes'
+import { InitStepsErrors, ReleaseNotes, Schema } from 'models'
 import { logDuration } from 'utils/duration'
 import logApp from 'utils/logger'
 import { migrate, migrationLog } from './migration'
diff --git a/src/migrations/migration.ts b/src/migrations/migration.ts
index 746e0c0adc59cda5e98c0703da1c9b01299da17e..b5e6819cbe39d908450e026c7a18731556567981 100644
--- a/src/migrations/migration.ts
+++ b/src/migrations/migration.ts
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/react'
 import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
-import { SCHEMAS_DOCTYPE } from 'doctypes/com-grandlyon-ecolyo-schemas'
-import { Schema } from 'models/schema.models'
+import { SCHEMAS_DOCTYPE } from 'doctypes'
+import { Schema } from 'models'
 import logApp from 'utils/logger'
 import {
   MIGRATION_RESULT_COMPLETE,
diff --git a/src/migrations/migration.type.ts b/src/migrations/migration.type.ts
index 1ee3c97765b38cd236e8dee76213289f1fbf03f8..e4b7a93c41f4cc840d720efd63179e1c8abace36 100644
--- a/src/migrations/migration.type.ts
+++ b/src/migrations/migration.type.ts
@@ -1,5 +1,5 @@
 import { Client } from 'cozy-client'
-import { Notes } from 'models/releaseNotes.model'
+import { Notes } from 'models'
 
 type SchemaVersion = number
 
diff --git a/src/models/action.model.ts b/src/models/action.model.ts
index d9c011f5deacd8c1bb04d8dcdbc9910df656f73a..dec0f416b2ec36b25df277712174b745216b17b3 100644
--- a/src/models/action.model.ts
+++ b/src/models/action.model.ts
@@ -1,4 +1,4 @@
-import { UserActionState } from 'enum/userAction.enum'
+import { UserActionState } from 'enums'
 import { DateTime } from 'luxon'
 import { Ecogesture } from 'models'
 
diff --git a/src/models/challenge.model.ts b/src/models/challenge.model.ts
index 1e9bee4e14a790b0f90a275222314cf638a7610e..0b02418fe3ddefe2a9e7035067416c4ef5275b7f 100644
--- a/src/models/challenge.model.ts
+++ b/src/models/challenge.model.ts
@@ -1,7 +1,4 @@
-import {
-  UserChallengeState,
-  UserChallengeSuccess,
-} from 'enum/userChallenge.enum'
+import { UserChallengeState, UserChallengeSuccess } from 'enums'
 import { DateTime } from 'luxon'
 import {
   Dataload,
diff --git a/src/models/chart.model.ts b/src/models/chart.model.ts
index 787ad686194256b15a72ba011142f1adc5893683..96fa843eb8d5fb4f190d2e46a740ea4315f866d1 100644
--- a/src/models/chart.model.ts
+++ b/src/models/chart.model.ts
@@ -1,4 +1,4 @@
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { Datachart } from 'models'
 
diff --git a/src/models/config.model.ts b/src/models/config.model.ts
index 121b79ed624ddec8625dde974c258685585d19d0..e81248d9ae8a3d52e938a8ce06277f214f9aadc3 100644
--- a/src/models/config.model.ts
+++ b/src/models/config.model.ts
@@ -1,4 +1,4 @@
-import { FluidSlugType } from 'enum/fluidSlug.enum'
+import { FluidSlugType } from 'enums'
 
 export interface KonnectorConfig {
   name: string
diff --git a/src/models/dataload.model.ts b/src/models/dataload.model.ts
index 3f7f73b015d7674971456e33d8026d27ed8c1c4d..e40d69dfea223a50afb617fd95af328dfe2181ee 100644
--- a/src/models/dataload.model.ts
+++ b/src/models/dataload.model.ts
@@ -1,4 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
+import { DataloadState } from 'enums'
 import { DateTime } from 'luxon'
 
 export interface DataloadValueDetail {
diff --git a/src/models/duel.model.ts b/src/models/duel.model.ts
index 83687f7191a3e0a35fbfca2ecae29302c09c0eb0..43628dbca34928f89018a84fd9627cc453f5e24c 100644
--- a/src/models/duel.model.ts
+++ b/src/models/duel.model.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+import { FluidType, UserDuelState } from 'enums'
 import { DateTime, Duration } from 'luxon'
 
 export interface DuelEntity {
diff --git a/src/models/ecogesture.model.ts b/src/models/ecogesture.model.ts
index 79f82d677d19d3dc5bb59a9af046f8c988b2aab2..d885795ce1c40b929c147f61ec196a1bdac7fc40 100644
--- a/src/models/ecogesture.model.ts
+++ b/src/models/ecogesture.model.ts
@@ -1,5 +1,4 @@
-import { EquipmentType, Room, Season, Usage } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { EquipmentType, FluidType, Room, Season, Usage } from 'enums'
 
 export interface Ecogesture {
   id: string
diff --git a/src/models/exploration.model.ts b/src/models/exploration.model.ts
index eccf99be8768779fca4eaff4b4f26a723323d0bc..792225668c73ad536d1729253a353ccb33b7a8c8 100644
--- a/src/models/exploration.model.ts
+++ b/src/models/exploration.model.ts
@@ -1,9 +1,5 @@
 /* eslint-disable camelcase */
-import { FluidType } from 'enum/fluid.enum'
-import {
-  UserExplorationState,
-  UserExplorationType,
-} from 'enum/userExploration.enum'
+import { FluidType, UserExplorationState, UserExplorationType } from 'enums'
 import { DateTime } from 'luxon'
 
 export interface ExplorationEntity {
diff --git a/src/models/fluid.model.ts b/src/models/fluid.model.ts
index 2994de62dc4b3ada6fcc0f347872a937964bba18..a99af34eb156a60a32ba5ba763421c78c326b0c9 100644
--- a/src/models/fluid.model.ts
+++ b/src/models/fluid.model.ts
@@ -1,4 +1,4 @@
-import { FluidState, FluidType } from 'enum/fluid.enum'
+import { FluidState, FluidType } from 'enums'
 import { DateTime } from 'luxon'
 import { Account, Konnector, KonnectorConfig, Trigger } from 'models'
 import { TriggerState } from './trigger.model'
diff --git a/src/models/fluidPrice.model.ts b/src/models/fluidPrice.model.ts
index 97bd6227989362beaa68bace880b53aef498d3af..c38feff398246475c8653a8d69bdbb69d41cd4b7 100644
--- a/src/models/fluidPrice.model.ts
+++ b/src/models/fluidPrice.model.ts
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 
 export interface FluidPrice {
   fluidType: FluidType
diff --git a/src/models/global.model.ts b/src/models/global.model.ts
index e7098fc38cd2ae2fcfc4329c7be6292f77812641..c9ca17dfda660933c7ebff88a14fbe4d6a513cc5 100644
--- a/src/models/global.model.ts
+++ b/src/models/global.model.ts
@@ -1,6 +1,4 @@
-import { Usage } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { ScreenType } from 'enum/screen.enum'
+import { FluidType, ScreenType, Usage } from 'enums'
 import { TermsStatus } from 'models'
 import { FluidStatus } from './fluid.model'
 import { PartnersInfo } from './partnersInfo.model'
diff --git a/src/models/index.ts b/src/models/index.ts
index 09b065bde0cefccc575de8795af3273f8519c7d9..99412717d6e8d8ea01c96ebeea6beb395ffc6cf5 100644
--- a/src/models/index.ts
+++ b/src/models/index.ts
@@ -7,8 +7,10 @@ export * from './config.model'
 export * from './customPopup.model'
 export * from './datachart.model'
 export * from './dataload.model'
+export * from './dju.model'
 export * from './duel.model'
 export * from './ecogesture.model'
+export * from './enedisMonthlyAnalysis'
 export * from './exploration.model'
 export * from './fluid.model'
 export * from './fluidPrice.model'
@@ -16,13 +18,18 @@ export * from './global.model'
 export * from './indicator.model'
 export * from './initialisationSteps.model'
 export * from './konnector.model'
+export * from './maxPower.model'
 export * from './modal.model'
+export * from './monthlyReport.model'
 export * from './partnersInfo.model'
 export * from './profile.model'
 export * from './profileEcogesture.model'
 export * from './profileType.model'
 export * from './quiz.model'
 export * from './relation.model'
+export * from './releaseNotes.model'
+export * from './schema.models'
+export * from './sgeStore.model'
 export * from './term.model'
 export * from './timePeriod.model'
 export * from './trigger.model'
diff --git a/src/models/modal.model.ts b/src/models/modal.model.ts
index 0dbb67b01b0ebc564477a51773902c2434199297..019051d00c75129a4462867115947247dea66030 100644
--- a/src/models/modal.model.ts
+++ b/src/models/modal.model.ts
@@ -1,4 +1,4 @@
-import { CustomPopup } from 'models/customPopup.model'
+import { CustomPopup } from 'models'
 
 export interface ModalState {
   customPopupModal: CustomPopup
diff --git a/src/models/profileEcogesture.model.ts b/src/models/profileEcogesture.model.ts
index 217f67a7030951283c9c80238898c1bcf8c6532e..9c1fdd8d788449aaaca55e9ccd13c33529c1b666 100644
--- a/src/models/profileEcogesture.model.ts
+++ b/src/models/profileEcogesture.model.ts
@@ -1,4 +1,4 @@
-import { ProfileEcogestureAnswerType } from 'enum/ecogestureForm.enum'
+import { ProfileEcogestureAnswerType } from 'enums'
 import { ProfileType } from './profileType.model'
 
 export type ProfileEcogesture = Pick<
diff --git a/src/models/profileType.model.ts b/src/models/profileType.model.ts
index e3184314d77fd3f5f2c1e9737c3e8a846458a1fa..0c62b3844b0dd64a4b4d3e7df4e273cf08590dff 100644
--- a/src/models/profileType.model.ts
+++ b/src/models/profileType.model.ts
@@ -1,8 +1,8 @@
-import { EquipmentType } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
 import {
   ConstructionYear,
+  EquipmentType,
   Floor,
+  FluidType,
   HotWaterEquipment,
   HotWaterFluid,
   HousingType,
@@ -12,7 +12,7 @@ import {
   ProfileTypeFormType,
   ThreeChoicesAnswer,
   WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
 import { DateTime } from 'luxon'
 
 export interface ProfileType {
diff --git a/src/models/quiz.model.ts b/src/models/quiz.model.ts
index a03221eb7381f73f201cd384710bac2ce7533eea..b691fbac9400b075ca8dd05110fa137c8752051a 100644
--- a/src/models/quiz.model.ts
+++ b/src/models/quiz.model.ts
@@ -1,9 +1,9 @@
-import { TimeStep } from 'enum/timeStep.enum'
 import {
   CustomQuestionType,
+  TimeStep,
   UserQuestionState,
   UserQuizState,
-} from 'enum/userQuiz.enum'
+} from 'enums'
 import { DateTime } from 'luxon'
 
 export interface Answer {
diff --git a/src/models/usageEvent.model.ts b/src/models/usageEvent.model.ts
index 210a849f116a5f8d4909dd2d4beed90f4571bbee..d0f04944e7c946023ecd5a823a7f7f676d17f371 100644
--- a/src/models/usageEvent.model.ts
+++ b/src/models/usageEvent.model.ts
@@ -1,4 +1,4 @@
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
 import { DateTime } from 'luxon'
 
 export interface AddEventParams {
diff --git a/src/services/action.service.spec.ts b/src/services/action.service.spec.ts
index 6eea6bfa56f7c29146325fa8e0746f3aaba3358a..48f0c210f6762b043664ef3fbf114f0affcd392b 100644
--- a/src/services/action.service.spec.ts
+++ b/src/services/action.service.spec.ts
@@ -1,5 +1,4 @@
-import { Season } from 'enum/ecogesture.enum'
-import { UserActionState } from 'enum/userAction.enum'
+import { Season, UserActionState } from 'enums'
 import { DateTime } from 'luxon'
 import { Ecogesture, UserAction } from 'models'
 import * as utils from 'utils/utils'
diff --git a/src/services/action.service.ts b/src/services/action.service.ts
index 9441daf6380dc0fd4e4ef766f472a0df476e8f9e..67a1c41db15255d161c77fcd656278f5fd4b5d56 100644
--- a/src/services/action.service.ts
+++ b/src/services/action.service.ts
@@ -1,8 +1,10 @@
 import { Client } from 'cozy-client'
-import { Season } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { UserActionState } from 'enum/userAction.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import {
+  FluidType,
+  Season,
+  UserActionState,
+  UserChallengeUpdateFlag,
+} from 'enums'
 import { orderBy } from 'lodash'
 import { DateTime } from 'luxon'
 import { Ecogesture, UserAction, UserChallenge } from 'models'
diff --git a/src/services/challenge.service.spec.ts b/src/services/challenge.service.spec.ts
index b05f55465cffc743227c81ea9e673f3e68cd5a0f..287719e29dd922450418be39eddef4518597ce5c 100644
--- a/src/services/challenge.service.spec.ts
+++ b/src/services/challenge.service.spec.ts
@@ -1,13 +1,13 @@
 /* eslint-disable camelcase */
 import { QueryResult } from 'cozy-client'
-import { DataloadState } from 'enum/dataload.enum'
-import { UserActionState } from 'enum/userAction.enum'
 import {
+  DataloadState,
+  UserActionState,
   UserChallengeState,
   UserChallengeSuccess,
   UserChallengeUpdateFlag,
-} from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+  UserDuelState,
+} from 'enums'
 import { cloneDeep } from 'lodash'
 import { DateTime, Duration } from 'luxon'
 import {
diff --git a/src/services/challenge.service.ts b/src/services/challenge.service.ts
index 4373e8a88f0c2109e75bd2d93ad2ba4ca4f871f9..e625f41799d07da72ae12f92447607ad399bdaa9 100644
--- a/src/services/challenge.service.ts
+++ b/src/services/challenge.service.ts
@@ -2,16 +2,17 @@ import * as Sentry from '@sentry/react'
 import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
 import logger from 'cozy-logger'
 import { CHALLENGE_DOCTYPE, USERCHALLENGE_DOCTYPE } from 'doctypes'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { UserActionState } from 'enum/userAction.enum'
 import {
+  FluidState,
+  FluidType,
+  TimeStep,
+  UserActionState,
   UserChallengeState,
   UserChallengeSuccess,
   UserChallengeUpdateFlag,
-} from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
-import { UserExplorationState } from 'enum/userExploration.enum'
+  UserDuelState,
+  UserExplorationState,
+} from 'enums'
 import { DateTime } from 'luxon'
 import {
   ChallengeEntity,
diff --git a/src/services/connection.service.ts b/src/services/connection.service.ts
index af9ccea3b23784d69a74183927209a31a17d8596..500955376ca4980422bbbf4248071349f5ddefbe 100644
--- a/src/services/connection.service.ts
+++ b/src/services/connection.service.ts
@@ -6,9 +6,9 @@ import {
   AccountAuthData,
   AccountSgeData,
   Konnector,
+  SgeStore,
   Trigger,
 } from 'models'
-import { SgeStore } from 'models/sgeStore.model'
 import AccountService from 'services/account.service'
 import KonnectorService from 'services/konnector.service'
 import TriggerService from 'services/triggers.service'
diff --git a/src/services/consumption.service.spec.ts b/src/services/consumption.service.spec.ts
index b848e4c06ea52f1be608af23042543bfff83ea44..3e2c3019a203c0f3dd3b388592b42081975e7390 100644
--- a/src/services/consumption.service.spec.ts
+++ b/src/services/consumption.service.spec.ts
@@ -1,8 +1,6 @@
 import { QueryResult } from 'cozy-client'
 import { ENEDIS_MINUTE_DOCTYPE } from 'doctypes'
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadState, FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import {
   Datachart,
diff --git a/src/services/consumption.service.ts b/src/services/consumption.service.ts
index 7fce6981f526172c8d54cb4111e84aace3b8da42..dc8f51833e5939e4c92b66243e0c27607833f293 100644
--- a/src/services/consumption.service.ts
+++ b/src/services/consumption.service.ts
@@ -1,20 +1,18 @@
 import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
 import { Doctype } from 'cozy-client/types/types'
 import { ENEDIS_MINUTE_DOCTYPE } from 'doctypes'
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadState, FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import {
   Datachart,
   Dataload,
   DataloadEntity,
   DataloadValueDetail,
+  EnedisMonthlyAnalysisData,
   FluidStatus,
   PerformanceIndicator,
   TimePeriod,
 } from 'models'
-import { EnedisMonthlyAnalysisData } from 'models/enedisMonthlyAnalysis'
 import ConsumptionFormatterService from 'services/consumptionFormatter.service'
 import ConsumptionValidatorService from 'services/consumptionValidator.service'
 import ConverterService from 'services/converter.service'
diff --git a/src/services/consumptionFormatter.service.spec.ts b/src/services/consumptionFormatter.service.spec.ts
index 1b6e2c2b9d7d31d288524351448127e476847e41..7b1a5db7fb73180746a9af4a7db4d2a1a2dcb7f9 100644
--- a/src/services/consumptionFormatter.service.spec.ts
+++ b/src/services/consumptionFormatter.service.spec.ts
@@ -1,6 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadState, FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { Dataload, FluidStatus, TimePeriod } from 'models'
 import { fluidStatusConnectedData } from '../../tests/__mocks__/fluidStatusData.mock'
diff --git a/src/services/consumptionFormatter.service.ts b/src/services/consumptionFormatter.service.ts
index 36c32a784e0f51da74ccb45ed2279132b19a8b54..cc05206889191b517bd1936f52ad0cffb046420e 100644
--- a/src/services/consumptionFormatter.service.ts
+++ b/src/services/consumptionFormatter.service.ts
@@ -1,6 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadState, FluidType, TimeStep } from 'enums'
 import { DateTime, Interval } from 'luxon'
 import { Dataload, FluidStatus, TimePeriod } from 'models'
 import DateChartService from 'services/dateChart.service'
diff --git a/src/services/consumptionValidator.service.spec.ts b/src/services/consumptionValidator.service.spec.ts
index dbb3be7527d383363280d27190c6d43381024adb..e18a4f5b4b38e751b8da707db9ee4fd66050aff2 100644
--- a/src/services/consumptionValidator.service.spec.ts
+++ b/src/services/consumptionValidator.service.spec.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { TimePeriod } from 'models'
 import ConsumptionValidatorService from './consumptionValidator.service'
diff --git a/src/services/consumptionValidator.service.ts b/src/services/consumptionValidator.service.ts
index 7f3901487ce2cf808b519cfbc7e1ee27f4abbfcd..c120459d8a7a477720bfb8083595a43b29aa32ce 100644
--- a/src/services/consumptionValidator.service.ts
+++ b/src/services/consumptionValidator.service.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { Interval } from 'luxon'
 import { TimePeriod } from 'models'
 
diff --git a/src/services/converter.service.spec.ts b/src/services/converter.service.spec.ts
index da324b069e93fa3e6f9f8f808ef20f8d2a9accca..85868150ad91496b08e9f260e0e915abd2e52b6b 100644
--- a/src/services/converter.service.spec.ts
+++ b/src/services/converter.service.spec.ts
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import ConverterService from './converter.service'
 import ConfigService from './fluidConfig.service'
 
diff --git a/src/services/converter.service.ts b/src/services/converter.service.ts
index c7e45fa5614413d11490d5c422f217d4fb143f92..2b3d0b018e615e07068f020a41e161931c506743 100644
--- a/src/services/converter.service.ts
+++ b/src/services/converter.service.ts
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { FluidConfig } from 'models'
 import ConfigService from './fluidConfig.service'
 
diff --git a/src/services/customPopup.service.ts b/src/services/customPopup.service.ts
index 32f87726eee3350a2bf1f302737ccfa50fe0f62f..0237970e67b10a791d845b6f135b53c87ee7f34c 100644
--- a/src/services/customPopup.service.ts
+++ b/src/services/customPopup.service.ts
@@ -4,8 +4,8 @@ import logger from 'cozy-logger'
 import {
   REMOTE_ORG_ECOLYO_AGENT_CUSTOM_POPUP,
   REMOTE_ORG_ECOLYO_AGENT_CUSTOM_POPUP_REC,
-} from 'doctypes/remote/org.ecolyo.agent.custom.popup'
-import { CustomPopup } from 'models/customPopup.model'
+} from 'doctypes'
+import { CustomPopup } from 'models'
 import logApp from 'utils/logger'
 import EnvironmentService from './environment.service'
 
diff --git a/src/services/dateChart.service.spec.ts b/src/services/dateChart.service.spec.ts
index 393f02a1241719c32c1bedcd63935072d894a95c..c261baf9ef0a774fef5158a03a58fff5e079101c 100644
--- a/src/services/dateChart.service.spec.ts
+++ b/src/services/dateChart.service.spec.ts
@@ -1,4 +1,4 @@
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { TimePeriod } from 'models'
 import DateChartService from './dateChart.service'
diff --git a/src/services/dateChart.service.ts b/src/services/dateChart.service.ts
index 199666c05ec86bd1b857ea55c932ef98c5c0bb29..550252fa28d5b5ff031982636a70f8142ed14893 100644
--- a/src/services/dateChart.service.ts
+++ b/src/services/dateChart.service.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { DateTime, Interval } from 'luxon'
 import { FluidConfig, TimePeriod } from 'models'
 import ConfigService from './fluidConfig.service'
diff --git a/src/services/duel.service.spec.ts b/src/services/duel.service.spec.ts
index 0a6260c98d10ca2c021a859c66f46a91631764da..3b40046d742acb0b85da884890bb166678493207 100644
--- a/src/services/duel.service.spec.ts
+++ b/src/services/duel.service.spec.ts
@@ -1,6 +1,5 @@
 import { QueryResult } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+import { FluidType, UserDuelState } from 'enums'
 import { DateTime, Duration } from 'luxon'
 import { DuelEntity, UserDuel } from 'models'
 import DuelService from 'services/duel.service'
diff --git a/src/services/duel.service.ts b/src/services/duel.service.ts
index d3f010ac5a611afb6e8268d1948641bee945e14b..204e9e708618d96591d8df649e987b0b5e24016c 100644
--- a/src/services/duel.service.ts
+++ b/src/services/duel.service.ts
@@ -1,10 +1,8 @@
 import * as Sentry from '@sentry/react'
 import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
 import logger from 'cozy-logger'
-import { DUEL_DOCTYPE } from 'doctypes/com-grandlyon-ecolyo-duel'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+import { DUEL_DOCTYPE } from 'doctypes'
+import { FluidState, FluidType, TimeStep, UserDuelState } from 'enums'
 import { DateTime, Duration } from 'luxon'
 import {
   Datachart,
diff --git a/src/services/ecogesture.service.spec.ts b/src/services/ecogesture.service.spec.ts
index 6e9ebd93f17f1d72c99f4819b3739a9bb68a17d5..30cd5ee552fbd5c4842a93eebe223a2ebd2bbeaf 100644
--- a/src/services/ecogesture.service.spec.ts
+++ b/src/services/ecogesture.service.spec.ts
@@ -1,7 +1,6 @@
 import { QueryResult } from 'cozy-client'
 import ecogestureData from 'db/ecogestureData.json'
-import { EquipmentType } from 'enum/ecogesture.enum'
-import { IndividualOrCollective, WarmingType } from 'enum/profileType.enum'
+import { EquipmentType, IndividualOrCollective, WarmingType } from 'enums'
 import { Ecogesture } from 'models'
 import { ProfileEcogesture } from 'models/profileEcogesture.model'
 import { hashFile } from 'utils/hash'
diff --git a/src/services/ecogesture.service.ts b/src/services/ecogesture.service.ts
index 0420aa5094fe95e39671618f3433766c7a17b709..402795d9e225584c0a9e1c9669e207093b939bdd 100644
--- a/src/services/ecogesture.service.ts
+++ b/src/services/ecogesture.service.ts
@@ -3,12 +3,15 @@ import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
 import logger from 'cozy-logger'
 import ecogestureData from 'db/ecogestureData.json'
 import { ECOGESTURE_DOCTYPE } from 'doctypes'
-import { Season, Usage } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { IndividualOrCollective, WarmingType } from 'enum/profileType.enum'
+import {
+  FluidType,
+  IndividualOrCollective,
+  Season,
+  Usage,
+  WarmingType,
+} from 'enums'
 import { orderBy } from 'lodash'
-import { Ecogesture } from 'models'
-import { ProfileEcogesture } from 'models/profileEcogesture.model'
+import { Ecogesture, ProfileEcogesture } from 'models'
 import { logDuration } from 'utils/duration'
 import { hashFile } from 'utils/hash'
 import logApp from 'utils/logger'
diff --git a/src/services/enedisMonthlyAnalysisData.service.ts b/src/services/enedisMonthlyAnalysisData.service.ts
index 0eff9590f3fb55bb6819be5b1e2624a3aa36e0e6..7d893b96e15a3ace3d37548dc43bebb91b23977f 100644
--- a/src/services/enedisMonthlyAnalysisData.service.ts
+++ b/src/services/enedisMonthlyAnalysisData.service.ts
@@ -5,14 +5,13 @@ import {
   ENEDIS_MAXPOWER_DOCTYPE,
   ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE,
 } from 'doctypes'
-import { DataloadState } from 'enum/dataload.enum'
+import { DataloadState } from 'enums'
 import { DateTime } from 'luxon'
-import { Dataload } from 'models'
+import { Dataload, MaxPowerEntity } from 'models'
 import {
   AggregatedEnedisMonthlyDataloads,
   EnedisMonthlyAnalysisData,
 } from 'models/enedisMonthlyAnalysis'
-import { MaxPowerEntity } from 'models/maxPower.model'
 import logApp from 'utils/logger'
 
 const logStack = logger.namespace('enedisMonthlyAnalysisDataService')
diff --git a/src/services/exploration.service.spec.ts b/src/services/exploration.service.spec.ts
index d6d1b092aa5e52e98f304c7a279a84eac882b547..f6c84e02eaf7b26b429b24823c0f1dd313619727 100644
--- a/src/services/exploration.service.spec.ts
+++ b/src/services/exploration.service.spec.ts
@@ -1,5 +1,5 @@
 import { QueryResult } from 'cozy-client'
-import { UserExplorationState } from 'enum/userExploration.enum'
+import { UserExplorationState } from 'enums'
 import { ExplorationEntity, UserChallenge, UserExploration } from 'models'
 import mockClient from '../../tests/__mocks__/client'
 import {
diff --git a/src/services/exploration.service.ts b/src/services/exploration.service.ts
index 8a4db83a644ba04a881fe6fe91a7d6bc66e5dddb..8e104793803c97318da145d6b3e29e6771c05880 100644
--- a/src/services/exploration.service.ts
+++ b/src/services/exploration.service.ts
@@ -1,11 +1,11 @@
 import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
 import { EXPLORATION_DOCTYPE } from 'doctypes'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
 import {
+  UserChallengeUpdateFlag,
   UserExplorationID,
   UserExplorationState,
   UserExplorationType,
-} from 'enum/userExploration.enum'
+} from 'enums'
 import { DateTime } from 'luxon'
 import { ExplorationEntity, UserChallenge, UserExploration } from 'models'
 import ChallengeService from './challenge.service'
diff --git a/src/services/fluid.service.spec.ts b/src/services/fluid.service.spec.ts
index 53fe0add5056faf5b87e9eb36e8afbce5d40bf2b..e5e3694f204b7b94b63f69662054bd218a238f4c 100644
--- a/src/services/fluid.service.spec.ts
+++ b/src/services/fluid.service.spec.ts
@@ -1,13 +1,12 @@
 /* eslint-disable camelcase */
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
+import { FluidSlugType, FluidState, FluidType } from 'enums'
 import { DateTime } from 'luxon'
 import { FluidStatus } from 'models'
 import { accountsData } from '../../tests/__mocks__/accountsData.mock'
 import mockClient from '../../tests/__mocks__/client'
 import { konnectorsData } from '../../tests/__mocks__/konnectorsData.mock'
-import { triggersData } from '../../tests/__mocks__/triggersData.mock'
 import { triggerStateData } from '../../tests/__mocks__/triggerStateData.mock'
+import { triggersData } from '../../tests/__mocks__/triggersData.mock'
 import FluidService from './fluid.service'
 
 const mockGetAccountByType = jest.fn()
diff --git a/src/services/fluid.service.ts b/src/services/fluid.service.ts
index 3de8f5c45b2851602969df86e00dca3571419be4..e6f3443de9111eab060f7806c8452b14ea4998d2 100644
--- a/src/services/fluid.service.ts
+++ b/src/services/fluid.service.ts
@@ -1,8 +1,14 @@
 import { Client } from 'cozy-client'
-import { FluidState, FluidType } from 'enum/fluid.enum'
+import { FluidState, FluidType } from 'enums'
 import { DateTime } from 'luxon'
-import { Account, FluidStatus, Konnector, Trigger, TriggerState } from 'models'
-import { PartnersInfo } from 'models/partnersInfo.model'
+import {
+  Account,
+  FluidStatus,
+  Konnector,
+  PartnersInfo,
+  Trigger,
+  TriggerState,
+} from 'models'
 import AccountService from 'services/account.service'
 import ConsumptionService from 'services/consumption.service'
 import ConfigService from 'services/fluidConfig.service'
diff --git a/src/services/fluidsPrices.service.spec.ts b/src/services/fluidsPrices.service.spec.ts
index f83929e3bd6e2636351cb916845d7734d5ba316d..0e2a551a32f6e168238dae1649f09429d5148e08 100644
--- a/src/services/fluidsPrices.service.spec.ts
+++ b/src/services/fluidsPrices.service.spec.ts
@@ -1,5 +1,5 @@
 import { QueryResult } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { DateTime } from 'luxon'
 import { FluidPrice } from 'models'
 import mockClient from '../../tests/__mocks__/client'
diff --git a/src/services/fluidsPrices.service.ts b/src/services/fluidsPrices.service.ts
index 7ea8c8fb3e3e072a5d7e5ae21de0a2c5ca4f47c9..64ad119f7108b47e4d6822ba72b395b25051729f 100644
--- a/src/services/fluidsPrices.service.ts
+++ b/src/services/fluidsPrices.service.ts
@@ -2,7 +2,7 @@ import * as Sentry from '@sentry/react'
 import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
 import logger from 'cozy-logger'
 import { FLUIDSPRICES_DOCTYPE } from 'doctypes'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { DateTime } from 'luxon'
 import { FluidPrice } from 'models'
 import logApp from 'utils/logger'
diff --git a/src/services/initialization.service.spec.ts b/src/services/initialization.service.spec.ts
index 39cf264a0d0a78324dc01becd19a70262b40c5e4..b8a43812700f8a7c6014351d9b7c355d09592bc9 100644
--- a/src/services/initialization.service.spec.ts
+++ b/src/services/initialization.service.spec.ts
@@ -3,7 +3,7 @@ import challengeEntityData from 'db/challengeEntity.json'
 import duelEntityData from 'db/duelEntity.json'
 import explorationEntityData from 'db/explorationEntity.json'
 import quizEntityData from 'db/quizEntity.json'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import { DateTime } from 'luxon'
 import { Profile, UserChallenge } from 'models'
 import { getActualAnalysisDate } from 'utils/date'
diff --git a/src/services/initialization.service.ts b/src/services/initialization.service.ts
index 56b3b9fc63ed91580768ce9ee827b6220868301c..a209b48de64b24fab7a231abadda791ca381c3c4 100644
--- a/src/services/initialization.service.ts
+++ b/src/services/initialization.service.ts
@@ -12,12 +12,10 @@ import {
   EXPLORATION_DOCTYPE,
   PROFILE_DOCTYPE,
   QUIZ_DOCTYPE,
-} from 'doctypes'
-import {
   REMOTE_ORG_ECOLYO_AGENT_PRICES,
   REMOTE_ORG_ECOLYO_AGENT_PRICES_REC,
-} from 'doctypes/remote/org.ecolyo.agent.prices'
-import { FluidType } from 'enum/fluid.enum'
+} from 'doctypes'
+import { FluidType } from 'enums'
 import { DateTime } from 'luxon'
 import { initSchemaDoctype } from 'migrations/migration'
 import { migrations } from 'migrations/migration.data'
@@ -25,13 +23,14 @@ import {
   Dataload,
   FluidPrice,
   FluidStatus,
+  InitSteps,
+  InitStepsErrors,
   Profile,
+  ProfileEcogesture,
   ProfileType,
   TermsStatus,
   UserChallenge,
 } from 'models'
-import { InitSteps, InitStepsErrors } from 'models/initialisationSteps.model'
-import { ProfileEcogesture } from 'models/profileEcogesture.model'
 import React from 'react'
 import ChallengeService from 'services/challenge.service'
 import DuelService from 'services/duel.service'
diff --git a/src/services/konnectorStatus.service.ts b/src/services/konnectorStatus.service.ts
index 10addfe4a80f4664f740cfe8e5aa282f63fbe3d6..46395d3e18e7b06996f23d36a44d646ffafc0762 100644
--- a/src/services/konnectorStatus.service.ts
+++ b/src/services/konnectorStatus.service.ts
@@ -1,5 +1,5 @@
 import { Client } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import AccountService from 'services/account.service'
 import ConfigService from 'services/fluidConfig.service'
 
diff --git a/src/services/partnersInfo.service.ts b/src/services/partnersInfo.service.ts
index 26d814d8f82a0ecab9df128624bb846c6a5e5b3d..6a39656d9bb695b99412cc69d1094b0901e364eb 100644
--- a/src/services/partnersInfo.service.ts
+++ b/src/services/partnersInfo.service.ts
@@ -4,8 +4,8 @@ import logger from 'cozy-logger'
 import {
   REMOTE_ORG_ECOLYO_AGENT_PARTNERS_INFO,
   REMOTE_ORG_ECOLYO_AGENT_PARTNERS_INFO_REC,
-} from 'doctypes/remote/org.ecolyo.agent.partners.info'
-import { PartnersInfo } from 'models/partnersInfo.model'
+} from 'doctypes'
+import { PartnersInfo } from 'models'
 import logApp from 'utils/logger'
 import EnvironmentService from './environment.service'
 
diff --git a/src/services/profileEcogesture.service.spec.ts b/src/services/profileEcogesture.service.spec.ts
index 5a6e2ee6037697cc373d593ed1f30549ddfff174..79974fbc44a2e0cb56de5f9dd5d151274549421e 100644
--- a/src/services/profileEcogesture.service.spec.ts
+++ b/src/services/profileEcogesture.service.spec.ts
@@ -1,5 +1,5 @@
 import { QueryResult } from 'cozy-client'
-import { EquipmentType } from 'enum/ecogesture.enum'
+import { EquipmentType } from 'enums'
 import { ProfileEcogesture } from 'models/profileEcogesture.model'
 import mockClient from '../../tests/__mocks__/client'
 import { mockProfileEcogestureUpdated } from '../../tests/__mocks__/profileEcogesture.mock'
diff --git a/src/services/profileEcogesture.service.ts b/src/services/profileEcogesture.service.ts
index d38c43f890206a452748f08727539dcef79de78d..d5a714a47c569da4572a0de206626f01831b8ef2 100644
--- a/src/services/profileEcogesture.service.ts
+++ b/src/services/profileEcogesture.service.ts
@@ -1,6 +1,6 @@
 import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
 import { PROFILEECOGESTURE_DOCTYPE } from 'doctypes'
-import { ProfileEcogesture } from 'models/profileEcogesture.model'
+import { ProfileEcogesture } from 'models'
 
 export default class ProfileEcogestureService {
   private readonly _client: Client
diff --git a/src/services/profileEcogestureForm.service.ts b/src/services/profileEcogestureForm.service.ts
index 0e3aae75a43dc394e026ad91c5bc0b2edc12129a..824e6eeef0b3b043ac23956756cd55c2a7342947 100644
--- a/src/services/profileEcogestureForm.service.ts
+++ b/src/services/profileEcogestureForm.service.ts
@@ -1,14 +1,15 @@
-import { EquipmentType } from 'enum/ecogesture.enum'
 import {
   EcogestureStepForm,
+  EquipmentType,
+  IndividualOrCollective,
   ProfileEcogestureAnswerType,
-} from 'enum/ecogestureForm.enum'
-import { IndividualOrCollective, WarmingType } from 'enum/profileType.enum'
+  WarmingType,
+} from 'enums'
 import {
   ProfileEcogesture,
   ProfileEcogestureAnswer,
   ProfileEcogestureValues,
-} from 'models/profileEcogesture.model'
+} from 'models'
 
 export default class ProfileEcogestureFormService {
   private readonly profileEcogesture: ProfileEcogesture
diff --git a/src/services/profileType.service.spec.ts b/src/services/profileType.service.spec.ts
index 0d58b4f0a1a177ee0bbbd6ef1ff48aba844cdef2..42993963cfc34ad18f2efe55d2c19f1f175d9d71 100644
--- a/src/services/profileType.service.spec.ts
+++ b/src/services/profileType.service.spec.ts
@@ -7,7 +7,7 @@ import {
   ProfileTypeStepForm,
   ThreeChoicesAnswer,
   WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
 import { DateTime } from 'luxon'
 import { ProfileType } from 'models/profileType.model'
 import mockClient from '../../tests/__mocks__/client'
diff --git a/src/services/profileType.service.ts b/src/services/profileType.service.ts
index 2255192a8c05659608928105a284886e8dd118a7..a5a2900fc38d729b9f8d03391df76f099ad79412 100644
--- a/src/services/profileType.service.ts
+++ b/src/services/profileType.service.ts
@@ -6,26 +6,26 @@ import elecSpeData from 'constants/consumptionConstants/electricSpecific.json'
 import heatingData from 'constants/consumptionConstants/heating.json'
 import { Client } from 'cozy-client'
 import logger from 'cozy-logger'
-import { REMOTE_ORG_ECOLYO_DJU } from 'doctypes/remote/org.ecolyo.dju'
-import { FluidType } from 'enum/fluid.enum'
+import { REMOTE_ORG_ECOLYO_DJU } from 'doctypes'
 import {
   ConstructionYear,
   Floor,
+  FluidType,
   HotWaterEquipment,
   HousingType,
   IndividualInsulationWork,
   IndividualOrCollective,
   OutsideFacingWalls,
   ThreeChoicesAnswer,
-} from 'enum/profileType.enum'
+} from 'enums'
 import { DateTime } from 'luxon'
-import { DjuResult } from 'models/dju.model'
 import {
   DetailsMonthlyForecast,
+  DjuResult,
   FluidForecast,
   MonthlyForecast,
   ProfileType,
-} from 'models/profileType.model'
+} from 'models'
 import logApp from 'utils/logger'
 import ConverterService from './converter.service'
 
diff --git a/src/services/profileTypeForm.service.ts b/src/services/profileTypeForm.service.ts
index 14e2bcd30ffeac698edfb303a551b2023e181f0b..b9d990f3b2cb759a234eb3d4d4fe2097953db501 100644
--- a/src/services/profileTypeForm.service.ts
+++ b/src/services/profileTypeForm.service.ts
@@ -1,8 +1,8 @@
-import { EquipmentType } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
 import {
   ConstructionYear,
+  EquipmentType,
   Floor,
+  FluidType,
   HotWaterEquipment,
   HotWaterFluid,
   HousingType,
@@ -13,7 +13,7 @@ import {
   ProfileTypeStepForm,
   ThreeChoicesAnswer,
   WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
 import { ProfileType, ProfileTypeAnswer } from 'models'
 
 export default class ProfileTypeFormService {
diff --git a/src/services/queryRunner.service.spec.ts b/src/services/queryRunner.service.spec.ts
index e820301be69aaf41cd3fadc60cf44df47dc2a2f9..79bde6490903cce77020f228612f5116fb4f9f03 100644
--- a/src/services/queryRunner.service.spec.ts
+++ b/src/services/queryRunner.service.spec.ts
@@ -1,7 +1,5 @@
 import { QueryResult } from 'cozy-client'
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadState, FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { Dataload, DataloadEntity } from 'models'
 import mockClient from '../../tests/__mocks__/client'
diff --git a/src/services/queryRunner.service.ts b/src/services/queryRunner.service.ts
index dffb788de165216d9d5890ef1e6a3f7c239e5c93..3fffee26dfc4292c518396f10702e59f9fa63443 100644
--- a/src/services/queryRunner.service.ts
+++ b/src/services/queryRunner.service.ts
@@ -11,9 +11,7 @@ import {
   GRDF_MONTH_DOCTYPE,
   GRDF_YEAR_DOCTYPE,
 } from 'doctypes'
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadState, FluidType, TimeStep } from 'enums'
 import { DateTime, Interval } from 'luxon'
 import { Dataload, TimePeriod } from 'models'
 import logApp from 'utils/logger'
diff --git a/src/services/quiz.service.spec.ts b/src/services/quiz.service.spec.ts
index 12462ae479373d9899a760e6ee3781f3ecdaea48..d9673eb4b123808768e903d6099414f115edef45 100644
--- a/src/services/quiz.service.spec.ts
+++ b/src/services/quiz.service.spec.ts
@@ -1,11 +1,11 @@
 import { QueryResult } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
 import {
   CustomQuestionType,
+  FluidType,
+  TimeStep,
   UserQuestionState,
   UserQuizState,
-} from 'enum/userQuiz.enum'
+} from 'enums'
 import { DateTime } from 'luxon'
 import {
   CustomQuestionEntity,
@@ -22,14 +22,14 @@ import {
 } from '../../tests/__mocks__/chartData.mock'
 import mockClient from '../../tests/__mocks__/client'
 import {
+  UserQuizDone,
+  UserQuizReseted,
+  UserQuizStarted,
   allQuizEntities,
   customQuestionEntity,
   quizDefault,
   quizEntity,
   userQuiz,
-  UserQuizDone,
-  UserQuizReseted,
-  UserQuizStarted,
 } from '../../tests/__mocks__/quizData.mock'
 import QuizService from './quiz.service'
 
diff --git a/src/services/quiz.service.ts b/src/services/quiz.service.ts
index c553c7f7d53869a308a38bd0af9af923eb7b266c..34a71fc059ef3f09c9b212213b6513cb517520e0 100644
--- a/src/services/quiz.service.ts
+++ b/src/services/quiz.service.ts
@@ -1,12 +1,12 @@
 import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
 import { QUIZ_DOCTYPE } from 'doctypes'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
 import {
   CustomQuestionType,
+  FluidType,
+  TimeStep,
   UserQuestionState,
   UserQuizState,
-} from 'enum/userQuiz.enum'
+} from 'enums'
 import { shuffle } from 'lodash'
 import { DateTime } from 'luxon'
 import {
diff --git a/src/services/timePeriod.service.spec.ts b/src/services/timePeriod.service.spec.ts
index 58830ee8c6192b513333f8ab1bb1b4be91b6821b..fe57abc9791ed4e47409b95a59247ffcdb0c43a4 100644
--- a/src/services/timePeriod.service.spec.ts
+++ b/src/services/timePeriod.service.spec.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { TimePeriod } from 'models'
 import TimePeriodService from './timePeriod.service'
diff --git a/src/services/timePeriod.service.ts b/src/services/timePeriod.service.ts
index 655f8b7538644022c0b213c692545ebe65583cd4..46804b2e55b687df5c0352d75c20e87dc7655979 100644
--- a/src/services/timePeriod.service.ts
+++ b/src/services/timePeriod.service.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { TimePeriod } from 'models'
 import ConfigService from 'services/fluidConfig.service'
diff --git a/src/services/usageEvent.service.spec.ts b/src/services/usageEvent.service.spec.ts
index 5fcc3a4cca66ce4650372b9475779ec0a8373b4c..3296cd2e5170dd75b0c2759a68c6124c4f08eda4 100644
--- a/src/services/usageEvent.service.spec.ts
+++ b/src/services/usageEvent.service.spec.ts
@@ -1,5 +1,5 @@
 import { QueryResult } from 'cozy-client'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
 import { DateTime } from 'luxon'
 import { AddEventParams, UsageEventEntity } from 'models'
 import mockClient from '../../tests/__mocks__/client'
diff --git a/src/services/usageEvent.service.ts b/src/services/usageEvent.service.ts
index 33fb71ea2b15ace740910d1d21852b30ad64f971..32f5c96ca1910c493df6771bd5c8cdceb36e3f58 100644
--- a/src/services/usageEvent.service.ts
+++ b/src/services/usageEvent.service.ts
@@ -8,7 +8,7 @@ import {
 } from 'cozy-client'
 import logger from 'cozy-logger'
 import { USAGEEVENT_DOCTYPE } from 'doctypes'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
 import { DateTime } from 'luxon'
 import {
   AddEventParams,
diff --git a/src/store/challenge/challenge.slice.spec.ts b/src/store/challenge/challenge.slice.spec.ts
index 8f544d473cba8c645aa24f29e1c6be9d72da73f6..fe8d9a1ea76fa6500485d2964d76515ae249ead7 100644
--- a/src/store/challenge/challenge.slice.spec.ts
+++ b/src/store/challenge/challenge.slice.spec.ts
@@ -1,5 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
-import { UserChallengeState } from 'enum/userChallenge.enum'
+import { DataloadState, UserChallengeState } from 'enums'
 import { DateTime } from 'luxon'
 import { ChallengeState, Dataload, UserChallenge } from 'models'
 import { mockChallengeState } from '../../../tests/__mocks__/store'
diff --git a/src/store/challenge/challenge.slice.ts b/src/store/challenge/challenge.slice.ts
index 3699373ef4200539e63317137dd068a1adf2acdd..9f37d4f90f5b29bcc64635c1558ce4ffc661df81 100644
--- a/src/store/challenge/challenge.slice.ts
+++ b/src/store/challenge/challenge.slice.ts
@@ -1,5 +1,5 @@
 import { PayloadAction, createSlice } from '@reduxjs/toolkit'
-import { UserChallengeState } from 'enum/userChallenge.enum'
+import { UserChallengeState } from 'enums'
 import { ChallengeState, Dataload, UserChallenge } from 'models'
 
 const initialState: ChallengeState = {
diff --git a/src/store/chart/chart.slice.spec.ts b/src/store/chart/chart.slice.spec.ts
index 48dfa4e9a838077d4770e6afedb5874443a3f66b..3bade62d16b0452481158badd1558e359ca42edc 100644
--- a/src/store/chart/chart.slice.spec.ts
+++ b/src/store/chart/chart.slice.spec.ts
@@ -1,4 +1,4 @@
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { graphData } from '../../../tests/__mocks__/chartData.mock'
 import { mockChartState } from '../../../tests/__mocks__/store'
diff --git a/src/store/chart/chart.slice.ts b/src/store/chart/chart.slice.ts
index d724d93d06df31708ca5538be3cfb07b22d7d770..f5ea8a86f86004df0ef552754d4c617c3fe90b13 100644
--- a/src/store/chart/chart.slice.ts
+++ b/src/store/chart/chart.slice.ts
@@ -1,5 +1,5 @@
 import { PayloadAction, createSlice } from '@reduxjs/toolkit'
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { ChartState, Datachart } from 'models'
 
diff --git a/src/store/global/global.slice.spec.ts b/src/store/global/global.slice.spec.ts
index d4a46788e0a652e666fbdd9f0e3596d25b2441d3..0d83f40b31762e2f49d52d1448c91eeec0528670 100644
--- a/src/store/global/global.slice.spec.ts
+++ b/src/store/global/global.slice.spec.ts
@@ -1,8 +1,5 @@
 /* eslint-disable camelcase */
-import { Usage } from 'enum/ecogesture.enum'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
-import { ScreenType } from 'enum/screen.enum'
+import { FluidSlugType, FluidState, FluidType, ScreenType, Usage } from 'enums'
 import { DateTime } from 'luxon'
 import { FluidStatus, PartnersInfo, TermsStatus } from 'models'
 import { SgeStore } from 'models/sgeStore.model'
diff --git a/src/store/global/global.slice.ts b/src/store/global/global.slice.ts
index 8e12aa8d128bbeaaaa9763622eb714ef102814c5..65c387677ad65c806592af6a85480b848e82984a 100644
--- a/src/store/global/global.slice.ts
+++ b/src/store/global/global.slice.ts
@@ -1,17 +1,14 @@
 import { PayloadAction, createSlice } from '@reduxjs/toolkit'
-import { Usage } from 'enum/ecogesture.enum'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
-import { ScreenType } from 'enum/screen.enum'
+import { FluidSlugType, FluidState, FluidType, ScreenType, Usage } from 'enums'
 import {
   FluidConnection,
   FluidStatus,
   GlobalState,
+  Notes,
   PartnersInfo,
+  SgeStore,
   TermsStatus,
 } from 'models'
-import { Notes } from 'models/releaseNotes.model'
-import { SgeStore } from 'models/sgeStore.model'
 
 const initialState: GlobalState = {
   screenType: ScreenType.MOBILE,
diff --git a/src/store/profileEcogesture/profileEcogesture.actions.ts b/src/store/profileEcogesture/profileEcogesture.actions.ts
index 6c170945fb16cac0d85618a2da3d1da1788011d4..95cbb3cf730002f2db7dc4999e9235a736e02b8c 100644
--- a/src/store/profileEcogesture/profileEcogesture.actions.ts
+++ b/src/store/profileEcogesture/profileEcogesture.actions.ts
@@ -1,6 +1,6 @@
 import { Client } from 'cozy-client'
-import { PROFILEECOGESTURE_DOCTYPE } from 'doctypes/com-grandlyon-ecolyo-profileecogesture'
-import { ProfileEcogesture } from 'models/profileEcogesture.model'
+import { PROFILEECOGESTURE_DOCTYPE } from 'doctypes'
+import { ProfileEcogesture } from 'models'
 import { Dispatch } from 'react'
 import ProfileEcogestureService from 'services/profileEcogesture.service'
 import { AppStore, defaultAction } from 'store/store'
diff --git a/src/store/profileEcogesture/profileEcogesture.reducer.ts b/src/store/profileEcogesture/profileEcogesture.reducer.ts
index 511c813a06fd8b23eb1a58185a1343762274da53..9a089edb8243d151a0687b1921e2cd9a44a9f733 100644
--- a/src/store/profileEcogesture/profileEcogesture.reducer.ts
+++ b/src/store/profileEcogesture/profileEcogesture.reducer.ts
@@ -1,5 +1,5 @@
-import { IndividualOrCollective, WarmingType } from 'enum/profileType.enum'
-import { ProfileEcogesture } from 'models/profileEcogesture.model'
+import { IndividualOrCollective, WarmingType } from 'enums'
+import { ProfileEcogesture } from 'models'
 import { Reducer } from 'redux'
 import {
   CREATE_NEW_PROFILE_ECOGESTURE,
diff --git a/src/store/profileType/profileType.slice.spec.ts b/src/store/profileType/profileType.slice.spec.ts
index 2cd73624bc399c5d2abdd4ec464cc66666623cd1..c23f76d7e35feb46bcbeded7a37e4845c0b53334 100644
--- a/src/store/profileType/profileType.slice.spec.ts
+++ b/src/store/profileType/profileType.slice.spec.ts
@@ -1,8 +1,8 @@
-import { EquipmentType } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
 import {
   ConstructionYear,
+  EquipmentType,
   Floor,
+  FluidType,
   HotWaterEquipment,
   HotWaterFluid,
   HousingType,
@@ -10,7 +10,7 @@ import {
   OutsideFacingWalls,
   ThreeChoicesAnswer,
   WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
 import { DateTime } from 'luxon'
 import { ProfileType } from 'models'
 import { mockProfileTypeState } from '../../../tests/__mocks__/store'
diff --git a/src/store/profileType/profileType.slice.ts b/src/store/profileType/profileType.slice.ts
index e267f6fce5791f0abd351be67f24a1b1554e71ff..861804a5ea86991177d8aea4b9a7fa57b2c22bb6 100644
--- a/src/store/profileType/profileType.slice.ts
+++ b/src/store/profileType/profileType.slice.ts
@@ -1,8 +1,8 @@
 import { PayloadAction, createSlice } from '@reduxjs/toolkit'
-import { FluidType } from 'enum/fluid.enum'
 import {
   ConstructionYear,
   Floor,
+  FluidType,
   HotWaterEquipment,
   HotWaterFluid,
   HousingType,
@@ -11,7 +11,7 @@ import {
   OutsideFacingWalls,
   ThreeChoicesAnswer,
   WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
 import { DateTime } from 'luxon'
 import { ProfileType } from 'models'
 
diff --git a/src/store/store.ts b/src/store/store.ts
index 0e40d9fa049bf18fc780fd2699fc1fae2fb625b5..6e85798480d688a6cb27178bf24ece3796ad433e 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -3,13 +3,13 @@ import { Client } from 'cozy-client'
 import {
   AnalysisState,
   ChallengeState,
+  ChartState,
   GlobalState,
   ModalState,
   Profile,
+  ProfileEcogesture,
   ProfileType,
 } from 'models'
-import { ChartState } from 'models/chart.model'
-import { ProfileEcogesture } from 'models/profileEcogesture.model'
 import {
   Store,
   applyMiddleware,
diff --git a/src/targets/services/aggregatorUsageEvents.ts b/src/targets/services/aggregatorUsageEvents.ts
index 782add87babdf44a4ad6c79de72932c686176aae..f02823d202cd0dede96f8cd207dbd17f6d7f6c16 100644
--- a/src/targets/services/aggregatorUsageEvents.ts
+++ b/src/targets/services/aggregatorUsageEvents.ts
@@ -1,14 +1,18 @@
 import * as Sentry from '@sentry/react'
 import { Client } from 'cozy-client'
 import logger from 'cozy-logger'
-import { DaccEvent } from 'enum/dacc.enum'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
-import { HotWaterFluid, WarmingType } from 'enum/profileType.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UsageEventProperties } from 'enum/usageEventProperties.enum'
-import { UserChallengeState } from 'enum/userChallenge.enum'
+import {
+  DaccEvent,
+  FluidSlugType,
+  FluidState,
+  FluidType,
+  HotWaterFluid,
+  TimeStep,
+  UsageEventProperties,
+  UsageEventType,
+  UserChallengeState,
+  WarmingType,
+} from 'enums'
 import { toNumber, uniq } from 'lodash'
 import { DateTime } from 'luxon'
 import { FluidStatus, PerformanceIndicator, UsageEvent } from 'models'
diff --git a/src/targets/services/consumptionAlert.ts b/src/targets/services/consumptionAlert.ts
index 49d49ae03ebc767b89bbdaf36f3ebfd65adaf425..496b83c3596b712b97f7d5449464086b69401478 100644
--- a/src/targets/services/consumptionAlert.ts
+++ b/src/targets/services/consumptionAlert.ts
@@ -1,6 +1,6 @@
 import { Client } from 'cozy-client'
 import logger from 'cozy-logger'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import get from 'lodash/get'
 import { DateTime } from 'luxon'
 import mjml2html from 'mjml'
diff --git a/src/targets/services/enedisHalfHourMonthlyAnalysis.ts b/src/targets/services/enedisHalfHourMonthlyAnalysis.ts
index 980b2cb71745fd88172b8279b185fa3398817319..638660c6192c462cc47ca99e7c65e0867c85b46d 100644
--- a/src/targets/services/enedisHalfHourMonthlyAnalysis.ts
+++ b/src/targets/services/enedisHalfHourMonthlyAnalysis.ts
@@ -5,8 +5,7 @@ import {
   ENEDIS_MINUTE_DOCTYPE,
   ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE,
 } from 'doctypes'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { union } from 'lodash'
 import { DateTime } from 'luxon'
 import { Datachart, DataloadEntity, TimePeriod } from 'models'
diff --git a/src/targets/services/fluidsPrices.ts b/src/targets/services/fluidsPrices.ts
index d6a5f0a6a0b82265da7529eb455d10343d05c185..e625a385086937796fbe16b27d78b2047df9e896 100644
--- a/src/targets/services/fluidsPrices.ts
+++ b/src/targets/services/fluidsPrices.ts
@@ -1,13 +1,14 @@
 import * as Sentry from '@sentry/react'
 import { Client } from 'cozy-client'
 import logger from 'cozy-logger'
-import { EGL_DAY_DOCTYPE, ENEDIS_DAY_DOCTYPE, GRDF_DAY_DOCTYPE } from 'doctypes'
 import {
+  EGL_DAY_DOCTYPE,
+  ENEDIS_DAY_DOCTYPE,
+  GRDF_DAY_DOCTYPE,
   REMOTE_ORG_ECOLYO_AGENT_PRICES,
   REMOTE_ORG_ECOLYO_AGENT_PRICES_REC,
-} from 'doctypes/remote/org.ecolyo.agent.prices'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+} from 'doctypes'
+import { FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { DataloadEntity, FluidPrice, TimePeriod } from 'models'
 import ConsumptionDataManager from 'services/consumption.service'
diff --git a/src/targets/services/monthlyReportNotification.ts b/src/targets/services/monthlyReportNotification.ts
index 65e4a7c6659eca59c8ab3616e98446d645f949be..352409998792203d32915267c3f07eea9d8dbd86 100644
--- a/src/targets/services/monthlyReportNotification.ts
+++ b/src/targets/services/monthlyReportNotification.ts
@@ -1,17 +1,12 @@
 import * as Sentry from '@sentry/react'
 import { Client } from 'cozy-client'
 import logger from 'cozy-logger'
-import {
-  REMOTE_ORG_ECOLYO_AGENT,
-  REMOTE_ORG_ECOLYO_AGENT_REC,
-} from 'doctypes/remote/org.ecolyo.agent'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { REMOTE_ORG_ECOLYO_AGENT, REMOTE_ORG_ECOLYO_AGENT_REC } from 'doctypes'
+import { FluidType, TimeStep } from 'enums'
 import get from 'lodash/get'
 import { DateTime, DurationLike } from 'luxon'
 import mjml2html from 'mjml'
-import { PerformanceIndicator } from 'models'
-import { MonthlyReport } from 'models/monthlyReport.model'
+import { MonthlyReport, PerformanceIndicator } from 'models'
 import ConsumptionService from 'services/consumption.service'
 import EnvironmentService from 'services/environment.service'
 import MailService from 'services/mail.service'
diff --git a/src/utils/date.spec.ts b/src/utils/date.spec.ts
index a3ab46f2f056e0f9755b91d9b4fcd72335a1b935..9bed97a99fb06c100e6b87659f810b65aaf20ffe 100644
--- a/src/utils/date.spec.ts
+++ b/src/utils/date.spec.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { Dataload } from 'models'
 import { graphData } from '../../tests/__mocks__/chartData.mock'
diff --git a/src/utils/date.ts b/src/utils/date.ts
index 805c50a8da1924327e80fca1840b6d22b226f809..e474fdd4923b6b7b8393ae80baac318783b7c447 100644
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { Dataload } from 'models'
 import { getMonthNameWithPrep } from './utils'
diff --git a/src/utils/picto.spec.ts b/src/utils/picto.spec.ts
index 422ec60c8630a678d1d7eeaec81be58fbd237bc3..c7ba738b0fd74e0715b3e6f97ca47decbff83c09 100644
--- a/src/utils/picto.spec.ts
+++ b/src/utils/picto.spec.ts
@@ -11,7 +11,7 @@ import iconGrdfWhiteLogo from 'assets/icons/visu/grdf-logo-white.svg'
 import iconGrdfLogo from 'assets/icons/visu/grdf-logo.svg'
 import MultiIcon from 'assets/icons/visu/multi-icon.svg'
 import WaterParamIcon from 'assets/icons/visu/water-param.svg'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
 import ElecSmallIcon from '../assets/icons/visu/elec-small.svg'
 import ElecIcon from '../assets/icons/visu/elec.svg'
 import GasSmallIcon from '../assets/icons/visu/gas-small.svg'
diff --git a/src/utils/picto.ts b/src/utils/picto.ts
index 54058b3d5dd0e91ec0cc317d5a44a21845ac08a7..0c8ae28308923a3373a21fcf45e2f56e672a4fcc 100644
--- a/src/utils/picto.ts
+++ b/src/utils/picto.ts
@@ -5,26 +5,26 @@ import Disconnected from 'assets/icons/visu/disconnected-grey.svg'
 import DisconnectedActive from 'assets/icons/visu/disconnected.svg'
 import iconEglWhiteLogo from 'assets/icons/visu/egl-logo-white.svg'
 import iconEglLogo from 'assets/icons/visu/egl-logo.svg'
+import ElecUnactive from 'assets/icons/visu/elec-grey.svg'
 import ElecParamIcon from 'assets/icons/visu/elec-param.svg'
+import ElecSmallIcon from 'assets/icons/visu/elec-small.svg'
+import ElecIcon from 'assets/icons/visu/elec.svg'
 import iconEnedisWhiteLogo from 'assets/icons/visu/enedis-logo-white.svg'
 import iconEnedisLogo from 'assets/icons/visu/enedis-logo.svg'
+import GasUnactive from 'assets/icons/visu/gas-grey.svg'
 import GasParamIcon from 'assets/icons/visu/gas-param.svg'
+import GasSmallIcon from 'assets/icons/visu/gas-small.svg'
+import GasIcon from 'assets/icons/visu/gas.svg'
 import iconGrdfWhiteLogo from 'assets/icons/visu/grdf-logo-white.svg'
 import iconGrdfLogo from 'assets/icons/visu/grdf-logo.svg'
 import MultiUnactive from 'assets/icons/visu/multi-grey.svg'
 import Multi from 'assets/icons/visu/multi.svg'
+import WaterUnactive from 'assets/icons/visu/water-grey.svg'
 import WaterParamIcon from 'assets/icons/visu/water-param.svg'
+import WaterSmallIcon from 'assets/icons/visu/water-small.svg'
+import WaterIcon from 'assets/icons/visu/water.svg'
+import { FluidType } from 'enums'
 import ConfigService from 'services/fluidConfig.service'
-import ElecUnactive from '../assets/icons/visu/elec-grey.svg'
-import ElecSmallIcon from '../assets/icons/visu/elec-small.svg'
-import ElecIcon from '../assets/icons/visu/elec.svg'
-import GasUnactive from '../assets/icons/visu/gas-grey.svg'
-import GasSmallIcon from '../assets/icons/visu/gas-small.svg'
-import GasIcon from '../assets/icons/visu/gas.svg'
-import WaterUnactive from '../assets/icons/visu/water-grey.svg'
-import WaterSmallIcon from '../assets/icons/visu/water-small.svg'
-import WaterIcon from '../assets/icons/visu/water.svg'
-import { FluidType } from '../enum/fluid.enum'
 
 /**
  * Return an icon corresponding to FluidType enum
diff --git a/src/utils/utils.spec.ts b/src/utils/utils.spec.ts
index 70bdbb0e64fa6c188fab3aa74620e854b63cffe7..0b6e70feb6bdd62d6a69cdb5deebfa15668aad69 100644
--- a/src/utils/utils.spec.ts
+++ b/src/utils/utils.spec.ts
@@ -1,7 +1,10 @@
-import { Season } from 'enum/ecogesture.enum'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
-import { KonnectorUpdate } from 'enum/konnectorUpdate.enum'
+import {
+  FluidSlugType,
+  FluidState,
+  FluidType,
+  KonnectorUpdate,
+  Season,
+} from 'enums'
 import { DateTime } from 'luxon'
 import { FluidStatus } from 'models'
 import {
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index dba467798d45c19de8df51eeaec652ce4c5d8464..4b35b19c7f2b99a5a6123880ca2f1df864db38e3 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -1,12 +1,15 @@
 import { captureException } from '@sentry/react'
-import { Season } from 'enum/ecogesture.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
+import {
+  FluidSlugType,
+  FluidState,
+  FluidType,
+  KonnectorUpdate,
+  Season,
+} from 'enums'
 import get from 'lodash/get'
 import { DateTime, Interval } from 'luxon'
 import { FluidStatus, GetRelationshipsReturn, Relation } from 'models'
 import challengeData from '../db/challengeEntity.json'
-import { FluidState, FluidType } from '../enum/fluid.enum'
-import { KonnectorUpdate } from '../enum/konnectorUpdate.enum'
 
 export function getFluidType(type: string) {
   switch (type.toUpperCase()) {
diff --git a/tests/__mocks__/actionData.mock.ts b/tests/__mocks__/actionData.mock.ts
index 5cd2ef51f5264989d86f2f3604577f0795b516ef..c2a5d716ce300507c3dab2b34a7d7e8deafe53f3 100644
--- a/tests/__mocks__/actionData.mock.ts
+++ b/tests/__mocks__/actionData.mock.ts
@@ -1,4 +1,4 @@
-import { EquipmentType, Season } from 'enum/ecogesture.enum'
+import { EquipmentType, Season } from 'enums'
 import { Ecogesture } from 'models'
 
 export const defaultEcogestureData: Ecogesture[] = [
diff --git a/tests/__mocks__/chartData.mock.ts b/tests/__mocks__/chartData.mock.ts
index 4fd3ddd29cfa1692333444f391143f65949d0aaf..904a31f3e66e6f54ed8426584bf31f2bfd108b60 100644
--- a/tests/__mocks__/chartData.mock.ts
+++ b/tests/__mocks__/chartData.mock.ts
@@ -1,6 +1,6 @@
-import { Datachart, Dataload } from 'models'
+import { DataloadState } from 'enums'
 import { DateTime } from 'luxon'
-import { DataloadState } from 'enum/dataload.enum'
+import { Datachart, Dataload } from 'models'
 
 export const graphData: Datachart = {
   actualData: [
diff --git a/tests/__mocks__/customPopup.mock.ts b/tests/__mocks__/customPopup.mock.ts
index 6576af638fc9d3cdf80094416d55b37722bc3c63..65c9b9d93101881fb1b78e2fc1bea274fca164f6 100644
--- a/tests/__mocks__/customPopup.mock.ts
+++ b/tests/__mocks__/customPopup.mock.ts
@@ -1,4 +1,4 @@
-import { CustomPopup } from 'models/customPopup.model'
+import { CustomPopup } from 'models'
 
 export const mockCustomPopup: CustomPopup = {
   popupEnabled: true,
diff --git a/tests/__mocks__/duelData.mock.ts b/tests/__mocks__/duelData.mock.ts
index ec44157b84358a4ba9444ebd7d4f1aef6bbc9f87..f429b67a5eb2f8f1f2137870d1a985777e1e6e53 100644
--- a/tests/__mocks__/duelData.mock.ts
+++ b/tests/__mocks__/duelData.mock.ts
@@ -1,6 +1,6 @@
+import { UserDuelState } from 'enums'
 import { Duration } from 'luxon'
-import { UserDuel, DuelEntity } from 'models'
-import { UserDuelState } from 'enum/userDuel.enum'
+import { DuelEntity, UserDuel } from 'models'
 
 export const duelEntity: DuelEntity = {
   id: 'DUEL001',
diff --git a/tests/__mocks__/ecogesturesData.mock.ts b/tests/__mocks__/ecogesturesData.mock.ts
index 827eb511a04bed69c722dd5a28d482be20ff15ed..e00247dd848f8c2537e684442c0697b0cb262912 100644
--- a/tests/__mocks__/ecogesturesData.mock.ts
+++ b/tests/__mocks__/ecogesturesData.mock.ts
@@ -1,5 +1,4 @@
-import { EquipmentType, Room, Season, Usage } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { EquipmentType, FluidType, Room, Season, Usage } from 'enums'
 import { Ecogesture } from 'models'
 
 export const mockedEcogesturesData: Ecogesture[] = [
diff --git a/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts b/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts
index 76c474dfb3341bf1f0dda0a31dfcba588dbe0822..bba9d3cc07c5222e83525b1e029b4752ec3acf3c 100644
--- a/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts
+++ b/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts
@@ -1,10 +1,10 @@
-import { DataloadState } from 'enum/dataload.enum'
+import { DataloadState } from 'enums'
 import { DateTime } from 'luxon'
+import { MaxPowerEntity } from 'models'
 import {
   AggregatedEnedisMonthlyDataloads,
   EnedisMonthlyAnalysisData,
 } from 'models/enedisMonthlyAnalysis'
-import { MaxPowerEntity } from 'models/maxPower.model'
 
 export const mockEnedisMonthlyAnalysis: EnedisMonthlyAnalysisData = {
   weekDaysHalfHourAverageValues: [0.35, 0.34, 0.33, 0.32, 0.31, 0.3],
diff --git a/tests/__mocks__/explorationData.mock.ts b/tests/__mocks__/explorationData.mock.ts
index a5ea25b2a4725c8c036c236944127b4d28732776..baed6c85d8e3398975596c4865cd8d4d7a7f18f4 100644
--- a/tests/__mocks__/explorationData.mock.ts
+++ b/tests/__mocks__/explorationData.mock.ts
@@ -1,8 +1,5 @@
 /* eslint-disable camelcase */
-import {
-  UserExplorationState,
-  UserExplorationType,
-} from 'enum/userExploration.enum'
+import { UserExplorationState, UserExplorationType } from 'enums'
 import { ExplorationEntity, UserExploration } from 'models'
 
 export const explorationEntity: ExplorationEntity = {
diff --git a/tests/__mocks__/fluidStatusData.mock.ts b/tests/__mocks__/fluidStatusData.mock.ts
index b8c167a61be66aacde0d74983bb35fe64988a682..407671ca631b1e897a6819be6259f2c56f609497 100644
--- a/tests/__mocks__/fluidStatusData.mock.ts
+++ b/tests/__mocks__/fluidStatusData.mock.ts
@@ -1,6 +1,5 @@
 /* eslint-disable camelcase */
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
+import { FluidSlugType, FluidState, FluidType } from 'enums'
 import { DateTime } from 'luxon'
 import { FluidStatus } from 'models'
 
diff --git a/tests/__mocks__/profileEcogesture.mock.ts b/tests/__mocks__/profileEcogesture.mock.ts
index 5489fead6c303f7c780c3fb55c13c3aad1969510..d73e1e654c1dae93d7c8cfc3e6024e8b6fdb681d 100644
--- a/tests/__mocks__/profileEcogesture.mock.ts
+++ b/tests/__mocks__/profileEcogesture.mock.ts
@@ -1,10 +1,10 @@
-import { EquipmentType } from 'enum/ecogesture.enum'
-import { ProfileEcogestureAnswerType } from 'enum/ecogestureForm.enum'
-import { IndividualOrCollective, WarmingType } from 'enum/profileType.enum'
 import {
-  ProfileEcogesture,
-  ProfileEcogestureAnswer,
-} from 'models/profileEcogesture.model'
+  EquipmentType,
+  IndividualOrCollective,
+  ProfileEcogestureAnswerType,
+  WarmingType,
+} from 'enums'
+import { ProfileEcogesture, ProfileEcogestureAnswer } from 'models'
 
 export const mockProfileEcogesture: ProfileEcogesture = {
   heating: IndividualOrCollective.INDIVIDUAL,
diff --git a/tests/__mocks__/profileType.mock.ts b/tests/__mocks__/profileType.mock.ts
index 7dcd4672215673997ab49455e9c3b743ba8ae30d..586da476177a0c3899f10be2a46ca3003028ed5b 100644
--- a/tests/__mocks__/profileType.mock.ts
+++ b/tests/__mocks__/profileType.mock.ts
@@ -1,7 +1,7 @@
-import { FluidType } from 'enum/fluid.enum'
 import {
   ConstructionYear,
   Floor,
+  FluidType,
   HotWaterEquipment,
   HotWaterFluid,
   HousingType,
@@ -11,13 +11,9 @@ import {
   ProfileTypeFormType,
   ThreeChoicesAnswer,
   WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
 import { DateTime } from 'luxon'
-import {
-  MonthlyForecast,
-  ProfileType,
-  ProfileTypeAnswer,
-} from 'models/profileType.model'
+import { MonthlyForecast, ProfileType, ProfileTypeAnswer } from 'models'
 
 export const profileTypeData: ProfileType = {
   _id: 'ed8a160e06431be15c8fdbb428000f6a',
diff --git a/tests/__mocks__/quizData.mock.ts b/tests/__mocks__/quizData.mock.ts
index 0a21247893b0e923de30e12997d0256595323fe1..d62c0c71374e147635822fe5f81a6a352effa8b8 100644
--- a/tests/__mocks__/quizData.mock.ts
+++ b/tests/__mocks__/quizData.mock.ts
@@ -1,14 +1,14 @@
-import { TimeStep } from 'enum/timeStep.enum'
 import {
   CustomQuestionType,
+  TimeStep,
   UserQuestionState,
   UserQuizState,
-} from 'enum/userQuiz.enum'
+} from 'enums'
 import { DateTime } from 'luxon'
 import {
-  QuizEntity,
-  QuestionEntity,
   CustomQuestionEntity,
+  QuestionEntity,
+  QuizEntity,
   UserQuiz,
 } from 'models'
 
diff --git a/tests/__mocks__/store/chart.state.mock.ts b/tests/__mocks__/store/chart.state.mock.ts
index 467bf31be711400bee23034f3c3d2a6dfc458077..df355ad572383eb3e1d9e627a43808852e5fe909 100644
--- a/tests/__mocks__/store/chart.state.mock.ts
+++ b/tests/__mocks__/store/chart.state.mock.ts
@@ -1,4 +1,4 @@
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
 import { DateTime } from 'luxon'
 import { ChartState } from 'models'
 
diff --git a/tests/__mocks__/store/global.state.mock.ts b/tests/__mocks__/store/global.state.mock.ts
index bc056c2cb88218e9cea6abb983bd823305dd6795..373b81070b4c12ab3a3c22187a2634dcd457575e 100644
--- a/tests/__mocks__/store/global.state.mock.ts
+++ b/tests/__mocks__/store/global.state.mock.ts
@@ -1,8 +1,5 @@
 /* eslint-disable camelcase */
-import { Usage } from 'enum/ecogesture.enum'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
-import { ScreenType } from 'enum/screen.enum'
+import { FluidSlugType, FluidState, FluidType, ScreenType, Usage } from 'enums'
 import { GlobalState } from 'models'
 
 export const mockGlobalState: GlobalState = {
diff --git a/tests/__mocks__/store/profileType.state.mock.ts b/tests/__mocks__/store/profileType.state.mock.ts
index 9b8091734b280ccc8c259415542090f4073e2a38..e3a947570cdb873bdabea7926812cba4bbe211d8 100644
--- a/tests/__mocks__/store/profileType.state.mock.ts
+++ b/tests/__mocks__/store/profileType.state.mock.ts
@@ -1,7 +1,7 @@
-import { FluidType } from 'enum/fluid.enum'
 import {
   ConstructionYear,
   Floor,
+  FluidType,
   HotWaterEquipment,
   HotWaterFluid,
   HousingType,
@@ -10,7 +10,7 @@ import {
   OutsideFacingWalls,
   ThreeChoicesAnswer,
   WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
 import { DateTime } from 'luxon'
 import { ProfileType } from 'models'
 
diff --git a/tests/__mocks__/usageEventsData.mock.ts b/tests/__mocks__/usageEventsData.mock.ts
index dde061dd292225d143dd101c769ad23558cbe888..c53c4ee4f37fa7eacc32ef0805a5dfff34a84bc2 100644
--- a/tests/__mocks__/usageEventsData.mock.ts
+++ b/tests/__mocks__/usageEventsData.mock.ts
@@ -1,4 +1,4 @@
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
 import { DateTime } from 'luxon'
 import { UsageEvent, UsageEventEntity } from 'models'
 
diff --git a/tests/__mocks__/userChallengeData.mock.ts b/tests/__mocks__/userChallengeData.mock.ts
index 205338b0380ddbccaa9ab6cf3a2df8d79c26ca51..3966c3f0b4a98577899f9bcd8f46a4f85dc7f5af 100644
--- a/tests/__mocks__/userChallengeData.mock.ts
+++ b/tests/__mocks__/userChallengeData.mock.ts
@@ -1,10 +1,10 @@
 /* eslint-disable camelcase */
-import { UserActionState } from 'enum/userAction.enum'
 import {
+  UserActionState,
   UserChallengeState,
   UserChallengeSuccess,
-} from 'enum/userChallenge.enum'
-import { UserExplorationType } from 'enum/userExploration.enum'
+  UserExplorationType,
+} from 'enums'
 import { UserChallenge } from 'models'
 import { duelData, duelDefault } from './duelData.mock'
 import {