diff --git a/src/Models/BaseChartModel.php b/src/Models/BaseChartModel.php
index 53e7de4..9f0a12c 100644
--- a/src/Models/BaseChartModel.php
+++ b/src/Models/BaseChartModel.php
@@ -3,6 +3,18 @@
 
 namespace Asantibanez\LivewireCharts\Models;
 
+use Asantibanez\LivewireCharts\Models\Traits\HasAnimation;
+use Asantibanez\LivewireCharts\Models\Traits\HasAxis;
+use Asantibanez\LivewireCharts\Models\Traits\HasColors;
+use Asantibanez\LivewireCharts\Models\Traits\HasDataLabels;
+use Asantibanez\LivewireCharts\Models\Traits\HasGrid;
+use Asantibanez\LivewireCharts\Models\Traits\HasJsonConfig;
+use Asantibanez\LivewireCharts\Models\Traits\HasLegend;
+use Asantibanez\LivewireCharts\Models\Traits\HasSparkline;
+use Asantibanez\LivewireCharts\Models\Traits\HasStroke;
+use Asantibanez\LivewireCharts\Models\Traits\HasTheme;
+use Asantibanez\LivewireCharts\Models\Traits\HasTitle;
+
 /**
  * Class BaseChartModel
  * @package Asantibanez\LivewireCharts\Models
diff --git a/src/Models/HasAnimation.php b/src/Models/Traits/HasAnimation.php
similarity index 92%
rename from src/Models/HasAnimation.php
rename to src/Models/Traits/HasAnimation.php
index c149430..5685c3b 100644
--- a/src/Models/HasAnimation.php
+++ b/src/Models/Traits/HasAnimation.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Asantibanez\LivewireCharts\Models;
+namespace Asantibanez\LivewireCharts\Models\Traits;
 
 
 trait HasAnimation
diff --git a/src/Models/HasAxis.php b/src/Models/Traits/HasAxis.php
similarity index 96%
rename from src/Models/HasAxis.php
rename to src/Models/Traits/HasAxis.php
index f38298f..9ffa058 100644
--- a/src/Models/HasAxis.php
+++ b/src/Models/Traits/HasAxis.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Asantibanez\LivewireCharts\Models;
+namespace Asantibanez\LivewireCharts\Models\Traits;
 
 
 trait HasAxis
diff --git a/src/Models/HasColors.php b/src/Models/Traits/HasColors.php
similarity index 95%
rename from src/Models/HasColors.php
rename to src/Models/Traits/HasColors.php
index 13e784d..d600473 100644
--- a/src/Models/HasColors.php
+++ b/src/Models/Traits/HasColors.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Asantibanez\LivewireCharts\Models;
+namespace Asantibanez\LivewireCharts\Models\Traits;
 
 
 trait HasColors
diff --git a/src/Models/HasDataLabels.php b/src/Models/Traits/HasDataLabels.php
similarity index 94%
rename from src/Models/HasDataLabels.php
rename to src/Models/Traits/HasDataLabels.php
index cdd055d..e211294 100644
--- a/src/Models/HasDataLabels.php
+++ b/src/Models/Traits/HasDataLabels.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Asantibanez\LivewireCharts\Models;
+namespace Asantibanez\LivewireCharts\Models\Traits;
 
 
 trait HasDataLabels
diff --git a/src/Models/HasGrid.php b/src/Models/Traits/HasGrid.php
similarity index 95%
rename from src/Models/HasGrid.php
rename to src/Models/Traits/HasGrid.php
index 37ef778..734c492 100644
--- a/src/Models/HasGrid.php
+++ b/src/Models/Traits/HasGrid.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Asantibanez\LivewireCharts\Models;
+namespace Asantibanez\LivewireCharts\Models\Traits;
 
 
 trait HasGrid
diff --git a/src/Models/HasJsonConfig.php b/src/Models/Traits/HasJsonConfig.php
similarity index 92%
rename from src/Models/HasJsonConfig.php
rename to src/Models/Traits/HasJsonConfig.php
index 3c9544b..0eba9a1 100644
--- a/src/Models/HasJsonConfig.php
+++ b/src/Models/Traits/HasJsonConfig.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Asantibanez\LivewireCharts\Models;
+namespace Asantibanez\LivewireCharts\Models\Traits;
 
 
 trait HasJsonConfig
diff --git a/src/Models/HasLegend.php b/src/Models/Traits/HasLegend.php
similarity index 97%
rename from src/Models/HasLegend.php
rename to src/Models/Traits/HasLegend.php
index 3c7399c..276bcde 100644
--- a/src/Models/HasLegend.php
+++ b/src/Models/Traits/HasLegend.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Asantibanez\LivewireCharts\Models;
+namespace Asantibanez\LivewireCharts\Models\Traits;
 
 
 trait HasLegend
diff --git a/src/Models/HasSparkline.php b/src/Models/Traits/HasSparkline.php
similarity index 94%
rename from src/Models/HasSparkline.php
rename to src/Models/Traits/HasSparkline.php
index 2da4bb1..4eb8188 100644
--- a/src/Models/HasSparkline.php
+++ b/src/Models/Traits/HasSparkline.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Asantibanez\LivewireCharts\Models;
+namespace Asantibanez\LivewireCharts\Models\Traits;
 
 
 trait HasSparkline
diff --git a/src/Models/HasStroke.php b/src/Models/Traits/HasStroke.php
similarity index 94%
rename from src/Models/HasStroke.php
rename to src/Models/Traits/HasStroke.php
index f8f12b7..a1fbd1f 100644
--- a/src/Models/HasStroke.php
+++ b/src/Models/Traits/HasStroke.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Asantibanez\LivewireCharts\Models;
+namespace Asantibanez\LivewireCharts\Models\Traits;
 
 
 trait HasStroke
diff --git a/src/Models/HasTheme.php b/src/Models/Traits/HasTheme.php
similarity index 91%
rename from src/Models/HasTheme.php
rename to src/Models/Traits/HasTheme.php
index 1efdf27..f67ce25 100644
--- a/src/Models/HasTheme.php
+++ b/src/Models/Traits/HasTheme.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Asantibanez\LivewireCharts\Models;
+namespace Asantibanez\LivewireCharts\Models\Traits;
 
 
 trait HasTheme
@@ -11,7 +11,7 @@ trait HasTheme
     private $palette;
 
     /**
-     * Initialize 
+     * Initialize
      */
     public function initTheme()
     {
@@ -20,7 +20,7 @@ trait HasTheme
 
     /**
      * set default theme
-     * 
+     *
      * @return array $theme
      */
     private function defaultTheme()
@@ -33,9 +33,9 @@ trait HasTheme
 
     /**
      * set theme mode
-     * 
+     *
      * @param string $mode
-     * 
+     *
      * @return $this
      */
     public function setThemeMode(string $mode)
@@ -44,10 +44,10 @@ trait HasTheme
 
         return $this;
     }
-    
+
     /**
      * set theme mode to dark theme
-     * 
+     *
      * @return $this
      */
     public function darkMode()
@@ -59,7 +59,7 @@ trait HasTheme
 
     /**
      * set theme mode to light theme
-     * 
+     *
      * @return $this
      */
     public function lightMode()
@@ -68,12 +68,12 @@ trait HasTheme
 
         return $this;
     }
-    
+
     /**
      * set the dark mode option to on or off
-     * 
+     *
      * @param bool $status = true
-     * 
+     *
      * @return $this
      */
     public function setDarkMode(bool $status = true)
@@ -85,9 +85,9 @@ trait HasTheme
 
     /**
      * set theme pallete
-     * 
+     *
      * @param string $pallete
-     * 
+     *
      * @return $this
      */
     public function setThemePalette(string $palette)
@@ -99,9 +99,9 @@ trait HasTheme
 
     /**
      * convert the theme to array
-     * 
+     *
      * @param string $mode
-     * 
+     *
      * @return $this
      */
     protected function themeToArray()
@@ -113,9 +113,9 @@ trait HasTheme
 
     /**
      * set theme from array
-     * 
+     *
      * @param string $mode
-     * 
+     *
      * @return $this
      */
     protected function themeFromArray($array)
diff --git a/src/Models/HasTitle.php b/src/Models/Traits/HasTitle.php
similarity index 91%
rename from src/Models/HasTitle.php
rename to src/Models/Traits/HasTitle.php
index e13fc9f..97a4ae0 100644
--- a/src/Models/HasTitle.php
+++ b/src/Models/Traits/HasTitle.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Asantibanez\LivewireCharts\Models;
+namespace Asantibanez\LivewireCharts\Models\Traits;
 
 
 trait HasTitle