diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index be8a65f25..1ef4ba13b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,7 +13,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-
+        with:
+           submodules: 'recursive'
+           
       - name: Install .NET
         uses: actions/setup-dotnet@v3
         with:
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 283fbfe0a..e446fc007 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -2,7 +2,7 @@ name: NET
 
 on:
   push:
-    branches: [ "master","cai" ]
+    branches: [ "master","cai"]
     
 jobs:
   Build:
@@ -10,7 +10,9 @@ jobs:
     
     steps:
       - uses: actions/checkout@v4
-
+        with:
+           submodules: 'recursive'
+           
       - name: Initialize .NET 6
         uses: actions/setup-dotnet@v3
         env:
diff --git a/Plugin.sln b/Plugin.sln
index c8804a58c..159a14a44 100644
--- a/Plugin.sln
+++ b/Plugin.sln
@@ -140,6 +140,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShortCommand", "ShortComman
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DTEntryBlock", "DTEntryBlock\DTEntryBlock.csproj", "{1486C0F5-9A7D-4530-B73F-4D1938F0B083}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugin", "Yaaiomni\Core\Plugin.csproj", "{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Misc", "Yaaiomni\Misc\Misc.csproj", "{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGen", "Yaaiomni\SourceGen\SourceGen.csproj", "{C9B00432-3802-489F-B2D1-C27C36B17DA1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -676,6 +682,30 @@ Global
 		{1486C0F5-9A7D-4530-B73F-4D1938F0B083}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1486C0F5-9A7D-4530-B73F-4D1938F0B083}.Release|x64.ActiveCfg = Release|Any CPU
 		{1486C0F5-9A7D-4530-B73F-4D1938F0B083}.Release|x64.Build.0 = Release|Any CPU
+		{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Debug|x64.Build.0 = Debug|Any CPU
+		{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Release|x64.ActiveCfg = Release|Any CPU
+		{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Release|x64.Build.0 = Release|Any CPU
+		{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Debug|x64.Build.0 = Debug|Any CPU
+		{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Release|x64.ActiveCfg = Release|Any CPU
+		{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Release|x64.Build.0 = Release|Any CPU
+		{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Debug|x64.Build.0 = Debug|Any CPU
+		{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Release|x64.ActiveCfg = Release|Any CPU
+		{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/SimultaneousUseFix/SimultaneousUseFix.csproj b/SimultaneousUseFix/SimultaneousUseFix.csproj
index 27803bf5e..efa3a461f 100644
--- a/SimultaneousUseFix/SimultaneousUseFix.csproj
+++ b/SimultaneousUseFix/SimultaneousUseFix.csproj
@@ -3,9 +3,7 @@
 	<Import Project="..\template.targets" />
 
 	<ItemGroup>
-	  <Reference Include="Chireiden.TShock.Omni">
-	    <HintPath>..\lib\Chireiden.TShock.Omni.dll</HintPath>
-	  </Reference>
+	  <ProjectReference Include="..\Yaaiomni\Core\Plugin.csproj" />
 	</ItemGroup>
 
 </Project>