diff --git a/Math/Shape/D2/Circle.php b/Math/Geometry/Shape/D2/Circle.php
similarity index 97%
rename from Math/Shape/D2/Circle.php
rename to Math/Geometry/Shape/D2/Circle.php
index 9e70ceb41..996785427 100644
--- a/Math/Shape/D2/Circle.php
+++ b/Math/Geometry/Shape/D2/Circle.php
@@ -13,7 +13,7 @@
  */
 declare(strict_types=1);
 
-namespace phpOMS\Math\Shape\D2;
+namespace phpOMS\Math\Geometry\Shape\D2;
 
 /**
  * Circle shape.
diff --git a/Math/Shape/D2/D2ShapeInterface.php b/Math/Geometry/Shape/D2/D2ShapeInterface.php
similarity index 84%
rename from Math/Shape/D2/D2ShapeInterface.php
rename to Math/Geometry/Shape/D2/D2ShapeInterface.php
index c1c432d34..47be0c709 100644
--- a/Math/Shape/D2/D2ShapeInterface.php
+++ b/Math/Geometry/Shape/D2/D2ShapeInterface.php
@@ -13,9 +13,9 @@
  */
 declare(strict_types=1);
 
-namespace phpOMS\Math\Shape\D2;
+namespace phpOMS\Math\Geometry\Shape\D2;
 
-use phpOMS\Math\Shape\ShapeInterface;
+use phpOMS\Math\Geometry\Shape\ShapeInterface;
 
 /**
  * Shape interface.
diff --git a/Math/Shape/D2/Ellipse.php b/Math/Geometry/Shape/D2/Ellipse.php
similarity index 97%
rename from Math/Shape/D2/Ellipse.php
rename to Math/Geometry/Shape/D2/Ellipse.php
index 574e630c7..289f1c297 100644
--- a/Math/Shape/D2/Ellipse.php
+++ b/Math/Geometry/Shape/D2/Ellipse.php
@@ -13,7 +13,7 @@
  */
 declare(strict_types=1);
 
-namespace phpOMS\Math\Shape\D2;
+namespace phpOMS\Math\Geometry\Shape\D2;
 
 /**
  * Ellipse shape.
diff --git a/Math/Shape/D2/Polygon.php b/Math/Geometry/Shape/D2/Polygon.php
similarity index 99%
rename from Math/Shape/D2/Polygon.php
rename to Math/Geometry/Shape/D2/Polygon.php
index 92c844ea0..a003b6341 100644
--- a/Math/Shape/D2/Polygon.php
+++ b/Math/Geometry/Shape/D2/Polygon.php
@@ -13,7 +13,7 @@
  */
 declare(strict_types=1);
 
-namespace phpOMS\Math\Shape\D2;
+namespace phpOMS\Math\Geometry\Shape\D2;
 
 /**
  * Polygon class.
diff --git a/Math/Shape/D2/Quadrilateral.php b/Math/Geometry/Shape/D2/Quadrilateral.php
similarity index 87%
rename from Math/Shape/D2/Quadrilateral.php
rename to Math/Geometry/Shape/D2/Quadrilateral.php
index 9227af40a..a2eb21912 100644
--- a/Math/Shape/D2/Quadrilateral.php
+++ b/Math/Geometry/Shape/D2/Quadrilateral.php
@@ -12,7 +12,7 @@
  * @link       http://orange-management.com
  */
 declare(strict_types=1);
- namespace phpOMS\Math\Shape\D2;
+ namespace phpOMS\Math\Geometry\Shape\D2;
 
 class Quadrilateral implements D2ShapeInterface
 {
diff --git a/Math/Shape/D2/Rectangle.php b/Math/Geometry/Shape/D2/Rectangle.php
similarity index 96%
rename from Math/Shape/D2/Rectangle.php
rename to Math/Geometry/Shape/D2/Rectangle.php
index ea1034bbe..05d43d330 100644
--- a/Math/Shape/D2/Rectangle.php
+++ b/Math/Geometry/Shape/D2/Rectangle.php
@@ -13,7 +13,7 @@
  */
 declare(strict_types=1);
 
-namespace phpOMS\Math\Shape\D2;
+namespace phpOMS\Math\Geometry\Shape\D2;
 
 /**
  * Rectangle shape.
diff --git a/Math/Shape/D2/Trapezoid.php b/Math/Geometry/Shape/D2/Trapezoid.php
similarity index 98%
rename from Math/Shape/D2/Trapezoid.php
rename to Math/Geometry/Shape/D2/Trapezoid.php
index 720af871f..a0943ea2b 100644
--- a/Math/Shape/D2/Trapezoid.php
+++ b/Math/Geometry/Shape/D2/Trapezoid.php
@@ -13,7 +13,7 @@
  */
 declare(strict_types=1);
 
-namespace phpOMS\Math\Shape\D2;
+namespace phpOMS\Math\Geometry\Shape\D2;
 
 /**
  * Trapezoid shape.
diff --git a/Math/Shape/D2/Triangle.php b/Math/Geometry/Shape/D2/Triangle.php
similarity index 97%
rename from Math/Shape/D2/Triangle.php
rename to Math/Geometry/Shape/D2/Triangle.php
index 6fd63b202..4493d196b 100644
--- a/Math/Shape/D2/Triangle.php
+++ b/Math/Geometry/Shape/D2/Triangle.php
@@ -13,7 +13,7 @@
  */
 declare(strict_types=1);
 
-namespace phpOMS\Math\Shape\D2;
+namespace phpOMS\Math\Geometry\Shape\D2;
 
 /**
  * Triangle shape.
diff --git a/Math/Shape/D3/Cone.php b/Math/Geometry/Shape/D3/Cone.php
similarity index 97%
rename from Math/Shape/D3/Cone.php
rename to Math/Geometry/Shape/D3/Cone.php
index c2993b0a8..2dc80e45e 100644
--- a/Math/Shape/D3/Cone.php
+++ b/Math/Geometry/Shape/D3/Cone.php
@@ -13,7 +13,7 @@
  */
 declare(strict_types=1);
 
-namespace phpOMS\Math\Shape\D3;
+namespace phpOMS\Math\Geometry\Shape\D3;
 
 /**
  * Cone shape.
diff --git a/Math/Shape/D3/Cuboid.php b/Math/Geometry/Shape/D3/Cuboid.php
similarity index 96%
rename from Math/Shape/D3/Cuboid.php
rename to Math/Geometry/Shape/D3/Cuboid.php
index 1e8f1dd0a..35ce4f6ae 100644
--- a/Math/Shape/D3/Cuboid.php
+++ b/Math/Geometry/Shape/D3/Cuboid.php
@@ -13,7 +13,7 @@
  */
 declare(strict_types=1);
 
-namespace phpOMS\Math\Shape\D3;
+namespace phpOMS\Math\Geometry\Shape\D3;
 
 /**
  * Cuboid shape.
diff --git a/Math/Shape/D3/Cylinder.php b/Math/Geometry/Shape/D3/Cylinder.php
similarity index 97%
rename from Math/Shape/D3/Cylinder.php
rename to Math/Geometry/Shape/D3/Cylinder.php
index 5bed17dc2..2062250e0 100644
--- a/Math/Shape/D3/Cylinder.php
+++ b/Math/Geometry/Shape/D3/Cylinder.php
@@ -13,7 +13,7 @@
  */
 declare(strict_types=1);
 
-namespace phpOMS\Math\Shape\D3;
+namespace phpOMS\Math\Geometry\Shape\D3;
 
 /**
  * Cylinder shape.
diff --git a/Math/Shape/D3/D3ShapeInterface.php b/Math/Geometry/Shape/D3/D3ShapeInterface.php
similarity index 84%
rename from Math/Shape/D3/D3ShapeInterface.php
rename to Math/Geometry/Shape/D3/D3ShapeInterface.php
index 9c51a7330..af28edc99 100644
--- a/Math/Shape/D3/D3ShapeInterface.php
+++ b/Math/Geometry/Shape/D3/D3ShapeInterface.php
@@ -13,9 +13,9 @@
  */
 declare(strict_types=1);
 
-namespace phpOMS\Math\Shape\D3;
+namespace phpOMS\Math\Geometry\Shape\D3;
 
-use phpOMS\Math\Shape\ShapeInterface;
+use phpOMS\Math\Geometry\Shape\ShapeInterface;
 
 /**
  * Shape interface.
diff --git a/Math/Shape/D3/Prism.php b/Math/Geometry/Shape/D3/Prism.php
similarity index 87%
rename from Math/Shape/D3/Prism.php
rename to Math/Geometry/Shape/D3/Prism.php
index b94ae9452..f6ba669a5 100644
--- a/Math/Shape/D3/Prism.php
+++ b/Math/Geometry/Shape/D3/Prism.php
@@ -12,7 +12,7 @@
  * @link       http://orange-management.com
  */
 declare(strict_types=1);
- namespace phpOMS\Math\Shape\D3;
+ namespace phpOMS\Math\Geometry\Shape\D3;
 
 class Prism implements D3ShapeInterface
 {
diff --git a/Math/Shape/D3/RectangularPyramid.php b/Math/Geometry/Shape/D3/RectangularPyramid.php
similarity index 97%
rename from Math/Shape/D3/RectangularPyramid.php
rename to Math/Geometry/Shape/D3/RectangularPyramid.php
index 9e20950dd..2c437a905 100644
--- a/Math/Shape/D3/RectangularPyramid.php
+++ b/Math/Geometry/Shape/D3/RectangularPyramid.php
@@ -13,7 +13,7 @@
  */
 declare(strict_types=1);
 
-namespace phpOMS\Math\Shape\D3;
+namespace phpOMS\Math\Geometry\Shape\D3;
 
 /**
  * Rectangular pyramid shape.
diff --git a/Math/Shape/D3/Sphere.php b/Math/Geometry/Shape/D3/Sphere.php
similarity index 98%
rename from Math/Shape/D3/Sphere.php
rename to Math/Geometry/Shape/D3/Sphere.php
index 41fbc8763..334e872b6 100644
--- a/Math/Shape/D3/Sphere.php
+++ b/Math/Geometry/Shape/D3/Sphere.php
@@ -13,13 +13,13 @@
  */
 declare(strict_types=1);
 
-namespace phpOMS\Math\Shape\D3;
+namespace phpOMS\Math\Geometry\Shape\D3;
 
 /**
  * Sphere shape.
  *
  * @category   Framework
- * @package    phpOMS\Math\Shape
+ * @package    phpOMS\Math\Geometry\Shape
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Math/Shape/D3/Tetrahedron.php b/Math/Geometry/Shape/D3/Tetrahedron.php
similarity index 96%
rename from Math/Shape/D3/Tetrahedron.php
rename to Math/Geometry/Shape/D3/Tetrahedron.php
index 58066b9c5..e50351841 100644
--- a/Math/Shape/D3/Tetrahedron.php
+++ b/Math/Geometry/Shape/D3/Tetrahedron.php
@@ -13,7 +13,7 @@
  */
 declare(strict_types=1);
 
-namespace phpOMS\Math\Shape\D3;
+namespace phpOMS\Math\Geometry\Shape\D3;
 
 /**
  * Tetraedron shape.
diff --git a/Math/Shape/ShapeInterface.php b/Math/Geometry/Shape/ShapeInterface.php
similarity index 92%
rename from Math/Shape/ShapeInterface.php
rename to Math/Geometry/Shape/ShapeInterface.php
index 4b4e5743d..8e336e504 100644
--- a/Math/Shape/ShapeInterface.php
+++ b/Math/Geometry/Shape/ShapeInterface.php
@@ -13,7 +13,7 @@
  */
 declare(strict_types=1);
 
-namespace phpOMS\Math\Shape;
+namespace phpOMS\Math\Geometry\Shape;
 
 /**
  * Shape interface.
diff --git a/Math/Optimization/TSP/City.php b/Math/Optimization/TSP/City.php
index b0e9be4da..d2e45f0f7 100644
--- a/Math/Optimization/TSP/City.php
+++ b/Math/Optimization/TSP/City.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
 
 namespace phpOMS\Math\Optimization\TSP;
 
-use phpOMS\Math\Shape\D3\Sphere;
+use phpOMS\Math\Geometry\Shape\D3\Sphere;
 
 /**
  * City class.