diff --git a/Build/Scripts/TrackableEntities.Client.cmd b/Build/Scripts/TrackableEntities.Client.cmd
index 220dcc5c..aa476c92 100644
--- a/Build/Scripts/TrackableEntities.Client.cmd
+++ b/Build/Scripts/TrackableEntities.Client.cmd
@@ -14,6 +14,9 @@ set output=Build\Output\%name%
 set target-portable=portable-net45+wp80+win8+wpa81
 set target-sl5=sl5
 set target-net45=net45
+set src-portable=TrackableEntities.Client
+set src-sl5=TrackableEntities.Client.Sl5
+set src-net45=TrackableEntities.Client.Net45
 
 REM Restore:
 if "%debug%"=="1" pause
@@ -39,10 +42,10 @@ xcopy "%source%\bin\%config%\%name%.dll" "%output%\lib\%target-portable%\" /y
 xcopy "%source%\bin\%config%\%name%.xml" "%output%\lib\%target-portable%\" /y
 xcopy "%source%\bin\%config%\%name%.pdb" "%output%\lib\%target-portable%\" /y
 
-mkdir "%output%\src\%target-portable%\Properties"
-xcopy "Source\AssemblyVersion.cs" "%output%\src\%target-portable%\Properties\" /y
-xcopy "%source%\Properties\AssemblyInfo.cs" "%output%\src\%target-portable%\Properties\" /y
-xcopy "%source%\*.cs" "%output%\src\%target-portable%\" /y
+mkdir "%output%\src\%src-portable%\Properties"
+xcopy "Source\AssemblyVersion.cs" "%output%\src\%src-portable%\Properties\" /y
+xcopy "%source%\Properties\AssemblyInfo.cs" "%output%\src\%src-portable%\Properties\" /y
+xcopy "%source%\*.cs" "%output%\src\%src-portable%\" /y
 if "%debug%"=="1" pause
 if not "%errorlevel%"=="0" exit
 
@@ -53,10 +56,10 @@ xcopy "%source%\bin\%config%\%name%.dll" "%output%\lib\%target-sl5%\" /y
 xcopy "%source%\bin\%config%\%name%.xml" "%output%\lib\%target-sl5%\" /y
 xcopy "%source%\bin\%config%\%name%.pdb" "%output%\lib\%target-sl5%\" /y
 
-mkdir "%output%\src\%target-sl5%\Properties"
-xcopy "Source\AssemblyVersion.cs" "%output%\src\%target-sl5%\Properties\" /y
-xcopy "%source%\Properties\AssemblyInfo.cs" "%output%\src\%target-sl5%\Properties\" /y
-xcopy "%source%\*.cs" "%output%\src\%target-sl5%\" /y
+mkdir "%output%\src\%src-sl5%\Properties"
+xcopy "Source\AssemblyVersion.cs" "%output%\src\%src-sl5%\Properties\" /y
+xcopy "%source%\Properties\AssemblyInfo.cs" "%output%\src\%src-sl5%\Properties\" /y
+xcopy "%source%\*.cs" "%output%\src\%src-sl5%\" /y
 if "%debug%"=="1" pause
 if not "%errorlevel%"=="0" exit
 
@@ -67,12 +70,12 @@ xcopy "%source%.Net45\bin\%config%\%name%.dll" "%output%\lib\%target-net45%\" /y
 xcopy "%source%.Net45\bin\%config%\%name%.xml" "%output%\lib\%target-net45%\" /y
 xcopy "%source%.Net45\bin\%config%\%name%.pdb" "%output%\lib\%target-net45%\" /y
 
-mkdir "%output%\src\%target-net45%\Properties"
-xcopy "Source\AssemblyVersion.cs" "%output%\src\%target-net45%\Properties\" /y
-xcopy "%source%\Properties\AssemblyInfo.cs" "%output%\src\%target-net45%\Properties\" /y
-xcopy "%source%\*.cs" "%output%\src\%target-net45%\" /y
-del "%output%\src\%target-net45%\EntityBasePortable.cs"
-xcopy "%source%.Net45\*.cs" "%output%\src\%target-net45%\" /y
+mkdir "%output%\src\%src-net45%\Properties"
+xcopy "Source\AssemblyVersion.cs" "%output%\src\%src-net45%\Properties\" /y
+xcopy "%source%\Properties\AssemblyInfo.cs" "%output%\src\%src-net45%\Properties\" /y
+xcopy "%source%\*.cs" "%output%\src\%src-net45%\" /y
+del "%output%\src\%src-net45%\EntityBasePortable.cs"
+xcopy "%source%.Net45\*.cs" "%output%\src\%src-net45%\" /y
 if "%debug%"=="1" pause
 if not "%errorlevel%"=="0" exit
 
diff --git a/Extensions/VS2013/Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWcfService.zip b/Extensions/VS2013/Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWcfService.zip
index d39009e4..1c58e3a7 100644
Binary files a/Extensions/VS2013/Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWcfService.zip and b/Extensions/VS2013/Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWcfService.zip differ
diff --git a/Extensions/VS2013/Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWebApi.zip b/Extensions/VS2013/Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWebApi.zip
index 5ab2f3e6..e5270f08 100644
Binary files a/Extensions/VS2013/Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWebApi.zip and b/Extensions/VS2013/Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWebApi.zip differ
diff --git a/Extensions/VS2013/Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWebApiPatterns.zip b/Extensions/VS2013/Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWebApiPatterns.zip
index 56f708aa..3f17a157 100644
Binary files a/Extensions/VS2013/Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWebApiPatterns.zip and b/Extensions/VS2013/Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWebApiPatterns.zip differ
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/Entities.Client.Net45.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/Entities.Client.Net45.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/Entities.Client.Net45.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/Entities.Client.Net45.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/TrackableClientEntities.Net45.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/TrackableClientEntities.Net45.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/TrackableClientEntities.Net45.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/TrackableClientEntities.Net45.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/TrackableEntities.ClientTemplate.Net45.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/TrackableEntities.ClientTemplate.Net45.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/TrackableEntities.ClientTemplate.Net45.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/TrackableEntities.ClientTemplate.Net45.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Net45/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Net45/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/Context.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/Context.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/Context.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/Context.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/Entities.Client.Portable.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/Entities.Client.Portable.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/Entities.Client.Portable.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/Entities.Client.Portable.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/TrackableClientEntities.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/TrackableClientEntities.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/TrackableClientEntities.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/TrackableClientEntities.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/TrackableEntities.ClientTemplate.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/TrackableEntities.ClientTemplate.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/TrackableEntities.ClientTemplate.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/TrackableEntities.ClientTemplate.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Client.Portable/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Client.Portable/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/Entities.Service.Net45.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/Entities.Service.Net45.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/Entities.Service.Net45.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/Entities.Service.Net45.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/TrackableService.Entities.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/TrackableService.Entities.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/TrackableService.Entities.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/TrackableService.Entities.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/TrackableServiceEntities.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/TrackableServiceEntities.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/TrackableServiceEntities.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/TrackableServiceEntities.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Service.Net45/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Service.Net45/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/Entities.Shared.Net45.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/Entities.Shared.Net45.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/Entities.Shared.Net45.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/Entities.Shared.Net45.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/TrackableShared.Entities.Net45.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/TrackableShared.Entities.Net45.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/TrackableShared.Entities.Net45.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/TrackableShared.Entities.Net45.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/TrackableSharedEntities.Net45.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/TrackableSharedEntities.Net45.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/TrackableSharedEntities.Net45.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/TrackableSharedEntities.Net45.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Net45/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Net45/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/Entities.Shared.Portable.Data.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/Entities.Shared.Portable.Data.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/Entities.Shared.Portable.Data.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/Entities.Shared.Portable.Data.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/TrackableEntities.Shared.Entities.Portable.Data.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/TrackableEntities.Shared.Entities.Portable.Data.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/TrackableEntities.Shared.Entities.Portable.Data.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/TrackableEntities.Shared.Entities.Portable.Data.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/TrackableSharedEntities.Portable.Data.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/TrackableSharedEntities.Portable.Data.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/TrackableSharedEntities.Portable.Data.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/TrackableSharedEntities.Portable.Data.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable.Data/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable.Data/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Context.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/Entities.Shared.Portable.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/Entities.Shared.Portable.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/Entities.Shared.Portable.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/Entities.Shared.Portable.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/TrackableEntities.Shared.Entities.Portable.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/TrackableEntities.Shared.Entities.Portable.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/TrackableEntities.Shared.Entities.Portable.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/TrackableEntities.Shared.Entities.Portable.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/TrackableSharedEntities.Portable.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/TrackableSharedEntities.Portable.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/TrackableSharedEntities.Portable.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/TrackableSharedEntities.Portable.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities/Entities.Shared.Portable/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/Entities.Shared.Portable/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/TrackableWcfService.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/TrackableWcfService.vstemplate
index bd16382d..28760e22 100644
--- a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/TrackableWcfService.vstemplate
+++ b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/TrackableWcfService.vstemplate
@@ -28,22 +28,22 @@
         ConsoleClient\ConsoleClient.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Client.Net45">
-        Entities\Entities.Client.Net45\Entities.Client.Net45.vstemplate
+        Entities.Client.Net45\Entities.Client.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Client.Portable">
-        Entities\Entities.Client.Portable\Entities.Client.Portable.vstemplate
+        Entities.Client.Portable\Entities.Client.Portable.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Service.Net45">
-        Entities\Entities.Service.Net45\Entities.Service.Net45.vstemplate
+        Entities.Service.Net45\Entities.Service.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Shared.Net45">
-        Entities\Entities.Shared.Net45\Entities.Shared.Net45.vstemplate
+        Entities.Shared.Net45\Entities.Shared.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Shared.Portable">
-        Entities\Entities.Shared.Portable\Entities.Shared.Portable.vstemplate
+        Entities.Shared.Portable\Entities.Shared.Portable.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Service.Data">
-        Entities\Entities.Shared.Portable.Data\Entities.Shared.Portable.Data.vstemplate
+        Entities.Shared.Portable.Data\Entities.Shared.Portable.Data.vstemplate
       </ProjectTemplateLink>
     </ProjectCollection>
   </TemplateContent>
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/Entities.Client.Net45.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/Entities.Client.Net45.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/Entities.Client.Net45.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/Entities.Client.Net45.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/TrackableClientEntities.Net45.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/TrackableClientEntities.Net45.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/TrackableClientEntities.Net45.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/TrackableClientEntities.Net45.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/TrackableEntities.ClientTemplate.Net45.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/TrackableEntities.ClientTemplate.Net45.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/TrackableEntities.ClientTemplate.Net45.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/TrackableEntities.ClientTemplate.Net45.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Net45/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Net45/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/Context.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/Context.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/Context.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/Context.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/Entities.Client.Portable.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/Entities.Client.Portable.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/Entities.Client.Portable.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/Entities.Client.Portable.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/TrackableClientEntities.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/TrackableClientEntities.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/TrackableClientEntities.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/TrackableClientEntities.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/TrackableEntities.ClientTemplate.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/TrackableEntities.ClientTemplate.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/TrackableEntities.ClientTemplate.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/TrackableEntities.ClientTemplate.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Client.Portable/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Client.Portable/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/Entities.Service.Net45.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/Entities.Service.Net45.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/Entities.Service.Net45.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/Entities.Service.Net45.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/TrackableService.Entities.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/TrackableService.Entities.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/TrackableService.Entities.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/TrackableService.Entities.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/TrackableServiceEntities.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/TrackableServiceEntities.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/TrackableServiceEntities.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/TrackableServiceEntities.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Service.Net45/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Service.Net45/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/Entities.Shared.Net45.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/Entities.Shared.Net45.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/Entities.Shared.Net45.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/Entities.Shared.Net45.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/TrackableShared.Entities.Net45.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/TrackableShared.Entities.Net45.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/TrackableShared.Entities.Net45.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/TrackableShared.Entities.Net45.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/TrackableSharedEntities.Net45.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/TrackableSharedEntities.Net45.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/TrackableSharedEntities.Net45.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/TrackableSharedEntities.Net45.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Net45/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Net45/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/Entities.Shared.Portable.Data.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/Entities.Shared.Portable.Data.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/Entities.Shared.Portable.Data.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/Entities.Shared.Portable.Data.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/TrackableEntities.Shared.Entities.Portable.Data.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/TrackableEntities.Shared.Entities.Portable.Data.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/TrackableEntities.Shared.Entities.Portable.Data.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/TrackableEntities.Shared.Entities.Portable.Data.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/TrackableSharedEntities.Portable.Data.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/TrackableSharedEntities.Portable.Data.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/TrackableSharedEntities.Portable.Data.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/TrackableSharedEntities.Portable.Data.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable.Data/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable.Data/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Context.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/Entities.Shared.Portable.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/Entities.Shared.Portable.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/Entities.Shared.Portable.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/Entities.Shared.Portable.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/TrackableEntities.Shared.Entities.Portable.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/TrackableEntities.Shared.Entities.Portable.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/TrackableEntities.Shared.Entities.Portable.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/TrackableEntities.Shared.Entities.Portable.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/TrackableSharedEntities.Portable.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/TrackableSharedEntities.Portable.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/TrackableSharedEntities.Portable.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/TrackableSharedEntities.Portable.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities/Entities.Shared.Portable/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/Entities.Shared.Portable/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/TrackableWebApi.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/TrackableWebApi.vstemplate
index 0fb5c7f7..3179d347 100644
--- a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/TrackableWebApi.vstemplate
+++ b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/TrackableWebApi.vstemplate
@@ -25,22 +25,22 @@
         ConsoleClient\ConsoleClient.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Client.Net45">
-        Entities\Entities.Client.Net45\Entities.Client.Net45.vstemplate
+        Entities.Client.Net45\Entities.Client.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Client.Portable">
-        Entities\Entities.Client.Portable\Entities.Client.Portable.vstemplate
+        Entities.Client.Portable\Entities.Client.Portable.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Service.Net45">
-        Entities\Entities.Service.Net45\Entities.Service.Net45.vstemplate
+        Entities.Service.Net45\Entities.Service.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Shared.Net45">
-        Entities\Entities.Shared.Net45\Entities.Shared.Net45.vstemplate
+        Entities.Shared.Net45\Entities.Shared.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Shared.Portable">
-        Entities\Entities.Shared.Portable\Entities.Shared.Portable.vstemplate
+        Entities.Shared.Portable\Entities.Shared.Portable.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Service.Data">
-        Entities\Entities.Shared.Portable.Data\Entities.Shared.Portable.Data.vstemplate
+        Entities.Shared.Portable.Data\Entities.Shared.Portable.Data.vstemplate
       </ProjectTemplateLink>
     </ProjectCollection>
   </TemplateContent>
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/Entities.Client.Net45.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/Entities.Client.Net45.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/Entities.Client.Net45.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/Entities.Client.Net45.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/TrackableClientEntities.Net45.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/TrackableClientEntities.Net45.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/TrackableClientEntities.Net45.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/TrackableClientEntities.Net45.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/TrackableEntities.ClientTemplate.Net45.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/TrackableEntities.ClientTemplate.Net45.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/TrackableEntities.ClientTemplate.Net45.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/TrackableEntities.ClientTemplate.Net45.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Net45/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Net45/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/Context.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/Context.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/Context.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/Context.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/Entities.Client.Portable.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/Entities.Client.Portable.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/Entities.Client.Portable.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/Entities.Client.Portable.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/TrackableClientEntities.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/TrackableClientEntities.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/TrackableClientEntities.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/TrackableClientEntities.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/TrackableEntities.ClientTemplate.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/TrackableEntities.ClientTemplate.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/TrackableEntities.ClientTemplate.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/TrackableEntities.ClientTemplate.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Client.Portable/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Client.Portable/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/Entities.Service.Net45.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/Entities.Service.Net45.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/Entities.Service.Net45.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/Entities.Service.Net45.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/TrackableService.Entities.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/TrackableService.Entities.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/TrackableService.Entities.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/TrackableService.Entities.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/TrackableServiceEntities.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/TrackableServiceEntities.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/TrackableServiceEntities.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/TrackableServiceEntities.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Service.Net45/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Service.Net45/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/Context.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4 b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/CodeTemplates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/Entities.Shared.Net45.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/Entities.Shared.Net45.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/Entities.Shared.Net45.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/Entities.Shared.Net45.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/TrackableShared.Entities.Net45.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/TrackableShared.Entities.Net45.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/TrackableShared.Entities.Net45.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/TrackableShared.Entities.Net45.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/TrackableSharedEntities.Net45.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/TrackableSharedEntities.Net45.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/TrackableSharedEntities.Net45.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/TrackableSharedEntities.Net45.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Net45/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Net45/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/Entities.Shared.Portable.Data.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/Entities.Shared.Portable.Data.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/Entities.Shared.Portable.Data.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/Entities.Shared.Portable.Data.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/TrackableEntities.Shared.Entities.Portable.Data.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/TrackableEntities.Shared.Entities.Portable.Data.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/TrackableEntities.Shared.Entities.Portable.Data.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/TrackableEntities.Shared.Entities.Portable.Data.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/TrackableSharedEntities.Portable.Data.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/TrackableSharedEntities.Portable.Data.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/TrackableSharedEntities.Portable.Data.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/TrackableSharedEntities.Portable.Data.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable.Data/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable.Data/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/App.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/App.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/App.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/App.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Context.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Context.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/CodeTemplates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/Entities.Shared.Portable.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/Entities.Shared.Portable.vstemplate
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/Entities.Shared.Portable.vstemplate
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/Entities.Shared.Portable.vstemplate
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/Properties/AssemblyInfo.cs b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/Properties/AssemblyInfo.cs
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/Properties/AssemblyInfo.cs
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/Properties/AssemblyInfo.cs
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/TrackableEntities.Shared.Entities.Portable.csproj b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/TrackableEntities.Shared.Entities.Portable.csproj
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/TrackableEntities.Shared.Entities.Portable.csproj
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/TrackableEntities.Shared.Entities.Portable.csproj
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/TrackableSharedEntities.Portable.ReadMe.txt b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/TrackableSharedEntities.Portable.ReadMe.txt
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/TrackableSharedEntities.Portable.ReadMe.txt
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/TrackableSharedEntities.Portable.ReadMe.txt
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/__PreviewImage.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/__PreviewImage.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/__PreviewImage.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/__PreviewImage.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/__TemplateIcon.png b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/__TemplateIcon.png
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/__TemplateIcon.png
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/__TemplateIcon.png
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/packages.config b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/packages.config
similarity index 100%
rename from Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities/Entities.Shared.Portable/packages.config
rename to Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/Entities.Shared.Portable/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/TrackableWebApiPatterns.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/TrackableWebApiPatterns.vstemplate
index b4446a00..c7dfd078 100644
--- a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/TrackableWebApiPatterns.vstemplate
+++ b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApiPatterns/TrackableWebApiPatterns.vstemplate
@@ -31,22 +31,22 @@
         ConsoleClient\ConsoleClient.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Client.Net45">
-        Entities\Entities.Client.Net45\Entities.Client.Net45.vstemplate
+        Entities.Client.Net45\Entities.Client.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Client.Portable">
-        Entities\Entities.Client.Portable\Entities.Client.Portable.vstemplate
+        Entities.Client.Portable\Entities.Client.Portable.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Service.Net45">
-        Entities\Entities.Service.Net45\Entities.Service.Net45.vstemplate
+        Entities.Service.Net45\Entities.Service.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Shared.Net45">
-        Entities\Entities.Shared.Net45\Entities.Shared.Net45.vstemplate
+        Entities.Shared.Net45\Entities.Shared.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Shared.Portable">
-        Entities\Entities.Shared.Portable\Entities.Shared.Portable.vstemplate
+        Entities.Shared.Portable\Entities.Shared.Portable.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Service.Data">
-        Entities\Entities.Shared.Portable.Data\Entities.Shared.Portable.Data.vstemplate
+        Entities.Shared.Portable.Data\Entities.Shared.Portable.Data.vstemplate
       </ProjectTemplateLink>
     </ProjectCollection>
   </TemplateContent>
diff --git a/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWcfService.zip b/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWcfService.zip
index d39009e4..1c58e3a7 100644
Binary files a/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWcfService.zip and b/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWcfService.zip differ
diff --git a/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWebApi.zip b/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWebApi.zip
index 5ab2f3e6..e5270f08 100644
Binary files a/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWebApi.zip and b/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWebApi.zip differ
diff --git a/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWebApiPatterns.zip b/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWebApiPatterns.zip
index 56f708aa..3f17a157 100644
Binary files a/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWebApiPatterns.zip and b/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWebApiPatterns.zip differ
diff --git a/Extensions/VS2013/VSIX/TrackableEntities.VS2013-2.2.5.vsix b/Extensions/VS2013/VSIX/TrackableEntities.VS2013-2.5.0.vsix
similarity index 92%
rename from Extensions/VS2013/VSIX/TrackableEntities.VS2013-2.2.5.vsix
rename to Extensions/VS2013/VSIX/TrackableEntities.VS2013-2.5.0.vsix
index ed1a2f2d..9f946365 100644
Binary files a/Extensions/VS2013/VSIX/TrackableEntities.VS2013-2.2.5.vsix and b/Extensions/VS2013/VSIX/TrackableEntities.VS2013-2.5.0.vsix differ
diff --git a/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.2.5.0.nupkg b/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.2.5.0.nupkg
new file mode 100644
index 00000000..772a5678
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.2.5.0.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.2.5.0.symbols.nupkg b/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.2.5.0.symbols.nupkg
new file mode 100644
index 00000000..6ebcb25c
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.2.5.0.symbols.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.nuspec b/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.nuspec
index 5efa60e3..71283207 100644
--- a/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.nuspec
+++ b/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>TrackableEntities.Client.Net4</id>
-    	<version>2.1.1.0-beta1</version>
+    	<version>2.5.0</version>
         <title>Trackable Entities Client for .NET 4.0</title>
         <authors>Tony Sneed</authors>
         <owners>Tony Sneed</owners>
@@ -15,8 +15,8 @@
         <tags>change-tracking entity-framework n-tier wcf web-api</tags>
         <dependencies>
             <group targetFramework="net40">
-                <dependency id="Newtonsoft.Json" version="6.0.3" />
-                <dependency id="TrackableEntities.Common" version="2.1.0.0" />
+                <dependency id="Newtonsoft.Json" version="6.0.8" />
+                <dependency id="TrackableEntities.Common" version="2.5.0" />
             </group>
         </dependencies>
     </metadata>
diff --git a/NuGet/Packages/TrackableEntities.Client.Net4/lib/net40/TrackableEntities.Client.dll b/NuGet/Packages/TrackableEntities.Client.Net4/lib/net40/TrackableEntities.Client.dll
deleted file mode 100644
index 5c0a5b65..00000000
Binary files a/NuGet/Packages/TrackableEntities.Client.Net4/lib/net40/TrackableEntities.Client.dll and /dev/null differ
diff --git a/NuGet/Packages/TrackableEntities.Client.Net4/lib/net40/TrackableEntities.Client.pdb b/NuGet/Packages/TrackableEntities.Client.Net4/lib/net40/TrackableEntities.Client.pdb
deleted file mode 100644
index a3485ce8..00000000
Binary files a/NuGet/Packages/TrackableEntities.Client.Net4/lib/net40/TrackableEntities.Client.pdb and /dev/null differ
diff --git a/NuGet/Packages/TrackableEntities.Client.Net4/lib/net40/TrackableEntities.Client.xml b/NuGet/Packages/TrackableEntities.Client.Net4/lib/net40/TrackableEntities.Client.xml
deleted file mode 100644
index ffb64b81..00000000
--- a/NuGet/Packages/TrackableEntities.Client.Net4/lib/net40/TrackableEntities.Client.xml
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>TrackableEntities.Client</name>
-    </assembly>
-    <members>
-        <member name="T:TrackableEntities.Client.ChangeTrackingCollection`1">
-            <summary>
-            Collection responsible for tracking changes to entities.
-            </summary>
-            <typeparam name="TEntity">Trackable entity type</typeparam>
-        </member>
-        <member name="T:TrackableEntities.Client.ITrackingCollection`1">
-            <summary>
-            Interface implemented by trackable collections.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ITrackingCollection`1.GetChanges">
-            <summary>
-            Get entities that have been marked as Added, Modified or Deleted.
-            </summary>
-            <returns>Collection containing only changed entities</returns>
-        </member>
-        <member name="T:TrackableEntities.Client.ITrackingCollection">
-            <summary>
-            Interface implemented by trackable collections.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ITrackingCollection.SetTracking(System.Boolean,TrackableEntities.Common.ObjectVisitationHelper)">
-            <summary>
-            For internal use.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ITrackingCollection.GetChanges(System.Boolean)">
-            <summary>
-            Get entities that have been marked as Added, Modified or Deleted.
-            </summary>
-            <param name="cachedDeletesOnly">True to return only cached deletes</param>
-            <returns>Collection containing only changed entities</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.ITrackingCollection.RemoveCachedDeletes">
-            <summary>
-            Remove deleted entities which have been cached.
-            </summary>
-        </member>
-        <member name="E:TrackableEntities.Client.ITrackingCollection.EntityChanged">
-            <summary>
-            Notification that an entity has changed.
-            </summary>
-        </member>
-        <member name="P:TrackableEntities.Client.ITrackingCollection.Tracking">
-            <summary>
-            Turn change-tracking on and off.
-            </summary>
-        </member>
-        <member name="P:TrackableEntities.Client.ITrackingCollection.ExcludedProperties">
-            <summary>
-            Properties to exclude from change tracking.
-            </summary>
-        </member>
-        <member name="P:TrackableEntities.Client.ITrackingCollection.Parent">
-            <summary>
-            ITrackable parent referencing items in this collection.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.#ctor">
-            <summary>
-            Default contstructor with change-tracking disabled
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.#ctor(System.Boolean)">
-            <summary>
-            Change-tracking will not begin after entities are added, 
-            unless tracking is enabled.
-            </summary>
-            <param name="enableTracking">Enable tracking after entities are added</param>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.#ctor(`0[])">
-            <summary>
-            Constructor that accepts one or more entities.
-            Change-tracking will begin after entities are added.
-            </summary>
-            <param name="entities">Entities being change-tracked</param>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.#ctor(System.Collections.Generic.IEnumerable{`0},System.Boolean)">
-            <summary>
-            Constructor that accepts a collection of entities.
-            Change-tracking will begin after entities are added, 
-            unless tracking is disabled.
-            </summary>
-            <param name="entities">Entities being change-tracked</param>
-            <param name="disableTracking">Disable tracking after entities are added</param>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.SetTracking(System.Boolean,TrackableEntities.Common.ObjectVisitationHelper)">
-            <summary>
-            For internal use.
-            Turn change-tracking on and off with proper circular reference checking.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.InsertItem(System.Int32,`0)">
-            <summary>
-            Insert item at specified index.
-            </summary>
-            <param name="index">Zero-based index at which item should be inserted</param>
-            <param name="item">Item to insert</param>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.RemoveItem(System.Int32)">
-            <summary>
-            Remove item at specified index.
-            </summary>
-            <param name="index">Zero-based index at which item should be removed</param>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.GetChanges">
-            <summary>
-            Get entities that have been added, modified or deleted, including child 
-            collections with entities that have been added, modified or deleted.
-            </summary>
-            <returns>Collection containing only changed entities</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.TrackableEntities#Client#ITrackingCollection#GetChanges(System.Boolean)">
-            <summary>
-            Get entities that have been added, modified or deleted.
-            </summary>
-            <param name="cachedDeletesOnly">True to return only cached deletes</param>
-            <returns>Collection containing only changed entities</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.TrackableEntities#Client#ITrackingCollection#RemoveCachedDeletes">
-            <summary>
-            Remove deleted entities which have been cached.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.MergeChanges(`0@,`0)">
-            <summary>
-            <para>Merge changed child items into the original trackable entity. 
-            This assumes GetChanges was called to update only changed items. 
-            Non-recursive - only direct children will be merged.</para> 
-            <code>Usage: MergeChanges(ref originalItem, updatedItem);</code>
-            </summary>
-            <param name="originalItem">Local entity containing unchanged child items.</param>
-            <param name="updatedItem">Entity returned by an update operation.</param>
-        </member>
-        <member name="E:TrackableEntities.Client.ChangeTrackingCollection`1.EntityChanged">
-            <summary>
-            Event for when an entity in the collection has changed its tracking state.
-            </summary>
-        </member>
-        <member name="P:TrackableEntities.Client.ChangeTrackingCollection`1.ExcludedProperties">
-            <summary>
-            Properties to exclude from change tracking.
-            </summary>
-        </member>
-        <member name="P:TrackableEntities.Client.ChangeTrackingCollection`1.Tracking">
-            <summary>
-            Turn change-tracking on and off.
-            </summary>
-        </member>
-        <member name="P:TrackableEntities.Client.ChangeTrackingCollection`1.Parent">
-            <summary>
-            ITrackable parent referencing items in this collection.
-            </summary>
-        </member>
-        <member name="T:TrackableEntities.Client.ChangeTrackingExtensions">
-            <summary>
-            ITrackable extension methods.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingExtensions.MergeChanges``1(TrackableEntities.Client.ChangeTrackingCollection{``0},``0[])">
-            <summary>
-            <para>Merge changes from a one or more updated entities into original entities.</para>
-            <para>First call GetChanges on the change tracker, passing changes to a service update operation.</para>
-            <para>Then call MergeChanges, passing one or more updated entities from the service update operation.</para>
-            <para>Properties on original entities will be set to those from updated entities.</para>
-            <code>
-            // Usage:
-            // Start change-tracking originalEntity (new or retrieved from service)
-            var changeTracker = new ChangeTrackingCollection(originalEntity);
-            
-            // Make changes to originalEntity, including reference and child entities
-            
-            // Get changes
-            var changedEntity = changeTracker.GetChanges().SingleOrDefault();
-            
-            // Pass changes to service update operation
-            var updatedEntity = service.Update(changedEntity);
-            
-            // Merge updates from updated entity back into the original entity
-            changeTracker.MergeChanges(updatedEntity);
-            </code>
-            </summary>
-            <typeparam name="TEntity">Trackable entity type</typeparam>
-            <param name="changeTracker">Change tracker used to track changes on original entities</param>
-            <param name="updatedItems">One or more entities updated with changes from a service update operation</param>
-            <exception cref="T:System.ArgumentException">
-            <para>Entity must implement IEquatable(TEntity)</para>
-            <para>Update Trackable Entities Visual Studio Extension to v 2.0 or later, then re-generate client entities.</para>
-            </exception>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingExtensions.HasChanges(TrackableEntities.ITrackable)">
-            <summary>
-            See if there are changes in an object graph.
-            </summary>
-            <param name="item">Trackable object</param>
-            <returns>True if there are changes in the object graph</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingExtensions.Clone``1(TrackableEntities.Client.ChangeTrackingCollection{``0})">
-            <summary>
-            <para>Create a clone of the ChangeTrackingCollection using a JSON binary serializer.</para>
-            <para>Changes can be rolled back by reverting to the cloned ChangeTrackingCollection.</para>
-            </summary>
-            <param name="changeTracker">Change tracker used to track changes on entities</param>
-            <typeparam name="TEntity">Trackable entity type</typeparam>
-            <returns>Deep copy of the ChangeTrackingCollection</returns>
-        </member>
-        <member name="T:TrackableEntities.Client.Constants">
-            <summary>
-            TrackableEntities constants.
-            </summary>
-        </member>
-        <member name="T:TrackableEntities.Client.Constants.TrackingProperties">
-            <summary>
-            Change-tracking property names.
-            </summary>
-        </member>
-        <member name="F:TrackableEntities.Client.Constants.TrackingProperties.TrackingState">
-            <summary>TrackingState property name</summary>
-        </member>
-        <member name="F:TrackableEntities.Client.Constants.TrackingProperties.ModifiedProperties">
-            <summary>ModifiedProperties property name</summary>
-        </member>
-        <member name="T:TrackableEntities.Client.Constants.EquatableMembers">
-            <summary>
-            Equatable member names.
-            </summary>
-        </member>
-        <member name="F:TrackableEntities.Client.Constants.EquatableMembers.EquatableMethodStart">
-            <summary>Equatable method start</summary>
-        </member>
-        <member name="F:TrackableEntities.Client.Constants.EquatableMembers.EquatableMethodEnd">
-            <summary>Equatable method end</summary>
-        </member>
-        <member name="F:TrackableEntities.Client.Constants.EquatableMembers.EntityIdentifierProperty">
-            <summary>Entity identifier property</summary>
-        </member>
-        <member name="F:TrackableEntities.Client.Constants.EquatableMembers.EntityIdentifyField">
-            <summary>Entity identify field</summary>
-        </member>
-        <member name="T:TrackableEntities.Client.Constants.ChangeTrackingMembers">
-            <summary>
-            Change-tracking member names.
-            </summary>
-        </member>
-        <member name="F:TrackableEntities.Client.Constants.ChangeTrackingMembers.ChangeTrackingPropEnd">
-            <summary>Change-tracking property end</summary>
-        </member>
-        <member name="T:TrackableEntities.Client.ModelBase`1">
-            <summary>
-            Base class for model entities to support INotifyPropertyChanged
-            </summary>
-            <typeparam name="TModel">Entity type</typeparam>
-        </member>
-        <member name="M:TrackableEntities.Client.ModelBase`1.NotifyPropertyChanged``1(System.Linq.Expressions.Expression{System.Func{`0,``0}})">
-            <summary>
-            Fire PropertyChanged event.
-            </summary>
-            <typeparam name="TResult">Property return type</typeparam>
-            <param name="property">Lambda expression for property</param>
-        </member>
-        <member name="E:TrackableEntities.Client.ModelBase`1.PropertyChanged">
-            <summary>
-            Event for notification of property changes
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.SetTracking(TrackableEntities.ITrackable,System.Boolean,TrackableEntities.Common.ObjectVisitationHelper)">
-            <summary>
-            Recursively enable or disable tracking on trackable entities in an object graph.
-            </summary>
-            <param name="item">Trackable object</param>
-            <param name="enableTracking">Enable or disable change-tracking</param>
-            <param name="visitationHelper">Circular reference checking helper</param>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.SetState(TrackableEntities.ITrackable,TrackableEntities.TrackingState,TrackableEntities.Common.ObjectVisitationHelper,System.Boolean)">
-            <summary>
-            Recursively set tracking state on trackable entities in an object graph.
-            </summary>
-            <param name="item">Trackable object</param>
-            <param name="state">Change-tracking state of an entity</param>
-            <param name="visitationHelper">Circular reference checking helper</param>
-            <param name="isManyToManyItem">True is an item is treated as part of an M-M collection</param>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.SetModifiedProperties(TrackableEntities.ITrackable,System.Collections.Generic.ICollection{System.String},TrackableEntities.Common.ObjectVisitationHelper)">
-            <summary>
-            Recursively set tracking state on trackable properties in an object graph.
-            </summary>
-            <param name="item">Trackable object</param>
-            <param name="modified">Properties on an entity that have been modified</param>
-            <param name="visitationHelper">Circular reference checking helper</param>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.RemoveRestoredDeletes(TrackableEntities.Client.ITrackingCollection,TrackableEntities.Common.ObjectVisitationHelper)">
-            <summary>
-            Recursively remove items marked as deleted.
-            </summary>
-            <param name="changeTracker">Change-tracking collection</param>
-            <param name="visitationHelper">Circular reference checking helper</param>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.RestoreDeletes(TrackableEntities.Client.ITrackingCollection,TrackableEntities.Common.ObjectVisitationHelper)">
-            <summary>
-            Restore items marked as deleted.
-            </summary>
-            <param name="changeTracker">Change-tracking collection</param>
-            <param name="visitationHelper">Circular reference checking helper</param>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.GetChanges(System.Collections.Generic.IEnumerable{TrackableEntities.ITrackable},TrackableEntities.Common.ObjectVisitationHelper)">
-            <summary>
-            Get entities that have been added, modified or deleted, including trackable 
-            reference and child entities.
-            </summary>
-            <param name="items">Collection of ITrackable objects</param>
-            <param name="visitationHelper">Circular reference checking helper</param>
-            <returns>Collection containing only added, modified or deleted entities</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.Clone``1(``0)">
-            <summary>
-            Performs a deep copy using Json binary serializer.
-            </summary>
-            <typeparam name="T">Entity type</typeparam>
-            <param name="item">Trackable object</param>
-            <returns>Cloned Trackable object</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.Clone``1(System.Collections.Generic.IEnumerable{``0})">
-            <summary>
-            Performs a deep copy using Json binary serializer.
-            </summary>
-            <typeparam name="T">Entity type</typeparam>
-            <param name="items">Collection of Trackable objects</param>
-            <returns>Cloned collection of Trackable object</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.IsEquatable(TrackableEntities.ITrackable,TrackableEntities.ITrackable)">
-            <summary>
-            Determines if two entities have the same identifier.
-            </summary>
-            <param name="item">Trackable object</param>
-            <param name="other">Other trackable object</param>
-            <returns>True if item is equatable, otherwise false</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.GetEntityIdentifier(TrackableEntities.ITrackable)">
-            <summary>
-            Get entity identifier for correlation with MergeChanges.
-            </summary>
-            <param name="item">ITrackable object</param>
-            <returns>Entity identifier used for correlation with MergeChanges</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.SetEntityIdentifier(TrackableEntities.ITrackable,System.Nullable{System.Guid})">
-            <summary>
-            Set entity identifier used for correlation with MergeChanges.
-            </summary>
-            <param name="item">ITrackable object</param>
-            <param name="value">Unique identifier (optional)</param>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.GetEntityIdentity(TrackableEntities.ITrackable)">
-            <summary>
-            Get value of entity identity used for setting EntityIdentifier.
-            </summary>
-            <param name="item">ITrackable object</param>
-            <returns>Value of entity identity field</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.SetEntityIdentity(TrackableEntities.ITrackable,System.Guid)">
-            <summary>
-            Set value of entity identity used for setting EntityIdentifier.
-            </summary>
-            <param name="item">ITrackable object</param>
-            <param name="value">Value for entity identity field</param>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.GetRefPropertyChangeTracker(TrackableEntities.ITrackable,System.String)">
-            <summary>
-            Get reference property change tracker.
-            </summary>
-            <param name="item">ITrackable object</param>
-            <param name="propertyName">Reference property name</param>
-            <returns>Reference property change tracker</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.IsManyToManyChildCollection(TrackableEntities.Client.ITrackingCollection)">
-            <summary>
-            Determine if an entity is a child of a many-to-many change-tracking collection property.
-            </summary>
-            <param name="changeTracker">Change-tracking collection</param>
-            <returns></returns>
-        </member>
-    </members>
-</doc>
diff --git a/NuGet/Packages/TrackableEntities.Client/TrackableEntities.Client.2.5.0.nupkg b/NuGet/Packages/TrackableEntities.Client/TrackableEntities.Client.2.5.0.nupkg
new file mode 100644
index 00000000..776699e9
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.Client/TrackableEntities.Client.2.5.0.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.Client/TrackableEntities.Client.2.5.0.symbols.nupkg b/NuGet/Packages/TrackableEntities.Client/TrackableEntities.Client.2.5.0.symbols.nupkg
new file mode 100644
index 00000000..abe4a195
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.Client/TrackableEntities.Client.2.5.0.symbols.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.Client/TrackableEntities.Client.nuspec b/NuGet/Packages/TrackableEntities.Client/TrackableEntities.Client.nuspec
index 36bcb54e..1a44335e 100644
--- a/NuGet/Packages/TrackableEntities.Client/TrackableEntities.Client.nuspec
+++ b/NuGet/Packages/TrackableEntities.Client/TrackableEntities.Client.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>TrackableEntities.Client</id>
-    	<version>2.1.1.0-beta1</version>
+    	<version>2.5.0</version>
         <title>Trackable Entities Client</title>
         <authors>Tony Sneed</authors>
         <owners>Tony Sneed</owners>
@@ -14,10 +14,8 @@
         <language>en-US</language>
         <tags>change-tracking entity-framework n-tier wcf web-api</tags>
         <dependencies>
-            <group targetFramework=".NETPortable0.0-net45+sl5+win8+windowsphone8">
-                <dependency id="Newtonsoft.Json" version="6.0.3" />
-                <dependency id="TrackableEntities.Common" version="2.1.0.0" />
-            </group>
+          <dependency id="Newtonsoft.Json" version="6.0.8" />
+          <dependency id="TrackableEntities.Common" version="2.5.0" />
         </dependencies>
     </metadata>
 </package>
\ No newline at end of file
diff --git a/NuGet/Packages/TrackableEntities.Client/lib/portable-net45+sl5+win8+windowsphone8/TrackableEntities.Client.dll b/NuGet/Packages/TrackableEntities.Client/lib/portable-net45+sl5+win8+windowsphone8/TrackableEntities.Client.dll
deleted file mode 100644
index df0174a9..00000000
Binary files a/NuGet/Packages/TrackableEntities.Client/lib/portable-net45+sl5+win8+windowsphone8/TrackableEntities.Client.dll and /dev/null differ
diff --git a/NuGet/Packages/TrackableEntities.Client/lib/portable-net45+sl5+win8+windowsphone8/TrackableEntities.Client.pdb b/NuGet/Packages/TrackableEntities.Client/lib/portable-net45+sl5+win8+windowsphone8/TrackableEntities.Client.pdb
deleted file mode 100644
index 20c661a4..00000000
Binary files a/NuGet/Packages/TrackableEntities.Client/lib/portable-net45+sl5+win8+windowsphone8/TrackableEntities.Client.pdb and /dev/null differ
diff --git a/NuGet/Packages/TrackableEntities.Client/lib/portable-net45+sl5+win8+windowsphone8/TrackableEntities.Client.xml b/NuGet/Packages/TrackableEntities.Client/lib/portable-net45+sl5+win8+windowsphone8/TrackableEntities.Client.xml
deleted file mode 100644
index 2e7d6869..00000000
--- a/NuGet/Packages/TrackableEntities.Client/lib/portable-net45+sl5+win8+windowsphone8/TrackableEntities.Client.xml
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>TrackableEntities.Client</name>
-    </assembly>
-    <members>
-        <member name="T:TrackableEntities.Client.ChangeTrackingCollection`1">
-            <summary>
-            Collection responsible for tracking changes to entities.
-            </summary>
-            <typeparam name="TEntity">Trackable entity type</typeparam>
-        </member>
-        <member name="T:TrackableEntities.Client.ITrackingCollection`1">
-            <summary>
-            Interface implemented by trackable collections.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ITrackingCollection`1.GetChanges">
-            <summary>
-            Get entities that have been marked as Added, Modified or Deleted.
-            </summary>
-            <returns>Collection containing only changed entities</returns>
-        </member>
-        <member name="T:TrackableEntities.Client.ITrackingCollection">
-            <summary>
-            Interface implemented by trackable collections.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ITrackingCollection.SetTracking(System.Boolean,TrackableEntities.Common.ObjectVisitationHelper)">
-            <summary>
-            For internal use.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ITrackingCollection.GetChanges(System.Boolean)">
-            <summary>
-            Get entities that have been marked as Added, Modified or Deleted.
-            </summary>
-            <param name="cachedDeletesOnly">True to return only cached deletes</param>
-            <returns>Collection containing only changed entities</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.ITrackingCollection.RemoveCachedDeletes">
-            <summary>
-            Remove deleted entities which have been cached.
-            </summary>
-        </member>
-        <member name="E:TrackableEntities.Client.ITrackingCollection.EntityChanged">
-            <summary>
-            Notification that an entity has changed.
-            </summary>
-        </member>
-        <member name="P:TrackableEntities.Client.ITrackingCollection.Tracking">
-            <summary>
-            Turn change-tracking on and off.
-            </summary>
-        </member>
-        <member name="P:TrackableEntities.Client.ITrackingCollection.ExcludedProperties">
-            <summary>
-            Properties to exclude from change tracking.
-            </summary>
-        </member>
-        <member name="P:TrackableEntities.Client.ITrackingCollection.Parent">
-            <summary>
-            ITrackable parent referencing items in this collection.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.#ctor">
-            <summary>
-            Default contstructor with change-tracking disabled
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.#ctor(System.Boolean)">
-            <summary>
-            Change-tracking will not begin after entities are added, 
-            unless tracking is enabled.
-            </summary>
-            <param name="enableTracking">Enable tracking after entities are added</param>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.#ctor(`0[])">
-            <summary>
-            Constructor that accepts one or more entities.
-            Change-tracking will begin after entities are added.
-            </summary>
-            <param name="entities">Entities being change-tracked</param>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.#ctor(System.Collections.Generic.IEnumerable{`0},System.Boolean)">
-            <summary>
-            Constructor that accepts a collection of entities.
-            Change-tracking will begin after entities are added, 
-            unless tracking is disabled.
-            </summary>
-            <param name="entities">Entities being change-tracked</param>
-            <param name="disableTracking">Disable tracking after entities are added</param>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.SetTracking(System.Boolean,TrackableEntities.Common.ObjectVisitationHelper)">
-            <summary>
-            For internal use.
-            Turn change-tracking on and off with proper circular reference checking.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.InsertItem(System.Int32,`0)">
-            <summary>
-            Insert item at specified index.
-            </summary>
-            <param name="index">Zero-based index at which item should be inserted</param>
-            <param name="item">Item to insert</param>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.RemoveItem(System.Int32)">
-            <summary>
-            Remove item at specified index.
-            </summary>
-            <param name="index">Zero-based index at which item should be removed</param>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.GetChanges">
-            <summary>
-            Get entities that have been added, modified or deleted, including child 
-            collections with entities that have been added, modified or deleted.
-            </summary>
-            <returns>Collection containing only changed entities</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.TrackableEntities#Client#ITrackingCollection#GetChanges(System.Boolean)">
-            <summary>
-            Get entities that have been added, modified or deleted.
-            </summary>
-            <param name="cachedDeletesOnly">True to return only cached deletes</param>
-            <returns>Collection containing only changed entities</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.TrackableEntities#Client#ITrackingCollection#RemoveCachedDeletes">
-            <summary>
-            Remove deleted entities which have been cached.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingCollection`1.MergeChanges(`0@,`0)">
-            <summary>
-            <para>Merge changed child items into the original trackable entity. 
-            This assumes GetChanges was called to update only changed items. 
-            Non-recursive - only direct children will be merged.</para> 
-            <code>Usage: MergeChanges(ref originalItem, updatedItem);</code>
-            </summary>
-            <param name="originalItem">Local entity containing unchanged child items.</param>
-            <param name="updatedItem">Entity returned by an update operation.</param>
-        </member>
-        <member name="E:TrackableEntities.Client.ChangeTrackingCollection`1.EntityChanged">
-            <summary>
-            Event for when an entity in the collection has changed its tracking state.
-            </summary>
-        </member>
-        <member name="P:TrackableEntities.Client.ChangeTrackingCollection`1.ExcludedProperties">
-            <summary>
-            Properties to exclude from change tracking.
-            </summary>
-        </member>
-        <member name="P:TrackableEntities.Client.ChangeTrackingCollection`1.Tracking">
-            <summary>
-            Turn change-tracking on and off.
-            </summary>
-        </member>
-        <member name="P:TrackableEntities.Client.ChangeTrackingCollection`1.Parent">
-            <summary>
-            ITrackable parent referencing items in this collection.
-            </summary>
-        </member>
-        <member name="T:TrackableEntities.Client.Constants">
-            <summary>
-            TrackableEntities constants.
-            </summary>
-        </member>
-        <member name="T:TrackableEntities.Client.Constants.TrackingProperties">
-            <summary>
-            Change-tracking property names.
-            </summary>
-        </member>
-        <member name="F:TrackableEntities.Client.Constants.TrackingProperties.TrackingState">
-            <summary>TrackingState property name</summary>
-        </member>
-        <member name="F:TrackableEntities.Client.Constants.TrackingProperties.ModifiedProperties">
-            <summary>ModifiedProperties property name</summary>
-        </member>
-        <member name="T:TrackableEntities.Client.Constants.EquatableMembers">
-            <summary>
-            Equatable member names.
-            </summary>
-        </member>
-        <member name="F:TrackableEntities.Client.Constants.EquatableMembers.EquatableMethodStart">
-            <summary>Equatable method start</summary>
-        </member>
-        <member name="F:TrackableEntities.Client.Constants.EquatableMembers.EquatableMethodEnd">
-            <summary>Equatable method end</summary>
-        </member>
-        <member name="F:TrackableEntities.Client.Constants.EquatableMembers.EntityIdentifierProperty">
-            <summary>Entity identifier property</summary>
-        </member>
-        <member name="F:TrackableEntities.Client.Constants.EquatableMembers.EntityIdentifyField">
-            <summary>Entity identify field</summary>
-        </member>
-        <member name="T:TrackableEntities.Client.Constants.ChangeTrackingMembers">
-            <summary>
-            Change-tracking member names.
-            </summary>
-        </member>
-        <member name="F:TrackableEntities.Client.Constants.ChangeTrackingMembers.ChangeTrackingPropEnd">
-            <summary>Change-tracking property end</summary>
-        </member>
-        <member name="T:TrackableEntities.Client.ModelBase`1">
-            <summary>
-            Base class for model entities to support INotifyPropertyChanged
-            </summary>
-            <typeparam name="TModel">Entity type</typeparam>
-        </member>
-        <member name="M:TrackableEntities.Client.ModelBase`1.NotifyPropertyChanged``1(System.Linq.Expressions.Expression{System.Func{`0,``0}})">
-            <summary>
-            Fire PropertyChanged event.
-            </summary>
-            <typeparam name="TResult">Property return type</typeparam>
-            <param name="property">Lambda expression for property</param>
-        </member>
-        <member name="E:TrackableEntities.Client.ModelBase`1.PropertyChanged">
-            <summary>
-            Event for notification of property changes
-            </summary>
-        </member>
-        <member name="T:TrackableEntities.Client.ChangeTrackingExtensions">
-            <summary>
-            ITrackable extension methods.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingExtensions.MergeChanges``1(TrackableEntities.Client.ChangeTrackingCollection{``0},``0[])">
-            <summary>
-            <para>Merge changes from a one or more updated entities into original entities.</para>
-            <para>First call GetChanges on the change tracker, passing changes to a service update operation.</para>
-            <para>Then call MergeChanges, passing one or more updated entities from the service update operation.</para>
-            <para>Properties on original entities will be set to those from updated entities.</para>
-            <code>
-            // Usage:
-            // Start change-tracking originalEntity (new or retrieved from service)
-            var changeTracker = new ChangeTrackingCollection(originalEntity);
-            
-            // Make changes to originalEntity, including reference and child entities
-            
-            // Get changes
-            var changedEntity = changeTracker.GetChanges().SingleOrDefault();
-            
-            // Pass changes to service update operation
-            var updatedEntity = service.Update(changedEntity);
-            
-            // Merge updates from updated entity back into the original entity
-            changeTracker.MergeChanges(updatedEntity);
-            </code>
-            </summary>
-            <typeparam name="TEntity">Trackable entity type</typeparam>
-            <param name="changeTracker">Change tracker used to track changes on original entities</param>
-            <param name="updatedItems">One or more entities updated with changes from a service update operation</param>
-            <exception cref="T:System.ArgumentException">
-            <para>Entity must implement IEquatable(TEntity)</para>
-            <para>Update Trackable Entities Visual Studio Extension to v 2.0 or later, then re-generate client entities.</para>
-            </exception>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingExtensions.HasChanges(TrackableEntities.ITrackable)">
-            <summary>
-            See if there are changes in an object graph.
-            </summary>
-            <param name="item">Trackable object</param>
-            <returns>True if there are changes in the object graph</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.ChangeTrackingExtensions.Clone``1(TrackableEntities.Client.ChangeTrackingCollection{``0})">
-            <summary>
-            <para>Create a clone of the ChangeTrackingCollection using a JSON binary serializer.</para>
-            <para>Changes can be rolled back by reverting to the cloned ChangeTrackingCollection.</para>
-            </summary>
-            <param name="changeTracker">Change tracker used to track changes on entities</param>
-            <typeparam name="TEntity">Trackable entity type</typeparam>
-            <returns>Deep copy of the ChangeTrackingCollection</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.SetTracking(TrackableEntities.ITrackable,System.Boolean,TrackableEntities.Common.ObjectVisitationHelper)">
-            <summary>
-            Recursively enable or disable tracking on trackable entities in an object graph.
-            </summary>
-            <param name="item">Trackable object</param>
-            <param name="enableTracking">Enable or disable change-tracking</param>
-            <param name="visitationHelper">Circular reference checking helper</param>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.SetState(TrackableEntities.ITrackable,TrackableEntities.TrackingState,TrackableEntities.Common.ObjectVisitationHelper,System.Boolean)">
-            <summary>
-            Recursively set tracking state on trackable entities in an object graph.
-            </summary>
-            <param name="item">Trackable object</param>
-            <param name="state">Change-tracking state of an entity</param>
-            <param name="visitationHelper">Circular reference checking helper</param>
-            <param name="isManyToManyItem">True is an item is treated as part of an M-M collection</param>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.SetModifiedProperties(TrackableEntities.ITrackable,System.Collections.Generic.ICollection{System.String},TrackableEntities.Common.ObjectVisitationHelper)">
-            <summary>
-            Recursively set tracking state on trackable properties in an object graph.
-            </summary>
-            <param name="item">Trackable object</param>
-            <param name="modified">Properties on an entity that have been modified</param>
-            <param name="visitationHelper">Circular reference checking helper</param>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.RemoveRestoredDeletes(TrackableEntities.Client.ITrackingCollection,TrackableEntities.Common.ObjectVisitationHelper)">
-            <summary>
-            Recursively remove items marked as deleted.
-            </summary>
-            <param name="changeTracker">Change-tracking collection</param>
-            <param name="visitationHelper">Circular reference checking helper</param>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.RestoreDeletes(TrackableEntities.Client.ITrackingCollection,TrackableEntities.Common.ObjectVisitationHelper)">
-            <summary>
-            Restore items marked as deleted.
-            </summary>
-            <param name="changeTracker">Change-tracking collection</param>
-            <param name="visitationHelper">Circular reference checking helper</param>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.GetChanges(System.Collections.Generic.IEnumerable{TrackableEntities.ITrackable},TrackableEntities.Common.ObjectVisitationHelper)">
-            <summary>
-            Get entities that have been added, modified or deleted, including trackable 
-            reference and child entities.
-            </summary>
-            <param name="items">Collection of ITrackable objects</param>
-            <param name="visitationHelper">Circular reference checking helper</param>
-            <returns>Collection containing only added, modified or deleted entities</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.Clone``1(``0)">
-            <summary>
-            Performs a deep copy using Json binary serializer.
-            </summary>
-            <typeparam name="T">Entity type</typeparam>
-            <param name="item">Trackable object</param>
-            <returns>Cloned Trackable object</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.Clone``1(System.Collections.Generic.IEnumerable{``0})">
-            <summary>
-            Performs a deep copy using Json binary serializer.
-            </summary>
-            <typeparam name="T">Entity type</typeparam>
-            <param name="items">Collection of Trackable objects</param>
-            <returns>Cloned collection of Trackable object</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.IsEquatable(TrackableEntities.ITrackable,TrackableEntities.ITrackable)">
-            <summary>
-            Determines if two entities have the same identifier.
-            </summary>
-            <param name="item">Trackable object</param>
-            <param name="other">Other trackable object</param>
-            <returns>True if item is equatable, otherwise false</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.GetEntityIdentifier(TrackableEntities.ITrackable)">
-            <summary>
-            Get entity identifier for correlation with MergeChanges.
-            </summary>
-            <param name="item">ITrackable object</param>
-            <returns>Entity identifier used for correlation with MergeChanges</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.SetEntityIdentifier(TrackableEntities.ITrackable,System.Nullable{System.Guid})">
-            <summary>
-            Set entity identifier used for correlation with MergeChanges.
-            </summary>
-            <param name="item">ITrackable object</param>
-            <param name="value">Unique identifier (optional)</param>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.GetEntityIdentity(TrackableEntities.ITrackable)">
-            <summary>
-            Get value of entity identity used for setting EntityIdentifier.
-            </summary>
-            <param name="item">ITrackable object</param>
-            <returns>Value of entity identity field</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.SetEntityIdentity(TrackableEntities.ITrackable,System.Guid)">
-            <summary>
-            Set value of entity identity used for setting EntityIdentifier.
-            </summary>
-            <param name="item">ITrackable object</param>
-            <param name="value">Value for entity identity field</param>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.GetRefPropertyChangeTracker(TrackableEntities.ITrackable,System.String)">
-            <summary>
-            Get reference property change tracker.
-            </summary>
-            <param name="item">ITrackable object</param>
-            <param name="propertyName">Reference property name</param>
-            <returns>Reference property change tracker</returns>
-        </member>
-        <member name="M:TrackableEntities.Client.TrackableExtensions.IsManyToManyChildCollection(TrackableEntities.Client.ITrackingCollection)">
-            <summary>
-            Determine if an entity is a child of a many-to-many change-tracking collection property.
-            </summary>
-            <param name="changeTracker">Change-tracking collection</param>
-            <returns></returns>
-        </member>
-    </members>
-</doc>
diff --git a/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Client.Net45/TrackableEntities.CodeTemplates.Client.Net45.2.5.0.nupkg b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Client.Net45/TrackableEntities.CodeTemplates.Client.Net45.2.5.0.nupkg
new file mode 100644
index 00000000..bedd97fb
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Client.Net45/TrackableEntities.CodeTemplates.Client.Net45.2.5.0.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Client.Net45/TrackableEntities.CodeTemplates.Client.Net45.nuspec b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Client.Net45/TrackableEntities.CodeTemplates.Client.Net45.nuspec
new file mode 100644
index 00000000..16267974
--- /dev/null
+++ b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Client.Net45/TrackableEntities.CodeTemplates.Client.Net45.nuspec
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>TrackableEntities.CodeTemplates.Client.Net45</id>
+    <version>$PackageVersion$</version>
+    <title>Trackable Entities .NET 4.5 Client Code Templates</title>
+    <authors>Tony Sneed</authors>
+    <owners>Tony Sneed</owners>
+    <licenseUrl>http://trackable.codeplex.com/license</licenseUrl>
+    <projectUrl>http://trackable.codeplex.com</projectUrl>
+    <iconUrl>http://tonysneed.com/images/trackable/tracking-small.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Adds T4 templates used to generate trackable entity classes from a database using Entity Framework Power Tools or EF 6.x Tools for Visual Studio.</description>
+    <language>en-US</language>
+    <tags>change-tracking entity-framework n-tier code-generation t4</tags>
+  </metadata>
+</package>
\ No newline at end of file
diff --git a/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Client.Portable/TrackableEntities.CodeTemplates.Client.Portable.2.5.0.nupkg b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Client.Portable/TrackableEntities.CodeTemplates.Client.Portable.2.5.0.nupkg
new file mode 100644
index 00000000..322c5572
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Client.Portable/TrackableEntities.CodeTemplates.Client.Portable.2.5.0.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Client.Portable/TrackableEntities.CodeTemplates.Client.Portable.nuspec b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Client.Portable/TrackableEntities.CodeTemplates.Client.Portable.nuspec
new file mode 100644
index 00000000..72f2423f
--- /dev/null
+++ b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Client.Portable/TrackableEntities.CodeTemplates.Client.Portable.nuspec
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>TrackableEntities.CodeTemplates.Client.Portable</id>
+    <version>$PackageVersion$</version>
+    <title>Trackable Entities Portable Client Code Templates</title>
+    <authors>Tony Sneed</authors>
+    <owners>Tony Sneed</owners>
+    <licenseUrl>http://trackable.codeplex.com/license</licenseUrl>
+    <projectUrl>http://trackable.codeplex.com</projectUrl>
+    <iconUrl>http://tonysneed.com/images/trackable/tracking-small.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Adds T4 templates used to generate trackable entity classes from a database using Entity Framework Power Tools or EF 6.x Tools for Visual Studio.</description>
+    <language>en-US</language>
+    <tags>change-tracking entity-framework n-tier code-generation t4</tags>
+  </metadata>
+</package>
\ No newline at end of file
diff --git a/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Service.Net45/TrackableEntities.CodeTemplates.Service.Net45.2.5.0.nupkg b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Service.Net45/TrackableEntities.CodeTemplates.Service.Net45.2.5.0.nupkg
new file mode 100644
index 00000000..0cad504e
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Service.Net45/TrackableEntities.CodeTemplates.Service.Net45.2.5.0.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Service.Net45/TrackableEntities.CodeTemplates.Service.Net45.nuspec b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Service.Net45/TrackableEntities.CodeTemplates.Service.Net45.nuspec
new file mode 100644
index 00000000..f3f5e662
--- /dev/null
+++ b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Service.Net45/TrackableEntities.CodeTemplates.Service.Net45.nuspec
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>TrackableEntities.CodeTemplates.Service.Net45</id>
+    <version>$PackageVersion$</version>
+    <title>Trackable Entities .NET 4.5 Service Code Templates</title>
+    <authors>Tony Sneed</authors>
+    <owners>Tony Sneed</owners>
+    <licenseUrl>http://trackable.codeplex.com/license</licenseUrl>
+    <projectUrl>http://trackable.codeplex.com</projectUrl>
+    <iconUrl>http://tonysneed.com/images/trackable/tracking-small.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Adds T4 templates used to generate trackable entity classes from a database using Entity Framework Power Tools or EF 6.x Tools for Visual Studio.</description>
+    <language>en-US</language>
+    <tags>change-tracking entity-framework n-tier code-generation t4</tags>
+  </metadata>
+</package>
\ No newline at end of file
diff --git a/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Shared.Net45/TrackableEntities.CodeTemplates.Shared.Net45.2.5.0.nupkg b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Shared.Net45/TrackableEntities.CodeTemplates.Shared.Net45.2.5.0.nupkg
new file mode 100644
index 00000000..5641f4fb
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Shared.Net45/TrackableEntities.CodeTemplates.Shared.Net45.2.5.0.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Shared.Net45/TrackableEntities.CodeTemplates.Shared.Net45.nuspec b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Shared.Net45/TrackableEntities.CodeTemplates.Shared.Net45.nuspec
new file mode 100644
index 00000000..c69bbe3e
--- /dev/null
+++ b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Shared.Net45/TrackableEntities.CodeTemplates.Shared.Net45.nuspec
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>TrackableEntities.CodeTemplates.Shared.Net45</id>
+    <version>$PackageVersion$</version>
+    <title>Trackable Entities .NET 4.5 Shared Code Templates</title>
+    <authors>Tony Sneed</authors>
+    <owners>Tony Sneed</owners>
+    <licenseUrl>http://trackable.codeplex.com/license</licenseUrl>
+    <projectUrl>http://trackable.codeplex.com</projectUrl>
+    <iconUrl>http://tonysneed.com/images/trackable/tracking-small.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Adds T4 templates used to generate trackable entity classes from a database using Entity Framework Power Tools or EF 6.x Tools for Visual Studio.</description>
+    <language>en-US</language>
+    <tags>change-tracking entity-framework n-tier code-generation t4</tags>
+  </metadata>
+</package>
\ No newline at end of file
diff --git a/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Shared.Portable/TrackableEntities.CodeTemplates.Shared.Portable.2.5.0.nupkg b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Shared.Portable/TrackableEntities.CodeTemplates.Shared.Portable.2.5.0.nupkg
new file mode 100644
index 00000000..6d9b3a88
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Shared.Portable/TrackableEntities.CodeTemplates.Shared.Portable.2.5.0.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Shared.Portable/TrackableEntities.CodeTemplates.Shared.Portable.nuspec b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Shared.Portable/TrackableEntities.CodeTemplates.Shared.Portable.nuspec
new file mode 100644
index 00000000..4d53fc94
--- /dev/null
+++ b/NuGet/Packages/TrackableEntities.CodeTemplates/TrackableEntities.CodeTemplates.Shared.Portable/TrackableEntities.CodeTemplates.Shared.Portable.nuspec
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>TrackableEntities.CodeTemplates.Shared.Portable</id>
+    <version>$PackageVersion$</version>
+    <title>Trackable Entities Portable Shared Code Templates</title>
+    <authors>Tony Sneed</authors>
+    <owners>Tony Sneed</owners>
+    <licenseUrl>http://trackable.codeplex.com/license</licenseUrl>
+    <projectUrl>http://trackable.codeplex.com</projectUrl>
+    <iconUrl>http://tonysneed.com/images/trackable/tracking-small.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Adds T4 templates used to generate trackable entity classes from a database using Entity Framework Power Tools or EF 6.x Tools for Visual Studio.</description>
+    <language>en-US</language>
+    <tags>change-tracking entity-framework n-tier code-generation t4</tags>
+  </metadata>
+</package>
\ No newline at end of file
diff --git a/NuGet/Packages/TrackableEntities.Common/TrackableEntities.Common.2.5.0.nupkg b/NuGet/Packages/TrackableEntities.Common/TrackableEntities.Common.2.5.0.nupkg
new file mode 100644
index 00000000..00637036
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.Common/TrackableEntities.Common.2.5.0.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.Common/TrackableEntities.Common.2.5.0.symbols.nupkg b/NuGet/Packages/TrackableEntities.Common/TrackableEntities.Common.2.5.0.symbols.nupkg
new file mode 100644
index 00000000..d1f88265
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.Common/TrackableEntities.Common.2.5.0.symbols.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.Common/TrackableEntities.Common.nuspec b/NuGet/Packages/TrackableEntities.Common/TrackableEntities.Common.nuspec
index f34fa6d6..c6b760f6 100644
--- a/NuGet/Packages/TrackableEntities.Common/TrackableEntities.Common.nuspec
+++ b/NuGet/Packages/TrackableEntities.Common/TrackableEntities.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>TrackableEntities.Common</id>
-    	<version>2.1.0.0</version>
+    	<version>2.5.0</version>
         <title>Trackable Entities Common</title>
         <authors>Tony Sneed</authors>
         <owners>Tony Sneed</owners>
diff --git a/NuGet/Packages/TrackableEntities.Common/lib/portable-net40+sl5+win8+windowsphone8/TrackableEntities.Common.dll b/NuGet/Packages/TrackableEntities.Common/lib/portable-net40+sl5+win8+windowsphone8/TrackableEntities.Common.dll
deleted file mode 100644
index 68fb6879..00000000
Binary files a/NuGet/Packages/TrackableEntities.Common/lib/portable-net40+sl5+win8+windowsphone8/TrackableEntities.Common.dll and /dev/null differ
diff --git a/NuGet/Packages/TrackableEntities.Common/lib/portable-net40+sl5+win8+windowsphone8/TrackableEntities.Common.pdb b/NuGet/Packages/TrackableEntities.Common/lib/portable-net40+sl5+win8+windowsphone8/TrackableEntities.Common.pdb
deleted file mode 100644
index bb1983b9..00000000
Binary files a/NuGet/Packages/TrackableEntities.Common/lib/portable-net40+sl5+win8+windowsphone8/TrackableEntities.Common.pdb and /dev/null differ
diff --git a/NuGet/Packages/TrackableEntities.Common/lib/portable-net40+sl5+win8+windowsphone8/TrackableEntities.Common.xml b/NuGet/Packages/TrackableEntities.Common/lib/portable-net40+sl5+win8+windowsphone8/TrackableEntities.Common.xml
deleted file mode 100644
index cc581d51..00000000
--- a/NuGet/Packages/TrackableEntities.Common/lib/portable-net40+sl5+win8+windowsphone8/TrackableEntities.Common.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>TrackableEntities.Common</name>
-    </assembly>
-    <members>
-        <member name="T:TrackableEntities.ITrackable">
-            <summary>
-            Interface implemented by entities that are change-tracked.
-            </summary>
-        </member>
-        <member name="P:TrackableEntities.ITrackable.TrackingState">
-            <summary>
-            Change-tracking state of an entity.
-            </summary>
-        </member>
-        <member name="P:TrackableEntities.ITrackable.ModifiedProperties">
-            <summary>
-            Properties on an entity that have been modified.
-            </summary>
-        </member>
-        <member name="T:TrackableEntities.Common.TrackableExtensions">
-            <summary>
-            Extension methods for entities that implement ITrackable.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Common.TrackableExtensions.AcceptChanges(TrackableEntities.ITrackable)">
-            <summary>
-            Set tracking state to Unchanged on an entity and its child collections.
-            </summary>
-            <param name="item">Trackable object</param>
-        </member>
-        <member name="M:TrackableEntities.Common.TrackableExtensions.AcceptChanges(System.Collections.Generic.IEnumerable{TrackableEntities.ITrackable})">
-            <summary>
-            Set tracking state to Unchanged on entities and their child collections.
-            </summary>
-            <param name="items">Trackable objects</param>
-        </member>
-        <member name="T:TrackableEntities.TrackingState">
-            <summary>
-            Change-tracking state of an entity.
-            </summary>
-        </member>
-        <member name="F:TrackableEntities.TrackingState.Unchanged">
-            <summary>Existing entity that has not been modified.</summary>
-        </member>
-        <member name="F:TrackableEntities.TrackingState.Added">
-            <summary>Newly created entity.</summary>
-        </member>
-        <member name="F:TrackableEntities.TrackingState.Modified">
-            <summary>Existing entity that has been modified.</summary>
-        </member>
-        <member name="F:TrackableEntities.TrackingState.Deleted">
-            <summary>Existing entity that has been marked as deleted.</summary>
-        </member>
-    </members>
-</doc>
diff --git a/NuGet/Packages/TrackableEntities.EF.5/TrackableEntities.EF.5.2.5.0.nupkg b/NuGet/Packages/TrackableEntities.EF.5/TrackableEntities.EF.5.2.5.0.nupkg
new file mode 100644
index 00000000..89f83029
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.EF.5/TrackableEntities.EF.5.2.5.0.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.EF.5/TrackableEntities.EF.5.2.5.0.symbols.nupkg b/NuGet/Packages/TrackableEntities.EF.5/TrackableEntities.EF.5.2.5.0.symbols.nupkg
new file mode 100644
index 00000000..57a8f24b
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.EF.5/TrackableEntities.EF.5.2.5.0.symbols.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.EF.5/TrackableEntities.EF.5.nuspec b/NuGet/Packages/TrackableEntities.EF.5/TrackableEntities.EF.5.nuspec
index 8b070332..4ec44955 100644
--- a/NuGet/Packages/TrackableEntities.EF.5/TrackableEntities.EF.5.nuspec
+++ b/NuGet/Packages/TrackableEntities.EF.5/TrackableEntities.EF.5.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>TrackableEntities.EF.5</id>
-    	<version>2.1.1.0-beta1</version>
+    	<version>2.5.0</version>
         <title>Trackable Entities for EF5</title>
         <authors>Tony Sneed</authors>
         <owners />
@@ -16,8 +16,8 @@
         <dependencies>
             <group targetFramework="net45">
                 <dependency id="EntityFramework" version="[5.0.0]" />
-                <dependency id="Newtonsoft.Json" version="6.0.3" />
-                <dependency id="TrackableEntities.Common" version="2.1.0.0" />
+                <dependency id="Newtonsoft.Json" version="6.0.8" />
+                <dependency id="TrackableEntities.Common" version="2.5.0" />
             </group>
         </dependencies>
     </metadata>
diff --git a/NuGet/Packages/TrackableEntities.EF.5/lib/net45/TrackableEntities.EF.5.dll b/NuGet/Packages/TrackableEntities.EF.5/lib/net45/TrackableEntities.EF.5.dll
deleted file mode 100644
index 6a0605d9..00000000
Binary files a/NuGet/Packages/TrackableEntities.EF.5/lib/net45/TrackableEntities.EF.5.dll and /dev/null differ
diff --git a/NuGet/Packages/TrackableEntities.EF.5/lib/net45/TrackableEntities.EF.5.pdb b/NuGet/Packages/TrackableEntities.EF.5/lib/net45/TrackableEntities.EF.5.pdb
deleted file mode 100644
index 4c3bc0bc..00000000
Binary files a/NuGet/Packages/TrackableEntities.EF.5/lib/net45/TrackableEntities.EF.5.pdb and /dev/null differ
diff --git a/NuGet/Packages/TrackableEntities.EF.5/lib/net45/TrackableEntities.EF.5.xml b/NuGet/Packages/TrackableEntities.EF.5/lib/net45/TrackableEntities.EF.5.xml
deleted file mode 100644
index ff2cd19b..00000000
--- a/NuGet/Packages/TrackableEntities.EF.5/lib/net45/TrackableEntities.EF.5.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>TrackableEntities.EF.5</name>
-    </assembly>
-    <members>
-        <member name="T:TrackableEntities.EF5.DbContextExtensions">
-            <summary>
-            Extension methods for DbContext to persist trackable entities.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.EF5.DbContextExtensions.ApplyChanges(System.Data.Entity.DbContext,TrackableEntities.ITrackable)">
-            <summary>
-            Update entity state on DbContext for an object graph.
-            </summary>
-            <param name="context">Used to query and save changes to a database</param>
-            <param name="item">Object that implements ITrackable</param>
-        </member>
-        <member name="M:TrackableEntities.EF5.DbContextExtensions.ApplyChanges(System.Data.Entity.DbContext,System.Collections.Generic.IEnumerable{TrackableEntities.ITrackable})">
-            <summary>
-            Update entity state on DbContext for more than one object graph.
-            </summary>
-            <param name="context">Used to query and save changes to a database</param>
-            <param name="items">Objects that implement ITrackable</param>
-        </member>
-        <member name="M:TrackableEntities.EF5.DbContextExtensions.GetEntitySetName(System.Data.Entity.DbContext,System.Type)">
-            <summary>
-            For the given entity type return the EntitySet name qualified by container name.
-            </summary>
-            <param name="dbContext">Used to query and save changes to a database</param>
-            <param name="entityType">Type of an entity</param>
-            <returns></returns>
-        </member>
-        <member name="M:TrackableEntities.EF5.DbContextExtensions.LoadRelatedEntities(System.Data.Entity.DbContext,TrackableEntities.ITrackable,System.Boolean)">
-            <summary>
-            Load related entities for an object graph.
-            </summary>
-            <param name="context">Used to query and save changes to a database</param>
-            <param name="item">Object that implement ITrackable</param>
-            <param name="loadAll">True to load all related entities, false to load only added entities</param>
-        </member>
-        <member name="M:TrackableEntities.EF5.DbContextExtensions.LoadRelatedEntities(System.Data.Entity.DbContext,System.Collections.Generic.IEnumerable{TrackableEntities.ITrackable},System.Boolean)">
-            <summary>
-            Load related entities for more than one object graph.
-            </summary>
-            <param name="context">Used to query and save changes to a database</param>
-            <param name="items">Objects that implements ITrackable</param>
-            <param name="loadAll">True to load all related entities, false to load only added entities</param>
-        </member>
-    </members>
-</doc>
diff --git a/NuGet/Packages/TrackableEntities.EF.6/TrackableEntities.EF.6.2.5.0.nupkg b/NuGet/Packages/TrackableEntities.EF.6/TrackableEntities.EF.6.2.5.0.nupkg
new file mode 100644
index 00000000..c140e765
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.EF.6/TrackableEntities.EF.6.2.5.0.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.EF.6/TrackableEntities.EF.6.2.5.0.symbols.nupkg b/NuGet/Packages/TrackableEntities.EF.6/TrackableEntities.EF.6.2.5.0.symbols.nupkg
new file mode 100644
index 00000000..5f1a4e65
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.EF.6/TrackableEntities.EF.6.2.5.0.symbols.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.EF.6/TrackableEntities.EF.6.nuspec b/NuGet/Packages/TrackableEntities.EF.6/TrackableEntities.EF.6.nuspec
index 8dce2a04..ae5d1a7b 100644
--- a/NuGet/Packages/TrackableEntities.EF.6/TrackableEntities.EF.6.nuspec
+++ b/NuGet/Packages/TrackableEntities.EF.6/TrackableEntities.EF.6.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>TrackableEntities.EF.6</id>
-    	<version>2.1.1.0-beta1</version>
+    	<version>2.5.0</version>
         <title>Trackable Entities for EF6</title>
         <authors>Tony Sneed</authors>
         <owners />
@@ -15,9 +15,9 @@
         <tags>change-tracking entity-framework n-tier wcf web-api</tags>
         <dependencies>
             <group targetFramework="net45">
-                <dependency id="EntityFramework" version="6.1.1" />
-                <dependency id="Newtonsoft.Json" version="6.0.3" />
-                <dependency id="TrackableEntities.Common" version="2.1.0.0" />
+                <dependency id="EntityFramework" version="6.1.2" />
+                <dependency id="Newtonsoft.Json" version="6.0.8" />
+                <dependency id="TrackableEntities.Common" version="2.5.0" />
             </group>
         </dependencies>
     </metadata>
diff --git a/NuGet/Packages/TrackableEntities.EF.6/lib/net45/TrackableEntities.EF.6.dll b/NuGet/Packages/TrackableEntities.EF.6/lib/net45/TrackableEntities.EF.6.dll
deleted file mode 100644
index c6c47edd..00000000
Binary files a/NuGet/Packages/TrackableEntities.EF.6/lib/net45/TrackableEntities.EF.6.dll and /dev/null differ
diff --git a/NuGet/Packages/TrackableEntities.EF.6/lib/net45/TrackableEntities.EF.6.pdb b/NuGet/Packages/TrackableEntities.EF.6/lib/net45/TrackableEntities.EF.6.pdb
deleted file mode 100644
index 88bf8737..00000000
Binary files a/NuGet/Packages/TrackableEntities.EF.6/lib/net45/TrackableEntities.EF.6.pdb and /dev/null differ
diff --git a/NuGet/Packages/TrackableEntities.EF.6/lib/net45/TrackableEntities.EF.6.xml b/NuGet/Packages/TrackableEntities.EF.6/lib/net45/TrackableEntities.EF.6.xml
deleted file mode 100644
index d80b7f6f..00000000
--- a/NuGet/Packages/TrackableEntities.EF.6/lib/net45/TrackableEntities.EF.6.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>TrackableEntities.EF.6</name>
-    </assembly>
-    <members>
-        <member name="T:TrackableEntities.EF6.DbContextExtensions">
-            <summary>
-            Extension methods for DbContext to persist trackable entities.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.EF6.DbContextExtensions.ApplyChanges(System.Data.Entity.DbContext,TrackableEntities.ITrackable)">
-            <summary>
-            Update entity state on DbContext for an object graph.
-            </summary>
-            <param name="context">Used to query and save changes to a database</param>
-            <param name="item">Object that implements ITrackable</param>
-        </member>
-        <member name="M:TrackableEntities.EF6.DbContextExtensions.ApplyChanges(System.Data.Entity.DbContext,System.Collections.Generic.IEnumerable{TrackableEntities.ITrackable})">
-            <summary>
-            Update entity state on DbContext for more than one object graph.
-            </summary>
-            <param name="context">Used to query and save changes to a database</param>
-            <param name="items">Objects that implement ITrackable</param>
-        </member>
-        <member name="M:TrackableEntities.EF6.DbContextExtensions.GetEntitySetName(System.Data.Entity.DbContext,System.Type)">
-            <summary>
-            For the given entity type return the EntitySet name qualified by container name.
-            </summary>
-            <param name="dbContext">Used to query and save changes to a database</param>
-            <param name="entityType">Type of an entity</param>
-            <returns></returns>
-        </member>
-        <member name="M:TrackableEntities.EF6.DbContextExtensions.LoadRelatedEntities(System.Data.Entity.DbContext,TrackableEntities.ITrackable,System.Boolean)">
-            <summary>
-            Load related entities for an object graph.
-            </summary>
-            <param name="context">Used to query and save changes to a database</param>
-            <param name="item">Object that implement ITrackable</param>
-            <param name="loadAll">True to load all related entities, false to load only added entities</param>
-        </member>
-        <member name="M:TrackableEntities.EF6.DbContextExtensions.LoadRelatedEntities(System.Data.Entity.DbContext,System.Collections.Generic.IEnumerable{TrackableEntities.ITrackable},System.Boolean)">
-            <summary>
-            Load related entities for more than one object graph.
-            </summary>
-            <param name="context">Used to query and save changes to a database</param>
-            <param name="items">Objects that implements ITrackable</param>
-            <param name="loadAll">True to load all related entities, false to load only added entities</param>
-        </member>
-        <member name="M:TrackableEntities.EF6.DbContextExtensions.LoadRelatedEntitiesAsync(System.Data.Entity.DbContext,TrackableEntities.ITrackable,System.Boolean)">
-            <summary>
-            Load related entities for an object graph asynchronously.
-            </summary>
-            <param name="context">Used to query and save changes to a database</param>
-            <param name="item">Object that implement ITrackable</param>
-            <param name="loadAll">True to load all related entities, false to load only added entities</param>
-            <returns>A task that represents the asynchronous operation</returns>
-        </member>
-        <member name="M:TrackableEntities.EF6.DbContextExtensions.LoadRelatedEntitiesAsync(System.Data.Entity.DbContext,TrackableEntities.ITrackable,System.Threading.CancellationToken,System.Boolean)">
-            <summary>
-            Load related entities for an object graph asynchronously.
-            </summary>
-            <param name="context">Used to query and save changes to a database</param>
-            <param name="item">Object that implement ITrackable</param>
-            <param name="cancellationToken">A CancellationToken to observe while waiting for the task to complete.</param>
-            <param name="loadAll">True to load all related entities, false to load only added entities</param>
-            <returns>A task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:TrackableEntities.EF6.DbContextExtensions.LoadRelatedEntitiesAsync(System.Data.Entity.DbContext,System.Collections.Generic.IEnumerable{TrackableEntities.ITrackable},System.Boolean)">
-            <summary>
-            Load related entities for more than one object graph asynchronously.
-            </summary>
-            <param name="context">Used to query and save changes to a database</param>
-            <param name="items">Objects that implements ITrackable</param>
-            <param name="loadAll">True to load all related entities, false to load only added entities</param>
-            <returns>A task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:TrackableEntities.EF6.DbContextExtensions.LoadRelatedEntitiesAsync(System.Data.Entity.DbContext,System.Collections.Generic.IEnumerable{TrackableEntities.ITrackable},System.Threading.CancellationToken,System.Boolean)">
-            <summary>
-            Load related entities for more than one object graph asynchronously.
-            </summary>
-            <param name="context">Used to query and save changes to a database</param>
-            <param name="items">Objects that implements ITrackable</param>
-            <param name="cancellationToken">A CancellationToken to observe while waiting for the task to complete.</param>
-            <param name="loadAll">True to load all related entities, false to load only added entities</param>
-            <returns>A task that represents the asynchronous operation.</returns>
-        </member>
-    </members>
-</doc>
diff --git a/NuGet/Packages/TrackableEntities.Patterns.EF.6/TrackableEntities.Patterns.EF.6.2.5.0.nupkg b/NuGet/Packages/TrackableEntities.Patterns.EF.6/TrackableEntities.Patterns.EF.6.2.5.0.nupkg
new file mode 100644
index 00000000..545134a4
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.Patterns.EF.6/TrackableEntities.Patterns.EF.6.2.5.0.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.Patterns.EF.6/TrackableEntities.Patterns.EF.6.2.5.0.symbols.nupkg b/NuGet/Packages/TrackableEntities.Patterns.EF.6/TrackableEntities.Patterns.EF.6.2.5.0.symbols.nupkg
new file mode 100644
index 00000000..7957e77e
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.Patterns.EF.6/TrackableEntities.Patterns.EF.6.2.5.0.symbols.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.Patterns.EF.6/TrackableEntities.Patterns.EF.6.nuspec b/NuGet/Packages/TrackableEntities.Patterns.EF.6/TrackableEntities.Patterns.EF.6.nuspec
index 0b60ae11..c3956aa6 100644
--- a/NuGet/Packages/TrackableEntities.Patterns.EF.6/TrackableEntities.Patterns.EF.6.nuspec
+++ b/NuGet/Packages/TrackableEntities.Patterns.EF.6/TrackableEntities.Patterns.EF.6.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>TrackableEntities.Patterns.EF.6</id>
-    	<version>2.1.1.0-beta1</version>
+    	<version>2.5.0</version>
         <title>Trackable Entities Patterns for EF6</title>
         <authors>Tony Sneed</authors>
         <owners />
@@ -15,10 +15,10 @@
         <tags>change-tracking entity-framework repository unitofwork patterns</tags>
         <dependencies>
             <group targetFramework="net45">
-                <dependency id="EntityFramework" version="6.1.1" />
-                <dependency id="TrackableEntities.Common" version="2.1.0.0" />
-                <dependency id="TrackableEntities.EF.6" version="2.1.1.0-alpha1" />
-                <dependency id="TrackableEntities.Patterns" version="2.1.0.0" />
+                <dependency id="EntityFramework" version="6.1.2" />
+                <dependency id="TrackableEntities.Common" version="2.5.0" />
+                <dependency id="TrackableEntities.EF.6" version="2.5.0" />
+                <dependency id="TrackableEntities.Patterns" version="2.5.0" />
             </group>
         </dependencies>
     </metadata>
diff --git a/NuGet/Packages/TrackableEntities.Patterns.EF.6/lib/net45/TrackableEntities.Patterns.EF.6.dll b/NuGet/Packages/TrackableEntities.Patterns.EF.6/lib/net45/TrackableEntities.Patterns.EF.6.dll
deleted file mode 100644
index 6cc74480..00000000
Binary files a/NuGet/Packages/TrackableEntities.Patterns.EF.6/lib/net45/TrackableEntities.Patterns.EF.6.dll and /dev/null differ
diff --git a/NuGet/Packages/TrackableEntities.Patterns.EF.6/lib/net45/TrackableEntities.Patterns.EF.6.pdb b/NuGet/Packages/TrackableEntities.Patterns.EF.6/lib/net45/TrackableEntities.Patterns.EF.6.pdb
deleted file mode 100644
index d2f03253..00000000
Binary files a/NuGet/Packages/TrackableEntities.Patterns.EF.6/lib/net45/TrackableEntities.Patterns.EF.6.pdb and /dev/null differ
diff --git a/NuGet/Packages/TrackableEntities.Patterns.EF.6/lib/net45/TrackableEntities.Patterns.EF.6.xml b/NuGet/Packages/TrackableEntities.Patterns.EF.6/lib/net45/TrackableEntities.Patterns.EF.6.xml
deleted file mode 100644
index 3ca82e53..00000000
--- a/NuGet/Packages/TrackableEntities.Patterns.EF.6/lib/net45/TrackableEntities.Patterns.EF.6.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>TrackableEntities.Patterns.EF.6</name>
-    </assembly>
-    <members>
-        <member name="T:TrackableEntities.Patterns.EF6.Repository`1">
-            <summary>
-            Generic repository with basic operations.
-            </summary>
-            <typeparam name="TEntity">Entity type for the repository.</typeparam>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.#ctor">
-            <summary>
-            Creates a new Repository.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.#ctor(System.Data.Entity.DbContext)">
-            <summary>
-            Creates a new Repository.
-            </summary>
-            <param name="context">Entity Framework DbContext-derived class.</param>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.Find(System.Object[])">
-            <summary>
-            Finds an entity with the given primary key values. If no entity is found, then null is returned.
-            </summary>
-            <param name="keyValues">The values of the primary key for the entity to be found.</param>
-            <returns>The entity found, or null.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.Insert(`0)">
-            <summary>
-            Inserts a new entity into the repository.
-            </summary>
-            <param name="entity">Entity to insert.</param>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.Update(`0)">
-            <summary>
-            Updates an existing entity in the repository.
-            </summary>
-            <param name="entity">Entity to update.</param>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.Delete(System.Object[])">
-            <summary>
-            <para>Removes an entity from the respository.</para>
-            <para>Override to include child entities in delete operation.</para>
-            </summary>
-            <param name="keyValues">The values of the primary key for the entity to be found.</param>
-            <returns>False if the entity does not exist in the repository, or true if successfully deleted.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.FindAsync(System.Object[])">
-            <summary>
-            Finds an entity with the given primary key values. If no entity is found, then null is returned.
-            </summary>
-            <param name="keyValues">The values of the primary key for the entity to be found.</param>
-            <returns>A task that represents the asynchronous find operation. The task result contains the entity found, or null.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.FindAsync(System.Threading.CancellationToken,System.Object[])">
-            <summary>
-            Finds an entity with the given primary key values. If no entity is found, then null is returned.
-            </summary>
-            <param name="cancellationToken">A CancellationToken to observe while waiting for the task to complete.</param>
-            <param name="keyValues">The values of the primary key for the entity to be found.</param>
-            <returns>A task that represents the asynchronous find operation. The task result contains the entity found, or null.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.DeleteAsync(System.Object[])">
-            <summary>
-            <para>Removes an entity from the respository.</para>
-            <para>Override to include child entities in delete operation.</para>
-            </summary>
-            <param name="keyValues">The values of the primary key for the entity to be found.</param>
-            <returns>A task that represents the asynchronous delete operation. The task result will be false if the entity does not exist in the repository, or true if successfully removed.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.DeleteAsync(System.Threading.CancellationToken,System.Object[])">
-            <summary>
-            <para>Removes an entity from the respository.</para>
-            <para>Override to include child entities in delete operation.</para>
-            </summary>
-            <param name="cancellationToken">A CancellationToken to observe while waiting for the task to complete.</param>
-            <param name="keyValues">The values of the primary key for the entity to be found.</param>
-            <returns>A task that represents the asynchronous delete operation. The task result will be false if the entity does not exist in the repository, or true if successfully removed.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.LoadRelatedEntities(`0)">
-            <summary>
-            Load related entities for an object graph.
-            </summary>
-            <param name="entity">Entity on which related entities are loaded.</param>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.LoadRelatedEntitiesAsync(`0)">
-            <summary>
-            Load related entities for an object graph.
-            </summary>
-            <param name="entity">Entity on which related entities are loaded.</param>
-            <returns>A task that represents the asynchronous operation</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.LoadRelatedEntitiesAsync(`0,System.Threading.CancellationToken)">
-            <summary>
-            Load related entities for an object graph.
-            </summary>
-            <param name="entity">Entity on which related entities are loaded.</param>
-            <param name="cancellationToken">A CancellationToken to observe while waiting for the task to complete.</param>
-            <returns>A task that represents the asynchronous operation</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.LoadRelatedEntities(System.Collections.Generic.IEnumerable{`0})">
-            <summary>
-            Load related entities for more than one object graph.
-            </summary>
-            <param name="entities">Entities on which related entities are loaded.</param>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.LoadRelatedEntitiesAsync(System.Collections.Generic.IEnumerable{`0})">
-            <summary>
-            Load related entities for more than one object graph.
-            </summary>
-            <param name="entities">Entities on which related entities are loaded.</param>
-            <returns>A task that represents the asynchronous operation</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.LoadRelatedEntitiesAsync(System.Collections.Generic.IEnumerable{`0},System.Threading.CancellationToken)">
-            <summary>
-            Load related entities for more than one object graph.
-            </summary>
-            <param name="entities">Entities on which related entities are loaded.</param>
-            <param name="cancellationToken">A CancellationToken to observe while waiting for the task to complete.</param>
-            <returns>A task that represents the asynchronous operation</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.Repository`1.ApplyDelete(`0)">
-            <summary>
-            Mark entity as deleted and apply changes to context.
-            </summary>
-            <param name="entity">Entity which is marked as deleted.</param>
-        </member>
-        <member name="P:TrackableEntities.Patterns.EF6.Repository`1.Context">
-            <summary>
-            Gets and sets the DbContext for the repository.
-            </summary>
-        </member>
-        <member name="P:TrackableEntities.Patterns.EF6.Repository`1.Set">
-            <summary>
-            Gets the DbSet for the respository
-            </summary>
-        </member>
-        <member name="T:TrackableEntities.Patterns.EF6.UnitOfWork">
-            <summary>
-            General unit of work for committing changes across one or more repositories. 
-            Inherit from this class to supply a specific DbContext. 
-            Add a property for each respository for which unit of work must be done.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.UnitOfWork.#ctor">
-            <summary>
-            Constructs a new general unit of work.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.UnitOfWork.#ctor(System.Data.Entity.DbContext)">
-            <summary>
-            Constructs a new general unit of work.
-            </summary>
-            <param name="context">Entity Framework DbContext-derived class.</param>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.UnitOfWork.Dispose">
-            <summary>
-            Disposes the DbContext.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.UnitOfWork.Dispose(System.Boolean)">
-            <summary>
-            Disposes the DbContext.
-            </summary>
-            <param name="disposing">True to release both managed and unmanaged resources; false to release only unmanaged resources.</param>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.UnitOfWork.SaveChanges">
-            <summary>
-            Saves changes made to one or more repositories.
-            </summary>
-            <returns>The number of objects saved.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.UnitOfWork.SaveChangesAsync">
-            <summary>
-            Saves changes made to one or more repositories.
-            </summary>
-            <returns>A task that represents the asynchronous save operation. The task result contains the number of objects saved.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.EF6.UnitOfWork.SaveChangesAsync(System.Threading.CancellationToken)">
-            <summary>
-            Saves changes made to one or more repositories.
-            </summary>
-            <param name="cancellationToken">A CancellationToken to observe while waiting for the task to complete.</param>
-            <returns>A task that represents the asynchronous save operation. The task result contains the number of objects saved.</returns>
-        </member>
-        <member name="P:TrackableEntities.Patterns.EF6.UnitOfWork.Context">
-            <summary>
-            Gets the DbContext for the unit of work.
-            </summary>
-        </member>
-    </members>
-</doc>
diff --git a/NuGet/Packages/TrackableEntities.Patterns/TrackableEntities.Patterns.2.5.0.nupkg b/NuGet/Packages/TrackableEntities.Patterns/TrackableEntities.Patterns.2.5.0.nupkg
new file mode 100644
index 00000000..798a6a3e
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.Patterns/TrackableEntities.Patterns.2.5.0.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.Patterns/TrackableEntities.Patterns.2.5.0.symbols.nupkg b/NuGet/Packages/TrackableEntities.Patterns/TrackableEntities.Patterns.2.5.0.symbols.nupkg
new file mode 100644
index 00000000..84221596
Binary files /dev/null and b/NuGet/Packages/TrackableEntities.Patterns/TrackableEntities.Patterns.2.5.0.symbols.nupkg differ
diff --git a/NuGet/Packages/TrackableEntities.Patterns/TrackableEntities.Patterns.nuspec b/NuGet/Packages/TrackableEntities.Patterns/TrackableEntities.Patterns.nuspec
index 6f43786a..b59cbea9 100644
--- a/NuGet/Packages/TrackableEntities.Patterns/TrackableEntities.Patterns.nuspec
+++ b/NuGet/Packages/TrackableEntities.Patterns/TrackableEntities.Patterns.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>TrackableEntities.Patterns</id>
-    	<version>2.1.0.0</version>
+    	<version>2.5.0</version>
         <title>Trackable Entities Patterns</title>
         <authors>Tony Sneed</authors>
         <owners>Tony Sneed</owners>
diff --git a/NuGet/Packages/TrackableEntities.Patterns/lib/net45/TrackableEntities.Patterns.dll b/NuGet/Packages/TrackableEntities.Patterns/lib/net45/TrackableEntities.Patterns.dll
deleted file mode 100644
index 7fccec59..00000000
Binary files a/NuGet/Packages/TrackableEntities.Patterns/lib/net45/TrackableEntities.Patterns.dll and /dev/null differ
diff --git a/NuGet/Packages/TrackableEntities.Patterns/lib/net45/TrackableEntities.Patterns.pdb b/NuGet/Packages/TrackableEntities.Patterns/lib/net45/TrackableEntities.Patterns.pdb
deleted file mode 100644
index 8decf86b..00000000
Binary files a/NuGet/Packages/TrackableEntities.Patterns/lib/net45/TrackableEntities.Patterns.pdb and /dev/null differ
diff --git a/NuGet/Packages/TrackableEntities.Patterns/lib/net45/TrackableEntities.Patterns.xml b/NuGet/Packages/TrackableEntities.Patterns/lib/net45/TrackableEntities.Patterns.xml
deleted file mode 100644
index 45c664d1..00000000
--- a/NuGet/Packages/TrackableEntities.Patterns/lib/net45/TrackableEntities.Patterns.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>TrackableEntities.Patterns</name>
-    </assembly>
-    <members>
-        <member name="T:TrackableEntities.Patterns.IRepositoryAsync`1">
-            <summary>
-            Generic repository interface with basic asynchronous operations.
-            </summary>
-            <typeparam name="TEntity">Entity type</typeparam>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IRepositoryAsync`1.FindAsync(System.Object[])">
-            <summary>
-            Finds an entity with the given primary key values. If no entity is found, then null is returned.
-            </summary>
-            <param name="keyValues">The values of the primary key for the entity to be found.</param>
-            <returns>A task that represents the asynchronous find operation. The task result contains the entity found, or null.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IRepositoryAsync`1.FindAsync(System.Threading.CancellationToken,System.Object[])">
-            <summary>
-            Finds an entity with the given primary key values. If no entity is found, then null is returned.
-            </summary>
-            <param name="cancellationToken">A CancellationToken to observe while waiting for the task to complete.</param>
-            <param name="keyValues">The values of the primary key for the entity to be found.</param>
-            <returns>A task that represents the asynchronous find operation. The task result contains the entity found, or null.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IRepositoryAsync`1.DeleteAsync(System.Object[])">
-            <summary>
-            Removes an entity from the respository.
-            </summary>
-            <param name="keyValues">The values of the primary key for the entity to be found.</param>
-            <returns>A task that represents the asynchronous delete operation. The task result will be false if the entity does not exist in the repository, or true if successfully removed.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IRepositoryAsync`1.DeleteAsync(System.Threading.CancellationToken,System.Object[])">
-            <summary>
-            Removes an entity from the respository.
-            </summary>
-            <param name="cancellationToken">A CancellationToken to observe while waiting for the task to complete.</param>
-            <param name="keyValues">The values of the primary key for the entity to be found.</param>
-            <returns>A task that represents the asynchronous delete operation. The task result will be false if the entity does not exist in the repository, or true if successfully removed.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IRepositoryAsync`1.LoadRelatedEntitiesAsync(`0)">
-            <summary>
-            Load related entities for an object graph.
-            </summary>
-            <param name="entity">Entity on which related entities are loaded.</param>
-            <returns>A task that represents the asynchronous delete operation. The task result will be false if the entity does not exist in the repository, or true if successfully removed.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IRepositoryAsync`1.LoadRelatedEntitiesAsync(`0,System.Threading.CancellationToken)">
-            <summary>
-            Load related entities for an object graph.
-            </summary>
-            <param name="entity">Entity on which related entities are loaded.</param>
-            <param name="cancellationToken">A CancellationToken to observe while waiting for the task to complete.</param>
-            <returns>A task that represents the asynchronous delete operation. The task result will be false if the entity does not exist in the repository, or true if successfully removed.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IRepositoryAsync`1.LoadRelatedEntitiesAsync(System.Collections.Generic.IEnumerable{`0})">
-            <summary>
-            Load related entities for more than one object graph.
-            </summary>
-            <param name="entities">Entities on which related entities are loaded.</param>
-            <returns>A task that represents the asynchronous delete operation. The task result will be false if the entity does not exist in the repository, or true if successfully removed.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IRepositoryAsync`1.LoadRelatedEntitiesAsync(System.Collections.Generic.IEnumerable{`0},System.Threading.CancellationToken)">
-            <summary>
-            Load related entities for more than one object graph.
-            </summary>
-            <param name="entities">Entities on which related entities are loaded.</param>
-            <param name="cancellationToken">A CancellationToken to observe while waiting for the task to complete.</param>
-            <returns>A task that represents the asynchronous delete operation. The task result will be false if the entity does not exist in the repository, or true if successfully removed.</returns>
-        </member>
-        <member name="T:TrackableEntities.Patterns.IRepository`1">
-            <summary>
-            Generic repository interface with basic operations.
-            </summary>
-            <typeparam name="TEntity">Entity type</typeparam>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IRepository`1.Find(System.Object[])">
-            <summary>
-            Finds an entity with the given primary key values. If no entity is found, then null is returned.
-            </summary>
-            <param name="keyValues">The values of the primary key for the entity to be found.</param>
-            <returns>The entity found, or null.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IRepository`1.Insert(`0)">
-            <summary>
-            Inserts a new entity into the repository.
-            </summary>
-            <param name="entity">Entity to insert.</param>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IRepository`1.Update(`0)">
-            <summary>
-            Updates an existing entity in the repository.
-            </summary>
-            <param name="entity">Entity to update.</param>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IRepository`1.Delete(System.Object[])">
-            <summary>
-            Removes an entity from the respository.
-            </summary>
-            <param name="keyValues">The values of the primary key for the entity to be found.</param>
-            <returns>False if the entity does not exist in the repository, or true if successfully deleted.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IRepository`1.LoadRelatedEntities(`0)">
-            <summary>
-            Load related entities for an object graph.
-            </summary>
-            <param name="entity">Entity on which related entities are loaded.</param>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IRepository`1.LoadRelatedEntities(System.Collections.Generic.IEnumerable{`0})">
-            <summary>
-            Load related entities for more than one object graph.
-            </summary>
-            <param name="entities">Entities on which related entities are loaded.</param>
-        </member>
-        <member name="T:TrackableEntities.Patterns.IUnitOfWorkAsync">
-            <summary>
-            Unit of work for committing changes across one or more repositories asynchronously.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IUnitOfWorkAsync.SaveChangesAsync">
-            <summary>
-            Saves changes made to one or more repositories.
-            </summary>
-            <returns>A task that represents the asynchronous save operation. The task result contains the number of objects saved.</returns>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IUnitOfWorkAsync.SaveChangesAsync(System.Threading.CancellationToken)">
-            <summary>
-            Saves changes made to one or more repositories.
-            </summary>
-            <param name="cancellationToken">A CancellationToken to observe while waiting for the task to complete.</param>
-            <returns>A task that represents the asynchronous save operation. The task result contains the number of objects saved.</returns>
-        </member>
-        <member name="T:TrackableEntities.Patterns.IUnitOfWork">
-            <summary>
-            Unit of work for committing changes across one or more repositories.
-            </summary>
-        </member>
-        <member name="M:TrackableEntities.Patterns.IUnitOfWork.SaveChanges">
-            <summary>
-            Saves changes made to one or more repositories.
-            </summary>
-            <returns>The number of objects saved.</returns>
-        </member>
-    </members>
-</doc>