diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
index 7dadce3..abe6f49 100644
--- a/.github/workflows/nuget.yml
+++ b/.github/workflows/nuget.yml
@@ -11,6 +11,9 @@ jobs:
 
     runs-on: windows-latest
 
+    env:
+      NUGET_ENABLE_LEGACY_CSPROJ_PACK: true
+    
     steps:
     - name: Checkout
       uses: actions/checkout@v1
diff --git a/RuntimeUnityEditor.Core.IL2CPP/ILRepack.targets b/RuntimeUnityEditor.Core.IL2CPP/ILRepack.targets
deleted file mode 100644
index 8c4f85a..0000000
--- a/RuntimeUnityEditor.Core.IL2CPP/ILRepack.targets
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="ILRepacker" AfterTargets="Build">
-    <Move SourceFiles="$(OutputPath)\$(AssemblyName).dll" DestinationFiles="$(OutputPath)\$(AssemblyName)1.dll" />
-
-    <ItemGroup>
-      <InputAssemblies Include="$(OutputPath)\$(AssemblyName)1.dll" />
-      <InputAssemblies Include="$(OutputPath)\mcs.dll" />
-    </ItemGroup>
-
-    <ILRepack
-      Parallel="true"
-      Internalize="true"
-      DebugInfo="false"
-      LibraryPath="$(OutputPath)"
-      InputAssemblies="@(InputAssemblies)"
-      TargetKind="Dll"
-      TargetPlatformVersion="v2"
-      OutputFile="$(OutputPath)\$(AssemblyName).dll"
-    />
-
-    <Delete Files="@(InputAssemblies)" />
-    <Delete Files="$(OutputPath)\UnityEngine.dll" />
-    <Delete Files="$(OutputPath)\0Harmony.dll" />
-    <Delete Files="$(OutputPath)\0Harmony.xml" />
-    <Delete Files="$(OutputPath)\mcs.pdb" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/RuntimeUnityEditor.Core.IL2CPP/RuntimeUnityEditor.Core.IL2CPP.csproj b/RuntimeUnityEditor.Core.IL2CPP/RuntimeUnityEditor.Core.IL2CPP.csproj
index 2910b8b..d0c57c7 100644
--- a/RuntimeUnityEditor.Core.IL2CPP/RuntimeUnityEditor.Core.IL2CPP.csproj
+++ b/RuntimeUnityEditor.Core.IL2CPP/RuntimeUnityEditor.Core.IL2CPP.csproj
@@ -8,6 +8,8 @@
     <RootNamespace>RuntimeUnityEditor.Core</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
+    <Version>5.5</Version>
+
     <OutputPath>..\bin\IL2CPP\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
diff --git a/RuntimeUnityEditor.Core.IL2CPP/RuntimeUnityEditor.Core.csproj b/RuntimeUnityEditor.Core.IL2CPP/RuntimeUnityEditor.Core.csproj
deleted file mode 100644
index ea1aaca..0000000
--- a/RuntimeUnityEditor.Core.IL2CPP/RuntimeUnityEditor.Core.csproj
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A66A97B4-F32F-4748-8332-48F0876F0AAC}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>RuntimeUnityEditor.Core</RootNamespace>
-    <AssemblyName>RuntimeUnityEditor.Core</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>embedded</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Core\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>
-    </CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>embedded</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Core\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>
-    </CodeAnalysisRuleSet>
-    <DebugSymbols>true</DebugSymbols>
-    <DocumentationFile>..\bin\Core\RuntimeUnityEditor.Core.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="0Harmony, Version=2.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HarmonyX.2.6.0\lib\net35\0Harmony.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Mono.Cecil, Version=0.10.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.10.4\lib\net35\Mono.Cecil.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Mono.Cecil.Mdb, Version=0.10.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.10.4\lib\net35\Mono.Cecil.Mdb.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Mono.Cecil.Pdb, Version=0.10.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.10.4\lib\net35\Mono.Cecil.Pdb.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Mono.Cecil.Rocks, Version=0.10.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.10.4\lib\net35\Mono.Cecil.Rocks.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MonoMod.RuntimeDetour, Version=21.11.1.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MonoMod.RuntimeDetour.21.11.1.1\lib\net35\MonoMod.RuntimeDetour.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MonoMod.Utils, Version=21.11.1.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MonoMod.Utils.21.11.1.1\lib\net35\MonoMod.Utils.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Core">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Unity.InputSystem, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.InputSystem.1.5.0\lib\net35\Unity.InputSystem.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\IllusionLibs.HoneySelect.UnityEngine.5.3.5\lib\net35\UnityEngine.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\IllusionLibs.HoneySelect.UnityEngine.UI.5.3.5\lib\net35\UnityEngine.UI.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Features\CursorUnlocker.cs" />
-    <Compile Include="FeatureBase.cs" />
-    <Compile Include="Features\Gizmos\lib\Constants.cs" />
-    <Compile Include="Features\Gizmos\lib\Drawer.cs" />
-    <Compile Include="Features\Gizmos\lib\Drawers\CubeDrawer.cs" />
-    <Compile Include="Features\Gizmos\lib\Drawers\LineDrawer.cs" />
-    <Compile Include="Features\Gizmos\lib\Drawers\ArcDrawer.cs" />
-    <Compile Include="Features\Gizmos\lib\Drawers\PolygonDrawer.cs" />
-    <Compile Include="Features\Gizmos\lib\Drawers\SquareDrawer.cs" />
-    <Compile Include="Features\Gizmos\lib\Element.cs" />
-    <Compile Include="Features\Gizmos\lib\Gizmos.cs" />
-    <Compile Include="Features\Gizmos\lib\GizmosInstance.cs" />
-    <Compile Include="Utils\Abstractions\InitSettings.cs" />
-    <Compile Include="Utils\MovingAverage.cs" />
-    <Compile Include="Utils\ObjectDumper\Dumper.cs" />
-    <Compile Include="Utils\ObjectDumper\MeshExport.cs" />
-    <Compile Include="Utils\ObjectDumper\ObjectDumperExtensions.cs" />
-    <Compile Include="WindowBase.cs" />
-    <Compile Include="Features\WireframeFeature.cs" />
-    <Compile Include="Features\ContextMenu.cs" />
-    <Compile Include="Windows\ChangeHistory\Change.cs" />
-    <Compile Include="Windows\ChangeHistory\ChangeAction.cs" />
-    <Compile Include="Windows\ChangeHistory\ChangeHistoryWindow.cs" />
-    <Compile Include="Windows\ChangeHistory\IChange.cs" />
-    <Compile Include="Windows\Clipboard\ClipboardWindow.cs" />
-    <Compile Include="Windows\Inspector\Entries\Contents\EventCacheEntry.cs" />
-    <Compile Include="Utils\OrderedSet.cs" />
-    <Compile Include="ScreenPartition.cs" />
-    <Compile Include="Windows\ChangeHistory\ChangeAssignment.cs" />
-    <Compile Include="Windows\Taskbar.cs" />
-    <Compile Include="WindowManager.cs" />
-    <Compile Include="Windows\Profiler\ProfilerWindow.cs" />
-    <Compile Include="Utils\Abstractions\UnityInput.cs" />
-    <Compile Include="Utils\Abstractions\DnSpyHelper.cs" />
-    <Compile Include="Windows\Inspector\VariableFieldDrawer.cs" />
-    <Compile Include="Windows\Inspector\Inspector.InspectorTab.cs" />
-    <Compile Include="Windows\ObjectView\ObjectViewWindow.cs" />
-    <Compile Include="Utils\Abstractions\AssetBundleManagerHelper.cs" />
-    <Compile Include="Windows\ObjectTree\RootGameObjectSearcher.cs" />
-    <Compile Include="Utils\Abstractions\ILoggerWrapper.cs" />
-    <Compile Include="Windows\Inspector\Entries\Contents\CallbackCacheEntey.cs" />
-    <Compile Include="Windows\Inspector\Entries\Contents\ReadonlyListCacheEntry.cs" />
-    <Compile Include="Windows\Inspector\Entries\Inspector\InstanceStackEntry.cs" />
-    <Compile Include="Windows\Inspector\Entries\Inspector\StaticStackEntry.cs" />
-    <Compile Include="Windows\Inspector\Inspector.cs" />
-    <Compile Include="Windows\Inspector\Entries\Contents\CacheEntryBase.cs" />
-    <Compile Include="Windows\Inspector\InspectorHelpObject.cs" />
-    <Compile Include="Utils\Abstractions\LogLevel.cs" />
-    <Compile Include="Features\Gizmos\GizmoDrawer.cs" />
-    <Compile Include="Windows\ObjectTree\ObjectTreeViewer.cs" />
-    <Compile Include="Windows\REPL\MCS\ScriptEvaluator.cs" />
-    <Compile Include="Windows\REPL\REPL.cs" />
-    <Compile Include="Windows\REPL\ReplHelper.cs" />
-    <Compile Include="Windows\REPL\Suggestion.cs" />
-    <Compile Include="Windows\REPL\SuggestionKind.cs" />
-    <Compile Include="Windows\REPL\TypeHelper.cs" />
-    <Compile Include="Windows\REPL\REPLWindow.cs" />
-    <Compile Include="RuntimeUnityEditorCore.cs" />
-    <Compile Include="Utils\TextureUtils.cs" />
-    <Compile Include="Utils\Abstractions\OpenFileDialog.cs" />
-    <Compile Include="Utils\IMGUIUtils.cs" />
-    <Compile Include="Utils\Abstractions\DataUtility.cs" />
-    <Compile Include="Features\MouseInspect.cs" />
-    <Compile Include="Utils\ComboBox.cs" />
-    <Compile Include="Utils\ReflectionUtils.cs" />
-    <Compile Include="Utils\TomlTypeConverter.cs" />
-    <Compile Include="Utils\EditorUtilities.cs" />
-    <Compile Include="Utils\Extensions.cs" />
-    <Compile Include="Windows\Inspector\Entries\Contents\FieldCacheEntry.cs" />
-    <Compile Include="Windows\Inspector\Entries\Contents\ICacheEntry.cs" />
-    <Compile Include="Windows\Inspector\Entries\Inspector\InspectorStackEntryBase.cs" />
-    <Compile Include="Windows\Inspector\Entries\Contents\ListCacheEntry.cs" />
-    <Compile Include="Windows\Inspector\Entries\Contents\MethodCacheEntry.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Windows\Inspector\Entries\Contents\PropertyCacheEntry.cs" />
-    <Compile Include="Windows\Inspector\Entries\Contents\ReadonlyCacheEntry.cs" />
-    <Compile Include="Utils\UI\InterfaceMaker.cs" />
-    <Compile Include="Utils\ResourceUtils.cs" />
-    <Compile Include="Utils\SceneDumper.cs" />
-    <Compile Include="Windows\Inspector\ToStringConverter.cs" />
-    <Compile Include="Utils\TypeNameExtensions.cs" />
-    <Compile Include="Utils\Abstractions\UnityFeatureHelper.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\LICENSE">
-      <Link>LICENSE</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\README.md">
-      <Link>README.md</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="ILRepack.targets" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Utils\UI\guisharp-box.png" />
-    <EmbeddedResource Include="Utils\UI\guisharp-window.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\modules\mcs\mcs\mcs.csproj">
-      <Project>{e4989e4c-0875-4528-9031-08e2c0e70103}</Project>
-      <Name>mcs</Name>
-      <Private>True</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\ILRepack.Lib.MSBuild.Task.2.0.16.1\build\ILRepack.Lib.MSBuild.Task.targets" Condition="Exists('..\packages\ILRepack.Lib.MSBuild.Task.2.0.16.1\build\ILRepack.Lib.MSBuild.Task.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\ILRepack.Lib.MSBuild.Task.2.0.16.1\build\ILRepack.Lib.MSBuild.Task.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILRepack.Lib.MSBuild.Task.2.0.16.1\build\ILRepack.Lib.MSBuild.Task.targets'))" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/RuntimeUnityEditor.Core.IL2CPP/packages.config b/RuntimeUnityEditor.Core.IL2CPP/packages.config
deleted file mode 100644
index eec00f8..0000000
--- a/RuntimeUnityEditor.Core.IL2CPP/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="HarmonyX" version="2.6.0" targetFramework="net35" developmentDependency="true" />
-  <package id="IllusionLibs.HoneySelect.UnityEngine" version="5.3.5" targetFramework="net35" developmentDependency="true" />
-  <package id="IllusionLibs.HoneySelect.UnityEngine.UI" version="5.3.5" targetFramework="net35" developmentDependency="true" />
-  <package id="ILRepack.Lib.MSBuild.Task" version="2.0.16.1" targetFramework="net35" developmentDependency="true" />
-  <package id="Mono.Cecil" version="0.10.4" targetFramework="net35" developmentDependency="true" />
-  <package id="MonoMod.RuntimeDetour" version="21.11.1.1" targetFramework="net35" developmentDependency="true" />
-  <package id="MonoMod.Utils" version="21.11.1.1" targetFramework="net35" developmentDependency="true" />
-  <package id="Unity.InputSystem" version="1.5.0" targetFramework="net35" developmentDependency="true" />
-</packages>
\ No newline at end of file
diff --git a/RuntimeUnityEditor.Core.Mono/RuntimeUnityEditor.Core.nuspec b/RuntimeUnityEditor.Core.Mono/RuntimeUnityEditor.Core.Mono.nuspec
similarity index 100%
rename from RuntimeUnityEditor.Core.Mono/RuntimeUnityEditor.Core.nuspec
rename to RuntimeUnityEditor.Core.Mono/RuntimeUnityEditor.Core.Mono.nuspec