diff --git a/src/.gitignore b/src/SignalRServiceExtension/.gitignore
similarity index 100%
rename from src/.gitignore
rename to src/SignalRServiceExtension/.gitignore
diff --git a/src/AzureSignalR.cs b/src/SignalRServiceExtension/AzureSignalR.cs
similarity index 100%
rename from src/AzureSignalR.cs
rename to src/SignalRServiceExtension/AzureSignalR.cs
diff --git a/src/AzureSignalRConnectionInfo.cs b/src/SignalRServiceExtension/AzureSignalRConnectionInfo.cs
similarity index 100%
rename from src/AzureSignalRConnectionInfo.cs
rename to src/SignalRServiceExtension/AzureSignalRConnectionInfo.cs
diff --git a/src/HttpClientFactory.cs b/src/SignalRServiceExtension/HttpClientFactory.cs
similarity index 100%
rename from src/HttpClientFactory.cs
rename to src/SignalRServiceExtension/HttpClientFactory.cs
diff --git a/src/Microsoft.Azure.WebJobs.Extensions.SignalRService.csproj b/src/SignalRServiceExtension/Microsoft.Azure.WebJobs.Extensions.SignalRService.csproj
similarity index 100%
rename from src/Microsoft.Azure.WebJobs.Extensions.SignalRService.csproj
rename to src/SignalRServiceExtension/Microsoft.Azure.WebJobs.Extensions.SignalRService.csproj
diff --git a/src/SignalRAttribute.cs b/src/SignalRServiceExtension/SignalRAttribute.cs
similarity index 100%
rename from src/SignalRAttribute.cs
rename to src/SignalRServiceExtension/SignalRAttribute.cs
diff --git a/src/SignalRConfiguration.cs b/src/SignalRServiceExtension/SignalRConfiguration.cs
similarity index 100%
rename from src/SignalRConfiguration.cs
rename to src/SignalRServiceExtension/SignalRConfiguration.cs
diff --git a/src/SignalRConnectionInfoAttribute.cs b/src/SignalRServiceExtension/SignalRConnectionInfoAttribute.cs
similarity index 96%
rename from src/SignalRConnectionInfoAttribute.cs
rename to src/SignalRServiceExtension/SignalRConnectionInfoAttribute.cs
index f8d2fc6..b0d8fdf 100644
--- a/src/SignalRConnectionInfoAttribute.cs
+++ b/src/SignalRServiceExtension/SignalRConnectionInfoAttribute.cs
@@ -1,16 +1,16 @@
-using System;
-using Microsoft.Azure.WebJobs.Description;
-
-namespace Microsoft.Azure.WebJobs.Extensions.SignalRService
-{
-    [AttributeUsage(AttributeTargets.ReturnValue | AttributeTargets.Parameter)]
-    [Binding]
-    public class SignalRConnectionInfoAttribute : Attribute
-    {
-        [AppSetting(Default = "AzureSignalRConnectionString")]
-        public string ConnectionStringSetting { get; set; }
-        
-        [AutoResolve]
-        public string HubName { get; set; }
-    }
-}
+using System;
+using Microsoft.Azure.WebJobs.Description;
+
+namespace Microsoft.Azure.WebJobs.Extensions.SignalRService
+{
+    [AttributeUsage(AttributeTargets.ReturnValue | AttributeTargets.Parameter)]
+    [Binding]
+    public class SignalRConnectionInfoAttribute : Attribute
+    {
+        [AppSetting(Default = "AzureSignalRConnectionString")]
+        public string ConnectionStringSetting { get; set; }
+        
+        [AutoResolve]
+        public string HubName { get; set; }
+    }
+}
diff --git a/src/SignalRMessage.cs b/src/SignalRServiceExtension/SignalRMessage.cs
similarity index 100%
rename from src/SignalRMessage.cs
rename to src/SignalRServiceExtension/SignalRMessage.cs
diff --git a/src/SignalRMessageAsyncCollector.cs b/src/SignalRServiceExtension/SignalRMessageAsyncCollector.cs
similarity index 100%
rename from src/SignalRMessageAsyncCollector.cs
rename to src/SignalRServiceExtension/SignalRMessageAsyncCollector.cs