diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/.gitattributes b/samples/WinML-IntelligentAPI/.gitattributes
similarity index 100%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/.gitattributes
rename to samples/WinML-IntelligentAPI/.gitattributes
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/.gitignore b/samples/WinML-IntelligentAPI/.gitignore
similarity index 100%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/.gitignore
rename to samples/WinML-IntelligentAPI/.gitignore
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ImageClassificationTest.sln b/samples/WinML-IntelligentAPI/ImageClassificationTest.sln
similarity index 95%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ImageClassificationTest.sln
rename to samples/WinML-IntelligentAPI/ImageClassificationTest.sln
index 708ffde..9d01aac 100644
--- a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ImageClassificationTest.sln
+++ b/samples/WinML-IntelligentAPI/ImageClassificationTest.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31205.134
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageClassificationTestProject", "ProjectBangaloreNugetTest\ImageClassificationTestProject.csproj", "{E99D1A06-2477-4A98-A227-3485C79F25F3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageClassificationTestProject", "ImageClassificationTestProject\ImageClassificationTestProject.csproj", "{E99D1A06-2477-4A98-A227-3485C79F25F3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/App.xaml b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/App.xaml
similarity index 100%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/App.xaml
rename to samples/WinML-IntelligentAPI/ImageClassificationTestProject/App.xaml
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/App.xaml.cs b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/App.xaml.cs
similarity index 100%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/App.xaml.cs
rename to samples/WinML-IntelligentAPI/ImageClassificationTestProject/App.xaml.cs
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Assets/LockScreenLogo.scale-200.png b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/Assets/LockScreenLogo.scale-200.png
similarity index 100%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Assets/LockScreenLogo.scale-200.png
rename to samples/WinML-IntelligentAPI/ImageClassificationTestProject/Assets/LockScreenLogo.scale-200.png
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Assets/SplashScreen.scale-200.png b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/Assets/SplashScreen.scale-200.png
similarity index 100%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Assets/SplashScreen.scale-200.png
rename to samples/WinML-IntelligentAPI/ImageClassificationTestProject/Assets/SplashScreen.scale-200.png
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Assets/Square150x150Logo.scale-200.png b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Assets/Square150x150Logo.scale-200.png
rename to samples/WinML-IntelligentAPI/ImageClassificationTestProject/Assets/Square150x150Logo.scale-200.png
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Assets/Square44x44Logo.scale-200.png b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Assets/Square44x44Logo.scale-200.png
rename to samples/WinML-IntelligentAPI/ImageClassificationTestProject/Assets/Square44x44Logo.scale-200.png
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
rename to samples/WinML-IntelligentAPI/ImageClassificationTestProject/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Assets/StoreLogo.png b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/Assets/StoreLogo.png
similarity index 100%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Assets/StoreLogo.png
rename to samples/WinML-IntelligentAPI/ImageClassificationTestProject/Assets/StoreLogo.png
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Assets/Wide310x150Logo.scale-200.png b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Assets/Wide310x150Logo.scale-200.png
rename to samples/WinML-IntelligentAPI/ImageClassificationTestProject/Assets/Wide310x150Logo.scale-200.png
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/ImageClassificationTestProject.csproj b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/ImageClassificationTestProject.csproj
similarity index 98%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/ImageClassificationTestProject.csproj
rename to samples/WinML-IntelligentAPI/ImageClassificationTestProject/ImageClassificationTestProject.csproj
index 766deaa..bf08aa5 100644
--- a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/ImageClassificationTestProject.csproj
+++ b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/ImageClassificationTestProject.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{E99D1A06-2477-4A98-A227-3485C79F25F3}</ProjectGuid>
     <OutputType>AppContainerExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ProjectBangaloreNugetTest</RootNamespace>
-    <AssemblyName>ProjectBangaloreNugetTest</AssemblyName>
+    <RootNamespace>ImageClassificationTest</RootNamespace>
+    <AssemblyName>ImageClassificationTest</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/MainPage.xaml b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/MainPage.xaml
similarity index 100%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/MainPage.xaml
rename to samples/WinML-IntelligentAPI/ImageClassificationTestProject/MainPage.xaml
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/MainPage.xaml.cs b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/MainPage.xaml.cs
similarity index 79%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/MainPage.xaml.cs
rename to samples/WinML-IntelligentAPI/ImageClassificationTestProject/MainPage.xaml.cs
index 3682dd2..652ba01 100644
--- a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/MainPage.xaml.cs
+++ b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/MainPage.xaml.cs
@@ -48,12 +48,17 @@ private async void ButtonRun_Click(object sender, RoutedEventArgs e)
 
 
             //Call ClassifyImage to get image classes
-            List<ClassificationResult> list = await SqueezeNetImageClassifier.ClassifyImage(selectedStorageFile, 3);
-
-            //Display Image and result
-            ResultsBlock.Text = "1st guess: " + list[0].category + "\nwith confidence: " + list[0].confidence + " \n\n\n2nd guess: " + list[1].category + "\nwith confidence: " + list[1].confidence + " \n\n\n3rd guess: " + list[2].category + "\nwith confidence: " + list[2].confidence;
-            await DisplayImage(selectedStorageFile);
-
+            if (selectedStorageFile != null)
+            {
+                List<ClassificationResult> list = await SqueezeNetImageClassifier.ClassifyImage(selectedStorageFile, 3);
+                //Display Image and result
+                ResultsBlock.Text = "1st guess: " + list[0].category + "\nwith confidence: " + list[0].confidence + " \n\n\n2nd guess: " + list[1].category + "\nwith confidence: " + list[1].confidence + " \n\n\n3rd guess: " + list[2].category + "\nwith confidence: " + list[2].confidence;
+                await DisplayImage(selectedStorageFile);
+            }
+            else
+            {
+                ResultsBlock.Text = "Select a file";
+            }
         }
 
         private async Task DisplayImage(StorageFile selectedStorageFile)
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Package.appxmanifest b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/Package.appxmanifest
similarity index 100%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Package.appxmanifest
rename to samples/WinML-IntelligentAPI/ImageClassificationTestProject/Package.appxmanifest
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Properties/AssemblyInfo.cs b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Properties/AssemblyInfo.cs
rename to samples/WinML-IntelligentAPI/ImageClassificationTestProject/Properties/AssemblyInfo.cs
diff --git a/samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Properties/Default.rd.xml b/samples/WinML-IntelligentAPI/ImageClassificationTestProject/Properties/Default.rd.xml
similarity index 100%
rename from samples/WinML-IntelligentAPI/IntelligentAPIs_ImageClassificationTest/ProjectBangaloreNugetTest/Properties/Default.rd.xml
rename to samples/WinML-IntelligentAPI/ImageClassificationTestProject/Properties/Default.rd.xml