diff --git a/api/chalicelib/core/metrics/__init__.py b/api/chalicelib/core/metrics/__init__.py
index 9906cb8bc..db7e95e33 100644
--- a/api/chalicelib/core/metrics/__init__.py
+++ b/api/chalicelib/core/metrics/__init__.py
@@ -6,8 +6,5 @@ logger = logging.getLogger(__name__)
 
 if config("EXP_METRICS", cast=bool, default=False):
     logger.info(">>> Using experimental metrics")
-    from chalicelib.core.metrics import heatmaps_ch as heatmaps
-    from chalicelib.core.metrics import product_analytics_ch as product_analytics
 else:
-    from chalicelib.core.metrics import heatmaps
-    from chalicelib.core.metrics import product_analytics
+    pass
\ No newline at end of file
diff --git a/api/chalicelib/core/metrics/heatmaps/__init__.py b/api/chalicelib/core/metrics/heatmaps/__init__.py
new file mode 100644
index 000000000..7f3ab4eda
--- /dev/null
+++ b/api/chalicelib/core/metrics/heatmaps/__init__.py
@@ -0,0 +1,11 @@
+import logging
+
+from decouple import config
+
+logger = logging.getLogger(__name__)
+
+if config("EXP_METRICS", cast=bool, default=False):
+    logger.info(">>> Using experimental heatmaps")
+    from .heatmaps_ch import *
+else:
+    from .heatmaps import *
diff --git a/api/chalicelib/core/metrics/heatmaps.py b/api/chalicelib/core/metrics/heatmaps/heatmaps.py
similarity index 100%
rename from api/chalicelib/core/metrics/heatmaps.py
rename to api/chalicelib/core/metrics/heatmaps/heatmaps.py
diff --git a/api/chalicelib/core/metrics/heatmaps_ch.py b/api/chalicelib/core/metrics/heatmaps/heatmaps_ch.py
similarity index 100%
rename from api/chalicelib/core/metrics/heatmaps_ch.py
rename to api/chalicelib/core/metrics/heatmaps/heatmaps_ch.py
diff --git a/api/chalicelib/core/metrics/product_analytics/__init__.py b/api/chalicelib/core/metrics/product_analytics/__init__.py
new file mode 100644
index 000000000..1f94cce71
--- /dev/null
+++ b/api/chalicelib/core/metrics/product_analytics/__init__.py
@@ -0,0 +1,10 @@
+import logging
+
+from decouple import config
+
+logger = logging.getLogger(__name__)
+if config("EXP_METRICS", cast=bool, default=False):
+    logger.info(">>> Using experimental product-analytics")
+    from .product_analytics_ch import *
+else:
+    from .product_analytics import *
diff --git a/api/chalicelib/core/metrics/product_analytics.py b/api/chalicelib/core/metrics/product_analytics/product_analytics.py
similarity index 100%
rename from api/chalicelib/core/metrics/product_analytics.py
rename to api/chalicelib/core/metrics/product_analytics/product_analytics.py
diff --git a/api/chalicelib/core/metrics/product_analytics_ch.py b/api/chalicelib/core/metrics/product_analytics/product_analytics_ch.py
similarity index 99%
rename from api/chalicelib/core/metrics/product_analytics_ch.py
rename to api/chalicelib/core/metrics/product_analytics/product_analytics_ch.py
index 44c94952e..7f066c467 100644
--- a/api/chalicelib/core/metrics/product_analytics_ch.py
+++ b/api/chalicelib/core/metrics/product_analytics/product_analytics_ch.py
@@ -3,7 +3,7 @@ from time import time
 
 import schemas
 from chalicelib.core import metadata
-from chalicelib.core.metrics.product_analytics import __transform_journey
+from .product_analytics import __transform_journey
 from chalicelib.utils import ch_client, exp_ch_helper
 from chalicelib.utils import helper
 from chalicelib.utils import sql_helper as sh
@@ -85,10 +85,6 @@ def __complete_missing_steps(start_time, end_time, density, neutral, rows, time_
 # compute avg_time_from_previous at the same level as sessions_count (this was removed in v1.22)
 # if start-point is selected, the selected event is ranked n°1
 def path_analysis(project_id: int, data: schemas.CardPathAnalysis):
-    # # This code is used for testing only
-    # return __get_test_data()
-
-    # ------ end of testing code ---
     sub_events = []
     start_points_conditions = []
     step_0_conditions = []
diff --git a/ee/api/.gitignore b/ee/api/.gitignore
index a6c0601d2..2376ed1ac 100644
--- a/ee/api/.gitignore
+++ b/ee/api/.gitignore
@@ -198,10 +198,8 @@ Pipfile.lock
 /chalicelib/core/metrics/custom_metrics.py
 /chalicelib/core/metrics/dashboards.py
 /chalicelib/core/metrics/funnels.py
-/chalicelib/core/metrics/heatmaps.py
-/chalicelib/core/metrics/heatmaps_ch.py
-/chalicelib/core/metrics/product_analytics.py
-/chalicelib/core/metrics/product_analytics_ch.py
+/chalicelib/core/metrics/heatmaps
+/chalicelib/core/metrics/product_analytics
 /chalicelib/core/metrics/product_anaytics2.py
 /chalicelib/core/events.py
 /chalicelib/core/events_mobile.py
diff --git a/ee/api/chalicelib/core/metrics/__init__.py b/ee/api/chalicelib/core/metrics/__init__.py
index 0e3dfed20..6f2a3db82 100644
--- a/ee/api/chalicelib/core/metrics/__init__.py
+++ b/ee/api/chalicelib/core/metrics/__init__.py
@@ -4,6 +4,4 @@ from decouple import config
 
 logger = logging.getLogger(__name__)
 
-from chalicelib.core.metrics import heatmaps_ch as heatmaps
 from chalicelib.core.metrics import custom_metrics_ee as custom_metrics
-from chalicelib.core.metrics import product_analytics_ch as product_analytics
diff --git a/ee/api/clean-dev.sh b/ee/api/clean-dev.sh
index a915a2f60..8466565be 100755
--- a/ee/api/clean-dev.sh
+++ b/ee/api/clean-dev.sh
@@ -18,10 +18,8 @@ rm -rf ./chalicelib/core/countries.py
 rm -rf ./chalicelib/core/metrics/custom_metrics.py
 rm -rf ./chalicelib/core/metrics/funnels.py
 rm -rf ./chalicelib/core/metrics/dashboards.py
-rm -rf ./chalicelib/core/metrics/heatmaps.py
-rm -rf ./chalicelib/core/metrics/heatmaps_ch.py
-rm -rf ./chalicelib/core/metrics/product_analytics.py
-rm -rf ./chalicelib/core/metrics/product_analytics_ch.py
+rm -rf ./chalicelib/core/metrics/heatmaps
+rm -rf ./chalicelib/core/metrics/product_analytics
 rm -rf ./chalicelib/core/metrics/product_anaytics2.py
 rm -rf ./chalicelib/core/events.py
 rm -rf ./chalicelib/core/events_mobile.py
diff --git a/frontend/app/components/Dashboard/components/WidgetForm/WidgetFormNew.tsx b/frontend/app/components/Dashboard/components/WidgetForm/WidgetFormNew.tsx
index a3cabf722..2a3594a05 100644
--- a/frontend/app/components/Dashboard/components/WidgetForm/WidgetFormNew.tsx
+++ b/frontend/app/components/Dashboard/components/WidgetForm/WidgetFormNew.tsx
@@ -155,7 +155,9 @@ const FilterSection = observer(
                   }}
                   emptyMessage={
                     isTable
-                      ? t('Filter data using any event or attribute. Use Add Step button below to do so.')
+                      ? t(
+                          'Filter data using any event or attribute. Use Add Step button below to do so.',
+                        )
                       : t('Add an event or filter step to define the series.')
                   }
                   expandable={isSingleSeries}
@@ -163,8 +165,10 @@ const FilterSection = observer(
               </div>
             ))}
         {isSingleSeries ? null : (
-          <div className={'mx-auto flex items-center gap-2 w-fit'}>
-            <Tooltip title={canAddSeries ? '' : t('Maximum of 3 series reached.')}>
+          <div className="mx-auto flex items-center gap-2 w-fit">
+            <Tooltip
+              title={canAddSeries ? '' : t('Maximum of 3 series reached.')}
+            >
               <Button
                 onClick={() => {
                   if (!canAddSeries) return;
@@ -179,8 +183,8 @@ const FilterSection = observer(
               </Button>
             </Tooltip>
             <Button
-              size={'small'}
-              type={'text'}
+              size="small"
+              type="text"
               icon={
                 <ChevronUp
                   size={16}
@@ -189,7 +193,7 @@ const FilterSection = observer(
               }
               onClick={allCollapsed ? expandAll : collapseAll}
             >
-              {allCollapsed ? t('Expand') : t('Collapse')} All
+              {allCollapsed ? t('Expand') : t('Collapse')}&nbsp;{t('All')}
             </Button>
           </div>
         )}
@@ -215,7 +219,7 @@ const PathAnalysisFilter = observer(({ metric, writeOption }: any) => {
       <div className="flex flex-col justify-start gap-2 flex-wrap">
         <Form.Item className="mb-0 hover:bg-bg-blue/30 px-4 pb-1 pt-2">
           <div className="flex flex-wrap gap-2 items-center justify-start">
-            <span className="font-medium">{t('Journeys With')}&nbsp;</span>
+            <span className="font-medium">{t('Journeys With')}</span>
             <div className="flex gap-2 items-center">
               <Select
                 className="w-36 rounded-lg"
diff --git a/frontend/app/components/ui/Checkbox/Checkbox.tsx b/frontend/app/components/ui/Checkbox/Checkbox.tsx
index 6e514355f..ff1739b17 100644
--- a/frontend/app/components/ui/Checkbox/Checkbox.tsx
+++ b/frontend/app/components/ui/Checkbox/Checkbox.tsx
@@ -6,8 +6,7 @@ interface Props {
   label?: string;
   [x: string]: any;
 }
-
-export default (props: Props) => {
-  const { className = '', label, ...rest } = props;
+export default function (props: Props) {
+  const { className = '', label = '', ...rest } = props;
   return <AntCheckbox {...rest}>{label}</AntCheckbox>;
-};
\ No newline at end of file
+}