diff --git a/example/example.xcodeproj/project.pbxproj b/example/example.xcodeproj/project.pbxproj
index 75d414b..456e1de 100644
--- a/example/example.xcodeproj/project.pbxproj
+++ b/example/example.xcodeproj/project.pbxproj
@@ -36,75 +36,75 @@
 		0130C9821CE65AA600911E17 /* snappy-sinksource.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0130C9491CE65AA600911E17 /* snappy-sinksource.cc */; };
 		0130C9831CE65AA600911E17 /* snappy-stubs-internal.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0130C94B1CE65AA600911E17 /* snappy-stubs-internal.cc */; };
 		0130C9841CE65AA600911E17 /* snappy.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0130C94E1CE65AA600911E17 /* snappy.cc */; };
-		0146D4DF1D81B55400C1487C /* Application.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4481D81B55400C1487C /* Application.cpp */; };
-		0146D4E01D81B55400C1487C /* ApplicationBaseState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D44A1D81B55400C1487C /* ApplicationBaseState.cpp */; };
-		0146D4E11D81B55400C1487C /* Gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D44C1D81B55400C1487C /* Gui.cpp */; };
-		0146D4E21D81B55400C1487C /* LayerPanelWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D44F1D81B55400C1487C /* LayerPanelWidget.cpp */; };
-		0146D4E31D81B55400C1487C /* PresentationState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4511D81B55400C1487C /* PresentationState.cpp */; };
-		0146D4E41D81B55400C1487C /* ProjectionMappingState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4531D81B55400C1487C /* ProjectionMappingState.cpp */; };
-		0146D4E51D81B55400C1487C /* ScaleWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4551D81B55400C1487C /* ScaleWidget.cpp */; };
-		0146D4E61D81B55400C1487C /* SettingsLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4571D81B55400C1487C /* SettingsLoader.cpp */; };
-		0146D4E71D81B55400C1487C /* SourceSelectionState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4591D81B55400C1487C /* SourceSelectionState.cpp */; };
-		0146D4E81D81B55400C1487C /* SurfaceHighlightWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D45B1D81B55400C1487C /* SurfaceHighlightWidget.cpp */; };
-		0146D4E91D81B55400C1487C /* TextureHighlightWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D45D1D81B55400C1487C /* TextureHighlightWidget.cpp */; };
-		0146D4EA1D81B55400C1487C /* TextureMappingState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D45F1D81B55400C1487C /* TextureMappingState.cpp */; };
-		0146D4EB1D81B55400C1487C /* AddGridColCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4621D81B55400C1487C /* AddGridColCmd.cpp */; };
-		0146D4EC1D81B55400C1487C /* AddGridRowCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4641D81B55400C1487C /* AddGridRowCmd.cpp */; };
-		0146D4ED1D81B55400C1487C /* AddSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4661D81B55400C1487C /* AddSurfaceCmd.cpp */; };
-		0146D4EE1D81B55400C1487C /* ClearSurfacesCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4691D81B55400C1487C /* ClearSurfacesCmd.cpp */; };
-		0146D4EF1D81B55400C1487C /* CmdManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D46B1D81B55400C1487C /* CmdManager.cpp */; };
-		0146D4F01D81B55400C1487C /* DeselectSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D46D1D81B55400C1487C /* DeselectSurfaceCmd.cpp */; };
-		0146D4F11D81B55400C1487C /* DeselectTexCoordCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D46F1D81B55400C1487C /* DeselectTexCoordCmd.cpp */; };
-		0146D4F21D81B55400C1487C /* DuplicateSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4711D81B55400C1487C /* DuplicateSurfaceCmd.cpp */; };
-		0146D4F31D81B55400C1487C /* MvAllTexCoordsCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4731D81B55400C1487C /* MvAllTexCoordsCmd.cpp */; };
-		0146D4F41D81B55400C1487C /* MvLayerDnCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4751D81B55400C1487C /* MvLayerDnCmd.cpp */; };
-		0146D4F51D81B55400C1487C /* MvLayerUpCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4771D81B55400C1487C /* MvLayerUpCmd.cpp */; };
-		0146D4F61D81B55400C1487C /* MvSelectionCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4791D81B55400C1487C /* MvSelectionCmd.cpp */; };
-		0146D4F71D81B55400C1487C /* MvSurfaceVertCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D47B1D81B55400C1487C /* MvSurfaceVertCmd.cpp */; };
-		0146D4F81D81B55400C1487C /* MvTexCoordCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D47D1D81B55400C1487C /* MvTexCoordCmd.cpp */; };
-		0146D4F91D81B55400C1487C /* RmGridColCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D47F1D81B55400C1487C /* RmGridColCmd.cpp */; };
-		0146D4FA1D81B55400C1487C /* RmGridRowCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4811D81B55400C1487C /* RmGridRowCmd.cpp */; };
-		0146D4FB1D81B55400C1487C /* RmSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4831D81B55400C1487C /* RmSurfaceCmd.cpp */; };
-		0146D4FC1D81B55400C1487C /* ScaleSurfaceFromToCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4851D81B55400C1487C /* ScaleSurfaceFromToCmd.cpp */; };
-		0146D4FD1D81B55400C1487C /* SelNextSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4871D81B55400C1487C /* SelNextSurfaceCmd.cpp */; };
-		0146D4FE1D81B55400C1487C /* SelNextTexCoordCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4891D81B55400C1487C /* SelNextTexCoordCmd.cpp */; };
-		0146D4FF1D81B55400C1487C /* SelNextVertexCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D48B1D81B55400C1487C /* SelNextVertexCmd.cpp */; };
-		0146D5001D81B55400C1487C /* SelPrevSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D48D1D81B55400C1487C /* SelPrevSurfaceCmd.cpp */; };
-		0146D5011D81B55400C1487C /* SelPrevTexCoordCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D48F1D81B55400C1487C /* SelPrevTexCoordCmd.cpp */; };
-		0146D5021D81B55400C1487C /* SelPrevVertexCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4911D81B55400C1487C /* SelPrevVertexCmd.cpp */; };
-		0146D5031D81B55400C1487C /* SelSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4931D81B55400C1487C /* SelSurfaceCmd.cpp */; };
-		0146D5041D81B55400C1487C /* SelVertexCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4951D81B55400C1487C /* SelVertexCmd.cpp */; };
-		0146D5051D81B55400C1487C /* SetApplicationStateCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4971D81B55400C1487C /* SetApplicationStateCmd.cpp */; };
-		0146D5061D81B55400C1487C /* SetNextSourceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4991D81B55400C1487C /* SetNextSourceCmd.cpp */; };
-		0146D5071D81B55400C1487C /* SetSourceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D49B1D81B55400C1487C /* SetSourceCmd.cpp */; };
-		0146D5081D81B55400C1487C /* StartDragSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D49D1D81B55400C1487C /* StartDragSurfaceCmd.cpp */; };
-		0146D5091D81B55400C1487C /* ToggleAnimatedSourceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D49F1D81B55400C1487C /* ToggleAnimatedSourceCmd.cpp */; };
-		0146D50A1D81B55400C1487C /* TogglePerspectiveCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4A11D81B55400C1487C /* TogglePerspectiveCmd.cpp */; };
-		0146D50B1D81B55400C1487C /* Info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4A41D81B55400C1487C /* Info.cpp */; };
-		0146D50C1D81B55400C1487C /* DirectoryWatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4A71D81B55400C1487C /* DirectoryWatcher.cpp */; };
-		0146D50D1D81B55400C1487C /* MediaServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4A91D81B55400C1487C /* MediaServer.cpp */; };
-		0146D50E1D81B55400C1487C /* ofxPiMapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4AB1D81B55400C1487C /* ofxPiMapper.cpp */; };
-		0146D50F1D81B55400C1487C /* BaseSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4AE1D81B55400C1487C /* BaseSource.cpp */; };
-		0146D5101D81B55400C1487C /* FboSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4B01D81B55400C1487C /* FboSource.cpp */; };
-		0146D5111D81B55400C1487C /* ImageSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4B21D81B55400C1487C /* ImageSource.cpp */; };
-		0146D5121D81B55400C1487C /* OMXPlayerCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4B41D81B55400C1487C /* OMXPlayerCache.cpp */; };
-		0146D5131D81B55400C1487C /* VideoSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4B71D81B55400C1487C /* VideoSource.cpp */; };
-		0146D5141D81B55400C1487C /* BaseSurface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4BA1D81B55400C1487C /* BaseSurface.cpp */; };
-		0146D5151D81B55400C1487C /* GridWarpSurface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4BC1D81B55400C1487C /* GridWarpSurface.cpp */; };
-		0146D5161D81B55400C1487C /* QuadSurface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4BE1D81B55400C1487C /* QuadSurface.cpp */; };
-		0146D5171D81B55400C1487C /* SurfaceFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4C01D81B55400C1487C /* SurfaceFactory.cpp */; };
-		0146D5181D81B55400C1487C /* SurfaceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4C21D81B55400C1487C /* SurfaceManager.cpp */; };
-		0146D5191D81B55400C1487C /* SurfaceManagerGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4C41D81B55400C1487C /* SurfaceManagerGui.cpp */; };
-		0146D51A1D81B55400C1487C /* SurfaceStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4C61D81B55400C1487C /* SurfaceStack.cpp */; };
-		0146D51B1D81B55400C1487C /* TriangleSurface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4C91D81B55400C1487C /* TriangleSurface.cpp */; };
-		0146D51C1D81B55400C1487C /* BaseJoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4CC1D81B55400C1487C /* BaseJoint.cpp */; };
-		0146D51D1D81B55400C1487C /* CircleJoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4CE1D81B55400C1487C /* CircleJoint.cpp */; };
-		0146D51E1D81B55400C1487C /* ProjectionEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4D21D81B55400C1487C /* ProjectionEditor.cpp */; };
-		0146D51F1D81B55400C1487C /* RadioList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4D41D81B55400C1487C /* RadioList.cpp */; };
-		0146D5201D81B55400C1487C /* SourcesEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4D61D81B55400C1487C /* SourcesEditor.cpp */; };
-		0146D5211D81B55400C1487C /* TextureEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4D81D81B55400C1487C /* TextureEditor.cpp */; };
-		0146D5221D81B55400C1487C /* HomographyHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4DB1D81B55400C1487C /* HomographyHelper.cpp */; };
-		0146D5231D81B55400C1487C /* TerminalListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0146D4DD1D81B55400C1487C /* TerminalListener.cpp */; };
+		01C2074A1D82FA4A00742588 /* Application.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206B01D82FA4900742588 /* Application.cpp */; };
+		01C2074B1D82FA4A00742588 /* SettingsLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206B21D82FA4900742588 /* SettingsLoader.cpp */; };
+		01C2074C1D82FA4A00742588 /* ApplicationBaseState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206B51D82FA4900742588 /* ApplicationBaseState.cpp */; };
+		01C2074D1D82FA4A00742588 /* PresentationState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206B71D82FA4900742588 /* PresentationState.cpp */; };
+		01C2074E1D82FA4A00742588 /* ProjectionMappingState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206B91D82FA4900742588 /* ProjectionMappingState.cpp */; };
+		01C2074F1D82FA4A00742588 /* SourceSelectionState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206BB1D82FA4900742588 /* SourceSelectionState.cpp */; };
+		01C207501D82FA4A00742588 /* TextureMappingState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206BD1D82FA4900742588 /* TextureMappingState.cpp */; };
+		01C207511D82FA4A00742588 /* AddGridColCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206C01D82FA4900742588 /* AddGridColCmd.cpp */; };
+		01C207521D82FA4A00742588 /* AddGridRowCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206C21D82FA4900742588 /* AddGridRowCmd.cpp */; };
+		01C207531D82FA4A00742588 /* AddSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206C41D82FA4900742588 /* AddSurfaceCmd.cpp */; };
+		01C207541D82FA4A00742588 /* ClearSurfacesCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206C71D82FA4900742588 /* ClearSurfacesCmd.cpp */; };
+		01C207551D82FA4A00742588 /* CmdManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206C91D82FA4900742588 /* CmdManager.cpp */; };
+		01C207561D82FA4A00742588 /* DeselectSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206CB1D82FA4900742588 /* DeselectSurfaceCmd.cpp */; };
+		01C207571D82FA4A00742588 /* DeselectTexCoordCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206CD1D82FA4900742588 /* DeselectTexCoordCmd.cpp */; };
+		01C207581D82FA4A00742588 /* DuplicateSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206CF1D82FA4900742588 /* DuplicateSurfaceCmd.cpp */; };
+		01C207591D82FA4A00742588 /* MvAllTexCoordsCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206D11D82FA4900742588 /* MvAllTexCoordsCmd.cpp */; };
+		01C2075A1D82FA4A00742588 /* MvLayerDnCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206D31D82FA4900742588 /* MvLayerDnCmd.cpp */; };
+		01C2075B1D82FA4A00742588 /* MvLayerUpCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206D51D82FA4900742588 /* MvLayerUpCmd.cpp */; };
+		01C2075C1D82FA4A00742588 /* MvSelectionCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206D71D82FA4900742588 /* MvSelectionCmd.cpp */; };
+		01C2075D1D82FA4A00742588 /* MvSurfaceVertCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206D91D82FA4900742588 /* MvSurfaceVertCmd.cpp */; };
+		01C2075E1D82FA4A00742588 /* MvTexCoordCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206DB1D82FA4900742588 /* MvTexCoordCmd.cpp */; };
+		01C2075F1D82FA4A00742588 /* RmGridColCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206DD1D82FA4900742588 /* RmGridColCmd.cpp */; };
+		01C207601D82FA4A00742588 /* RmGridRowCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206DF1D82FA4900742588 /* RmGridRowCmd.cpp */; };
+		01C207611D82FA4A00742588 /* RmSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206E11D82FA4900742588 /* RmSurfaceCmd.cpp */; };
+		01C207621D82FA4A00742588 /* ScaleSurfaceFromToCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206E31D82FA4900742588 /* ScaleSurfaceFromToCmd.cpp */; };
+		01C207631D82FA4A00742588 /* SelNextSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206E51D82FA4900742588 /* SelNextSurfaceCmd.cpp */; };
+		01C207641D82FA4A00742588 /* SelNextTexCoordCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206E71D82FA4900742588 /* SelNextTexCoordCmd.cpp */; };
+		01C207651D82FA4A00742588 /* SelNextVertexCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206E91D82FA4900742588 /* SelNextVertexCmd.cpp */; };
+		01C207661D82FA4A00742588 /* SelPrevSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206EB1D82FA4900742588 /* SelPrevSurfaceCmd.cpp */; };
+		01C207671D82FA4A00742588 /* SelPrevTexCoordCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206ED1D82FA4900742588 /* SelPrevTexCoordCmd.cpp */; };
+		01C207681D82FA4A00742588 /* SelPrevVertexCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206EF1D82FA4900742588 /* SelPrevVertexCmd.cpp */; };
+		01C207691D82FA4A00742588 /* SelSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206F11D82FA4900742588 /* SelSurfaceCmd.cpp */; };
+		01C2076A1D82FA4A00742588 /* SelVertexCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206F31D82FA4900742588 /* SelVertexCmd.cpp */; };
+		01C2076B1D82FA4A00742588 /* SetApplicationStateCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206F51D82FA4900742588 /* SetApplicationStateCmd.cpp */; };
+		01C2076C1D82FA4A00742588 /* SetNextSourceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206F71D82FA4900742588 /* SetNextSourceCmd.cpp */; };
+		01C2076D1D82FA4A00742588 /* SetSourceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206F91D82FA4900742588 /* SetSourceCmd.cpp */; };
+		01C2076E1D82FA4A00742588 /* StartDragSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206FB1D82FA4900742588 /* StartDragSurfaceCmd.cpp */; };
+		01C2076F1D82FA4A00742588 /* ToggleAnimatedSourceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206FD1D82FA4900742588 /* ToggleAnimatedSourceCmd.cpp */; };
+		01C207701D82FA4A00742588 /* TogglePerspectiveCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C206FF1D82FA4900742588 /* TogglePerspectiveCmd.cpp */; };
+		01C207711D82FA4A00742588 /* Gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207021D82FA4900742588 /* Gui.cpp */; };
+		01C207721D82FA4A00742588 /* LayerPanelWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207061D82FA4900742588 /* LayerPanelWidget.cpp */; };
+		01C207731D82FA4A00742588 /* ScaleWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207081D82FA4900742588 /* ScaleWidget.cpp */; };
+		01C207741D82FA4A00742588 /* SurfaceHighlightWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2070A1D82FA4900742588 /* SurfaceHighlightWidget.cpp */; };
+		01C207751D82FA4A00742588 /* TextureHighlightWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2070C1D82FA4900742588 /* TextureHighlightWidget.cpp */; };
+		01C207761D82FA4A00742588 /* Info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2070F1D82FA4900742588 /* Info.cpp */; };
+		01C207771D82FA4A00742588 /* DirectoryWatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207121D82FA4900742588 /* DirectoryWatcher.cpp */; };
+		01C207781D82FA4A00742588 /* MediaServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207141D82FA4900742588 /* MediaServer.cpp */; };
+		01C207791D82FA4A00742588 /* ofxPiMapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207161D82FA4900742588 /* ofxPiMapper.cpp */; };
+		01C2077A1D82FA4A00742588 /* BaseSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207191D82FA4900742588 /* BaseSource.cpp */; };
+		01C2077B1D82FA4A00742588 /* FboSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2071B1D82FA4900742588 /* FboSource.cpp */; };
+		01C2077C1D82FA4A00742588 /* ImageSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2071D1D82FA4900742588 /* ImageSource.cpp */; };
+		01C2077D1D82FA4A00742588 /* OMXPlayerCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2071F1D82FA4900742588 /* OMXPlayerCache.cpp */; };
+		01C2077E1D82FA4A00742588 /* VideoSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207221D82FA4900742588 /* VideoSource.cpp */; };
+		01C2077F1D82FA4A00742588 /* BaseSurface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207251D82FA4900742588 /* BaseSurface.cpp */; };
+		01C207801D82FA4A00742588 /* GridWarpSurface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207271D82FA4900742588 /* GridWarpSurface.cpp */; };
+		01C207811D82FA4A00742588 /* QuadSurface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207291D82FA4A00742588 /* QuadSurface.cpp */; };
+		01C207821D82FA4A00742588 /* SurfaceFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2072B1D82FA4A00742588 /* SurfaceFactory.cpp */; };
+		01C207831D82FA4A00742588 /* SurfaceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2072D1D82FA4A00742588 /* SurfaceManager.cpp */; };
+		01C207841D82FA4A00742588 /* SurfaceManagerGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2072F1D82FA4A00742588 /* SurfaceManagerGui.cpp */; };
+		01C207851D82FA4A00742588 /* SurfaceStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207311D82FA4A00742588 /* SurfaceStack.cpp */; };
+		01C207861D82FA4A00742588 /* TriangleSurface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207341D82FA4A00742588 /* TriangleSurface.cpp */; };
+		01C207871D82FA4A00742588 /* BaseJoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207371D82FA4A00742588 /* BaseJoint.cpp */; };
+		01C207881D82FA4A00742588 /* CircleJoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207391D82FA4A00742588 /* CircleJoint.cpp */; };
+		01C207891D82FA4A00742588 /* ProjectionEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2073D1D82FA4A00742588 /* ProjectionEditor.cpp */; };
+		01C2078A1D82FA4A00742588 /* RadioList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2073F1D82FA4A00742588 /* RadioList.cpp */; };
+		01C2078B1D82FA4A00742588 /* SourcesEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207411D82FA4A00742588 /* SourcesEditor.cpp */; };
+		01C2078C1D82FA4A00742588 /* TextureEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207431D82FA4A00742588 /* TextureEditor.cpp */; };
+		01C2078D1D82FA4A00742588 /* HomographyHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207461D82FA4A00742588 /* HomographyHelper.cpp */; };
+		01C2078E1D82FA4A00742588 /* TerminalListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C207481D82FA4A00742588 /* TerminalListener.cpp */; };
 		3926483B192224DA0008A7F5 /* ofxXmlSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39264839192224DA0008A7F5 /* ofxXmlSettings.cpp */; };
 		39264841192224F90008A7F5 /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3926483D192224F90008A7F5 /* tinyxml.cpp */; };
 		39264842192224F90008A7F5 /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3926483F192224F90008A7F5 /* tinyxmlerror.cpp */; };
@@ -235,150 +235,150 @@
 		0130C94E1CE65AA600911E17 /* snappy.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = snappy.cc; sourceTree = "<group>"; };
 		0130C94F1CE65AA600911E17 /* snappy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = snappy.h; sourceTree = "<group>"; };
 		0130C95B1CE65AA600911E17 /* ofxIO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxIO.h; sourceTree = "<group>"; };
-		0146D4481D81B55400C1487C /* Application.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Application.cpp; sourceTree = "<group>"; };
-		0146D4491D81B55400C1487C /* Application.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Application.h; sourceTree = "<group>"; };
-		0146D44A1D81B55400C1487C /* ApplicationBaseState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ApplicationBaseState.cpp; sourceTree = "<group>"; };
-		0146D44B1D81B55400C1487C /* ApplicationBaseState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplicationBaseState.h; sourceTree = "<group>"; };
-		0146D44C1D81B55400C1487C /* Gui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Gui.cpp; sourceTree = "<group>"; };
-		0146D44D1D81B55400C1487C /* Gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Gui.h; sourceTree = "<group>"; };
-		0146D44E1D81B55400C1487C /* GuiBaseWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuiBaseWidget.h; sourceTree = "<group>"; };
-		0146D44F1D81B55400C1487C /* LayerPanelWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayerPanelWidget.cpp; sourceTree = "<group>"; };
-		0146D4501D81B55400C1487C /* LayerPanelWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerPanelWidget.h; sourceTree = "<group>"; };
-		0146D4511D81B55400C1487C /* PresentationState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PresentationState.cpp; sourceTree = "<group>"; };
-		0146D4521D81B55400C1487C /* PresentationState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PresentationState.h; sourceTree = "<group>"; };
-		0146D4531D81B55400C1487C /* ProjectionMappingState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProjectionMappingState.cpp; sourceTree = "<group>"; };
-		0146D4541D81B55400C1487C /* ProjectionMappingState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectionMappingState.h; sourceTree = "<group>"; };
-		0146D4551D81B55400C1487C /* ScaleWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScaleWidget.cpp; sourceTree = "<group>"; };
-		0146D4561D81B55400C1487C /* ScaleWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScaleWidget.h; sourceTree = "<group>"; };
-		0146D4571D81B55400C1487C /* SettingsLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SettingsLoader.cpp; sourceTree = "<group>"; };
-		0146D4581D81B55400C1487C /* SettingsLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsLoader.h; sourceTree = "<group>"; };
-		0146D4591D81B55400C1487C /* SourceSelectionState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SourceSelectionState.cpp; sourceTree = "<group>"; };
-		0146D45A1D81B55400C1487C /* SourceSelectionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourceSelectionState.h; sourceTree = "<group>"; };
-		0146D45B1D81B55400C1487C /* SurfaceHighlightWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SurfaceHighlightWidget.cpp; sourceTree = "<group>"; };
-		0146D45C1D81B55400C1487C /* SurfaceHighlightWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurfaceHighlightWidget.h; sourceTree = "<group>"; };
-		0146D45D1D81B55400C1487C /* TextureHighlightWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureHighlightWidget.cpp; sourceTree = "<group>"; };
-		0146D45E1D81B55400C1487C /* TextureHighlightWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureHighlightWidget.h; sourceTree = "<group>"; };
-		0146D45F1D81B55400C1487C /* TextureMappingState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureMappingState.cpp; sourceTree = "<group>"; };
-		0146D4601D81B55400C1487C /* TextureMappingState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureMappingState.h; sourceTree = "<group>"; };
-		0146D4621D81B55400C1487C /* AddGridColCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddGridColCmd.cpp; sourceTree = "<group>"; };
-		0146D4631D81B55400C1487C /* AddGridColCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddGridColCmd.h; sourceTree = "<group>"; };
-		0146D4641D81B55400C1487C /* AddGridRowCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddGridRowCmd.cpp; sourceTree = "<group>"; };
-		0146D4651D81B55400C1487C /* AddGridRowCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddGridRowCmd.h; sourceTree = "<group>"; };
-		0146D4661D81B55400C1487C /* AddSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddSurfaceCmd.cpp; sourceTree = "<group>"; };
-		0146D4671D81B55400C1487C /* AddSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddSurfaceCmd.h; sourceTree = "<group>"; };
-		0146D4681D81B55400C1487C /* BaseCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseCmd.h; sourceTree = "<group>"; };
-		0146D4691D81B55400C1487C /* ClearSurfacesCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClearSurfacesCmd.cpp; sourceTree = "<group>"; };
-		0146D46A1D81B55400C1487C /* ClearSurfacesCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClearSurfacesCmd.h; sourceTree = "<group>"; };
-		0146D46B1D81B55400C1487C /* CmdManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CmdManager.cpp; sourceTree = "<group>"; };
-		0146D46C1D81B55400C1487C /* CmdManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CmdManager.h; sourceTree = "<group>"; };
-		0146D46D1D81B55400C1487C /* DeselectSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeselectSurfaceCmd.cpp; sourceTree = "<group>"; };
-		0146D46E1D81B55400C1487C /* DeselectSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeselectSurfaceCmd.h; sourceTree = "<group>"; };
-		0146D46F1D81B55400C1487C /* DeselectTexCoordCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeselectTexCoordCmd.cpp; sourceTree = "<group>"; };
-		0146D4701D81B55400C1487C /* DeselectTexCoordCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeselectTexCoordCmd.h; sourceTree = "<group>"; };
-		0146D4711D81B55400C1487C /* DuplicateSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DuplicateSurfaceCmd.cpp; sourceTree = "<group>"; };
-		0146D4721D81B55400C1487C /* DuplicateSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DuplicateSurfaceCmd.h; sourceTree = "<group>"; };
-		0146D4731D81B55400C1487C /* MvAllTexCoordsCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MvAllTexCoordsCmd.cpp; sourceTree = "<group>"; };
-		0146D4741D81B55400C1487C /* MvAllTexCoordsCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MvAllTexCoordsCmd.h; sourceTree = "<group>"; };
-		0146D4751D81B55400C1487C /* MvLayerDnCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MvLayerDnCmd.cpp; sourceTree = "<group>"; };
-		0146D4761D81B55400C1487C /* MvLayerDnCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MvLayerDnCmd.h; sourceTree = "<group>"; };
-		0146D4771D81B55400C1487C /* MvLayerUpCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MvLayerUpCmd.cpp; sourceTree = "<group>"; };
-		0146D4781D81B55400C1487C /* MvLayerUpCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MvLayerUpCmd.h; sourceTree = "<group>"; };
-		0146D4791D81B55400C1487C /* MvSelectionCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MvSelectionCmd.cpp; sourceTree = "<group>"; };
-		0146D47A1D81B55400C1487C /* MvSelectionCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MvSelectionCmd.h; sourceTree = "<group>"; };
-		0146D47B1D81B55400C1487C /* MvSurfaceVertCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MvSurfaceVertCmd.cpp; sourceTree = "<group>"; };
-		0146D47C1D81B55400C1487C /* MvSurfaceVertCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MvSurfaceVertCmd.h; sourceTree = "<group>"; };
-		0146D47D1D81B55400C1487C /* MvTexCoordCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MvTexCoordCmd.cpp; sourceTree = "<group>"; };
-		0146D47E1D81B55400C1487C /* MvTexCoordCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MvTexCoordCmd.h; sourceTree = "<group>"; };
-		0146D47F1D81B55400C1487C /* RmGridColCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RmGridColCmd.cpp; sourceTree = "<group>"; };
-		0146D4801D81B55400C1487C /* RmGridColCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RmGridColCmd.h; sourceTree = "<group>"; };
-		0146D4811D81B55400C1487C /* RmGridRowCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RmGridRowCmd.cpp; sourceTree = "<group>"; };
-		0146D4821D81B55400C1487C /* RmGridRowCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RmGridRowCmd.h; sourceTree = "<group>"; };
-		0146D4831D81B55400C1487C /* RmSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RmSurfaceCmd.cpp; sourceTree = "<group>"; };
-		0146D4841D81B55400C1487C /* RmSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RmSurfaceCmd.h; sourceTree = "<group>"; };
-		0146D4851D81B55400C1487C /* ScaleSurfaceFromToCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScaleSurfaceFromToCmd.cpp; sourceTree = "<group>"; };
-		0146D4861D81B55400C1487C /* ScaleSurfaceFromToCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScaleSurfaceFromToCmd.h; sourceTree = "<group>"; };
-		0146D4871D81B55400C1487C /* SelNextSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelNextSurfaceCmd.cpp; sourceTree = "<group>"; };
-		0146D4881D81B55400C1487C /* SelNextSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelNextSurfaceCmd.h; sourceTree = "<group>"; };
-		0146D4891D81B55400C1487C /* SelNextTexCoordCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelNextTexCoordCmd.cpp; sourceTree = "<group>"; };
-		0146D48A1D81B55400C1487C /* SelNextTexCoordCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelNextTexCoordCmd.h; sourceTree = "<group>"; };
-		0146D48B1D81B55400C1487C /* SelNextVertexCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelNextVertexCmd.cpp; sourceTree = "<group>"; };
-		0146D48C1D81B55400C1487C /* SelNextVertexCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelNextVertexCmd.h; sourceTree = "<group>"; };
-		0146D48D1D81B55400C1487C /* SelPrevSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelPrevSurfaceCmd.cpp; sourceTree = "<group>"; };
-		0146D48E1D81B55400C1487C /* SelPrevSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelPrevSurfaceCmd.h; sourceTree = "<group>"; };
-		0146D48F1D81B55400C1487C /* SelPrevTexCoordCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelPrevTexCoordCmd.cpp; sourceTree = "<group>"; };
-		0146D4901D81B55400C1487C /* SelPrevTexCoordCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelPrevTexCoordCmd.h; sourceTree = "<group>"; };
-		0146D4911D81B55400C1487C /* SelPrevVertexCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelPrevVertexCmd.cpp; sourceTree = "<group>"; };
-		0146D4921D81B55400C1487C /* SelPrevVertexCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelPrevVertexCmd.h; sourceTree = "<group>"; };
-		0146D4931D81B55400C1487C /* SelSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelSurfaceCmd.cpp; sourceTree = "<group>"; };
-		0146D4941D81B55400C1487C /* SelSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelSurfaceCmd.h; sourceTree = "<group>"; };
-		0146D4951D81B55400C1487C /* SelVertexCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelVertexCmd.cpp; sourceTree = "<group>"; };
-		0146D4961D81B55400C1487C /* SelVertexCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelVertexCmd.h; sourceTree = "<group>"; };
-		0146D4971D81B55400C1487C /* SetApplicationStateCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetApplicationStateCmd.cpp; sourceTree = "<group>"; };
-		0146D4981D81B55400C1487C /* SetApplicationStateCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetApplicationStateCmd.h; sourceTree = "<group>"; };
-		0146D4991D81B55400C1487C /* SetNextSourceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetNextSourceCmd.cpp; sourceTree = "<group>"; };
-		0146D49A1D81B55400C1487C /* SetNextSourceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetNextSourceCmd.h; sourceTree = "<group>"; };
-		0146D49B1D81B55400C1487C /* SetSourceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetSourceCmd.cpp; sourceTree = "<group>"; };
-		0146D49C1D81B55400C1487C /* SetSourceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetSourceCmd.h; sourceTree = "<group>"; };
-		0146D49D1D81B55400C1487C /* StartDragSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StartDragSurfaceCmd.cpp; sourceTree = "<group>"; };
-		0146D49E1D81B55400C1487C /* StartDragSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StartDragSurfaceCmd.h; sourceTree = "<group>"; };
-		0146D49F1D81B55400C1487C /* ToggleAnimatedSourceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ToggleAnimatedSourceCmd.cpp; sourceTree = "<group>"; };
-		0146D4A01D81B55400C1487C /* ToggleAnimatedSourceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ToggleAnimatedSourceCmd.h; sourceTree = "<group>"; };
-		0146D4A11D81B55400C1487C /* TogglePerspectiveCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TogglePerspectiveCmd.cpp; sourceTree = "<group>"; };
-		0146D4A21D81B55400C1487C /* TogglePerspectiveCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TogglePerspectiveCmd.h; sourceTree = "<group>"; };
-		0146D4A41D81B55400C1487C /* Info.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Info.cpp; sourceTree = "<group>"; };
-		0146D4A51D81B55400C1487C /* Info.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Info.h; sourceTree = "<group>"; };
-		0146D4A71D81B55400C1487C /* DirectoryWatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryWatcher.cpp; sourceTree = "<group>"; };
-		0146D4A81D81B55400C1487C /* DirectoryWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryWatcher.h; sourceTree = "<group>"; };
-		0146D4A91D81B55400C1487C /* MediaServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaServer.cpp; sourceTree = "<group>"; };
-		0146D4AA1D81B55400C1487C /* MediaServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaServer.h; sourceTree = "<group>"; };
-		0146D4AB1D81B55400C1487C /* ofxPiMapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxPiMapper.cpp; sourceTree = "<group>"; };
-		0146D4AC1D81B55400C1487C /* ofxPiMapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxPiMapper.h; sourceTree = "<group>"; };
-		0146D4AE1D81B55400C1487C /* BaseSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseSource.cpp; sourceTree = "<group>"; };
-		0146D4AF1D81B55400C1487C /* BaseSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseSource.h; sourceTree = "<group>"; };
-		0146D4B01D81B55400C1487C /* FboSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FboSource.cpp; sourceTree = "<group>"; };
-		0146D4B11D81B55400C1487C /* FboSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FboSource.h; sourceTree = "<group>"; };
-		0146D4B21D81B55400C1487C /* ImageSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageSource.cpp; sourceTree = "<group>"; };
-		0146D4B31D81B55400C1487C /* ImageSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageSource.h; sourceTree = "<group>"; };
-		0146D4B41D81B55400C1487C /* OMXPlayerCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OMXPlayerCache.cpp; sourceTree = "<group>"; };
-		0146D4B51D81B55400C1487C /* OMXPlayerCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OMXPlayerCache.h; sourceTree = "<group>"; };
-		0146D4B61D81B55400C1487C /* SourceType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourceType.h; sourceTree = "<group>"; };
-		0146D4B71D81B55400C1487C /* VideoSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoSource.cpp; sourceTree = "<group>"; };
-		0146D4B81D81B55400C1487C /* VideoSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoSource.h; sourceTree = "<group>"; };
-		0146D4BA1D81B55400C1487C /* BaseSurface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseSurface.cpp; sourceTree = "<group>"; };
-		0146D4BB1D81B55400C1487C /* BaseSurface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseSurface.h; sourceTree = "<group>"; };
-		0146D4BC1D81B55400C1487C /* GridWarpSurface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GridWarpSurface.cpp; sourceTree = "<group>"; };
-		0146D4BD1D81B55400C1487C /* GridWarpSurface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GridWarpSurface.h; sourceTree = "<group>"; };
-		0146D4BE1D81B55400C1487C /* QuadSurface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QuadSurface.cpp; sourceTree = "<group>"; };
-		0146D4BF1D81B55400C1487C /* QuadSurface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuadSurface.h; sourceTree = "<group>"; };
-		0146D4C01D81B55400C1487C /* SurfaceFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SurfaceFactory.cpp; sourceTree = "<group>"; };
-		0146D4C11D81B55400C1487C /* SurfaceFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurfaceFactory.h; sourceTree = "<group>"; };
-		0146D4C21D81B55400C1487C /* SurfaceManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SurfaceManager.cpp; sourceTree = "<group>"; };
-		0146D4C31D81B55400C1487C /* SurfaceManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurfaceManager.h; sourceTree = "<group>"; };
-		0146D4C41D81B55400C1487C /* SurfaceManagerGui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SurfaceManagerGui.cpp; sourceTree = "<group>"; };
-		0146D4C51D81B55400C1487C /* SurfaceManagerGui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurfaceManagerGui.h; sourceTree = "<group>"; };
-		0146D4C61D81B55400C1487C /* SurfaceStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SurfaceStack.cpp; sourceTree = "<group>"; };
-		0146D4C71D81B55400C1487C /* SurfaceStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurfaceStack.h; sourceTree = "<group>"; };
-		0146D4C81D81B55400C1487C /* SurfaceType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurfaceType.h; sourceTree = "<group>"; };
-		0146D4C91D81B55400C1487C /* TriangleSurface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TriangleSurface.cpp; sourceTree = "<group>"; };
-		0146D4CA1D81B55400C1487C /* TriangleSurface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriangleSurface.h; sourceTree = "<group>"; };
-		0146D4CC1D81B55400C1487C /* BaseJoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseJoint.cpp; sourceTree = "<group>"; };
-		0146D4CD1D81B55400C1487C /* BaseJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseJoint.h; sourceTree = "<group>"; };
-		0146D4CE1D81B55400C1487C /* CircleJoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CircleJoint.cpp; sourceTree = "<group>"; };
-		0146D4CF1D81B55400C1487C /* CircleJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleJoint.h; sourceTree = "<group>"; };
-		0146D4D01D81B55400C1487C /* EditorType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditorType.h; sourceTree = "<group>"; };
-		0146D4D11D81B55400C1487C /* GuiMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuiMode.h; sourceTree = "<group>"; };
-		0146D4D21D81B55400C1487C /* ProjectionEditor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProjectionEditor.cpp; sourceTree = "<group>"; };
-		0146D4D31D81B55400C1487C /* ProjectionEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectionEditor.h; sourceTree = "<group>"; };
-		0146D4D41D81B55400C1487C /* RadioList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RadioList.cpp; sourceTree = "<group>"; };
-		0146D4D51D81B55400C1487C /* RadioList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RadioList.h; sourceTree = "<group>"; };
-		0146D4D61D81B55400C1487C /* SourcesEditor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SourcesEditor.cpp; sourceTree = "<group>"; };
-		0146D4D71D81B55400C1487C /* SourcesEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourcesEditor.h; sourceTree = "<group>"; };
-		0146D4D81D81B55400C1487C /* TextureEditor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureEditor.cpp; sourceTree = "<group>"; };
-		0146D4D91D81B55400C1487C /* TextureEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureEditor.h; sourceTree = "<group>"; };
-		0146D4DB1D81B55400C1487C /* HomographyHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HomographyHelper.cpp; sourceTree = "<group>"; };
-		0146D4DC1D81B55400C1487C /* HomographyHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomographyHelper.h; sourceTree = "<group>"; };
-		0146D4DD1D81B55400C1487C /* TerminalListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TerminalListener.cpp; sourceTree = "<group>"; };
-		0146D4DE1D81B55400C1487C /* TerminalListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TerminalListener.h; sourceTree = "<group>"; };
+		01C206B01D82FA4900742588 /* Application.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Application.cpp; sourceTree = "<group>"; };
+		01C206B11D82FA4900742588 /* Application.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Application.h; sourceTree = "<group>"; };
+		01C206B21D82FA4900742588 /* SettingsLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SettingsLoader.cpp; sourceTree = "<group>"; };
+		01C206B31D82FA4900742588 /* SettingsLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsLoader.h; sourceTree = "<group>"; };
+		01C206B51D82FA4900742588 /* ApplicationBaseState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ApplicationBaseState.cpp; sourceTree = "<group>"; };
+		01C206B61D82FA4900742588 /* ApplicationBaseState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplicationBaseState.h; sourceTree = "<group>"; };
+		01C206B71D82FA4900742588 /* PresentationState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PresentationState.cpp; sourceTree = "<group>"; };
+		01C206B81D82FA4900742588 /* PresentationState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PresentationState.h; sourceTree = "<group>"; };
+		01C206B91D82FA4900742588 /* ProjectionMappingState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProjectionMappingState.cpp; sourceTree = "<group>"; };
+		01C206BA1D82FA4900742588 /* ProjectionMappingState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectionMappingState.h; sourceTree = "<group>"; };
+		01C206BB1D82FA4900742588 /* SourceSelectionState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SourceSelectionState.cpp; sourceTree = "<group>"; };
+		01C206BC1D82FA4900742588 /* SourceSelectionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourceSelectionState.h; sourceTree = "<group>"; };
+		01C206BD1D82FA4900742588 /* TextureMappingState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureMappingState.cpp; sourceTree = "<group>"; };
+		01C206BE1D82FA4900742588 /* TextureMappingState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureMappingState.h; sourceTree = "<group>"; };
+		01C206C01D82FA4900742588 /* AddGridColCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddGridColCmd.cpp; sourceTree = "<group>"; };
+		01C206C11D82FA4900742588 /* AddGridColCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddGridColCmd.h; sourceTree = "<group>"; };
+		01C206C21D82FA4900742588 /* AddGridRowCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddGridRowCmd.cpp; sourceTree = "<group>"; };
+		01C206C31D82FA4900742588 /* AddGridRowCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddGridRowCmd.h; sourceTree = "<group>"; };
+		01C206C41D82FA4900742588 /* AddSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddSurfaceCmd.cpp; sourceTree = "<group>"; };
+		01C206C51D82FA4900742588 /* AddSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddSurfaceCmd.h; sourceTree = "<group>"; };
+		01C206C61D82FA4900742588 /* BaseCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseCmd.h; sourceTree = "<group>"; };
+		01C206C71D82FA4900742588 /* ClearSurfacesCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClearSurfacesCmd.cpp; sourceTree = "<group>"; };
+		01C206C81D82FA4900742588 /* ClearSurfacesCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClearSurfacesCmd.h; sourceTree = "<group>"; };
+		01C206C91D82FA4900742588 /* CmdManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CmdManager.cpp; sourceTree = "<group>"; };
+		01C206CA1D82FA4900742588 /* CmdManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CmdManager.h; sourceTree = "<group>"; };
+		01C206CB1D82FA4900742588 /* DeselectSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeselectSurfaceCmd.cpp; sourceTree = "<group>"; };
+		01C206CC1D82FA4900742588 /* DeselectSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeselectSurfaceCmd.h; sourceTree = "<group>"; };
+		01C206CD1D82FA4900742588 /* DeselectTexCoordCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeselectTexCoordCmd.cpp; sourceTree = "<group>"; };
+		01C206CE1D82FA4900742588 /* DeselectTexCoordCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeselectTexCoordCmd.h; sourceTree = "<group>"; };
+		01C206CF1D82FA4900742588 /* DuplicateSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DuplicateSurfaceCmd.cpp; sourceTree = "<group>"; };
+		01C206D01D82FA4900742588 /* DuplicateSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DuplicateSurfaceCmd.h; sourceTree = "<group>"; };
+		01C206D11D82FA4900742588 /* MvAllTexCoordsCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MvAllTexCoordsCmd.cpp; sourceTree = "<group>"; };
+		01C206D21D82FA4900742588 /* MvAllTexCoordsCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MvAllTexCoordsCmd.h; sourceTree = "<group>"; };
+		01C206D31D82FA4900742588 /* MvLayerDnCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MvLayerDnCmd.cpp; sourceTree = "<group>"; };
+		01C206D41D82FA4900742588 /* MvLayerDnCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MvLayerDnCmd.h; sourceTree = "<group>"; };
+		01C206D51D82FA4900742588 /* MvLayerUpCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MvLayerUpCmd.cpp; sourceTree = "<group>"; };
+		01C206D61D82FA4900742588 /* MvLayerUpCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MvLayerUpCmd.h; sourceTree = "<group>"; };
+		01C206D71D82FA4900742588 /* MvSelectionCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MvSelectionCmd.cpp; sourceTree = "<group>"; };
+		01C206D81D82FA4900742588 /* MvSelectionCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MvSelectionCmd.h; sourceTree = "<group>"; };
+		01C206D91D82FA4900742588 /* MvSurfaceVertCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MvSurfaceVertCmd.cpp; sourceTree = "<group>"; };
+		01C206DA1D82FA4900742588 /* MvSurfaceVertCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MvSurfaceVertCmd.h; sourceTree = "<group>"; };
+		01C206DB1D82FA4900742588 /* MvTexCoordCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MvTexCoordCmd.cpp; sourceTree = "<group>"; };
+		01C206DC1D82FA4900742588 /* MvTexCoordCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MvTexCoordCmd.h; sourceTree = "<group>"; };
+		01C206DD1D82FA4900742588 /* RmGridColCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RmGridColCmd.cpp; sourceTree = "<group>"; };
+		01C206DE1D82FA4900742588 /* RmGridColCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RmGridColCmd.h; sourceTree = "<group>"; };
+		01C206DF1D82FA4900742588 /* RmGridRowCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RmGridRowCmd.cpp; sourceTree = "<group>"; };
+		01C206E01D82FA4900742588 /* RmGridRowCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RmGridRowCmd.h; sourceTree = "<group>"; };
+		01C206E11D82FA4900742588 /* RmSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RmSurfaceCmd.cpp; sourceTree = "<group>"; };
+		01C206E21D82FA4900742588 /* RmSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RmSurfaceCmd.h; sourceTree = "<group>"; };
+		01C206E31D82FA4900742588 /* ScaleSurfaceFromToCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScaleSurfaceFromToCmd.cpp; sourceTree = "<group>"; };
+		01C206E41D82FA4900742588 /* ScaleSurfaceFromToCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScaleSurfaceFromToCmd.h; sourceTree = "<group>"; };
+		01C206E51D82FA4900742588 /* SelNextSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelNextSurfaceCmd.cpp; sourceTree = "<group>"; };
+		01C206E61D82FA4900742588 /* SelNextSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelNextSurfaceCmd.h; sourceTree = "<group>"; };
+		01C206E71D82FA4900742588 /* SelNextTexCoordCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelNextTexCoordCmd.cpp; sourceTree = "<group>"; };
+		01C206E81D82FA4900742588 /* SelNextTexCoordCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelNextTexCoordCmd.h; sourceTree = "<group>"; };
+		01C206E91D82FA4900742588 /* SelNextVertexCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelNextVertexCmd.cpp; sourceTree = "<group>"; };
+		01C206EA1D82FA4900742588 /* SelNextVertexCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelNextVertexCmd.h; sourceTree = "<group>"; };
+		01C206EB1D82FA4900742588 /* SelPrevSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelPrevSurfaceCmd.cpp; sourceTree = "<group>"; };
+		01C206EC1D82FA4900742588 /* SelPrevSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelPrevSurfaceCmd.h; sourceTree = "<group>"; };
+		01C206ED1D82FA4900742588 /* SelPrevTexCoordCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelPrevTexCoordCmd.cpp; sourceTree = "<group>"; };
+		01C206EE1D82FA4900742588 /* SelPrevTexCoordCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelPrevTexCoordCmd.h; sourceTree = "<group>"; };
+		01C206EF1D82FA4900742588 /* SelPrevVertexCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelPrevVertexCmd.cpp; sourceTree = "<group>"; };
+		01C206F01D82FA4900742588 /* SelPrevVertexCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelPrevVertexCmd.h; sourceTree = "<group>"; };
+		01C206F11D82FA4900742588 /* SelSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelSurfaceCmd.cpp; sourceTree = "<group>"; };
+		01C206F21D82FA4900742588 /* SelSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelSurfaceCmd.h; sourceTree = "<group>"; };
+		01C206F31D82FA4900742588 /* SelVertexCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelVertexCmd.cpp; sourceTree = "<group>"; };
+		01C206F41D82FA4900742588 /* SelVertexCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelVertexCmd.h; sourceTree = "<group>"; };
+		01C206F51D82FA4900742588 /* SetApplicationStateCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetApplicationStateCmd.cpp; sourceTree = "<group>"; };
+		01C206F61D82FA4900742588 /* SetApplicationStateCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetApplicationStateCmd.h; sourceTree = "<group>"; };
+		01C206F71D82FA4900742588 /* SetNextSourceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetNextSourceCmd.cpp; sourceTree = "<group>"; };
+		01C206F81D82FA4900742588 /* SetNextSourceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetNextSourceCmd.h; sourceTree = "<group>"; };
+		01C206F91D82FA4900742588 /* SetSourceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetSourceCmd.cpp; sourceTree = "<group>"; };
+		01C206FA1D82FA4900742588 /* SetSourceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetSourceCmd.h; sourceTree = "<group>"; };
+		01C206FB1D82FA4900742588 /* StartDragSurfaceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StartDragSurfaceCmd.cpp; sourceTree = "<group>"; };
+		01C206FC1D82FA4900742588 /* StartDragSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StartDragSurfaceCmd.h; sourceTree = "<group>"; };
+		01C206FD1D82FA4900742588 /* ToggleAnimatedSourceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ToggleAnimatedSourceCmd.cpp; sourceTree = "<group>"; };
+		01C206FE1D82FA4900742588 /* ToggleAnimatedSourceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ToggleAnimatedSourceCmd.h; sourceTree = "<group>"; };
+		01C206FF1D82FA4900742588 /* TogglePerspectiveCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TogglePerspectiveCmd.cpp; sourceTree = "<group>"; };
+		01C207001D82FA4900742588 /* TogglePerspectiveCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TogglePerspectiveCmd.h; sourceTree = "<group>"; };
+		01C207021D82FA4900742588 /* Gui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Gui.cpp; sourceTree = "<group>"; };
+		01C207031D82FA4900742588 /* Gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Gui.h; sourceTree = "<group>"; };
+		01C207051D82FA4900742588 /* GuiBaseWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuiBaseWidget.h; sourceTree = "<group>"; };
+		01C207061D82FA4900742588 /* LayerPanelWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayerPanelWidget.cpp; sourceTree = "<group>"; };
+		01C207071D82FA4900742588 /* LayerPanelWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerPanelWidget.h; sourceTree = "<group>"; };
+		01C207081D82FA4900742588 /* ScaleWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScaleWidget.cpp; sourceTree = "<group>"; };
+		01C207091D82FA4900742588 /* ScaleWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScaleWidget.h; sourceTree = "<group>"; };
+		01C2070A1D82FA4900742588 /* SurfaceHighlightWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SurfaceHighlightWidget.cpp; sourceTree = "<group>"; };
+		01C2070B1D82FA4900742588 /* SurfaceHighlightWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurfaceHighlightWidget.h; sourceTree = "<group>"; };
+		01C2070C1D82FA4900742588 /* TextureHighlightWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureHighlightWidget.cpp; sourceTree = "<group>"; };
+		01C2070D1D82FA4900742588 /* TextureHighlightWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureHighlightWidget.h; sourceTree = "<group>"; };
+		01C2070F1D82FA4900742588 /* Info.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Info.cpp; sourceTree = "<group>"; };
+		01C207101D82FA4900742588 /* Info.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Info.h; sourceTree = "<group>"; };
+		01C207121D82FA4900742588 /* DirectoryWatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryWatcher.cpp; sourceTree = "<group>"; };
+		01C207131D82FA4900742588 /* DirectoryWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryWatcher.h; sourceTree = "<group>"; };
+		01C207141D82FA4900742588 /* MediaServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaServer.cpp; sourceTree = "<group>"; };
+		01C207151D82FA4900742588 /* MediaServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaServer.h; sourceTree = "<group>"; };
+		01C207161D82FA4900742588 /* ofxPiMapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxPiMapper.cpp; sourceTree = "<group>"; };
+		01C207171D82FA4900742588 /* ofxPiMapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxPiMapper.h; sourceTree = "<group>"; };
+		01C207191D82FA4900742588 /* BaseSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseSource.cpp; sourceTree = "<group>"; };
+		01C2071A1D82FA4900742588 /* BaseSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseSource.h; sourceTree = "<group>"; };
+		01C2071B1D82FA4900742588 /* FboSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FboSource.cpp; sourceTree = "<group>"; };
+		01C2071C1D82FA4900742588 /* FboSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FboSource.h; sourceTree = "<group>"; };
+		01C2071D1D82FA4900742588 /* ImageSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageSource.cpp; sourceTree = "<group>"; };
+		01C2071E1D82FA4900742588 /* ImageSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageSource.h; sourceTree = "<group>"; };
+		01C2071F1D82FA4900742588 /* OMXPlayerCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OMXPlayerCache.cpp; sourceTree = "<group>"; };
+		01C207201D82FA4900742588 /* OMXPlayerCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OMXPlayerCache.h; sourceTree = "<group>"; };
+		01C207211D82FA4900742588 /* SourceType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourceType.h; sourceTree = "<group>"; };
+		01C207221D82FA4900742588 /* VideoSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoSource.cpp; sourceTree = "<group>"; };
+		01C207231D82FA4900742588 /* VideoSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoSource.h; sourceTree = "<group>"; };
+		01C207251D82FA4900742588 /* BaseSurface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseSurface.cpp; sourceTree = "<group>"; };
+		01C207261D82FA4900742588 /* BaseSurface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseSurface.h; sourceTree = "<group>"; };
+		01C207271D82FA4900742588 /* GridWarpSurface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GridWarpSurface.cpp; sourceTree = "<group>"; };
+		01C207281D82FA4900742588 /* GridWarpSurface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GridWarpSurface.h; sourceTree = "<group>"; };
+		01C207291D82FA4A00742588 /* QuadSurface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QuadSurface.cpp; sourceTree = "<group>"; };
+		01C2072A1D82FA4A00742588 /* QuadSurface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuadSurface.h; sourceTree = "<group>"; };
+		01C2072B1D82FA4A00742588 /* SurfaceFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SurfaceFactory.cpp; sourceTree = "<group>"; };
+		01C2072C1D82FA4A00742588 /* SurfaceFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurfaceFactory.h; sourceTree = "<group>"; };
+		01C2072D1D82FA4A00742588 /* SurfaceManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SurfaceManager.cpp; sourceTree = "<group>"; };
+		01C2072E1D82FA4A00742588 /* SurfaceManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurfaceManager.h; sourceTree = "<group>"; };
+		01C2072F1D82FA4A00742588 /* SurfaceManagerGui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SurfaceManagerGui.cpp; sourceTree = "<group>"; };
+		01C207301D82FA4A00742588 /* SurfaceManagerGui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurfaceManagerGui.h; sourceTree = "<group>"; };
+		01C207311D82FA4A00742588 /* SurfaceStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SurfaceStack.cpp; sourceTree = "<group>"; };
+		01C207321D82FA4A00742588 /* SurfaceStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurfaceStack.h; sourceTree = "<group>"; };
+		01C207331D82FA4A00742588 /* SurfaceType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurfaceType.h; sourceTree = "<group>"; };
+		01C207341D82FA4A00742588 /* TriangleSurface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TriangleSurface.cpp; sourceTree = "<group>"; };
+		01C207351D82FA4A00742588 /* TriangleSurface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriangleSurface.h; sourceTree = "<group>"; };
+		01C207371D82FA4A00742588 /* BaseJoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseJoint.cpp; sourceTree = "<group>"; };
+		01C207381D82FA4A00742588 /* BaseJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseJoint.h; sourceTree = "<group>"; };
+		01C207391D82FA4A00742588 /* CircleJoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CircleJoint.cpp; sourceTree = "<group>"; };
+		01C2073A1D82FA4A00742588 /* CircleJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleJoint.h; sourceTree = "<group>"; };
+		01C2073B1D82FA4A00742588 /* EditorType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditorType.h; sourceTree = "<group>"; };
+		01C2073C1D82FA4A00742588 /* GuiMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuiMode.h; sourceTree = "<group>"; };
+		01C2073D1D82FA4A00742588 /* ProjectionEditor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProjectionEditor.cpp; sourceTree = "<group>"; };
+		01C2073E1D82FA4A00742588 /* ProjectionEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectionEditor.h; sourceTree = "<group>"; };
+		01C2073F1D82FA4A00742588 /* RadioList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RadioList.cpp; sourceTree = "<group>"; };
+		01C207401D82FA4A00742588 /* RadioList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RadioList.h; sourceTree = "<group>"; };
+		01C207411D82FA4A00742588 /* SourcesEditor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SourcesEditor.cpp; sourceTree = "<group>"; };
+		01C207421D82FA4A00742588 /* SourcesEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourcesEditor.h; sourceTree = "<group>"; };
+		01C207431D82FA4A00742588 /* TextureEditor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureEditor.cpp; sourceTree = "<group>"; };
+		01C207441D82FA4A00742588 /* TextureEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureEditor.h; sourceTree = "<group>"; };
+		01C207461D82FA4A00742588 /* HomographyHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HomographyHelper.cpp; sourceTree = "<group>"; };
+		01C207471D82FA4A00742588 /* HomographyHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomographyHelper.h; sourceTree = "<group>"; };
+		01C207481D82FA4A00742588 /* TerminalListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TerminalListener.cpp; sourceTree = "<group>"; };
+		01C207491D82FA4A00742588 /* TerminalListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TerminalListener.h; sourceTree = "<group>"; };
 		39264839192224DA0008A7F5 /* ofxXmlSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofxXmlSettings.cpp; path = ../../ofxXmlSettings/src/ofxXmlSettings.cpp; sourceTree = "<group>"; };
 		3926483A192224DA0008A7F5 /* ofxXmlSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxXmlSettings.h; path = ../../ofxXmlSettings/src/ofxXmlSettings.h; sourceTree = "<group>"; };
 		3926483D192224F90008A7F5 /* tinyxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxml.cpp; sourceTree = "<group>"; };
@@ -661,218 +661,242 @@
 			path = src;
 			sourceTree = "<group>";
 		};
-		0146D4461D81B55400C1487C /* src */ = {
+		01C206AE1D82FA4900742588 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				0146D4471D81B55400C1487C /* Application */,
-				0146D4611D81B55400C1487C /* Commands */,
-				0146D4A31D81B55400C1487C /* Info */,
-				0146D4A61D81B55400C1487C /* MediaServer */,
-				0146D4AB1D81B55400C1487C /* ofxPiMapper.cpp */,
-				0146D4AC1D81B55400C1487C /* ofxPiMapper.h */,
-				0146D4AD1D81B55400C1487C /* Sources */,
-				0146D4B91D81B55400C1487C /* Surfaces */,
-				0146D4CB1D81B55400C1487C /* UserInterface */,
-				0146D4DA1D81B55400C1487C /* Utils */,
+				01C206AF1D82FA4900742588 /* Application */,
+				01C206BF1D82FA4900742588 /* Commands */,
+				01C207011D82FA4900742588 /* Gui */,
+				01C2070E1D82FA4900742588 /* Info */,
+				01C207111D82FA4900742588 /* MediaServer */,
+				01C207161D82FA4900742588 /* ofxPiMapper.cpp */,
+				01C207171D82FA4900742588 /* ofxPiMapper.h */,
+				01C207181D82FA4900742588 /* Sources */,
+				01C207241D82FA4900742588 /* Surfaces */,
+				01C207361D82FA4A00742588 /* UserInterface */,
+				01C207451D82FA4A00742588 /* Utils */,
 			);
 			name = src;
 			path = ../src;
 			sourceTree = "<group>";
 		};
-		0146D4471D81B55400C1487C /* Application */ = {
+		01C206AF1D82FA4900742588 /* Application */ = {
 			isa = PBXGroup;
 			children = (
-				0146D4481D81B55400C1487C /* Application.cpp */,
-				0146D4491D81B55400C1487C /* Application.h */,
-				0146D44A1D81B55400C1487C /* ApplicationBaseState.cpp */,
-				0146D44B1D81B55400C1487C /* ApplicationBaseState.h */,
-				0146D44C1D81B55400C1487C /* Gui.cpp */,
-				0146D44D1D81B55400C1487C /* Gui.h */,
-				0146D44E1D81B55400C1487C /* GuiBaseWidget.h */,
-				0146D44F1D81B55400C1487C /* LayerPanelWidget.cpp */,
-				0146D4501D81B55400C1487C /* LayerPanelWidget.h */,
-				0146D4511D81B55400C1487C /* PresentationState.cpp */,
-				0146D4521D81B55400C1487C /* PresentationState.h */,
-				0146D4531D81B55400C1487C /* ProjectionMappingState.cpp */,
-				0146D4541D81B55400C1487C /* ProjectionMappingState.h */,
-				0146D4551D81B55400C1487C /* ScaleWidget.cpp */,
-				0146D4561D81B55400C1487C /* ScaleWidget.h */,
-				0146D4571D81B55400C1487C /* SettingsLoader.cpp */,
-				0146D4581D81B55400C1487C /* SettingsLoader.h */,
-				0146D4591D81B55400C1487C /* SourceSelectionState.cpp */,
-				0146D45A1D81B55400C1487C /* SourceSelectionState.h */,
-				0146D45B1D81B55400C1487C /* SurfaceHighlightWidget.cpp */,
-				0146D45C1D81B55400C1487C /* SurfaceHighlightWidget.h */,
-				0146D45D1D81B55400C1487C /* TextureHighlightWidget.cpp */,
-				0146D45E1D81B55400C1487C /* TextureHighlightWidget.h */,
-				0146D45F1D81B55400C1487C /* TextureMappingState.cpp */,
-				0146D4601D81B55400C1487C /* TextureMappingState.h */,
+				01C206B01D82FA4900742588 /* Application.cpp */,
+				01C206B11D82FA4900742588 /* Application.h */,
+				01C206B21D82FA4900742588 /* SettingsLoader.cpp */,
+				01C206B31D82FA4900742588 /* SettingsLoader.h */,
+				01C206B41D82FA4900742588 /* States */,
 			);
 			path = Application;
 			sourceTree = "<group>";
 		};
-		0146D4611D81B55400C1487C /* Commands */ = {
+		01C206B41D82FA4900742588 /* States */ = {
 			isa = PBXGroup;
 			children = (
-				0146D4621D81B55400C1487C /* AddGridColCmd.cpp */,
-				0146D4631D81B55400C1487C /* AddGridColCmd.h */,
-				0146D4641D81B55400C1487C /* AddGridRowCmd.cpp */,
-				0146D4651D81B55400C1487C /* AddGridRowCmd.h */,
-				0146D4661D81B55400C1487C /* AddSurfaceCmd.cpp */,
-				0146D4671D81B55400C1487C /* AddSurfaceCmd.h */,
-				0146D4681D81B55400C1487C /* BaseCmd.h */,
-				0146D4691D81B55400C1487C /* ClearSurfacesCmd.cpp */,
-				0146D46A1D81B55400C1487C /* ClearSurfacesCmd.h */,
-				0146D46B1D81B55400C1487C /* CmdManager.cpp */,
-				0146D46C1D81B55400C1487C /* CmdManager.h */,
-				0146D46D1D81B55400C1487C /* DeselectSurfaceCmd.cpp */,
-				0146D46E1D81B55400C1487C /* DeselectSurfaceCmd.h */,
-				0146D46F1D81B55400C1487C /* DeselectTexCoordCmd.cpp */,
-				0146D4701D81B55400C1487C /* DeselectTexCoordCmd.h */,
-				0146D4711D81B55400C1487C /* DuplicateSurfaceCmd.cpp */,
-				0146D4721D81B55400C1487C /* DuplicateSurfaceCmd.h */,
-				0146D4731D81B55400C1487C /* MvAllTexCoordsCmd.cpp */,
-				0146D4741D81B55400C1487C /* MvAllTexCoordsCmd.h */,
-				0146D4751D81B55400C1487C /* MvLayerDnCmd.cpp */,
-				0146D4761D81B55400C1487C /* MvLayerDnCmd.h */,
-				0146D4771D81B55400C1487C /* MvLayerUpCmd.cpp */,
-				0146D4781D81B55400C1487C /* MvLayerUpCmd.h */,
-				0146D4791D81B55400C1487C /* MvSelectionCmd.cpp */,
-				0146D47A1D81B55400C1487C /* MvSelectionCmd.h */,
-				0146D47B1D81B55400C1487C /* MvSurfaceVertCmd.cpp */,
-				0146D47C1D81B55400C1487C /* MvSurfaceVertCmd.h */,
-				0146D47D1D81B55400C1487C /* MvTexCoordCmd.cpp */,
-				0146D47E1D81B55400C1487C /* MvTexCoordCmd.h */,
-				0146D47F1D81B55400C1487C /* RmGridColCmd.cpp */,
-				0146D4801D81B55400C1487C /* RmGridColCmd.h */,
-				0146D4811D81B55400C1487C /* RmGridRowCmd.cpp */,
-				0146D4821D81B55400C1487C /* RmGridRowCmd.h */,
-				0146D4831D81B55400C1487C /* RmSurfaceCmd.cpp */,
-				0146D4841D81B55400C1487C /* RmSurfaceCmd.h */,
-				0146D4851D81B55400C1487C /* ScaleSurfaceFromToCmd.cpp */,
-				0146D4861D81B55400C1487C /* ScaleSurfaceFromToCmd.h */,
-				0146D4871D81B55400C1487C /* SelNextSurfaceCmd.cpp */,
-				0146D4881D81B55400C1487C /* SelNextSurfaceCmd.h */,
-				0146D4891D81B55400C1487C /* SelNextTexCoordCmd.cpp */,
-				0146D48A1D81B55400C1487C /* SelNextTexCoordCmd.h */,
-				0146D48B1D81B55400C1487C /* SelNextVertexCmd.cpp */,
-				0146D48C1D81B55400C1487C /* SelNextVertexCmd.h */,
-				0146D48D1D81B55400C1487C /* SelPrevSurfaceCmd.cpp */,
-				0146D48E1D81B55400C1487C /* SelPrevSurfaceCmd.h */,
-				0146D48F1D81B55400C1487C /* SelPrevTexCoordCmd.cpp */,
-				0146D4901D81B55400C1487C /* SelPrevTexCoordCmd.h */,
-				0146D4911D81B55400C1487C /* SelPrevVertexCmd.cpp */,
-				0146D4921D81B55400C1487C /* SelPrevVertexCmd.h */,
-				0146D4931D81B55400C1487C /* SelSurfaceCmd.cpp */,
-				0146D4941D81B55400C1487C /* SelSurfaceCmd.h */,
-				0146D4951D81B55400C1487C /* SelVertexCmd.cpp */,
-				0146D4961D81B55400C1487C /* SelVertexCmd.h */,
-				0146D4971D81B55400C1487C /* SetApplicationStateCmd.cpp */,
-				0146D4981D81B55400C1487C /* SetApplicationStateCmd.h */,
-				0146D4991D81B55400C1487C /* SetNextSourceCmd.cpp */,
-				0146D49A1D81B55400C1487C /* SetNextSourceCmd.h */,
-				0146D49B1D81B55400C1487C /* SetSourceCmd.cpp */,
-				0146D49C1D81B55400C1487C /* SetSourceCmd.h */,
-				0146D49D1D81B55400C1487C /* StartDragSurfaceCmd.cpp */,
-				0146D49E1D81B55400C1487C /* StartDragSurfaceCmd.h */,
-				0146D49F1D81B55400C1487C /* ToggleAnimatedSourceCmd.cpp */,
-				0146D4A01D81B55400C1487C /* ToggleAnimatedSourceCmd.h */,
-				0146D4A11D81B55400C1487C /* TogglePerspectiveCmd.cpp */,
-				0146D4A21D81B55400C1487C /* TogglePerspectiveCmd.h */,
+				01C206B51D82FA4900742588 /* ApplicationBaseState.cpp */,
+				01C206B61D82FA4900742588 /* ApplicationBaseState.h */,
+				01C206B71D82FA4900742588 /* PresentationState.cpp */,
+				01C206B81D82FA4900742588 /* PresentationState.h */,
+				01C206B91D82FA4900742588 /* ProjectionMappingState.cpp */,
+				01C206BA1D82FA4900742588 /* ProjectionMappingState.h */,
+				01C206BB1D82FA4900742588 /* SourceSelectionState.cpp */,
+				01C206BC1D82FA4900742588 /* SourceSelectionState.h */,
+				01C206BD1D82FA4900742588 /* TextureMappingState.cpp */,
+				01C206BE1D82FA4900742588 /* TextureMappingState.h */,
+			);
+			path = States;
+			sourceTree = "<group>";
+		};
+		01C206BF1D82FA4900742588 /* Commands */ = {
+			isa = PBXGroup;
+			children = (
+				01C206C01D82FA4900742588 /* AddGridColCmd.cpp */,
+				01C206C11D82FA4900742588 /* AddGridColCmd.h */,
+				01C206C21D82FA4900742588 /* AddGridRowCmd.cpp */,
+				01C206C31D82FA4900742588 /* AddGridRowCmd.h */,
+				01C206C41D82FA4900742588 /* AddSurfaceCmd.cpp */,
+				01C206C51D82FA4900742588 /* AddSurfaceCmd.h */,
+				01C206C61D82FA4900742588 /* BaseCmd.h */,
+				01C206C71D82FA4900742588 /* ClearSurfacesCmd.cpp */,
+				01C206C81D82FA4900742588 /* ClearSurfacesCmd.h */,
+				01C206C91D82FA4900742588 /* CmdManager.cpp */,
+				01C206CA1D82FA4900742588 /* CmdManager.h */,
+				01C206CB1D82FA4900742588 /* DeselectSurfaceCmd.cpp */,
+				01C206CC1D82FA4900742588 /* DeselectSurfaceCmd.h */,
+				01C206CD1D82FA4900742588 /* DeselectTexCoordCmd.cpp */,
+				01C206CE1D82FA4900742588 /* DeselectTexCoordCmd.h */,
+				01C206CF1D82FA4900742588 /* DuplicateSurfaceCmd.cpp */,
+				01C206D01D82FA4900742588 /* DuplicateSurfaceCmd.h */,
+				01C206D11D82FA4900742588 /* MvAllTexCoordsCmd.cpp */,
+				01C206D21D82FA4900742588 /* MvAllTexCoordsCmd.h */,
+				01C206D31D82FA4900742588 /* MvLayerDnCmd.cpp */,
+				01C206D41D82FA4900742588 /* MvLayerDnCmd.h */,
+				01C206D51D82FA4900742588 /* MvLayerUpCmd.cpp */,
+				01C206D61D82FA4900742588 /* MvLayerUpCmd.h */,
+				01C206D71D82FA4900742588 /* MvSelectionCmd.cpp */,
+				01C206D81D82FA4900742588 /* MvSelectionCmd.h */,
+				01C206D91D82FA4900742588 /* MvSurfaceVertCmd.cpp */,
+				01C206DA1D82FA4900742588 /* MvSurfaceVertCmd.h */,
+				01C206DB1D82FA4900742588 /* MvTexCoordCmd.cpp */,
+				01C206DC1D82FA4900742588 /* MvTexCoordCmd.h */,
+				01C206DD1D82FA4900742588 /* RmGridColCmd.cpp */,
+				01C206DE1D82FA4900742588 /* RmGridColCmd.h */,
+				01C206DF1D82FA4900742588 /* RmGridRowCmd.cpp */,
+				01C206E01D82FA4900742588 /* RmGridRowCmd.h */,
+				01C206E11D82FA4900742588 /* RmSurfaceCmd.cpp */,
+				01C206E21D82FA4900742588 /* RmSurfaceCmd.h */,
+				01C206E31D82FA4900742588 /* ScaleSurfaceFromToCmd.cpp */,
+				01C206E41D82FA4900742588 /* ScaleSurfaceFromToCmd.h */,
+				01C206E51D82FA4900742588 /* SelNextSurfaceCmd.cpp */,
+				01C206E61D82FA4900742588 /* SelNextSurfaceCmd.h */,
+				01C206E71D82FA4900742588 /* SelNextTexCoordCmd.cpp */,
+				01C206E81D82FA4900742588 /* SelNextTexCoordCmd.h */,
+				01C206E91D82FA4900742588 /* SelNextVertexCmd.cpp */,
+				01C206EA1D82FA4900742588 /* SelNextVertexCmd.h */,
+				01C206EB1D82FA4900742588 /* SelPrevSurfaceCmd.cpp */,
+				01C206EC1D82FA4900742588 /* SelPrevSurfaceCmd.h */,
+				01C206ED1D82FA4900742588 /* SelPrevTexCoordCmd.cpp */,
+				01C206EE1D82FA4900742588 /* SelPrevTexCoordCmd.h */,
+				01C206EF1D82FA4900742588 /* SelPrevVertexCmd.cpp */,
+				01C206F01D82FA4900742588 /* SelPrevVertexCmd.h */,
+				01C206F11D82FA4900742588 /* SelSurfaceCmd.cpp */,
+				01C206F21D82FA4900742588 /* SelSurfaceCmd.h */,
+				01C206F31D82FA4900742588 /* SelVertexCmd.cpp */,
+				01C206F41D82FA4900742588 /* SelVertexCmd.h */,
+				01C206F51D82FA4900742588 /* SetApplicationStateCmd.cpp */,
+				01C206F61D82FA4900742588 /* SetApplicationStateCmd.h */,
+				01C206F71D82FA4900742588 /* SetNextSourceCmd.cpp */,
+				01C206F81D82FA4900742588 /* SetNextSourceCmd.h */,
+				01C206F91D82FA4900742588 /* SetSourceCmd.cpp */,
+				01C206FA1D82FA4900742588 /* SetSourceCmd.h */,
+				01C206FB1D82FA4900742588 /* StartDragSurfaceCmd.cpp */,
+				01C206FC1D82FA4900742588 /* StartDragSurfaceCmd.h */,
+				01C206FD1D82FA4900742588 /* ToggleAnimatedSourceCmd.cpp */,
+				01C206FE1D82FA4900742588 /* ToggleAnimatedSourceCmd.h */,
+				01C206FF1D82FA4900742588 /* TogglePerspectiveCmd.cpp */,
+				01C207001D82FA4900742588 /* TogglePerspectiveCmd.h */,
 			);
 			path = Commands;
 			sourceTree = "<group>";
 		};
-		0146D4A31D81B55400C1487C /* Info */ = {
+		01C207011D82FA4900742588 /* Gui */ = {
+			isa = PBXGroup;
+			children = (
+				01C207021D82FA4900742588 /* Gui.cpp */,
+				01C207031D82FA4900742588 /* Gui.h */,
+				01C207041D82FA4900742588 /* Widgets */,
+			);
+			path = Gui;
+			sourceTree = "<group>";
+		};
+		01C207041D82FA4900742588 /* Widgets */ = {
+			isa = PBXGroup;
+			children = (
+				01C207051D82FA4900742588 /* GuiBaseWidget.h */,
+				01C207061D82FA4900742588 /* LayerPanelWidget.cpp */,
+				01C207071D82FA4900742588 /* LayerPanelWidget.h */,
+				01C207081D82FA4900742588 /* ScaleWidget.cpp */,
+				01C207091D82FA4900742588 /* ScaleWidget.h */,
+				01C2070A1D82FA4900742588 /* SurfaceHighlightWidget.cpp */,
+				01C2070B1D82FA4900742588 /* SurfaceHighlightWidget.h */,
+				01C2070C1D82FA4900742588 /* TextureHighlightWidget.cpp */,
+				01C2070D1D82FA4900742588 /* TextureHighlightWidget.h */,
+			);
+			path = Widgets;
+			sourceTree = "<group>";
+		};
+		01C2070E1D82FA4900742588 /* Info */ = {
 			isa = PBXGroup;
 			children = (
-				0146D4A41D81B55400C1487C /* Info.cpp */,
-				0146D4A51D81B55400C1487C /* Info.h */,
+				01C2070F1D82FA4900742588 /* Info.cpp */,
+				01C207101D82FA4900742588 /* Info.h */,
 			);
 			path = Info;
 			sourceTree = "<group>";
 		};
-		0146D4A61D81B55400C1487C /* MediaServer */ = {
+		01C207111D82FA4900742588 /* MediaServer */ = {
 			isa = PBXGroup;
 			children = (
-				0146D4A71D81B55400C1487C /* DirectoryWatcher.cpp */,
-				0146D4A81D81B55400C1487C /* DirectoryWatcher.h */,
-				0146D4A91D81B55400C1487C /* MediaServer.cpp */,
-				0146D4AA1D81B55400C1487C /* MediaServer.h */,
+				01C207121D82FA4900742588 /* DirectoryWatcher.cpp */,
+				01C207131D82FA4900742588 /* DirectoryWatcher.h */,
+				01C207141D82FA4900742588 /* MediaServer.cpp */,
+				01C207151D82FA4900742588 /* MediaServer.h */,
 			);
 			path = MediaServer;
 			sourceTree = "<group>";
 		};
-		0146D4AD1D81B55400C1487C /* Sources */ = {
+		01C207181D82FA4900742588 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				0146D4AE1D81B55400C1487C /* BaseSource.cpp */,
-				0146D4AF1D81B55400C1487C /* BaseSource.h */,
-				0146D4B01D81B55400C1487C /* FboSource.cpp */,
-				0146D4B11D81B55400C1487C /* FboSource.h */,
-				0146D4B21D81B55400C1487C /* ImageSource.cpp */,
-				0146D4B31D81B55400C1487C /* ImageSource.h */,
-				0146D4B41D81B55400C1487C /* OMXPlayerCache.cpp */,
-				0146D4B51D81B55400C1487C /* OMXPlayerCache.h */,
-				0146D4B61D81B55400C1487C /* SourceType.h */,
-				0146D4B71D81B55400C1487C /* VideoSource.cpp */,
-				0146D4B81D81B55400C1487C /* VideoSource.h */,
+				01C207191D82FA4900742588 /* BaseSource.cpp */,
+				01C2071A1D82FA4900742588 /* BaseSource.h */,
+				01C2071B1D82FA4900742588 /* FboSource.cpp */,
+				01C2071C1D82FA4900742588 /* FboSource.h */,
+				01C2071D1D82FA4900742588 /* ImageSource.cpp */,
+				01C2071E1D82FA4900742588 /* ImageSource.h */,
+				01C2071F1D82FA4900742588 /* OMXPlayerCache.cpp */,
+				01C207201D82FA4900742588 /* OMXPlayerCache.h */,
+				01C207211D82FA4900742588 /* SourceType.h */,
+				01C207221D82FA4900742588 /* VideoSource.cpp */,
+				01C207231D82FA4900742588 /* VideoSource.h */,
 			);
 			path = Sources;
 			sourceTree = "<group>";
 		};
-		0146D4B91D81B55400C1487C /* Surfaces */ = {
+		01C207241D82FA4900742588 /* Surfaces */ = {
 			isa = PBXGroup;
 			children = (
-				0146D4BA1D81B55400C1487C /* BaseSurface.cpp */,
-				0146D4BB1D81B55400C1487C /* BaseSurface.h */,
-				0146D4BC1D81B55400C1487C /* GridWarpSurface.cpp */,
-				0146D4BD1D81B55400C1487C /* GridWarpSurface.h */,
-				0146D4BE1D81B55400C1487C /* QuadSurface.cpp */,
-				0146D4BF1D81B55400C1487C /* QuadSurface.h */,
-				0146D4C01D81B55400C1487C /* SurfaceFactory.cpp */,
-				0146D4C11D81B55400C1487C /* SurfaceFactory.h */,
-				0146D4C21D81B55400C1487C /* SurfaceManager.cpp */,
-				0146D4C31D81B55400C1487C /* SurfaceManager.h */,
-				0146D4C41D81B55400C1487C /* SurfaceManagerGui.cpp */,
-				0146D4C51D81B55400C1487C /* SurfaceManagerGui.h */,
-				0146D4C61D81B55400C1487C /* SurfaceStack.cpp */,
-				0146D4C71D81B55400C1487C /* SurfaceStack.h */,
-				0146D4C81D81B55400C1487C /* SurfaceType.h */,
-				0146D4C91D81B55400C1487C /* TriangleSurface.cpp */,
-				0146D4CA1D81B55400C1487C /* TriangleSurface.h */,
+				01C207251D82FA4900742588 /* BaseSurface.cpp */,
+				01C207261D82FA4900742588 /* BaseSurface.h */,
+				01C207271D82FA4900742588 /* GridWarpSurface.cpp */,
+				01C207281D82FA4900742588 /* GridWarpSurface.h */,
+				01C207291D82FA4A00742588 /* QuadSurface.cpp */,
+				01C2072A1D82FA4A00742588 /* QuadSurface.h */,
+				01C2072B1D82FA4A00742588 /* SurfaceFactory.cpp */,
+				01C2072C1D82FA4A00742588 /* SurfaceFactory.h */,
+				01C2072D1D82FA4A00742588 /* SurfaceManager.cpp */,
+				01C2072E1D82FA4A00742588 /* SurfaceManager.h */,
+				01C2072F1D82FA4A00742588 /* SurfaceManagerGui.cpp */,
+				01C207301D82FA4A00742588 /* SurfaceManagerGui.h */,
+				01C207311D82FA4A00742588 /* SurfaceStack.cpp */,
+				01C207321D82FA4A00742588 /* SurfaceStack.h */,
+				01C207331D82FA4A00742588 /* SurfaceType.h */,
+				01C207341D82FA4A00742588 /* TriangleSurface.cpp */,
+				01C207351D82FA4A00742588 /* TriangleSurface.h */,
 			);
 			path = Surfaces;
 			sourceTree = "<group>";
 		};
-		0146D4CB1D81B55400C1487C /* UserInterface */ = {
+		01C207361D82FA4A00742588 /* UserInterface */ = {
 			isa = PBXGroup;
 			children = (
-				0146D4CC1D81B55400C1487C /* BaseJoint.cpp */,
-				0146D4CD1D81B55400C1487C /* BaseJoint.h */,
-				0146D4CE1D81B55400C1487C /* CircleJoint.cpp */,
-				0146D4CF1D81B55400C1487C /* CircleJoint.h */,
-				0146D4D01D81B55400C1487C /* EditorType.h */,
-				0146D4D11D81B55400C1487C /* GuiMode.h */,
-				0146D4D21D81B55400C1487C /* ProjectionEditor.cpp */,
-				0146D4D31D81B55400C1487C /* ProjectionEditor.h */,
-				0146D4D41D81B55400C1487C /* RadioList.cpp */,
-				0146D4D51D81B55400C1487C /* RadioList.h */,
-				0146D4D61D81B55400C1487C /* SourcesEditor.cpp */,
-				0146D4D71D81B55400C1487C /* SourcesEditor.h */,
-				0146D4D81D81B55400C1487C /* TextureEditor.cpp */,
-				0146D4D91D81B55400C1487C /* TextureEditor.h */,
+				01C207371D82FA4A00742588 /* BaseJoint.cpp */,
+				01C207381D82FA4A00742588 /* BaseJoint.h */,
+				01C207391D82FA4A00742588 /* CircleJoint.cpp */,
+				01C2073A1D82FA4A00742588 /* CircleJoint.h */,
+				01C2073B1D82FA4A00742588 /* EditorType.h */,
+				01C2073C1D82FA4A00742588 /* GuiMode.h */,
+				01C2073D1D82FA4A00742588 /* ProjectionEditor.cpp */,
+				01C2073E1D82FA4A00742588 /* ProjectionEditor.h */,
+				01C2073F1D82FA4A00742588 /* RadioList.cpp */,
+				01C207401D82FA4A00742588 /* RadioList.h */,
+				01C207411D82FA4A00742588 /* SourcesEditor.cpp */,
+				01C207421D82FA4A00742588 /* SourcesEditor.h */,
+				01C207431D82FA4A00742588 /* TextureEditor.cpp */,
+				01C207441D82FA4A00742588 /* TextureEditor.h */,
 			);
 			path = UserInterface;
 			sourceTree = "<group>";
 		};
-		0146D4DA1D81B55400C1487C /* Utils */ = {
+		01C207451D82FA4A00742588 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
-				0146D4DB1D81B55400C1487C /* HomographyHelper.cpp */,
-				0146D4DC1D81B55400C1487C /* HomographyHelper.h */,
-				0146D4DD1D81B55400C1487C /* TerminalListener.cpp */,
-				0146D4DE1D81B55400C1487C /* TerminalListener.h */,
+				01C207461D82FA4A00742588 /* HomographyHelper.cpp */,
+				01C207471D82FA4A00742588 /* HomographyHelper.h */,
+				01C207481D82FA4A00742588 /* TerminalListener.cpp */,
+				01C207491D82FA4A00742588 /* TerminalListener.h */,
 			);
 			path = Utils;
 			sourceTree = "<group>";
@@ -943,7 +967,7 @@
 		396E8A34190FEDE500705899 /* ofxPiMapper */ = {
 			isa = PBXGroup;
 			children = (
-				0146D4461D81B55400C1487C /* src */,
+				01C206AE1D82FA4900742588 /* src */,
 			);
 			name = ofxPiMapper;
 			sourceTree = "<group>";
@@ -1130,121 +1154,121 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				01C207671D82FA4A00742588 /* SelPrevTexCoordCmd.cpp in Sources */,
+				01C207531D82FA4A00742588 /* AddSurfaceCmd.cpp in Sources */,
+				01C207571D82FA4A00742588 /* DeselectTexCoordCmd.cpp in Sources */,
 				3933D5D819BB87BD000ACA55 /* ofxSlider.cpp in Sources */,
 				0130C9821CE65AA600911E17 /* snappy-sinksource.cc in Sources */,
+				01C207651D82FA4A00742588 /* SelNextVertexCmd.cpp in Sources */,
 				0130C9701CE65AA600911E17 /* COBSEncoding.cpp in Sources */,
+				01C207521D82FA4A00742588 /* AddGridRowCmd.cpp in Sources */,
 				3933D5DA19BB87BD000ACA55 /* ofxToggle.cpp in Sources */,
+				01C207591D82FA4A00742588 /* MvAllTexCoordsCmd.cpp in Sources */,
+				01C2077E1D82FA4A00742588 /* VideoSource.cpp in Sources */,
 				3933D5D319BB87BD000ACA55 /* ofxBaseGui.cpp in Sources */,
-				0146D4F31D81B55400C1487C /* MvAllTexCoordsCmd.cpp in Sources */,
 				3933D5D919BB87BD000ACA55 /* ofxSliderGroup.cpp in Sources */,
+				01C207601D82FA4A00742588 /* RmGridRowCmd.cpp in Sources */,
+				01C207581D82FA4A00742588 /* DuplicateSurfaceCmd.cpp in Sources */,
 				0130C9841CE65AA600911E17 /* snappy.cc in Sources */,
-				0146D4E91D81B55400C1487C /* TextureHighlightWidget.cpp in Sources */,
+				01C207501D82FA4A00742588 /* TextureMappingState.cpp in Sources */,
 				0130C96B1CE65AA600911E17 /* ByteBuffer.cpp in Sources */,
-				0146D5131D81B55400C1487C /* VideoSource.cpp in Sources */,
+				01C207801D82FA4A00742588 /* GridWarpSurface.cpp in Sources */,
+				01C207611D82FA4A00742588 /* RmSurfaceCmd.cpp in Sources */,
+				01C2076F1D82FA4A00742588 /* ToggleAnimatedSourceCmd.cpp in Sources */,
+				01C2075C1D82FA4A00742588 /* MvSelectionCmd.cpp in Sources */,
 				0130C96A1CE65AA600911E17 /* Base64Encoding.cpp in Sources */,
 				3995C20A1C79069B00123352 /* Settings.cpp in Sources */,
+				01C207841D82FA4A00742588 /* SurfaceManagerGui.cpp in Sources */,
+				01C207761D82FA4A00742588 /* Info.cpp in Sources */,
+				01C2078C1D82FA4A00742588 /* TextureEditor.cpp in Sources */,
 				0130C96F1CE65AA600911E17 /* ByteBufferWriter.cpp in Sources */,
-				0146D5091D81B55400C1487C /* ToggleAnimatedSourceCmd.cpp in Sources */,
+				01C2076E1D82FA4A00742588 /* StartDragSurfaceCmd.cpp in Sources */,
 				0130C97E1CE65AA600911E17 /* RegexPathFilter.cpp in Sources */,
-				0146D4F01D81B55400C1487C /* DeselectSurfaceCmd.cpp in Sources */,
-				0146D4EC1D81B55400C1487C /* AddGridRowCmd.cpp in Sources */,
-				0146D5151D81B55400C1487C /* GridWarpSurface.cpp in Sources */,
 				0130C9771CE65AA600911E17 /* FileExtensionFilter.cpp in Sources */,
-				0146D4F11D81B55400C1487C /* DeselectTexCoordCmd.cpp in Sources */,
-				0146D4E41D81B55400C1487C /* ProjectionMappingState.cpp in Sources */,
-				0146D5041D81B55400C1487C /* SelVertexCmd.cpp in Sources */,
+				01C207631D82FA4A00742588 /* SelNextSurfaceCmd.cpp in Sources */,
+				01C207891D82FA4A00742588 /* ProjectionEditor.cpp in Sources */,
+				01C207701D82FA4A00742588 /* TogglePerspectiveCmd.cpp in Sources */,
+				01C207731D82FA4A00742588 /* ScaleWidget.cpp in Sources */,
 				E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */,
-				0146D5191D81B55400C1487C /* SurfaceManagerGui.cpp in Sources */,
-				0146D50B1D81B55400C1487C /* Info.cpp in Sources */,
-				0146D5211D81B55400C1487C /* TextureEditor.cpp in Sources */,
-				0146D4F91D81B55400C1487C /* RmGridColCmd.cpp in Sources */,
+				01C207681D82FA4A00742588 /* SelPrevVertexCmd.cpp in Sources */,
 				39264843192224F90008A7F5 /* tinyxmlparser.cpp in Sources */,
-				0146D5031D81B55400C1487C /* SelSurfaceCmd.cpp in Sources */,
+				01C2074C1D82FA4A00742588 /* ApplicationBaseState.cpp in Sources */,
+				01C2077A1D82FA4A00742588 /* BaseSource.cpp in Sources */,
 				0130C96D1CE65AA600911E17 /* ByteBufferStream.cpp in Sources */,
 				3933D5D419BB87BD000ACA55 /* ofxButton.cpp in Sources */,
-				0146D51E1D81B55400C1487C /* ProjectionEditor.cpp in Sources */,
+				01C207861D82FA4A00742588 /* TriangleSurface.cpp in Sources */,
 				0130C9691CE65AA600911E17 /* lz4.c in Sources */,
-				0146D4F61D81B55400C1487C /* MvSelectionCmd.cpp in Sources */,
+				01C2077B1D82FA4A00742588 /* FboSource.cpp in Sources */,
+				01C2078E1D82FA4A00742588 /* TerminalListener.cpp in Sources */,
+				01C2076B1D82FA4A00742588 /* SetApplicationStateCmd.cpp in Sources */,
 				0130C9791CE65AA600911E17 /* HiddenFileFilter.cpp in Sources */,
+				01C2075B1D82FA4A00742588 /* MvLayerUpCmd.cpp in Sources */,
+				01C207511D82FA4A00742588 /* AddGridColCmd.cpp in Sources */,
 				0130C97B1CE65AA600911E17 /* PathFilterCollection.cpp in Sources */,
-				0146D5071D81B55400C1487C /* SetSourceCmd.cpp in Sources */,
+				01C207811D82FA4A00742588 /* QuadSurface.cpp in Sources */,
 				0130C9721CE65AA600911E17 /* DeviceFilter.cpp in Sources */,
-				0146D50F1D81B55400C1487C /* BaseSource.cpp in Sources */,
 				0130C9781CE65AA600911E17 /* HexBinaryEncoding.cpp in Sources */,
-				0146D4FA1D81B55400C1487C /* RmGridRowCmd.cpp in Sources */,
-				0146D51B1D81B55400C1487C /* TriangleSurface.cpp in Sources */,
+				01C207741D82FA4A00742588 /* SurfaceHighlightWidget.cpp in Sources */,
+				01C2075F1D82FA4A00742588 /* RmGridColCmd.cpp in Sources */,
+				01C207711D82FA4A00742588 /* Gui.cpp in Sources */,
 				0130C96E1CE65AA600911E17 /* ByteBufferUtils.cpp in Sources */,
-				0146D5101D81B55400C1487C /* FboSource.cpp in Sources */,
-				0146D5231D81B55400C1487C /* TerminalListener.cpp in Sources */,
-				0146D4DF1D81B55400C1487C /* Application.cpp in Sources */,
+				01C207641D82FA4A00742588 /* SelNextTexCoordCmd.cpp in Sources */,
+				01C2078A1D82FA4A00742588 /* RadioList.cpp in Sources */,
+				01C2074A1D82FA4A00742588 /* Application.cpp in Sources */,
 				39264841192224F90008A7F5 /* tinyxml.cpp in Sources */,
-				0146D4E01D81B55400C1487C /* ApplicationBaseState.cpp in Sources */,
-				0146D4ED1D81B55400C1487C /* AddSurfaceCmd.cpp in Sources */,
-				0146D4FD1D81B55400C1487C /* SelNextSurfaceCmd.cpp in Sources */,
-				0146D5161D81B55400C1487C /* QuadSurface.cpp in Sources */,
 				0130C9731CE65AA600911E17 /* DirectoryFilter.cpp in Sources */,
+				01C207661D82FA4A00742588 /* SelPrevSurfaceCmd.cpp in Sources */,
+				01C2076D1D82FA4A00742588 /* SetSourceCmd.cpp in Sources */,
 				3933D5D619BB87BD000ACA55 /* ofxLabel.cpp in Sources */,
+				01C207721D82FA4A00742588 /* LayerPanelWidget.cpp in Sources */,
+				01C2074B1D82FA4A00742588 /* SettingsLoader.cpp in Sources */,
 				399953691BD54FF600D5B1F1 /* CrossSource.cpp in Sources */,
-				0146D5051D81B55400C1487C /* SetApplicationStateCmd.cpp in Sources */,
 				0130C9741CE65AA600911E17 /* DirectoryUtils.cpp in Sources */,
-				0146D4E21D81B55400C1487C /* LayerPanelWidget.cpp in Sources */,
-				0146D50A1D81B55400C1487C /* TogglePerspectiveCmd.cpp in Sources */,
-				0146D51F1D81B55400C1487C /* RadioList.cpp in Sources */,
-				0146D4E71D81B55400C1487C /* SourceSelectionState.cpp in Sources */,
-				0146D4F21D81B55400C1487C /* DuplicateSurfaceCmd.cpp in Sources */,
+				01C2075D1D82FA4A00742588 /* MvSurfaceVertCmd.cpp in Sources */,
+				01C207771D82FA4A00742588 /* DirectoryWatcher.cpp in Sources */,
+				01C2077F1D82FA4A00742588 /* BaseSurface.cpp in Sources */,
 				0130C9801CE65AA600911E17 /* SLIPEncoding.cpp in Sources */,
+				01C207691D82FA4A00742588 /* SelSurfaceCmd.cpp in Sources */,
 				0130C9831CE65AA600911E17 /* snappy-stubs-internal.cc in Sources */,
-				0146D4FB1D81B55400C1487C /* RmSurfaceCmd.cpp in Sources */,
 				0130C97F1CE65AA600911E17 /* SearchPath.cpp in Sources */,
+				01C2074E1D82FA4A00742588 /* ProjectionMappingState.cpp in Sources */,
+				01C2077D1D82FA4A00742588 /* OMXPlayerCache.cpp in Sources */,
+				01C2078B1D82FA4A00742588 /* SourcesEditor.cpp in Sources */,
+				01C207851D82FA4A00742588 /* SurfaceStack.cpp in Sources */,
+				01C2076C1D82FA4A00742588 /* SetNextSourceCmd.cpp in Sources */,
 				0130C97A1CE65AA600911E17 /* LinkFilter.cpp in Sources */,
-				0146D4E31D81B55400C1487C /* PresentationState.cpp in Sources */,
-				0146D4EB1D81B55400C1487C /* AddGridColCmd.cpp in Sources */,
-				0146D4E11D81B55400C1487C /* Gui.cpp in Sources */,
-				0146D5001D81B55400C1487C /* SelPrevSurfaceCmd.cpp in Sources */,
-				0146D50C1D81B55400C1487C /* DirectoryWatcher.cpp in Sources */,
-				0146D5141D81B55400C1487C /* BaseSurface.cpp in Sources */,
-				0146D4F41D81B55400C1487C /* MvLayerDnCmd.cpp in Sources */,
-				0146D4F81D81B55400C1487C /* MvTexCoordCmd.cpp in Sources */,
+				01C207821D82FA4A00742588 /* SurfaceFactory.cpp in Sources */,
+				01C2077C1D82FA4A00742588 /* ImageSource.cpp in Sources */,
 				E4B69E210A3A1BDC003C02F2 /* ofApp.cpp in Sources */,
-				0146D5021D81B55400C1487C /* SelPrevVertexCmd.cpp in Sources */,
-				0146D4F71D81B55400C1487C /* MvSurfaceVertCmd.cpp in Sources */,
-				0146D5121D81B55400C1487C /* OMXPlayerCache.cpp in Sources */,
-				0146D5201D81B55400C1487C /* SourcesEditor.cpp in Sources */,
-				0146D51A1D81B55400C1487C /* SurfaceStack.cpp in Sources */,
 				0130C96C1CE65AA600911E17 /* ByteBufferReader.cpp in Sources */,
 				3933D5D719BB87BD000ACA55 /* ofxPanel.cpp in Sources */,
-				0146D5171D81B55400C1487C /* SurfaceFactory.cpp in Sources */,
-				0146D5111D81B55400C1487C /* ImageSource.cpp in Sources */,
-				0146D5061D81B55400C1487C /* SetNextSourceCmd.cpp in Sources */,
-				0146D5081D81B55400C1487C /* StartDragSurfaceCmd.cpp in Sources */,
 				0130C97D1CE65AA600911E17 /* RecursiveDirectoryIteratorStategies.cpp in Sources */,
-				0146D4FF1D81B55400C1487C /* SelNextVertexCmd.cpp in Sources */,
-				0146D50D1D81B55400C1487C /* MediaServer.cpp in Sources */,
-				0146D51C1D81B55400C1487C /* BaseJoint.cpp in Sources */,
-				0146D4EA1D81B55400C1487C /* TextureMappingState.cpp in Sources */,
+				01C207781D82FA4A00742588 /* MediaServer.cpp in Sources */,
+				01C207871D82FA4A00742588 /* BaseJoint.cpp in Sources */,
 				0130C9711CE65AA600911E17 /* Compression.cpp in Sources */,
 				0130C97C1CE65AA600911E17 /* RecursiveDirectoryIterator.cpp in Sources */,
+				01C207551D82FA4A00742588 /* CmdManager.cpp in Sources */,
+				01C2075E1D82FA4A00742588 /* MvTexCoordCmd.cpp in Sources */,
+				01C2076A1D82FA4A00742588 /* SelVertexCmd.cpp in Sources */,
 				39264842192224F90008A7F5 /* tinyxmlerror.cpp in Sources */,
-				0146D4FC1D81B55400C1487C /* ScaleSurfaceFromToCmd.cpp in Sources */,
-				0146D4EF1D81B55400C1487C /* CmdManager.cpp in Sources */,
 				3926483B192224DA0008A7F5 /* ofxXmlSettings.cpp in Sources */,
-				0146D4FE1D81B55400C1487C /* SelNextTexCoordCmd.cpp in Sources */,
-				0146D4EE1D81B55400C1487C /* ClearSurfacesCmd.cpp in Sources */,
-				0146D4E51D81B55400C1487C /* ScaleWidget.cpp in Sources */,
-				0146D50E1D81B55400C1487C /* ofxPiMapper.cpp in Sources */,
-				0146D4E81D81B55400C1487C /* SurfaceHighlightWidget.cpp in Sources */,
 				0130C9681CE65AA600911E17 /* README.md in Sources */,
+				01C2074F1D82FA4A00742588 /* SourceSelectionState.cpp in Sources */,
+				01C207621D82FA4A00742588 /* ScaleSurfaceFromToCmd.cpp in Sources */,
+				01C207791D82FA4A00742588 /* ofxPiMapper.cpp in Sources */,
+				01C207541D82FA4A00742588 /* ClearSurfacesCmd.cpp in Sources */,
+				01C207561D82FA4A00742588 /* DeselectSurfaceCmd.cpp in Sources */,
 				0130C9751CE65AA600911E17 /* DirectoryWatcher.cpp in Sources */,
 				0130C9811CE65AA600911E17 /* URIEncoding.cpp in Sources */,
 				397EFC821A09047C0009286E /* CustomSource.cpp in Sources */,
-				0146D5011D81B55400C1487C /* SelPrevTexCoordCmd.cpp in Sources */,
-				0146D4E61D81B55400C1487C /* SettingsLoader.cpp in Sources */,
+				01C2075A1D82FA4A00742588 /* MvLayerDnCmd.cpp in Sources */,
+				01C2074D1D82FA4A00742588 /* PresentationState.cpp in Sources */,
 				3933D5D519BB87BD000ACA55 /* ofxGuiGroup.cpp in Sources */,
-				0146D4F51D81B55400C1487C /* MvLayerUpCmd.cpp in Sources */,
+				01C207751D82FA4A00742588 /* TextureHighlightWidget.cpp in Sources */,
 				0130C9761CE65AA600911E17 /* DirectoryWatcherManager.cpp in Sources */,
-				0146D5181D81B55400C1487C /* SurfaceManager.cpp in Sources */,
-				0146D51D1D81B55400C1487C /* CircleJoint.cpp in Sources */,
-				0146D5221D81B55400C1487C /* HomographyHelper.cpp in Sources */,
+				01C207831D82FA4A00742588 /* SurfaceManager.cpp in Sources */,
+				01C207881D82FA4A00742588 /* CircleJoint.cpp in Sources */,
+				01C2078D1D82FA4A00742588 /* HomographyHelper.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};