diff --git a/nanoFramework.Json.Test/nanoFramework.Json.Test.nfproj b/nanoFramework.Json.Test/nanoFramework.Json.Test.nfproj
index 2536484..df6f56a 100644
--- a/nanoFramework.Json.Test/nanoFramework.Json.Test.nfproj
+++ b/nanoFramework.Json.Test/nanoFramework.Json.Test.nfproj
@@ -32,33 +32,33 @@
   </PropertyGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
   <ItemGroup>
-    <Compile Include="Configuration\ConvertersMappingTests.cs" />
-    <Compile Include="Configuration\SettingsTests.cs" />
-    <Compile Include="Converters\DateTimeConverterTests.cs" />
-    <Compile Include="Converters\SByteConverterTests.cs" />
-    <Compile Include="Converters\ByteConverterTests.cs" />
-    <Compile Include="Converters\BoolConverterTests.cs" />
-    <Compile Include="Converters\TimeSpanConverterTests.cs" />
-    <Compile Include="Converters\UIntConverterTests.cs" />
-    <Compile Include="Converters\ShortConverterTests.cs" />
-    <Compile Include="Converters\StringConverterTests.cs" />
-    <Compile Include="Converters\UShortConverterTests.cs" />
-    <Compile Include="Converters\ULongConverterTests.cs" />
-    <Compile Include="Converters\LongConverterTests.cs" />
-    <Compile Include="Converters\IntConverterTests.cs" />
-    <Compile Include="Converters\FloatConverterTests.cs" />
-    <Compile Include="Converters\DoubleConverterTests.cs" />
-    <Compile Include="Configuration\JsonCustomTypeTests.cs" />
+    <Compile Include="Configuration/ConvertersMappingTests.cs" />
+    <Compile Include="Configuration/SettingsTests.cs" />
+    <Compile Include="Converters/DateTimeConverterTests.cs" />
+    <Compile Include="Converters/SByteConverterTests.cs" />
+    <Compile Include="Converters/ByteConverterTests.cs" />
+    <Compile Include="Converters/BoolConverterTests.cs" />
+    <Compile Include="Converters/TimeSpanConverterTests.cs" />
+    <Compile Include="Converters/UIntConverterTests.cs" />
+    <Compile Include="Converters/ShortConverterTests.cs" />
+    <Compile Include="Converters/StringConverterTests.cs" />
+    <Compile Include="Converters/UShortConverterTests.cs" />
+    <Compile Include="Converters/ULongConverterTests.cs" />
+    <Compile Include="Converters/LongConverterTests.cs" />
+    <Compile Include="Converters/IntConverterTests.cs" />
+    <Compile Include="Converters/FloatConverterTests.cs" />
+    <Compile Include="Converters/DoubleConverterTests.cs" />
+    <Compile Include="Configuration/JsonCustomTypeTests.cs" />
     <Compile Include="JsonDeserializationArraysTests.cs" />
     <Compile Include="JsonSettingsTests.cs" />
     <Compile Include="JsonThreadSafeTests.cs" />
     <Compile Include="JsonSerializerOptionsTests.cs" />
-    <Compile Include="Mocks\MockMemberResolver.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resolvers\MemberResolverCaseInsensitiveExceptionTests.cs" />
-    <Compile Include="Resolvers\MemberResolverCaseInsensitiveTests.cs" />
-    <Compile Include="Resolvers\MemberResolverCaseSensitiveExceptionTests.cs" />
-    <Compile Include="Resolvers\MemberResolverCaseSensitiveTests.cs" />
+    <Compile Include="Mocks/MockMemberResolver.cs" />
+    <Compile Include="Properties/AssemblyInfo.cs" />
+    <Compile Include="Resolvers/MemberResolverCaseInsensitiveExceptionTests.cs" />
+    <Compile Include="Resolvers/MemberResolverCaseInsensitiveTests.cs" />
+    <Compile Include="Resolvers/MemberResolverCaseSensitiveExceptionTests.cs" />
+    <Compile Include="Resolvers/MemberResolverCaseSensitiveTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="packages.lock.json" />