diff --git a/TShockLauncher/Program.cs b/TShockLauncher/Program.cs
index 4a139370..84ddedc1 100644
--- a/TShockLauncher/Program.cs
+++ b/TShockLauncher/Program.cs
@@ -27,22 +27,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 using System.Reflection;
-using TShockPluginManager;
-
-if (args.Length > 0 && args[0].ToLower() == "plugins")
-{
-	var items = args.ToList();
-	items.RemoveAt(0);
-	await NugetCLI.Main(items);
-	return;
-}
-
 
 Dictionary<string, Assembly> _cache = new Dictionary<string, Assembly>();
 
 System.Runtime.Loader.AssemblyLoadContext.Default.Resolving += Default_Resolving;
 
-Start();
+await StartAsync();
 
 /// <summary>
 /// Resolves a module from the ./bin folder, either with a .dll by preference or .exe
@@ -53,6 +43,7 @@ Assembly? Default_Resolving(System.Runtime.Loader.AssemblyLoadContext arg1, Asse
 	if (_cache.TryGetValue(arg2.Name, out Assembly? asm) && asm is not null) return asm;
 
 	var loc = Path.Combine(AppContext.BaseDirectory, "bin", arg2.Name + ".dll");
+
 	if (File.Exists(loc))
 		asm = arg1.LoadFromAssemblyPath(loc);
 
@@ -70,7 +61,15 @@ Assembly? Default_Resolving(System.Runtime.Loader.AssemblyLoadContext arg1, Asse
 /// Initiates the TSAPI server.
 /// </summary>
 /// <remarks>This method exists so that the resolver can attach before TSAPI needs its dependencies.</remarks>
-void Start()
+async Task StartAsync()
 {
+	if (args.Length > 0 && args[0].ToLower() == "plugins")
+	{
+		var items = args.ToList();
+		items.RemoveAt(0);
+		await TShockPluginManager.NugetCLI.Main(items);
+		return;
+	}
+
 	TerrariaApi.Server.Program.Main(args);
 }
diff --git a/TShockLauncher/TShockLauncher.csproj b/TShockLauncher/TShockLauncher.csproj
index 80cd8bd5..0e1c5b76 100644
--- a/TShockLauncher/TShockLauncher.csproj
+++ b/TShockLauncher/TShockLauncher.csproj
@@ -91,7 +91,13 @@
 		</ItemGroup>
 		<Copy SourceFiles="@(MOFiles)" DestinationFolder="$(PublishDir)%(RecursiveDir)" />
 	</Target>
-	<Target Name="MoveBin" AfterTargets="Publish">
+	<Target Name="MoveDevBin" AfterTargets="PostBuildEvent">
+		<ItemGroup>
+			<MoveBinaries Include="$(OutDir)*" Exclude="$(OutDir)\TShock.Server*;$(OutDir)\GeoIP.dat" />
+		</ItemGroup>
+		<Move SourceFiles="@(MoveBinaries)" DestinationFolder="$(OutDir)bin" ContinueOnError="true" />
+	</Target>
+	<Target Name="MovePublishBin" AfterTargets="Publish">
 		<ItemGroup>
 			<MoveBinaries Include="$(PublishDir)*" Exclude="$(PublishDir)\TShock.Server*;$(PublishDir)\GeoIP.dat" />
 		</ItemGroup>