diff --git a/README.md b/README.md
index 2a33ba83..0761c4c4 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ A C# .NET version based on https://github.com/alexvictoor/WireMock which tries t
[](https://ci.appveyor.com/project/StefH/wiremock-net)
-[](https://www.nuget.org/packages/System.Linq.Dynamic.Core)
+[](https://www.nuget.org/packages/WireMock.Net)
Based on class HttpListener from the .net framework, it is very lightweight and have no external dependencies.
diff --git a/WireMock.Net Solution.sln b/WireMock.Net Solution.sln
index b1cd1593..1b15f224 100644
--- a/WireMock.Net Solution.sln
+++ b/WireMock.Net Solution.sln
@@ -12,7 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
README.md = README.md
EndProjectSection
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WireMock", "src\WireMock\WireMock.xproj", "{D3804228-91F4-4502-9595-39584E5A01AD}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WireMock", "src\WireMock.Net\WireMock.Net.xproj", "{D3804228-91F4-4502-9595-39584E5A01AD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{F0C22C47-DF71-463C-9B04-B4E0F3B8708A}"
EndProject
diff --git a/examples/WireMock.Net.ConsoleApplication/WireMock.Net.ConsoleApplication.csproj b/examples/WireMock.Net.ConsoleApplication/WireMock.Net.ConsoleApplication.csproj
index 0b2e0676..752e1dd9 100644
--- a/examples/WireMock.Net.ConsoleApplication/WireMock.Net.ConsoleApplication.csproj
+++ b/examples/WireMock.Net.ConsoleApplication/WireMock.Net.ConsoleApplication.csproj
@@ -40,7 +40,7 @@
- ..\..\src\WireMock\bin\$(Configuration)\net45\WireMock.dll
+ ..\..\src\WireMock.Net\bin\$(Configuration)\net45\WireMock.dll
diff --git a/src/WireMock/Admin/BodyModel.cs b/src/WireMock.Net/Admin/BodyModel.cs
similarity index 100%
rename from src/WireMock/Admin/BodyModel.cs
rename to src/WireMock.Net/Admin/BodyModel.cs
diff --git a/src/WireMock/Admin/CookieModel.cs b/src/WireMock.Net/Admin/CookieModel.cs
similarity index 100%
rename from src/WireMock/Admin/CookieModel.cs
rename to src/WireMock.Net/Admin/CookieModel.cs
diff --git a/src/WireMock/Admin/FuncModel.cs b/src/WireMock.Net/Admin/FuncModel.cs
similarity index 100%
rename from src/WireMock/Admin/FuncModel.cs
rename to src/WireMock.Net/Admin/FuncModel.cs
diff --git a/src/WireMock/Admin/HeaderModel.cs b/src/WireMock.Net/Admin/HeaderModel.cs
similarity index 100%
rename from src/WireMock/Admin/HeaderModel.cs
rename to src/WireMock.Net/Admin/HeaderModel.cs
diff --git a/src/WireMock/Admin/MappingModel.cs b/src/WireMock.Net/Admin/MappingModel.cs
similarity index 100%
rename from src/WireMock/Admin/MappingModel.cs
rename to src/WireMock.Net/Admin/MappingModel.cs
diff --git a/src/WireMock/Admin/MatcherModel.cs b/src/WireMock.Net/Admin/MatcherModel.cs
similarity index 100%
rename from src/WireMock/Admin/MatcherModel.cs
rename to src/WireMock.Net/Admin/MatcherModel.cs
diff --git a/src/WireMock/Admin/ParamModel.cs b/src/WireMock.Net/Admin/ParamModel.cs
similarity index 100%
rename from src/WireMock/Admin/ParamModel.cs
rename to src/WireMock.Net/Admin/ParamModel.cs
diff --git a/src/WireMock/Admin/RequestModel.cs b/src/WireMock.Net/Admin/RequestModel.cs
similarity index 100%
rename from src/WireMock/Admin/RequestModel.cs
rename to src/WireMock.Net/Admin/RequestModel.cs
diff --git a/src/WireMock/Admin/ResponseModel.cs b/src/WireMock.Net/Admin/ResponseModel.cs
similarity index 100%
rename from src/WireMock/Admin/ResponseModel.cs
rename to src/WireMock.Net/Admin/ResponseModel.cs
diff --git a/src/WireMock/Admin/UrlModel.cs b/src/WireMock.Net/Admin/UrlModel.cs
similarity index 100%
rename from src/WireMock/Admin/UrlModel.cs
rename to src/WireMock.Net/Admin/UrlModel.cs
diff --git a/src/WireMock/DynamicResponseProvider.cs b/src/WireMock.Net/DynamicResponseProvider.cs
similarity index 100%
rename from src/WireMock/DynamicResponseProvider.cs
rename to src/WireMock.Net/DynamicResponseProvider.cs
diff --git a/src/WireMock/Extensions/DictionaryExtensions.cs b/src/WireMock.Net/Extensions/DictionaryExtensions.cs
similarity index 100%
rename from src/WireMock/Extensions/DictionaryExtensions.cs
rename to src/WireMock.Net/Extensions/DictionaryExtensions.cs
diff --git a/src/WireMock/Http/Ports.cs b/src/WireMock.Net/Http/Ports.cs
similarity index 100%
rename from src/WireMock/Http/Ports.cs
rename to src/WireMock.Net/Http/Ports.cs
diff --git a/src/WireMock/Http/TinyHttpServer.cs b/src/WireMock.Net/Http/TinyHttpServer.cs
similarity index 100%
rename from src/WireMock/Http/TinyHttpServer.cs
rename to src/WireMock.Net/Http/TinyHttpServer.cs
diff --git a/src/WireMock/HttpListenerRequestMapper.cs b/src/WireMock.Net/HttpListenerRequestMapper.cs
similarity index 100%
rename from src/WireMock/HttpListenerRequestMapper.cs
rename to src/WireMock.Net/HttpListenerRequestMapper.cs
diff --git a/src/WireMock/HttpListenerResponseMapper.cs b/src/WireMock.Net/HttpListenerResponseMapper.cs
similarity index 100%
rename from src/WireMock/HttpListenerResponseMapper.cs
rename to src/WireMock.Net/HttpListenerResponseMapper.cs
diff --git a/src/WireMock/IResponseProvider.cs b/src/WireMock.Net/IResponseProvider.cs
similarity index 100%
rename from src/WireMock/IResponseProvider.cs
rename to src/WireMock.Net/IResponseProvider.cs
diff --git a/src/WireMock/Mapping.cs b/src/WireMock.Net/Mapping.cs
similarity index 100%
rename from src/WireMock/Mapping.cs
rename to src/WireMock.Net/Mapping.cs
diff --git a/src/WireMock/Matchers/IMatcher.cs b/src/WireMock.Net/Matchers/IMatcher.cs
similarity index 100%
rename from src/WireMock/Matchers/IMatcher.cs
rename to src/WireMock.Net/Matchers/IMatcher.cs
diff --git a/src/WireMock/Matchers/JSONPathMatcher.cs b/src/WireMock.Net/Matchers/JSONPathMatcher.cs
similarity index 100%
rename from src/WireMock/Matchers/JSONPathMatcher.cs
rename to src/WireMock.Net/Matchers/JSONPathMatcher.cs
diff --git a/src/WireMock/Matchers/RegexMatcher.cs b/src/WireMock.Net/Matchers/RegexMatcher.cs
similarity index 100%
rename from src/WireMock/Matchers/RegexMatcher.cs
rename to src/WireMock.Net/Matchers/RegexMatcher.cs
diff --git a/src/WireMock/Matchers/Request/CompositeMatcherType.cs b/src/WireMock.Net/Matchers/Request/CompositeMatcherType.cs
similarity index 100%
rename from src/WireMock/Matchers/Request/CompositeMatcherType.cs
rename to src/WireMock.Net/Matchers/Request/CompositeMatcherType.cs
diff --git a/src/WireMock/Matchers/Request/IRequestMatcher.cs b/src/WireMock.Net/Matchers/Request/IRequestMatcher.cs
similarity index 100%
rename from src/WireMock/Matchers/Request/IRequestMatcher.cs
rename to src/WireMock.Net/Matchers/Request/IRequestMatcher.cs
diff --git a/src/WireMock/Matchers/Request/RequestMessageBodyMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
similarity index 100%
rename from src/WireMock/Matchers/Request/RequestMessageBodyMatcher.cs
rename to src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
diff --git a/src/WireMock/Matchers/Request/RequestMessageCompositeMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageCompositeMatcher.cs
similarity index 100%
rename from src/WireMock/Matchers/Request/RequestMessageCompositeMatcher.cs
rename to src/WireMock.Net/Matchers/Request/RequestMessageCompositeMatcher.cs
diff --git a/src/WireMock/Matchers/Request/RequestMessageCookieMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageCookieMatcher.cs
similarity index 100%
rename from src/WireMock/Matchers/Request/RequestMessageCookieMatcher.cs
rename to src/WireMock.Net/Matchers/Request/RequestMessageCookieMatcher.cs
diff --git a/src/WireMock/Matchers/Request/RequestMessageHeaderMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs
similarity index 100%
rename from src/WireMock/Matchers/Request/RequestMessageHeaderMatcher.cs
rename to src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs
diff --git a/src/WireMock/Matchers/Request/RequestMessageParamMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs
similarity index 100%
rename from src/WireMock/Matchers/Request/RequestMessageParamMatcher.cs
rename to src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs
diff --git a/src/WireMock/Matchers/Request/RequestMessagePathMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessagePathMatcher.cs
similarity index 100%
rename from src/WireMock/Matchers/Request/RequestMessagePathMatcher.cs
rename to src/WireMock.Net/Matchers/Request/RequestMessagePathMatcher.cs
diff --git a/src/WireMock/Matchers/Request/RequestMessageUrlMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageUrlMatcher.cs
similarity index 100%
rename from src/WireMock/Matchers/Request/RequestMessageUrlMatcher.cs
rename to src/WireMock.Net/Matchers/Request/RequestMessageUrlMatcher.cs
diff --git a/src/WireMock/Matchers/Request/RequestMessageVerbMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageVerbMatcher.cs
similarity index 100%
rename from src/WireMock/Matchers/Request/RequestMessageVerbMatcher.cs
rename to src/WireMock.Net/Matchers/Request/RequestMessageVerbMatcher.cs
diff --git a/src/WireMock/Matchers/WildcardMatcher.cs b/src/WireMock.Net/Matchers/WildcardMatcher.cs
similarity index 100%
rename from src/WireMock/Matchers/WildcardMatcher.cs
rename to src/WireMock.Net/Matchers/WildcardMatcher.cs
diff --git a/src/WireMock/Matchers/XPathMatcher.cs b/src/WireMock.Net/Matchers/XPathMatcher.cs
similarity index 100%
rename from src/WireMock/Matchers/XPathMatcher.cs
rename to src/WireMock.Net/Matchers/XPathMatcher.cs
diff --git a/src/WireMock/RequestBuilders/IBodyRequestBuilder.cs b/src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs
similarity index 100%
rename from src/WireMock/RequestBuilders/IBodyRequestBuilder.cs
rename to src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs
diff --git a/src/WireMock/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs b/src/WireMock.Net/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs
similarity index 100%
rename from src/WireMock/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs
rename to src/WireMock.Net/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs
diff --git a/src/WireMock/RequestBuilders/IParamsRequestBuilder.cs b/src/WireMock.Net/RequestBuilders/IParamsRequestBuilder.cs
similarity index 100%
rename from src/WireMock/RequestBuilders/IParamsRequestBuilder.cs
rename to src/WireMock.Net/RequestBuilders/IParamsRequestBuilder.cs
diff --git a/src/WireMock/RequestBuilders/IRequestBuilder.cs b/src/WireMock.Net/RequestBuilders/IRequestBuilder.cs
similarity index 100%
rename from src/WireMock/RequestBuilders/IRequestBuilder.cs
rename to src/WireMock.Net/RequestBuilders/IRequestBuilder.cs
diff --git a/src/WireMock/RequestBuilders/IUrlAndPathRequestBuilder.cs b/src/WireMock.Net/RequestBuilders/IUrlAndPathRequestBuilder.cs
similarity index 100%
rename from src/WireMock/RequestBuilders/IUrlAndPathRequestBuilder.cs
rename to src/WireMock.Net/RequestBuilders/IUrlAndPathRequestBuilder.cs
diff --git a/src/WireMock/RequestBuilders/IVerbRequestBuilder.cs b/src/WireMock.Net/RequestBuilders/IVerbRequestBuilder.cs
similarity index 100%
rename from src/WireMock/RequestBuilders/IVerbRequestBuilder.cs
rename to src/WireMock.Net/RequestBuilders/IVerbRequestBuilder.cs
diff --git a/src/WireMock/RequestBuilders/Request.cs b/src/WireMock.Net/RequestBuilders/Request.cs
similarity index 100%
rename from src/WireMock/RequestBuilders/Request.cs
rename to src/WireMock.Net/RequestBuilders/Request.cs
diff --git a/src/WireMock/RequestMessage.cs b/src/WireMock.Net/RequestMessage.cs
similarity index 100%
rename from src/WireMock/RequestMessage.cs
rename to src/WireMock.Net/RequestMessage.cs
diff --git a/src/WireMock/ResponseBuilders/IBodyResponseBuilder.cs b/src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs
similarity index 100%
rename from src/WireMock/ResponseBuilders/IBodyResponseBuilder.cs
rename to src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs
diff --git a/src/WireMock/ResponseBuilders/IDelayResponseBuilder.cs b/src/WireMock.Net/ResponseBuilders/IDelayResponseBuilder.cs
similarity index 100%
rename from src/WireMock/ResponseBuilders/IDelayResponseBuilder.cs
rename to src/WireMock.Net/ResponseBuilders/IDelayResponseBuilder.cs
diff --git a/src/WireMock/ResponseBuilders/IHeadersResponseBuilder.cs b/src/WireMock.Net/ResponseBuilders/IHeadersResponseBuilder.cs
similarity index 100%
rename from src/WireMock/ResponseBuilders/IHeadersResponseBuilder.cs
rename to src/WireMock.Net/ResponseBuilders/IHeadersResponseBuilder.cs
diff --git a/src/WireMock/ResponseBuilders/IResponseBuilder.cs b/src/WireMock.Net/ResponseBuilders/IResponseBuilder.cs
similarity index 100%
rename from src/WireMock/ResponseBuilders/IResponseBuilder.cs
rename to src/WireMock.Net/ResponseBuilders/IResponseBuilder.cs
diff --git a/src/WireMock/ResponseBuilders/IStatusCodeResponseBuilder.cs b/src/WireMock.Net/ResponseBuilders/IStatusCodeResponseBuilder.cs
similarity index 100%
rename from src/WireMock/ResponseBuilders/IStatusCodeResponseBuilder.cs
rename to src/WireMock.Net/ResponseBuilders/IStatusCodeResponseBuilder.cs
diff --git a/src/WireMock/ResponseBuilders/ITransformResponseBuilder.cs b/src/WireMock.Net/ResponseBuilders/ITransformResponseBuilder.cs
similarity index 100%
rename from src/WireMock/ResponseBuilders/ITransformResponseBuilder.cs
rename to src/WireMock.Net/ResponseBuilders/ITransformResponseBuilder.cs
diff --git a/src/WireMock/ResponseBuilders/Response.cs b/src/WireMock.Net/ResponseBuilders/Response.cs
similarity index 100%
rename from src/WireMock/ResponseBuilders/Response.cs
rename to src/WireMock.Net/ResponseBuilders/Response.cs
diff --git a/src/WireMock/ResponseMessage.cs b/src/WireMock.Net/ResponseMessage.cs
similarity index 100%
rename from src/WireMock/ResponseMessage.cs
rename to src/WireMock.Net/ResponseMessage.cs
diff --git a/src/WireMock/RouteRegistrationCallback.cs b/src/WireMock.Net/RouteRegistrationCallback.cs
similarity index 100%
rename from src/WireMock/RouteRegistrationCallback.cs
rename to src/WireMock.Net/RouteRegistrationCallback.cs
diff --git a/src/WireMock/Server/FluentMockServer.Admin.cs b/src/WireMock.Net/Server/FluentMockServer.Admin.cs
similarity index 100%
rename from src/WireMock/Server/FluentMockServer.Admin.cs
rename to src/WireMock.Net/Server/FluentMockServer.Admin.cs
diff --git a/src/WireMock/Server/FluentMockServer.cs b/src/WireMock.Net/Server/FluentMockServer.cs
similarity index 100%
rename from src/WireMock/Server/FluentMockServer.cs
rename to src/WireMock.Net/Server/FluentMockServer.cs
diff --git a/src/WireMock/Server/IRespondWithAProvider.cs b/src/WireMock.Net/Server/IRespondWithAProvider.cs
similarity index 100%
rename from src/WireMock/Server/IRespondWithAProvider.cs
rename to src/WireMock.Net/Server/IRespondWithAProvider.cs
diff --git a/src/WireMock/Server/RespondWithAProvider.cs b/src/WireMock.Net/Server/RespondWithAProvider.cs
similarity index 100%
rename from src/WireMock/Server/RespondWithAProvider.cs
rename to src/WireMock.Net/Server/RespondWithAProvider.cs
diff --git a/src/WireMock/Util/WireMockList.cs b/src/WireMock.Net/Util/WireMockList.cs
similarity index 100%
rename from src/WireMock/Util/WireMockList.cs
rename to src/WireMock.Net/Util/WireMockList.cs
diff --git a/src/WireMock/Validation/Check.cs b/src/WireMock.Net/Validation/Check.cs
similarity index 100%
rename from src/WireMock/Validation/Check.cs
rename to src/WireMock.Net/Validation/Check.cs
diff --git a/src/WireMock/Validation/CoreStrings.cs b/src/WireMock.Net/Validation/CoreStrings.cs
similarity index 100%
rename from src/WireMock/Validation/CoreStrings.cs
rename to src/WireMock.Net/Validation/CoreStrings.cs
diff --git a/src/WireMock/WireMock.xproj b/src/WireMock.Net/WireMock.Net.xproj
similarity index 100%
rename from src/WireMock/WireMock.xproj
rename to src/WireMock.Net/WireMock.Net.xproj
diff --git a/src/WireMock/netstandard1.3.txt b/src/WireMock.Net/netstandard1.3.txt
similarity index 100%
rename from src/WireMock/netstandard1.3.txt
rename to src/WireMock.Net/netstandard1.3.txt
diff --git a/src/WireMock/project.json b/src/WireMock.Net/project.json
similarity index 100%
rename from src/WireMock/project.json
rename to src/WireMock.Net/project.json
diff --git a/src/_build nuget.cmd b/src/_build nuget.cmd
index e8abd854..e21a4ee8 100644
--- a/src/_build nuget.cmd
+++ b/src/_build nuget.cmd
@@ -1,3 +1,3 @@
dotnet restore
-dotnet pack -c Release WireMock\project.json
+dotnet pack -c Release WireMock.Net\project.json
pause
\ No newline at end of file
diff --git a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
index 4d6ea378..66b8fc7c 100644
--- a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
+++ b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
@@ -55,7 +55,7 @@
- ..\..\src\WireMock\bin\$(Configuration)\net45\WireMock.dll
+ ..\..\src\WireMock.Net\bin\$(Configuration)\net45\WireMock.dll