wp-net · ThomasPe · Apr 7, 2026 · Apr 7, 2026 · Apr 7, 2026
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -50,4 +50,4 @@ jobs:
         curl --fail http://localhost:8080/wp-json
 
     - name: 'Run Tests: Selfhosted WordPress with JWT-AUTH'
-      run: dotnet test -l "console;verbosity=detailed" WordPressPCL.Tests.Selfhosted/WordPressPCL.Tests.Selfhosted.csproj -s WordPressPCL.Tests.Selfhosted/jwtauth.runsettings
+      run: dotnet test -l "console;verbosity=detailed" tests/WordPressPCL.Tests.Selfhosted/WordPressPCL.Tests.Selfhosted.csproj -s tests/WordPressPCL.Tests.Selfhosted/jwtauth.runsettings
diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       solution: WordPressPCL.sln
-      project: WordPressPCL/WordPressPCL.csproj
+      project: src/WordPressPCL/WordPressPCL.csproj
       release_tag: ${{ github.event.release.tag_name }}
 
     steps:

diff --git a/.gitignore b/.gitignore
@@ -254,4 +254,4 @@ WordPressPCL.Tests.Selfhosted/Utility/ApiCredentials.cs
 WordPressPCL.Tests.Selfhosted/Utility/ApiCredentials.cs
 WordPressPCL.Tests.Hosted/Utility/ApiCredentials.cs
 WordPressPCL.Tests.Selfhosted/Utility/ApiCredentials.cs
-WordPressPCL.Tests.Selfhosted/Utility/ApiCredentials.cs
+WordPressPCL.Tests.Selfhosted/Utility/ApiCredentials.cssite/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,81 @@
+# Contributing to WordPressPCL
+
+Thank you for your interest in contributing! This guide explains how to set up a development environment, run the tests, and submit changes.
+
+## Repository layout
+
+```
+WordPressPCL/
+├── src/
+│   └── WordPressPCL/          # Library source code
+├── tests/
+│   ├── WordPressPCL.Tests.Selfhosted/   # Integration tests against a local Docker WordPress
+│   └── WordPressPCL.Tests.Hosted/       # Smoke tests against a live WordPress instance
+├── docs/
+│   ├── v3/                    # Reference docs for version 3.x
+│   ├── v2/                    # Reference docs for version 2.x
+│   └── v1/                    # Reference docs for version 1.x
+├── dev/                       # Docker Compose setup for local WordPress
+├── WordPressPCL.sln
+├── Directory.Build.props
+├── Directory.Packages.props
+├── CHANGELOG.md
+└── mkdocs.yml
+```
+
+## Prerequisites
+
+- [.NET 10 SDK](https://dotnet.microsoft.com/download/dotnet/10.0)
+- [Docker and Docker Compose](https://docs.docker.com/get-docker/) (for self-hosted integration tests)
+
+## Building
+
+```bash
+dotnet restore WordPressPCL.sln --disable-parallel
+dotnet build WordPressPCL.sln -c Release --no-restore
+```
+
+## Running tests
+
+### Self-hosted integration tests (recommended for most changes)
+
+The self-hosted tests spin up a local WordPress instance via Docker Compose and run the full test suite against it.
+
+```bash
+# Start the test environment
+cd dev
+docker compose up -d
+
+# Wait for WordPress to be ready (the container creates .wp-tests-ready when done)
+# Then run the tests from the repository root
+cd ..
+dotnet test tests/WordPressPCL.Tests.Selfhosted/WordPressPCL.Tests.Selfhosted.csproj \
+  -s tests/WordPressPCL.Tests.Selfhosted/jwtauth.runsettings \
+  -l "console;verbosity=detailed"
+```
+
+For full setup instructions, including plugin requirements and run-settings options, see [`dev/install.md`](dev/install.md).
+
+### Hosted tests
+
+The hosted tests run against a live WordPress site. They depend on specific content and credentials and may fail for environment reasons unrelated to your change. They are mainly used in CI and are not required for local development.
+
+## Code style
+
+Please follow the [Microsoft C# coding guidelines](https://learn.microsoft.com/dotnet/csharp/fundamentals/coding-style/coding-conventions). Nullable reference types are enabled solution-wide — do not suppress nullable warnings without a clear justification.
+
+## Submitting a pull request
+
+1. **Open an issue first.** Describe the feature or bug so we can discuss whether it is in scope and avoid duplicate work.
+2. Fork the repository and create a branch from `main`.
+3. Make your changes. Add or update tests to cover any new or modified behaviour.
+4. Run the build and self-hosted tests to verify nothing is broken.
+5. Open a pull request against `main`. Reference the related issue in the description.
+
+## Reporting bugs
+
+Please [open an issue](https://github.com/wp-net/WordPressPCL/issues) with a clear description, the version of WordPressPCL you are using, and a minimal reproduction.
+
+## Code of conduct
+
+This project follows the [Contributor Covenant Code of Conduct](CODE_OF_CONDUCT.md). By participating you agree to abide by its terms.
diff --git a/README.md b/README.md
@@ -44,9 +44,9 @@ WordPressPCL uses GitHub Releases as the source of truth for publishing new pack
 WordPressPCL 3.0 targets .NET 10 only. Upgrading from 2.x is a breaking change and requires applications and test environments to move to the .NET 10 SDK/runtime before restoring, building, or running tests.
 
 ## Versioned Reference Docs
-- [Version 3.x reference docs](docs/I%20version%203.x/index.md)
-- [Version 2.x reference docs](docs/II%20version%202.x/index.md)
-- [Version 1.x reference docs](docs/III%20version%201.x/index.md)
+- [Version 3.x reference docs](docs/v3/index.md)
+- [Version 2.x reference docs](docs/v2/index.md)
+- [Version 1.x reference docs](docs/v1/index.md)
 
 ## Supported Platforms
 WordPressPCL 3.0 targets .NET 10 and is intended for applications running on the current .NET platform:
@@ -195,7 +195,7 @@ dynamic searchResults = await client.CustomRequest.GetAsync<dynamic>("search?sea
 dynamic customEndpoint = await client.CustomRequest.GetAsync<dynamic>("wc/v3/products", useAuth: true);
 ```
 
-For a fuller endpoint-by-endpoint summary, see [docs/I version 3.x/endpoint-coverage.md](docs/I%20version%203.x/endpoint-coverage.md).
+For a fuller endpoint-by-endpoint summary, see [docs/v3/endpoint-coverage.md](docs/v3/endpoint-coverage.md).
 
 
 ## Additional Features
@@ -204,12 +204,10 @@ For a fuller endpoint-by-endpoint summary, see [docs/I version 3.x/endpoint-cove
 - [HttpResponsePreProcessing](https://github.com/wp-net/WordPressPCL/wiki/HttpResponsePreProcessing): manipulate the API response before deserializing it
 
 ## Contribution Guidelines
-We're very happy to get input from the community on this project! To keep the code clean we ask you to follow a few simple contribution guidelines.
+We're very happy to get input from the community on this project! See [CONTRIBUTING.md](CONTRIBUTING.md) for full details on setting up a development environment, running tests, and submitting pull requests.
 
-First, create an issue describing what feature you want to add or what problem you're trying to solve, just to make sure no one is already working on that. That also gives us a chance to debate whether a feature is within the scope of this project.
-
-Second, please try to stick to the official C# coding guidelines. https://msdn.microsoft.com/en-us/library/ms229002(v=vs.110).aspx
-
-Also, make sure to write some tests covering your new or modified code.
-
-In order to run the tests on local machine please refer to the **install.md** file in the dev directory of the repository. Docker and Docker Compose will be required to run the tests.
+In brief:
+- Open an issue before starting work so we can discuss scope and avoid duplicate effort.
+- Follow the [Microsoft C# coding guidelines](https://learn.microsoft.com/dotnet/csharp/fundamentals/coding-style/coding-conventions).
+- Add or update tests to cover your change.
+- In order to run the tests locally, refer to the [`dev/install.md`](dev/install.md) file and use Docker Compose.
diff --git a/WordPressPCL.sln b/WordPressPCL.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31613.86
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WordPressPCL", "WordPressPCL\WordPressPCL.csproj", "{E34E9B5D-0086-47D8-86A0-359B7D812CFC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WordPressPCL", "src\WordPressPCL\WordPressPCL.csproj", "{E34E9B5D-0086-47D8-86A0-359B7D812CFC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WordPressPCL.Tests.Selfhosted", "WordPressPCL.Tests.Selfhosted\WordPressPCL.Tests.Selfhosted.csproj", "{ECE2EA35-0152-4A27-80A8-567E192832E1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WordPressPCL.Tests.Selfhosted", "tests\WordPressPCL.Tests.Selfhosted\WordPressPCL.Tests.Selfhosted.csproj", "{ECE2EA35-0152-4A27-80A8-567E192832E1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WordPressPCL.Tests.Hosted", "WordPressPCL.Tests.Hosted\WordPressPCL.Tests.Hosted.csproj", "{885149FB-8AE8-42F8-BBFE-59FD5C6B6BBF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WordPressPCL.Tests.Hosted", "tests\WordPressPCL.Tests.Hosted\WordPressPCL.Tests.Hosted.csproj", "{885149FB-8AE8-42F8-BBFE-59FD5C6B6BBF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{58C7E88F-517F-49D0-B9D1-60ABF23B1686}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/docs/index.md b/docs/index.md
@@ -25,9 +25,9 @@ The WordPressPCL API Wrapper is avaiable through [NuGet](https://www.nuget.org/p
 WordPressPCL 3.0 targets .NET 10 only. Upgrading from 2.x is a breaking change and requires applications and test environments to move to the .NET 10 SDK/runtime before restoring, building, or running tests.
 
 ## Versioned Reference Docs
-- [Version 3.x reference docs](I%20version%203.x/index.md)
-- [Version 2.x reference docs](II%20version%202.x/index.md)
-- [Version 1.x reference docs](III%20version%201.x/index.md)
+- [Version 3.x reference docs](v3/index.md)
+- [Version 2.x reference docs](v2/index.md)
+- [Version 1.x reference docs](v1/index.md)
 
 ## Supported Platforms
 WordPressPCL 3.0 targets .NET 10 and is intended for applications running on the current .NET platform:

diff --git a/...ion 1.x/customization/customHttpClient.md → docs/v1/customization/customHttpClient.md b/...ion 1.x/customization/customHttpClient.md → docs/v1/customization/customHttpClient.md
diff --git a/...zation/customJsonSerializationSettings.md → ...zation/customJsonSerializationSettings.md b/...zation/customJsonSerializationSettings.md → ...zation/customJsonSerializationSettings.md
diff --git a/...ersion 1.x/customization/customRequest.md → docs/v1/customization/customRequest.md b/...ersion 1.x/customization/customRequest.md → docs/v1/customization/customRequest.md
diff --git a/...ustomization/httpResponsePreProcessing.md → ...ustomization/httpResponsePreProcessing.md b/...ustomization/httpResponsePreProcessing.md → ...ustomization/httpResponsePreProcessing.md
diff --git a/docs/III version 1.x/entities/categories.md → docs/v1/entities/categories.md b/docs/III version 1.x/entities/categories.md → docs/v1/entities/categories.md
diff --git a/docs/III version 1.x/entities/comments.md → docs/v1/entities/comments.md b/docs/III version 1.x/entities/comments.md → docs/v1/entities/comments.md
diff --git a/...II version 1.x/entities/customPostType.md → docs/v1/entities/customPostType.md b/...II version 1.x/entities/customPostType.md → docs/v1/entities/customPostType.md
diff --git a/docs/III version 1.x/entities/media.md → docs/v1/entities/media.md b/docs/III version 1.x/entities/media.md → docs/v1/entities/media.md
diff --git a/docs/III version 1.x/entities/pages.md → docs/v1/entities/pages.md b/docs/III version 1.x/entities/pages.md → docs/v1/entities/pages.md
diff --git a/docs/III version 1.x/entities/posts.md → docs/v1/entities/posts.md b/docs/III version 1.x/entities/posts.md → docs/v1/entities/posts.md
diff --git a/.../III version 1.x/entities/poststatuses.md → docs/v1/entities/poststatuses.md b/.../III version 1.x/entities/poststatuses.md → docs/v1/entities/poststatuses.md
diff --git a/docs/III version 1.x/entities/posttypes.md → docs/v1/entities/posttypes.md b/docs/III version 1.x/entities/posttypes.md → docs/v1/entities/posttypes.md
diff --git a/docs/III version 1.x/entities/settings.md → docs/v1/entities/settings.md b/docs/III version 1.x/entities/settings.md → docs/v1/entities/settings.md
diff --git a/docs/III version 1.x/entities/tags.md → docs/v1/entities/tags.md b/docs/III version 1.x/entities/tags.md → docs/v1/entities/tags.md
diff --git a/docs/III version 1.x/entities/taxonomies.md → docs/v1/entities/taxonomies.md b/docs/III version 1.x/entities/taxonomies.md → docs/v1/entities/taxonomies.md
diff --git a/docs/III version 1.x/entities/users.md → docs/v1/entities/users.md b/docs/III version 1.x/entities/users.md → docs/v1/entities/users.md
diff --git a/docs/III version 1.x/index.md → docs/v1/index.md b/docs/III version 1.x/index.md → docs/v1/index.md
diff --git a/docs/III version 1.x/troubleshooting.md → docs/v1/troubleshooting.md b/docs/III version 1.x/troubleshooting.md → docs/v1/troubleshooting.md
diff --git a/docs/II version 2.x/breaking-changes.md → docs/v2/breaking-changes.md b/docs/II version 2.x/breaking-changes.md → docs/v2/breaking-changes.md
diff --git a/...ion 2.x/customization/customHttpClient.md → docs/v2/customization/customHttpClient.md b/...ion 2.x/customization/customHttpClient.md → docs/v2/customization/customHttpClient.md
diff --git a/...zation/customJsonSerializationSettings.md → ...zation/customJsonSerializationSettings.md b/...zation/customJsonSerializationSettings.md → ...zation/customJsonSerializationSettings.md
diff --git a/...ersion 2.x/customization/customRequest.md → docs/v2/customization/customRequest.md b/...ersion 2.x/customization/customRequest.md → docs/v2/customization/customRequest.md
diff --git a/...ustomization/httpResponsePreProcessing.md → ...ustomization/httpResponsePreProcessing.md b/...ustomization/httpResponsePreProcessing.md → ...ustomization/httpResponsePreProcessing.md
diff --git a/docs/II version 2.x/entities/categories.md → docs/v2/entities/categories.md b/docs/II version 2.x/entities/categories.md → docs/v2/entities/categories.md
diff --git a/docs/II version 2.x/entities/comments.md → docs/v2/entities/comments.md b/docs/II version 2.x/entities/comments.md → docs/v2/entities/comments.md
diff --git a/...II version 2.x/entities/customPostType.md → docs/v2/entities/customPostType.md b/...II version 2.x/entities/customPostType.md → docs/v2/entities/customPostType.md
diff --git a/docs/II version 2.x/entities/media.md → docs/v2/entities/media.md b/docs/II version 2.x/entities/media.md → docs/v2/entities/media.md
diff --git a/docs/II version 2.x/entities/pages.md → docs/v2/entities/pages.md b/docs/II version 2.x/entities/pages.md → docs/v2/entities/pages.md
diff --git a/docs/II version 2.x/entities/posts.md → docs/v2/entities/posts.md b/docs/II version 2.x/entities/posts.md → docs/v2/entities/posts.md
diff --git a/docs/II version 2.x/entities/poststatuses.md → docs/v2/entities/poststatuses.md b/docs/II version 2.x/entities/poststatuses.md → docs/v2/entities/poststatuses.md
diff --git a/docs/II version 2.x/entities/posttypes.md → docs/v2/entities/posttypes.md b/docs/II version 2.x/entities/posttypes.md → docs/v2/entities/posttypes.md
diff --git a/docs/II version 2.x/entities/settings.md → docs/v2/entities/settings.md b/docs/II version 2.x/entities/settings.md → docs/v2/entities/settings.md
diff --git a/docs/II version 2.x/entities/tags.md → docs/v2/entities/tags.md b/docs/II version 2.x/entities/tags.md → docs/v2/entities/tags.md
diff --git a/docs/II version 2.x/entities/taxonomies.md → docs/v2/entities/taxonomies.md b/docs/II version 2.x/entities/taxonomies.md → docs/v2/entities/taxonomies.md
diff --git a/docs/II version 2.x/entities/users.md → docs/v2/entities/users.md b/docs/II version 2.x/entities/users.md → docs/v2/entities/users.md
diff --git a/docs/II version 2.x/index.md → docs/v2/index.md b/docs/II version 2.x/index.md → docs/v2/index.md
diff --git a/docs/II version 2.x/troubleshooting.md → docs/v2/troubleshooting.md b/docs/II version 2.x/troubleshooting.md → docs/v2/troubleshooting.md
diff --git a/docs/I version 3.x/breaking-changes.md → docs/v3/breaking-changes.md b/docs/I version 3.x/breaking-changes.md → docs/v3/breaking-changes.md
diff --git a/...ion 3.x/customization/customHttpClient.md → docs/v3/customization/customHttpClient.md b/...ion 3.x/customization/customHttpClient.md → docs/v3/customization/customHttpClient.md
diff --git a/...zation/customJsonSerializationSettings.md → ...zation/customJsonSerializationSettings.md b/...zation/customJsonSerializationSettings.md → ...zation/customJsonSerializationSettings.md
diff --git a/...ersion 3.x/customization/customRequest.md → docs/v3/customization/customRequest.md b/...ersion 3.x/customization/customRequest.md → docs/v3/customization/customRequest.md
diff --git a/...ustomization/httpResponsePreProcessing.md → ...ustomization/httpResponsePreProcessing.md b/...ustomization/httpResponsePreProcessing.md → ...ustomization/httpResponsePreProcessing.md
diff --git a/docs/I version 3.x/endpoint-coverage.md → docs/v3/endpoint-coverage.md b/docs/I version 3.x/endpoint-coverage.md → docs/v3/endpoint-coverage.md
diff --git a/docs/I version 3.x/entities/categories.md → docs/v3/entities/categories.md b/docs/I version 3.x/entities/categories.md → docs/v3/entities/categories.md
diff --git a/docs/I version 3.x/entities/comments.md → docs/v3/entities/comments.md b/docs/I version 3.x/entities/comments.md → docs/v3/entities/comments.md
diff --git a/.../I version 3.x/entities/customPostType.md → docs/v3/entities/customPostType.md b/.../I version 3.x/entities/customPostType.md → docs/v3/entities/customPostType.md
diff --git a/docs/I version 3.x/entities/media.md → docs/v3/entities/media.md b/docs/I version 3.x/entities/media.md → docs/v3/entities/media.md
diff --git a/docs/I version 3.x/entities/pages.md → docs/v3/entities/pages.md b/docs/I version 3.x/entities/pages.md → docs/v3/entities/pages.md
diff --git a/docs/I version 3.x/entities/posts.md → docs/v3/entities/posts.md b/docs/I version 3.x/entities/posts.md → docs/v3/entities/posts.md
diff --git a/docs/I version 3.x/entities/poststatuses.md → docs/v3/entities/poststatuses.md b/docs/I version 3.x/entities/poststatuses.md → docs/v3/entities/poststatuses.md
diff --git a/docs/I version 3.x/entities/posttypes.md → docs/v3/entities/posttypes.md b/docs/I version 3.x/entities/posttypes.md → docs/v3/entities/posttypes.md
diff --git a/docs/I version 3.x/entities/settings.md → docs/v3/entities/settings.md b/docs/I version 3.x/entities/settings.md → docs/v3/entities/settings.md
diff --git a/docs/I version 3.x/entities/tags.md → docs/v3/entities/tags.md b/docs/I version 3.x/entities/tags.md → docs/v3/entities/tags.md
diff --git a/docs/I version 3.x/entities/taxonomies.md → docs/v3/entities/taxonomies.md b/docs/I version 3.x/entities/taxonomies.md → docs/v3/entities/taxonomies.md
diff --git a/docs/I version 3.x/entities/users.md → docs/v3/entities/users.md b/docs/I version 3.x/entities/users.md → docs/v3/entities/users.md
diff --git a/docs/I version 3.x/index.md → docs/v3/index.md b/docs/I version 3.x/index.md → docs/v3/index.md
diff --git a/docs/I version 3.x/troubleshooting.md → docs/v3/troubleshooting.md b/docs/I version 3.x/troubleshooting.md → docs/v3/troubleshooting.md
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -1,3 +1,71 @@
 site_name: WordPressPCL
 site_url: https://wp-net.github.io/WordPressPCL/
-theme: readthedocs
+theme: readthedocs
+nav:
+  - Home: index.md
+  - Version 3.x:
+    - Overview: v3/index.md
+    - Breaking Changes: v3/breaking-changes.md
+    - Endpoint Coverage: v3/endpoint-coverage.md
+    - Troubleshooting: v3/troubleshooting.md
+    - Customization:
+      - Custom HttpClient & DI: v3/customization/customHttpClient.md
+      - Custom JSON Settings: v3/customization/customJsonSerializationSettings.md
+      - Custom Request: v3/customization/customRequest.md
+      - HTTP Response Pre-Processing: v3/customization/httpResponsePreProcessing.md
+    - Entities:
+      - Posts: v3/entities/posts.md
+      - Pages: v3/entities/pages.md
+      - Comments: v3/entities/comments.md
+      - Categories: v3/entities/categories.md
+      - Tags: v3/entities/tags.md
+      - Users: v3/entities/users.md
+      - Media: v3/entities/media.md
+      - Taxonomies: v3/entities/taxonomies.md
+      - Post Types: v3/entities/posttypes.md
+      - Post Statuses: v3/entities/poststatuses.md
+      - Settings: v3/entities/settings.md
+      - Custom Post Type: v3/entities/customPostType.md
+  - Version 2.x:
+    - Overview: v2/index.md
+    - Breaking Changes: v2/breaking-changes.md
+    - Troubleshooting: v2/troubleshooting.md
+    - Customization:
+      - Custom HttpClient & DI: v2/customization/customHttpClient.md
+      - Custom JSON Settings: v2/customization/customJsonSerializationSettings.md
+      - Custom Request: v2/customization/customRequest.md
+      - HTTP Response Pre-Processing: v2/customization/httpResponsePreProcessing.md
+    - Entities:
+      - Posts: v2/entities/posts.md
+      - Pages: v2/entities/pages.md
+      - Comments: v2/entities/comments.md
+      - Categories: v2/entities/categories.md
+      - Tags: v2/entities/tags.md
+      - Users: v2/entities/users.md
+      - Media: v2/entities/media.md
+      - Taxonomies: v2/entities/taxonomies.md
+      - Post Types: v2/entities/posttypes.md
+      - Post Statuses: v2/entities/poststatuses.md
+      - Settings: v2/entities/settings.md
+      - Custom Post Type: v2/entities/customPostType.md
+  - Version 1.x:
+    - Overview: v1/index.md
+    - Troubleshooting: v1/troubleshooting.md
+    - Customization:
+      - Custom HttpClient: v1/customization/customHttpClient.md
+      - Custom JSON Settings: v1/customization/customJsonSerializationSettings.md
+      - Custom Request: v1/customization/customRequest.md
+      - HTTP Response Pre-Processing: v1/customization/httpResponsePreProcessing.md
+    - Entities:
+      - Posts: v1/entities/posts.md
+      - Pages: v1/entities/pages.md
+      - Comments: v1/entities/comments.md
+      - Categories: v1/entities/categories.md
+      - Tags: v1/entities/tags.md
+      - Users: v1/entities/users.md
+      - Media: v1/entities/media.md
+      - Taxonomies: v1/entities/taxonomies.md
+      - Post Types: v1/entities/posttypes.md
+      - Post Statuses: v1/entities/poststatuses.md
+      - Settings: v1/entities/settings.md
+      - Custom Post Type: v1/entities/customPostType.md
diff --git a/WordPressPCL/Client/Auth.cs → src/WordPressPCL/Client/Auth.cs b/WordPressPCL/Client/Auth.cs → src/WordPressPCL/Client/Auth.cs
diff --git a/WordPressPCL/Client/CRUDOperation.cs → src/WordPressPCL/Client/CRUDOperation.cs b/WordPressPCL/Client/CRUDOperation.cs → src/WordPressPCL/Client/CRUDOperation.cs
diff --git a/WordPressPCL/Client/Categories.cs → src/WordPressPCL/Client/Categories.cs b/WordPressPCL/Client/Categories.cs → src/WordPressPCL/Client/Categories.cs
diff --git a/WordPressPCL/Client/Comments.cs → src/WordPressPCL/Client/Comments.cs b/WordPressPCL/Client/Comments.cs → src/WordPressPCL/Client/Comments.cs
diff --git a/WordPressPCL/Client/CustomRequest.cs → src/WordPressPCL/Client/CustomRequest.cs b/WordPressPCL/Client/CustomRequest.cs → src/WordPressPCL/Client/CustomRequest.cs
diff --git a/WordPressPCL/Client/Media.cs → src/WordPressPCL/Client/Media.cs b/WordPressPCL/Client/Media.cs → src/WordPressPCL/Client/Media.cs
diff --git a/WordPressPCL/Client/Pages.cs → src/WordPressPCL/Client/Pages.cs b/WordPressPCL/Client/Pages.cs → src/WordPressPCL/Client/Pages.cs
diff --git a/WordPressPCL/Client/Plugins.cs → src/WordPressPCL/Client/Plugins.cs b/WordPressPCL/Client/Plugins.cs → src/WordPressPCL/Client/Plugins.cs
diff --git a/WordPressPCL/Client/PostRevisions.cs → src/WordPressPCL/Client/PostRevisions.cs b/WordPressPCL/Client/PostRevisions.cs → src/WordPressPCL/Client/PostRevisions.cs
diff --git a/WordPressPCL/Client/PostStatuses.cs → src/WordPressPCL/Client/PostStatuses.cs b/WordPressPCL/Client/PostStatuses.cs → src/WordPressPCL/Client/PostStatuses.cs
diff --git a/WordPressPCL/Client/PostTypes.cs → src/WordPressPCL/Client/PostTypes.cs b/WordPressPCL/Client/PostTypes.cs → src/WordPressPCL/Client/PostTypes.cs
diff --git a/WordPressPCL/Client/Posts.cs → src/WordPressPCL/Client/Posts.cs b/WordPressPCL/Client/Posts.cs → src/WordPressPCL/Client/Posts.cs
diff --git a/WordPressPCL/Client/Settings.cs → src/WordPressPCL/Client/Settings.cs b/WordPressPCL/Client/Settings.cs → src/WordPressPCL/Client/Settings.cs
diff --git a/WordPressPCL/Client/Tags.cs → src/WordPressPCL/Client/Tags.cs b/WordPressPCL/Client/Tags.cs → src/WordPressPCL/Client/Tags.cs
diff --git a/WordPressPCL/Client/Taxonomies.cs → src/WordPressPCL/Client/Taxonomies.cs b/WordPressPCL/Client/Taxonomies.cs → src/WordPressPCL/Client/Taxonomies.cs
diff --git a/WordPressPCL/Client/Themes.cs → src/WordPressPCL/Client/Themes.cs b/WordPressPCL/Client/Themes.cs → src/WordPressPCL/Client/Themes.cs
diff --git a/WordPressPCL/Client/Users.cs → src/WordPressPCL/Client/Users.cs b/WordPressPCL/Client/Users.cs → src/WordPressPCL/Client/Users.cs
diff --git a/...n/WordPressServiceCollectionExtensions.cs → ...n/WordPressServiceCollectionExtensions.cs b/...n/WordPressServiceCollectionExtensions.cs → ...n/WordPressServiceCollectionExtensions.cs
diff --git a/WordPressPCL/Images/icon.png → src/WordPressPCL/Images/icon.png b/WordPressPCL/Images/icon.png → src/WordPressPCL/Images/icon.png
diff --git a/WordPressPCL/Interfaces/ICountOperation.cs → ...ordPressPCL/Interfaces/ICountOperation.cs b/WordPressPCL/Interfaces/ICountOperation.cs → ...ordPressPCL/Interfaces/ICountOperation.cs
diff --git a/WordPressPCL/Interfaces/ICreateOperation.cs → ...rdPressPCL/Interfaces/ICreateOperation.cs b/WordPressPCL/Interfaces/ICreateOperation.cs → ...rdPressPCL/Interfaces/ICreateOperation.cs
diff --git a/WordPressPCL/Interfaces/IDeleteOperation.cs → ...rdPressPCL/Interfaces/IDeleteOperation.cs b/WordPressPCL/Interfaces/IDeleteOperation.cs → ...rdPressPCL/Interfaces/IDeleteOperation.cs
diff --git a/WordPressPCL/Interfaces/IQueryOperation.cs → ...ordPressPCL/Interfaces/IQueryOperation.cs b/WordPressPCL/Interfaces/IQueryOperation.cs → ...ordPressPCL/Interfaces/IQueryOperation.cs
diff --git a/WordPressPCL/Interfaces/IReadOperation.cs → ...WordPressPCL/Interfaces/IReadOperation.cs b/WordPressPCL/Interfaces/IReadOperation.cs → ...WordPressPCL/Interfaces/IReadOperation.cs
diff --git a/WordPressPCL/Interfaces/IUpdateOperation.cs → ...rdPressPCL/Interfaces/IUpdateOperation.cs b/WordPressPCL/Interfaces/IUpdateOperation.cs → ...rdPressPCL/Interfaces/IUpdateOperation.cs
diff --git a/WordPressPCL/Models/ApplicationPassword.cs → ...ordPressPCL/Models/ApplicationPassword.cs b/WordPressPCL/Models/ApplicationPassword.cs → ...ordPressPCL/Models/ApplicationPassword.cs
diff --git a/WordPressPCL/Models/AuthMethod.cs → src/WordPressPCL/Models/AuthMethod.cs b/WordPressPCL/Models/AuthMethod.cs → src/WordPressPCL/Models/AuthMethod.cs
diff --git a/WordPressPCL/Models/AvatarURL.cs → src/WordPressPCL/Models/AvatarURL.cs b/WordPressPCL/Models/AvatarURL.cs → src/WordPressPCL/Models/AvatarURL.cs
diff --git a/WordPressPCL/Models/BadRequest.cs → src/WordPressPCL/Models/BadRequest.cs b/WordPressPCL/Models/BadRequest.cs → src/WordPressPCL/Models/BadRequest.cs
diff --git a/WordPressPCL/Models/Base.cs → src/WordPressPCL/Models/Base.cs b/WordPressPCL/Models/Base.cs → src/WordPressPCL/Models/Base.cs
diff --git a/WordPressPCL/Models/Category.cs → src/WordPressPCL/Models/Category.cs b/WordPressPCL/Models/Category.cs → src/WordPressPCL/Models/Category.cs
diff --git a/WordPressPCL/Models/Comment.cs → src/WordPressPCL/Models/Comment.cs b/WordPressPCL/Models/Comment.cs → src/WordPressPCL/Models/Comment.cs
diff --git a/WordPressPCL/Models/CommentThreaded.cs → src/WordPressPCL/Models/CommentThreaded.cs b/WordPressPCL/Models/CommentThreaded.cs → src/WordPressPCL/Models/CommentThreaded.cs
diff --git a/WordPressPCL/Models/Embedded.cs → src/WordPressPCL/Models/Embedded.cs b/WordPressPCL/Models/Embedded.cs → src/WordPressPCL/Models/Embedded.cs
diff --git a/WordPressPCL/Models/Enums.cs → src/WordPressPCL/Models/Enums.cs b/WordPressPCL/Models/Enums.cs → src/WordPressPCL/Models/Enums.cs
diff --git a/...PressPCL/Models/Exceptions/WPException.cs → ...PressPCL/Models/Exceptions/WPException.cs b/...PressPCL/Models/Exceptions/WPException.cs → ...PressPCL/Models/Exceptions/WPException.cs
diff --git a/...odels/Exceptions/WPUnexpectedException.cs → ...odels/Exceptions/WPUnexpectedException.cs b/...odels/Exceptions/WPUnexpectedException.cs → ...odels/Exceptions/WPUnexpectedException.cs
diff --git a/WordPressPCL/Models/ImageMeta.cs → src/WordPressPCL/Models/ImageMeta.cs b/WordPressPCL/Models/ImageMeta.cs → src/WordPressPCL/Models/ImageMeta.cs
diff --git a/WordPressPCL/Models/JWTData.cs → src/WordPressPCL/Models/JWTData.cs b/WordPressPCL/Models/JWTData.cs → src/WordPressPCL/Models/JWTData.cs
diff --git a/WordPressPCL/Models/JWTPlugin.cs → src/WordPressPCL/Models/JWTPlugin.cs b/WordPressPCL/Models/JWTPlugin.cs → src/WordPressPCL/Models/JWTPlugin.cs
diff --git a/WordPressPCL/Models/JWTResponse.cs → src/WordPressPCL/Models/JWTResponse.cs b/WordPressPCL/Models/JWTResponse.cs → src/WordPressPCL/Models/JWTResponse.cs
diff --git a/WordPressPCL/Models/JWTUser.cs → src/WordPressPCL/Models/JWTUser.cs b/WordPressPCL/Models/JWTUser.cs → src/WordPressPCL/Models/JWTUser.cs
diff --git a/WordPressPCL/Models/Links.cs → src/WordPressPCL/Models/Links.cs b/WordPressPCL/Models/Links.cs → src/WordPressPCL/Models/Links.cs
diff --git a/WordPressPCL/Models/MediaDetails.cs → src/WordPressPCL/Models/MediaDetails.cs b/WordPressPCL/Models/MediaDetails.cs → src/WordPressPCL/Models/MediaDetails.cs
diff --git a/WordPressPCL/Models/MediaItem.cs → src/WordPressPCL/Models/MediaItem.cs b/WordPressPCL/Models/MediaItem.cs → src/WordPressPCL/Models/MediaItem.cs
diff --git a/WordPressPCL/Models/MediaSize.cs → src/WordPressPCL/Models/MediaSize.cs b/WordPressPCL/Models/MediaSize.cs → src/WordPressPCL/Models/MediaSize.cs
diff --git a/WordPressPCL/Models/Page.cs → src/WordPressPCL/Models/Page.cs b/WordPressPCL/Models/Page.cs → src/WordPressPCL/Models/Page.cs
diff --git a/WordPressPCL/Models/PagedResult.cs → src/WordPressPCL/Models/PagedResult.cs b/WordPressPCL/Models/PagedResult.cs → src/WordPressPCL/Models/PagedResult.cs
diff --git a/WordPressPCL/Models/Plugin.cs → src/WordPressPCL/Models/Plugin.cs b/WordPressPCL/Models/Plugin.cs → src/WordPressPCL/Models/Plugin.cs
diff --git a/WordPressPCL/Models/Post.cs → src/WordPressPCL/Models/Post.cs b/WordPressPCL/Models/Post.cs → src/WordPressPCL/Models/Post.cs
diff --git a/WordPressPCL/Models/PostRevision.cs → src/WordPressPCL/Models/PostRevision.cs b/WordPressPCL/Models/PostRevision.cs → src/WordPressPCL/Models/PostRevision.cs
diff --git a/WordPressPCL/Models/PostStatus.cs → src/WordPressPCL/Models/PostStatus.cs b/WordPressPCL/Models/PostStatus.cs → src/WordPressPCL/Models/PostStatus.cs
diff --git a/WordPressPCL/Models/PostType.cs → src/WordPressPCL/Models/PostType.cs b/WordPressPCL/Models/PostType.cs → src/WordPressPCL/Models/PostType.cs
diff --git a/WordPressPCL/Models/Settings.cs → src/WordPressPCL/Models/Settings.cs b/WordPressPCL/Models/Settings.cs → src/WordPressPCL/Models/Settings.cs
diff --git a/WordPressPCL/Models/Subclasses.cs → src/WordPressPCL/Models/Subclasses.cs b/WordPressPCL/Models/Subclasses.cs → src/WordPressPCL/Models/Subclasses.cs
diff --git a/WordPressPCL/Models/Tag.cs → src/WordPressPCL/Models/Tag.cs b/WordPressPCL/Models/Tag.cs → src/WordPressPCL/Models/Tag.cs
diff --git a/WordPressPCL/Models/Taxonomy.cs → src/WordPressPCL/Models/Taxonomy.cs b/WordPressPCL/Models/Taxonomy.cs → src/WordPressPCL/Models/Taxonomy.cs
diff --git a/WordPressPCL/Models/Term.cs → src/WordPressPCL/Models/Term.cs b/WordPressPCL/Models/Term.cs → src/WordPressPCL/Models/Term.cs
diff --git a/WordPressPCL/Models/Theme.cs → src/WordPressPCL/Models/Theme.cs b/WordPressPCL/Models/Theme.cs → src/WordPressPCL/Models/Theme.cs
diff --git a/WordPressPCL/Models/User.cs → src/WordPressPCL/Models/User.cs b/WordPressPCL/Models/User.cs → src/WordPressPCL/Models/User.cs
diff --git a/...ressPCL/Utility/CategoriesQueryBuilder.cs → ...ressPCL/Utility/CategoriesQueryBuilder.cs b/...ressPCL/Utility/CategoriesQueryBuilder.cs → ...ressPCL/Utility/CategoriesQueryBuilder.cs
diff --git a/WordPressPCL/Utility/CommentsQueryBuilder.cs → ...dPressPCL/Utility/CommentsQueryBuilder.cs b/WordPressPCL/Utility/CommentsQueryBuilder.cs → ...dPressPCL/Utility/CommentsQueryBuilder.cs
diff --git a/...tility/CustomCapabilitiesJsonConverter.cs → ...tility/CustomCapabilitiesJsonConverter.cs b/...tility/CustomCapabilitiesJsonConverter.cs → ...tility/CustomCapabilitiesJsonConverter.cs
diff --git a/...sPCL/Utility/ExcludeQueryTextAttribute.cs → ...sPCL/Utility/ExcludeQueryTextAttribute.cs b/...sPCL/Utility/ExcludeQueryTextAttribute.cs → ...sPCL/Utility/ExcludeQueryTextAttribute.cs
diff --git a/WordPressPCL/Utility/HttpHelper.cs → src/WordPressPCL/Utility/HttpHelper.cs b/WordPressPCL/Utility/HttpHelper.cs → src/WordPressPCL/Utility/HttpHelper.cs
diff --git a/.../Utility/JsonStringEnumMemberConverter.cs → .../Utility/JsonStringEnumMemberConverter.cs b/.../Utility/JsonStringEnumMemberConverter.cs → .../Utility/JsonStringEnumMemberConverter.cs
diff --git a/WordPressPCL/Utility/MediaQueryBuilder.cs → ...WordPressPCL/Utility/MediaQueryBuilder.cs b/WordPressPCL/Utility/MediaQueryBuilder.cs → ...WordPressPCL/Utility/MediaQueryBuilder.cs
diff --git a/WordPressPCL/Utility/MimeTypeHelper.cs → src/WordPressPCL/Utility/MimeTypeHelper.cs b/WordPressPCL/Utility/MimeTypeHelper.cs → src/WordPressPCL/Utility/MimeTypeHelper.cs
diff --git a/WordPressPCL/Utility/PagesQueryBuilder.cs → ...WordPressPCL/Utility/PagesQueryBuilder.cs b/WordPressPCL/Utility/PagesQueryBuilder.cs → ...WordPressPCL/Utility/PagesQueryBuilder.cs
diff --git a/WordPressPCL/Utility/PluginsQueryBuilder.cs → ...rdPressPCL/Utility/PluginsQueryBuilder.cs b/WordPressPCL/Utility/PluginsQueryBuilder.cs → ...rdPressPCL/Utility/PluginsQueryBuilder.cs
diff --git a/WordPressPCL/Utility/PostsQueryBuilder.cs → ...WordPressPCL/Utility/PostsQueryBuilder.cs b/WordPressPCL/Utility/PostsQueryBuilder.cs → ...WordPressPCL/Utility/PostsQueryBuilder.cs
diff --git a/WordPressPCL/Utility/QueryBuilder.cs → src/WordPressPCL/Utility/QueryBuilder.cs b/WordPressPCL/Utility/QueryBuilder.cs → src/WordPressPCL/Utility/QueryBuilder.cs
diff --git a/WordPressPCL/Utility/QueryTextAttribute.cs → ...ordPressPCL/Utility/QueryTextAttribute.cs b/WordPressPCL/Utility/QueryTextAttribute.cs → ...ordPressPCL/Utility/QueryTextAttribute.cs
diff --git a/WordPressPCL/Utility/TagsQueryBuilder.cs → src/WordPressPCL/Utility/TagsQueryBuilder.cs b/WordPressPCL/Utility/TagsQueryBuilder.cs → src/WordPressPCL/Utility/TagsQueryBuilder.cs
diff --git a/...ressPCL/Utility/TaxonomiesQueryBuilder.cs → ...ressPCL/Utility/TaxonomiesQueryBuilder.cs b/...ressPCL/Utility/TaxonomiesQueryBuilder.cs → ...ressPCL/Utility/TaxonomiesQueryBuilder.cs
diff --git a/WordPressPCL/Utility/ThemesQueryBuilder.cs → ...ordPressPCL/Utility/ThemesQueryBuilder.cs b/WordPressPCL/Utility/ThemesQueryBuilder.cs → ...ordPressPCL/Utility/ThemesQueryBuilder.cs
diff --git a/...ressPCL/Utility/ThreadedCommentsHelper.cs → ...ressPCL/Utility/ThreadedCommentsHelper.cs b/...ressPCL/Utility/ThreadedCommentsHelper.cs → ...ressPCL/Utility/ThreadedCommentsHelper.cs
diff --git a/WordPressPCL/Utility/UrlHelper.cs → src/WordPressPCL/Utility/UrlHelper.cs b/WordPressPCL/Utility/UrlHelper.cs → src/WordPressPCL/Utility/UrlHelper.cs
diff --git a/WordPressPCL/Utility/UsersQueryBuilder.cs → ...WordPressPCL/Utility/UsersQueryBuilder.cs b/WordPressPCL/Utility/UsersQueryBuilder.cs → ...WordPressPCL/Utility/UsersQueryBuilder.cs
diff --git a/WordPressPCL/WordPressClient.cs → src/WordPressPCL/WordPressClient.cs b/WordPressPCL/WordPressClient.cs → src/WordPressPCL/WordPressClient.cs
diff --git a/WordPressPCL/WordPressPCL.csproj → src/WordPressPCL/WordPressPCL.csproj b/WordPressPCL/WordPressPCL.csproj → src/WordPressPCL/WordPressPCL.csproj
@@ -32,12 +32,12 @@
     <None Update="icon.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="..\.editorconfig" Link=".editorconfig" />
-    <None Include="..\README.md">
+    <None Include="..\..\editorconfig" Link=".editorconfig" />
+    <None Include="..\..\README.md">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
-    <None Include="..\CHANGELOG.md">
+    <None Include="..\..\CHANGELOG.md">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>

diff --git a/WordPressPCL/WordPressPCL.xml → src/WordPressPCL/WordPressPCL.xml b/WordPressPCL/WordPressPCL.xml → src/WordPressPCL/WordPressPCL.xml
diff --git a/WordPressPCL.Tests.Hosted/Basic_Tests.cs → .../WordPressPCL.Tests.Hosted/Basic_Tests.cs b/WordPressPCL.Tests.Hosted/Basic_Tests.cs → .../WordPressPCL.Tests.Hosted/Basic_Tests.cs
diff --git a/...CL.Tests.Hosted/Utility/ApiCredentials.cs → ...CL.Tests.Hosted/Utility/ApiCredentials.cs b/...CL.Tests.Hosted/Utility/ApiCredentials.cs → ...CL.Tests.Hosted/Utility/ApiCredentials.cs
diff --git a/...sPCL.Tests.Hosted/Utility/ClientHelper.cs → ...sPCL.Tests.Hosted/Utility/ClientHelper.cs b/...sPCL.Tests.Hosted/Utility/ClientHelper.cs → ...sPCL.Tests.Hosted/Utility/ClientHelper.cs
diff --git a/....Tests.Hosted/Utility/HttpHelper_Tests.cs → ....Tests.Hosted/Utility/HttpHelper_Tests.cs b/....Tests.Hosted/Utility/HttpHelper_Tests.cs → ....Tests.Hosted/Utility/HttpHelper_Tests.cs
diff --git a/....Tests.Hosted/WordPressClient_DI_Tests.cs → ....Tests.Hosted/WordPressClient_DI_Tests.cs b/....Tests.Hosted/WordPressClient_DI_Tests.cs → ....Tests.Hosted/WordPressClient_DI_Tests.cs
diff --git a/...ts.Hosted/WordPressClient_Logger_Tests.cs → ...ts.Hosted/WordPressClient_Logger_Tests.cs b/...ts.Hosted/WordPressClient_Logger_Tests.cs → ...ts.Hosted/WordPressClient_Logger_Tests.cs
diff --git a/...s.Hosted/WordPressPCL.Tests.Hosted.csproj → ...s.Hosted/WordPressPCL.Tests.Hosted.csproj b/...s.Hosted/WordPressPCL.Tests.Hosted.csproj → ...s.Hosted/WordPressPCL.Tests.Hosted.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\WordPressPCL\WordPressPCL.csproj" />
+    <ProjectReference Include="..\..\src\WordPressPCL\WordPressPCL.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/....Selfhosted/ApplicationPasswords_Tests.cs → ....Selfhosted/ApplicationPasswords_Tests.cs b/....Selfhosted/ApplicationPasswords_Tests.cs → ....Selfhosted/ApplicationPasswords_Tests.cs
diff --git a/WordPressPCL.Tests.Selfhosted/Assets/cat.jpg → ...dPressPCL.Tests.Selfhosted/Assets/cat.jpg b/WordPressPCL.Tests.Selfhosted/Assets/cat.jpg → ...dPressPCL.Tests.Selfhosted/Assets/cat.jpg
diff --git a/...ests.Selfhosted/Assets/img_exif_error.jpg → ...ests.Selfhosted/Assets/img_exif_error.jpg b/...ests.Selfhosted/Assets/img_exif_error.jpg → ...ests.Selfhosted/Assets/img_exif_error.jpg
diff --git a/WordPressPCL.Tests.Selfhosted/Basic_Tests.cs → ...dPressPCL.Tests.Selfhosted/Basic_Tests.cs b/WordPressPCL.Tests.Selfhosted/Basic_Tests.cs → ...dPressPCL.Tests.Selfhosted/Basic_Tests.cs
diff --git a/...sts.Selfhosted/CancellationToken_Tests.cs → ...sts.Selfhosted/CancellationToken_Tests.cs b/...sts.Selfhosted/CancellationToken_Tests.cs → ...sts.Selfhosted/CancellationToken_Tests.cs
diff --git a/...sPCL.Tests.Selfhosted/Categories_Tests.cs → ...sPCL.Tests.Selfhosted/Categories_Tests.cs b/...sPCL.Tests.Selfhosted/Categories_Tests.cs → ...sPCL.Tests.Selfhosted/Categories_Tests.cs
diff --git a/...ests.Selfhosted/CommentsThreaded_Tests.cs → ...ests.Selfhosted/CommentsThreaded_Tests.cs b/...ests.Selfhosted/CommentsThreaded_Tests.cs → ...ests.Selfhosted/CommentsThreaded_Tests.cs
diff --git a/...essPCL.Tests.Selfhosted/Comments_Tests.cs → ...essPCL.Tests.Selfhosted/Comments_Tests.cs b/...essPCL.Tests.Selfhosted/Comments_Tests.cs → ...essPCL.Tests.Selfhosted/Comments_Tests.cs
diff --git a/....Tests.Selfhosted/CustomRequests_Tests.cs → ....Tests.Selfhosted/CustomRequests_Tests.cs b/....Tests.Selfhosted/CustomRequests_Tests.cs → ....Tests.Selfhosted/CustomRequests_Tests.cs
diff --git a/...essPCL.Tests.Selfhosted/ExceptionTests.cs → ...essPCL.Tests.Selfhosted/ExceptionTests.cs b/...essPCL.Tests.Selfhosted/ExceptionTests.cs → ...essPCL.Tests.Selfhosted/ExceptionTests.cs
diff --git a/....Selfhosted/Exception_Unexpected_Tests.cs → ....Selfhosted/Exception_Unexpected_Tests.cs b/....Selfhosted/Exception_Unexpected_Tests.cs → ....Selfhosted/Exception_Unexpected_Tests.cs
diff --git a/...sPCL.Tests.Selfhosted/HttpClient_Tests.cs → ...sPCL.Tests.Selfhosted/HttpClient_Tests.cs b/...sPCL.Tests.Selfhosted/HttpClient_Tests.cs → ...sPCL.Tests.Selfhosted/HttpClient_Tests.cs
diff --git a/...elfhosted/ListPosts_QueryBuilder_Tests.cs → ...elfhosted/ListPosts_QueryBuilder_Tests.cs b/...elfhosted/ListPosts_QueryBuilder_Tests.cs → ...elfhosted/ListPosts_QueryBuilder_Tests.cs
diff --git a/WordPressPCL.Tests.Selfhosted/Media_Tests.cs → ...dPressPCL.Tests.Selfhosted/Media_Tests.cs b/WordPressPCL.Tests.Selfhosted/Media_Tests.cs → ...dPressPCL.Tests.Selfhosted/Media_Tests.cs
diff --git a/....Tests.Selfhosted/MimeTypeHelper_Tests.cs → ....Tests.Selfhosted/MimeTypeHelper_Tests.cs b/....Tests.Selfhosted/MimeTypeHelper_Tests.cs → ....Tests.Selfhosted/MimeTypeHelper_Tests.cs
diff --git a/...CL.Tests.Selfhosted/NullHandling_Tests.cs → ...CL.Tests.Selfhosted/NullHandling_Tests.cs b/...CL.Tests.Selfhosted/NullHandling_Tests.cs → ...CL.Tests.Selfhosted/NullHandling_Tests.cs
diff --git a/WordPressPCL.Tests.Selfhosted/Pages_Tests.cs → ...dPressPCL.Tests.Selfhosted/Pages_Tests.cs b/WordPressPCL.Tests.Selfhosted/Pages_Tests.cs → ...dPressPCL.Tests.Selfhosted/Pages_Tests.cs
diff --git a/...ressPCL.Tests.Selfhosted/Plugins_Tests.cs → ...ressPCL.Tests.Selfhosted/Plugins_Tests.cs b/...ressPCL.Tests.Selfhosted/Plugins_Tests.cs → ...ressPCL.Tests.Selfhosted/Plugins_Tests.cs
diff --git a/...L.Tests.Selfhosted/PostRevisions_Tests.cs → ...L.Tests.Selfhosted/PostRevisions_Tests.cs b/...L.Tests.Selfhosted/PostRevisions_Tests.cs → ...L.Tests.Selfhosted/PostRevisions_Tests.cs
diff --git a/...CL.Tests.Selfhosted/PostStatuses_Tests.cs → ...CL.Tests.Selfhosted/PostStatuses_Tests.cs b/...CL.Tests.Selfhosted/PostStatuses_Tests.cs → ...CL.Tests.Selfhosted/PostStatuses_Tests.cs
diff --git a/...ssPCL.Tests.Selfhosted/PostTypes_Tests.cs → ...ssPCL.Tests.Selfhosted/PostTypes_Tests.cs b/...ssPCL.Tests.Selfhosted/PostTypes_Tests.cs → ...ssPCL.Tests.Selfhosted/PostTypes_Tests.cs
diff --git a/WordPressPCL.Tests.Selfhosted/Posts_Tests.cs → ...dPressPCL.Tests.Selfhosted/Posts_Tests.cs b/WordPressPCL.Tests.Selfhosted/Posts_Tests.cs → ...dPressPCL.Tests.Selfhosted/Posts_Tests.cs
diff --git a/...CL.Tests.Selfhosted/QueryBuilder_Tests.cs → ...CL.Tests.Selfhosted/QueryBuilder_Tests.cs b/...CL.Tests.Selfhosted/QueryBuilder_Tests.cs → ...CL.Tests.Selfhosted/QueryBuilder_Tests.cs
diff --git a/...essPCL.Tests.Selfhosted/Settings_Tests.cs → ...essPCL.Tests.Selfhosted/Settings_Tests.cs b/...essPCL.Tests.Selfhosted/Settings_Tests.cs → ...essPCL.Tests.Selfhosted/Settings_Tests.cs
diff --git a/WordPressPCL.Tests.Selfhosted/Tag_Tests.cs → ...ordPressPCL.Tests.Selfhosted/Tag_Tests.cs b/WordPressPCL.Tests.Selfhosted/Tag_Tests.cs → ...ordPressPCL.Tests.Selfhosted/Tag_Tests.cs
diff --git a/...sPCL.Tests.Selfhosted/Taxonomies_Tests.cs → ...sPCL.Tests.Selfhosted/Taxonomies_Tests.cs b/...sPCL.Tests.Selfhosted/Taxonomies_Tests.cs → ...sPCL.Tests.Selfhosted/Taxonomies_Tests.cs
diff --git a/...PressPCL.Tests.Selfhosted/Themes_Tests.cs → ...PressPCL.Tests.Selfhosted/Themes_Tests.cs b/...PressPCL.Tests.Selfhosted/Themes_Tests.cs → ...PressPCL.Tests.Selfhosted/Themes_Tests.cs
diff --git a/WordPressPCL.Tests.Selfhosted/User_Tests.cs → ...rdPressPCL.Tests.Selfhosted/User_Tests.cs b/WordPressPCL.Tests.Selfhosted/User_Tests.cs → ...rdPressPCL.Tests.Selfhosted/User_Tests.cs
diff --git a/...ests.Selfhosted/Utility/ApiCredentials.cs → ...ests.Selfhosted/Utility/ApiCredentials.cs b/...ests.Selfhosted/Utility/ApiCredentials.cs → ...ests.Selfhosted/Utility/ApiCredentials.cs
diff --git a/...tility/CapabilitiesJsonConverter_Tests.cs → ...tility/CapabilitiesJsonConverter_Tests.cs b/...tility/CapabilitiesJsonConverter_Tests.cs → ...tility/CapabilitiesJsonConverter_Tests.cs
diff --git a/....Tests.Selfhosted/Utility/ClientHelper.cs → ....Tests.Selfhosted/Utility/ClientHelper.cs b/....Tests.Selfhosted/Utility/ClientHelper.cs → ....Tests.Selfhosted/Utility/ClientHelper.cs
diff --git a/...ts.Selfhosted/Utility/HttpHelper_Tests.cs → ...ts.Selfhosted/Utility/HttpHelper_Tests.cs b/...ts.Selfhosted/Utility/HttpHelper_Tests.cs → ...ts.Selfhosted/Utility/HttpHelper_Tests.cs
diff --git a/...d/Utility/ThreadedCommentsHelper_Tests.cs → ...d/Utility/ThreadedCommentsHelper_Tests.cs b/...d/Utility/ThreadedCommentsHelper_Tests.cs → ...d/Utility/ThreadedCommentsHelper_Tests.cs
diff --git a/...sts.Selfhosted/Utility/UrlHelper_Tests.cs → ...sts.Selfhosted/Utility/UrlHelper_Tests.cs b/...sts.Selfhosted/Utility/UrlHelper_Tests.cs → ...sts.Selfhosted/Utility/UrlHelper_Tests.cs
diff --git a/...sted/WordPressPCL.Tests.Selfhosted.csproj → ...sted/WordPressPCL.Tests.Selfhosted.csproj b/...sted/WordPressPCL.Tests.Selfhosted.csproj → ...sted/WordPressPCL.Tests.Selfhosted.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\WordPressPCL\WordPressPCL.csproj" />
+    <ProjectReference Include="..\..\src\WordPressPCL\WordPressPCL.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...PressPCL.Tests.Selfhosted/jwt.runsettings → ...PressPCL.Tests.Selfhosted/jwt.runsettings b/...PressPCL.Tests.Selfhosted/jwt.runsettings → ...PressPCL.Tests.Selfhosted/jwt.runsettings
diff --git a/...sPCL.Tests.Selfhosted/jwtauth.runsettings → ...sPCL.Tests.Selfhosted/jwtauth.runsettings b/...sPCL.Tests.Selfhosted/jwtauth.runsettings → ...sPCL.Tests.Selfhosted/jwtauth.runsettings