diff --git a/Code/CsvIndexer.cs b/CsvLib/CsvIndexer.cs
similarity index 99%
rename from Code/CsvIndexer.cs
rename to CsvLib/CsvIndexer.cs
index 7ee21bd..7c1de3d 100644
--- a/Code/CsvIndexer.cs
+++ b/CsvLib/CsvIndexer.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
-namespace CsvView.Code
+namespace CsvLib
 {
     public class CsvIndexer
     {
diff --git a/CsvLib/CsvLib.csproj b/CsvLib/CsvLib.csproj
new file mode 100644
index 0000000..2756020
--- /dev/null
+++ b/CsvLib/CsvLib.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+    </PropertyGroup>
+
+</Project>
diff --git a/Code/CsvParser.cs b/CsvLib/CsvParser.cs
similarity index 99%
rename from Code/CsvParser.cs
rename to CsvLib/CsvParser.cs
index d6c3274..b45563b 100644
--- a/Code/CsvParser.cs
+++ b/CsvLib/CsvParser.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 
-namespace CsvView.Code
+namespace CsvLib
 {
     public class CsvParser
     {
diff --git a/Code/TrackingTextReader.cs b/CsvLib/TrackingTextReader.cs
similarity index 97%
rename from Code/TrackingTextReader.cs
rename to CsvLib/TrackingTextReader.cs
index 79b76fa..6009077 100644
--- a/Code/TrackingTextReader.cs
+++ b/CsvLib/TrackingTextReader.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace CsvView.Code
+namespace CsvLib
 {
     public class TrackingTextReader : TextReader
     {
diff --git a/CsvView.csproj b/CsvView.csproj
index d582b55..97cb645 100644
--- a/CsvView.csproj
+++ b/CsvView.csproj
@@ -64,9 +64,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Code\CsvIndexer.cs" />
-    <Compile Include="Code\CsvParser.cs" />
-    <Compile Include="Code\TrackingTextReader.cs" />
     <Compile Include="UI\CTextBox.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -102,6 +99,12 @@
   <ItemGroup>
     <Content Include="LICENSE.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="CsvLib\CsvLib.csproj">
+      <Project>{eb0fdb60-8b9d-401c-85a8-4cf4105d5063}</Project>
+      <Name>CsvLib</Name>
+    </ProjectReference>
+  </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/CsvView.sln b/CsvView.sln
index c82c2b7..0edf147 100644
--- a/CsvView.sln
+++ b/CsvView.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsvView", "CsvView.csproj", "{587169B9-7891-4A2F-8537-9196898B86AF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsvLib", "CsvLib\CsvLib.csproj", "{EB0FDB60-8B9D-401C-85A8-4CF4105D5063}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{587169B9-7891-4A2F-8537-9196898B86AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{587169B9-7891-4A2F-8537-9196898B86AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{587169B9-7891-4A2F-8537-9196898B86AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB0FDB60-8B9D-401C-85A8-4CF4105D5063}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB0FDB60-8B9D-401C-85A8-4CF4105D5063}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB0FDB60-8B9D-401C-85A8-4CF4105D5063}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB0FDB60-8B9D-401C-85A8-4CF4105D5063}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CsvView.sln.DotSettings b/CsvView.sln.DotSettings
new file mode 100644
index 0000000..9b6148b
--- /dev/null
+++ b/CsvView.sln.DotSettings
@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/Environment/Hierarchy/Build/BuildTool/CustomBuildToolPath/@EntryValue">/usr/lib/mono/msbuild/15.0/bin/MSBuild.dll</s:String>
+	<s:Int64 x:Key="/Default/Environment/Hierarchy/Build/BuildTool/MsbuildVersion/@EntryValue">983040</s:Int64></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/UI/FrmCsvViewer.cs b/UI/FrmCsvViewer.cs
index 77c3cb6..ad4eea5 100644
--- a/UI/FrmCsvViewer.cs
+++ b/UI/FrmCsvViewer.cs
@@ -1,8 +1,8 @@
-using CsvView.Code;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
+using CsvLib;
 
 namespace CsvView.UI
 {