diff --git a/CsvIndexer.cs b/Code/CsvIndexer.cs
similarity index 99%
rename from CsvIndexer.cs
rename to Code/CsvIndexer.cs
index 6a4607a..9423f7d 100644
--- a/CsvIndexer.cs
+++ b/Code/CsvIndexer.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
-namespace CsvView
+namespace CsvView.Code
 {
     public class CsvIndexer
     {
diff --git a/CsvParser.cs b/Code/CsvParser.cs
similarity index 99%
rename from CsvParser.cs
rename to Code/CsvParser.cs
index c5621ae..763d98d 100644
--- a/CsvParser.cs
+++ b/Code/CsvParser.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 
-namespace CsvView
+namespace CsvView.Code
 {
     public class CsvParser
     {
diff --git a/CsvView.csproj b/CsvView.csproj
index cebb460..68ffbb0 100644
--- a/CsvView.csproj
+++ b/CsvView.csproj
@@ -64,26 +64,23 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CsvIndexer.cs" />
-    <Compile Include="CsvParser.cs" />
-    <Compile Include="CTextBox.cs">
+    <Compile Include="Code\CsvIndexer.cs" />
+    <Compile Include="Code\CsvParser.cs" />
+    <Compile Include="UI\CTextBox.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="DoubleBufferPanel.cs">
+    <Compile Include="UI\DoubleBufferPanel.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="FrmCsvViewer.cs">
+    <Compile Include="UI\FrmCsvViewer.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FrmCsvViewer.Designer.cs">
+    <Compile Include="UI\FrmCsvViewer.Designer.cs">
       <DependentUpon>FrmCsvViewer.cs</DependentUpon>
     </Compile>
-    <Compile Include="MessageBoxEx.cs" />
+    <Compile Include="UI\MessageBoxEx.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="FrmCsvViewer.resx">
-      <DependentUpon>FrmCsvViewer.cs</DependentUpon>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.manifest" />
diff --git a/FrmCsvViewer.resx b/FrmCsvViewer.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/FrmCsvViewer.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/Program.cs b/Program.cs
index f5d8044..4f02bb8 100644
--- a/Program.cs
+++ b/Program.cs
@@ -1,4 +1,5 @@
-using System;
+using CsvView.UI;
+using System;
 using System.Windows.Forms;
 
 namespace CsvView.Net
diff --git a/CTextBox.cs b/UI/CTextBox.cs
similarity index 97%
rename from CTextBox.cs
rename to UI/CTextBox.cs
index d861e5f..5278cea 100644
--- a/CTextBox.cs
+++ b/UI/CTextBox.cs
@@ -3,7 +3,7 @@ using System.Windows.Forms;
 using System.Runtime.InteropServices;
 using System.Drawing;
 
-namespace CsvView
+namespace CsvView.UI
 {
     public class CTextBox : TextBox
     {
diff --git a/DoubleBufferPanel.cs b/UI/DoubleBufferPanel.cs
similarity index 98%
rename from DoubleBufferPanel.cs
rename to UI/DoubleBufferPanel.cs
index 4d84475..e5ad59c 100644
--- a/DoubleBufferPanel.cs
+++ b/UI/DoubleBufferPanel.cs
@@ -4,7 +4,7 @@ using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace CsvView
+namespace CsvView.UI
 {
     public class DoubleBufferPanel : Panel
     {
diff --git a/FrmCsvViewer.Designer.cs b/UI/FrmCsvViewer.Designer.cs
similarity index 97%
rename from FrmCsvViewer.Designer.cs
rename to UI/FrmCsvViewer.Designer.cs
index fd68fc9..5a28af5 100644
--- a/FrmCsvViewer.Designer.cs
+++ b/UI/FrmCsvViewer.Designer.cs
@@ -1,4 +1,4 @@
-namespace CsvView
+namespace CsvView.UI
 {
     partial class FrmCsvViewer
     {
@@ -31,9 +31,9 @@
             this.txtPath = new System.Windows.Forms.TextBox();
             this.btnLoad = new System.Windows.Forms.Button();
             this.grpFile = new System.Windows.Forms.GroupBox();
-            this.pnlScrollData = new CsvView.DoubleBufferPanel();
-            this.pnlData = new CsvView.DoubleBufferPanel();
-            this.pnlReg = new CsvView.DoubleBufferPanel();
+            this.pnlScrollData = new CsvView.UI.DoubleBufferPanel();
+            this.pnlData = new CsvView.UI.DoubleBufferPanel();
+            this.pnlReg = new CsvView.UI.DoubleBufferPanel();
             this.btnPrevReg = new System.Windows.Forms.Button();
             this.tblRegNumbers = new System.Windows.Forms.TableLayoutPanel();
             this.txtCurrentReg = new System.Windows.Forms.TextBox();
@@ -238,10 +238,10 @@
         private System.Windows.Forms.TextBox txtCurrentReg;
         private System.Windows.Forms.TextBox txtTotalRegs;
         private System.Windows.Forms.TableLayoutPanel tblRegNumbers;
-        private CsvView.DoubleBufferPanel pnlReg;
-        private CsvView.DoubleBufferPanel pnlData;
+        private CsvView.UI.DoubleBufferPanel pnlReg;
+        private CsvView.UI.DoubleBufferPanel pnlData;
         private System.Windows.Forms.GroupBox grpFile;
-        private DoubleBufferPanel pnlScrollData;
+        private CsvView.UI.DoubleBufferPanel pnlScrollData;
     }
 }
 
diff --git a/FrmCsvViewer.cs b/UI/FrmCsvViewer.cs
similarity index 99%
rename from FrmCsvViewer.cs
rename to UI/FrmCsvViewer.cs
index a59d7ed..3e126c7 100644
--- a/FrmCsvViewer.cs
+++ b/UI/FrmCsvViewer.cs
@@ -1,9 +1,10 @@
-using System;
+using CsvView.Code;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
 
-namespace CsvView
+namespace CsvView.UI
 {
     public partial class FrmCsvViewer : Form
     {
diff --git a/MessageBoxEx.cs b/UI/MessageBoxEx.cs
similarity index 99%
rename from MessageBoxEx.cs
rename to UI/MessageBoxEx.cs
index 7269b58..2c804e6 100644
--- a/MessageBoxEx.cs
+++ b/UI/MessageBoxEx.cs
@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Windows.Forms;
 
-namespace CsvView
+namespace CsvView.UI
 {
     public class MessageBoxEx
     {