diff --git a/CNTK.sln b/CNTK.sln
index 8ef33271e..ce1caec6f 100644
--- a/CNTK.sln
+++ b/CNTK.sln
@@ -487,10 +487,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CIFAR-10", "CIFAR-10", "{77
 		Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56.ndl = Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56.ndl
 		Examples\Image\Miscellaneous\CIFAR-10\16to32.txt = Examples\Image\Miscellaneous\CIFAR-10\16to32.txt
 		Examples\Image\Miscellaneous\CIFAR-10\32to64.txt = Examples\Image\Miscellaneous\CIFAR-10\32to64.txt
-		Examples\Image\Miscellaneous\CIFAR-10\CifarDownload.py = Examples\Image\Miscellaneous\CIFAR-10\CifarDownload.py
-		Examples\Image\Miscellaneous\CIFAR-10\CifarDownload_py3.py = Examples\Image\Miscellaneous\CIFAR-10\CifarDownload_py3.py
 		Examples\Image\Miscellaneous\CIFAR-10\CifarConverter.py = Examples\Image\Miscellaneous\CIFAR-10\CifarConverter.py
 		Examples\Image\Miscellaneous\CIFAR-10\CifarConverter_py3.py = Examples\Image\Miscellaneous\CIFAR-10\CifarConverter_py3.py
+		Examples\Image\Miscellaneous\CIFAR-10\CifarDownload.py = Examples\Image\Miscellaneous\CIFAR-10\CifarDownload.py
+		Examples\Image\Miscellaneous\CIFAR-10\CifarDownload_py3.py = Examples\Image\Miscellaneous\CIFAR-10\CifarDownload_py3.py
 		Examples\Image\Miscellaneous\CIFAR-10\labelsmap.txt = Examples\Image\Miscellaneous\CIFAR-10\labelsmap.txt
 		Examples\Image\Miscellaneous\CIFAR-10\Macros.ndl = Examples\Image\Miscellaneous\CIFAR-10\Macros.ndl
 		Examples\Image\Miscellaneous\CIFAR-10\readme.txt = Examples\Image\Miscellaneous\CIFAR-10\readme.txt
@@ -1143,9 +1143,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedEvalTests", "Tests\U
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Evaluation", "Evaluation", "{3385EBEA-5F97-4B2B-9F30-0E6D7F91B9CA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSEvalClient-CntkSln", "Examples\Evaluation\CSEvalClient-CntkSln\CSEvalClient-CntkSln.csproj", "{1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSEvalClient-CntkSln", "Tests\EvalClients\CSEvalClient-CntkSln\CSEvalClient-CntkSln.csproj", "{1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CPPEvalClient-CntkSln", "Examples\Evaluation\CPPEvalClient-CntkSln\CPPEvalClient-CntkSln.vcxproj", "{CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CPPEvalClient-CntkSln", "Tests\EvalClients\CPPEvalClient-CntkSln\CPPEvalClient-CntkSln.vcxproj", "{CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{482999D1-B7E2-466E-9F8D-2119F93EAFD9} = {482999D1-B7E2-466E-9F8D-2119F93EAFD9}
 	EndProjectSection
@@ -1260,6 +1260,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Truncated-Kaldi", "Truncate
 		Tests\EndToEndTests\Speech\LSTM\Truncated-Kaldi\testcases.yml = Tests\EndToEndTests\Speech\LSTM\Truncated-Kaldi\testcases.yml
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EvalClients", "EvalClients", "{1A069795-9187-4286-9F74-3E53C789C61F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_CpuOnly|x64 = Debug_CpuOnly|x64
@@ -1702,8 +1704,8 @@ Global
 		{F4CC3AB2-0DB2-4281-929A-2E68E30F0F6E} = {6F19321A-65E7-4829-B00C-3886CD6C6EDE}
 		{CC8DDDCB-D53A-4B30-8596-AEF1C493DB31} = {6F19321A-65E7-4829-B00C-3886CD6C6EDE}
 		{3385EBEA-5F97-4B2B-9F30-0E6D7F91B9CA} = {47755F2E-D674-4175-9E38-8EA053455072}
-		{1C6E6C53-1AA7-4B69-913E-B97BB5A872CF} = {3385EBEA-5F97-4B2B-9F30-0E6D7F91B9CA}
-		{CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E} = {3385EBEA-5F97-4B2B-9F30-0E6D7F91B9CA}
+		{1C6E6C53-1AA7-4B69-913E-B97BB5A872CF} = {1A069795-9187-4286-9F74-3E53C789C61F}
+		{CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E} = {1A069795-9187-4286-9F74-3E53C789C61F}
 		{9F999212-AFC5-4EAC-AA78-F7247D46C456} = {6F19321A-65E7-4829-B00C-3886CD6C6EDE}
 		{2230BF3D-4317-4A3F-A743-DDD6160503F8} = {8BE0642A-A3AA-4A64-95D0-C78FB285B2A4}
 		{CC143D08-567D-4DAC-9E14-264749C19039} = {8BE0642A-A3AA-4A64-95D0-C78FB285B2A4}
@@ -1719,5 +1721,6 @@ Global
 		{D293C7C7-B7D7-47CE-A796-45262C16F980} = {19EE975B-232D-49F0-94C7-6F1C6424FB53}
 		{4F534076-39A5-40E2-BF87-64EC464C52B2} = {19EE975B-232D-49F0-94C7-6F1C6424FB53}
 		{31263D7F-F590-475E-B4F0-7DFA4E4FF4B8} = {19EE975B-232D-49F0-94C7-6F1C6424FB53}
+		{1A069795-9187-4286-9F74-3E53C789C61F} = {D45DF403-6781-444E-B654-A96868C5BE68}
 	EndGlobalSection
 EndGlobal
diff --git a/Examples/Evaluation/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj b/Tests/EvalClients/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj
similarity index 98%
rename from Examples/Evaluation/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj
rename to Tests/EvalClients/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj
index c686a31e1..072255e6d 100644
--- a/Examples/Evaluation/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj
+++ b/Tests/EvalClients/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj
@@ -106,7 +106,7 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\CPPEvalClient\CPPEvalClient.cpp" />
+    <ClCompile Include="..\..\..\Examples\Evaluation\CPPEvalClient\CPPEvalClient.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
diff --git a/Examples/Evaluation/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj.filters b/Tests/EvalClients/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj.filters
similarity index 100%
rename from Examples/Evaluation/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj.filters
rename to Tests/EvalClients/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj.filters
diff --git a/Examples/Evaluation/CPPEvalClient-CntkSln/README.md b/Tests/EvalClients/CPPEvalClient-CntkSln/README.md
similarity index 71%
rename from Examples/Evaluation/CPPEvalClient-CntkSln/README.md
rename to Tests/EvalClients/CPPEvalClient-CntkSln/README.md
index 0026bad6d..a5c896eda 100644
--- a/Examples/Evaluation/CPPEvalClient-CntkSln/README.md
+++ b/Tests/EvalClients/CPPEvalClient-CntkSln/README.md
@@ -1 +1 @@
-This folder contains the VC++ project file used by cntk.sln to build CPPEvalClient.exe. The C++ source code used by the project is available in ..\CPPEvalClient.
\ No newline at end of file
+This folder contains the VC++ project file used by cntk.sln to build CPPEvalClient.exe. The C++ source code used by the project is available in Examples\Evaluation\CPPEvalClient.
\ No newline at end of file
diff --git a/Examples/Evaluation/CSEvalClient-CntkSln/App.config b/Tests/EvalClients/CSEvalClient-CntkSln/App.config
similarity index 100%
rename from Examples/Evaluation/CSEvalClient-CntkSln/App.config
rename to Tests/EvalClients/CSEvalClient-CntkSln/App.config
diff --git a/Examples/Evaluation/CSEvalClient-CntkSln/CSEvalClient-CntkSln.csproj b/Tests/EvalClients/CSEvalClient-CntkSln/CSEvalClient-CntkSln.csproj
similarity index 93%
rename from Examples/Evaluation/CSEvalClient-CntkSln/CSEvalClient-CntkSln.csproj
rename to Tests/EvalClients/CSEvalClient-CntkSln/CSEvalClient-CntkSln.csproj
index c09c73c64..5027cbfaa 100644
--- a/Examples/Evaluation/CSEvalClient-CntkSln/CSEvalClient-CntkSln.csproj
+++ b/Tests/EvalClients/CSEvalClient-CntkSln/CSEvalClient-CntkSln.csproj
@@ -59,9 +59,9 @@
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\CSEvalClient\CntkBitmapExtensions.cs" />
-    <Compile Include="..\CSEvalClient\ModelEvaluator.cs" />
-    <Compile Include="..\CSEvalClient\Program.cs" />
+    <Compile Include="..\..\..\Examples\Evaluation\CSEvalClient\CntkBitmapExtensions.cs" />
+    <Compile Include="..\..\..\Examples\Evaluation\CSEvalClient\ModelEvaluator.cs" />
+    <Compile Include="..\..\..\Examples\Evaluation\CSEvalClient\Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Examples/Evaluation/CSEvalClient-CntkSln/Properties/AssemblyInfo.cs b/Tests/EvalClients/CSEvalClient-CntkSln/Properties/AssemblyInfo.cs
similarity index 100%
rename from Examples/Evaluation/CSEvalClient-CntkSln/Properties/AssemblyInfo.cs
rename to Tests/EvalClients/CSEvalClient-CntkSln/Properties/AssemblyInfo.cs
diff --git a/Examples/Evaluation/CSEvalClient-CntkSln/README.md b/Tests/EvalClients/CSEvalClient-CntkSln/README.md
similarity index 73%
rename from Examples/Evaluation/CSEvalClient-CntkSln/README.md
rename to Tests/EvalClients/CSEvalClient-CntkSln/README.md
index ea5f65464..2afc21596 100644
--- a/Examples/Evaluation/CSEvalClient-CntkSln/README.md
+++ b/Tests/EvalClients/CSEvalClient-CntkSln/README.md
@@ -1 +1 @@
-This folder contains the C# project file used by cntk.sln to build CSEvalClient.exe. The C# source code used by the project is available in ..\CSEvalClient.
\ No newline at end of file
+This folder contains the C# project file used by cntk.sln to build CSEvalClient.exe. The C# source code used by the project is available in Examples\Evaluation\CSEvalClient.
\ No newline at end of file