diff --git a/src/CloudNative.CloudEvents.AspNetCore/CloudEventJsonInputFormatter.cs b/samples/CloudNative.CloudEvents.AspNetCoreSample/CloudEventJsonInputFormatter.cs
similarity index 96%
rename from src/CloudNative.CloudEvents.AspNetCore/CloudEventJsonInputFormatter.cs
rename to samples/CloudNative.CloudEvents.AspNetCoreSample/CloudEventJsonInputFormatter.cs
index 125611f..83cf74a 100644
--- a/src/CloudNative.CloudEvents.AspNetCore/CloudEventJsonInputFormatter.cs
+++ b/samples/CloudNative.CloudEvents.AspNetCoreSample/CloudEventJsonInputFormatter.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache 2.0 license.
 // See LICENSE file in the project root for full license information.
 
+using CloudNative.CloudEvents.AspNetCore;
 using CloudNative.CloudEvents.Core;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Net.Http.Headers;
@@ -9,7 +10,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CloudNative.CloudEvents.AspNetCore
+namespace CloudNative.CloudEvents.AspNetCoreSample
 {
     // FIXME: This doesn't get called for binary CloudEvents without content, or with a different data content type.
     // FIXME: This shouldn't really be tied to JSON. We need to work out how we actually want this to be used.
diff --git a/samples/CloudNative.CloudEvents.AspNetCoreSample/Startup.cs b/samples/CloudNative.CloudEvents.AspNetCoreSample/Startup.cs
index 82cb86e..719a30d 100644
--- a/samples/CloudNative.CloudEvents.AspNetCoreSample/Startup.cs
+++ b/samples/CloudNative.CloudEvents.AspNetCoreSample/Startup.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache 2.0 license.
 // See LICENSE file in the project root for full license information.
 
-using CloudNative.CloudEvents.AspNetCore;
 using CloudNative.CloudEvents.NewtonsoftJson;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;