diff --git a/.gitignore b/.gitignore
index 5a14d84..79d7245 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 
+.idea
 .DS_Store
 #ignore thumbnails created by windows
 Thumbs.db
diff --git a/.idea/.idea.Threenine.Map/.idea/contentModel.xml b/.idea/.idea.Threenine.Map/.idea/contentModel.xml
new file mode 100644
index 0000000..49f030c
--- /dev/null
+++ b/.idea/.idea.Threenine.Map/.idea/contentModel.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ContentModelStore">
+    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.2.0/build/netcoreapp1.0/xunit.runner.reporters.netstandard15.dll" t="Include" />
+    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.2.0/build/netcoreapp1.0/xunit.runner.utility.netstandard15.dll" t="Include" />
+    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.2.0/build/netcoreapp1.0/xunit.runner.visualstudio.dotnetcore.testadapter.dll" t="Include" />
+    <e p="$PROJECT_DIR$" t="IncludeFlat">
+      <e p="packages" t="ExcludeRecursive" />
+      <e p="src" t="IncludeRecursive">
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="ICustomMap.cs" t="Include" />
+        <e p="IMapFrom.cs" t="Include" />
+        <e p="IMapTo.cs" t="Include" />
+        <e p="MapConfigurationFactory.cs" t="Include" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netstandard2.0" t="Include">
+              <e p="Threenine.Map.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
+        <e p="readme.txt" t="Include" />
+        <e p="Threenine.Map.csproj" t="IncludeRecursive" />
+      </e>
+      <e p="Threenine.Map.sln" t="IncludeFlat" />
+      <e p="UnitTests" t="Include">
+        <e p="DomainObjects" t="IncludeRecursive">
+          <e p="bin" t="ExcludeRecursive" />
+          <e p="ComplexDomainObject.cs" t="Include" />
+          <e p="DomainObjects.csproj" t="IncludeRecursive" />
+          <e p="obj" t="ExcludeRecursive">
+            <e p="Debug" t="Include">
+              <e p="netstandard2.0" t="Include">
+                <e p="DomainObjects.AssemblyInfo.cs" t="Include" />
+              </e>
+            </e>
+          </e>
+          <e p="SimpleDomainObject.cs" t="Include" />
+        </e>
+        <e p="EntityObjects" t="IncludeRecursive">
+          <e p="bin" t="ExcludeRecursive" />
+          <e p="EntityObjects.csproj" t="IncludeRecursive" />
+          <e p="obj" t="ExcludeRecursive">
+            <e p="Debug" t="Include">
+              <e p="netstandard2.0" t="Include">
+                <e p="EntityObjects.AssemblyInfo.cs" t="Include" />
+              </e>
+            </e>
+          </e>
+          <e p="SimpleEntity.cs" t="Include" />
+        </e>
+        <e p="MapperTests" t="IncludeRecursive">
+          <e p="bin" t="ExcludeRecursive" />
+          <e p="ComplexDomainObjectTests.cs" t="Include" />
+          <e p="MapperFixture.cs" t="Include" />
+          <e p="MapperTests.csproj" t="IncludeRecursive" />
+          <e p="obj" t="ExcludeRecursive">
+            <e p="Debug" t="Include">
+              <e p="netcoreapp2.0" t="Include">
+                <e p="MapperTests.AssemblyInfo.cs" t="Include" />
+                <e p="MapperTests.Program.cs" t="Include" />
+              </e>
+            </e>
+          </e>
+          <e p="SimpleDomainObjectTests.cs" t="Include" />
+          <e p="TestCollection.cs" t="Include" />
+        </e>
+      </e>
+    </e>
+    <e p="$USER_HOME$/Library/Caches/Rider2018.2/extResources" t="IncludeRecursive" />
+    <e p="$USER_HOME$/Library/Caches/Rider2018.2/resharper-host/local/Transient/ReSharperHost/v182/SolutionCaches/_Threenine.Map.1451039293.00" t="ExcludeRecursive" />
+    <e p="$APPLICATION_CONFIG_DIR$/consoles/db" t="IncludeRecursive" />
+    <e p="$APPLICATION_CONFIG_DIR$/extensions" t="IncludeRecursive" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.Threenine.Map/.idea/indexLayout.xml b/.idea/.idea.Threenine.Map/.idea/indexLayout.xml
new file mode 100644
index 0000000..27ba142
--- /dev/null
+++ b/.idea/.idea.Threenine.Map/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ContentModelUserStore">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.Threenine.Map/.idea/modules.xml b/.idea/.idea.Threenine.Map/.idea/modules.xml
new file mode 100644
index 0000000..0c14199
--- /dev/null
+++ b/.idea/.idea.Threenine.Map/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.Threenine.Map/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.Threenine.Map/riderModule.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.Threenine.Map/.idea/vcs.xml b/.idea/.idea.Threenine.Map/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/.idea.Threenine.Map/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.Threenine.Map/riderModule.iml b/.idea/.idea.Threenine.Map/riderModule.iml
new file mode 100644
index 0000000..3e5f0e5
--- /dev/null
+++ b/.idea/.idea.Threenine.Map/riderModule.iml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.2.0/build/netcoreapp1.0/xunit.runner.reporters.netstandard15.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.2.0/build/netcoreapp1.0/xunit.runner.utility.netstandard15.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.2.0/build/netcoreapp1.0/xunit.runner.visualstudio.dotnetcore.testadapter.dll" />
+    <content url="file://$MODULE_DIR$/../.." />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/README.md b/README.md
index 1be59b1..2deaccb 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Threenine.Map
-[![Build status](https://ci.appveyor.com/api/projects/status/6ob8lbutfecvi5n3/branch/master?svg=true)](https://ci.appveyor.com/project/garywoodfine/reflectmap/branch/master) [![NuGet](http://img.shields.io/nuget/v/Threenine.Map.svg)](https://www.nuget.org/packages/Threenine.Map/) [![NuGet Downloads](http://img.shields.io/nuget/dt/Threenine.Map.svg?style=flat)](https://www.nuget.org/packages/Threenine.Map/) [![Twitter Follow](https://img.shields.io/twitter/follow/threenine39.svg?style=social?maxAge=2592000)](https://twitter.com/threenine39) [![Documentation Status](https://readthedocs.org/projects/threeninemap/badge/?version=latest)](http://threeninemap.readthedocs.io/en/latest/?badge=latest)
+[![Build status](https://ci.appveyor.com/api/projects/status/5tm9exklhej7jhs9?svg=true)](https://ci.appveyor.com/project/garywoodfine/reflectmap) [![NuGet](http://img.shields.io/nuget/v/Threenine.Map.svg)](https://www.nuget.org/packages/Threenine.Map/) [![NuGet Downloads](http://img.shields.io/nuget/dt/Threenine.Map.svg?style=flat)](https://www.nuget.org/packages/Threenine.Map/) [![Twitter Follow](https://img.shields.io/twitter/follow/threenine39.svg?style=social?maxAge=2592000)](https://twitter.com/threenine39) [![Documentation Status](https://readthedocs.org/projects/threeninemap/badge/?version=latest)](http://threeninemap.readthedocs.io/en/latest/?badge=latest)
 
 Want a simple way to create clean & simple configuration for AutoMapper?
 
@@ -30,4 +30,4 @@ If you find there are aspects of the library that you are unsure of or would lik
 
 
 
-[![threenine logo](http://static.threenine.co.uk/img/github_footer.png)](https://threenine.co.uk/)
\ No newline at end of file
+[![threenine logo](http://static.threenine.co.uk/img/github_footer.png)](https://threenine.co.uk/)
diff --git a/appveyor.yml b/appveyor.yml
index a5740f9..4d3fc5f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,9 +12,9 @@ before_build:
   # Display .NET Core version
   - cmd: dotnet --version
   # Display minimal restore text
-  - cmd: dotnet restore ./Threenine.Map/Threenine.Map.csproj --verbosity m
+  - cmd: dotnet restore ./src/Threenine.Map.csproj --verbosity m
 build_script:
-    - cmd: dotnet build ./Threenine.Map/Threenine.Map.csproj -c Release
+    - cmd: dotnet build ./src/Threenine.Map.csproj -c Release
     - cmd: dotnet pack  -c Release /p:PackageVersion=1.0.2
 test_script:
     - cmd: dotnet test "./UnitTests/MapperTests/MapperTests.csproj" -c Release