diff --git a/Mathematica/Constants.cs b/Mathematica.Lib/Constants.cs
similarity index 100%
rename from Mathematica/Constants.cs
rename to Mathematica.Lib/Constants.cs
diff --git a/Mathematica/ExpressionEvaluator/ExpressionEvaluator.cs b/Mathematica.Lib/ExpressionEvaluator/ExpressionEvaluator.cs
similarity index 100%
rename from Mathematica/ExpressionEvaluator/ExpressionEvaluator.cs
rename to Mathematica.Lib/ExpressionEvaluator/ExpressionEvaluator.cs
diff --git a/Mathematica.Lib/Mathematica.Lib.csproj b/Mathematica.Lib/Mathematica.Lib.csproj
new file mode 100644
index 0000000..db6ec9a
--- /dev/null
+++ b/Mathematica.Lib/Mathematica.Lib.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>$(MSBuildProjectName.Replace(" ", "_").Replace(".Lib", ""))</RootNamespace>
+  </PropertyGroup>
+
+</Project>
diff --git a/Mathematica/Mathematica.csproj b/Mathematica.Lib/Mathematica.csproj
similarity index 82%
rename from Mathematica/Mathematica.csproj
rename to Mathematica.Lib/Mathematica.csproj
index 9c6e295..1eaf024 100644
--- a/Mathematica/Mathematica.csproj
+++ b/Mathematica.Lib/Mathematica.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Xamarin.Forms.5.0.0.2244\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2244\build\Xamarin.Forms.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
@@ -52,17 +53,6 @@
     <Compile Include="UnitConverter\VelocityConverter.cs" />
     <Compile Include="UnitConverter\VolumeConverter.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
@@ -73,7 +63,10 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\packages\Xamarin.Forms.5.0.0.2244\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.5.0.0.2244\build\Xamarin.Forms.props'))" />
+    <Error Condition="!Exists('..\packages\Xamarin.Forms.5.0.0.2244\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.5.0.0.2244\build\Xamarin.Forms.targets'))" />
   </Target>
+  <Import Project="..\packages\Xamarin.Forms.5.0.0.2244\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2244\build\Xamarin.Forms.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.
   <Target Name="BeforeBuild">
diff --git a/Mathematica/UnitConverter/AccelerationConverter.cs b/Mathematica.Lib/UnitConverter/AccelerationConverter.cs
similarity index 100%
rename from Mathematica/UnitConverter/AccelerationConverter.cs
rename to Mathematica.Lib/UnitConverter/AccelerationConverter.cs
diff --git a/Mathematica/UnitConverter/AngleConverter.cs b/Mathematica.Lib/UnitConverter/AngleConverter.cs
similarity index 100%
rename from Mathematica/UnitConverter/AngleConverter.cs
rename to Mathematica.Lib/UnitConverter/AngleConverter.cs
diff --git a/Mathematica/UnitConverter/AreaConverter.cs b/Mathematica.Lib/UnitConverter/AreaConverter.cs
similarity index 100%
rename from Mathematica/UnitConverter/AreaConverter.cs
rename to Mathematica.Lib/UnitConverter/AreaConverter.cs
diff --git a/Mathematica/UnitConverter/ElectromagnetismConverter.cs b/Mathematica.Lib/UnitConverter/ElectromagnetismConverter.cs
similarity index 100%
rename from Mathematica/UnitConverter/ElectromagnetismConverter.cs
rename to Mathematica.Lib/UnitConverter/ElectromagnetismConverter.cs
diff --git a/Mathematica/UnitConverter/EnergyConverter.cs b/Mathematica.Lib/UnitConverter/EnergyConverter.cs
similarity index 100%
rename from Mathematica/UnitConverter/EnergyConverter.cs
rename to Mathematica.Lib/UnitConverter/EnergyConverter.cs
diff --git a/Mathematica/UnitConverter/LengthConverter.cs b/Mathematica.Lib/UnitConverter/LengthConverter.cs
similarity index 100%
rename from Mathematica/UnitConverter/LengthConverter.cs
rename to Mathematica.Lib/UnitConverter/LengthConverter.cs
diff --git a/Mathematica/UnitConverter/LightConverter.cs b/Mathematica.Lib/UnitConverter/LightConverter.cs
similarity index 100%
rename from Mathematica/UnitConverter/LightConverter.cs
rename to Mathematica.Lib/UnitConverter/LightConverter.cs
diff --git a/Mathematica/UnitConverter/PowerConverter.cs b/Mathematica.Lib/UnitConverter/PowerConverter.cs
similarity index 100%
rename from Mathematica/UnitConverter/PowerConverter.cs
rename to Mathematica.Lib/UnitConverter/PowerConverter.cs
diff --git a/Mathematica/UnitConverter/PressureConverter.cs b/Mathematica.Lib/UnitConverter/PressureConverter.cs
similarity index 100%
rename from Mathematica/UnitConverter/PressureConverter.cs
rename to Mathematica.Lib/UnitConverter/PressureConverter.cs
diff --git a/Mathematica/UnitConverter/RadiologyConverter.cs b/Mathematica.Lib/UnitConverter/RadiologyConverter.cs
similarity index 100%
rename from Mathematica/UnitConverter/RadiologyConverter.cs
rename to Mathematica.Lib/UnitConverter/RadiologyConverter.cs
diff --git a/Mathematica/UnitConverter/TemperatureConverter.cs b/Mathematica.Lib/UnitConverter/TemperatureConverter.cs
similarity index 100%
rename from Mathematica/UnitConverter/TemperatureConverter.cs
rename to Mathematica.Lib/UnitConverter/TemperatureConverter.cs
diff --git a/Mathematica/UnitConverter/VelocityConverter.cs b/Mathematica.Lib/UnitConverter/VelocityConverter.cs
similarity index 100%
rename from Mathematica/UnitConverter/VelocityConverter.cs
rename to Mathematica.Lib/UnitConverter/VelocityConverter.cs
diff --git a/Mathematica/UnitConverter/VolumeConverter.cs b/Mathematica.Lib/UnitConverter/VolumeConverter.cs
similarity index 100%
rename from Mathematica/UnitConverter/VolumeConverter.cs
rename to Mathematica.Lib/UnitConverter/VolumeConverter.cs
diff --git a/Mathematica/UnitConverter/_scripts/Acceleration.txt b/Mathematica.Lib/UnitConverter/_scripts/Acceleration.txt
similarity index 100%
rename from Mathematica/UnitConverter/_scripts/Acceleration.txt
rename to Mathematica.Lib/UnitConverter/_scripts/Acceleration.txt
diff --git a/Mathematica/UnitConverter/_scripts/Area.txt b/Mathematica.Lib/UnitConverter/_scripts/Area.txt
similarity index 100%
rename from Mathematica/UnitConverter/_scripts/Area.txt
rename to Mathematica.Lib/UnitConverter/_scripts/Area.txt
diff --git a/Mathematica/UnitConverter/_scripts/Electromagnetism.txt b/Mathematica.Lib/UnitConverter/_scripts/Electromagnetism.txt
similarity index 100%
rename from Mathematica/UnitConverter/_scripts/Electromagnetism.txt
rename to Mathematica.Lib/UnitConverter/_scripts/Electromagnetism.txt
diff --git a/Mathematica/UnitConverter/_scripts/Energy.txt b/Mathematica.Lib/UnitConverter/_scripts/Energy.txt
similarity index 100%
rename from Mathematica/UnitConverter/_scripts/Energy.txt
rename to Mathematica.Lib/UnitConverter/_scripts/Energy.txt
diff --git a/Mathematica/UnitConverter/_scripts/Length.txt b/Mathematica.Lib/UnitConverter/_scripts/Length.txt
similarity index 100%
rename from Mathematica/UnitConverter/_scripts/Length.txt
rename to Mathematica.Lib/UnitConverter/_scripts/Length.txt
diff --git a/Mathematica/UnitConverter/_scripts/Light.txt b/Mathematica.Lib/UnitConverter/_scripts/Light.txt
similarity index 100%
rename from Mathematica/UnitConverter/_scripts/Light.txt
rename to Mathematica.Lib/UnitConverter/_scripts/Light.txt
diff --git a/Mathematica/UnitConverter/_scripts/Power.txt b/Mathematica.Lib/UnitConverter/_scripts/Power.txt
similarity index 100%
rename from Mathematica/UnitConverter/_scripts/Power.txt
rename to Mathematica.Lib/UnitConverter/_scripts/Power.txt
diff --git a/Mathematica/UnitConverter/_scripts/Pressure.txt b/Mathematica.Lib/UnitConverter/_scripts/Pressure.txt
similarity index 100%
rename from Mathematica/UnitConverter/_scripts/Pressure.txt
rename to Mathematica.Lib/UnitConverter/_scripts/Pressure.txt
diff --git a/Mathematica/UnitConverter/_scripts/Radiology.txt b/Mathematica.Lib/UnitConverter/_scripts/Radiology.txt
similarity index 100%
rename from Mathematica/UnitConverter/_scripts/Radiology.txt
rename to Mathematica.Lib/UnitConverter/_scripts/Radiology.txt
diff --git a/Mathematica/UnitConverter/_scripts/Velocity.txt b/Mathematica.Lib/UnitConverter/_scripts/Velocity.txt
similarity index 100%
rename from Mathematica/UnitConverter/_scripts/Velocity.txt
rename to Mathematica.Lib/UnitConverter/_scripts/Velocity.txt
diff --git a/Mathematica/UnitConverter/_scripts/Volume.txt b/Mathematica.Lib/UnitConverter/_scripts/Volume.txt
similarity index 100%
rename from Mathematica/UnitConverter/_scripts/Volume.txt
rename to Mathematica.Lib/UnitConverter/_scripts/Volume.txt
diff --git a/Mathematica/UnitConverter/_scripts/generateFile.awk b/Mathematica.Lib/UnitConverter/_scripts/generateFile.awk
similarity index 100%
rename from Mathematica/UnitConverter/_scripts/generateFile.awk
rename to Mathematica.Lib/UnitConverter/_scripts/generateFile.awk
diff --git a/Mathematica/UnitConverter/_scripts/preProcessAndExpandFile.awk b/Mathematica.Lib/UnitConverter/_scripts/preProcessAndExpandFile.awk
similarity index 100%
rename from Mathematica/UnitConverter/_scripts/preProcessAndExpandFile.awk
rename to Mathematica.Lib/UnitConverter/_scripts/preProcessAndExpandFile.awk
diff --git a/Mathematica/UnitConverter/_scripts/process b/Mathematica.Lib/UnitConverter/_scripts/process
similarity index 100%
rename from Mathematica/UnitConverter/_scripts/process
rename to Mathematica.Lib/UnitConverter/_scripts/process
diff --git a/Mathematica.Test/Mathematica.Test.csproj b/Mathematica.Test/Mathematica.Test.csproj
index 29e987a..74fe758 100644
--- a/Mathematica.Test/Mathematica.Test.csproj
+++ b/Mathematica.Test/Mathematica.Test.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Mathematica.Test</RootNamespace>
     <AssemblyName>Mathematica.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
@@ -19,6 +19,7 @@
     <TestProjectType>UnitTest</TestProjectType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,12 +72,11 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Mathematica\Mathematica.csproj">
-      <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project>
-      <Name>Mathematica</Name>
+    <ProjectReference Include="..\Mathematica.Lib\Mathematica.Lib.csproj">
+      <Project>{8580a3c3-c7ca-4ae6-a8f9-eaee08ff564a}</Project>
+      <Name>Mathematica.Lib</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/Mathematica.sln b/Mathematica.sln
index d443b46..3434bf9 100644
--- a/Mathematica.sln
+++ b/Mathematica.sln
@@ -1,28 +1,31 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.9
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31919.166
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mathematica", "Mathematica\Mathematica.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mathematica.Test", "Mathematica.Test\Mathematica.Test.csproj", "{1617A582-8B64-4DB6-A197-E57D9CA0FB42}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mathematica.Lib", "Mathematica.Lib\Mathematica.Lib.csproj", "{8580A3C3-C7CA-4AE6-A8F9-EAEE08FF564A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1617A582-8B64-4DB6-A197-E57D9CA0FB42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1617A582-8B64-4DB6-A197-E57D9CA0FB42}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1617A582-8B64-4DB6-A197-E57D9CA0FB42}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1617A582-8B64-4DB6-A197-E57D9CA0FB42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8580A3C3-C7CA-4AE6-A8F9-EAEE08FF564A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8580A3C3-C7CA-4AE6-A8F9-EAEE08FF564A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8580A3C3-C7CA-4AE6-A8F9-EAEE08FF564A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8580A3C3-C7CA-4AE6-A8F9-EAEE08FF564A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {07E7E5FF-17B1-46AC-BB16-9527199AD411}
+	EndGlobalSection
 EndGlobal
diff --git a/Mathematica/Properties/AssemblyInfo.cs b/Mathematica/Properties/AssemblyInfo.cs
deleted file mode 100644
index ca3c1c1..0000000
--- a/Mathematica/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Resources;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Mathematica")]
-[assembly: AssemblyDescription("This assembly is intended to be a maths engine, which can support all the desired mathematical functionality for applications.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Lagomeraki")]
-[assembly: AssemblyProduct("Mathematica Library")]
-[assembly: AssemblyCopyright("© 2017 Lagomeraki")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.1")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Mathematica/packages.config b/Mathematica/packages.config
deleted file mode 100644
index 313c542..0000000
--- a/Mathematica/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Xamarin.Forms" version="2.3.3.193" targetFramework="portable45-net45+win8+wpa81" />
-</packages>
\ No newline at end of file