diff --git a/samples/SocialWeather/PipeWeatherStreamFormatter.cs b/samples/SocialWeather/Pipe/PipeWeatherStreamFormatter.cs
similarity index 98%
rename from samples/SocialWeather/PipeWeatherStreamFormatter.cs
rename to samples/SocialWeather/Pipe/PipeWeatherStreamFormatter.cs
index ee57f17404..72c9733a7d 100644
--- a/samples/SocialWeather/PipeWeatherStreamFormatter.cs
+++ b/samples/SocialWeather/Pipe/PipeWeatherStreamFormatter.cs
@@ -3,7 +3,7 @@ using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SocialWeather
+namespace SocialWeather.Pipe
 {
     public class PipeWeatherStreamFormatter : IStreamFormatter<WeatherReport>
     {
diff --git a/samples/SocialWeather/Startup.cs b/samples/SocialWeather/Startup.cs
index 4b539789f1..b5cbdd02ff 100644
--- a/samples/SocialWeather/Startup.cs
+++ b/samples/SocialWeather/Startup.cs
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using SocialWeather.Pipe;
 using SocialWeather.Protobuf;
 
 namespace SocialWeather