diff --git a/03_Animal/vbnet/Animal.Tests/Animal.Tests.vbproj b/03_Animal/vbnet/Animal.Tests/Animal.Tests.vbproj
new file mode 100644
index 00000000..05d00314
--- /dev/null
+++ b/03_Animal/vbnet/Animal.Tests/Animal.Tests.vbproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <RootNamespace>Animal.Tests</RootNamespace>
+    <TargetFramework>net6.0</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/03_Animal/vbnet/Animal.Tests/UnitTest1.vb b/03_Animal/vbnet/Animal.Tests/UnitTest1.vb
new file mode 100644
index 00000000..fe32490e
--- /dev/null
+++ b/03_Animal/vbnet/Animal.Tests/UnitTest1.vb
@@ -0,0 +1,12 @@
+Imports System
+Imports Xunit
+
+Namespace Animal.Tests
+    Public Class UnitTest1
+        <Fact>
+        Sub TestSub()
+
+        End Sub
+    End Class
+End Namespace
+
diff --git a/03_Animal/vbnet/Animal.sln b/03_Animal/vbnet/Animal.sln
index eaaf1b67..f3b48076 100644
--- a/03_Animal/vbnet/Animal.sln
+++ b/03_Animal/vbnet/Animal.sln
@@ -1,22 +1,31 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30114.105
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Animal", "Animal.vbproj", "{147D66D5-D817-4024-9447-9F5B9A6D2B7D}"
+Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Animal", "Animal\Animal.vbproj", "{5517E4CE-BCF9-4D1F-9A17-B620C1B96B0D}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Animal.Tests", "Animal.Tests\Animal.Tests.vbproj", "{3986C6A2-77D4-4F00-B3CF-F5736C623B1E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5517E4CE-BCF9-4D1F-9A17-B620C1B96B0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5517E4CE-BCF9-4D1F-9A17-B620C1B96B0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5517E4CE-BCF9-4D1F-9A17-B620C1B96B0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5517E4CE-BCF9-4D1F-9A17-B620C1B96B0D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3986C6A2-77D4-4F00-B3CF-F5736C623B1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3986C6A2-77D4-4F00-B3CF-F5736C623B1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3986C6A2-77D4-4F00-B3CF-F5736C623B1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3986C6A2-77D4-4F00-B3CF-F5736C623B1E}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{147D66D5-D817-4024-9447-9F5B9A6D2B7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{147D66D5-D817-4024-9447-9F5B9A6D2B7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{147D66D5-D817-4024-9447-9F5B9A6D2B7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{147D66D5-D817-4024-9447-9F5B9A6D2B7D}.Release|Any CPU.Build.0 = Release|Any CPU
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {88469A47-E30C-4763-A325-074101D16608}
 	EndGlobalSection
 EndGlobal
diff --git a/03_Animal/vbnet/Animal.vbproj b/03_Animal/vbnet/Animal/Animal.vbproj
similarity index 100%
rename from 03_Animal/vbnet/Animal.vbproj
rename to 03_Animal/vbnet/Animal/Animal.vbproj
diff --git a/03_Animal/vbnet/Branch.vb b/03_Animal/vbnet/Animal/Branch.vb
similarity index 100%
rename from 03_Animal/vbnet/Branch.vb
rename to 03_Animal/vbnet/Animal/Branch.vb
diff --git a/03_Animal/vbnet/Game.vb b/03_Animal/vbnet/Animal/Game.vb
similarity index 100%
rename from 03_Animal/vbnet/Game.vb
rename to 03_Animal/vbnet/Animal/Game.vb
diff --git a/03_Animal/vbnet/Program.vb b/03_Animal/vbnet/Animal/Program.vb
similarity index 100%
rename from 03_Animal/vbnet/Program.vb
rename to 03_Animal/vbnet/Animal/Program.vb
diff --git a/03_Animal/vbnet/Shared/ConsoleAdapter.vb b/03_Animal/vbnet/Animal/Shared/ConsoleAdapter.vb
similarity index 100%
rename from 03_Animal/vbnet/Shared/ConsoleAdapter.vb
rename to 03_Animal/vbnet/Animal/Shared/ConsoleAdapter.vb
diff --git a/03_Animal/vbnet/Shared/ConsoleAdapterBase.vb b/03_Animal/vbnet/Animal/Shared/ConsoleAdapterBase.vb
similarity index 100%
rename from 03_Animal/vbnet/Shared/ConsoleAdapterBase.vb
rename to 03_Animal/vbnet/Animal/Shared/ConsoleAdapterBase.vb
diff --git a/03_Animal/vbnet/Shared/Extensions.vb b/03_Animal/vbnet/Animal/Shared/Extensions.vb
similarity index 100%
rename from 03_Animal/vbnet/Shared/Extensions.vb
rename to 03_Animal/vbnet/Animal/Shared/Extensions.vb