shibayan · shibayan · Mar 16, 2026 · Mar 16, 2026 · Mar 16, 2026
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -31,7 +31,7 @@ jobs:
       run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_OUTPUT
 
     - name: Pack NuGet Package
-      run: dotnet pack Sharprompt/Sharprompt.csproj -c Release -o ./dist -p:Version=${{ steps.setup_version.outputs.VERSION }}
+      run: dotnet pack src/Sharprompt/Sharprompt.csproj -c Release -o ./dist -p:Version=${{ steps.setup_version.outputs.VERSION }}
 
     - name: Publish
       run: dotnet nuget push dist/*.nupkg -k ${{ steps.login.outputs.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ dotnet test -c Release
 The example project can be run with:
 
 ```sh
-dotnet run --project Sharprompt.Example
+dotnet run --project samples/Sharprompt.Example
 ```
 
 ## Before Opening a Pull Request

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <Nullable>enable</Nullable>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+  </PropertyGroup>
+</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,13 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.201" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
+    <PackageVersion Include="xunit.v3" Version="3.2.2" />
+  </ItemGroup>
+</Project>
diff --git a/README.md b/README.md
@@ -47,10 +47,10 @@ Console.WriteLine($"Your answer is {answer}");
 
 ## Examples
 
-The project in the folder `Sharprompt.Example` contains all the samples. Please check it.
+The project in the folder `samples/Sharprompt.Example` contains all the samples. Please check it.
 
 ```sh
-dotnet run --project Sharprompt.Example
+dotnet run --project samples/Sharprompt.Example
 ```
 
 ## Prompt types

diff --git a/Sharprompt.Example/Sharprompt.Example.csproj b/Sharprompt.Example/Sharprompt.Example.csproj
diff --git a/Sharprompt.slnx b/Sharprompt.slnx
@@ -1,6 +1,6 @@
 <Solution>
-  <Project Path="Sharprompt.Example/Sharprompt.Example.csproj" />
-  <Project Path="Sharprompt.SourceGenerator/Sharprompt.SourceGenerator.csproj" />
-  <Project Path="Sharprompt.Tests/Sharprompt.Tests.csproj" />
-  <Project Path="Sharprompt/Sharprompt.csproj" />
+  <Project Path="samples/Sharprompt.Example/Sharprompt.Example.csproj" />
+  <Project Path="src/Sharprompt.SourceGenerator/Sharprompt.SourceGenerator.csproj" />
+  <Project Path="tests/Sharprompt.Tests/Sharprompt.Tests.csproj" />
+  <Project Path="src/Sharprompt/Sharprompt.csproj" />
 </Solution>
diff --git a/Sharprompt.Example/ExampleType.cs → samples/Sharprompt.Example/ExampleType.cs b/Sharprompt.Example/ExampleType.cs → samples/Sharprompt.Example/ExampleType.cs
diff --git a/Sharprompt.Example/Models/MyEnum.cs → samples/Sharprompt.Example/Models/MyEnum.cs b/Sharprompt.Example/Models/MyEnum.cs → samples/Sharprompt.Example/Models/MyEnum.cs
diff --git a/Sharprompt.Example/Models/MyFormModel.cs → .../Sharprompt.Example/Models/MyFormModel.cs b/Sharprompt.Example/Models/MyFormModel.cs → .../Sharprompt.Example/Models/MyFormModel.cs
diff --git a/Sharprompt.Example/Program.cs → samples/Sharprompt.Example/Program.cs b/Sharprompt.Example/Program.cs → samples/Sharprompt.Example/Program.cs
diff --git a/samples/Sharprompt.Example/Sharprompt.Example.csproj b/samples/Sharprompt.Example/Sharprompt.Example.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Sharprompt\Sharprompt.csproj" />
+    <ProjectReference Include="..\..\src\Sharprompt.SourceGenerator\Sharprompt.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+</Project>
diff --git a/....SourceGenerator/EnumMetadataGenerator.cs → ....SourceGenerator/EnumMetadataGenerator.cs b/....SourceGenerator/EnumMetadataGenerator.cs → ....SourceGenerator/EnumMetadataGenerator.cs
diff --git a/...ourceGenerator/PromptBindableGenerator.cs → ...ourceGenerator/PromptBindableGenerator.cs b/...ourceGenerator/PromptBindableGenerator.cs → ...ourceGenerator/PromptBindableGenerator.cs
diff --git a/...nerator/Sharprompt.SourceGenerator.csproj → ...nerator/Sharprompt.SourceGenerator.csproj b/...nerator/Sharprompt.SourceGenerator.csproj → ...nerator/Sharprompt.SourceGenerator.csproj
@@ -3,17 +3,14 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
     <IsRoslynComponent>true</IsRoslynComponent>
     <IsPackable>false</IsPackable>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.201" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/Sharprompt/AssemblyInfo.cs → src/Sharprompt/AssemblyInfo.cs b/Sharprompt/AssemblyInfo.cs → src/Sharprompt/AssemblyInfo.cs
diff --git a/Sharprompt/BindIgnoreAttribute.cs → src/Sharprompt/BindIgnoreAttribute.cs b/Sharprompt/BindIgnoreAttribute.cs → src/Sharprompt/BindIgnoreAttribute.cs
diff --git a/Sharprompt/ConfirmOptions.cs → src/Sharprompt/ConfirmOptions.cs b/Sharprompt/ConfirmOptions.cs → src/Sharprompt/ConfirmOptions.cs
diff --git a/Sharprompt/Drivers/DefaultConsoleDriver.cs → ...harprompt/Drivers/DefaultConsoleDriver.cs b/Sharprompt/Drivers/DefaultConsoleDriver.cs → ...harprompt/Drivers/DefaultConsoleDriver.cs
diff --git a/Sharprompt/Drivers/IConsoleDriver.cs → src/Sharprompt/Drivers/IConsoleDriver.cs b/Sharprompt/Drivers/IConsoleDriver.cs → src/Sharprompt/Drivers/IConsoleDriver.cs
diff --git a/Sharprompt/EnumMetadataRegistry.cs → src/Sharprompt/EnumMetadataRegistry.cs b/Sharprompt/EnumMetadataRegistry.cs → src/Sharprompt/EnumMetadataRegistry.cs
diff --git a/...prompt/Fluent/ConfirmOptionsExtensions.cs → ...prompt/Fluent/ConfirmOptionsExtensions.cs b/...prompt/Fluent/ConfirmOptionsExtensions.cs → ...prompt/Fluent/ConfirmOptionsExtensions.cs
diff --git a/Sharprompt/Fluent/InputOptionsExtensions.cs → ...arprompt/Fluent/InputOptionsExtensions.cs b/Sharprompt/Fluent/InputOptionsExtensions.cs → ...arprompt/Fluent/InputOptionsExtensions.cs
diff --git a/Sharprompt/Fluent/ListOptionsExtensions.cs → ...harprompt/Fluent/ListOptionsExtensions.cs b/Sharprompt/Fluent/ListOptionsExtensions.cs → ...harprompt/Fluent/ListOptionsExtensions.cs
diff --git a/...pt/Fluent/MultiSelectOptionsExtensions.cs → ...pt/Fluent/MultiSelectOptionsExtensions.cs b/...pt/Fluent/MultiSelectOptionsExtensions.cs → ...pt/Fluent/MultiSelectOptionsExtensions.cs
diff --git a/...rompt/Fluent/PasswordOptionsExtensions.cs → ...rompt/Fluent/PasswordOptionsExtensions.cs b/...rompt/Fluent/PasswordOptionsExtensions.cs → ...rompt/Fluent/PasswordOptionsExtensions.cs
diff --git a/Sharprompt/Fluent/SelectOptionsExtensions.cs → ...rprompt/Fluent/SelectOptionsExtensions.cs b/Sharprompt/Fluent/SelectOptionsExtensions.cs → ...rprompt/Fluent/SelectOptionsExtensions.cs
diff --git a/Sharprompt/Forms/ConfirmForm.cs → src/Sharprompt/Forms/ConfirmForm.cs b/Sharprompt/Forms/ConfirmForm.cs → src/Sharprompt/Forms/ConfirmForm.cs
diff --git a/Sharprompt/Forms/FormBase.cs → src/Sharprompt/Forms/FormBase.cs b/Sharprompt/Forms/FormBase.cs → src/Sharprompt/Forms/FormBase.cs
diff --git a/Sharprompt/Forms/FormRenderer.cs → src/Sharprompt/Forms/FormRenderer.cs b/Sharprompt/Forms/FormRenderer.cs → src/Sharprompt/Forms/FormRenderer.cs
diff --git a/Sharprompt/Forms/InputForm.cs → src/Sharprompt/Forms/InputForm.cs b/Sharprompt/Forms/InputForm.cs → src/Sharprompt/Forms/InputForm.cs
diff --git a/Sharprompt/Forms/ListForm.cs → src/Sharprompt/Forms/ListForm.cs b/Sharprompt/Forms/ListForm.cs → src/Sharprompt/Forms/ListForm.cs
diff --git a/Sharprompt/Forms/MultiSelectForm.cs → src/Sharprompt/Forms/MultiSelectForm.cs b/Sharprompt/Forms/MultiSelectForm.cs → src/Sharprompt/Forms/MultiSelectForm.cs
diff --git a/Sharprompt/Forms/PasswordForm.cs → src/Sharprompt/Forms/PasswordForm.cs b/Sharprompt/Forms/PasswordForm.cs → src/Sharprompt/Forms/PasswordForm.cs
diff --git a/Sharprompt/Forms/SelectForm.cs → src/Sharprompt/Forms/SelectForm.cs b/Sharprompt/Forms/SelectForm.cs → src/Sharprompt/Forms/SelectForm.cs
diff --git a/Sharprompt/Forms/SelectFormBase.cs → src/Sharprompt/Forms/SelectFormBase.cs b/Sharprompt/Forms/SelectFormBase.cs → src/Sharprompt/Forms/SelectFormBase.cs
diff --git a/Sharprompt/Forms/TextFormBase.cs → src/Sharprompt/Forms/TextFormBase.cs b/Sharprompt/Forms/TextFormBase.cs → src/Sharprompt/Forms/TextFormBase.cs
diff --git a/Sharprompt/InlineItemsAttribute.cs → src/Sharprompt/InlineItemsAttribute.cs b/Sharprompt/InlineItemsAttribute.cs → src/Sharprompt/InlineItemsAttribute.cs
diff --git a/Sharprompt/InputOptions.cs → src/Sharprompt/InputOptions.cs b/Sharprompt/InputOptions.cs → src/Sharprompt/InputOptions.cs
diff --git a/Sharprompt/Internal/ConsoleKeyBinding.cs → src/Sharprompt/Internal/ConsoleKeyBinding.cs b/Sharprompt/Internal/ConsoleKeyBinding.cs → src/Sharprompt/Internal/ConsoleKeyBinding.cs
diff --git a/Sharprompt/Internal/EastAsianWidth.cs → src/Sharprompt/Internal/EastAsianWidth.cs b/Sharprompt/Internal/EastAsianWidth.cs → src/Sharprompt/Internal/EastAsianWidth.cs
diff --git a/Sharprompt/Internal/NativeMethods.cs → src/Sharprompt/Internal/NativeMethods.cs b/Sharprompt/Internal/NativeMethods.cs → src/Sharprompt/Internal/NativeMethods.cs
diff --git a/Sharprompt/Internal/OffscreenBuffer.cs → src/Sharprompt/Internal/OffscreenBuffer.cs b/Sharprompt/Internal/OffscreenBuffer.cs → src/Sharprompt/Internal/OffscreenBuffer.cs
diff --git a/...mpt/Internal/OffscreenBufferExtensions.cs → ...mpt/Internal/OffscreenBufferExtensions.cs b/...mpt/Internal/OffscreenBufferExtensions.cs → ...mpt/Internal/OffscreenBufferExtensions.cs
diff --git a/Sharprompt/Internal/Optional.cs → src/Sharprompt/Internal/Optional.cs b/Sharprompt/Internal/Optional.cs → src/Sharprompt/Internal/Optional.cs
diff --git a/Sharprompt/Internal/Paginator.cs → src/Sharprompt/Internal/Paginator.cs b/Sharprompt/Internal/Paginator.cs → src/Sharprompt/Internal/Paginator.cs
diff --git a/Sharprompt/Internal/RenderScope.cs → src/Sharprompt/Internal/RenderScope.cs b/Sharprompt/Internal/RenderScope.cs → src/Sharprompt/Internal/RenderScope.cs
diff --git a/Sharprompt/Internal/TextInputBuffer.cs → src/Sharprompt/Internal/TextInputBuffer.cs b/Sharprompt/Internal/TextInputBuffer.cs → src/Sharprompt/Internal/TextInputBuffer.cs
diff --git a/Sharprompt/Internal/TypeHelper.cs → src/Sharprompt/Internal/TypeHelper.cs b/Sharprompt/Internal/TypeHelper.cs → src/Sharprompt/Internal/TypeHelper.cs
diff --git a/Sharprompt/Internal/ValidatorsExtensions.cs → ...arprompt/Internal/ValidatorsExtensions.cs b/Sharprompt/Internal/ValidatorsExtensions.cs → ...arprompt/Internal/ValidatorsExtensions.cs
diff --git a/Sharprompt/ListOptions.cs → src/Sharprompt/ListOptions.cs b/Sharprompt/ListOptions.cs → src/Sharprompt/ListOptions.cs
diff --git a/Sharprompt/MemberItemsAttribute.cs → src/Sharprompt/MemberItemsAttribute.cs b/Sharprompt/MemberItemsAttribute.cs → src/Sharprompt/MemberItemsAttribute.cs
diff --git a/Sharprompt/ModelBinderRegistry.cs → src/Sharprompt/ModelBinderRegistry.cs b/Sharprompt/ModelBinderRegistry.cs → src/Sharprompt/ModelBinderRegistry.cs
diff --git a/Sharprompt/MultiSelectOptions.cs → src/Sharprompt/MultiSelectOptions.cs b/Sharprompt/MultiSelectOptions.cs → src/Sharprompt/MultiSelectOptions.cs
diff --git a/Sharprompt/PasswordOptions.cs → src/Sharprompt/PasswordOptions.cs b/Sharprompt/PasswordOptions.cs → src/Sharprompt/PasswordOptions.cs
diff --git a/Sharprompt/Prompt.Basic.cs → src/Sharprompt/Prompt.Basic.cs b/Sharprompt/Prompt.Basic.cs → src/Sharprompt/Prompt.Basic.cs
diff --git a/Sharprompt/Prompt.Bind.cs → src/Sharprompt/Prompt.Bind.cs b/Sharprompt/Prompt.Bind.cs → src/Sharprompt/Prompt.Bind.cs
diff --git a/Sharprompt/Prompt.Configuration.cs → src/Sharprompt/Prompt.Configuration.cs b/Sharprompt/Prompt.Configuration.cs → src/Sharprompt/Prompt.Configuration.cs
diff --git a/Sharprompt/PromptBindableAttribute.cs → src/Sharprompt/PromptBindableAttribute.cs b/Sharprompt/PromptBindableAttribute.cs → src/Sharprompt/PromptBindableAttribute.cs
diff --git a/Sharprompt/PromptCanceledException.cs → src/Sharprompt/PromptCanceledException.cs b/Sharprompt/PromptCanceledException.cs → src/Sharprompt/PromptCanceledException.cs
diff --git a/Sharprompt/PromptConfiguration.cs → src/Sharprompt/PromptConfiguration.cs b/Sharprompt/PromptConfiguration.cs → src/Sharprompt/PromptConfiguration.cs
diff --git a/Sharprompt/PromptOptions.cs → src/Sharprompt/PromptOptions.cs b/Sharprompt/PromptOptions.cs → src/Sharprompt/PromptOptions.cs
diff --git a/Sharprompt/SelectOptions.cs → src/Sharprompt/SelectOptions.cs b/Sharprompt/SelectOptions.cs → src/Sharprompt/SelectOptions.cs
diff --git a/Sharprompt/Sharprompt.csproj → src/Sharprompt/Sharprompt.csproj b/Sharprompt/Sharprompt.csproj → src/Sharprompt/Sharprompt.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -15,19 +14,17 @@
     <PackageReleaseNotes>https://github.com/shibayan/Sharprompt/releases/tag/v$(Version)</PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageTags>cli;command-line;console;interactive;prompt;terminal</PackageTags>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RepositoryUrl>https://github.com/shibayan/Sharprompt</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\icon.png" Pack="true" PackagePath="\" />
-    <None Include="..\README.md" Pack="true" PackagePath="\" />
+    <None Include="..\..\icon.png" Pack="true" PackagePath="\" />
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.201" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Sharprompt/Strings/Resource.Designer.cs → src/Sharprompt/Strings/Resource.Designer.cs b/Sharprompt/Strings/Resource.Designer.cs → src/Sharprompt/Strings/Resource.Designer.cs
diff --git a/Sharprompt/Strings/Resource.de-DE.resx → src/Sharprompt/Strings/Resource.de-DE.resx b/Sharprompt/Strings/Resource.de-DE.resx → src/Sharprompt/Strings/Resource.de-DE.resx
diff --git a/Sharprompt/Strings/Resource.ja.resx → src/Sharprompt/Strings/Resource.ja.resx b/Sharprompt/Strings/Resource.ja.resx → src/Sharprompt/Strings/Resource.ja.resx
diff --git a/Sharprompt/Strings/Resource.resx → src/Sharprompt/Strings/Resource.resx b/Sharprompt/Strings/Resource.resx → src/Sharprompt/Strings/Resource.resx
diff --git a/Sharprompt/Symbol.cs → src/Sharprompt/Symbol.cs b/Sharprompt/Symbol.cs → src/Sharprompt/Symbol.cs
diff --git a/Sharprompt/Validators.cs → src/Sharprompt/Validators.cs b/Sharprompt/Validators.cs → src/Sharprompt/Validators.cs
diff --git a/...prompt.Tests/EnumMetadataRegistryTests.cs → ...ests/Binding/EnumMetadataRegistryTests.cs b/...prompt.Tests/EnumMetadataRegistryTests.cs → ...ests/Binding/EnumMetadataRegistryTests.cs
diff --git a/Sharprompt.Tests/ModelBinderRegistryTests.cs → ...Tests/Binding/ModelBinderRegistryTests.cs b/Sharprompt.Tests/ModelBinderRegistryTests.cs → ...Tests/Binding/ModelBinderRegistryTests.cs
diff --git a/...prompt.Tests/ConsoleDriverFactoryTests.cs → ...ests/Console/ConsoleDriverFactoryTests.cs b/...prompt.Tests/ConsoleDriverFactoryTests.cs → ...ests/Console/ConsoleDriverFactoryTests.cs
diff --git a/Sharprompt.Tests/ConsoleKeyBindingTests.cs → ...t.Tests/Console/ConsoleKeyBindingTests.cs b/Sharprompt.Tests/ConsoleKeyBindingTests.cs → ...t.Tests/Console/ConsoleKeyBindingTests.cs
diff --git a/Sharprompt.Tests/IConsoleDriverTests.cs → ...ompt.Tests/Console/IConsoleDriverTests.cs b/Sharprompt.Tests/IConsoleDriverTests.cs → ...ompt.Tests/Console/IConsoleDriverTests.cs
diff --git a/Sharprompt.Tests/FluentExtensionsTests.cs → ...mpt.Tests/Fluent/FluentExtensionsTests.cs b/Sharprompt.Tests/FluentExtensionsTests.cs → ...mpt.Tests/Fluent/FluentExtensionsTests.cs
diff --git a/Sharprompt.Tests/EastAsianWidthTests.cs → ...mpt.Tests/Internal/EastAsianWidthTests.cs b/Sharprompt.Tests/EastAsianWidthTests.cs → ...mpt.Tests/Internal/EastAsianWidthTests.cs
diff --git a/Sharprompt.Tests/OptionalTests.cs → ...harprompt.Tests/Internal/OptionalTests.cs b/Sharprompt.Tests/OptionalTests.cs → ...harprompt.Tests/Internal/OptionalTests.cs
diff --git a/Sharprompt.Tests/PaginatorTests.cs → ...arprompt.Tests/Internal/PaginatorTests.cs b/Sharprompt.Tests/PaginatorTests.cs → ...arprompt.Tests/Internal/PaginatorTests.cs
diff --git a/Sharprompt.Tests/TextInputBufferTests.cs → ...pt.Tests/Internal/TextInputBufferTests.cs b/Sharprompt.Tests/TextInputBufferTests.cs → ...pt.Tests/Internal/TextInputBufferTests.cs
diff --git a/Sharprompt.Tests/TypeHelperTests.cs → ...rprompt.Tests/Internal/TypeHelperTests.cs b/Sharprompt.Tests/TypeHelperTests.cs → ...rprompt.Tests/Internal/TypeHelperTests.cs
diff --git a/...prompt.Tests/ValidatorsExtensionsTests.cs → ...sts/Internal/ValidatorsExtensionsTests.cs b/...prompt.Tests/ValidatorsExtensionsTests.cs → ...sts/Internal/ValidatorsExtensionsTests.cs
diff --git a/Sharprompt.Tests/OptionsTests.cs → .../Sharprompt.Tests/Options/OptionsTests.cs b/Sharprompt.Tests/OptionsTests.cs → .../Sharprompt.Tests/Options/OptionsTests.cs
diff --git a/...mpt.Tests/PromptCanceledExceptionTests.cs → ...PublicApi/PromptCanceledExceptionTests.cs b/...mpt.Tests/PromptCanceledExceptionTests.cs → ...PublicApi/PromptCanceledExceptionTests.cs
diff --git a/Sharprompt.Tests/Sharprompt.Tests.csproj → .../Sharprompt.Tests/Sharprompt.Tests.csproj b/Sharprompt.Tests/Sharprompt.Tests.csproj → .../Sharprompt.Tests/Sharprompt.Tests.csproj
@@ -2,21 +2,20 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="xunit.v3" Version="3.2.2" />
+    <PackageReference Include="xunit.v3" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Sharprompt\Sharprompt.csproj" />
+    <ProjectReference Include="..\..\src\Sharprompt\Sharprompt.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Sharprompt.Tests/ValidatorsTests.cs → ...rompt.Tests/Validation/ValidatorsTests.cs b/Sharprompt.Tests/ValidatorsTests.cs → ...rompt.Tests/Validation/ValidatorsTests.cs