diff --git a/PocketSharp.Tests/PocketSharp.Tests.csproj b/PocketSharp.Tests/PocketSharp.Tests.csproj
index 85353dd..8a0089e 100644
--- a/PocketSharp.Tests/PocketSharp.Tests.csproj
+++ b/PocketSharp.Tests/PocketSharp.Tests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>fbe5a0d2-d0de-44b1-8b8a-cf8cd3ac2230</ProjectGuid>
+    <ProjectGuid>{F1CEA363-7039-40BA-9744-0071F46BB90C}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PocketSharp.Tests</RootNamespace>
diff --git a/PocketSharp.sln b/PocketSharp.sln
index 1c89a84..e25683e 100644
--- a/PocketSharp.sln
+++ b/PocketSharp.sln
@@ -5,6 +5,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp", "PocketSharp\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Console", "PocketSharp.Console\PocketSharp.Console.csproj", "{81B7D587-A189-4785-BDFE-CA8A9ABA0760}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Tests", "PocketSharp.Tests\PocketSharp.Tests.csproj", "{F1CEA363-7039-40BA-9744-0071F46BB90C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -19,6 +21,10 @@ Global
 		{81B7D587-A189-4785-BDFE-CA8A9ABA0760}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81B7D587-A189-4785-BDFE-CA8A9ABA0760}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81B7D587-A189-4785-BDFE-CA8A9ABA0760}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/PocketSharp/Components/Authentification.cs b/PocketSharp/Components/Authentification.cs
index 1e9f965..abc204e 100644
--- a/PocketSharp/Components/Authentification.cs
+++ b/PocketSharp/Components/Authentification.cs
@@ -1,7 +1,5 @@
-using PocketSharp.Models.Authentification;
+using PocketSharp.Models;
 using System;
-using System.Collections.Generic;
-using RestSharp;
 
 namespace PocketSharp
 {
diff --git a/PocketSharp/Models/PocketItem.cs b/PocketSharp/Models/PocketItem.cs
index 845949a..40421fa 100644
--- a/PocketSharp/Models/PocketItem.cs
+++ b/PocketSharp/Models/PocketItem.cs
@@ -182,7 +182,7 @@ namespace PocketSharp.Models
     /// The _ tag dictionary.
     /// </value>
     [DataMember(Name = "tags")]
-    public Dictionary<string, PocketTag> _TagDictionary { get; set; }
+    public Dictionary<string, PocketTag> TagDictionary { get; set; }
 
     /// <summary>
     /// Gets or sets the _ image dictionary.
@@ -191,7 +191,7 @@ namespace PocketSharp.Models
     /// The _ image dictionary.
     /// </value>
     [DataMember(Name = "images")]
-    public Dictionary<string, PocketImage> _ImageDictionary { get; set; }
+    public Dictionary<string, PocketImage> ImageDictionary { get; set; }
 
     /// <summary>
     /// Gets or sets the _ video dictionary.
@@ -200,7 +200,7 @@ namespace PocketSharp.Models
     /// The _ video dictionary.
     /// </value>
     [DataMember(Name = "videos")]
-    public Dictionary<string, PocketVideo> _VideoDictionary { get; set; }
+    public Dictionary<string, PocketVideo> VideoDictionary { get; set; }
 
     /// <summary>
     /// Gets or sets the _ author dictionary.
@@ -209,7 +209,7 @@ namespace PocketSharp.Models
     /// The _ author dictionary.
     /// </value>
     [DataMember(Name = "authors")]
-    public Dictionary<string, PocketAuthor> _AuthorDictionary { get; set; }
+    public Dictionary<string, PocketAuthor> AuthorDictionary { get; set; }
 
 
     /// <summary>
@@ -221,7 +221,7 @@ namespace PocketSharp.Models
     [IgnoreDataMember]
     public List<PocketTag> Tags
     {
-      get { return Utilities.DictionaryToList<PocketTag>(_TagDictionary); }
+      get { return Utilities.DictionaryToList<PocketTag>(TagDictionary); }
     }
 
     /// <summary>
@@ -233,7 +233,7 @@ namespace PocketSharp.Models
     [IgnoreDataMember]
     public List<PocketImage> Images
     {
-      get { return Utilities.DictionaryToList<PocketImage>(_ImageDictionary); }
+      get { return Utilities.DictionaryToList<PocketImage>(ImageDictionary); }
     }
 
     /// <summary>
@@ -257,7 +257,7 @@ namespace PocketSharp.Models
     [IgnoreDataMember]
     public List<PocketVideo> Videos
     {
-      get { return Utilities.DictionaryToList<PocketVideo>(_VideoDictionary); }
+      get { return Utilities.DictionaryToList<PocketVideo>(VideoDictionary); }
     }
 
     /// <summary>
@@ -269,7 +269,7 @@ namespace PocketSharp.Models
     [IgnoreDataMember]
     public List<PocketAuthor> Authors
     {
-      get { return Utilities.DictionaryToList<PocketAuthor>(_AuthorDictionary); }
+      get { return Utilities.DictionaryToList<PocketAuthor>(AuthorDictionary); }
     }
   }
 }
diff --git a/PocketSharp/Models/Authentification/AccessCode.cs b/PocketSharp/Models/Response/AccessCode.cs
similarity index 92%
rename from PocketSharp/Models/Authentification/AccessCode.cs
rename to PocketSharp/Models/Response/AccessCode.cs
index c574518..874a625 100644
--- a/PocketSharp/Models/Authentification/AccessCode.cs
+++ b/PocketSharp/Models/Response/AccessCode.cs
@@ -1,6 +1,6 @@
 using System.Runtime.Serialization;
 
-namespace PocketSharp.Models.Authentification
+namespace PocketSharp.Models
 {
   /// <summary>
   /// Access Code
diff --git a/PocketSharp/Models/Authentification/RequestCode.cs b/PocketSharp/Models/Response/RequestCode.cs
similarity index 91%
rename from PocketSharp/Models/Authentification/RequestCode.cs
rename to PocketSharp/Models/Response/RequestCode.cs
index cad4000..5a4d59e 100644
--- a/PocketSharp/Models/Authentification/RequestCode.cs
+++ b/PocketSharp/Models/Response/RequestCode.cs
@@ -1,6 +1,6 @@
 using System.Runtime.Serialization;
 
-namespace PocketSharp.Models.Authentification
+namespace PocketSharp.Models
 {
   /// <summary>
   /// Request Code
diff --git a/PocketSharp/Models/Response/Retrieve.cs b/PocketSharp/Models/Response/Retrieve.cs
index e0eac2b..97530db 100644
--- a/PocketSharp/Models/Response/Retrieve.cs
+++ b/PocketSharp/Models/Response/Retrieve.cs
@@ -34,7 +34,7 @@ namespace PocketSharp.Models
     /// The _ item dictionary.
     /// </value>
     [DataMember(Name = "list")]
-    public Dictionary<string, PocketItem> _ItemDictionary { get; set; }
+    public Dictionary<string, PocketItem> ItemDictionary { get; set; }
 
     /// <summary>
     /// Gets the items.
@@ -45,7 +45,7 @@ namespace PocketSharp.Models
     [IgnoreDataMember]
     public List<PocketItem> Items
     {
-      get { return Utilities.DictionaryToList<PocketItem>(_ItemDictionary); }
+      get { return Utilities.DictionaryToList<PocketItem>(ItemDictionary); }
     }
   }
 }
diff --git a/PocketSharp/PocketSharp.csproj b/PocketSharp/PocketSharp.csproj
index fd5834f..017307a 100644
--- a/PocketSharp/PocketSharp.csproj
+++ b/PocketSharp/PocketSharp.csproj
@@ -56,8 +56,8 @@
     <Compile Include="Components\ModifyTags.cs" />
     <Compile Include="Components\Retrieve.cs" />
     <Compile Include="JsonDeserializer.cs" />
-    <Compile Include="Models\Authentification\AccessCode.cs" />
-    <Compile Include="Models\Authentification\RequestCode.cs" />
+    <Compile Include="Models\Response\AccessCode.cs" />
+    <Compile Include="Models\Response\RequestCode.cs" />
     <Compile Include="Models\Parameters\AddParameters.cs" />
     <Compile Include="Models\PocketAuthor.cs" />
     <Compile Include="Models\PocketImage.cs" />