diff --git a/PiwigoDotnet/.idea/.idea.PiwigoDotnet/.idea/.gitignore b/src/.idea/.idea.PiwigoDotnet/.idea/.gitignore
similarity index 100%
rename from PiwigoDotnet/.idea/.idea.PiwigoDotnet/.idea/.gitignore
rename to src/.idea/.idea.PiwigoDotnet/.idea/.gitignore
diff --git a/PiwigoDotnet/.idea/.idea.PiwigoDotnet/.idea/encodings.xml b/src/.idea/.idea.PiwigoDotnet/.idea/encodings.xml
similarity index 100%
rename from PiwigoDotnet/.idea/.idea.PiwigoDotnet/.idea/encodings.xml
rename to src/.idea/.idea.PiwigoDotnet/.idea/encodings.xml
diff --git a/PiwigoDotnet/.idea/.idea.PiwigoDotnet/.idea/indexLayout.xml b/src/.idea/.idea.PiwigoDotnet/.idea/indexLayout.xml
similarity index 100%
rename from PiwigoDotnet/.idea/.idea.PiwigoDotnet/.idea/indexLayout.xml
rename to src/.idea/.idea.PiwigoDotnet/.idea/indexLayout.xml
diff --git a/PiwigoDotnet/.idea/.idea.PiwigoDotnet/.idea/vcs.xml b/src/.idea/.idea.PiwigoDotnet/.idea/vcs.xml
similarity index 100%
rename from PiwigoDotnet/.idea/.idea.PiwigoDotnet/.idea/vcs.xml
rename to src/.idea/.idea.PiwigoDotnet/.idea/vcs.xml
diff --git a/PiwigoDotnet/Piwigo.Client.Autofac/ContainerBuilderExtensions.cs b/src/Piwigo.Client.Autofac/ContainerBuilderExtensions.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Autofac/ContainerBuilderExtensions.cs
rename to src/Piwigo.Client.Autofac/ContainerBuilderExtensions.cs
diff --git a/PiwigoDotnet/Piwigo.Client.Autofac/Piwigo.Client.Autofac.csproj b/src/Piwigo.Client.Autofac/Piwigo.Client.Autofac.csproj
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Autofac/Piwigo.Client.Autofac.csproj
rename to src/Piwigo.Client.Autofac/Piwigo.Client.Autofac.csproj
diff --git a/PiwigoDotnet/Piwigo.Client.Autofac/PiwigoModule.cs b/src/Piwigo.Client.Autofac/PiwigoModule.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Autofac/PiwigoModule.cs
rename to src/Piwigo.Client.Autofac/PiwigoModule.cs
diff --git a/PiwigoDotnet/Piwigo.Client.Cli/Piwigo.Client.Cli.csproj b/src/Piwigo.Client.Cli/Piwigo.Client.Cli.csproj
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Cli/Piwigo.Client.Cli.csproj
rename to src/Piwigo.Client.Cli/Piwigo.Client.Cli.csproj
diff --git a/PiwigoDotnet/Piwigo.Client.Cli/Program.cs b/src/Piwigo.Client.Cli/Program.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Cli/Program.cs
rename to src/Piwigo.Client.Cli/Program.cs
diff --git a/PiwigoDotnet/Piwigo.Client.Tests/AlbumApi.getList.json b/src/Piwigo.Client.Tests/AlbumApi.getList.json
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Tests/AlbumApi.getList.json
rename to src/Piwigo.Client.Tests/AlbumApi.getList.json
diff --git a/PiwigoDotnet/Piwigo.Client.Tests/AlbumApiTests.GetList_should_return_all_existing_albums.verified.txt b/src/Piwigo.Client.Tests/AlbumApiTests.GetList_should_return_all_existing_albums.verified.txt
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Tests/AlbumApiTests.GetList_should_return_all_existing_albums.verified.txt
rename to src/Piwigo.Client.Tests/AlbumApiTests.GetList_should_return_all_existing_albums.verified.txt
diff --git a/PiwigoDotnet/Piwigo.Client.Tests/AlbumApiTests.cs b/src/Piwigo.Client.Tests/AlbumApiTests.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Tests/AlbumApiTests.cs
rename to src/Piwigo.Client.Tests/AlbumApiTests.cs
diff --git a/PiwigoDotnet/Piwigo.Client.Tests/ApiTestsBase.cs b/src/Piwigo.Client.Tests/ApiTestsBase.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Tests/ApiTestsBase.cs
rename to src/Piwigo.Client.Tests/ApiTestsBase.cs
diff --git a/PiwigoDotnet/Piwigo.Client.Tests/ImageApi.getImages.json b/src/Piwigo.Client.Tests/ImageApi.getImages.json
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Tests/ImageApi.getImages.json
rename to src/Piwigo.Client.Tests/ImageApi.getImages.json
diff --git a/PiwigoDotnet/Piwigo.Client.Tests/ImageApi.getInfo.json b/src/Piwigo.Client.Tests/ImageApi.getInfo.json
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Tests/ImageApi.getInfo.json
rename to src/Piwigo.Client.Tests/ImageApi.getInfo.json
diff --git a/PiwigoDotnet/Piwigo.Client.Tests/ImageApiTests.GetImages_should_return_expected_images.verified.txt b/src/Piwigo.Client.Tests/ImageApiTests.GetImages_should_return_expected_images.verified.txt
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Tests/ImageApiTests.GetImages_should_return_expected_images.verified.txt
rename to src/Piwigo.Client.Tests/ImageApiTests.GetImages_should_return_expected_images.verified.txt
diff --git a/PiwigoDotnet/Piwigo.Client.Tests/ImageApiTests.GetInfo_should_pass_request_and_return_data.verified.txt b/src/Piwigo.Client.Tests/ImageApiTests.GetInfo_should_pass_request_and_return_data.verified.txt
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Tests/ImageApiTests.GetInfo_should_pass_request_and_return_data.verified.txt
rename to src/Piwigo.Client.Tests/ImageApiTests.GetInfo_should_pass_request_and_return_data.verified.txt
diff --git a/PiwigoDotnet/Piwigo.Client.Tests/ImageApiTests.cs b/src/Piwigo.Client.Tests/ImageApiTests.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Tests/ImageApiTests.cs
rename to src/Piwigo.Client.Tests/ImageApiTests.cs
diff --git a/PiwigoDotnet/Piwigo.Client.Tests/Piwigo.Client.Tests.csproj b/src/Piwigo.Client.Tests/Piwigo.Client.Tests.csproj
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Tests/Piwigo.Client.Tests.csproj
rename to src/Piwigo.Client.Tests/Piwigo.Client.Tests.csproj
diff --git a/PiwigoDotnet/Piwigo.Client.Tests/SessionApiTests.cs b/src/Piwigo.Client.Tests/SessionApiTests.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Tests/SessionApiTests.cs
rename to src/Piwigo.Client.Tests/SessionApiTests.cs
diff --git a/PiwigoDotnet/Piwigo.Client.Tests/Usings.cs b/src/Piwigo.Client.Tests/Usings.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Tests/Usings.cs
rename to src/Piwigo.Client.Tests/Usings.cs
diff --git a/PiwigoDotnet/Piwigo.Client.Tests/appsettings.json b/src/Piwigo.Client.Tests/appsettings.json
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client.Tests/appsettings.json
rename to src/Piwigo.Client.Tests/appsettings.json
diff --git a/PiwigoDotnet/Piwigo.Client/AlbumApi.cs b/src/Piwigo.Client/AlbumApi.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/AlbumApi.cs
rename to src/Piwigo.Client/AlbumApi.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/Album.cs b/src/Piwigo.Client/Contract/Album.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/Album.cs
rename to src/Piwigo.Client/Contract/Album.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/AlbumAdded.cs b/src/Piwigo.Client/Contract/AlbumAdded.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/AlbumAdded.cs
rename to src/Piwigo.Client/Contract/AlbumAdded.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/AlbumList.cs b/src/Piwigo.Client/Contract/AlbumList.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/AlbumList.cs
rename to src/Piwigo.Client/Contract/AlbumList.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/AlbumOrphans.cs b/src/Piwigo.Client/Contract/AlbumOrphans.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/AlbumOrphans.cs
rename to src/Piwigo.Client/Contract/AlbumOrphans.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/AlbumPosition.cs b/src/Piwigo.Client/Contract/AlbumPosition.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/AlbumPosition.cs
rename to src/Piwigo.Client/Contract/AlbumPosition.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/AlbumStatus.cs b/src/Piwigo.Client/Contract/AlbumStatus.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/AlbumStatus.cs
rename to src/Piwigo.Client/Contract/AlbumStatus.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/CheckFilesResult.cs b/src/Piwigo.Client/Contract/CheckFilesResult.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/CheckFilesResult.cs
rename to src/Piwigo.Client/Contract/CheckFilesResult.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/CheckUpload.cs b/src/Piwigo.Client/Contract/CheckUpload.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/CheckUpload.cs
rename to src/Piwigo.Client/Contract/CheckUpload.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/Comment.cs b/src/Piwigo.Client/Contract/Comment.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/Comment.cs
rename to src/Piwigo.Client/Contract/Comment.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/CommentAdded.cs b/src/Piwigo.Client/Contract/CommentAdded.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/CommentAdded.cs
rename to src/Piwigo.Client/Contract/CommentAdded.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/CommentPagingInfo.cs b/src/Piwigo.Client/Contract/CommentPagingInfo.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/CommentPagingInfo.cs
rename to src/Piwigo.Client/Contract/CommentPagingInfo.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/CommentPost.cs b/src/Piwigo.Client/Contract/CommentPost.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/CommentPost.cs
rename to src/Piwigo.Client/Contract/CommentPost.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/Image.cs b/src/Piwigo.Client/Contract/Image.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/Image.cs
rename to src/Piwigo.Client/Contract/Image.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/ImageAlbum.cs b/src/Piwigo.Client/Contract/ImageAlbum.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/ImageAlbum.cs
rename to src/Piwigo.Client/Contract/ImageAlbum.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/ImageCheckStatus.cs b/src/Piwigo.Client/Contract/ImageCheckStatus.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/ImageCheckStatus.cs
rename to src/Piwigo.Client/Contract/ImageCheckStatus.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/ImageDerivative.cs b/src/Piwigo.Client/Contract/ImageDerivative.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/ImageDerivative.cs
rename to src/Piwigo.Client/Contract/ImageDerivative.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/ImageFilter.cs b/src/Piwigo.Client/Contract/ImageFilter.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/ImageFilter.cs
rename to src/Piwigo.Client/Contract/ImageFilter.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/ImageInfo.cs b/src/Piwigo.Client/Contract/ImageInfo.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/ImageInfo.cs
rename to src/Piwigo.Client/Contract/ImageInfo.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/ImageOrder.cs b/src/Piwigo.Client/Contract/ImageOrder.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/ImageOrder.cs
rename to src/Piwigo.Client/Contract/ImageOrder.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/ImagePagingInfo.cs b/src/Piwigo.Client/Contract/ImagePagingInfo.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/ImagePagingInfo.cs
rename to src/Piwigo.Client/Contract/ImagePagingInfo.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/ImageRating.cs b/src/Piwigo.Client/Contract/ImageRating.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/ImageRating.cs
rename to src/Piwigo.Client/Contract/ImageRating.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/ImageUpload.cs b/src/Piwigo.Client/Contract/ImageUpload.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/ImageUpload.cs
rename to src/Piwigo.Client/Contract/ImageUpload.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/ImageUploaded.cs b/src/Piwigo.Client/Contract/ImageUploaded.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/ImageUploaded.cs
rename to src/Piwigo.Client/Contract/ImageUploaded.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/OrphanImagesDeleted.cs b/src/Piwigo.Client/Contract/OrphanImagesDeleted.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/OrphanImagesDeleted.cs
rename to src/Piwigo.Client/Contract/OrphanImagesDeleted.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/PagedImages.cs b/src/Piwigo.Client/Contract/PagedImages.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/PagedImages.cs
rename to src/Piwigo.Client/Contract/PagedImages.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/PiwigoResponse.cs b/src/Piwigo.Client/Contract/PiwigoResponse.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/PiwigoResponse.cs
rename to src/Piwigo.Client/Contract/PiwigoResponse.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/SessionStatus.cs b/src/Piwigo.Client/Contract/SessionStatus.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/SessionStatus.cs
rename to src/Piwigo.Client/Contract/SessionStatus.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/ThumbnailSize.cs b/src/Piwigo.Client/Contract/ThumbnailSize.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/ThumbnailSize.cs
rename to src/Piwigo.Client/Contract/ThumbnailSize.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Contract/ValueUpdateMode.cs b/src/Piwigo.Client/Contract/ValueUpdateMode.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Contract/ValueUpdateMode.cs
rename to src/Piwigo.Client/Contract/ValueUpdateMode.cs
diff --git a/PiwigoDotnet/Piwigo.Client/DictionaryExtensions.cs b/src/Piwigo.Client/DictionaryExtensions.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/DictionaryExtensions.cs
rename to src/Piwigo.Client/DictionaryExtensions.cs
diff --git a/PiwigoDotnet/Piwigo.Client/FlurlExtensions.cs b/src/Piwigo.Client/FlurlExtensions.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/FlurlExtensions.cs
rename to src/Piwigo.Client/FlurlExtensions.cs
diff --git a/PiwigoDotnet/Piwigo.Client/IAlbumApi.cs b/src/Piwigo.Client/IAlbumApi.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/IAlbumApi.cs
rename to src/Piwigo.Client/IAlbumApi.cs
diff --git a/PiwigoDotnet/Piwigo.Client/IImageApi.cs b/src/Piwigo.Client/IImageApi.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/IImageApi.cs
rename to src/Piwigo.Client/IImageApi.cs
diff --git a/PiwigoDotnet/Piwigo.Client/IPiwigoClient.cs b/src/Piwigo.Client/IPiwigoClient.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/IPiwigoClient.cs
rename to src/Piwigo.Client/IPiwigoClient.cs
diff --git a/PiwigoDotnet/Piwigo.Client/IPiwigoConfiguration.cs b/src/Piwigo.Client/IPiwigoConfiguration.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/IPiwigoConfiguration.cs
rename to src/Piwigo.Client/IPiwigoConfiguration.cs
diff --git a/PiwigoDotnet/Piwigo.Client/IPiwigoContext.cs b/src/Piwigo.Client/IPiwigoContext.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/IPiwigoContext.cs
rename to src/Piwigo.Client/IPiwigoContext.cs
diff --git a/PiwigoDotnet/Piwigo.Client/ISessionApi.cs b/src/Piwigo.Client/ISessionApi.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/ISessionApi.cs
rename to src/Piwigo.Client/ISessionApi.cs
diff --git a/PiwigoDotnet/Piwigo.Client/ITagApi.cs b/src/Piwigo.Client/ITagApi.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/ITagApi.cs
rename to src/Piwigo.Client/ITagApi.cs
diff --git a/PiwigoDotnet/Piwigo.Client/ImageApi.cs b/src/Piwigo.Client/ImageApi.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/ImageApi.cs
rename to src/Piwigo.Client/ImageApi.cs
diff --git a/PiwigoDotnet/Piwigo.Client/Piwigo.Client.csproj b/src/Piwigo.Client/Piwigo.Client.csproj
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/Piwigo.Client.csproj
rename to src/Piwigo.Client/Piwigo.Client.csproj
diff --git a/PiwigoDotnet/Piwigo.Client/PiwigoClient.cs b/src/Piwigo.Client/PiwigoClient.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/PiwigoClient.cs
rename to src/Piwigo.Client/PiwigoClient.cs
diff --git a/PiwigoDotnet/Piwigo.Client/PiwigoConfiguration.cs b/src/Piwigo.Client/PiwigoConfiguration.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/PiwigoConfiguration.cs
rename to src/Piwigo.Client/PiwigoConfiguration.cs
diff --git a/PiwigoDotnet/Piwigo.Client/PiwigoContext.cs b/src/Piwigo.Client/PiwigoContext.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/PiwigoContext.cs
rename to src/Piwigo.Client/PiwigoContext.cs
diff --git a/PiwigoDotnet/Piwigo.Client/PiwigoException.cs b/src/Piwigo.Client/PiwigoException.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/PiwigoException.cs
rename to src/Piwigo.Client/PiwigoException.cs
diff --git a/PiwigoDotnet/Piwigo.Client/SessionApi.cs b/src/Piwigo.Client/SessionApi.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/SessionApi.cs
rename to src/Piwigo.Client/SessionApi.cs
diff --git a/PiwigoDotnet/Piwigo.Client/TagApi.cs b/src/Piwigo.Client/TagApi.cs
similarity index 100%
rename from PiwigoDotnet/Piwigo.Client/TagApi.cs
rename to src/Piwigo.Client/TagApi.cs
diff --git a/PiwigoDotnet/PiwigoDotnet.sln b/src/PiwigoDotnet.sln
similarity index 100%
rename from PiwigoDotnet/PiwigoDotnet.sln
rename to src/PiwigoDotnet.sln
diff --git a/PiwigoDotnet/PiwigoDotnet.sln.DotSettings b/src/PiwigoDotnet.sln.DotSettings
similarity index 100%
rename from PiwigoDotnet/PiwigoDotnet.sln.DotSettings
rename to src/PiwigoDotnet.sln.DotSettings