diff --git a/src/OnePeek.Api.Spotlight/Program.cs b/src/OnePeek.Api.Spotlight/Program.cs
deleted file mode 100644
index 1f39b71..0000000
--- a/src/OnePeek.Api.Spotlight/Program.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-namespace OnePeek
-{
-    public class Program
-    {
-        public void Main(string[] args)
-        {
-            Console.WriteLine("onepeek");
-            Console.ReadLine();
-        }
-    }
-}
diff --git a/src/OnePeek.Api.Spotlight/OnePeek.Api.Spotlight.kproj b/src/OnePeek.Api/OnePeek.Api.kproj
similarity index 90%
rename from src/OnePeek.Api.Spotlight/OnePeek.Api.Spotlight.kproj
rename to src/OnePeek.Api/OnePeek.Api.kproj
index 2f9ae9c..efc09aa 100644
--- a/src/OnePeek.Api.Spotlight/OnePeek.Api.Spotlight.kproj
+++ b/src/OnePeek.Api/OnePeek.Api.kproj
@@ -7,8 +7,8 @@
 
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>b3230130-6190-4fe6-b783-aa63bf6ce4d0</ProjectGuid>
-    <RootNamespace>OnePeek</RootNamespace>
+    <ProjectGuid>e20e3e83-5d8a-4e63-8e71-45aa3607f301</ProjectGuid>
+    <RootNamespace>OnePeek.Api</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
diff --git a/src/OnePeek.Api.Spotlight/project.json b/src/OnePeek.Api/project.json
similarity index 56%
rename from src/OnePeek.Api.Spotlight/project.json
rename to src/OnePeek.Api/project.json
index de1fe40..4c39836 100644
--- a/src/OnePeek.Api.Spotlight/project.json
+++ b/src/OnePeek.Api/project.json
@@ -2,14 +2,15 @@
     "version": "1.0.0-*",
     "dependencies": {
     },
-    "commands": { 
-        "run" : "run"
-    },
+
     "frameworks" : {
-        "aspnet50" : { },
+        "aspnet50" : { 
+            "dependencies": {
+            }
+        },
         "aspnetcore50" : { 
             "dependencies": {
-                "System.Console": "4.0.0-beta-22231"
+                "System.Runtime": "4.0.20-beta-22231"
             }
         }
     }
diff --git a/src/OnePeek.sln b/src/OnePeek.sln
index 3a29dd2..0ee6e77 100644
--- a/src/OnePeek.sln
+++ b/src/OnePeek.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.22310.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OnePeek.Api.Spotlight", "OnePeek.Api.Spotlight\OnePeek.Api.Spotlight.kproj", "{B3230130-6190-4FE6-B783-AA63BF6CE4D0}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OnePeek.Models", "OnePeek.Models\OnePeek.Models.kproj", "{CD522111-F999-4693-A55F-8A4D0E6DC7B5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +10,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B3230130-6190-4FE6-B783-AA63BF6CE4D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B3230130-6190-4FE6-B783-AA63BF6CE4D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B3230130-6190-4FE6-B783-AA63BF6CE4D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B3230130-6190-4FE6-B783-AA63BF6CE4D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD522111-F999-4693-A55F-8A4D0E6DC7B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD522111-F999-4693-A55F-8A4D0E6DC7B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD522111-F999-4693-A55F-8A4D0E6DC7B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD522111-F999-4693-A55F-8A4D0E6DC7B5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE