diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3caae5cf2..8a7d968e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,17 @@
 # Changelog
 
 ## [Unreleased]
+
+## [5.5.0] - 2023-07-07
 ### Added
 - Support for Lambert Cylindrical Equal Area (Spherical) projection
 ### Changed
 - Infer a current epoch when doing time-dependant transforms and no explicit epoch is supplied
 - Updates to data for Polar regions, Algeria and Spain
+### Deprecated
+- The namespace of all `*Point` classes have been tidied up and changed to from `PHPCoord` to `PHPCoord\Point` e.g. 
+  `PHPCoord\GeographicPoint` is now `PHPCoord\Point\GeographicPoint`. An alias has been provided, all existing
+  code referencing the old names will continue to work
 
 ## [5.4.0] - 2023-05-27
 ### Added
@@ -273,8 +279,9 @@ Initial release of this fork (based off of v2.3 of original)
  - Eastings and northings are rounded to 1m, and lat/long to 5dp (approx 1m) to avoid any misconceptions that precision is the same thing as accuracy.
  - When calculating surface distances, a more accurate mean radius is now used rather than that derived from historical definitions of a nautical mile
 
-[Unreleased]: https://github.com/dvdoug/PHPCoord/compare/v5.4.0...HEAD
+[Unreleased]: https://github.com/dvdoug/PHPCoord/compare/v5.5.0...HEAD
 
+[5.5.0]: https://github.com/dvdoug/PHPCoord/compare/v5.4.0...v5.5.0
 [5.4.0]: https://github.com/dvdoug/PHPCoord/compare/v5.3.1...v5.4.0
 [5.3.1]: https://github.com/dvdoug/PHPCoord/compare/v5.3.0...v5.3.1
 [5.3.0]: https://github.com/dvdoug/PHPCoord/compare/v5.2.0...v5.3.0
diff --git a/docs/coordinate_conversions_easy.rst b/docs/coordinate_conversions_easy.rst
index 8a1004159..363fb64f8 100644
--- a/docs/coordinate_conversions_easy.rst
+++ b/docs/coordinate_conversions_easy.rst
@@ -20,7 +20,7 @@ Examples:
     <?php
     use PHPCoord\CoordinateReferenceSystem\Geographic2D;
     use PHPCoord\CoordinateReferenceSystem\Projected;
-    use PHPCoord\GeographicPoint;
+    use PHPCoord\Point\GeographicPoint;
     use PHPCoord\UnitOfMeasure\Angle\Degree;
 
     // Converting from NAD83 to Florida State Plane
@@ -38,7 +38,7 @@ Examples:
     <?php
     use PHPCoord\CoordinateReferenceSystem\Geographic2D;
     use PHPCoord\CoordinateReferenceSystem\Projected;
-    use PHPCoord\ProjectedPoint;
+    use PHPCoord\Point\ProjectedPoint;
     use PHPCoord\UnitOfMeasure\Length\Metre;
 
     // Converting from Florida State Plane to NAD83
diff --git a/docs/creating_points_compound.rst b/docs/creating_points_compound.rst
index cf84d8622..8c7a931d4 100644
--- a/docs/creating_points_compound.rst
+++ b/docs/creating_points_compound.rst
@@ -22,9 +22,9 @@ Example:
     <?php
     use PHPCoord\CoordinateReferenceSystem\Projected;
     use PHPCoord\CoordinateReferenceSystem\Vertical;
-    use PHPCoord\CompoundPoint;
-    use PHPCoord\ProjectedPoint;
-    use PHPCoord\VerticalPoint;
+    use PHPCoord\Point\CompoundPoint;
+    use PHPCoord\Point\ProjectedPoint;
+    use PHPCoord\Point\VerticalPoint;
     use PHPCoord\UnitOfMeasure\Length\Metre;
 
     // Horizontal location of Ben Nevis peak using British National Grid
diff --git a/docs/creating_points_geocentric.rst b/docs/creating_points_geocentric.rst
index 377406e70..1e529f578 100644
--- a/docs/creating_points_geocentric.rst
+++ b/docs/creating_points_geocentric.rst
@@ -21,7 +21,7 @@ Examples:
 
     <?php
     use PHPCoord\CoordinateReferenceSystem\Geocentric;
-    use PHPCoord\GeocentricPoint;
+    use PHPCoord\Point\GeocentricPoint;
     use PHPCoord\UnitOfMeasure\Length\Metre;
 
     // Ascension Island GPS tracking station in ITRF2008 (unknown date), traditional arguments
diff --git a/docs/creating_points_geographic.rst b/docs/creating_points_geographic.rst
index 02bb1a634..dcb08b36d 100644
--- a/docs/creating_points_geographic.rst
+++ b/docs/creating_points_geographic.rst
@@ -26,7 +26,7 @@ Examples:
 
     <?php
     use PHPCoord\CoordinateReferenceSystem\Geographic2D;
-    use PHPCoord\GeographicPoint;
+    use PHPCoord\Point\GeographicPoint;
     use PHPCoord\UnitOfMeasure\Angle\Degree;
 
     // the Statue of Liberty in WGS84 (unknown date), traditional arguments, decimal degrees
diff --git a/docs/creating_points_projected.rst b/docs/creating_points_projected.rst
index 5050213f5..639d9d68a 100644
--- a/docs/creating_points_projected.rst
+++ b/docs/creating_points_projected.rst
@@ -52,7 +52,7 @@ Examples:
 
     <?php
     use PHPCoord\CoordinateReferenceSystem\Projected;
-    use PHPCoord\ProjectedPoint;
+    use PHPCoord\Point\ProjectedPoint;
     use PHPCoord\UnitOfMeasure\Length\Metre;
 
     // Nelson's Column in British National Grid (unknown date), traditional arguments
@@ -141,8 +141,8 @@ Examples:
 
     <?php
     use PHPCoord\CoordinateReferenceSystem\Projected;
-    use PHPCoord\BritishNationalGridPoint;
-    use PHPCoord\ProjectedPoint;
+    use PHPCoord\Point\BritishNationalGridPoint;
+    use PHPCoord\Point\ProjectedPoint;
     use PHPCoord\UnitOfMeasure\Length\Metre;
 
     // Nelson's Column
@@ -195,8 +195,8 @@ Examples:
 
     <?php
     use PHPCoord\CoordinateReferenceSystem\Projected;
-    use PHPCoord\IrishGridPoint;
-    use PHPCoord\ProjectedPoint;
+    use PHPCoord\Point\IrishGridPoint;
+    use PHPCoord\Point\ProjectedPoint;
     use PHPCoord\UnitOfMeasure\Length\Metre;
 
     // Spire of Dublin
@@ -245,8 +245,8 @@ Examples:
 
     <?php
     use PHPCoord\CoordinateReferenceSystem\Projected;
-    use PHPCoord\IrishTransverseMercatorPoint;
-    use PHPCoord\ProjectedPoint;
+    use PHPCoord\Point\IrishTransverseMercatorPoint;
+    use PHPCoord\Point\ProjectedPoint;
     use PHPCoord\UnitOfMeasure\Length\Metre;
 
     // Spire of Dublin
@@ -290,7 +290,7 @@ Examples:
 
     <?php
     use PHPCoord\CoordinateReferenceSystem\Projected;
-    use PHPCoord\ProjectedPoint;
+    use PHPCoord\Point\ProjectedPoint;
     use PHPCoord\UnitOfMeasure\Length\Metre;
 
     // Piazza San Marco, Venice
@@ -332,7 +332,7 @@ Example:
 
     <?php
     use PHPCoord\CoordinateReferenceSystem\Projected;
-    use PHPCoord\ProjectedPoint;
+    use PHPCoord\Point\ProjectedPoint;
     use PHPCoord\UnitOfMeasure\Length\Metre;
 
     // Piazza San Marco, Venice
@@ -369,7 +369,7 @@ Example:
 
     <?php
     use PHPCoord\CoordinateReferenceSystem\Geographic;
-    use PHPCoord\UTMPoint;
+    use PHPCoord\Point\UTMPoint;
     use PHPCoord\UnitOfMeasure\Length\Metre;
 
     // Piazza San Marco, Venice
diff --git a/docs/creating_points_vertical.rst b/docs/creating_points_vertical.rst
index 294fc88c4..7d8a8dcc5 100644
--- a/docs/creating_points_vertical.rst
+++ b/docs/creating_points_vertical.rst
@@ -21,7 +21,7 @@ Examples:
 
     <?php
     use PHPCoord\CoordinateReferenceSystem\Vertical;
-    use PHPCoord\VerticalPoint;
+    use PHPCoord\Point\VerticalPoint;
     use PHPCoord\UnitOfMeasure\Length\Metre;
 
     // an arbitrary height in New Zealand Vertical Datum (unknown date), traditional arguments
diff --git a/docs/primer.rst b/docs/primer.rst
index 5843d3f4a..ab7761b67 100644
--- a/docs/primer.rst
+++ b/docs/primer.rst
@@ -342,6 +342,7 @@ portion of a coordinate is called an *epoch*.
     and accepts dates in standard PHP ``DateTime``/``DateTimeImmutable`` format instead.
 
     If, like most people you don't have dates for your coordinates, you can also use ``null`` or leave blank entirely.
+    Doing this means that PHPCoord will infer the current date when converting coordinates between systems.
 
 
 EPSG codes