diff --git a/src/NmeaParser/Nmea/Garmin/PGRMZ.cs b/src/NmeaParser/Nmea/Garmin/PGRMZ.cs
index 82422e5..7a7b0a5 100644
--- a/src/NmeaParser/Nmea/Garmin/PGRMZ.cs
+++ b/src/NmeaParser/Nmea/Garmin/PGRMZ.cs
@@ -15,7 +15,7 @@
 using System;
 using System.Globalization;
 
-namespace NmeaParser.Nmea.Gps.Garmin
+namespace NmeaParser.Nmea.Garmin
 {
     /// <summary>
     /// Altitude Information
diff --git a/src/NmeaParser/Nmea/LaserRange/LaserRangeMessage.cs b/src/NmeaParser/Nmea/LaserRangeMessage.cs
similarity index 98%
rename from src/NmeaParser/Nmea/LaserRange/LaserRangeMessage.cs
rename to src/NmeaParser/Nmea/LaserRangeMessage.cs
index c95ab1c..3986c0b 100644
--- a/src/NmeaParser/Nmea/LaserRange/LaserRangeMessage.cs
+++ b/src/NmeaParser/Nmea/LaserRangeMessage.cs
@@ -15,7 +15,7 @@
 using System;
 using System.Globalization;
 
-namespace NmeaParser.Nmea.LaserRange
+namespace NmeaParser.Nmea
 {
     /// <summary>
     /// Laser Range Measurement
diff --git a/src/NmeaParser/Nmea/LaserRange/LaserTech/PLTIT.cs b/src/NmeaParser/Nmea/LaserTech/PLTIT.cs
similarity index 96%
rename from src/NmeaParser/Nmea/LaserRange/LaserTech/PLTIT.cs
rename to src/NmeaParser/Nmea/LaserTech/PLTIT.cs
index 7390d86..1739f68 100644
--- a/src/NmeaParser/Nmea/LaserRange/LaserTech/PLTIT.cs
+++ b/src/NmeaParser/Nmea/LaserTech/PLTIT.cs
@@ -12,7 +12,7 @@
 //  *   limitations under the License.
 //  ******************************************************************************
 
-namespace NmeaParser.Nmea.LaserRange.LaserTech
+namespace NmeaParser.Nmea.LaserTech
 {
     /// <summary>
     /// Laser Range 
diff --git a/src/NmeaParser/Nmea/LaserRange/Trimble/PTNLA.cs b/src/NmeaParser/Nmea/Trimble/PTNLA.cs
similarity index 95%
rename from src/NmeaParser/Nmea/LaserRange/Trimble/PTNLA.cs
rename to src/NmeaParser/Nmea/Trimble/PTNLA.cs
index 17c31bb..77a495f 100644
--- a/src/NmeaParser/Nmea/LaserRange/Trimble/PTNLA.cs
+++ b/src/NmeaParser/Nmea/Trimble/PTNLA.cs
@@ -12,10 +12,10 @@
 //  *   limitations under the License.
 //  ******************************************************************************
 
-namespace NmeaParser.Nmea.LaserRange.Trimble
+namespace NmeaParser.Nmea.Trimble
 {
     /// <summary>
-    /// Burden finder
+    /// Laser Range Burden finder
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Ptnla")]
     [NmeaMessageType("PTNLA")]
diff --git a/src/NmeaParser/Nmea/LaserRange/Trimble/PTNLB.cs b/src/NmeaParser/Nmea/Trimble/PTNLB.cs
similarity index 97%
rename from src/NmeaParser/Nmea/LaserRange/Trimble/PTNLB.cs
rename to src/NmeaParser/Nmea/Trimble/PTNLB.cs
index dce58ae..8e1d2b8 100644
--- a/src/NmeaParser/Nmea/LaserRange/Trimble/PTNLB.cs
+++ b/src/NmeaParser/Nmea/Trimble/PTNLB.cs
@@ -15,10 +15,10 @@
 using System;
 using System.Globalization;
 
-namespace NmeaParser.Nmea.LaserRange.Trimble
+namespace NmeaParser.Nmea.Trimble
 {
     /// <summary>
-    /// Tree Measurement
+    /// Laser Range Tree Measurement
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Ptnlb")]
     [NmeaMessageType("PTNLB")]
diff --git a/src/SampleApp.Droid/MainActivity.cs b/src/SampleApp.Droid/MainActivity.cs
index a1dc683..3aff1a8 100644
--- a/src/SampleApp.Droid/MainActivity.cs
+++ b/src/SampleApp.Droid/MainActivity.cs
@@ -8,7 +8,6 @@ using Android.Content.PM;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using NmeaParser.Nmea.Gps;
 using NmeaParser.Nmea;
 
 namespace SampleApp.Droid
diff --git a/src/SampleApp.WinDesktop/UnknownMessageControl.xaml.cs b/src/SampleApp.WinDesktop/UnknownMessageControl.xaml.cs
index 06506df..2cc76a3 100644
--- a/src/SampleApp.WinDesktop/UnknownMessageControl.xaml.cs
+++ b/src/SampleApp.WinDesktop/UnknownMessageControl.xaml.cs
@@ -1,20 +1,9 @@
-using NmeaParser.Nmea;
-using NmeaParser.Nmea.Gps;
-using NmeaParser.Nmea.Gps.Garmin;
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using NmeaParser.Nmea;
 
 namespace SampleApp.WinDesktop
 {
diff --git a/src/UnitTests/NmeaParser.Tests/NmeaMessages.cs b/src/UnitTests/NmeaParser.Tests/NmeaMessages.cs
index 1559c59..97e9ede 100644
--- a/src/UnitTests/NmeaParser.Tests/NmeaMessages.cs
+++ b/src/UnitTests/NmeaParser.Tests/NmeaMessages.cs
@@ -19,7 +19,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using NmeaParser.Nmea;
-using NmeaParser.Nmea.Gps;
 using System.Threading.Tasks;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -230,9 +229,9 @@ namespace NmeaParser.Tests
         {
             string input = "$PTNLA,HV,002.94,M,288.1,D,008.6,D,002.98,M*74";
             var msg = NmeaMessage.Parse(input);
-            Assert.IsInstanceOfType(msg, typeof(NmeaParser.Nmea.LaserRange.Trimble.Ptnla));
+            Assert.IsInstanceOfType(msg, typeof(NmeaParser.Nmea.Trimble.Ptnla));
             Assert.AreEqual(Talker.ProprietaryCode, msg.TalkerId);
-            NmeaParser.Nmea.LaserRange.Trimble.Ptnla ptlna = (NmeaParser.Nmea.LaserRange.Trimble.Ptnla)msg;
+            NmeaParser.Nmea.Trimble.Ptnla ptlna = (NmeaParser.Nmea.Trimble.Ptnla)msg;
             Assert.AreEqual(2.94, ptlna.HorizontalDistance);
             Assert.AreEqual('M', ptlna.HorizontalDistanceUnits);
             Assert.AreEqual(288.1, ptlna.HorizontalAngle);
@@ -686,11 +685,11 @@ namespace NmeaParser.Tests
         {
             string input = "$PGRMZ,,,*7E";
             var msg = NmeaMessage.Parse(input);
-            Assert.IsInstanceOfType(msg, typeof(NmeaParser.Nmea.Gps.Garmin.Pgrmz));
-            var rmz = (NmeaParser.Nmea.Gps.Garmin.Pgrmz)msg;
+            Assert.IsInstanceOfType(msg, typeof(NmeaParser.Nmea.Garmin.Pgrmz));
+            var rmz = (NmeaParser.Nmea.Garmin.Pgrmz)msg;
             Assert.AreEqual(double.NaN, rmz.Altitude, "Altitude");
-            Assert.AreEqual(NmeaParser.Nmea.Gps.Garmin.Pgrmz.AltitudeUnit.Unknown, rmz.Unit, "Unit");
-            Assert.AreEqual(NmeaParser.Nmea.Gps.Garmin.Pgrmz.PositionFixType.Unknown, rmz.FixType, "FixDimension");
+            Assert.AreEqual(NmeaParser.Nmea.Garmin.Pgrmz.AltitudeUnit.Unknown, rmz.Unit, "Unit");
+            Assert.AreEqual(NmeaParser.Nmea.Garmin.Pgrmz.PositionFixType.Unknown, rmz.FixType, "FixDimension");
         }
 
         [TestMethod]
@@ -698,11 +697,11 @@ namespace NmeaParser.Tests
         {
             string input = "$PGRMZ,93,f,3*21";
             var msg = NmeaMessage.Parse(input);
-            Assert.IsInstanceOfType(msg, typeof(NmeaParser.Nmea.Gps.Garmin.Pgrmz));
-            var rmz = (NmeaParser.Nmea.Gps.Garmin.Pgrmz)msg;
+            Assert.IsInstanceOfType(msg, typeof(NmeaParser.Nmea.Garmin.Pgrmz));
+            var rmz = (NmeaParser.Nmea.Garmin.Pgrmz)msg;
             Assert.AreEqual(93d, rmz.Altitude, "Altitude");
-            Assert.AreEqual(NmeaParser.Nmea.Gps.Garmin.Pgrmz.AltitudeUnit.Feet, rmz.Unit, "Unit");
-            Assert.AreEqual(NmeaParser.Nmea.Gps.Garmin.Pgrmz.PositionFixType.Fix3D, rmz.FixType, "FixDimension");
+            Assert.AreEqual(NmeaParser.Nmea.Garmin.Pgrmz.AltitudeUnit.Feet, rmz.Unit, "Unit");
+            Assert.AreEqual(NmeaParser.Nmea.Garmin.Pgrmz.PositionFixType.Fix3D, rmz.FixType, "FixDimension");
         }
 
         [TestMethod]