diff --git a/.gitignore b/.gitignore
index e2b98361..035cfdf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,6 @@ lib/local/FaceAnalyser/Debug/
 lib/local/LandmarkDetector/Debug/
 OpenFaceDemo/bin/
 OpenFaceDemo/obj/
+Debug/model/
+Debug/
+*.suo
diff --git a/OpenFace.sln b/OpenFace.sln
index f830b7b5..c3e36c08 100644
--- a/OpenFace.sln
+++ b/OpenFace.sln
@@ -33,7 +33,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CamCom", "lib\local\CamCom\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenFaceOffline", "gui\OpenFaceOffline\OpenFaceOffline.csproj", "{A4760F41-2B1F-4144-B7B2-62785AFFE79B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenFaceDemo", "OpenFaceDemo\OpenFaceDemo.csproj", "{E143A2AA-312E-4DFE-B61D-9A87CCBC8E90}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenFaceDemo", "gui\OpenFaceDemo\OpenFaceDemo.csproj", "{E143A2AA-312E-4DFE-B61D-9A87CCBC8E90}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj.user b/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj.user
new file mode 100644
index 00000000..08d82061
--- /dev/null
+++ b/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj.user
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user
new file mode 100644
index 00000000..950288a8
--- /dev/null
+++ b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/exe/FeatureExtraction/FeatureExtraction.vcxproj.user b/exe/FeatureExtraction/FeatureExtraction.vcxproj.user
new file mode 100644
index 00000000..08d82061
--- /dev/null
+++ b/exe/FeatureExtraction/FeatureExtraction.vcxproj.user
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/exe/Recording/Recording.vcxproj.user b/exe/Recording/Recording.vcxproj.user
new file mode 100644
index 00000000..b89184ef
--- /dev/null
+++ b/exe/Recording/Recording.vcxproj.user
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/OpenFaceDemo/App.config b/gui/OpenFaceDemo/App.config
similarity index 100%
rename from OpenFaceDemo/App.config
rename to gui/OpenFaceDemo/App.config
diff --git a/OpenFaceDemo/App.xaml b/gui/OpenFaceDemo/App.xaml
similarity index 100%
rename from OpenFaceDemo/App.xaml
rename to gui/OpenFaceDemo/App.xaml
diff --git a/OpenFaceDemo/App.xaml.cs b/gui/OpenFaceDemo/App.xaml.cs
similarity index 100%
rename from OpenFaceDemo/App.xaml.cs
rename to gui/OpenFaceDemo/App.xaml.cs
diff --git a/OpenFaceDemo/MainWindow.xaml b/gui/OpenFaceDemo/MainWindow.xaml
similarity index 100%
rename from OpenFaceDemo/MainWindow.xaml
rename to gui/OpenFaceDemo/MainWindow.xaml
diff --git a/OpenFaceDemo/MainWindow.xaml.cs b/gui/OpenFaceDemo/MainWindow.xaml.cs
similarity index 98%
rename from OpenFaceDemo/MainWindow.xaml.cs
rename to gui/OpenFaceDemo/MainWindow.xaml.cs
index c3f5ff48..f3695fdc 100644
--- a/OpenFaceDemo/MainWindow.xaml.cs
+++ b/gui/OpenFaceDemo/MainWindow.xaml.cs
@@ -86,7 +86,7 @@ namespace OpenFaceDemo
 
                 if (cam_sec == null)
                 {
-                    cam_sec = new CameraSelection();
+                    cam_sec = new CameraSelection(); 
                 }
                 else
                 {
diff --git a/OpenFaceDemo/OpenFaceDemo.csproj b/gui/OpenFaceDemo/OpenFaceDemo.csproj
similarity index 94%
rename from OpenFaceDemo/OpenFaceDemo.csproj
rename to gui/OpenFaceDemo/OpenFaceDemo.csproj
index 11c7dde2..a4519734 100644
--- a/OpenFaceDemo/OpenFaceDemo.csproj
+++ b/gui/OpenFaceDemo/OpenFaceDemo.csproj
@@ -123,16 +123,23 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\gui\OpenFaceOffline\OpenFaceOffline.csproj">
+    <ProjectReference Include="..\OpenFaceOffline\OpenFaceOffline.csproj">
       <Project>{a4760f41-2b1f-4144-b7b2-62785affe79b}</Project>
       <Name>OpenFaceOffline</Name>
     </ProjectReference>
-    <ProjectReference Include="..\lib\local\CppInerop\CppInerop.vcxproj">
+    <ProjectReference Include="..\..\lib\local\CppInerop\CppInerop.vcxproj">
       <Project>{78196985-ee54-411f-822b-5a23edf80642}</Project>
       <Name>CppInerop</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>xcopy /I /E /Y /D "$(ProjectDir)logo1.ico" "$(ProjectDir)$(OutDir)"</PostBuildEvent>
+  </PropertyGroup>
   <!-- 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/OpenFaceDemo/Properties/AssemblyInfo.cs b/gui/OpenFaceDemo/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenFaceDemo/Properties/AssemblyInfo.cs
rename to gui/OpenFaceDemo/Properties/AssemblyInfo.cs
diff --git a/OpenFaceDemo/Properties/Resources.Designer.cs b/gui/OpenFaceDemo/Properties/Resources.Designer.cs
similarity index 100%
rename from OpenFaceDemo/Properties/Resources.Designer.cs
rename to gui/OpenFaceDemo/Properties/Resources.Designer.cs
diff --git a/OpenFaceDemo/Properties/Resources.resx b/gui/OpenFaceDemo/Properties/Resources.resx
similarity index 100%
rename from OpenFaceDemo/Properties/Resources.resx
rename to gui/OpenFaceDemo/Properties/Resources.resx
diff --git a/OpenFaceDemo/Properties/Settings.Designer.cs b/gui/OpenFaceDemo/Properties/Settings.Designer.cs
similarity index 100%
rename from OpenFaceDemo/Properties/Settings.Designer.cs
rename to gui/OpenFaceDemo/Properties/Settings.Designer.cs
diff --git a/OpenFaceDemo/Properties/Settings.settings b/gui/OpenFaceDemo/Properties/Settings.settings
similarity index 100%
rename from OpenFaceDemo/Properties/Settings.settings
rename to gui/OpenFaceDemo/Properties/Settings.settings
diff --git a/OpenFaceDemo/UI_items/CameraSelection.xaml b/gui/OpenFaceDemo/UI_items/CameraSelection.xaml
similarity index 100%
rename from OpenFaceDemo/UI_items/CameraSelection.xaml
rename to gui/OpenFaceDemo/UI_items/CameraSelection.xaml
diff --git a/OpenFaceDemo/UI_items/CameraSelection.xaml.cs b/gui/OpenFaceDemo/UI_items/CameraSelection.xaml.cs
similarity index 100%
rename from OpenFaceDemo/UI_items/CameraSelection.xaml.cs
rename to gui/OpenFaceDemo/UI_items/CameraSelection.xaml.cs
diff --git a/gui/OpenFaceDemo/logo1.ico b/gui/OpenFaceDemo/logo1.ico
new file mode 100644
index 00000000..60a49af1
Binary files /dev/null and b/gui/OpenFaceDemo/logo1.ico differ
diff --git a/gui/OpenFaceOffline/OpenFaceOffline.csproj b/gui/OpenFaceOffline/OpenFaceOffline.csproj
index 1fbd385e..f66b34dc 100644
--- a/gui/OpenFaceOffline/OpenFaceOffline.csproj
+++ b/gui/OpenFaceOffline/OpenFaceOffline.csproj
@@ -172,7 +172,11 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>xcopy /I /E /Y /D "$(ProjectDir)logo1.ico" "$(OutDir)"</PreBuildEvent>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>xcopy /I /E /Y /D "$(ProjectDir)logo1.ico" "$(ProjectDir)$(OutDir)"</PostBuildEvent>
   </PropertyGroup>
   <!-- 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.
diff --git a/lib/local/CppInerop/CameraInterop.h b/lib/local/CppInerop/CameraInterop.h
index 63faa5a4..a5cb8ff1 100644
--- a/lib/local/CppInerop/CameraInterop.h
+++ b/lib/local/CppInerop/CameraInterop.h
@@ -257,11 +257,13 @@ namespace CameraInterop {
 			{
 				cameras[i].activate();
 				std::string name = cameras[i].name(); 
-				if(name.compare("Microsoft LifeCam Front") == 0)
-				{
-					cameras.push_back(cameras[i]);
-					cameras.erase(cameras.begin() + i);
-				}
+
+				// TODO, something is odd here
+				//if(name.compare("Microsoft LifeCam Front") == 0)
+				//{
+				//	cameras.push_back(cameras[i]);
+				//	cameras.erase(cameras.begin() + i);
+				//}
 			}