diff --git a/DataNode.cs b/DataNode.cs
deleted file mode 100644
index ef3248d..0000000
--- a/DataNode.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using Substrate.Core;
-using Substrate.Nbt;
-using System.Collections.Generic;
-using System;
-using System.Windows.Forms;
-
-namespace NBTExplorer
-{
-    public class DataNodeOld
-    {
-        public DataNodeOld ()
-        {
-        }
-
-        public DataNodeOld (DataNodeOld parent)
-        {
-            Parent = parent;
-        }
-
-        public DataNodeOld Parent { get; set; }
-
-        private bool _modified;
-        public bool Modified
-        {
-            get { return _modified; }
-            set
-            {
-                if (value && Parent != null) {
-                    Parent.Modified = value;
-                }
-                _modified = value;
-            }
-        }
-
-        public bool Expanded { get; set; }
-    }
-
-    public class NbtDataNode : DataNodeOld
-    {
-        public NbtDataNode ()
-        {
-        }
-
-        public NbtDataNode (DataNodeOld parent)
-            : base(parent)
-        {
-        }
-
-        public NbtTree Tree { get; set; }
-    }
-
-    public class RegionChunkData : NbtDataNode
-    {
-        public RegionChunkData (RegionFile file, int x, int z)
-            : this(null, file, x, z)
-        {
-        }
-
-        public RegionChunkData (DataNodeOld parent, RegionFile file, int x, int z)
-            : base(parent)
-        {
-            Region = file;
-            X = x;
-            Z = z;
-        }
-
-        public RegionFile Region { get; private set; }
-        public int X { get; private set; }
-        public int Z { get; private set; }
-    }
-
-    public class RegionData : DataNodeOld
-    {
-        public RegionData (string path)
-            : this(null, path)
-        {
-        }
-
-        public RegionData (DataNodeOld parent, string path)
-            : base(parent)
-        {
-            Path = path;
-        }
-
-        public string Path { get; private set; }
-    }
-
-    public class NbtFileData : NbtDataNode
-    {
-        public NbtFileData (string path, CompressionType cztype)
-            : this(null, path, cztype)
-        {
-        }
-
-        public NbtFileData (DataNodeOld parent, string path, CompressionType cztype)
-            : base(parent)
-        {
-            Path = path;
-            CompressionType = cztype;
-        }
-
-        public string Path { get; private set; }
-        public CompressionType CompressionType { get; private set; }
-    }
-
-    public class DirectoryData : DataNodeOld
-    {
-        public DirectoryData (string path)
-            : this(null, path)
-        {
-        }
-
-        public DirectoryData (DataNodeOld parent, string path)
-            : base(parent)
-        {
-            Path = path;
-        }
-
-        public string Path { get; private set; }
-    }
-}
diff --git a/FormRegistry.cs b/FormRegistry.cs
new file mode 100644
index 0000000..770959b
--- /dev/null
+++ b/FormRegistry.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using Substrate.Nbt;
+
+namespace NBTExplorer
+{
+    public static class FormRegistry
+    {
+        public delegate bool EditStringAction (StringFormData data);
+        public delegate bool EditRestrictedStringAction (RestrictedStringFormData data);
+        public delegate bool EditTagScalarAction (TagScalarFormData data);
+        public delegate bool EditByteArrayAction (ByteArrayFormData data);
+
+        public static EditStringAction EditString { get; set; }
+        public static EditRestrictedStringAction RenameTag { get; set; }
+        public static EditTagScalarAction EditTagScalar { get; set; }
+        public static EditByteArrayAction EditByteArray { get; set; }
+    }
+
+    public class TagScalarFormData
+    {
+        public TagScalarFormData (TagNode tag)
+        {
+            Tag = tag;
+        }
+        
+        public TagNode Tag { get; private set; }
+    }
+
+    public class StringFormData
+    {
+        public StringFormData (String value)
+        {
+            Value = value;
+        }
+
+        public String Value { get; set; }
+    }
+
+    public class RestrictedStringFormData : StringFormData
+    {
+        private List<String> _restricted = new List<string>();
+
+        public RestrictedStringFormData (String value)
+            : base(value)
+        {
+        }
+
+        public List<String> RestrictedValues
+        {
+            get { return _restricted; }
+        }
+    }
+
+    public class ByteArrayFormData
+    {
+        public string NodeName { get; set; }
+        public int BytesPerElement { get; set; }
+        public byte[] Data { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Model/TagCompoundDataNode.cs b/Model/TagCompoundDataNode.cs
index d4810ae..e6a36d5 100644
--- a/Model/TagCompoundDataNode.cs
+++ b/Model/TagCompoundDataNode.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
+using NBTExplorer.Windows;
 using Substrate.Nbt;
 
 namespace NBTExplorer.Model
diff --git a/Model/TagDataNode.cs b/Model/TagDataNode.cs
index 9ddc61f..0631752 100644
--- a/Model/TagDataNode.cs
+++ b/Model/TagDataNode.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Windows.Forms;
+//susing System.Windows.Forms;
 using Substrate.Nbt;
 
 namespace NBTExplorer.Model
@@ -221,11 +221,12 @@ namespace NBTExplorer.Model
 
         public override bool RenameNode ()
         {
-            if (CanRenameNode && TagParent.IsNamedContainer) {
-                EditName form = new EditName(TagParent.NamedTagContainer.GetTagName(Tag));
-                form.InvalidNames.AddRange(TagParent.NamedTagContainer.TagNamesInUse);
-                if (form.ShowDialog() == DialogResult.OK && form.IsModified) {
-                    if (TagParent.NamedTagContainer.RenameTag(Tag, form.TagName)) {
+            if (CanRenameNode && TagParent.IsNamedContainer && FormRegistry.EditString != null) {
+                RestrictedStringFormData data = new RestrictedStringFormData(TagParent.NamedTagContainer.GetTagName(Tag));
+                data.RestrictedValues.AddRange(TagParent.NamedTagContainer.TagNamesInUse);
+
+                if (FormRegistry.RenameTag(data)) {
+                    if (TagParent.NamedTagContainer.RenameTag(Tag, data.Value)) {
                         IsModified = true;
                         return true;
                     }
@@ -284,61 +285,77 @@ namespace NBTExplorer.Model
 
         protected bool EditScalarValue (TagNode tag)
         {
-            EditValue form = new EditValue(tag);
-            if (form.ShowDialog() == DialogResult.OK) {
-                IsModified = true;
-                return true;
+            if (FormRegistry.EditTagScalar != null) {
+                if (FormRegistry.EditTagScalar(new TagScalarFormData(tag))) {
+                    IsModified = true;
+                    return true;
+                }
             }
-            else
-                return false;
+            return false;
         }
 
         protected bool EditStringValue (TagNode tag)
         {
-            EditString form = new EditString(tag.ToTagString().Data);
-            if (form.ShowDialog() == DialogResult.OK) {
-                tag.ToTagString().Data = form.StringValue;
-
-                IsModified = true;
-                return true;
+            if (FormRegistry.EditString != null) {
+                StringFormData data = new StringFormData(tag.ToTagString().Data);
+                if (FormRegistry.EditString(data)) {
+                    tag.ToTagString().Data = data.Value;
+                    IsModified = true;
+                    return true;
+                }
             }
-            else
-                return false;
+            return false;
         }
 
         protected bool EditByteHexValue (TagNode tag)
         {
-            HexEditor form = new HexEditor(NodeName, tag.ToTagByteArray().Data, 1);
-            if (form.ShowDialog() == DialogResult.OK && form.Modified) {
-                Array.Copy(form.Data, tag.ToTagByteArray().Data, tag.ToTagByteArray().Length);
+            if (FormRegistry.EditByteArray != null) {
+                byte[] byteData = new byte[tag.ToTagByteArray().Length];
+                Array.Copy(tag.ToTagByteArray().Data, byteData, byteData.Length);
 
-                IsModified = true;
-                return true;
+                ByteArrayFormData data = new ByteArrayFormData() {
+                    NodeName = NodeName,
+                    BytesPerElement = 1,
+                    Data = byteData,
+                };
+
+                if (FormRegistry.EditByteArray(data)) {
+                    Array.Copy(data.Data, tag.ToTagByteArray().Data, tag.ToTagByteArray().Length);
+                    IsModified = true;
+                    return true;
+                }
             }
-            else
-                return false;
+
+            return false;
         }
 
         protected bool EditIntHexValue (TagNode tag)
         {
-            TagNodeIntArray iatag = tag.ToTagIntArray();
-            byte[] data = new byte[iatag.Length * 4];
-            for (int i = 0; i < iatag.Length; i++) {
-                byte[] buf = BitConverter.GetBytes(iatag.Data[i]);
-                Array.Copy(buf, 0, data, 4 * i, 4);
-            }
-
-            HexEditor form = new HexEditor(NodeName, data, 4);
-            if (form.ShowDialog() == DialogResult.OK && form.Modified) {
+            if (FormRegistry.EditByteArray != null) {
+                TagNodeIntArray iatag = tag.ToTagIntArray();
+                byte[] byteData = new byte[iatag.Length * 4];
                 for (int i = 0; i < iatag.Length; i++) {
-                    iatag.Data[i] = BitConverter.ToInt32(form.Data, i * 4);
+                    byte[] buf = BitConverter.GetBytes(iatag.Data[i]);
+                    Array.Copy(buf, 0, byteData, 4 * i, 4);
                 }
 
-                IsModified = true;
-                return true;
+                ByteArrayFormData data = new ByteArrayFormData() {
+                    NodeName = NodeName,
+                    BytesPerElement = 4,
+                    Data = byteData,
+                };
+
+                if (FormRegistry.EditByteArray(data)) {
+                    for (int i = 0; i < iatag.Length; i++) {
+                        iatag.Data[i] = BitConverter.ToInt32(data.Data, i * 4);
+                    }
+
+                    IsModified = true;
+                    return true;
+                }
             }
-            else
-                return false;
+
+            return false;
         }
     }
 }
diff --git a/TagKey.cs b/Model/TagKey.cs
similarity index 96%
rename from TagKey.cs
rename to Model/TagKey.cs
index d9279f1..a6f73bb 100644
--- a/TagKey.cs
+++ b/Model/TagKey.cs
@@ -1,7 +1,7 @@
 using System;
 using Substrate.Nbt;
 
-namespace NBTExplorer
+namespace NBTExplorer.Model
 {
     public class TagKey : IComparable<TagKey>
     {
diff --git a/NBTExplorer.csproj b/NBTExplorer.csproj
index 3b17f28..a68738f 100644
--- a/NBTExplorer.csproj
+++ b/NBTExplorer.csproj
@@ -80,60 +80,60 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Forms\CancelSearchForm.cs">
+    <Compile Include="FormRegistry.cs" />
+    <Compile Include="Windows\CancelSearchForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\CancelSearchForm.Designer.cs">
+    <Compile Include="Windows\CancelSearchForm.Designer.cs">
       <DependentUpon>CancelSearchForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="IconRegistry.cs" />
-    <Compile Include="MainForm.cs">
+    <Compile Include="Windows\IconRegistry.cs" />
+    <Compile Include="Windows\MainForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="MainForm.Designer.cs">
+    <Compile Include="Windows\MainForm.Designer.cs">
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="DataNode.cs" />
-    <Compile Include="Forms\About.cs">
+    <Compile Include="Windows\About.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\About.Designer.cs">
+    <Compile Include="Windows\About.Designer.cs">
       <DependentUpon>About.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\EditName.cs">
+    <Compile Include="Windows\EditName.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\EditName.Designer.cs">
+    <Compile Include="Windows\EditName.Designer.cs">
       <DependentUpon>EditName.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\EditString.cs">
+    <Compile Include="Windows\EditString.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\EditString.Designer.cs">
+    <Compile Include="Windows\EditString.Designer.cs">
       <DependentUpon>EditString.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\CreateNode.cs">
+    <Compile Include="Windows\CreateNode.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\CreateNode.Designer.cs">
+    <Compile Include="Windows\CreateNode.Designer.cs">
       <DependentUpon>CreateNode.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\EditValue.cs">
+    <Compile Include="Windows\EditValue.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\EditValue.Designer.cs">
+    <Compile Include="Windows\EditValue.Designer.cs">
       <DependentUpon>EditValue.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\Find.cs">
+    <Compile Include="Windows\Find.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\Find.Designer.cs">
+    <Compile Include="Windows\Find.Designer.cs">
       <DependentUpon>Find.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\EditHex.cs">
+    <Compile Include="Windows\EditHex.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\EditHex.Designer.cs">
+    <Compile Include="Windows\EditHex.Designer.cs">
       <DependentUpon>EditHex.cs</DependentUpon>
     </Compile>
     <Compile Include="Model\CompoundTagContainer.cs" />
@@ -170,7 +170,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
     <Compile Include="SearchWorker.cs" />
-    <Compile Include="TagKey.cs" />
+    <Compile Include="Model\TagKey.cs" />
     <Compile Include="Vendor\Be.Windows.Forms.HexBox\BuiltInContextMenu.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -191,32 +191,33 @@
     <Compile Include="Vendor\Be.Windows.Forms.HexBox\MemoryDataBlock.cs" />
     <Compile Include="Vendor\Be.Windows.Forms.HexBox\NativeMethods.cs" />
     <Compile Include="Vendor\Be.Windows.Forms.HexBox\Util.cs" />
-    <EmbeddedResource Include="Forms\CancelSearchForm.resx">
+    <Compile Include="Windows\FormHandlers.cs" />
+    <EmbeddedResource Include="Windows\CancelSearchForm.resx">
       <DependentUpon>CancelSearchForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="MainForm.resx">
+    <EmbeddedResource Include="Windows\MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\About.resx">
+    <EmbeddedResource Include="Windows\About.resx">
       <DependentUpon>About.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\EditName.resx">
+    <EmbeddedResource Include="Windows\EditName.resx">
       <DependentUpon>EditName.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\EditString.resx">
+    <EmbeddedResource Include="Windows\EditString.resx">
       <DependentUpon>EditString.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\CreateNode.resx">
+    <EmbeddedResource Include="Windows\CreateNode.resx">
       <DependentUpon>CreateNode.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\EditValue.resx">
+    <EmbeddedResource Include="Windows\EditValue.resx">
       <DependentUpon>EditValue.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Find.resx">
+    <EmbeddedResource Include="Windows\Find.resx">
       <DependentUpon>Find.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\EditHex.resx">
+    <EmbeddedResource Include="Windows\EditHex.resx">
       <DependentUpon>EditHex.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -246,6 +247,7 @@
     <None Include="Resources\arrow-270.png" />
     <Content Include="Vendor\Be.Windows.Forms.HexBox\HexBox.bmp" />
   </ItemGroup>
+  <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/Program.cs b/Program.cs
index d2f1547..dec0542 100644
--- a/Program.cs
+++ b/Program.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Windows.Forms;
+using NBTExplorer.Windows;
 
 namespace NBTExplorer
 {
diff --git a/forms/About.Designer.cs b/Windows/About.Designer.cs
similarity index 99%
rename from forms/About.Designer.cs
rename to Windows/About.Designer.cs
index 4e30769..cee128a 100644
--- a/forms/About.Designer.cs
+++ b/Windows/About.Designer.cs
@@ -1,4 +1,4 @@
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     partial class About
     {
diff --git a/forms/About.cs b/Windows/About.cs
similarity index 59%
rename from forms/About.cs
rename to Windows/About.cs
index 701e584..4459efa 100644
--- a/forms/About.cs
+++ b/Windows/About.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
+using System.Windows.Forms;
 
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     public partial class About : Form
     {
diff --git a/forms/About.resx b/Windows/About.resx
similarity index 100%
rename from forms/About.resx
rename to Windows/About.resx
diff --git a/forms/CancelSearchForm.Designer.cs b/Windows/CancelSearchForm.Designer.cs
similarity index 98%
rename from forms/CancelSearchForm.Designer.cs
rename to Windows/CancelSearchForm.Designer.cs
index 8a8c5de..5b476ab 100644
--- a/forms/CancelSearchForm.Designer.cs
+++ b/Windows/CancelSearchForm.Designer.cs
@@ -1,4 +1,4 @@
-namespace NBTExplorer.Forms
+namespace NBTExplorer.Windows
 {
     partial class CancelSearchForm
     {
diff --git a/Windows/CancelSearchForm.cs b/Windows/CancelSearchForm.cs
new file mode 100644
index 0000000..5bef05c
--- /dev/null
+++ b/Windows/CancelSearchForm.cs
@@ -0,0 +1,12 @@
+using System.Windows.Forms;
+
+namespace NBTExplorer.Windows
+{
+    public partial class CancelSearchForm : Form
+    {
+        public CancelSearchForm ()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/forms/CancelSearchForm.resx b/Windows/CancelSearchForm.resx
similarity index 100%
rename from forms/CancelSearchForm.resx
rename to Windows/CancelSearchForm.resx
diff --git a/forms/CreateNode.Designer.cs b/Windows/CreateNode.Designer.cs
similarity index 99%
rename from forms/CreateNode.Designer.cs
rename to Windows/CreateNode.Designer.cs
index 4435b37..418a1c9 100644
--- a/forms/CreateNode.Designer.cs
+++ b/Windows/CreateNode.Designer.cs
@@ -1,4 +1,4 @@
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     partial class CreateNodeForm
     {
diff --git a/forms/CreateNode.cs b/Windows/CreateNode.cs
similarity index 97%
rename from forms/CreateNode.cs
rename to Windows/CreateNode.cs
index e4418c0..c0e7216 100644
--- a/forms/CreateNode.cs
+++ b/Windows/CreateNode.cs
@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using Substrate.Nbt;
 
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     public partial class CreateNodeForm : Form
     {
diff --git a/forms/CreateNode.resx b/Windows/CreateNode.resx
similarity index 100%
rename from forms/CreateNode.resx
rename to Windows/CreateNode.resx
diff --git a/forms/EditHex.Designer.cs b/Windows/EditHex.Designer.cs
similarity index 99%
rename from forms/EditHex.Designer.cs
rename to Windows/EditHex.Designer.cs
index f85faf2..a971eab 100644
--- a/forms/EditHex.Designer.cs
+++ b/Windows/EditHex.Designer.cs
@@ -1,4 +1,4 @@
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     partial class HexEditor
     {
diff --git a/forms/EditHex.cs b/Windows/EditHex.cs
similarity index 94%
rename from forms/EditHex.cs
rename to Windows/EditHex.cs
index ff922cd..55eef29 100644
--- a/forms/EditHex.cs
+++ b/Windows/EditHex.cs
@@ -1,13 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using Be.Windows.Forms;
 
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     public partial class HexEditor : Form
     {
diff --git a/forms/EditHex.resx b/Windows/EditHex.resx
similarity index 100%
rename from forms/EditHex.resx
rename to Windows/EditHex.resx
diff --git a/forms/EditName.Designer.cs b/Windows/EditName.Designer.cs
similarity index 99%
rename from forms/EditName.Designer.cs
rename to Windows/EditName.Designer.cs
index b817f36..c2abb6a 100644
--- a/forms/EditName.Designer.cs
+++ b/Windows/EditName.Designer.cs
@@ -1,4 +1,4 @@
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     partial class EditName
     {
diff --git a/forms/EditName.cs b/Windows/EditName.cs
similarity index 93%
rename from forms/EditName.cs
rename to Windows/EditName.cs
index 1525661..e76cf0c 100644
--- a/forms/EditName.cs
+++ b/Windows/EditName.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Substrate.Nbt;
 
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     public partial class EditName : Form
     {
diff --git a/forms/EditName.resx b/Windows/EditName.resx
similarity index 100%
rename from forms/EditName.resx
rename to Windows/EditName.resx
diff --git a/forms/EditString.Designer.cs b/Windows/EditString.Designer.cs
similarity index 99%
rename from forms/EditString.Designer.cs
rename to Windows/EditString.Designer.cs
index 62a897f..ff98dc1 100644
--- a/forms/EditString.Designer.cs
+++ b/Windows/EditString.Designer.cs
@@ -1,4 +1,4 @@
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     partial class EditString
     {
diff --git a/forms/EditString.cs b/Windows/EditString.cs
similarity index 85%
rename from forms/EditString.cs
rename to Windows/EditString.cs
index f61b976..2a782ac 100644
--- a/forms/EditString.cs
+++ b/Windows/EditString.cs
@@ -1,13 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Substrate.Nbt;
 
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     public partial class EditString : Form
     {
diff --git a/forms/EditString.resx b/Windows/EditString.resx
similarity index 100%
rename from forms/EditString.resx
rename to Windows/EditString.resx
diff --git a/forms/EditValue.Designer.cs b/Windows/EditValue.Designer.cs
similarity index 99%
rename from forms/EditValue.Designer.cs
rename to Windows/EditValue.Designer.cs
index eeb6d06..1f72cfe 100644
--- a/forms/EditValue.Designer.cs
+++ b/Windows/EditValue.Designer.cs
@@ -1,4 +1,4 @@
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     partial class EditValue
     {
diff --git a/forms/EditValue.cs b/Windows/EditValue.cs
similarity index 95%
rename from forms/EditValue.cs
rename to Windows/EditValue.cs
index 8d61064..346234b 100644
--- a/forms/EditValue.cs
+++ b/Windows/EditValue.cs
@@ -1,12 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using Substrate.Nbt;
 
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     public partial class EditValue : Form
     {
diff --git a/forms/EditValue.resx b/Windows/EditValue.resx
similarity index 100%
rename from forms/EditValue.resx
rename to Windows/EditValue.resx
diff --git a/forms/Find.Designer.cs b/Windows/Find.Designer.cs
similarity index 99%
rename from forms/Find.Designer.cs
rename to Windows/Find.Designer.cs
index 75bcd3b..daae1eb 100644
--- a/forms/Find.Designer.cs
+++ b/Windows/Find.Designer.cs
@@ -1,4 +1,4 @@
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     partial class Find
     {
diff --git a/forms/Find.cs b/Windows/Find.cs
similarity index 87%
rename from forms/Find.cs
rename to Windows/Find.cs
index 3226d83..f2e007a 100644
--- a/forms/Find.cs
+++ b/Windows/Find.cs
@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     public partial class Find : Form
     {
diff --git a/forms/Find.resx b/Windows/Find.resx
similarity index 100%
rename from forms/Find.resx
rename to Windows/Find.resx
diff --git a/Windows/FormHandlers.cs b/Windows/FormHandlers.cs
new file mode 100644
index 0000000..9653d80
--- /dev/null
+++ b/Windows/FormHandlers.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Windows.Forms;
+
+namespace NBTExplorer.Windows
+{
+    public static class FormHandlers
+    {
+        public static void Register ()
+        {
+            FormRegistry.EditByteArray = EditByteArrayHandler;
+            FormRegistry.EditString = EditStringHandler;
+            FormRegistry.EditTagScalar = EditTagScalarValueHandler;
+            FormRegistry.RenameTag = RenameTagHandler;
+        }
+
+        public static bool EditStringHandler (StringFormData data)
+        {
+            EditString form = new EditString(data.Value);
+            if (form.ShowDialog() == DialogResult.OK) {
+                data.Value = form.StringValue;
+                return true;
+            }
+            else
+                return false;
+        }
+
+        public static bool RenameTagHandler (RestrictedStringFormData data)
+        {
+            EditName form = new EditName(data.Value);
+            form.InvalidNames.AddRange(data.RestrictedValues);
+
+            if (form.ShowDialog() == DialogResult.OK && form.IsModified) {
+                data.Value = form.TagName;
+                return true;
+            }
+            else
+                return false;
+        }
+
+        public static bool EditTagScalarValueHandler (TagScalarFormData data)
+        {
+            EditValue form = new EditValue(data.Tag);
+            if (form.ShowDialog() == DialogResult.OK)
+                return true;
+            else
+                return false;
+        }
+
+        public static bool EditByteArrayHandler (ByteArrayFormData data)
+        {
+            HexEditor form = new HexEditor(data.NodeName, data.Data, data.BytesPerElement);
+            if (form.ShowDialog() == DialogResult.OK && form.Modified) {
+                Array.Copy(form.Data, data.Data, data.Data.Length);
+                return true;
+            }
+            else
+                return false;
+        }
+    }
+}
diff --git a/IconRegistry.cs b/Windows/IconRegistry.cs
similarity index 95%
rename from IconRegistry.cs
rename to Windows/IconRegistry.cs
index 14ec075..27712db 100644
--- a/IconRegistry.cs
+++ b/Windows/IconRegistry.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     public class IconRegistry
     {
diff --git a/MainForm.Designer.cs b/Windows/MainForm.Designer.cs
similarity index 99%
rename from MainForm.Designer.cs
rename to Windows/MainForm.Designer.cs
index 1d3fd1d..069f0c1 100644
--- a/MainForm.Designer.cs
+++ b/Windows/MainForm.Designer.cs
@@ -1,4 +1,4 @@
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     partial class MainForm
     {
diff --git a/MainForm.cs b/Windows/MainForm.cs
similarity index 99%
rename from MainForm.cs
rename to Windows/MainForm.cs
index bfa726a..bf6bbdf 100644
--- a/MainForm.cs
+++ b/Windows/MainForm.cs
@@ -1,16 +1,15 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.IO;
 using System.Threading;
 using System.Windows.Forms;
-using NBTExplorer.Forms;
 using NBTExplorer.Model;
-using Substrate.Nbt;
 using NBTExplorer.Properties;
-using System.Collections.Specialized;
+using Substrate.Nbt;
 
-namespace NBTExplorer
+namespace NBTExplorer.Windows
 {
     public partial class MainForm : Form
     {
@@ -45,6 +44,7 @@ namespace NBTExplorer
         {
             InitializeComponent();
             InitializeIconRegistry();
+            FormHandlers.Register();
 
             FormClosing += MainForm_Closing;
 
diff --git a/MainForm.resx b/Windows/MainForm.resx
similarity index 100%
rename from MainForm.resx
rename to Windows/MainForm.resx
diff --git a/forms/CancelSearchForm.cs b/forms/CancelSearchForm.cs
deleted file mode 100644
index 8d97d5c..0000000
--- a/forms/CancelSearchForm.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-
-namespace NBTExplorer.Forms
-{
-    public partial class CancelSearchForm : Form
-    {
-        public CancelSearchForm ()
-        {
-            InitializeComponent();
-        }
-    }
-}