diff --git a/src/NmeaParser.Shared/Nmea/Gps/Garmin/PGRME.cs b/src/NmeaParser.Shared/Nmea/Gps/Garmin/PGRME.cs
index b0e8409..e5d4c62 100644
--- a/src/NmeaParser.Shared/Nmea/Gps/Garmin/PGRME.cs
+++ b/src/NmeaParser.Shared/Nmea/Gps/Garmin/PGRME.cs
@@ -1,4 +1,20 @@
-using System;
+//
+// Copyright (c) 2014 Morten Nielsen
+//
+// Licensed under the Microsoft Public License (Ms-PL) (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://opensource.org/licenses/Ms-PL.html
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
diff --git a/src/NmeaParser.Shared/Nmea/LaserRangeMessage.cs b/src/NmeaParser.Shared/Nmea/LaserRange/LaserRangeMessage.cs
similarity index 97%
rename from src/NmeaParser.Shared/Nmea/LaserRangeMessage.cs
rename to src/NmeaParser.Shared/Nmea/LaserRange/LaserRangeMessage.cs
index 5df33de..feded4d 100644
--- a/src/NmeaParser.Shared/Nmea/LaserRangeMessage.cs
+++ b/src/NmeaParser.Shared/Nmea/LaserRange/LaserRangeMessage.cs
@@ -14,6 +14,7 @@
 // limitations under the License.
 //
 
+using NmeaParser.Nmea;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -21,7 +22,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NmeaParser.Nmea
+namespace NmeaParser.Nmea.LaserRange
 {
 	/// <summary>
 	/// Laser Range Measurement
diff --git a/src/NmeaParser.Shared/Nmea/LaserTech/LaserRange/PLTIT.cs b/src/NmeaParser.Shared/Nmea/LaserRange/LaserTech/PLTIT.cs
similarity index 94%
rename from src/NmeaParser.Shared/Nmea/LaserTech/LaserRange/PLTIT.cs
rename to src/NmeaParser.Shared/Nmea/LaserRange/LaserTech/PLTIT.cs
index c76e591..65ade5c 100644
--- a/src/NmeaParser.Shared/Nmea/LaserTech/LaserRange/PLTIT.cs
+++ b/src/NmeaParser.Shared/Nmea/LaserRange/LaserTech/PLTIT.cs
@@ -21,7 +21,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NmeaParser.Nmea.LaserTech.LaserRange
+namespace NmeaParser.Nmea.LaserRange.LaserTech
 {
 	/// <summary>
 	/// Laser Range 
diff --git a/src/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLA.cs b/src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLA.cs
similarity index 95%
rename from src/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLA.cs
rename to src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLA.cs
index 03d9da8..451ad8e 100644
--- a/src/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLA.cs
+++ b/src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLA.cs
@@ -21,7 +21,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NmeaParser.Nmea.Trimble.LaserRange
+namespace NmeaParser.Nmea.LaserRange.Trimble
 {
 	/// <summary>
 	/// Burden finder
diff --git a/src/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLB.cs b/src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLB.cs
similarity index 97%
rename from src/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLB.cs
rename to src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLB.cs
index fdd6eea..4a1d348 100644
--- a/src/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLB.cs
+++ b/src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLB.cs
@@ -21,7 +21,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NmeaParser.Nmea.Trimble.LaserRange
+namespace NmeaParser.Nmea.LaserRange.Trimble
 {
 	/// <summary>
 	/// Tree Measurement
diff --git a/src/NmeaParser.Shared/NmeaParser.Shared.projitems b/src/NmeaParser.Shared/NmeaParser.Shared.projitems
index 4cef398..5c35b1f 100644
--- a/src/NmeaParser.Shared/NmeaParser.Shared.projitems
+++ b/src/NmeaParser.Shared/NmeaParser.Shared.projitems
@@ -15,11 +15,11 @@
     <Compile Include="$(MSBuildThisFileDirectory)Nmea\Gps\GPGGA.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Nmea\Gps\GPRMB.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Nmea\Gps\GPRMC.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Nmea\LaserRangeMessage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Nmea\LaserTech\LaserRange\PLTIT.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Nmea\LaserRange\LaserRangeMessage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Nmea\LaserRange\LaserTech\PLTIT.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Nmea\LaserRange\Trimble\PTNLA.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Nmea\LaserRange\Trimble\PTNLB.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Nmea\NmeaMessage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Nmea\Trimble\LaserRange\PTNLA.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Nmea\Trimble\LaserRange\PTNLB.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Nmea\UnknownMessage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)StreamDevice.cs" />
   </ItemGroup>
diff --git a/src/NmeaParser.Tests/NmeaMessages.cs b/src/NmeaParser.Tests/NmeaMessages.cs
index d268824..3aa5874 100644
--- a/src/NmeaParser.Tests/NmeaMessages.cs
+++ b/src/NmeaParser.Tests/NmeaMessages.cs
@@ -121,8 +121,8 @@ 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(Nmea.Trimble.LaserRange.Ptnla));
-			Nmea.Trimble.LaserRange.Ptnla ptlna = (Nmea.Trimble.LaserRange.Ptnla)msg;
+			Assert.IsInstanceOfType(msg, typeof(NmeaParser.Nmea.LaserRange.Trimble.Ptnla));
+			NmeaParser.Nmea.LaserRange.Trimble.Ptnla ptlna = (NmeaParser.Nmea.LaserRange.Trimble.Ptnla)msg;
 			Assert.AreEqual(2.94, ptlna.HorizontalDistance);
 			Assert.AreEqual('M', ptlna.HorizontalDistanceUnits);
 			Assert.AreEqual(288.1, ptlna.HorizontalAngle);