diff --git a/.gitignore b/.gitignore
index cd88c055..a9e64663 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,8 @@
 ###################
 *.com
 *.class
-*.dll
-*.exe
+
+
 *.o
 *.so
 */bin/*
diff --git a/DBEditor/Main.cs b/DBEditor/Main.cs
index 77a485ad..40c5388f 100644
--- a/DBEditor/Main.cs
+++ b/DBEditor/Main.cs
@@ -6,8 +6,9 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.IO;
-using MySql.Data.MySqlClient;
 using Community.CsharpSqlite.SQLiteClient;
+using MySql.Data.MySqlClient;
+
 using System.Windows.Forms;
 
 namespace TShockDBEditor
diff --git a/DBEditor/TShockDBEditor.csproj b/DBEditor/TShockDBEditor.csproj
index 5b6091c2..dd92788f 100644
--- a/DBEditor/TShockDBEditor.csproj
+++ b/DBEditor/TShockDBEditor.csproj
@@ -14,6 +14,21 @@
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -35,19 +50,16 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Community.CsharpSqlite">
-      <HintPath>..\..\..\..\..\..\Public\Documents\C3Mod\TShock Testing Environment\Community.CsharpSqlite.dll</HintPath>
-    </Reference>
     <Reference Include="Community.CsharpSqlite.SQLiteClient">
-      <HintPath>..\..\..\..\..\..\Public\Documents\C3Mod\TShock Testing Environment\Community.CsharpSqlite.SQLiteClient.dll</HintPath>
+      <HintPath>..\SqlBins\Community.CsharpSqlite.SQLiteClient.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data, Version=6.3.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\Public\Documents\C3Mod\TShock Testing Environment\MySql.Data.dll</HintPath>
+      <HintPath>..\SqlBins\MySql.Data.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Web, Version=6.3.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\Public\Documents\C3Mod\TShock Testing Environment\MySql.Web.dll</HintPath>
+      <HintPath>..\SqlBins\MySql.Web.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -100,6 +112,28 @@
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/TShockAPI/SqlBins/Community.CsharpSqlite.SQLiteClient.dll b/SqlBins/Community.CsharpSqlite.SQLiteClient.dll
similarity index 100%
rename from TShockAPI/SqlBins/Community.CsharpSqlite.SQLiteClient.dll
rename to SqlBins/Community.CsharpSqlite.SQLiteClient.dll
diff --git a/TShockAPI/SqlBins/Community.CsharpSqlite.dll b/SqlBins/Community.CsharpSqlite.dll
similarity index 100%
rename from TShockAPI/SqlBins/Community.CsharpSqlite.dll
rename to SqlBins/Community.CsharpSqlite.dll
diff --git a/TShockAPI/SqlBins/MySql.Data.dll b/SqlBins/MySql.Data.dll
similarity index 100%
rename from TShockAPI/SqlBins/MySql.Data.dll
rename to SqlBins/MySql.Data.dll
diff --git a/TShockAPI/SqlBins/MySql.Web.dll b/SqlBins/MySql.Web.dll
similarity index 100%
rename from TShockAPI/SqlBins/MySql.Web.dll
rename to SqlBins/MySql.Web.dll
diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index 6cef2940..59ae6194 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -48,19 +48,20 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Community.CsharpSqlite.SQLiteClient">
-      <HintPath>SqlBins\Community.CsharpSqlite.SQLiteClient.dll</HintPath>
+    <Reference Include="Community.CsharpSqlite.SQLiteClient, Version=3.7.5.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\SqlBins\Community.CsharpSqlite.SQLiteClient.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
     <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
     <Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
     <Reference Include="MySql.Data, Version=6.3.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>SqlBins\MySql.Data.dll</HintPath>
+      <HintPath>..\SqlBins\MySql.Data.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Web, Version=6.3.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>SqlBins\MySql.Web.dll</HintPath>
+      <HintPath>..\SqlBins\MySql.Web.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>.\Newtonsoft.Json.dll</HintPath>
@@ -162,7 +163,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_StartDate="2011/6/17" BuildVersion_IncrementBeforeBuild="False" />
+      <UserProperties BuildVersion_IncrementBeforeBuild="False" BuildVersion_StartDate="2011/6/17" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_BuildAction="Both" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Terraria.sln b/Terraria.sln
index ec50424c..bb07cd98 100644
--- a/Terraria.sln
+++ b/Terraria.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TShockAPI", "TShockAPI\TShockAPI.csproj", "{49606449-072B-4CF5-8088-AA49DA586694}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TShockDBEditor", "..\dbeditor\DBEditor\TShockDBEditor.csproj", "{F1AE395C-6B4D-40E0-8BF8-0D8A126488D3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TShockDBEditor", "DBEditor\TShockDBEditor.csproj", "{F1AE395C-6B4D-40E0-8BF8-0D8A126488D3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/TShockAPI/TerrariaServerBins/TerrariaServer.exe b/TerrariaServerBins/TerrariaServer.exe
similarity index 100%
rename from TShockAPI/TerrariaServerBins/TerrariaServer.exe
rename to TerrariaServerBins/TerrariaServer.exe
diff --git a/TShockAPI/TerrariaServerBins/TerrariaServerAPI.dll b/TerrariaServerBins/TerrariaServerAPI.dll
similarity index 100%
rename from TShockAPI/TerrariaServerBins/TerrariaServerAPI.dll
rename to TerrariaServerBins/TerrariaServerAPI.dll
diff --git a/TShockAPI/TerrariaServerBins/XNAHelpers.dll b/TerrariaServerBins/XNAHelpers.dll
similarity index 100%
rename from TShockAPI/TerrariaServerBins/XNAHelpers.dll
rename to TerrariaServerBins/XNAHelpers.dll