diff --git a/cli/Program.cs b/cli/Program.cs
index 6d5fd6d6..40badef9 100644
--- a/cli/Program.cs
+++ b/cli/Program.cs
@@ -7,7 +7,6 @@ using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Yavsc.Models;
-using Yavsc.Services;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Builder.Internal;
 using Microsoft.Extensions.PlatformAbstractions;
diff --git a/cli/cli.csproj b/cli/cli.csproj
index 8515999c..094856c7 100644
--- a/cli/cli.csproj
+++ b/cli/cli.csproj
@@ -63,9 +63,6 @@
     <Reference Include="Microsoft.AspNet.Identity">
       <HintPath>..\..\..\..\..\srv\www\dnx\packages\Microsoft.AspNet.Identity\3.0.0-rc1-final\lib\net451\Microsoft.AspNet.Identity.dll</HintPath>
     </Reference>
-    <Reference Include="Yavsc">
-      <HintPath>..\Yavsc\bin\Debug\dnx451\Yavsc.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Framework.ConfigurationModel">
       <HintPath>..\..\..\..\..\srv\www\dnx\packages\Microsoft.Framework.ConfigurationModel\1.0.0-beta4\lib\net45\Microsoft.Framework.ConfigurationModel.dll</HintPath>
     </Reference>
@@ -260,6 +257,9 @@
     <Reference Include="Microsoft.Extensions.CommandLineUtils">
       <HintPath>packages\Microsoft.Extensions.CommandLineUtils.1.1.1\lib\net451\Microsoft.Extensions.CommandLineUtils.dll</HintPath>
     </Reference>
+    <Reference Include="Yavsc.Abstract">
+      <HintPath>packages\Yavsc.Abstract.1.0.5-rc7\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Yavsc.Abstract.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
@@ -276,4 +276,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/cli/packages.config b/cli/packages.config
index c570b325..576e8067 100644
--- a/cli/packages.config
+++ b/cli/packages.config
@@ -16,6 +16,7 @@
   <package id="Microsoft.AspNet.WebPages" version="3.2.4" targetFramework="net451" />
   <package id="Microsoft.Extensions.Caching.Abstractions" version="1.0.0-rc1-final" targetFramework="net451" />
   <package id="Microsoft.Extensions.Caching.Memory" version="1.0.0-rc1-final" targetFramework="net451" />
+  <package id="Microsoft.Extensions.CommandLineUtils" version="1.1.1" targetFramework="net451" />
   <package id="Microsoft.Extensions.Configuration.FileExtensions" version="1.0.0-rc1-final" targetFramework="net451" />
   <package id="Microsoft.Extensions.Configuration.UserSecrets" version="1.0.0-rc1-final" targetFramework="net451" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0-rc1-final" targetFramework="net451" />
@@ -28,5 +29,5 @@
   <package id="Owin" version="1.0" targetFramework="net451" />
   <package id="Remotion.Linq" version="2.0.1" targetFramework="net451" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.0.0-beta-23516" targetFramework="net45" />
-  <package id="Microsoft.Extensions.CommandLineUtils" version="1.1.1" targetFramework="net451" /> 
+  <package id="Yavsc.Abstract" version="1.0.5-rc7" targetFramework="net451" />
 </packages>
\ No newline at end of file