diff --git a/AnimationEditor/Form1.Designer.cs b/AnimationEditor/AnimationEditor.Designer.cs
similarity index 99%
rename from AnimationEditor/Form1.Designer.cs
rename to AnimationEditor/AnimationEditor.Designer.cs
index 745370c..11884a9 100644
--- a/AnimationEditor/Form1.Designer.cs
+++ b/AnimationEditor/AnimationEditor.Designer.cs
@@ -1,6 +1,6 @@
 namespace AnimationEditor
 {
-    partial class Form1
+    partial class AnimationEditor
     {
         /// <summary>
         /// Required designer variable.
@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AnimationEditor));
             this.loadSpriteSheetDialog = new System.Windows.Forms.OpenFileDialog();
             this.loadSpriteMapDialog = new System.Windows.Forms.OpenFileDialog();
             this.spriteMapListBox = new System.Windows.Forms.ListBox();
@@ -81,7 +81,7 @@
             this.animationPanel = new System.Windows.Forms.Panel();
             this.animationNameLabel = new System.Windows.Forms.Label();
             this.animationLabel = new System.Windows.Forms.Label();
-            this.animationPreview = new AnimationEditor.AnimationPreview();
+            this.animationPreview = new global::AnimationEditor.AnimationPreview();
             this.loadAnimationSetDialog = new System.Windows.Forms.OpenFileDialog();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
             this.addAnimationButton = new System.Windows.Forms.Button();
diff --git a/AnimationEditor/Form1.cs b/AnimationEditor/AnimationEditor.cs
similarity index 99%
rename from AnimationEditor/Form1.cs
rename to AnimationEditor/AnimationEditor.cs
index accc45e..0cc576c 100644
--- a/AnimationEditor/Form1.cs
+++ b/AnimationEditor/AnimationEditor.cs
@@ -32,7 +32,7 @@ using Microsoft.Xna.Framework.Content.Pipeline.Serialization.Intermediate;
 */
 namespace AnimationEditor
 {
-    public partial class Form1 : Form
+    public partial class AnimationEditor : Form
     {
         private History undoHistory;
 
@@ -62,7 +62,7 @@ namespace AnimationEditor
         private bool reading;
         private float importDelay = 0;
 
-        public Form1()
+        public AnimationEditor()
         {
             InitializeComponent();
             undoHistory = new History();
diff --git a/AnimationEditor/AnimationEditor.csproj b/AnimationEditor/AnimationEditor.csproj
index 395a76c..4bc42fe 100644
--- a/AnimationEditor/AnimationEditor.csproj
+++ b/AnimationEditor/AnimationEditor.csproj
@@ -38,6 +38,9 @@
     <Reference Include="MonoGame.Framework, Version=3.7.0.1114, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MonoGame.Forms.DX.2.1.0.2\lib\net451\MonoGame.Framework.dll</HintPath>
     </Reference>
+    <Reference Include="QURO">
+      <HintPath>..\..\QURO\QURO\bin\Release\QURO.dll</HintPath>
+    </Reference>
     <Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
     </Reference>
@@ -85,11 +88,11 @@
     <Compile Include="AnimationPreview.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Form1.cs">
+    <Compile Include="AnimationEditor.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <Compile Include="AnimationEditor.Designer.cs">
+      <DependentUpon>AnimationEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="Modifications\ModHelper.cs" />
     <Compile Include="Modifications\SelectionState.cs" />
@@ -144,8 +147,8 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Texture2DRegionExtractor.cs" />
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <EmbeddedResource Include="AnimationEditor.resx">
+      <DependentUpon>AnimationEditor.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -171,12 +174,6 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\QURO\QURO.csproj">
-      <Project>{4581e0c8-b14a-454d-9a7b-52d37535e7e9}</Project>
-      <Name>QURO</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\createnew.png" />
   </ItemGroup>
diff --git a/AnimationEditor/Form1.resx b/AnimationEditor/AnimationEditor.resx
similarity index 100%
rename from AnimationEditor/Form1.resx
rename to AnimationEditor/AnimationEditor.resx
diff --git a/AnimationEditor/Program.cs b/AnimationEditor/Program.cs
index 6db79ba..c7e8468 100644
--- a/AnimationEditor/Program.cs
+++ b/AnimationEditor/Program.cs
@@ -16,7 +16,7 @@ namespace AnimationEditor
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new Form1());
+            Application.Run(new AnimationEditor());
         }
     }
 }
diff --git a/QURO.AnimationTools.sln b/QURO.AnimationTools.sln
index 92c0953..a4ac451 100644
--- a/QURO.AnimationTools.sln
+++ b/QURO.AnimationTools.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27703.2047
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QURO", "QURO\QURO.csproj", "{4581E0C8-B14A-454D-9A7B-52D37535E7E9}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpriteMapEditor", "SpriteMapEditor\SpriteMapEditor.csproj", "{2AF6999F-93F0-4096-9BC1-863CEE5E7791}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnimationEditor", "AnimationEditor\AnimationEditor.csproj", "{01280C24-6439-4186-ABA3-5686A2B66C45}"
@@ -15,10 +13,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4581E0C8-B14A-454D-9A7B-52D37535E7E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4581E0C8-B14A-454D-9A7B-52D37535E7E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4581E0C8-B14A-454D-9A7B-52D37535E7E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4581E0C8-B14A-454D-9A7B-52D37535E7E9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2AF6999F-93F0-4096-9BC1-863CEE5E7791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2AF6999F-93F0-4096-9BC1-863CEE5E7791}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2AF6999F-93F0-4096-9BC1-863CEE5E7791}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/SpriteMapEditor/Program.cs b/SpriteMapEditor/Program.cs
index 52b809f..7970dd8 100644
--- a/SpriteMapEditor/Program.cs
+++ b/SpriteMapEditor/Program.cs
@@ -16,7 +16,7 @@ namespace SpriteMapEditor
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new Form1());
+            Application.Run(new SpriteMapEditor());
         }
     }
 }
diff --git a/SpriteMapEditor/Form1.Designer.cs b/SpriteMapEditor/SpriteMapEditor.Designer.cs
similarity index 99%
rename from SpriteMapEditor/Form1.Designer.cs
rename to SpriteMapEditor/SpriteMapEditor.Designer.cs
index cf870a4..5b8d1ff 100644
--- a/SpriteMapEditor/Form1.Designer.cs
+++ b/SpriteMapEditor/SpriteMapEditor.Designer.cs
@@ -1,6 +1,6 @@
 namespace SpriteMapEditor
 {
-    partial class Form1
+    partial class SpriteMapEditor
     {
         /// <summary>
         /// Required designer variable.
@@ -60,7 +60,7 @@
             this.loadMapDialog = new System.Windows.Forms.OpenFileDialog();
             this.saveMapDialog = new System.Windows.Forms.SaveFileDialog();
             this.spriteViewerPanel = new System.Windows.Forms.Panel();
-            this.spriteSheetViewer = new SpriteMapEditor.PictureBoxWithInterpolationMode();
+            this.spriteSheetViewer = new global::SpriteMapEditor.PictureBoxWithInterpolationMode();
             this.zoomInButton = new System.Windows.Forms.Button();
             this.zoomOutButton = new System.Windows.Forms.Button();
             this.zoomLabel = new System.Windows.Forms.Label();
diff --git a/SpriteMapEditor/Form1.cs b/SpriteMapEditor/SpriteMapEditor.cs
similarity index 99%
rename from SpriteMapEditor/Form1.cs
rename to SpriteMapEditor/SpriteMapEditor.cs
index 3485217..5eae821 100644
--- a/SpriteMapEditor/Form1.cs
+++ b/SpriteMapEditor/SpriteMapEditor.cs
@@ -19,7 +19,7 @@ using SpriteMapEditor.SpriteMapModifications;
 
 namespace SpriteMapEditor
 {
-    public partial class Form1 : Form
+    public partial class SpriteMapEditor : Form
     {
         private History undoHistory;
 
@@ -84,7 +84,7 @@ namespace SpriteMapEditor
 
         private List<Microsoft.Xna.Framework.Rectangle> preDragBounds;
 
-        public Form1()
+        public SpriteMapEditor()
         {
             InitializeComponent();
             FormBorderStyle = FormBorderStyle.Sizable;
diff --git a/SpriteMapEditor/SpriteMapEditor.csproj b/SpriteMapEditor/SpriteMapEditor.csproj
index 7c8586d..185116d 100644
--- a/SpriteMapEditor/SpriteMapEditor.csproj
+++ b/SpriteMapEditor/SpriteMapEditor.csproj
@@ -38,6 +38,9 @@
     <Reference Include="MonoGame.Framework.Content.Pipeline">
       <HintPath>C:\Program Files (x86)\MSBuild\MonoGame\v3.0\Tools\MonoGame.Framework.Content.Pipeline.dll</HintPath>
     </Reference>
+    <Reference Include="QURO">
+      <HintPath>..\..\QURO\QURO\bin\Release\QURO.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -52,11 +55,11 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DirectBitmap.cs" />
-    <Compile Include="Form1.cs">
+    <Compile Include="SpriteMapEditor.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <Compile Include="SpriteMapEditor.Designer.cs">
+      <DependentUpon>SpriteMapEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="SpriteMapModifications\ApplyOriginPreset.cs" />
     <Compile Include="SpriteMapModifications\ModHelper.cs" />
@@ -76,8 +79,8 @@
     <Compile Include="SpriteMapModifications\RemoveSprite.cs" />
     <Compile Include="SpriteMapModifications\RenameSprite.cs" />
     <Compile Include="SpriteMapProject.cs" />
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <EmbeddedResource Include="SpriteMapEditor.resx">
+      <DependentUpon>SpriteMapEditor.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -102,12 +105,6 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\QURO\QURO.csproj">
-      <Project>{4581e0c8-b14a-454d-9a7b-52d37535e7e9}</Project>
-      <Name>QURO</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="Resources\originPointer_black.png" />
   </ItemGroup>
diff --git a/SpriteMapEditor/Form1.resx b/SpriteMapEditor/SpriteMapEditor.resx
similarity index 100%
rename from SpriteMapEditor/Form1.resx
rename to SpriteMapEditor/SpriteMapEditor.resx