diff --git a/Repository.Mongo.Cqrs.sln b/Repository.Mongo.Cqrs.sln
index d297080..dc0c715 100644
--- a/Repository.Mongo.Cqrs.sln
+++ b/Repository.Mongo.Cqrs.sln
@@ -1,15 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.421
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Repository.Mongo.Cqrs", "Repository.Mongo.Cqrs\Repository.Mongo.Cqrs.xproj", "{84E62ADA-6C0E-4488-BDCC-81228671C1E2}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3F581870-E016-4EB4-ADFC-11EE3AB51038}"
 	ProjectSection(SolutionItems) = preProject
 		global.json = global.json
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Repository.Mongo.Cqrs", "Repository.Mongo.Cqrs\Repository.Mongo.Cqrs.csproj", "{84E62ADA-6C0E-4488-BDCC-81228671C1E2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -24,4 +24,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C571B718-8385-4C25-94D2-94DD29664CBA}
+	EndGlobalSection
 EndGlobal
diff --git a/Repository.Mongo.Cqrs/IReadRepository.cs b/Repository.Mongo.Cqrs/IReadRepository.cs
index db54990..9b7664a 100644
--- a/Repository.Mongo.Cqrs/IReadRepository.cs
+++ b/Repository.Mongo.Cqrs/IReadRepository.cs
@@ -1,7 +1,8 @@
-using MongoDB.Driver;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq.Expressions;
+using System.Collections.Generic;
+// Mongo
+using MongoDB.Driver;
 
 namespace Repository.Mongo.Cqrs
 {
diff --git a/Repository.Mongo.Cqrs/IWriteRepository.cs b/Repository.Mongo.Cqrs/IWriteRepository.cs
index a8024c6..2630add 100644
--- a/Repository.Mongo.Cqrs/IWriteRepository.cs
+++ b/Repository.Mongo.Cqrs/IWriteRepository.cs
@@ -1,7 +1,8 @@
-using MongoDB.Driver;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq.Expressions;
+using System.Collections.Generic;
+// Mongo
+using MongoDB.Driver;
 
 namespace Repository.Mongo.Cqrs
 {
diff --git a/Repository.Mongo.Cqrs/ReadRepository.cs b/Repository.Mongo.Cqrs/ReadRepository.cs
index fa48a20..04ea2ee 100644
--- a/Repository.Mongo.Cqrs/ReadRepository.cs
+++ b/Repository.Mongo.Cqrs/ReadRepository.cs
@@ -1,7 +1,8 @@
-using MongoDB.Driver;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq.Expressions;
+using System.Collections.Generic;
+// Mongo
+using MongoDB.Driver;
 
 namespace Repository.Mongo.Cqrs
 {
diff --git a/Repository.Mongo.Cqrs/Repository.Mongo.Cqrs.csproj b/Repository.Mongo.Cqrs/Repository.Mongo.Cqrs.csproj
new file mode 100644
index 0000000..c03da95
--- /dev/null
+++ b/Repository.Mongo.Cqrs/Repository.Mongo.Cqrs.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>This package contains base implementations for CQRS pattern on Repository.Mongo package. It is also possible to use Repository.Mongo.Cached package</Description>
+    <VersionPrefix>1.0.1</VersionPrefix>
+    <Authors>UsameEsendir</Authors>
+    <TargetFramework>net46</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>Repository.Mongo.Cqrs</AssemblyName>
+    <PackageId>Repository.Mongo.Cqrs</PackageId>
+    <PackageTags>mongo;repository;cqrs</PackageTags>
+    <PackageReleaseNotes>packages updated</PackageReleaseNotes>
+    <PackageProjectUrl>https://github.com/esendir/MongoRepository.Cqrs</PackageProjectUrl>
+    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Repository.Mongo" Version="2.1.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/Repository.Mongo.Cqrs/Repository.Mongo.Cqrs.xproj b/Repository.Mongo.Cqrs/Repository.Mongo.Cqrs.xproj
deleted file mode 100644
index 534a7cd..0000000
--- a/Repository.Mongo.Cqrs/Repository.Mongo.Cqrs.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>84e62ada-6c0e-4488-bdcc-81228671c1e2</ProjectGuid>
-    <RootNamespace>Repository.Mongo.Cqrs</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/Repository.Mongo.Cqrs/WriteRepository.cs b/Repository.Mongo.Cqrs/WriteRepository.cs
index 71c5d1f..38842c0 100644
--- a/Repository.Mongo.Cqrs/WriteRepository.cs
+++ b/Repository.Mongo.Cqrs/WriteRepository.cs
@@ -1,7 +1,8 @@
-using MongoDB.Driver;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq.Expressions;
+using System.Collections.Generic;
+// Mongo
+using MongoDB.Driver;
 
 namespace Repository.Mongo.Cqrs
 {
diff --git a/Repository.Mongo.Cqrs/project.json b/Repository.Mongo.Cqrs/project.json
deleted file mode 100644
index 7f9d7aa..0000000
--- a/Repository.Mongo.Cqrs/project.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "version": "1.0.1",
-  "description": "This package contains base implementations for CQRS pattern on Repository.Mongo package. It is also possible to use Repository.Mongo.Cached package",
-  "authors": [ "UsameEsendir" ],
-  "packOptions": {
-    "tags": [ "mongo", "repository", "cqrs" ],
-    "projectUrl": "https://github.com/esendir/MongoRepository.Cqrs",
-    "summary": "CQRS pattern based on repository pattern of MongoDB",
-    "releaseNotes": "packages updated"
-  },
-  "frameworks": {
-    "net46": { }
-  },
-  "dependencies": {
-    "Repository.Mongo": "1.0.4"
-  },
-  "buildOptions": {
-    "xmlDoc": true
-  }
-}
\ No newline at end of file