diff --git a/BSBshared/BSBshared.csproj b/BSBshared/BSBshared.csproj
index 1ccdaaf..ebad046 100644
--- a/BSBshared/BSBshared.csproj
+++ b/BSBshared/BSBshared.csproj
@@ -16,8 +16,6 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\libremetaverse-core\Libremetaverse.structureddata\LibreMetaverse.StructuredData.csproj" />
-    <ProjectReference Include="..\libremetaverse-core\Libremetaversetypes\LibreMetaverse.Types.csproj" />
     <ProjectReference Include="..\libremetaverse-core\Libremetaverse\LibreMetaverse.csproj" />
   </ItemGroup>
 </Project>
diff --git a/BetterSecondBot.sln b/BetterSecondBot.sln
index 311993b..dfad9a1 100644
--- a/BetterSecondBot.sln
+++ b/BetterSecondBot.sln
@@ -8,11 +8,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BetterSecondBot", "CLI\Bett
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BSBshared", "BSBshared\BSBshared.csproj", "{42075C8C-8055-4178-8C12-AE97DAFE8484}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse", "libremetaverse-core\Libremetaverse\LibreMetaverse.csproj", "{748DEFDD-B7EF-4E67-907C-33C8B2F0C221}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse", "libremetaverse-core\Libremetaverse\LibreMetaverse.csproj", "{4AD32FB5-F8E9-4BFF-9F37-293D28929322}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.StructuredData", "libremetaverse-core\Libremetaverse.structureddata\LibreMetaverse.StructuredData.csproj", "{9B42196B-00EC-4F33-B78D-8B693B23E56D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.StructuredData", "libremetaverse-core\Libremetaverse.structureddata\LibreMetaverse.StructuredData.csproj", "{9A317423-2218-4E91-86CD-588A19396387}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.Types", "libremetaverse-core\Libremetaversetypes\LibreMetaverse.Types.csproj", "{53663A03-7508-4D44-9B08-79BEB6AAB47E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.Types", "libremetaverse-core\Libremetaversetypes\LibreMetaverse.Types.csproj", "{C416FB6E-CBA0-4482-8317-5547D8950247}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,24 +39,24 @@ Global
 		{42075C8C-8055-4178-8C12-AE97DAFE8484}.DockerBuild|x64.Build.0 = DockerBuild|x64
 		{42075C8C-8055-4178-8C12-AE97DAFE8484}.Release|x64.ActiveCfg = Release|x64
 		{42075C8C-8055-4178-8C12-AE97DAFE8484}.Release|x64.Build.0 = Release|x64
-		{748DEFDD-B7EF-4E67-907C-33C8B2F0C221}.Debug|x64.ActiveCfg = Debug|x64
-		{748DEFDD-B7EF-4E67-907C-33C8B2F0C221}.Debug|x64.Build.0 = Debug|x64
-		{748DEFDD-B7EF-4E67-907C-33C8B2F0C221}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
-		{748DEFDD-B7EF-4E67-907C-33C8B2F0C221}.DockerBuild|x64.Build.0 = DockerBuild|x64
-		{748DEFDD-B7EF-4E67-907C-33C8B2F0C221}.Release|x64.ActiveCfg = Release|x64
-		{748DEFDD-B7EF-4E67-907C-33C8B2F0C221}.Release|x64.Build.0 = Release|x64
-		{9B42196B-00EC-4F33-B78D-8B693B23E56D}.Debug|x64.ActiveCfg = Debug|x64
-		{9B42196B-00EC-4F33-B78D-8B693B23E56D}.Debug|x64.Build.0 = Debug|x64
-		{9B42196B-00EC-4F33-B78D-8B693B23E56D}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
-		{9B42196B-00EC-4F33-B78D-8B693B23E56D}.DockerBuild|x64.Build.0 = DockerBuild|x64
-		{9B42196B-00EC-4F33-B78D-8B693B23E56D}.Release|x64.ActiveCfg = Release|x64
-		{9B42196B-00EC-4F33-B78D-8B693B23E56D}.Release|x64.Build.0 = Release|x64
-		{53663A03-7508-4D44-9B08-79BEB6AAB47E}.Debug|x64.ActiveCfg = Debug|x64
-		{53663A03-7508-4D44-9B08-79BEB6AAB47E}.Debug|x64.Build.0 = Debug|x64
-		{53663A03-7508-4D44-9B08-79BEB6AAB47E}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
-		{53663A03-7508-4D44-9B08-79BEB6AAB47E}.DockerBuild|x64.Build.0 = DockerBuild|x64
-		{53663A03-7508-4D44-9B08-79BEB6AAB47E}.Release|x64.ActiveCfg = Release|x64
-		{53663A03-7508-4D44-9B08-79BEB6AAB47E}.Release|x64.Build.0 = Release|x64
+		{4AD32FB5-F8E9-4BFF-9F37-293D28929322}.Debug|x64.ActiveCfg = Debug|x64
+		{4AD32FB5-F8E9-4BFF-9F37-293D28929322}.Debug|x64.Build.0 = Debug|x64
+		{4AD32FB5-F8E9-4BFF-9F37-293D28929322}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
+		{4AD32FB5-F8E9-4BFF-9F37-293D28929322}.DockerBuild|x64.Build.0 = DockerBuild|x64
+		{4AD32FB5-F8E9-4BFF-9F37-293D28929322}.Release|x64.ActiveCfg = Release|x64
+		{4AD32FB5-F8E9-4BFF-9F37-293D28929322}.Release|x64.Build.0 = Release|x64
+		{9A317423-2218-4E91-86CD-588A19396387}.Debug|x64.ActiveCfg = Debug|x64
+		{9A317423-2218-4E91-86CD-588A19396387}.Debug|x64.Build.0 = Debug|x64
+		{9A317423-2218-4E91-86CD-588A19396387}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
+		{9A317423-2218-4E91-86CD-588A19396387}.DockerBuild|x64.Build.0 = DockerBuild|x64
+		{9A317423-2218-4E91-86CD-588A19396387}.Release|x64.ActiveCfg = Release|x64
+		{9A317423-2218-4E91-86CD-588A19396387}.Release|x64.Build.0 = Release|x64
+		{C416FB6E-CBA0-4482-8317-5547D8950247}.Debug|x64.ActiveCfg = Debug|x64
+		{C416FB6E-CBA0-4482-8317-5547D8950247}.Debug|x64.Build.0 = Debug|x64
+		{C416FB6E-CBA0-4482-8317-5547D8950247}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
+		{C416FB6E-CBA0-4482-8317-5547D8950247}.DockerBuild|x64.Build.0 = DockerBuild|x64
+		{C416FB6E-CBA0-4482-8317-5547D8950247}.Release|x64.ActiveCfg = Release|x64
+		{C416FB6E-CBA0-4482-8317-5547D8950247}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/libremetaverse-core/LibreMetaverse.sln b/libremetaverse-core/LibreMetaverse.sln
index a76de61..bd681e2 100644
--- a/libremetaverse-core/LibreMetaverse.sln
+++ b/libremetaverse-core/LibreMetaverse.sln
@@ -6,8 +6,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse", "LibreMeta
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.StructuredData", "LibreMetaverse.StructuredData\LibreMetaverse.StructuredData.csproj", "{89D7A3E5-0000-0000-0000-000000000000}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.Tests", "LibreMetaverse.Tests\LibreMetaverse.Tests.csproj", "{0CCC2C3D-0000-0000-0000-000000000000}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.Types", "LibreMetaverseTypes\LibreMetaverse.Types.csproj", "{B37B02AD-0000-0000-0000-000000000000}"
 EndProject
 Global
@@ -17,30 +15,21 @@ Global
 		ReleaseNoGui|Any CPU = ReleaseNoGui|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{27C70F3A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27C70F3A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27C70F3A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27C70F3A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27C70F3A-0000-0000-0000-000000000000}.ReleaseNoGui|Any CPU.ActiveCfg = Release|Any CPU
-		{27C70F3A-0000-0000-0000-000000000000}.ReleaseNoGui|Any CPU.Build.0 = Release|Any CPU
-		{89D7A3E5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89D7A3E5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89D7A3E5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89D7A3E5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89D7A3E5-0000-0000-0000-000000000000}.ReleaseNoGui|Any CPU.ActiveCfg = Release|Any CPU
-		{89D7A3E5-0000-0000-0000-000000000000}.ReleaseNoGui|Any CPU.Build.0 = Release|Any CPU
-		{0CCC2C3D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0CCC2C3D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0CCC2C3D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0CCC2C3D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0CCC2C3D-0000-0000-0000-000000000000}.ReleaseNoGui|Any CPU.ActiveCfg = Release|Any CPU
-		{0CCC2C3D-0000-0000-0000-000000000000}.ReleaseNoGui|Any CPU.Build.0 = Release|Any CPU
-		{B37B02AD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B37B02AD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B37B02AD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B37B02AD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B37B02AD-0000-0000-0000-000000000000}.ReleaseNoGui|Any CPU.ActiveCfg = Release|Any CPU
-		{B37B02AD-0000-0000-0000-000000000000}.ReleaseNoGui|Any CPU.Build.0 = Release|Any CPU
+		{27C70F3A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{27C70F3A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|x64
+		{27C70F3A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|x64
+		{27C70F3A-0000-0000-0000-000000000000}.ReleaseNoGui|Any CPU.ActiveCfg = DockerBuild|x64
+		{27C70F3A-0000-0000-0000-000000000000}.ReleaseNoGui|Any CPU.Build.0 = DockerBuild|x64
+		{89D7A3E5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{89D7A3E5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|x64
+		{89D7A3E5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|x64
+		{89D7A3E5-0000-0000-0000-000000000000}.ReleaseNoGui|Any CPU.ActiveCfg = DockerBuild|x64
+		{89D7A3E5-0000-0000-0000-000000000000}.ReleaseNoGui|Any CPU.Build.0 = DockerBuild|x64
+		{B37B02AD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{B37B02AD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|x64
+		{B37B02AD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|x64
+		{B37B02AD-0000-0000-0000-000000000000}.ReleaseNoGui|Any CPU.ActiveCfg = DockerBuild|x64
+		{B37B02AD-0000-0000-0000-000000000000}.ReleaseNoGui|Any CPU.Build.0 = DockerBuild|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE