diff --git a/maszyna.sln b/maszyna.sln
index e52888e7..a12e6c85 100644
--- a/maszyna.sln
+++ b/maszyna.sln
@@ -1,18 +1,24 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 2013
+VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "maszyna", "maszyna.vcxproj", "{8E0232E5-1C67-442F-9E04-45ED2DDFC960}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x64.ActiveCfg = Debug|x64
+		{8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x64.Build.0 = Debug|x64
 		{8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x86.ActiveCfg = Debug|Win32
 		{8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x86.Build.0 = Debug|Win32
+		{8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x64.ActiveCfg = Release|x64
+		{8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x64.Build.0 = Release|x64
 		{8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x86.ActiveCfg = Release|Win32
 		{8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
diff --git a/maszyna.vcxproj b/maszyna.vcxproj
index 2797b436..1cf2b810 100644
--- a/maszyna.vcxproj
+++ b/maszyna.vcxproj
@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8E0232E5-1C67-442F-9E04-45ED2DDFC960}</ProjectGuid>
@@ -18,12 +26,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -31,185 +49,338 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>eu07++</TargetName>
+    <TargetName>eu07-$(PlatformShortName)</TargetName>
     <IntDir>$(SolutionDir)tmp\$(PlatformShortName)-$(Configuration)\$(ProjectName)\</IntDir>
     <OutDir>$(SolutionDir)bin\</OutDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>eu07++</TargetName>
-    <IntDir>$(SolutionDir)tmp\$(PlatformShortName)-$(Configuration)\$(ProjectName)\</IntDir>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>eu07-$(PlatformShortName)</TargetName>
     <OutDir>$(SolutionDir)bin\</OutDir>
+    <IntDir>$(SolutionDir)tmp\$(PlatformShortName)-$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)bin\</OutDir>
+    <IntDir>$(SolutionDir)tmp\$(PlatformShortName)-$(Configuration)\$(ProjectName)\</IntDir>
+    <TargetName>eu07-$(PlatformShortName)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>eu07-$(PlatformShortName)</TargetName>
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)bin\</OutDir>
+    <IntDir>$(SolutionDir)tmp\$(PlatformShortName)-$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)opengl;$(SolutionDir)python/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glm;$(SolutionDir)ref/openal/include;$(SolutionDir)ref/dr_libs/include;$(SolutionDir)ref/imgui;$(SolutionDir)ref/imgui/examples;$(SolutionDir)ref/python/include;$(SolutionDir)ref/libserialport/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
       <FloatingPointExceptions>true</FloatingPointExceptions>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
     </ClCompile>
     <Link>
-      <TargetMachine>MachineX86</TargetMachine>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glew/lib/msvc-$(MSBuildToolsVersion)/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/msvc-$(MSBuildToolsVersion)/$(PlatformShortName);$(SolutionDir)ref/openal/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);$(SolutionDir)ref/libserialport/lib/$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)opengl;$(SolutionDir)python/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+      <LargeAddressAware>true</LargeAddressAware>
+    </Link>
+    <Bscmake />
+    <Bscmake />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glm;$(SolutionDir)ref/openal/include;$(SolutionDir)ref/dr_libs/include;$(SolutionDir)ref/imgui;$(SolutionDir)ref/imgui/examples;$(SolutionDir)ref/python/include;$(SolutionDir)ref/libserialport/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glew/lib/msvc-$(MSBuildToolsVersion)/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/msvc-$(MSBuildToolsVersion)/$(PlatformShortName);$(SolutionDir)ref/openal/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);$(SolutionDir)ref/libserialport/lib/$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Windows</SubSystem>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)opengl;$(SolutionDir)python/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glm;$(SolutionDir)ref/openal/include;$(SolutionDir)ref/dr_libs/include;$(SolutionDir)ref/imgui;$(SolutionDir)ref/imgui/examples;$(SolutionDir)ref/python/include;$(SolutionDir)ref/libserialport/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
     </ClCompile>
     <Link>
-      <TargetMachine>MachineX86</TargetMachine>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)opengl;$(SolutionDir)python/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glew/lib/msvc-$(MSBuildToolsVersion)/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/msvc-$(MSBuildToolsVersion)/$(PlatformShortName);$(SolutionDir)ref/openal/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);$(SolutionDir)ref/libserialport/lib/$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Windows</SubSystem>
+      <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
+      <LargeAddressAware>true</LargeAddressAware>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glm;$(SolutionDir)ref/openal/include;$(SolutionDir)ref/dr_libs/include;$(SolutionDir)ref/imgui;$(SolutionDir)ref/imgui/examples;$(SolutionDir)ref/python/include;$(SolutionDir)ref/libserialport/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <FloatingPointExceptions>true</FloatingPointExceptions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glew/lib/msvc-$(MSBuildToolsVersion)/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/msvc-$(MSBuildToolsVersion)/$(PlatformShortName);$(SolutionDir)ref/openal/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);$(SolutionDir)ref/libserialport/lib/$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Windows</SubSystem>
+      <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="AdvSound.cpp" />
     <ClCompile Include="AirCoupler.cpp" />
     <ClCompile Include="AnimModel.cpp" />
+    <ClCompile Include="application.cpp" />
+    <ClCompile Include="audio.cpp" />
+    <ClCompile Include="audiorenderer.cpp" />
     <ClCompile Include="Button.cpp" />
     <ClCompile Include="Camera.cpp" />
+    <ClCompile Include="command.cpp" />
     <ClCompile Include="Console.cpp" />
     <ClCompile Include="console\LPT.cpp" />
-    <ClCompile Include="Console\MWD.cpp" />
     <ClCompile Include="console\PoKeys55.cpp" />
     <ClCompile Include="Driver.cpp" />
+    <ClCompile Include="drivermode.cpp" />
+    <ClCompile Include="driveruilayer.cpp" />
+    <ClCompile Include="driveruipanels.cpp" />
     <ClCompile Include="dumb3d.cpp" />
     <ClCompile Include="DynObj.cpp" />
-    <ClCompile Include="EU07.cpp" />
+    <ClCompile Include="editorkeyboardinput.cpp" />
+    <ClCompile Include="editormode.cpp" />
+    <ClCompile Include="editormouseinput.cpp" />
+    <ClCompile Include="editoruilayer.cpp" />
+    <ClCompile Include="editoruipanels.cpp" />
+    <ClCompile Include="eu07.cpp" />
     <ClCompile Include="Event.cpp" />
     <ClCompile Include="EvLaunch.cpp" />
-    <ClCompile Include="FadeSound.cpp" />
     <ClCompile Include="Float3d.cpp" />
+    <ClCompile Include="frustum.cpp" />
+    <ClCompile Include="gamepadinput.cpp" />
     <ClCompile Include="Gauge.cpp" />
     <ClCompile Include="Globals.cpp" />
-    <ClCompile Include="Ground.cpp" />
+    <ClCompile Include="driverkeyboardinput.cpp" />
+    <ClCompile Include="keyboardinput.cpp" />
+    <ClCompile Include="lightarray.cpp" />
     <ClCompile Include="Logs.cpp" />
+    <ClCompile Include="material.cpp" />
     <ClCompile Include="mczapkie\friction.cpp" />
     <ClCompile Include="mczapkie\hamulce.cpp" />
-    <ClCompile Include="mczapkie\mctools.cpp" />
     <ClCompile Include="mczapkie\Mover.cpp" />
     <ClCompile Include="mczapkie\Oerlikon_ESt.cpp" />
     <ClCompile Include="MdlMngr.cpp" />
     <ClCompile Include="MemCell.cpp" />
+    <ClCompile Include="messaging.cpp" />
     <ClCompile Include="Model3d.cpp" />
+    <ClCompile Include="moon.cpp" />
+    <ClCompile Include="drivermouseinput.cpp" />
     <ClCompile Include="mtable.cpp" />
     <ClCompile Include="Names.cpp" />
-    <ClCompile Include="opengl\ARB_Multisample.cpp" />
+    <ClCompile Include="openglcolor.cpp" />
+    <ClCompile Include="openglgeometrybank.cpp" />
+    <ClCompile Include="openglmatrixstack.cpp" />
     <ClCompile Include="parser.cpp" />
+    <ClCompile Include="precipitation.cpp" />
     <ClCompile Include="PyInt.cpp" />
-    <ClCompile Include="RealSound.cpp" />
+    <ClCompile Include="ref\imgui\examples\imgui_impl_glfw.cpp" />
+    <ClCompile Include="ref\imgui\examples\imgui_impl_opengl2.cpp" />
+    <ClCompile Include="ref\imgui\examples\imgui_impl_opengl3.cpp" />
+    <ClCompile Include="ref\imgui\imgui.cpp" />
+    <ClCompile Include="ref\imgui\imgui_draw.cpp" />
+    <ClCompile Include="ref\imgui\imgui_widgets.cpp" />
+    <ClCompile Include="renderer.cpp" />
     <ClCompile Include="ResourceManager.cpp" />
+    <ClCompile Include="scenarioloadermode.cpp" />
+    <ClCompile Include="scenenodegroups.cpp" />
+    <ClCompile Include="simulationenvironment.cpp" />
+    <ClCompile Include="simulationstateserializer.cpp" />
+    <ClCompile Include="scene.cpp" />
+    <ClCompile Include="sceneeditor.cpp" />
+    <ClCompile Include="scenenode.cpp" />
     <ClCompile Include="Segment.cpp" />
+    <ClCompile Include="simulation.cpp" />
+    <ClCompile Include="simulationtime.cpp" />
     <ClCompile Include="sky.cpp" />
-    <ClCompile Include="Sound.cpp" />
+    <ClCompile Include="skydome.cpp" />
+    <ClCompile Include="sn_utils.cpp" />
+    <ClCompile Include="sound.cpp" />
     <ClCompile Include="Spring.cpp" />
+    <ClCompile Include="stars.cpp" />
+    <ClCompile Include="station.cpp" />
+    <ClCompile Include="stb_vorbis.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="sun.cpp" />
     <ClCompile Include="Texture.cpp" />
-    <ClCompile Include="TextureDDS.cpp" />
     <ClCompile Include="Timer.cpp" />
     <ClCompile Include="Track.cpp" />
     <ClCompile Include="Traction.cpp" />
     <ClCompile Include="TractionPower.cpp" />
     <ClCompile Include="Train.cpp" />
+    <ClCompile Include="translation.cpp" />
     <ClCompile Include="TrkFoll.cpp" />
-    <ClCompile Include="VBO.cpp" />
-    <ClCompile Include="wavread.cpp" />
-    <ClCompile Include="World.cpp" />
+    <ClCompile Include="uart.cpp" />
+    <ClCompile Include="uilayer.cpp" />
+    <ClCompile Include="uitranscripts.cpp" />
+    <ClCompile Include="utilities.cpp" />
+    <ClCompile Include="vertex.cpp" />
+    <ClCompile Include="windows.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="AdvSound.h" />
     <ClInclude Include="AirCoupler.h" />
     <ClInclude Include="AnimModel.h" />
+    <ClInclude Include="application.h" />
+    <ClInclude Include="applicationmode.h" />
+    <ClInclude Include="audio.h" />
+    <ClInclude Include="audiorenderer.h" />
     <ClInclude Include="Button.h" />
     <ClInclude Include="Camera.h" />
     <ClInclude Include="Classes.h" />
+    <ClInclude Include="color.h" />
+    <ClInclude Include="command.h" />
     <ClInclude Include="Console.h" />
     <ClInclude Include="Console\LPT.h" />
-    <ClInclude Include="Console\MWD.h" />
     <ClInclude Include="Console\PoKeys55.h" />
     <ClInclude Include="Driver.h" />
+    <ClInclude Include="drivermode.h" />
+    <ClInclude Include="driveruilayer.h" />
+    <ClInclude Include="driveruipanels.h" />
     <ClInclude Include="dumb3d.h" />
     <ClInclude Include="DynObj.h" />
+    <ClInclude Include="editorkeyboardinput.h" />
+    <ClInclude Include="editormode.h" />
+    <ClInclude Include="editormouseinput.h" />
+    <ClInclude Include="editoruilayer.h" />
+    <ClInclude Include="editoruipanels.h" />
     <ClInclude Include="Event.h" />
     <ClInclude Include="EvLaunch.h" />
-    <ClInclude Include="FadeSound.h" />
     <ClInclude Include="Float3d.h" />
+    <ClInclude Include="frustum.h" />
+    <ClInclude Include="gamepadinput.h" />
     <ClInclude Include="Gauge.h" />
     <ClInclude Include="Globals.h" />
-    <ClInclude Include="Ground.h" />
+    <ClInclude Include="driverkeyboardinput.h" />
+    <ClInclude Include="keyboardinput.h" />
+    <ClInclude Include="light.h" />
+    <ClInclude Include="lightarray.h" />
     <ClInclude Include="Logs.h" />
+    <ClInclude Include="material.h" />
     <ClInclude Include="McZapkie\friction.h" />
     <ClInclude Include="McZapkie\hamulce.h" />
-    <ClInclude Include="McZapkie\mctools.h" />
     <ClInclude Include="McZapkie\mover.h" />
     <ClInclude Include="McZapkie\Oerlikon_ESt.h" />
     <ClInclude Include="MdlMngr.h" />
     <ClInclude Include="MemCell.h" />
+    <ClInclude Include="messaging.h" />
     <ClInclude Include="Model3d.h" />
+    <ClInclude Include="moon.h" />
+    <ClInclude Include="drivermouseinput.h" />
     <ClInclude Include="mtable.h" />
     <ClInclude Include="Names.h" />
-    <ClInclude Include="opengl\arb_multisample.h" />
-    <ClInclude Include="opengl\glew.h" />
-    <ClInclude Include="opengl\wglew.h" />
+    <ClInclude Include="openglcolor.h" />
+    <ClInclude Include="openglgeometrybank.h" />
+    <ClInclude Include="openglmatrixstack.h" />
     <ClInclude Include="parser.h" />
+    <ClInclude Include="precipitation.h" />
     <ClInclude Include="PyInt.h" />
-    <ClInclude Include="python\include\Python.h" />
-    <ClInclude Include="RealSound.h" />
+    <ClInclude Include="renderer.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="ResourceManager.h" />
+    <ClInclude Include="scenarioloadermode.h" />
+    <ClInclude Include="scenarioloaderuilayer.h" />
+    <ClInclude Include="scenenodegroups.h" />
+    <ClInclude Include="simulationenvironment.h" />
+    <ClInclude Include="simulationstateserializer.h" />
+    <ClInclude Include="scene.h" />
+    <ClInclude Include="sceneeditor.h" />
+    <ClInclude Include="scenenode.h" />
     <ClInclude Include="Segment.h" />
+    <ClInclude Include="simulation.h" />
+    <ClInclude Include="simulationtime.h" />
     <ClInclude Include="sky.h" />
-    <ClInclude Include="Sound.h" />
+    <ClInclude Include="skydome.h" />
+    <ClInclude Include="sn_utils.h" />
+    <ClInclude Include="sound.h" />
     <ClInclude Include="Spring.h" />
+    <ClInclude Include="stars.h" />
+    <ClInclude Include="station.h" />
     <ClInclude Include="stdafx.h" />
+    <ClInclude Include="sun.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="Texture.h" />
-    <ClInclude Include="TextureDDS.h" />
     <ClInclude Include="Timer.h" />
     <ClInclude Include="Track.h" />
     <ClInclude Include="Traction.h" />
     <ClInclude Include="TractionPower.h" />
     <ClInclude Include="Train.h" />
+    <ClInclude Include="translation.h" />
     <ClInclude Include="TrkFoll.h" />
-    <ClInclude Include="usefull.h" />
-    <ClInclude Include="VBO.h" />
-    <ClInclude Include="wavread.h" />
-    <ClInclude Include="World.h" />
+    <ClInclude Include="uart.h" />
+    <ClInclude Include="uilayer.h" />
+    <ClInclude Include="uitranscripts.h" />
+    <ClInclude Include="utilities.h" />
+    <ClInclude Include="version.h" />
+    <ClInclude Include="vertex.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="maszyna.rc" />
+    <ResourceCompile Include="maszyna.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">TARGETMACHINEX86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TARGETMACHINEX86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="eu07.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="ClassDiagram.cd" />
-    <None Include="ClassDiagram1.cd" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters
index fed256d5..7bf6e177 100644
--- a/maszyna.vcxproj.filters
+++ b/maszyna.vcxproj.filters
@@ -13,29 +13,47 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
     </Filter>
-    <Filter Include="Source Files\opengl">
-      <UniqueIdentifier>{d91dfdb6-7d84-4b52-a16a-bad302b45e3c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\mczapkie">
       <UniqueIdentifier>{fafd38ab-4c2a-48c8-8e66-ad0d928573b3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\console">
-      <UniqueIdentifier>{2d73d7b2-5252-499c-963a-88fa3cb1af53}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\opengl">
-      <UniqueIdentifier>{aec51dd3-af67-4f08-9dcb-889f673ad7c9}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\mczapkie">
       <UniqueIdentifier>{36684428-8a48-435f-bca4-a24d9bfe2587}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\console">
-      <UniqueIdentifier>{cdf75bec-91f7-413c-8b57-9e32cba49148}</UniqueIdentifier>
+    <Filter Include="Header Files\application">
+      <UniqueIdentifier>{035056ae-b8d6-4338-9d1f-514a0ce5f1e0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\application">
+      <UniqueIdentifier>{395be8b7-094b-4e4d-918e-02369cd6013b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\application\mode_driver">
+      <UniqueIdentifier>{1ea7a1f1-5728-478c-8593-b6f4eecefdbf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\application\mode_editor">
+      <UniqueIdentifier>{89843d2c-930c-4135-8575-714040f117ac}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\application\mode_scenarioloader">
+      <UniqueIdentifier>{ab9c6f13-eb8f-497b-b21d-66f8c0220cf8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\application\mode_driver">
+      <UniqueIdentifier>{492181c1-fa1a-4087-be99-5d88edf66c69}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\application\mode_editor">
+      <UniqueIdentifier>{e8c50720-4d83-4722-8ac9-16ea6af834b5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\application\mode_scenarioloader">
+      <UniqueIdentifier>{ecadb5ae-48aa-4811-909d-56e8a01badb2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\application\input">
+      <UniqueIdentifier>{ba04e497-9bfa-4cfd-883f-7f018ac76301}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\application\input">
+      <UniqueIdentifier>{0630616b-1afe-4fb6-96d1-3755834ba8aa}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\imgui">
+      <UniqueIdentifier>{33f7f4ae-692b-4989-a71a-004e0d48ed4f}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="AdvSound.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="AirCoupler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -60,18 +78,12 @@
     <ClCompile Include="DynObj.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="EU07.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Event.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="EvLaunch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="FadeSound.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Float3d.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -81,9 +93,6 @@
     <ClCompile Include="Globals.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Ground.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Logs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -105,9 +114,6 @@
     <ClCompile Include="PyInt.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="RealSound.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="ResourceManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -117,18 +123,12 @@
     <ClCompile Include="sky.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Sound.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Spring.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Texture.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="TextureDDS.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Timer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -147,56 +147,200 @@
     <ClCompile Include="TrkFoll.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="VBO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wavread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="World.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="opengl\ARB_Multisample.cpp">
-      <Filter>Source Files\opengl</Filter>
-    </ClCompile>
     <ClCompile Include="mczapkie\friction.cpp">
       <Filter>Source Files\mczapkie</Filter>
     </ClCompile>
     <ClCompile Include="mczapkie\hamulce.cpp">
       <Filter>Source Files\mczapkie</Filter>
     </ClCompile>
-    <ClCompile Include="console\LPT.cpp">
-      <Filter>Source Files\console</Filter>
-    </ClCompile>
-    <ClCompile Include="mczapkie\mctools.cpp">
-      <Filter>Source Files\mczapkie</Filter>
-    </ClCompile>
     <ClCompile Include="mczapkie\Mover.cpp">
       <Filter>Source Files\mczapkie</Filter>
     </ClCompile>
     <ClCompile Include="mczapkie\Oerlikon_ESt.cpp">
       <Filter>Source Files\mczapkie</Filter>
     </ClCompile>
-    <ClCompile Include="console\PoKeys55.cpp">
-      <Filter>Source Files\console</Filter>
-    </ClCompile>
     <ClCompile Include="stdafx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Console\MWD.cpp">
-      <Filter>Source Files\console</Filter>
-    </ClCompile>
     <ClCompile Include="Names.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="sun.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="renderer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="skydome.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="stars.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="lightarray.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="windows.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sn_utils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="frustum.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="uilayer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="openglmatrixstack.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="moon.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="command.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="openglgeometrybank.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="translation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="material.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="scene.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="scenenode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="simulation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="vertex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="messaging.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sound.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="audiorenderer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="audio.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="uitranscripts.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="utilities.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="station.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="stb_vorbis.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="simulationtime.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="eu07.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="application.cpp">
+      <Filter>Source Files\application</Filter>
+    </ClCompile>
+    <ClCompile Include="simulationstateserializer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="simulationenvironment.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sceneeditor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="drivermode.cpp">
+      <Filter>Source Files\application\mode_driver</Filter>
+    </ClCompile>
+    <ClCompile Include="driveruilayer.cpp">
+      <Filter>Source Files\application\mode_driver</Filter>
+    </ClCompile>
+    <ClCompile Include="editoruilayer.cpp">
+      <Filter>Source Files\application\mode_editor</Filter>
+    </ClCompile>
+    <ClCompile Include="editormode.cpp">
+      <Filter>Source Files\application\mode_editor</Filter>
+    </ClCompile>
+    <ClCompile Include="scenarioloadermode.cpp">
+      <Filter>Source Files\application\mode_scenarioloader</Filter>
+    </ClCompile>
+    <ClCompile Include="driverkeyboardinput.cpp">
+      <Filter>Source Files\application\mode_driver</Filter>
+    </ClCompile>
+    <ClCompile Include="drivermouseinput.cpp">
+      <Filter>Source Files\application\mode_driver</Filter>
+    </ClCompile>
+    <ClCompile Include="editormouseinput.cpp">
+      <Filter>Source Files\application\mode_editor</Filter>
+    </ClCompile>
+    <ClCompile Include="gamepadinput.cpp">
+      <Filter>Source Files\application\mode_driver</Filter>
+    </ClCompile>
+    <ClCompile Include="console\LPT.cpp">
+      <Filter>Source Files\application\mode_driver</Filter>
+    </ClCompile>
+    <ClCompile Include="console\PoKeys55.cpp">
+      <Filter>Source Files\application\mode_driver</Filter>
+    </ClCompile>
+    <ClCompile Include="uart.cpp">
+      <Filter>Source Files\application\mode_driver</Filter>
+    </ClCompile>
+    <ClCompile Include="editorkeyboardinput.cpp">
+      <Filter>Source Files\application\mode_editor</Filter>
+    </ClCompile>
+    <ClCompile Include="keyboardinput.cpp">
+      <Filter>Source Files\application\input</Filter>
+    </ClCompile>
+    <ClCompile Include="scenenodegroups.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ref\imgui\imgui.cpp">
+      <Filter>Source Files\imgui</Filter>
+    </ClCompile>
+    <ClCompile Include="ref\imgui\imgui_draw.cpp">
+      <Filter>Source Files\imgui</Filter>
+    </ClCompile>
+    <ClCompile Include="ref\imgui\examples\imgui_impl_glfw.cpp">
+      <Filter>Source Files\imgui</Filter>
+    </ClCompile>
+    <ClCompile Include="driveruipanels.cpp">
+      <Filter>Source Files\application\mode_driver</Filter>
+    </ClCompile>
+    <ClCompile Include="editoruipanels.cpp">
+      <Filter>Source Files\application\mode_editor</Filter>
+    </ClCompile>
+    <ClCompile Include="ref\imgui\examples\imgui_impl_opengl3.cpp">
+      <Filter>Source Files\imgui</Filter>
+    </ClCompile>
+    <ClCompile Include="ref\imgui\imgui_widgets.cpp">
+      <Filter>Source Files\imgui</Filter>
+    </ClCompile>
+    <ClCompile Include="precipitation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="openglcolor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ref\imgui\examples\imgui_impl_opengl2.cpp">
+      <Filter>Source Files\imgui</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="opengl\glew.h">
-      <Filter>Header Files\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="opengl\arb_multisample.h">
-      <Filter>Header Files\opengl</Filter>
-    </ClInclude>
     <ClInclude Include="Globals.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -209,18 +353,12 @@
     <ClInclude Include="McZapkie\mover.h">
       <Filter>Header Files\mczapkie</Filter>
     </ClInclude>
-    <ClInclude Include="World.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="dumb3d.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="PyInt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="usefull.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Classes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -230,9 +368,6 @@
     <ClInclude Include="Camera.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Ground.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="MdlMngr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -245,15 +380,9 @@
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="VBO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Float3d.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="python\include\Python.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="stdafx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -266,24 +395,12 @@
     <ClInclude Include="McZapkie\Oerlikon_ESt.h">
       <Filter>Header Files\mczapkie</Filter>
     </ClInclude>
-    <ClInclude Include="McZapkie\mctools.h">
-      <Filter>Header Files\mczapkie</Filter>
-    </ClInclude>
     <ClInclude Include="McZapkie\hamulce.h">
       <Filter>Header Files\mczapkie</Filter>
     </ClInclude>
     <ClInclude Include="McZapkie\friction.h">
       <Filter>Header Files\mczapkie</Filter>
     </ClInclude>
-    <ClInclude Include="Console\PoKeys55.h">
-      <Filter>Header Files\console</Filter>
-    </ClInclude>
-    <ClInclude Include="Console\LPT.h">
-      <Filter>Header Files\console</Filter>
-    </ClInclude>
-    <ClInclude Include="RealSound.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Segment.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -308,15 +425,6 @@
     <ClInclude Include="Names.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="FadeSound.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Sound.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="AdvSound.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Model3d.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -326,12 +434,6 @@
     <ClInclude Include="AnimModel.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="opengl\wglew.h">
-      <Filter>Header Files\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="wavread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Track.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -344,9 +446,6 @@
     <ClInclude Include="Timer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TextureDDS.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="ResourceManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -362,8 +461,167 @@
     <ClInclude Include="Driver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Console\MWD.h">
-      <Filter>Header Files\console</Filter>
+    <ClInclude Include="sun.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="renderer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="skydome.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="color.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="stars.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="lightarray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="sn_utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="frustum.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="uilayer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="openglmatrixstack.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="moon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="command.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="openglgeometrybank.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="translation.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="material.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vertex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="scene.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="scenenode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="simulation.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="messaging.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="sound.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="audio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="audiorenderer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="uitranscripts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="light.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="utilities.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="station.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="simulationtime.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="applicationmode.h">
+      <Filter>Header Files\application</Filter>
+    </ClInclude>
+    <ClInclude Include="application.h">
+      <Filter>Header Files\application</Filter>
+    </ClInclude>
+    <ClInclude Include="simulationstateserializer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="simulationenvironment.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="sceneeditor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="drivermode.h">
+      <Filter>Header Files\application\mode_driver</Filter>
+    </ClInclude>
+    <ClInclude Include="driveruilayer.h">
+      <Filter>Header Files\application\mode_driver</Filter>
+    </ClInclude>
+    <ClInclude Include="driverkeyboardinput.h">
+      <Filter>Header Files\application\mode_driver</Filter>
+    </ClInclude>
+    <ClInclude Include="drivermouseinput.h">
+      <Filter>Header Files\application\mode_driver</Filter>
+    </ClInclude>
+    <ClInclude Include="gamepadinput.h">
+      <Filter>Header Files\application\mode_driver</Filter>
+    </ClInclude>
+    <ClInclude Include="Console\LPT.h">
+      <Filter>Header Files\application\mode_driver</Filter>
+    </ClInclude>
+    <ClInclude Include="Console\PoKeys55.h">
+      <Filter>Header Files\application\mode_driver</Filter>
+    </ClInclude>
+    <ClInclude Include="uart.h">
+      <Filter>Header Files\application\mode_driver</Filter>
+    </ClInclude>
+    <ClInclude Include="editoruilayer.h">
+      <Filter>Header Files\application\mode_editor</Filter>
+    </ClInclude>
+    <ClInclude Include="editormouseinput.h">
+      <Filter>Header Files\application\mode_editor</Filter>
+    </ClInclude>
+    <ClInclude Include="editormode.h">
+      <Filter>Header Files\application\mode_editor</Filter>
+    </ClInclude>
+    <ClInclude Include="scenarioloadermode.h">
+      <Filter>Header Files\application\mode_scenarioloader</Filter>
+    </ClInclude>
+    <ClInclude Include="scenarioloaderuilayer.h">
+      <Filter>Header Files\application\mode_scenarioloader</Filter>
+    </ClInclude>
+    <ClInclude Include="editorkeyboardinput.h">
+      <Filter>Header Files\application\mode_editor</Filter>
+    </ClInclude>
+    <ClInclude Include="keyboardinput.h">
+      <Filter>Header Files\application\input</Filter>
+    </ClInclude>
+    <ClInclude Include="scenenodegroups.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="driveruipanels.h">
+      <Filter>Header Files\application\mode_driver</Filter>
+    </ClInclude>
+    <ClInclude Include="editoruipanels.h">
+      <Filter>Header Files\application\mode_editor</Filter>
+    </ClInclude>
+    <ClInclude Include="precipitation.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="openglcolor.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -376,8 +634,4 @@
       <Filter>Resource Files</Filter>
     </Image>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="ClassDiagram.cd" />
-    <None Include="ClassDiagram1.cd" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/maszyna.vcxproj.user b/maszyna.vcxproj.user
index b99aece4..8c698752 100644
--- a/maszyna.vcxproj.user
+++ b/maszyna.vcxproj.user
@@ -1,12 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerWorkingDirectory>..\..\..\development\maszyna</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LocalDebuggerWorkingDirectory>..\..\Projects\maszyna</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerWorkingDirectory>..\..\..\development\maszyna</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerWorkingDirectory>..\..\..\development\maszyna</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerEnvironment>_NO_DEBUG_HEAP=1</LocalDebuggerEnvironment>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LocalDebuggerWorkingDirectory>..\..\Projects\maszyna</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerEnvironment>_NO_DEBUG_HEAP=1</LocalDebuggerEnvironment>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerWorkingDirectory>..\..\..\development\maszyna</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerEnvironment>_NO_DEBUG_HEAP=1</LocalDebuggerEnvironment>
+  </PropertyGroup>
 </Project>
\ No newline at end of file