diff --git a/src/ImageSharp/Formats/WebP/AlphaDecoder.cs b/src/ImageSharp/Formats/Webp/AlphaDecoder.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/AlphaDecoder.cs
rename to src/ImageSharp/Formats/Webp/AlphaDecoder.cs
diff --git a/src/ImageSharp/Formats/WebP/BitReader/BitReaderBase.cs b/src/ImageSharp/Formats/Webp/BitReader/BitReaderBase.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/BitReader/BitReaderBase.cs
rename to src/ImageSharp/Formats/Webp/BitReader/BitReaderBase.cs
diff --git a/src/ImageSharp/Formats/WebP/BitReader/Vp8BitReader.cs b/src/ImageSharp/Formats/Webp/BitReader/Vp8BitReader.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/BitReader/Vp8BitReader.cs
rename to src/ImageSharp/Formats/Webp/BitReader/Vp8BitReader.cs
diff --git a/src/ImageSharp/Formats/WebP/BitReader/Vp8LBitReader.cs b/src/ImageSharp/Formats/Webp/BitReader/Vp8LBitReader.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/BitReader/Vp8LBitReader.cs
rename to src/ImageSharp/Formats/Webp/BitReader/Vp8LBitReader.cs
diff --git a/src/ImageSharp/Formats/WebP/BitWriter/BitWriterBase.cs b/src/ImageSharp/Formats/Webp/BitWriter/BitWriterBase.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/BitWriter/BitWriterBase.cs
rename to src/ImageSharp/Formats/Webp/BitWriter/BitWriterBase.cs
diff --git a/src/ImageSharp/Formats/WebP/BitWriter/Vp8BitWriter.cs b/src/ImageSharp/Formats/Webp/BitWriter/Vp8BitWriter.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/BitWriter/Vp8BitWriter.cs
rename to src/ImageSharp/Formats/Webp/BitWriter/Vp8BitWriter.cs
diff --git a/src/ImageSharp/Formats/WebP/BitWriter/Vp8LBitWriter.cs b/src/ImageSharp/Formats/Webp/BitWriter/Vp8LBitWriter.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/BitWriter/Vp8LBitWriter.cs
rename to src/ImageSharp/Formats/Webp/BitWriter/Vp8LBitWriter.cs
diff --git a/src/ImageSharp/Formats/WebP/EntropyIx.cs b/src/ImageSharp/Formats/Webp/EntropyIx.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/EntropyIx.cs
rename to src/ImageSharp/Formats/Webp/EntropyIx.cs
diff --git a/src/ImageSharp/Formats/WebP/HistoIx.cs b/src/ImageSharp/Formats/Webp/HistoIx.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/HistoIx.cs
rename to src/ImageSharp/Formats/Webp/HistoIx.cs
diff --git a/src/ImageSharp/Formats/WebP/IWebpDecoderOptions.cs b/src/ImageSharp/Formats/Webp/IWebpDecoderOptions.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/IWebpDecoderOptions.cs
rename to src/ImageSharp/Formats/Webp/IWebpDecoderOptions.cs
diff --git a/src/ImageSharp/Formats/WebP/IWebpEncoderOptions.cs b/src/ImageSharp/Formats/Webp/IWebpEncoderOptions.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/IWebpEncoderOptions.cs
rename to src/ImageSharp/Formats/Webp/IWebpEncoderOptions.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/BackwardReferenceEncoder.cs b/src/ImageSharp/Formats/Webp/Lossless/BackwardReferenceEncoder.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/BackwardReferenceEncoder.cs
rename to src/ImageSharp/Formats/Webp/Lossless/BackwardReferenceEncoder.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/ColorCache.cs b/src/ImageSharp/Formats/Webp/Lossless/ColorCache.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/ColorCache.cs
rename to src/ImageSharp/Formats/Webp/Lossless/ColorCache.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/CostCacheInterval.cs b/src/ImageSharp/Formats/Webp/Lossless/CostCacheInterval.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/CostCacheInterval.cs
rename to src/ImageSharp/Formats/Webp/Lossless/CostCacheInterval.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/CostInterval.cs b/src/ImageSharp/Formats/Webp/Lossless/CostInterval.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/CostInterval.cs
rename to src/ImageSharp/Formats/Webp/Lossless/CostInterval.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/CostManager.cs b/src/ImageSharp/Formats/Webp/Lossless/CostManager.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/CostManager.cs
rename to src/ImageSharp/Formats/Webp/Lossless/CostManager.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/CostModel.cs b/src/ImageSharp/Formats/Webp/Lossless/CostModel.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/CostModel.cs
rename to src/ImageSharp/Formats/Webp/Lossless/CostModel.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/CrunchConfig.cs b/src/ImageSharp/Formats/Webp/Lossless/CrunchConfig.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/CrunchConfig.cs
rename to src/ImageSharp/Formats/Webp/Lossless/CrunchConfig.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/CrunchSubConfig.cs b/src/ImageSharp/Formats/Webp/Lossless/CrunchSubConfig.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/CrunchSubConfig.cs
rename to src/ImageSharp/Formats/Webp/Lossless/CrunchSubConfig.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/DominantCostRange.cs b/src/ImageSharp/Formats/Webp/Lossless/DominantCostRange.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/DominantCostRange.cs
rename to src/ImageSharp/Formats/Webp/Lossless/DominantCostRange.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/HTreeGroup.cs b/src/ImageSharp/Formats/Webp/Lossless/HTreeGroup.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/HTreeGroup.cs
rename to src/ImageSharp/Formats/Webp/Lossless/HTreeGroup.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/HistogramBinInfo.cs b/src/ImageSharp/Formats/Webp/Lossless/HistogramBinInfo.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/HistogramBinInfo.cs
rename to src/ImageSharp/Formats/Webp/Lossless/HistogramBinInfo.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/HistogramEncoder.cs b/src/ImageSharp/Formats/Webp/Lossless/HistogramEncoder.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/HistogramEncoder.cs
rename to src/ImageSharp/Formats/Webp/Lossless/HistogramEncoder.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/HistogramPair.cs b/src/ImageSharp/Formats/Webp/Lossless/HistogramPair.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/HistogramPair.cs
rename to src/ImageSharp/Formats/Webp/Lossless/HistogramPair.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/HuffIndex.cs b/src/ImageSharp/Formats/Webp/Lossless/HuffIndex.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/HuffIndex.cs
rename to src/ImageSharp/Formats/Webp/Lossless/HuffIndex.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/HuffmanCode.cs b/src/ImageSharp/Formats/Webp/Lossless/HuffmanCode.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/HuffmanCode.cs
rename to src/ImageSharp/Formats/Webp/Lossless/HuffmanCode.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/HuffmanTree.cs b/src/ImageSharp/Formats/Webp/Lossless/HuffmanTree.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/HuffmanTree.cs
rename to src/ImageSharp/Formats/Webp/Lossless/HuffmanTree.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/HuffmanTreeCode.cs b/src/ImageSharp/Formats/Webp/Lossless/HuffmanTreeCode.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/HuffmanTreeCode.cs
rename to src/ImageSharp/Formats/Webp/Lossless/HuffmanTreeCode.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/HuffmanTreeToken.cs b/src/ImageSharp/Formats/Webp/Lossless/HuffmanTreeToken.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/HuffmanTreeToken.cs
rename to src/ImageSharp/Formats/Webp/Lossless/HuffmanTreeToken.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/HuffmanUtils.cs b/src/ImageSharp/Formats/Webp/Lossless/HuffmanUtils.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/HuffmanUtils.cs
rename to src/ImageSharp/Formats/Webp/Lossless/HuffmanUtils.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/LosslessUtils.cs b/src/ImageSharp/Formats/Webp/Lossless/LosslessUtils.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/LosslessUtils.cs
rename to src/ImageSharp/Formats/Webp/Lossless/LosslessUtils.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/NearLosslessEnc.cs b/src/ImageSharp/Formats/Webp/Lossless/NearLosslessEnc.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/NearLosslessEnc.cs
rename to src/ImageSharp/Formats/Webp/Lossless/NearLosslessEnc.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/PixOrCopy.cs b/src/ImageSharp/Formats/Webp/Lossless/PixOrCopy.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/PixOrCopy.cs
rename to src/ImageSharp/Formats/Webp/Lossless/PixOrCopy.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/PixOrCopyMode.cs b/src/ImageSharp/Formats/Webp/Lossless/PixOrCopyMode.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/PixOrCopyMode.cs
rename to src/ImageSharp/Formats/Webp/Lossless/PixOrCopyMode.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/PredictorEncoder.cs b/src/ImageSharp/Formats/Webp/Lossless/PredictorEncoder.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/PredictorEncoder.cs
rename to src/ImageSharp/Formats/Webp/Lossless/PredictorEncoder.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/Vp8LBackwardRefs.cs b/src/ImageSharp/Formats/Webp/Lossless/Vp8LBackwardRefs.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/Vp8LBackwardRefs.cs
rename to src/ImageSharp/Formats/Webp/Lossless/Vp8LBackwardRefs.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/Vp8LBitEntropy.cs b/src/ImageSharp/Formats/Webp/Lossless/Vp8LBitEntropy.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/Vp8LBitEntropy.cs
rename to src/ImageSharp/Formats/Webp/Lossless/Vp8LBitEntropy.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/Vp8LDecoder.cs b/src/ImageSharp/Formats/Webp/Lossless/Vp8LDecoder.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/Vp8LDecoder.cs
rename to src/ImageSharp/Formats/Webp/Lossless/Vp8LDecoder.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/Vp8LEncoder.cs b/src/ImageSharp/Formats/Webp/Lossless/Vp8LEncoder.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/Vp8LEncoder.cs
rename to src/ImageSharp/Formats/Webp/Lossless/Vp8LEncoder.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/Vp8LHashChain.cs b/src/ImageSharp/Formats/Webp/Lossless/Vp8LHashChain.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/Vp8LHashChain.cs
rename to src/ImageSharp/Formats/Webp/Lossless/Vp8LHashChain.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/Vp8LHistogram.cs b/src/ImageSharp/Formats/Webp/Lossless/Vp8LHistogram.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/Vp8LHistogram.cs
rename to src/ImageSharp/Formats/Webp/Lossless/Vp8LHistogram.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/Vp8LLz77Type.cs b/src/ImageSharp/Formats/Webp/Lossless/Vp8LLz77Type.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/Vp8LLz77Type.cs
rename to src/ImageSharp/Formats/Webp/Lossless/Vp8LLz77Type.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/Vp8LMetadata.cs b/src/ImageSharp/Formats/Webp/Lossless/Vp8LMetadata.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/Vp8LMetadata.cs
rename to src/ImageSharp/Formats/Webp/Lossless/Vp8LMetadata.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/Vp8LMultipliers.cs b/src/ImageSharp/Formats/Webp/Lossless/Vp8LMultipliers.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/Vp8LMultipliers.cs
rename to src/ImageSharp/Formats/Webp/Lossless/Vp8LMultipliers.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/Vp8LStreaks.cs b/src/ImageSharp/Formats/Webp/Lossless/Vp8LStreaks.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/Vp8LStreaks.cs
rename to src/ImageSharp/Formats/Webp/Lossless/Vp8LStreaks.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/Vp8LTransform.cs b/src/ImageSharp/Formats/Webp/Lossless/Vp8LTransform.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/Vp8LTransform.cs
rename to src/ImageSharp/Formats/Webp/Lossless/Vp8LTransform.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/Vp8LTransformType.cs b/src/ImageSharp/Formats/Webp/Lossless/Vp8LTransformType.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/Vp8LTransformType.cs
rename to src/ImageSharp/Formats/Webp/Lossless/Vp8LTransformType.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/WebpLosslessDecoder.cs b/src/ImageSharp/Formats/Webp/Lossless/WebpLosslessDecoder.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/WebpLosslessDecoder.cs
rename to src/ImageSharp/Formats/Webp/Lossless/WebpLosslessDecoder.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossless/Webp_Lossless_Bitstream_Specification.pdf b/src/ImageSharp/Formats/Webp/Lossless/Webp_Lossless_Bitstream_Specification.pdf
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossless/Webp_Lossless_Bitstream_Specification.pdf
rename to src/ImageSharp/Formats/Webp/Lossless/Webp_Lossless_Bitstream_Specification.pdf
diff --git a/src/ImageSharp/Formats/WebP/Lossy/IntraPredictionMode.cs b/src/ImageSharp/Formats/Webp/Lossy/IntraPredictionMode.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/IntraPredictionMode.cs
rename to src/ImageSharp/Formats/Webp/Lossy/IntraPredictionMode.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/LoopFilter.cs b/src/ImageSharp/Formats/Webp/Lossy/LoopFilter.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/LoopFilter.cs
rename to src/ImageSharp/Formats/Webp/Lossy/LoopFilter.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/LossyUtils.cs b/src/ImageSharp/Formats/Webp/Lossy/LossyUtils.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/LossyUtils.cs
rename to src/ImageSharp/Formats/Webp/Lossy/LossyUtils.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/PassStats.cs b/src/ImageSharp/Formats/Webp/Lossy/PassStats.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/PassStats.cs
rename to src/ImageSharp/Formats/Webp/Lossy/PassStats.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/QuantEnc.cs b/src/ImageSharp/Formats/Webp/Lossy/QuantEnc.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/QuantEnc.cs
rename to src/ImageSharp/Formats/Webp/Lossy/QuantEnc.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8BandProbas.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8BandProbas.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8BandProbas.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8BandProbas.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8CostArray.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8CostArray.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8CostArray.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8CostArray.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8Costs.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8Costs.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8Costs.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8Costs.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8Decoder.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8Decoder.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8Decoder.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8Decoder.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8EncIterator.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8EncIterator.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8EncIterator.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8EncIterator.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8EncProba.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8EncProba.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8EncProba.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8EncProba.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8EncSegmentHeader.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8EncSegmentHeader.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8EncSegmentHeader.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8EncSegmentHeader.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8Encoder.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8Encoder.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8Encoder.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8Encoder.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8Encoding.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8Encoding.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8Encoding.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8Encoding.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8FilterHeader.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8FilterHeader.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8FilterHeader.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8FilterHeader.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8FilterInfo.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8FilterInfo.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8FilterInfo.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8FilterInfo.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8FrameHeader.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8FrameHeader.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8FrameHeader.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8FrameHeader.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8Histogram.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8Histogram.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8Histogram.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8Histogram.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8Io.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8Io.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8Io.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8Io.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8MacroBlock.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8MacroBlock.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8MacroBlock.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8MacroBlock.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8MacroBlockData.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8MacroBlockData.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8MacroBlockData.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8MacroBlockData.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8MacroBlockInfo.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8MacroBlockInfo.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8MacroBlockInfo.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8MacroBlockInfo.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8MacroBlockType.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8MacroBlockType.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8MacroBlockType.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8MacroBlockType.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8Matrix.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8Matrix.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8Matrix.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8Matrix.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8ModeScore.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8ModeScore.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8ModeScore.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8ModeScore.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8PictureHeader.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8PictureHeader.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8PictureHeader.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8PictureHeader.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8Proba.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8Proba.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8Proba.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8Proba.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8ProbaArray.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8ProbaArray.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8ProbaArray.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8ProbaArray.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8QuantMatrix.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8QuantMatrix.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8QuantMatrix.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8QuantMatrix.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8RDLevel.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8RDLevel.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8RDLevel.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8RDLevel.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8Residual.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8Residual.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8Residual.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8Residual.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8SegmentHeader.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8SegmentHeader.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8SegmentHeader.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8SegmentHeader.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8SegmentInfo.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8SegmentInfo.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8SegmentInfo.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8SegmentInfo.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8Stats.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8Stats.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8Stats.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8Stats.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8StatsArray.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8StatsArray.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8StatsArray.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8StatsArray.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/Vp8TopSamples.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8TopSamples.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/Vp8TopSamples.cs
rename to src/ImageSharp/Formats/Webp/Lossy/Vp8TopSamples.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/WebpLossyDecoder.cs b/src/ImageSharp/Formats/Webp/Lossy/WebpLossyDecoder.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/WebpLossyDecoder.cs
rename to src/ImageSharp/Formats/Webp/Lossy/WebpLossyDecoder.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/YuvConversion.cs b/src/ImageSharp/Formats/Webp/Lossy/YuvConversion.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/YuvConversion.cs
rename to src/ImageSharp/Formats/Webp/Lossy/YuvConversion.cs
diff --git a/src/ImageSharp/Formats/WebP/Lossy/rfc6386_lossy_specification.pdf b/src/ImageSharp/Formats/Webp/Lossy/rfc6386_lossy_specification.pdf
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Lossy/rfc6386_lossy_specification.pdf
rename to src/ImageSharp/Formats/Webp/Lossy/rfc6386_lossy_specification.pdf
diff --git a/src/ImageSharp/Formats/WebP/MetadataExtensions.cs b/src/ImageSharp/Formats/Webp/MetadataExtensions.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/MetadataExtensions.cs
rename to src/ImageSharp/Formats/Webp/MetadataExtensions.cs
diff --git a/src/ImageSharp/Formats/WebP/Readme.md b/src/ImageSharp/Formats/Webp/Readme.md
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Readme.md
rename to src/ImageSharp/Formats/Webp/Readme.md
diff --git a/src/ImageSharp/Formats/WebP/WebpAlphaCompressionMethod.cs b/src/ImageSharp/Formats/Webp/WebpAlphaCompressionMethod.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpAlphaCompressionMethod.cs
rename to src/ImageSharp/Formats/Webp/WebpAlphaCompressionMethod.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpAlphaFilterType.cs b/src/ImageSharp/Formats/Webp/WebpAlphaFilterType.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpAlphaFilterType.cs
rename to src/ImageSharp/Formats/Webp/WebpAlphaFilterType.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpBitsPerPixel.cs b/src/ImageSharp/Formats/Webp/WebpBitsPerPixel.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpBitsPerPixel.cs
rename to src/ImageSharp/Formats/Webp/WebpBitsPerPixel.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpChunkType.cs b/src/ImageSharp/Formats/Webp/WebpChunkType.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpChunkType.cs
rename to src/ImageSharp/Formats/Webp/WebpChunkType.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpCommonUtils.cs b/src/ImageSharp/Formats/Webp/WebpCommonUtils.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpCommonUtils.cs
rename to src/ImageSharp/Formats/Webp/WebpCommonUtils.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpConfigurationModule.cs b/src/ImageSharp/Formats/Webp/WebpConfigurationModule.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpConfigurationModule.cs
rename to src/ImageSharp/Formats/Webp/WebpConfigurationModule.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpConstants.cs b/src/ImageSharp/Formats/Webp/WebpConstants.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpConstants.cs
rename to src/ImageSharp/Formats/Webp/WebpConstants.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpDecoder.cs b/src/ImageSharp/Formats/Webp/WebpDecoder.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpDecoder.cs
rename to src/ImageSharp/Formats/Webp/WebpDecoder.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpDecoderCore.cs b/src/ImageSharp/Formats/Webp/WebpDecoderCore.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpDecoderCore.cs
rename to src/ImageSharp/Formats/Webp/WebpDecoderCore.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpEncoder.cs b/src/ImageSharp/Formats/Webp/WebpEncoder.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpEncoder.cs
rename to src/ImageSharp/Formats/Webp/WebpEncoder.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpEncoderCore.cs b/src/ImageSharp/Formats/Webp/WebpEncoderCore.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpEncoderCore.cs
rename to src/ImageSharp/Formats/Webp/WebpEncoderCore.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpFeatures.cs b/src/ImageSharp/Formats/Webp/WebpFeatures.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpFeatures.cs
rename to src/ImageSharp/Formats/Webp/WebpFeatures.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpFormat.cs b/src/ImageSharp/Formats/Webp/WebpFormat.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpFormat.cs
rename to src/ImageSharp/Formats/Webp/WebpFormat.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpFormatType.cs b/src/ImageSharp/Formats/Webp/WebpFormatType.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpFormatType.cs
rename to src/ImageSharp/Formats/Webp/WebpFormatType.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpImageFormatDetector.cs b/src/ImageSharp/Formats/Webp/WebpImageFormatDetector.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpImageFormatDetector.cs
rename to src/ImageSharp/Formats/Webp/WebpImageFormatDetector.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpImageInfo.cs b/src/ImageSharp/Formats/Webp/WebpImageInfo.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpImageInfo.cs
rename to src/ImageSharp/Formats/Webp/WebpImageInfo.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpLookupTables.cs b/src/ImageSharp/Formats/Webp/WebpLookupTables.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpLookupTables.cs
rename to src/ImageSharp/Formats/Webp/WebpLookupTables.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpMetadata.cs b/src/ImageSharp/Formats/Webp/WebpMetadata.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpMetadata.cs
rename to src/ImageSharp/Formats/Webp/WebpMetadata.cs
diff --git a/src/ImageSharp/Formats/WebP/WebpThrowHelper.cs b/src/ImageSharp/Formats/Webp/WebpThrowHelper.cs
similarity index 100%
rename from src/ImageSharp/Formats/WebP/WebpThrowHelper.cs
rename to src/ImageSharp/Formats/Webp/WebpThrowHelper.cs
diff --git a/src/ImageSharp/Formats/WebP/Webp_Container_Specification.pdf b/src/ImageSharp/Formats/Webp/Webp_Container_Specification.pdf
similarity index 100%
rename from src/ImageSharp/Formats/WebP/Webp_Container_Specification.pdf
rename to src/ImageSharp/Formats/Webp/Webp_Container_Specification.pdf