diff --git a/SeeSharpShip/Extensions/EnumExtensions.cs b/SeeSharpShip.Model/Extensions/EnumExtensions.cs
similarity index 92%
rename from SeeSharpShip/Extensions/EnumExtensions.cs
rename to SeeSharpShip.Model/Extensions/EnumExtensions.cs
index 2f9c04a..f3ec509 100644
--- a/SeeSharpShip/Extensions/EnumExtensions.cs
+++ b/SeeSharpShip.Model/Extensions/EnumExtensions.cs
@@ -1,4 +1,4 @@
-#region SeeSharpShip is Copyright (C) 2011-2011 Michael J. Sumerano.
+#region SeeSharpShip is Copyright (C) 2011-2011 Michael J. Sumerano.
 
 // This file is part of SeeSharpShip.
 // 
@@ -21,7 +21,7 @@
 using System.ComponentModel;
 using System.Linq;
 
-namespace SeeSharpShip.Extensions {
+namespace SeeSharpShip.Model.Extensions {
     public static class EnumExtensions {
         public static string ToDescription(this Enum value) {
             return (from m in value.GetType().GetMember(value.ToString())
diff --git a/SeeSharpShip/Extensions/GuidExtensions.cs b/SeeSharpShip.Model/Extensions/GuidExtensions.cs
similarity index 93%
rename from SeeSharpShip/Extensions/GuidExtensions.cs
rename to SeeSharpShip.Model/Extensions/GuidExtensions.cs
index 13de3c8..dc1f014 100644
--- a/SeeSharpShip/Extensions/GuidExtensions.cs
+++ b/SeeSharpShip.Model/Extensions/GuidExtensions.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Linq;
 
-namespace SeeSharpShip.Extensions {
+namespace SeeSharpShip.Model.Extensions {
     public static class GuidExtensions {
         public static string ToShortId(this Guid value) {
             long i = value.ToByteArray().Aggregate<byte, long>(1, (current, b) => current*((int) b + 1));
diff --git a/SeeSharpShip/Extensions/ModelExtensions.cs b/SeeSharpShip.Model/Extensions/ModelExtensions.cs
similarity index 95%
rename from SeeSharpShip/Extensions/ModelExtensions.cs
rename to SeeSharpShip.Model/Extensions/ModelExtensions.cs
index a44e2e3..d560d81 100644
--- a/SeeSharpShip/Extensions/ModelExtensions.cs
+++ b/SeeSharpShip.Model/Extensions/ModelExtensions.cs
@@ -22,7 +22,7 @@
 using System.Xml;
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Extensions {
+namespace SeeSharpShip.Model.Extensions {
     public static class ModelExtensions {
         public static string ToXmlString<T>(this T value) where T : new() {
             var serializer = new XmlSerializer(typeof (T), string.Empty);
diff --git a/SeeSharpShip.Model/SeeSharpShip.Model.csproj b/SeeSharpShip.Model/SeeSharpShip.Model.csproj
index 29c0ead..291d89e 100644
--- a/SeeSharpShip.Model/SeeSharpShip.Model.csproj
+++ b/SeeSharpShip.Model/SeeSharpShip.Model.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SeeSharpShip.Model</RootNamespace>
     <AssemblyName>SeeSharpShip.Model</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,7 +43,37 @@
     <Compile Include="..\Versioning\AssemblyVersionInfo.cs">
       <Link>Properties\AssemblyVersionInfo.cs</Link>
     </Compile>
+    <Compile Include="Extensions\EnumExtensions.cs" />
+    <Compile Include="Extensions\GuidExtensions.cs" />
+    <Compile Include="Extensions\ModelExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Usps\Domestic\FirstClassMailTypes.cs" />
+    <Compile Include="Usps\Domestic\Request\DomesticPackage.cs" />
+    <Compile Include="Usps\Domestic\Request\RateV4Request.cs" />
+    <Compile Include="Usps\Domestic\Request\SpecialService.cs" />
+    <Compile Include="Usps\Domestic\Response\Package.cs" />
+    <Compile Include="Usps\Domestic\Response\Postage.cs" />
+    <Compile Include="Usps\Domestic\Response\RateV4Response.cs" />
+    <Compile Include="Usps\Domestic\Response\SpecialService.cs" />
+    <Compile Include="Usps\Domestic\ServiceTypes.cs" />
+    <Compile Include="Usps\International\Request\ExtraServices.cs" />
+    <Compile Include="Usps\International\Request\GlobalExpressGuaranteed.cs" />
+    <Compile Include="Usps\International\Request\InternationalPackage.cs" />
+    <Compile Include="Usps\International\Request\IntlRateV2Request.cs" />
+    <Compile Include="Usps\International\Request\MailType.cs" />
+    <Compile Include="Usps\International\Response\ExtraService.cs" />
+    <Compile Include="Usps\International\Response\IntlV2Response.cs" />
+    <Compile Include="Usps\International\Response\Package.cs" />
+    <Compile Include="Usps\International\Response\PostOffice.cs" />
+    <Compile Include="Usps\International\Response\Service.cs" />
+    <Compile Include="Usps\IRateRequest.cs" />
+    <Compile Include="Usps\IRateResponse.cs" />
+    <Compile Include="Usps\RequestError.cs" />
+    <Compile Include="Usps\TrackDetail.cs" />
+    <Compile Include="Usps\TrackId.cs" />
+    <Compile Include="Usps\TrackInfo.cs" />
+    <Compile Include="Usps\TrackRequest.cs" />
+    <Compile Include="Usps\TrackResponse.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/SeeSharpShip/Models/Usps/Domestic/FirstClassMailTypes.cs b/SeeSharpShip.Model/Usps/Domestic/FirstClassMailTypes.cs
similarity index 92%
rename from SeeSharpShip/Models/Usps/Domestic/FirstClassMailTypes.cs
rename to SeeSharpShip.Model/Usps/Domestic/FirstClassMailTypes.cs
index 6810bae..21cb065 100644
--- a/SeeSharpShip/Models/Usps/Domestic/FirstClassMailTypes.cs
+++ b/SeeSharpShip.Model/Usps/Domestic/FirstClassMailTypes.cs
@@ -17,7 +17,7 @@
 
 #endregion
 
-namespace SeeSharpShip.Models.Usps.Domestic {
+namespace SeeSharpShip.Model.Usps.Domestic {
     public enum FirstClassMailTypes {
         Letter,
         Flat,
diff --git a/SeeSharpShip/Models/Usps/Domestic/Request/DomesticPackage.cs b/SeeSharpShip.Model/Usps/Domestic/Request/DomesticPackage.cs
similarity index 96%
rename from SeeSharpShip/Models/Usps/Domestic/Request/DomesticPackage.cs
rename to SeeSharpShip.Model/Usps/Domestic/Request/DomesticPackage.cs
index 3016a80..37bfe9b 100644
--- a/SeeSharpShip/Models/Usps/Domestic/Request/DomesticPackage.cs
+++ b/SeeSharpShip.Model/Usps/Domestic/Request/DomesticPackage.cs
@@ -19,9 +19,9 @@
 
 using System;
 using System.Xml.Serialization;
-using SeeSharpShip.Extensions;
+using SeeSharpShip.Model.Extensions;
 
-namespace SeeSharpShip.Models.Usps.Domestic.Request {
+namespace SeeSharpShip.Model.Usps.Domestic.Request {
     public class DomesticPackage {
         private string _container;
 
diff --git a/SeeSharpShip/Models/Usps/Domestic/Request/RateV4Request.cs b/SeeSharpShip.Model/Usps/Domestic/Request/RateV4Request.cs
similarity index 94%
rename from SeeSharpShip/Models/Usps/Domestic/Request/RateV4Request.cs
rename to SeeSharpShip.Model/Usps/Domestic/Request/RateV4Request.cs
index 3cc2211..e51f229 100644
--- a/SeeSharpShip/Models/Usps/Domestic/Request/RateV4Request.cs
+++ b/SeeSharpShip.Model/Usps/Domestic/Request/RateV4Request.cs
@@ -20,7 +20,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps.Domestic.Request {
+namespace SeeSharpShip.Model.Usps.Domestic.Request {
     public class RateV4Request : IRateRequest {
         public RateV4Request() {
             // Enables full V4 rate functionality
diff --git a/SeeSharpShip/Models/Usps/Domestic/Request/SpecialService.cs b/SeeSharpShip.Model/Usps/Domestic/Request/SpecialService.cs
similarity index 92%
rename from SeeSharpShip/Models/Usps/Domestic/Request/SpecialService.cs
rename to SeeSharpShip.Model/Usps/Domestic/Request/SpecialService.cs
index 7cdfce7..22d7b89 100644
--- a/SeeSharpShip/Models/Usps/Domestic/Request/SpecialService.cs
+++ b/SeeSharpShip.Model/Usps/Domestic/Request/SpecialService.cs
@@ -19,7 +19,7 @@
 
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps.Domestic.Request {
+namespace SeeSharpShip.Model.Usps.Domestic.Request {
     public class SpecialServices {
         [XmlElement("SpecialService")]
         public string[] SpecialService { get; set; }
diff --git a/SeeSharpShip/Models/Usps/Domestic/Response/Package.cs b/SeeSharpShip.Model/Usps/Domestic/Response/Package.cs
similarity index 94%
rename from SeeSharpShip/Models/Usps/Domestic/Response/Package.cs
rename to SeeSharpShip.Model/Usps/Domestic/Response/Package.cs
index cca10d2..248b1cc 100644
--- a/SeeSharpShip/Models/Usps/Domestic/Response/Package.cs
+++ b/SeeSharpShip.Model/Usps/Domestic/Response/Package.cs
@@ -20,7 +20,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps.Domestic.Response {
+namespace SeeSharpShip.Model.Usps.Domestic.Response {
     public class Package {
         public string ZipOrigination { get; set; }
         public string ZipDestination { get; set; }
diff --git a/SeeSharpShip/Models/Usps/Domestic/Response/Postage.cs b/SeeSharpShip.Model/Usps/Domestic/Response/Postage.cs
similarity index 95%
rename from SeeSharpShip/Models/Usps/Domestic/Response/Postage.cs
rename to SeeSharpShip.Model/Usps/Domestic/Response/Postage.cs
index f8ba076..f807452 100644
--- a/SeeSharpShip/Models/Usps/Domestic/Response/Postage.cs
+++ b/SeeSharpShip.Model/Usps/Domestic/Response/Postage.cs
@@ -21,7 +21,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps.Domestic.Response {
+namespace SeeSharpShip.Model.Usps.Domestic.Response {
     public class Postage : IEquatable<Postage> {
         [XmlAttribute(AttributeName = "CLASSID")]
         public string ClassId { get; set; }
diff --git a/SeeSharpShip/Models/Usps/Domestic/Response/RateV4Response.cs b/SeeSharpShip.Model/Usps/Domestic/Response/RateV4Response.cs
similarity index 92%
rename from SeeSharpShip/Models/Usps/Domestic/Response/RateV4Response.cs
rename to SeeSharpShip.Model/Usps/Domestic/Response/RateV4Response.cs
index e219b9d..17bb11a 100644
--- a/SeeSharpShip/Models/Usps/Domestic/Response/RateV4Response.cs
+++ b/SeeSharpShip.Model/Usps/Domestic/Response/RateV4Response.cs
@@ -20,7 +20,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps.Domestic.Response {
+namespace SeeSharpShip.Model.Usps.Domestic.Response {
     public class RateV4Response : IRateResponse {
         [XmlElement("Package")]
         public List<Package> Packages { get; set; }
diff --git a/SeeSharpShip/Models/Usps/Domestic/Response/SpecialService.cs b/SeeSharpShip.Model/Usps/Domestic/Response/SpecialService.cs
similarity index 93%
rename from SeeSharpShip/Models/Usps/Domestic/Response/SpecialService.cs
rename to SeeSharpShip.Model/Usps/Domestic/Response/SpecialService.cs
index 69b819a..bcbef6f 100644
--- a/SeeSharpShip/Models/Usps/Domestic/Response/SpecialService.cs
+++ b/SeeSharpShip.Model/Usps/Domestic/Response/SpecialService.cs
@@ -19,7 +19,7 @@
 
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps.Domestic.Response {
+namespace SeeSharpShip.Model.Usps.Domestic.Response {
     public class SpecialService {
         [XmlElement("ServiceID")]
         public string ServiceId { get; set; }
diff --git a/SeeSharpShip/Models/Usps/Domestic/ServiceTypes.cs b/SeeSharpShip.Model/Usps/Domestic/ServiceTypes.cs
similarity index 94%
rename from SeeSharpShip/Models/Usps/Domestic/ServiceTypes.cs
rename to SeeSharpShip.Model/Usps/Domestic/ServiceTypes.cs
index fdc1a08..965de1e 100644
--- a/SeeSharpShip/Models/Usps/Domestic/ServiceTypes.cs
+++ b/SeeSharpShip.Model/Usps/Domestic/ServiceTypes.cs
@@ -19,7 +19,7 @@
 
 using System.ComponentModel;
 
-namespace SeeSharpShip.Models.Usps.Domestic {
+namespace SeeSharpShip.Model.Usps.Domestic {
     public enum ServiceTypes {
         [Description("First Class")]
         FirstClass,
diff --git a/SeeSharpShip/Models/Usps/IRateRequest.cs b/SeeSharpShip.Model/Usps/IRateRequest.cs
similarity index 94%
rename from SeeSharpShip/Models/Usps/IRateRequest.cs
rename to SeeSharpShip.Model/Usps/IRateRequest.cs
index a454120..f4c003b 100644
--- a/SeeSharpShip/Models/Usps/IRateRequest.cs
+++ b/SeeSharpShip.Model/Usps/IRateRequest.cs
@@ -19,7 +19,7 @@
 
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps {
+namespace SeeSharpShip.Model.Usps {
     public interface IRateRequest {
         /// <summary>
         ///   This attribute specifies your Web Tools ID. See the Developer's Guide for information on obtaining your USERID.
diff --git a/SeeSharpShip/Models/Usps/IRateResponse.cs b/SeeSharpShip.Model/Usps/IRateResponse.cs
similarity index 93%
rename from SeeSharpShip/Models/Usps/IRateResponse.cs
rename to SeeSharpShip.Model/Usps/IRateResponse.cs
index c6f9adf..7e1fc91 100644
--- a/SeeSharpShip/Models/Usps/IRateResponse.cs
+++ b/SeeSharpShip.Model/Usps/IRateResponse.cs
@@ -19,7 +19,7 @@
 
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps {
+namespace SeeSharpShip.Model.Usps {
     public interface IRateResponse {
         [XmlAttribute(AttributeName = "ID")]
         string Id { get; set; }
diff --git a/SeeSharpShip/Models/Usps/International/Request/ExtraServices.cs b/SeeSharpShip.Model/Usps/International/Request/ExtraServices.cs
similarity index 91%
rename from SeeSharpShip/Models/Usps/International/Request/ExtraServices.cs
rename to SeeSharpShip.Model/Usps/International/Request/ExtraServices.cs
index 8e280cd..d88d07a 100644
--- a/SeeSharpShip/Models/Usps/International/Request/ExtraServices.cs
+++ b/SeeSharpShip.Model/Usps/International/Request/ExtraServices.cs
@@ -19,7 +19,7 @@
 
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps.International.Request {
+namespace SeeSharpShip.Model.Usps.International.Request {
     public class ExtraServices {
         [XmlElement("ExtraService")]
         public string[] ExtraService { get; set; }
diff --git a/SeeSharpShip/Models/Usps/International/Request/GlobalExpressGuaranteed.cs b/SeeSharpShip.Model/Usps/International/Request/GlobalExpressGuaranteed.cs
similarity index 93%
rename from SeeSharpShip/Models/Usps/International/Request/GlobalExpressGuaranteed.cs
rename to SeeSharpShip.Model/Usps/International/Request/GlobalExpressGuaranteed.cs
index 172d912..49e325e 100644
--- a/SeeSharpShip/Models/Usps/International/Request/GlobalExpressGuaranteed.cs
+++ b/SeeSharpShip.Model/Usps/International/Request/GlobalExpressGuaranteed.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps.International.Request {
+namespace SeeSharpShip.Model.Usps.International.Request {
     public abstract class GlobalExpressGuaranteed {
         private string _giftFlag;
         private string _poBoxFlag;
diff --git a/SeeSharpShip/Models/Usps/International/Request/InternationalPackage.cs b/SeeSharpShip.Model/Usps/International/Request/InternationalPackage.cs
similarity index 95%
rename from SeeSharpShip/Models/Usps/International/Request/InternationalPackage.cs
rename to SeeSharpShip.Model/Usps/International/Request/InternationalPackage.cs
index dec85df..e4fc298 100644
--- a/SeeSharpShip/Models/Usps/International/Request/InternationalPackage.cs
+++ b/SeeSharpShip.Model/Usps/International/Request/InternationalPackage.cs
@@ -19,9 +19,9 @@
 
 using System;
 using System.Xml.Serialization;
-using SeeSharpShip.Extensions;
+using SeeSharpShip.Model.Extensions;
 
-namespace SeeSharpShip.Models.Usps.International.Request {
+namespace SeeSharpShip.Model.Usps.International.Request {
     public class InternationalPackage {
         private string _container;
 
diff --git a/SeeSharpShip/Models/Usps/International/Request/IntlRateV2Request.cs b/SeeSharpShip.Model/Usps/International/Request/IntlRateV2Request.cs
similarity index 93%
rename from SeeSharpShip/Models/Usps/International/Request/IntlRateV2Request.cs
rename to SeeSharpShip.Model/Usps/International/Request/IntlRateV2Request.cs
index bc0017d..5d852b2 100644
--- a/SeeSharpShip/Models/Usps/International/Request/IntlRateV2Request.cs
+++ b/SeeSharpShip.Model/Usps/International/Request/IntlRateV2Request.cs
@@ -20,7 +20,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps.International.Request {
+namespace SeeSharpShip.Model.Usps.International.Request {
     public class IntlRateV2Request : IRateRequest {
         public IntlRateV2Request() {
             // Enables full V2 rate functionality
diff --git a/SeeSharpShip/Models/Usps/International/Request/MailType.cs b/SeeSharpShip.Model/Usps/International/Request/MailType.cs
similarity index 91%
rename from SeeSharpShip/Models/Usps/International/Request/MailType.cs
rename to SeeSharpShip.Model/Usps/International/Request/MailType.cs
index 98a157f..b301e24 100644
--- a/SeeSharpShip/Models/Usps/International/Request/MailType.cs
+++ b/SeeSharpShip.Model/Usps/International/Request/MailType.cs
@@ -19,7 +19,7 @@
 
 using System.ComponentModel;
 
-namespace SeeSharpShip.Models.Usps.International.Request {
+namespace SeeSharpShip.Model.Usps.International.Request {
     public enum MailType {
         All,
         Package,
diff --git a/SeeSharpShip/Models/Usps/International/Response/ExtraService.cs b/SeeSharpShip.Model/Usps/International/Response/ExtraService.cs
similarity index 92%
rename from SeeSharpShip/Models/Usps/International/Response/ExtraService.cs
rename to SeeSharpShip.Model/Usps/International/Response/ExtraService.cs
index dc83e1e..473af7c 100644
--- a/SeeSharpShip/Models/Usps/International/Response/ExtraService.cs
+++ b/SeeSharpShip.Model/Usps/International/Response/ExtraService.cs
@@ -19,7 +19,7 @@
 
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps.International.Response {
+namespace SeeSharpShip.Model.Usps.International.Response {
     public class ExtraService {
         [XmlElement("ServiceID")]
         public string ServiceId { get; set; }
diff --git a/SeeSharpShip/Models/Usps/International/Response/IntlV2Response.cs b/SeeSharpShip.Model/Usps/International/Response/IntlV2Response.cs
similarity index 86%
rename from SeeSharpShip/Models/Usps/International/Response/IntlV2Response.cs
rename to SeeSharpShip.Model/Usps/International/Response/IntlV2Response.cs
index 2ae7e5f..459cd4d 100644
--- a/SeeSharpShip/Models/Usps/International/Response/IntlV2Response.cs
+++ b/SeeSharpShip.Model/Usps/International/Response/IntlV2Response.cs
@@ -1,4 +1,4 @@
-#region SeeSharpShip is Copyright (C) 2011-2011 Michael J. Sumerano.
+#region SeeSharpShip is Copyright (C) 2011-2011 Michael J. Sumerano.
 
 // This file is part of SeeSharpShip.
 // 
@@ -20,7 +20,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps.International.Response {
+namespace SeeSharpShip.Model.Usps.International.Response {
     public class IntlRateV2Response : IRateResponse {
         [XmlElement("Package")]
         public List<Package> Packages { get; set; }
diff --git a/SeeSharpShip/Models/Usps/International/Response/Package.cs b/SeeSharpShip.Model/Usps/International/Response/Package.cs
similarity index 93%
rename from SeeSharpShip/Models/Usps/International/Response/Package.cs
rename to SeeSharpShip.Model/Usps/International/Response/Package.cs
index 4b06356..723aec3 100644
--- a/SeeSharpShip/Models/Usps/International/Response/Package.cs
+++ b/SeeSharpShip.Model/Usps/International/Response/Package.cs
@@ -19,7 +19,7 @@
 
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps.International.Response {
+namespace SeeSharpShip.Model.Usps.International.Response {
     public class Package {
         public string Prohibitions { get; set; }
         public string Restrictions { get; set; }
diff --git a/SeeSharpShip/Models/Usps/International/Response/PostOffice.cs b/SeeSharpShip.Model/Usps/International/Response/PostOffice.cs
similarity index 92%
rename from SeeSharpShip/Models/Usps/International/Response/PostOffice.cs
rename to SeeSharpShip.Model/Usps/International/Response/PostOffice.cs
index 60489a6..0a6baf0 100644
--- a/SeeSharpShip/Models/Usps/International/Response/PostOffice.cs
+++ b/SeeSharpShip.Model/Usps/International/Response/PostOffice.cs
@@ -19,7 +19,7 @@
 
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps.International.Response {
+namespace SeeSharpShip.Model.Usps.International.Response {
     public class PostOffice {
         public string Name { get; set; }
         public string Address { get; set; }
diff --git a/SeeSharpShip/Models/Usps/International/Response/Service.cs b/SeeSharpShip.Model/Usps/International/Response/Service.cs
similarity index 92%
rename from SeeSharpShip/Models/Usps/International/Response/Service.cs
rename to SeeSharpShip.Model/Usps/International/Response/Service.cs
index a55d1eb..69133e1 100644
--- a/SeeSharpShip/Models/Usps/International/Response/Service.cs
+++ b/SeeSharpShip.Model/Usps/International/Response/Service.cs
@@ -19,9 +19,9 @@
 
 using System.Collections.Generic;
 using System.Xml.Serialization;
-using SeeSharpShip.Models.Usps.International.Request;
+using SeeSharpShip.Model.Usps.International.Request;
 
-namespace SeeSharpShip.Models.Usps.International.Response {
+namespace SeeSharpShip.Model.Usps.International.Response {
     public class Service {
         [XmlAttribute(AttributeName = "ID")]
         public string Id { get; set; }
diff --git a/SeeSharpShip/Models/Usps/RequestError.cs b/SeeSharpShip.Model/Usps/RequestError.cs
similarity index 94%
rename from SeeSharpShip/Models/Usps/RequestError.cs
rename to SeeSharpShip.Model/Usps/RequestError.cs
index 1be8c73..82b5b31 100644
--- a/SeeSharpShip/Models/Usps/RequestError.cs
+++ b/SeeSharpShip.Model/Usps/RequestError.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps {
+namespace SeeSharpShip.Model.Usps {
     [Serializable]
     [XmlRoot("Error")]
     public class RequestError {
diff --git a/SeeSharpShip/Models/Usps/TrackDetail.cs b/SeeSharpShip.Model/Usps/TrackDetail.cs
similarity index 93%
rename from SeeSharpShip/Models/Usps/TrackDetail.cs
rename to SeeSharpShip.Model/Usps/TrackDetail.cs
index 33d41e9..8cc3d4a 100644
--- a/SeeSharpShip/Models/Usps/TrackDetail.cs
+++ b/SeeSharpShip.Model/Usps/TrackDetail.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps {
+namespace SeeSharpShip.Model.Usps {
     [Serializable]
     public class TrackDetail {
         [XmlText]
diff --git a/SeeSharpShip/Models/Usps/TrackId.cs b/SeeSharpShip.Model/Usps/TrackId.cs
similarity index 93%
rename from SeeSharpShip/Models/Usps/TrackId.cs
rename to SeeSharpShip.Model/Usps/TrackId.cs
index bbbb805..46e81a3 100644
--- a/SeeSharpShip/Models/Usps/TrackId.cs
+++ b/SeeSharpShip.Model/Usps/TrackId.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps {
+namespace SeeSharpShip.Model.Usps {
     [Serializable]
     public class TrackId {
         [XmlAttribute(AttributeName = "ID")]
diff --git a/SeeSharpShip/Models/Usps/TrackInfo.cs b/SeeSharpShip.Model/Usps/TrackInfo.cs
similarity index 94%
rename from SeeSharpShip/Models/Usps/TrackInfo.cs
rename to SeeSharpShip.Model/Usps/TrackInfo.cs
index 8057fd5..e0d446b 100644
--- a/SeeSharpShip/Models/Usps/TrackInfo.cs
+++ b/SeeSharpShip.Model/Usps/TrackInfo.cs
@@ -22,7 +22,7 @@
 using System.Xml.Schema;
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps {
+namespace SeeSharpShip.Model.Usps {
     [Serializable]
     [XmlType(AnonymousType = true)]
     public class TrackInfo {
diff --git a/SeeSharpShip/Models/Usps/TrackRequest.cs b/SeeSharpShip.Model/Usps/TrackRequest.cs
similarity index 93%
rename from SeeSharpShip/Models/Usps/TrackRequest.cs
rename to SeeSharpShip.Model/Usps/TrackRequest.cs
index a7d5c1c..fa7e72c 100644
--- a/SeeSharpShip/Models/Usps/TrackRequest.cs
+++ b/SeeSharpShip.Model/Usps/TrackRequest.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps {
+namespace SeeSharpShip.Model.Usps {
     [Serializable]
     public class TrackRequest {
         [XmlAttribute(AttributeName = "USERID")]
diff --git a/SeeSharpShip/Models/Usps/TrackResponse.cs b/SeeSharpShip.Model/Usps/TrackResponse.cs
similarity index 94%
rename from SeeSharpShip/Models/Usps/TrackResponse.cs
rename to SeeSharpShip.Model/Usps/TrackResponse.cs
index 89ca4b0..7fe08c6 100644
--- a/SeeSharpShip/Models/Usps/TrackResponse.cs
+++ b/SeeSharpShip.Model/Usps/TrackResponse.cs
@@ -21,7 +21,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace SeeSharpShip.Models.Usps {
+namespace SeeSharpShip.Model.Usps {
     [Serializable]
     [XmlType(AnonymousType = true)]
     [XmlRoot(Namespace = "", IsNullable = false)]
diff --git a/SeeSharpShip.Tests/FedEx/RateRequest.cs b/SeeSharpShip.Tests/FedEx/RateRequest.cs
index 472385c..457c9f0 100644
--- a/SeeSharpShip.Tests/FedEx/RateRequest.cs
+++ b/SeeSharpShip.Tests/FedEx/RateRequest.cs
@@ -18,5 +18,5 @@
 #endregion
 
 namespace SeeSharpShip.Tests.FedEx {
-    public class RateRequest : ServiceProxies.RateRequest {}
+    //public class RateRequest : ServiceProxies.RateRequest {}
 }
diff --git a/SeeSharpShip.Tests/FedEx/RateServiceTests.cs b/SeeSharpShip.Tests/FedEx/RateServiceTests.cs
index cc248b7..0b6deb2 100644
--- a/SeeSharpShip.Tests/FedEx/RateServiceTests.cs
+++ b/SeeSharpShip.Tests/FedEx/RateServiceTests.cs
@@ -6,11 +6,11 @@ namespace SeeSharpShip.Tests.FedEx
     [TestFixture]
     public class RateServiceTests
     {
-        [Test]
-        public void Get_EmptyRequest_ThrowsException() { 
-            var service = new Services.FedEx.RateService();
-            RateRequest request = new RateRequest();
-            Assert.Throws(typeof(NotImplementedException), () => service.Get(request));
-        }
+        //[Test]
+        //public void Get_EmptyRequest_ThrowsException() { 
+        //    var service = new Services.FedEx.RateService();
+        //    RateRequest request = new RateRequest();
+        //    Assert.Throws(typeof(NotImplementedException), () => service.Get(request));
+        //}
     }
 }
diff --git a/SeeSharpShip.Tests/ModelExtensionsTests.cs b/SeeSharpShip.Tests/ModelExtensionsTests.cs
index bf4dbcf..2056640 100644
--- a/SeeSharpShip.Tests/ModelExtensionsTests.cs
+++ b/SeeSharpShip.Tests/ModelExtensionsTests.cs
@@ -20,7 +20,8 @@
 using System;
 using NUnit.Framework;
 using SeeSharpShip.Extensions;
-using SeeSharpShip.Models.Usps.Domestic;
+using SeeSharpShip.Model.Extensions;
+using SeeSharpShip.Model.Usps.Domestic;
 using SeeSharpShip.Tests.Usps.DomesticBuilders;
 
 namespace SeeSharpShip.Tests {
diff --git a/SeeSharpShip.Tests/SeeSharpShip.Tests.csproj b/SeeSharpShip.Tests/SeeSharpShip.Tests.csproj
index 6df0bb6..b60c6e4 100644
--- a/SeeSharpShip.Tests/SeeSharpShip.Tests.csproj
+++ b/SeeSharpShip.Tests/SeeSharpShip.Tests.csproj
@@ -37,6 +37,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.ServiceModel" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Versioning\AssemblyVersionInfo.cs">
@@ -71,6 +72,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\SeeSharpShip.Model\SeeSharpShip.Model.csproj">
+      <Project>{fc5a0764-decb-483a-86d7-87dfed5a4cac}</Project>
+      <Name>SeeSharpShip.Model</Name>
+    </ProjectReference>
     <ProjectReference Include="..\SeeSharpShip\SeeSharpShip.csproj">
       <Project>{4ABFD9BB-B5EB-404C-9407-0F0D437EAECE}</Project>
       <Name>SeeSharpShip</Name>
diff --git a/SeeSharpShip.Tests/Usps/DomesticBuilders/DomesticRequest.cs b/SeeSharpShip.Tests/Usps/DomesticBuilders/DomesticRequest.cs
index da06323..79f9d43 100644
--- a/SeeSharpShip.Tests/Usps/DomesticBuilders/DomesticRequest.cs
+++ b/SeeSharpShip.Tests/Usps/DomesticBuilders/DomesticRequest.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using SeeSharpShip.Models.Usps.Domestic;
-using SeeSharpShip.Models.Usps.Domestic.Request;
+using SeeSharpShip.Model.Usps.Domestic;
+using SeeSharpShip.Model.Usps.Domestic.Request;
 
 namespace SeeSharpShip.Tests.Usps.DomesticBuilders {
     public static class Domestic {
diff --git a/SeeSharpShip.Tests/Usps/RateServiceTests.cs b/SeeSharpShip.Tests/Usps/RateServiceTests.cs
index 3792179..48bbe41 100644
--- a/SeeSharpShip.Tests/Usps/RateServiceTests.cs
+++ b/SeeSharpShip.Tests/Usps/RateServiceTests.cs
@@ -22,11 +22,12 @@
 using System.Linq;
 using NUnit.Framework;
 using SeeSharpShip.Extensions;
-using SeeSharpShip.Models.Usps;
-using SeeSharpShip.Models.Usps.Domestic.Request;
-using SeeSharpShip.Models.Usps.Domestic.Response;
-using SeeSharpShip.Models.Usps.International.Request;
-using SeeSharpShip.Models.Usps.International.Response;
+using SeeSharpShip.Model.Extensions;
+using SeeSharpShip.Model.Usps;
+using SeeSharpShip.Model.Usps.Domestic.Request;
+using SeeSharpShip.Model.Usps.Domestic.Response;
+using SeeSharpShip.Model.Usps.International.Request;
+using SeeSharpShip.Model.Usps.International.Response;
 using SeeSharpShip.Services.Usps;
 using SeeSharpShip.Tests.Properties;
 
diff --git a/SeeSharpShip.Tests/Usps/RateServiceTestsData.cs b/SeeSharpShip.Tests/Usps/RateServiceTestsData.cs
index dc9f623..d5c6df5 100644
--- a/SeeSharpShip.Tests/Usps/RateServiceTestsData.cs
+++ b/SeeSharpShip.Tests/Usps/RateServiceTestsData.cs
@@ -19,9 +19,9 @@
 
 using System;
 using System.Collections.Generic;
-using SeeSharpShip.Models.Usps.Domestic;
-using SeeSharpShip.Models.Usps.Domestic.Request;
-using SeeSharpShip.Models.Usps.International.Request;
+using SeeSharpShip.Model.Usps.Domestic;
+using SeeSharpShip.Model.Usps.Domestic.Request;
+using SeeSharpShip.Model.Usps.International.Request;
 using SeeSharpShip.Tests.Properties;
 
 namespace SeeSharpShip.Tests.Usps {
diff --git a/SeeSharpShip.Tests/Usps/TrackServiceTests.cs b/SeeSharpShip.Tests/Usps/TrackServiceTests.cs
index 7544cf3..2e637ef 100644
--- a/SeeSharpShip.Tests/Usps/TrackServiceTests.cs
+++ b/SeeSharpShip.Tests/Usps/TrackServiceTests.cs
@@ -19,7 +19,7 @@
 
 using System;
 using NUnit.Framework;
-using SeeSharpShip.Models.Usps;
+using SeeSharpShip.Model.Usps;
 using SeeSharpShip.Services.Usps;
 using SeeSharpShip.Tests.Properties;
 
diff --git a/SeeSharpShip/SeeSharpShip.csproj b/SeeSharpShip/SeeSharpShip.csproj
index 2a01a4b..0f3d93c 100644
--- a/SeeSharpShip/SeeSharpShip.csproj
+++ b/SeeSharpShip/SeeSharpShip.csproj
@@ -48,37 +48,8 @@
     <Compile Include="..\Versioning\AssemblyVersionInfo.cs">
       <Link>Properties\AssemblyVersionInfo.cs</Link>
     </Compile>
-    <Compile Include="Extensions\EnumExtensions.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
-    <Compile Include="Models\Usps\Domestic\FirstClassMailTypes.cs" />
-    <Compile Include="Extensions\ModelExtensions.cs" />
-    <Compile Include="Models\Usps\Domestic\Request\DomesticPackage.cs" />
-    <Compile Include="Extensions\GuidExtensions.cs" />
-    <Compile Include="Models\Usps\International\Request\MailType.cs" />
-    <Compile Include="Models\Usps\IRateResponse.cs" />
-    <Compile Include="Models\Usps\IRateRequest.cs" />
-    <Compile Include="Models\Usps\Domestic\Response\Package.cs" />
-    <Compile Include="Models\Usps\Domestic\Response\Postage.cs" />
-    <Compile Include="Models\Usps\International\Response\ExtraService.cs" />
-    <Compile Include="Models\Usps\International\Response\Package.cs" />
-    <Compile Include="Models\Usps\International\Response\PostOffice.cs" />
-    <Compile Include="Models\Usps\International\Response\Service.cs" />
-    <Compile Include="Models\Usps\RequestError.cs" />
-    <Compile Include="Models\Usps\Domestic\Response\SpecialService.cs" />
-    <Compile Include="Models\Usps\International\Request\ExtraServices.cs" />
-    <Compile Include="Models\Usps\International\Request\GlobalExpressGuaranteed.cs" />
-    <Compile Include="Models\Usps\International\Request\IntlRateV2Request.cs" />
-    <Compile Include="Models\Usps\International\Request\InternationalPackage.cs" />
-    <Compile Include="Models\Usps\International\Response\IntlV2Response.cs" />
-    <Compile Include="Models\Usps\TrackDetail.cs" />
-    <Compile Include="Models\Usps\TrackId.cs" />
-    <Compile Include="Models\Usps\TrackInfo.cs" />
-    <Compile Include="Models\Usps\TrackRequest.cs" />
-    <Compile Include="Models\Usps\TrackResponse.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Models\Usps\Domestic\ServiceTypes.cs" />
-    <Compile Include="Models\Usps\Domestic\Request\RateV4Request.cs" />
-    <Compile Include="Models\Usps\Domestic\Request\SpecialService.cs" />
     <Compile Include="Service References\UpsFreightRateService\Reference.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -98,7 +69,6 @@
     <Compile Include="Utilities\CacheItem.cs" />
     <Compile Include="Services\Usps\IRateService.cs" />
     <Compile Include="Services\Usps\RateService.cs" />
-    <Compile Include="Models\Usps\Domestic\Response\RateV4Response.cs" />
     <Compile Include="Utilities\ResponseCache.cs" />
     <Compile Include="Services\Usps\ServiceInfo.cs" />
     <Compile Include="Utilities\EnumHelper.cs" />
@@ -169,9 +139,7 @@
     <WCFMetadataStorage Include="Service References\UpsFreightRateService\" />
     <WCFMetadataStorage Include="Service References\UpsPackageRateService\" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Models\FedEx\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <ProjectReference Include="..\SeeSharpShip.Model\SeeSharpShip.Model.csproj">
       <Project>{fc5a0764-decb-483a-86d7-87dfed5a4cac}</Project>
diff --git a/SeeSharpShip/Services/FedEx/RateService.cs b/SeeSharpShip/Services/FedEx/RateService.cs
index 10bc35a..629944d 100644
--- a/SeeSharpShip/Services/FedEx/RateService.cs
+++ b/SeeSharpShip/Services/FedEx/RateService.cs
@@ -8,10 +8,10 @@ public class RateResponse {}
     public class RateService
     {
         //private RateReply CallRateService(RateRequest request) { return new RateReply(); }
-        public RateResponse Get(RateRequest request) {
-            throw new NotImplementedException();
+        //public RateResponse Get(RateRequest request) {
+        //    throw new NotImplementedException();
 
-            return new RateResponse();
-        }
+        //    return new RateResponse();
+        //}
     }
 }
diff --git a/SeeSharpShip/Services/Usps/IRateService.cs b/SeeSharpShip/Services/Usps/IRateService.cs
index 214a53c..0f68a52 100644
--- a/SeeSharpShip/Services/Usps/IRateService.cs
+++ b/SeeSharpShip/Services/Usps/IRateService.cs
@@ -18,10 +18,10 @@
 #endregion
 
 using System.Collections.Generic;
-using SeeSharpShip.Models.Usps.Domestic.Request;
-using SeeSharpShip.Models.Usps.Domestic.Response;
-using SeeSharpShip.Models.Usps.International.Request;
-using SeeSharpShip.Models.Usps.International.Response;
+using SeeSharpShip.Model.Usps.Domestic.Request;
+using SeeSharpShip.Model.Usps.Domestic.Response;
+using SeeSharpShip.Model.Usps.International.Request;
+using SeeSharpShip.Model.Usps.International.Response;
 
 namespace SeeSharpShip.Services.Usps {
     public interface IRateService {
diff --git a/SeeSharpShip/Services/Usps/ITrackService.cs b/SeeSharpShip/Services/Usps/ITrackService.cs
index 5203f92..6c70129 100644
--- a/SeeSharpShip/Services/Usps/ITrackService.cs
+++ b/SeeSharpShip/Services/Usps/ITrackService.cs
@@ -17,7 +17,7 @@
 
 #endregion
 
-using SeeSharpShip.Models.Usps;
+using SeeSharpShip.Model.Usps;
 
 namespace SeeSharpShip.Services.Usps {
     public interface ITrackService {
diff --git a/SeeSharpShip/Services/Usps/RateService.cs b/SeeSharpShip/Services/Usps/RateService.cs
index 29389d1..29ed0c5 100644
--- a/SeeSharpShip/Services/Usps/RateService.cs
+++ b/SeeSharpShip/Services/Usps/RateService.cs
@@ -21,12 +21,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using SeeSharpShip.Extensions;
-using SeeSharpShip.Models.Usps;
-using SeeSharpShip.Models.Usps.Domestic;
-using SeeSharpShip.Models.Usps.Domestic.Request;
-using SeeSharpShip.Models.Usps.Domestic.Response;
-using SeeSharpShip.Models.Usps.International.Request;
-using SeeSharpShip.Models.Usps.International.Response;
+using SeeSharpShip.Model.Extensions;
+using SeeSharpShip.Model.Usps;
+using SeeSharpShip.Model.Usps.Domestic;
+using SeeSharpShip.Model.Usps.Domestic.Request;
+using SeeSharpShip.Model.Usps.Domestic.Response;
+using SeeSharpShip.Model.Usps.International.Request;
+using SeeSharpShip.Model.Usps.International.Response;
 
 namespace SeeSharpShip.Services.Usps {
     public class RateService : IRateService {
diff --git a/SeeSharpShip/Services/Usps/TrackService.cs b/SeeSharpShip/Services/Usps/TrackService.cs
index 3a51fd9..b543296 100644
--- a/SeeSharpShip/Services/Usps/TrackService.cs
+++ b/SeeSharpShip/Services/Usps/TrackService.cs
@@ -20,7 +20,8 @@
 using System;
 using System.Xml.Linq;
 using SeeSharpShip.Extensions;
-using SeeSharpShip.Models.Usps;
+using SeeSharpShip.Model.Extensions;
+using SeeSharpShip.Model.Usps;
 
 namespace SeeSharpShip.Services.Usps {
     public class TrackService : ITrackService {
diff --git a/Versioning/AssemblyVersionInfo.cs b/Versioning/AssemblyVersionInfo.cs
index fa7b48c..cf66f34 100644
--- a/Versioning/AssemblyVersionInfo.cs
+++ b/Versioning/AssemblyVersionInfo.cs
@@ -50,5 +50,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("0.1.7.0")]
-[assembly: AssemblyFileVersion("0.1.7.0")]
+[assembly: AssemblyVersion("0.2.0.0")]
+[assembly: AssemblyFileVersion("0.2.0.0")]