diff --git a/app/Filament/Widgets/Data/LoadEvents/AverageLeagueSeason.php b/app/Filament/Widgets/Boxes/AverageLeagueSeason.php
similarity index 96%
rename from app/Filament/Widgets/Data/LoadEvents/AverageLeagueSeason.php
rename to app/Filament/Widgets/Boxes/AverageLeagueSeason.php
index c2ba4ab4..eaa0f913 100644
--- a/app/Filament/Widgets/Data/LoadEvents/AverageLeagueSeason.php
+++ b/app/Filament/Widgets/Boxes/AverageLeagueSeason.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Filament\Widgets\Data\LoadEvents;
+namespace App\Filament\Widgets\Boxes;
 
 use App\Filament\Pages\Selections\Helper\GetSeason;
+use App\Filament\Widgets\Boxes\Helper\ExpectationAverage;
 use App\Models\StatistikoEvent;
 
 class AverageLeagueSeason
diff --git a/app/Filament/Widgets/Data/LoadEvents/AverageTeam.php b/app/Filament/Widgets/Boxes/AverageTeam.php
similarity index 98%
rename from app/Filament/Widgets/Data/LoadEvents/AverageTeam.php
rename to app/Filament/Widgets/Boxes/AverageTeam.php
index d05aa4e0..41336680 100644
--- a/app/Filament/Widgets/Data/LoadEvents/AverageTeam.php
+++ b/app/Filament/Widgets/Boxes/AverageTeam.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Filament\Widgets\Data\LoadEvents;
+namespace App\Filament\Widgets\Boxes;
 
 use App\Filament\Pages\Selections\Helper\GetSeason;
+use App\Filament\Widgets\Boxes\Helper\ExpectationAverage;
 use App\Models\StatistikoEvent;
 
 class AverageTeam
diff --git a/app/Filament/Widgets/Data/LoadEvents/AverageTeamSeason.php b/app/Filament/Widgets/Boxes/AverageTeamSeason.php
similarity index 98%
rename from app/Filament/Widgets/Data/LoadEvents/AverageTeamSeason.php
rename to app/Filament/Widgets/Boxes/AverageTeamSeason.php
index 447571d6..d26a0038 100644
--- a/app/Filament/Widgets/Data/LoadEvents/AverageTeamSeason.php
+++ b/app/Filament/Widgets/Boxes/AverageTeamSeason.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Filament\Widgets\Data\LoadEvents;
+namespace App\Filament\Widgets\Boxes;
 
 use App\Filament\Pages\Selections\Helper\GetSeason;
+use App\Filament\Widgets\Boxes\Helper\ExpectationAverage;
 use App\Models\StatistikoEvent;
 
 class AverageTeamSeason
diff --git a/app/Filament/Widgets/Data/LoadEventsBoxes.php b/app/Filament/Widgets/Boxes/ExpectationsTeam.php
similarity index 75%
rename from app/Filament/Widgets/Data/LoadEventsBoxes.php
rename to app/Filament/Widgets/Boxes/ExpectationsTeam.php
index 0b18a49b..ffddcd6d 100644
--- a/app/Filament/Widgets/Data/LoadEventsBoxes.php
+++ b/app/Filament/Widgets/Boxes/ExpectationsTeam.php
@@ -1,42 +1,25 @@
 <?php
 
-namespace App\Filament\Widgets\Data;
+namespace App\Filament\Widgets\Boxes;
 
-use App\Filament\Widgets\Data\LoadEvents\AverageLeagueSeason;
-use App\Filament\Widgets\Data\LoadEvents\AverageTeam;
-use App\Filament\Widgets\Data\LoadEvents\AverageTeamSeason;
-use App\Filament\Widgets\Data\LoadEvents\ExpectationCalculation;
-use App\Filament\Widgets\Data\LoadEvents\ExpectationCollecting;
-use App\Filament\Widgets\Data\LoadEvents\LoadEventsQueryAll;
-use App\Models\StatisticFixtures;
+use App\Filament\Widgets\Boxes\Helper\ExpectationCalculation;
+use App\Filament\Widgets\Boxes\Helper\ExpectationCollecting;
+use App\Filament\Widgets\Charts\LoadEvents\LoadEventsQueryAll;
 use App\Utilities\Round;
 
-class LoadEventsBoxes
+class ExpectationsTeam
 {
-    public static function load(array $filter, bool $hasdots)
+    public static function load(array &$expectations, array $filter, object $match)
     {
+        /**
+         * STATTISTIC DATA
+         */
         $league_id = (int) $filter['league_id'] ?? 0;
         $match_id = (int) $filter['match_id'] ?? 0;
         $team_id = (int) $filter['team_id'] ?? 0;
         $team_position = $filter['team_position'];
         $similar_past_matches = $filter['similar_past_matches'];
 
-        if (! $league_id) {
-            return [];
-        }
-        if (! $match_id) {
-            return [];
-        }
-        if (! $team_id) {
-            return [];
-        }
-
-        $match = StatisticFixtures::with('home')->with('away')->where('id', (int) $match_id)->first();
-
-        if (! $match) {
-            return [];
-        }
-
         if ($similar_past_matches != 'none') {
             $team_id = 0;
             $team_position = '';
@@ -47,9 +30,6 @@ class LoadEventsBoxes
             $away_team = 'Against';
         }
 
-        /**
-         * STATTISTIC DATA
-         */
         $res = LoadEventsQueryAll::load($filter, $match);
         if (! $res) {
             return [];
@@ -126,22 +106,5 @@ class LoadEventsBoxes
         $expectations['draw_odd'] = $expectations['draw_count'] ? number_format(Round::odd($count_events / $expectations['draw_count']), 2) : 0;
         $expectations['lost_odd'] = $expectations['lost_count'] ? number_format(Round::odd($count_events / $expectations['lost_count']), 2) : 0;
         $expectations['count_events'] = $count_events;
-
-        if ($team_id == $match->home_id) {
-            $expectations['active_team'] = $match->home->ss_team_name;
-        } else {
-            $expectations['active_team'] = $match->away->ss_team_name;
-        }
-
-        /**
-         * LEAGUE AVERAGES
-         */
-        if ($team_id != 0 && $similar_past_matches == 'none') {
-            AverageTeam::load($expectations, $filter);
-            AverageTeamSeason::load($expectations, $filter);
-            AverageLeagueSeason::load($expectations, $filter);
-        }
-
-        return $expectations;
     }
 }
diff --git a/app/Filament/Widgets/Data/LoadEvents/ExpectationAverage.php b/app/Filament/Widgets/Boxes/Helper/ExpectationAverage.php
similarity index 85%
rename from app/Filament/Widgets/Data/LoadEvents/ExpectationAverage.php
rename to app/Filament/Widgets/Boxes/Helper/ExpectationAverage.php
index bba182f1..799f3a0d 100644
--- a/app/Filament/Widgets/Data/LoadEvents/ExpectationAverage.php
+++ b/app/Filament/Widgets/Boxes/Helper/ExpectationAverage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Widgets\Data\LoadEvents;
+namespace App\Filament\Widgets\Boxes\Helper;
 
 class ExpectationAverage
 {
diff --git a/app/Filament/Widgets/Data/LoadEvents/ExpectationCalculation.php b/app/Filament/Widgets/Boxes/Helper/ExpectationCalculation.php
similarity index 97%
rename from app/Filament/Widgets/Data/LoadEvents/ExpectationCalculation.php
rename to app/Filament/Widgets/Boxes/Helper/ExpectationCalculation.php
index 529ba336..93a402d7 100644
--- a/app/Filament/Widgets/Data/LoadEvents/ExpectationCalculation.php
+++ b/app/Filament/Widgets/Boxes/Helper/ExpectationCalculation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Widgets\Data\LoadEvents;
+namespace App\Filament\Widgets\Boxes\Helper;
 
 use App\Models\StatistikoConfig;
 
diff --git a/app/Filament/Widgets/Data/LoadEvents/ExpectationCollecting.php b/app/Filament/Widgets/Boxes/Helper/ExpectationCollecting.php
similarity index 97%
rename from app/Filament/Widgets/Data/LoadEvents/ExpectationCollecting.php
rename to app/Filament/Widgets/Boxes/Helper/ExpectationCollecting.php
index 990eeeb4..0f54948c 100644
--- a/app/Filament/Widgets/Data/LoadEvents/ExpectationCollecting.php
+++ b/app/Filament/Widgets/Boxes/Helper/ExpectationCollecting.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Widgets\Data\LoadEvents;
+namespace App\Filament\Widgets\Boxes\Helper;
 
 class ExpectationCollecting
 {
diff --git a/app/Filament/Widgets/Boxes/LoadEventsBoxes.php b/app/Filament/Widgets/Boxes/LoadEventsBoxes.php
new file mode 100644
index 00000000..09b139e4
--- /dev/null
+++ b/app/Filament/Widgets/Boxes/LoadEventsBoxes.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Filament\Widgets\Boxes;
+
+use App\Models\StatisticFixtures;
+
+class LoadEventsBoxes
+{
+    public static function load(array $filter, bool $hasdots)
+    {
+        $league_id = (int) $filter['league_id'] ?? 0;
+        $match_id = (int) $filter['match_id'] ?? 0;
+        $team_id = (int) $filter['team_id'] ?? 0;
+        $team_position = $filter['team_position'];
+        $similar_past_matches = $filter['similar_past_matches'];
+
+        if (! $league_id) {
+            return [];
+        }
+        if (! $match_id) {
+            return [];
+        }
+        if (! $team_id) {
+            return [];
+        }
+
+        $match = StatisticFixtures::with('home')->with('away')->where('id', (int) $match_id)->first();
+
+        if (! $match) {
+            return [];
+        }
+
+        $expectations = [];
+        ExpectationsTeam::load($expectations, $filter, $match);
+
+        if ($team_id == $match->home_id) {
+            $expectations['active_team'] = $match->home->ss_team_name;
+        } else {
+            $expectations['active_team'] = $match->away->ss_team_name;
+        }
+
+        /**
+         * LEAGUE AVERAGES
+         */
+        if ($team_id != 0 && $similar_past_matches == 'none') {
+            AverageTeam::load($expectations, $filter);
+            AverageTeamSeason::load($expectations, $filter);
+            AverageLeagueSeason::load($expectations, $filter);
+        }
+
+        return $expectations;
+    }
+}
diff --git a/app/Filament/Widgets/BoxesBettypeAll.php b/app/Filament/Widgets/BoxesBettypeAll.php
index 17f857bb..54839088 100644
--- a/app/Filament/Widgets/BoxesBettypeAll.php
+++ b/app/Filament/Widgets/BoxesBettypeAll.php
@@ -2,7 +2,7 @@
 
 namespace App\Filament\Widgets;
 
-use App\Filament\Widgets\Data\LoadEventsBoxes;
+use App\Filament\Widgets\Boxes\LoadEventsBoxes;
 use Filament\Widgets\Concerns\InteractsWithPageFilters;
 use Filament\Widgets\StatsOverviewWidget;
 use Filament\Widgets\StatsOverviewWidget\Stat;
diff --git a/app/Filament/Widgets/BoxesBettypeSingle.php b/app/Filament/Widgets/BoxesBettypeSingle.php
index d45a8b7b..5340ba5a 100644
--- a/app/Filament/Widgets/BoxesBettypeSingle.php
+++ b/app/Filament/Widgets/BoxesBettypeSingle.php
@@ -2,8 +2,8 @@
 
 namespace App\Filament\Widgets;
 
-use App\Filament\Widgets\Data\HelperStatisticType;
-use App\Filament\Widgets\Data\LoadEvents;
+use App\Filament\Widgets\Charts\HelperStatisticType;
+use App\Filament\Widgets\Charts\LoadEvents;
 use App\Utilities\Round;
 use Filament\Widgets\Concerns\InteractsWithPageFilters;
 use Filament\Widgets\StatsOverviewWidget;
diff --git a/app/Filament/Widgets/ChartEvent.php b/app/Filament/Widgets/ChartEvent.php
index 071a0f52..7a8a9dc1 100644
--- a/app/Filament/Widgets/ChartEvent.php
+++ b/app/Filament/Widgets/ChartEvent.php
@@ -2,8 +2,8 @@
 
 namespace App\Filament\Widgets;
 
-use App\Filament\Widgets\Data\HelperStatisticType;
-use App\Filament\Widgets\Data\LoadEvents;
+use App\Filament\Widgets\Charts\HelperStatisticType;
+use App\Filament\Widgets\Charts\LoadEvents;
 use Filament\Support\RawJs;
 use Filament\Widgets\ChartWidget;
 use Illuminate\Support\HtmlString;
diff --git a/app/Filament/Widgets/ChartEventMoAv.php b/app/Filament/Widgets/ChartEventMoAv.php
index 5c73ef16..4a17dfd0 100644
--- a/app/Filament/Widgets/ChartEventMoAv.php
+++ b/app/Filament/Widgets/ChartEventMoAv.php
@@ -2,9 +2,9 @@
 
 namespace App\Filament\Widgets;
 
-use App\Filament\Widgets\Data\HelperMoveingAverage;
-use App\Filament\Widgets\Data\HelperStatisticType;
-use App\Filament\Widgets\Data\LoadEvents;
+use App\Filament\Widgets\Charts\HelperMoveingAverage;
+use App\Filament\Widgets\Charts\HelperStatisticType;
+use App\Filament\Widgets\Charts\LoadEvents;
 use Filament\Support\RawJs;
 use Filament\Widgets\ChartWidget;
 use Illuminate\Support\HtmlString;
@@ -27,7 +27,7 @@ class ChartEventMoAv extends ChartWidget
                     <svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" fill="currentColor" viewBox="0 0 256 256"><path d="M232,64H208V48a8,8,0,0,0-8-8H56a8,8,0,0,0-8,8V64H24A16,16,0,0,0,8,80V96a40,40,0,0,0,40,40h3.65A80.13,80.13,0,0,0,120,191.61V216H96a8,8,0,0,0,0,16h64a8,8,0,0,0,0-16H136V191.58c31.94-3.23,58.44-25.64,68.08-55.58H208a40,40,0,0,0,40-40V80A16,16,0,0,0,232,64ZM48,120A24,24,0,0,1,24,96V80H48v32q0,4,.39,8Zm144-8.9c0,35.52-29,64.64-64,64.9a64,64,0,0,1-64-64V56H192ZM232,96a24,24,0,0,1-24,24h-.5a81.81,81.81,0,0,0,.5-8.9V80h24Z"></path></svg>
                     Events
                 </span>
-                <span>' . $this->type . ' Moving Average</span>
+                <span>'.$this->type.' Moving Average</span>
             </span>
         ');
     }
diff --git a/app/Filament/Widgets/ChartEventPerf.php b/app/Filament/Widgets/ChartEventPerf.php
index dff9b08f..f3598cbd 100644
--- a/app/Filament/Widgets/ChartEventPerf.php
+++ b/app/Filament/Widgets/ChartEventPerf.php
@@ -2,7 +2,7 @@
 
 namespace App\Filament\Widgets;
 
-use App\Filament\Widgets\Data\LoadPerformance;
+use App\Filament\Widgets\Charts\LoadPerformance;
 use Filament\Support\RawJs;
 use Filament\Widgets\ChartWidget;
 use Illuminate\Support\HtmlString;
@@ -25,7 +25,7 @@ class ChartEventPerf extends ChartWidget
                     <svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" fill="currentColor" viewBox="0 0 256 256"><path d="M232,64H208V48a8,8,0,0,0-8-8H56a8,8,0,0,0-8,8V64H24A16,16,0,0,0,8,80V96a40,40,0,0,0,40,40h3.65A80.13,80.13,0,0,0,120,191.61V216H96a8,8,0,0,0,0,16h64a8,8,0,0,0,0-16H136V191.58c31.94-3.23,58.44-25.64,68.08-55.58H208a40,40,0,0,0,40-40V80A16,16,0,0,0,232,64ZM48,120A24,24,0,0,1,24,96V80H48v32q0,4,.39,8Zm144-8.9c0,35.52-29,64.64-64,64.9a64,64,0,0,1-64-64V56H192ZM232,96a24,24,0,0,1-24,24h-.5a81.81,81.81,0,0,0,.5-8.9V80h24Z"></path></svg>
                     Events Performance
                 </span>
-                <span>' . $this->type . '</span>
+                <span>'.$this->type.'</span>
             </span>
         ');
     }
diff --git a/app/Filament/Widgets/ChartEventPerfMoAv.php b/app/Filament/Widgets/ChartEventPerfMoAv.php
index 6af4d229..bf6ac0b4 100644
--- a/app/Filament/Widgets/ChartEventPerfMoAv.php
+++ b/app/Filament/Widgets/ChartEventPerfMoAv.php
@@ -2,8 +2,8 @@
 
 namespace App\Filament\Widgets;
 
-use App\Filament\Widgets\Data\HelperMoveingAveragePerformens;
-use App\Filament\Widgets\Data\LoadPerformance;
+use App\Filament\Widgets\Charts\HelperMoveingAveragePerformens;
+use App\Filament\Widgets\Charts\LoadPerformance;
 use Filament\Support\RawJs;
 use Filament\Widgets\ChartWidget;
 use Illuminate\Support\HtmlString;
@@ -26,7 +26,7 @@ class ChartEventPerfMoAv extends ChartWidget
                     <svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" fill="currentColor" viewBox="0 0 256 256"><path d="M232,64H208V48a8,8,0,0,0-8-8H56a8,8,0,0,0-8,8V64H24A16,16,0,0,0,8,80V96a40,40,0,0,0,40,40h3.65A80.13,80.13,0,0,0,120,191.61V216H96a8,8,0,0,0,0,16h64a8,8,0,0,0,0-16H136V191.58c31.94-3.23,58.44-25.64,68.08-55.58H208a40,40,0,0,0,40-40V80A16,16,0,0,0,232,64ZM48,120A24,24,0,0,1,24,96V80H48v32q0,4,.39,8Zm144-8.9c0,35.52-29,64.64-64,64.9a64,64,0,0,1-64-64V56H192ZM232,96a24,24,0,0,1-24,24h-.5a81.81,81.81,0,0,0,.5-8.9V80h24Z"></path></svg>
                     Events Performance
                 </span>
-                <span>' . $this->type . 'Moving Average</span>
+                <span>'.$this->type.'Moving Average</span>
             </span>
         ');
     }
diff --git a/app/Filament/Widgets/ChartPlayer.php b/app/Filament/Widgets/ChartPlayer.php
index bd988e37..b71c2c07 100644
--- a/app/Filament/Widgets/ChartPlayer.php
+++ b/app/Filament/Widgets/ChartPlayer.php
@@ -2,8 +2,8 @@
 
 namespace App\Filament\Widgets;
 
-use App\Filament\Widgets\Data\HelperStatisticType;
-use App\Filament\Widgets\Data\LoadPlayerWidgets;
+use App\Filament\Widgets\Charts\HelperStatisticType;
+use App\Filament\Widgets\Charts\LoadPlayerWidgets;
 use Filament\Support\RawJs;
 use Filament\Widgets\ChartWidget;
 use Illuminate\Support\HtmlString;
diff --git a/app/Filament/Widgets/ChartPlayerMoAv.php b/app/Filament/Widgets/ChartPlayerMoAv.php
index 09b594fc..823a3ca6 100644
--- a/app/Filament/Widgets/ChartPlayerMoAv.php
+++ b/app/Filament/Widgets/ChartPlayerMoAv.php
@@ -2,9 +2,9 @@
 
 namespace App\Filament\Widgets;
 
-use App\Filament\Widgets\Data\HelperMoveingAverage;
-use App\Filament\Widgets\Data\HelperStatisticType;
-use App\Filament\Widgets\Data\LoadPlayerWidgets;
+use App\Filament\Widgets\Charts\HelperMoveingAverage;
+use App\Filament\Widgets\Charts\HelperStatisticType;
+use App\Filament\Widgets\Charts\LoadPlayerWidgets;
 use Filament\Support\RawJs;
 use Filament\Widgets\ChartWidget;
 use Illuminate\Support\HtmlString;
diff --git a/app/Filament/Widgets/ChartPlayerPerf.php b/app/Filament/Widgets/ChartPlayerPerf.php
index 92ec3945..866c31af 100644
--- a/app/Filament/Widgets/ChartPlayerPerf.php
+++ b/app/Filament/Widgets/ChartPlayerPerf.php
@@ -2,7 +2,7 @@
 
 namespace App\Filament\Widgets;
 
-use App\Filament\Widgets\Data\LoadPlayerPerformance;
+use App\Filament\Widgets\Charts\LoadPlayerPerformance;
 use Filament\Support\RawJs;
 use Filament\Widgets\ChartWidget;
 use Illuminate\Support\HtmlString;
@@ -37,7 +37,7 @@ class ChartPlayerPerf extends ChartWidget
                         c0.211,0.1782,0.5264,0.1516,0.7046-0.0593C13.0037,6.5523,13.0018,6.2761,12.84,6.09z"></path>
                         </g>
                     </svg> 
-                    ' . $this->player . '
+                    '.$this->player.'
                 </span>
                 <span>Performance</span>
             </span>
diff --git a/app/Filament/Widgets/ChartPlayerPerfMoAv.php b/app/Filament/Widgets/ChartPlayerPerfMoAv.php
index 10195f74..cbc97ad2 100644
--- a/app/Filament/Widgets/ChartPlayerPerfMoAv.php
+++ b/app/Filament/Widgets/ChartPlayerPerfMoAv.php
@@ -2,8 +2,8 @@
 
 namespace App\Filament\Widgets;
 
-use App\Filament\Widgets\Data\HelperMoveingAverage;
-use App\Filament\Widgets\Data\LoadPlayerPerformance;
+use App\Filament\Widgets\Charts\HelperMoveingAverage;
+use App\Filament\Widgets\Charts\LoadPlayerPerformance;
 use Filament\Support\RawJs;
 use Filament\Widgets\ChartWidget;
 use Illuminate\Support\HtmlString;
@@ -38,7 +38,7 @@ class ChartPlayerPerfMoAv extends ChartWidget
                         c0.211,0.1782,0.5264,0.1516,0.7046-0.0593C13.0037,6.5523,13.0018,6.2761,12.84,6.09z"></path>
                         </g>
                     </svg> 
-                    ' . $this->player . '
+                    '.$this->player.'
                 </span>
                 <span>Performance Moving Average</span>
             </span>
diff --git a/app/Filament/Widgets/Data/HelperMoveingAverage.php b/app/Filament/Widgets/Charts/HelperMoveingAverage.php
similarity index 78%
rename from app/Filament/Widgets/Data/HelperMoveingAverage.php
rename to app/Filament/Widgets/Charts/HelperMoveingAverage.php
index 2c606fb9..99737f78 100644
--- a/app/Filament/Widgets/Data/HelperMoveingAverage.php
+++ b/app/Filament/Widgets/Charts/HelperMoveingAverage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Widgets\Data;
+namespace App\Filament\Widgets\Charts;
 
 class HelperMoveingAverage
 {
@@ -19,9 +19,9 @@ class HelperMoveingAverage
             $last = count($arr);
             foreach ($arr as $key => $value) {
                 if ($key == 1 && $last > 2) {
-                    $new[] = round(((float)  $arr[0] + (float)  $value + (float) $arr[2]) / 3, 1);
+                    $new[] = round(((float) $arr[0] + (float) $value + (float) $arr[2]) / 3, 1);
                 } elseif ($key > 1 && $key < $last - 1) {
-                    $new[] = round(((float) $arr[$key - 1] + (float)  $value + (float) $arr[$key + 1]) / 3, 1);
+                    $new[] = round(((float) $arr[$key - 1] + (float) $value + (float) $arr[$key + 1]) / 3, 1);
                 }
             }
             $data['datasets'][$k]['data'] = $new;
diff --git a/app/Filament/Widgets/Data/HelperMoveingAveragePerformens.php b/app/Filament/Widgets/Charts/HelperMoveingAveragePerformens.php
similarity index 97%
rename from app/Filament/Widgets/Data/HelperMoveingAveragePerformens.php
rename to app/Filament/Widgets/Charts/HelperMoveingAveragePerformens.php
index 71fa6a81..2d00b163 100644
--- a/app/Filament/Widgets/Data/HelperMoveingAveragePerformens.php
+++ b/app/Filament/Widgets/Charts/HelperMoveingAveragePerformens.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Widgets\Data;
+namespace App\Filament\Widgets\Charts;
 
 class HelperMoveingAveragePerformens
 {
diff --git a/app/Filament/Widgets/Data/HelperStatisticType.php b/app/Filament/Widgets/Charts/HelperStatisticType.php
similarity index 93%
rename from app/Filament/Widgets/Data/HelperStatisticType.php
rename to app/Filament/Widgets/Charts/HelperStatisticType.php
index c4be4b1a..e1095967 100644
--- a/app/Filament/Widgets/Data/HelperStatisticType.php
+++ b/app/Filament/Widgets/Charts/HelperStatisticType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Widgets\Data;
+namespace App\Filament\Widgets\Charts;
 
 class HelperStatisticType
 {
diff --git a/app/Filament/Widgets/Data/LoadEvents.php b/app/Filament/Widgets/Charts/LoadEvents.php
similarity index 98%
rename from app/Filament/Widgets/Data/LoadEvents.php
rename to app/Filament/Widgets/Charts/LoadEvents.php
index f6c0138b..78dad7ac 100644
--- a/app/Filament/Widgets/Data/LoadEvents.php
+++ b/app/Filament/Widgets/Charts/LoadEvents.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Widgets\Data;
+namespace App\Filament\Widgets\Charts;
 
-use App\Filament\Widgets\Data\LoadEvents\LoadEventsAverages;
-use App\Filament\Widgets\Data\LoadEvents\LoadEventsQuery;
-use App\Filament\Widgets\Data\LoadEvents\LoadExpectations;
+use App\Filament\Widgets\Charts\LoadEvents\LoadEventsAverages;
+use App\Filament\Widgets\Charts\LoadEvents\LoadEventsQuery;
+use App\Filament\Widgets\Charts\LoadEvents\LoadExpectations;
 use App\Models\StatisticFixtures;
 use Illuminate\Support\Carbon;
 
diff --git a/app/Filament/Widgets/Data/LoadEvents/LoadEventsAverages.php b/app/Filament/Widgets/Charts/LoadEvents/LoadEventsAverages.php
similarity index 95%
rename from app/Filament/Widgets/Data/LoadEvents/LoadEventsAverages.php
rename to app/Filament/Widgets/Charts/LoadEvents/LoadEventsAverages.php
index 3ef6e875..b43d1e59 100644
--- a/app/Filament/Widgets/Data/LoadEvents/LoadEventsAverages.php
+++ b/app/Filament/Widgets/Charts/LoadEvents/LoadEventsAverages.php
@@ -1,10 +1,8 @@
 <?php
 
-namespace App\Filament\Widgets\Data\LoadEvents;
+namespace App\Filament\Widgets\Charts\LoadEvents;
 
-use App\Models\SofaScoreTournament;
 use App\Models\StatistikoEvent;
-use App\Models\Country;
 
 class LoadEventsAverages
 {
@@ -19,9 +17,9 @@ class LoadEventsAverages
         $start = $filter['start_date'] ?? 0;
         $end = $filter['end_date'] ?? 0;
 
-        if ($season_or_date != 'season')
+        if ($season_or_date != 'season') {
             $season = 0;
-        else {
+        } else {
             $end = 0;
             $start = 0;
         }
@@ -46,11 +44,11 @@ class LoadEventsAverages
             $league_home = [];
             $league_away = [];
 
-            // 1) la media dei falli di tutte le partite giocate dal Flamengo 
+            // 1) la media dei falli di tutte le partite giocate dal Flamengo
             // (esempio, giocate 6 partite con falli 17-11-15-14-15-12, la media è 14)
 
-            // 2) la media dei falli di tutte le partite giocate nel campionato Brasiliano 
-            // (esempio 6 giornate giocate = 60 partite quindi 120 squadre, quindi 120 dati tipo 17-12-12-15-8-15-13-21-..., 
+            // 2) la media dei falli di tutte le partite giocate nel campionato Brasiliano
+            // (esempio 6 giornate giocate = 60 partite quindi 120 squadre, quindi 120 dati tipo 17-12-12-15-8-15-13-21-...,
             // quindi la media di questi 120 dati)
 
             foreach ($res as $value) {
@@ -85,7 +83,7 @@ class LoadEventsAverages
                         break;
                 }
 
-                if ((!$team_position || $team_position == 'all') && ($team_id == $value['home_id'] or $team_id == $value['away_id'])) {
+                if ((! $team_position || $team_position == 'all') && ($team_id == $value['home_id'] or $team_id == $value['away_id'])) {
                     switch ($statistic_type) {
                         case 'gls':
                             if ($team_id == $value['home_id']) {
@@ -151,7 +149,7 @@ class LoadEventsAverages
                             }
                             break;
                     }
-                } else if ($team_position == 'home' && $team_id == $value['home_id']) {
+                } elseif ($team_position == 'home' && $team_id == $value['home_id']) {
                     switch ($statistic_type) {
                         case 'gls':
                             $team_home[] = (int) $value['gls_h'];
@@ -182,7 +180,7 @@ class LoadEventsAverages
                             $team_away[] = (int) $value['tsh_a'];
                             break;
                     }
-                } else if ($team_position == 'away' && $team_id == $value['away_id']) {
+                } elseif ($team_position == 'away' && $team_id == $value['away_id']) {
                     switch ($statistic_type) {
                         case 'gls':
                             $team_home[] = (int) $value['gls_a'];
diff --git a/app/Filament/Widgets/Data/LoadEvents/LoadEventsQuery.php b/app/Filament/Widgets/Charts/LoadEvents/LoadEventsQuery.php
similarity index 99%
rename from app/Filament/Widgets/Data/LoadEvents/LoadEventsQuery.php
rename to app/Filament/Widgets/Charts/LoadEvents/LoadEventsQuery.php
index 16314014..d42e8a6a 100644
--- a/app/Filament/Widgets/Data/LoadEvents/LoadEventsQuery.php
+++ b/app/Filament/Widgets/Charts/LoadEvents/LoadEventsQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Widgets\Data\LoadEvents;
+namespace App\Filament\Widgets\Charts\LoadEvents;
 
 use App\Filament\Pages\Selections\Helper\GetSeason;
 use App\Models\StatistikoEvent;
diff --git a/app/Filament/Widgets/Data/LoadEvents/LoadEventsQueryAll.php b/app/Filament/Widgets/Charts/LoadEvents/LoadEventsQueryAll.php
similarity index 99%
rename from app/Filament/Widgets/Data/LoadEvents/LoadEventsQueryAll.php
rename to app/Filament/Widgets/Charts/LoadEvents/LoadEventsQueryAll.php
index 1ed68950..cb7c078a 100644
--- a/app/Filament/Widgets/Data/LoadEvents/LoadEventsQueryAll.php
+++ b/app/Filament/Widgets/Charts/LoadEvents/LoadEventsQueryAll.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Widgets\Data\LoadEvents;
+namespace App\Filament\Widgets\Charts\LoadEvents;
 
 use App\Filament\Pages\Selections\Helper\GetSeason;
 use App\Models\StatistikoEvent;
diff --git a/app/Filament/Widgets/Data/LoadEvents/LoadExpectations.php b/app/Filament/Widgets/Charts/LoadEvents/LoadExpectations.php
similarity index 99%
rename from app/Filament/Widgets/Data/LoadEvents/LoadExpectations.php
rename to app/Filament/Widgets/Charts/LoadEvents/LoadExpectations.php
index fc177cb0..3bf562ea 100644
--- a/app/Filament/Widgets/Data/LoadEvents/LoadExpectations.php
+++ b/app/Filament/Widgets/Charts/LoadEvents/LoadExpectations.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Widgets\Data\LoadEvents;
+namespace App\Filament\Widgets\Charts\LoadEvents;
 
 use App\Models\StatistikoConfig;
 
diff --git a/app/Filament/Widgets/Data/LoadPerformance.php b/app/Filament/Widgets/Charts/LoadPerformance.php
similarity index 94%
rename from app/Filament/Widgets/Data/LoadPerformance.php
rename to app/Filament/Widgets/Charts/LoadPerformance.php
index e5d68446..8df44af7 100644
--- a/app/Filament/Widgets/Data/LoadPerformance.php
+++ b/app/Filament/Widgets/Charts/LoadPerformance.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Widgets\Data;
+namespace App\Filament\Widgets\Charts;
 
-use Illuminate\Support\Carbon;
+use App\Models\StatisticFixtures;
 use App\Models\StatistikoEvent;
 use App\Models\StatistikoPlayer;
-use App\Models\StatisticFixtures;
+use Illuminate\Support\Carbon;
 
 class LoadPerformance
 {
@@ -62,15 +62,15 @@ class LoadPerformance
                     if ($val->home_id == $home_id) {
                         $labels[] = round($val->starttime->diffInDays(Carbon::now()));
                         $date_home[] = $val['starttime']->format('Y-m-d H:i');
-                        $results_home[] = $val['gls_h'] . ' : ' . $val['gls_a'];
-                        $events_home[] = $val->home->ss_team_name . ' vs ' . $val->away->ss_team_name;
+                        $results_home[] = $val['gls_h'].' : '.$val['gls_a'];
+                        $events_home[] = $val->home->ss_team_name.' vs '.$val->away->ss_team_name;
                         $home_matches[] = $val->match_id;
                     }
                     if ($val->away_id == $away_id) {
                         $labels[] = round($val->starttime->diffInDays(Carbon::now()));
                         $date_away[] = $val['starttime']->format('Y-m-d H:i');
-                        $results_away[] = $val['gls_h'] . ' : ' . $val['gls_a'];
-                        $events_away[] = $val->home->ss_team_name . ' vs ' . $val->away->ss_team_name;
+                        $results_away[] = $val['gls_h'].' : '.$val['gls_a'];
+                        $events_away[] = $val->home->ss_team_name.' vs '.$val->away->ss_team_name;
                         $away_matches[] = $val->match_id;
                     }
                     break;
@@ -78,15 +78,15 @@ class LoadPerformance
                     if ($val->away_id == $home_id) {
                         $labels[] = round($val->starttime->diffInDays(Carbon::now()));
                         $date_home[] = $val['starttime']->format('Y-m-d H:i');
-                        $results_home[] = $val['gls_h'] . ' : ' . $val['gls_a'];
-                        $events_home[] = $val->home->name . ' vs ' . $val->away->name;
+                        $results_home[] = $val['gls_h'].' : '.$val['gls_a'];
+                        $events_home[] = $val->home->name.' vs '.$val->away->name;
                         $home_matches[] = $val->match_id;
                     }
                     if ($val->home_id == $away_id) {
                         $labels[] = round($val->starttime->diffInDays(Carbon::now()));
                         $date_away[] = $val['starttime']->format('Y-m-d H:i');
-                        $results_away[] = $val['gls_h'] . ' : ' . $val['gls_a'];
-                        $events_away[] = $val->home->ss_team_name . ' vs ' . $val->away->ss_team_name;
+                        $results_away[] = $val['gls_h'].' : '.$val['gls_a'];
+                        $events_away[] = $val->home->ss_team_name.' vs '.$val->away->ss_team_name;
                         $away_matches[] = $val->match_id;
                     }
                     break;
@@ -94,15 +94,15 @@ class LoadPerformance
                     if ($val->home_id == $home_id or $val->away_id == $home_id) {
                         $labels[] = round($val->starttime->diffInDays(Carbon::now()));
                         $date_home[] = $val['starttime']->format('Y-m-d H:i');
-                        $results_home[] = $val['gls_h'] . ' : ' . $val['gls_a'];
-                        $events_home[] = $val->home->ss_team_name . ' vs ' . $val->away->ss_team_name;
+                        $results_home[] = $val['gls_h'].' : '.$val['gls_a'];
+                        $events_home[] = $val->home->ss_team_name.' vs '.$val->away->ss_team_name;
                         $home_matches[] = $val->match_id;
                     }
                     if ($val->home_id == $away_id or $val->away_id == $away_id) {
                         $labels[] = round($val->starttime->diffInDays(Carbon::now()));
                         $date_away[] = $val['starttime']->format('Y-m-d H:i');
-                        $results_away[] = $val['gls_h'] . ' : ' . $val['gls_a'];
-                        $events_away[] = $val->home->ss_team_name . ' vs ' . $val->away->ss_team_name;
+                        $results_away[] = $val['gls_h'].' : '.$val['gls_a'];
+                        $events_away[] = $val->home->ss_team_name.' vs '.$val->away->ss_team_name;
                         $away_matches[] = $val->match_id;
                     }
                     break;
@@ -128,7 +128,6 @@ class LoadPerformance
         $home_av = self::makeAv($homes, $length);
         $away_av = self::makeAv($aways, $length);
 
-
         $res = StatistikoPlayer::whereIn('match_id', $league_matches)->select('match_id', 'ss_player_id', 'activeteam_id', 'minutes_played', 'playerrating_value', 'player_position')->get();
         $league = self::filterMatches($res, $league_matches);
         $league_av = self::leagueAv($league, $length);
@@ -427,7 +426,7 @@ class LoadPerformance
 
     public static function filterMatches($res, array $matches, $team_id = 0)
     {
-        if (!$res->count()) {
+        if (! $res->count()) {
             return ['all', 'def', 'att', 'mid'];
         }
 
@@ -454,7 +453,7 @@ class LoadPerformance
                 $result[$match_id]['def']['rating'] = 0;
             }
 
-            if (0 == $team_id || $value->activeteam_id == $team_id) {
+            if ($team_id == 0 || $value->activeteam_id == $team_id) {
 
                 if ($value->minutes_played > 0) {
 
@@ -565,10 +564,10 @@ class LoadPerformance
     public static function makeAv(array &$arr, int $length)
     {
         if (isset($arr['all']) && count($arr['all'])) {
-            $all = isset($arr['all']) ?  array_sum($arr['all']) / count($arr['all']) : 1;
-            $def = isset($arr['def']) ?  array_sum($arr['def']) / count($arr['def']) : 1;
-            $mid = isset($arr['mid']) ?  array_sum($arr['mid']) / count($arr['mid']) : 1;
-            $att = isset($arr['att']) ?  array_sum($arr['att']) / count($arr['att']) : 1;
+            $all = isset($arr['all']) ? array_sum($arr['all']) / count($arr['all']) : 1;
+            $def = isset($arr['def']) ? array_sum($arr['def']) / count($arr['def']) : 1;
+            $mid = isset($arr['mid']) ? array_sum($arr['mid']) / count($arr['mid']) : 1;
+            $att = isset($arr['att']) ? array_sum($arr['att']) / count($arr['att']) : 1;
             $ret = [];
             $ret['all'] = array_fill(0, $length, round($all, 2));
             $ret['def'] = array_fill(0, $length, round($def, 2));
diff --git a/app/Filament/Widgets/Data/LoadPlayerPerformance.php b/app/Filament/Widgets/Charts/LoadPlayerPerformance.php
similarity index 98%
rename from app/Filament/Widgets/Data/LoadPlayerPerformance.php
rename to app/Filament/Widgets/Charts/LoadPlayerPerformance.php
index cd1196a6..3cc05c9a 100644
--- a/app/Filament/Widgets/Data/LoadPlayerPerformance.php
+++ b/app/Filament/Widgets/Charts/LoadPlayerPerformance.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Widgets\Data;
+namespace App\Filament\Widgets\Charts;
 
-use Illuminate\Support\Carbon;
 use App\Models\StatistikoDetail;
 use App\Models\StatistikoPlayer;
+use Illuminate\Support\Carbon;
 
 class LoadPlayerPerformance
 {
diff --git a/app/Filament/Widgets/Data/LoadPlayerWidgets.php b/app/Filament/Widgets/Charts/LoadPlayerWidgets.php
similarity index 99%
rename from app/Filament/Widgets/Data/LoadPlayerWidgets.php
rename to app/Filament/Widgets/Charts/LoadPlayerWidgets.php
index 446a786b..fcc4a66e 100644
--- a/app/Filament/Widgets/Data/LoadPlayerWidgets.php
+++ b/app/Filament/Widgets/Charts/LoadPlayerWidgets.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Widgets\Data;
+namespace App\Filament\Widgets\Charts;
 
 use App\Filament\Pages\Selections\Helper\GetSeason;
 use App\Models\StatistikoDetail;