diff --git a/WickedEngine/DirectInput.cpp b/WickedEngine/DirectInput.cpp
deleted file mode 100644
index 785a4fada..000000000
--- a/WickedEngine/DirectInput.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-#include "wiDirectInput.h"
-
-#ifndef WINSTORE_SUPPORT
-
-DirectInput::DirectInput(HINSTANCE hinstance, HWND hwnd)
-{
-	for(int i=0;i<256;++i){
-		m_keyboardState[i]=0;
-	}
-	Initialize(hinstance, hwnd);
-}
-
-
-IDirectInputDevice8* m_keyboard = 0;
-IDirectInputDevice8* joystick[2] = {0,0};
-IDirectInput8*  m_directInput = 0;
-	short DirectInput::connectedJoys=0;
-
-BOOL CALLBACK enumCallback(const DIDEVICEINSTANCE* instance, VOID* context)
-{
-    HRESULT hr;
-
-    // Obtain an interface to the enumerated joystick.
-    hr = m_directInput->CreateDevice(instance->guidInstance, &joystick[DirectInput::connectedJoys], NULL);
-
-    // If it failed, then we can't use this joystick. (Maybe the user unplugged
-    // it while we were in the middle of enumerating it.)
-    if (FAILED(hr)) { 
-        return DIENUM_CONTINUE;
-    }
-
-    // Stop enumeration. Note: we're just taking the first joystick we get. You
-    // could store all the enumerated joysticks and let the user pick.
-	DirectInput::connectedJoys++;
-	if(DirectInput::connectedJoys<2)
-		return DIENUM_CONTINUE;
-	else 
-		return DIENUM_STOP;
-}
-BOOL CALLBACK enumAxesCallback(const DIDEVICEOBJECTINSTANCE* instance, VOID* context)
-{
-	HWND hDlg = (HWND)context;
-
-	DIPROPRANGE propRange; 
-	propRange.diph.dwSize       = sizeof(DIPROPRANGE); 
-	propRange.diph.dwHeaderSize = sizeof(DIPROPHEADER); 
-	propRange.diph.dwHow        = DIPH_BYID; 
-	propRange.diph.dwObj        = instance->dwType;
-	propRange.lMin              = -1000; 
-	propRange.lMax              = +1000; 
-    
-	// Set the range for the axis
-	for(short i=0;i<DirectInput::connectedJoys;i++)
-		if (FAILED(joystick[i]->SetProperty(DIPROP_RANGE, &propRange.diph))) {
-			return DIENUM_STOP;
-		}
-
-	return DIENUM_CONTINUE;
-}
-
-
-HRESULT DirectInput::Initialize(HINSTANCE hinstance, HWND hwnd)
-{
-	HRESULT result;
-
-
-	// Initialize the main direct input interface.
-	result = DirectInput8Create(hinstance, DIRECTINPUT_VERSION, IID_IDirectInput8, (void**)&m_directInput, NULL);
-	if(FAILED(result))
-	{
-		return E_FAIL;
-	}
-
-	// Initialize the direct input interface for the keyboard.
-	result = m_directInput->CreateDevice(GUID_SysKeyboard, &m_keyboard, NULL);
-	if(FAILED(result))
-	{
-		return E_FAIL;
-	}
-
-	// Set the data format.  In this case since it is a keyboard we can use the predefined data format.
-	result = m_keyboard->SetDataFormat(&c_dfDIKeyboard);
-	if(FAILED(result))
-	{
-		return E_FAIL;
-	}
-
-	// Set the cooperative level of the keyboard to not share with other programs.
-	result = m_keyboard->SetCooperativeLevel(hwnd, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE);
-	if(FAILED(result))
-	{
-		return E_FAIL;
-	}
-
-	// Now acquire the keyboard.
-	result = m_keyboard->Acquire();
-	if(FAILED(result))
-	{
-		return E_FAIL;
-	}
-	m_keyboard->GetDeviceState(sizeof(m_keyboardState), (LPVOID)&m_keyboardState);
-
-	InitJoy(hwnd);
-
-	return S_OK;
-}
-HRESULT DirectInput::InitJoy(HWND hwnd){
-	HRESULT result;
-	// Look for the first simple joystick we can find.
-	if (FAILED(result = m_directInput->EnumDevices(DI8DEVCLASS_GAMECTRL, ::enumCallback, NULL, DIEDFL_ATTACHEDONLY))) {
-		return result;
-	}
-	for(short i=0;i<connectedJoys;i++){
-
-		DIDEVCAPS capabilities;
-
-		// Set the data format to "simple joystick" - a predefined data format 
-		//
-		// A data format specifies which controls on a device we are interested in,
-		// and how they should be reported. This tells DInput that we will be
-		// passing a DIJOYSTATE2 structure to IDirectInputDevice::GetDeviceState().
-		if (FAILED(result = joystick[i]->SetDataFormat(&c_dfDIJoystick2))) {
-			return result;
-		}
-
-		// Set the cooperative level to let DInput know how this device should
-		// interact with the system and with other DInput applications.
-		if (FAILED(result = joystick[i]->SetCooperativeLevel(hwnd, DISCL_EXCLUSIVE | DISCL_FOREGROUND))) {
-			return result;
-		}
-
-		// Determine how many axis the joystick has (so we don't error out setting
-		// properties for unavailable axis)
-		capabilities.dwSize = sizeof(DIDEVCAPS);
-		if (FAILED(result = joystick[i]->GetCapabilities(&capabilities))) {
-			return result;
-		}
-
-		// Enumerate the axes of the joyctick and set the range of each axis. Note:
-		// we could just use the defaults, but we're just trying to show an example
-		// of enumerating device objects (axes, buttons, etc.).
-		if (FAILED(result = joystick[i]->EnumObjects(::enumAxesCallback, NULL, DIDFT_AXIS))) 
-			return result;
-	}
-	
-	
-
-	return S_OK;
-}
-
-void DirectInput::Shutdown()
-{
-	// Release the keyboard.
-	if(m_keyboard)
-	{
-		m_keyboard->Unacquire();
-		m_keyboard->Release();
-		m_keyboard = 0;
-	}
-	// Release Joypad
-	if(joystick){
-		for(short i=0;i<connectedJoys;i++)
-			if(joystick[i]){
-				joystick[i]->Unacquire();
-				joystick[i]->Release();
-				joystick[i] = 0;
-			}
-	}
-	// Release the main interface to direct input.
-	if(m_directInput)
-	{
-		m_directInput->Release();
-		m_directInput = 0;
-	}
-
-
-	return;
-}
-
-bool DirectInput::Frame()
-{
-	if(m_keyboard==nullptr)
-		return false;
-	// Read the keyboard device.
-	HRESULT result = m_keyboard->GetDeviceState(sizeof(m_keyboardState), (LPVOID)&m_keyboardState);
-	if(FAILED(result))
-	{
-		// If the keyboard lost focus or was not acquired then try to get control back.
-		if((result == DIERR_INPUTLOST) || (result == DIERR_NOTACQUIRED))
-		{
-			m_keyboard->Acquire();
-		}
-		else
-		{
-			return false;
-		}
-	}
-	for(short i=0;i<connectedJoys;i++)
-		poll(joystick[i],&joyState[i]);
-		
-	return true;
-}
-
-bool DirectInput::IsKeyDown(INT code)
-{
-	if(m_keyboardState[code] & 0x80)
-	{
-		return true;
-	}
-
-	return false;
-}
-int DirectInput::GetPressedKeys()
-{
-	int ret=0;
-	for(int i=0;i<256;i++)
-		if(m_keyboardState[i] & 0x80)
-		{
-			ret+=i;
-		}
-
-	return ret;
-}
-
-
-
-HRESULT DirectInput::poll(IDirectInputDevice8* joy,DIJOYSTATE2 *js)
-{
-    HRESULT     hr;
-
-    if (joystick == NULL) {
-        return S_OK;
-    }
-
-
-    // Poll the device to read the current state
-    hr = joy->Poll(); 
-    if (FAILED(hr)) {
-        // DInput is telling us that the input stream has been
-        // interrupted. We aren't tracking any state between polls, so
-        // we don't have any special reset that needs to be done. We
-        // just re-acquire and try again.
-        hr = joy->Acquire();
-        while (hr == DIERR_INPUTLOST) {
-            hr = joy->Acquire();
-        }
-
-        // If we encounter a fatal error, return failure.
-        if ((hr == DIERR_INVALIDPARAM) || (hr == DIERR_NOTINITIALIZED)) {
-            return E_FAIL;
-        }
-
-        // If another application has control of this device, return successfully.
-        // We'll just have to wait our turn to use the joystick.
-        if (hr == DIERR_OTHERAPPHASPRIO) {
-            return S_OK;
-        }
-    }
-
-    // Get the input's device state
-    if (FAILED(hr = joy->GetDeviceState(sizeof(DIJOYSTATE2), js))) {
-        return hr; // The device should have been acquired during the Poll()
-    }
-
-    return S_OK;
-}
-
-bool DirectInput::isButtonDown(short pIndex, unsigned int buttoncode)
-{
-	if(connectedJoys)
-		if(joyState[pIndex].rgbButtons[buttoncode-1]!=0)
-			return true;
-	return false;
-}
-DWORD DirectInput::getDirections(short pIndex)
-{
-	DWORD buttons=0;
-	if(connectedJoys)
-		for(short i=0;i<4;i++){
-			//if((LOWORD(joyState[pIndex].rgdwPOV[i]) != 0xFFFF))
-			if(buttons+=joyState[pIndex].rgdwPOV[i]!=POV_IDLE)
-				buttons+=joyState[pIndex].rgdwPOV[i];
-		}
-	return buttons;
-}
-
-#endif
diff --git a/WickedEngine/WickedEngine_SHARED.vcxitems b/WickedEngine/WickedEngine_SHARED.vcxitems
index bf4e0d393..3623ad0f8 100644
--- a/WickedEngine/WickedEngine_SHARED.vcxitems
+++ b/WickedEngine/WickedEngine_SHARED.vcxitems
@@ -504,7 +504,6 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)BULLET\LinearMath\btVector3.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)DeferredRenderableComponent.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)DeferredRenderableComponent_BindLua.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)DirectInput.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ForwardRenderableComponent.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ForwardRenderableComponent_BindLua.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)LoadingScreenComponent.cpp" />
@@ -614,12 +613,18 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)wiVersion.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)wiWidget.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)wiXInput.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)XInput.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="$(MSBuildThisFileDirectory)fonts\basic.dds" />
   </ItemGroup>
   <ItemGroup>
+    <Text Include="$(MSBuildThisFileDirectory)..\features.txt" />
+    <Text Include="$(MSBuildThisFileDirectory)..\licenses.txt" />
     <Text Include="$(MSBuildThisFileDirectory)fonts\basic.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)..\io_export_wicked_wi_bin.py" />
+    <None Include="$(MSBuildThisFileDirectory)..\README.md" />
+    <None Include="$(MSBuildThisFileDirectory)..\ScriptingAPI-Documentation.md" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WickedEngine/WickedEngine_SHARED.vcxitems.filters b/WickedEngine/WickedEngine_SHARED.vcxitems.filters
index 5a7b2dc34..5a7956fa2 100644
--- a/WickedEngine/WickedEngine_SHARED.vcxitems.filters
+++ b/WickedEngine/WickedEngine_SHARED.vcxitems.filters
@@ -28,6 +28,9 @@
     <Filter Include="ENGINE\Common">
       <UniqueIdentifier>{3c39405f-ec30-4b72-9c32-68aefb4fb7a5}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ENGINE\GUI">
+      <UniqueIdentifier>{a637b1af-3cc6-48c3-89b4-8b931a1eb23e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)BULLET\btBulletCollisionCommon.h">
@@ -828,24 +831,9 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)wiGraphicsAPI_DX11.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)wiGUI.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)wiWidget.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)Renderable2DComponent.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)Renderable3DComponent.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiColor.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)Renderable3DComponent_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiGraphicsAPI.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
@@ -861,12 +849,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)wiImage.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)ConstantBufferMapping.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)ResourceMapping.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiLensFlare.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
@@ -897,9 +879,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)wiTextureHelper.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)Texture_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiResourceManager.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
@@ -909,15 +888,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)wiSprite.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)DeferredRenderableComponent.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)ForwardRenderableComponent.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)SamplerMapping.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiSPTree.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
@@ -927,33 +897,15 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)wiBULLET.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)wiLoader_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiPHYSICS.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)SpriteAnim_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiParticle.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)MainComponent_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)MainComponent.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiLua_Globals.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)RenderableComponent.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)RenderableComponent_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiThreadSafeManager.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
@@ -963,27 +915,15 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)wiVersion.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)LoadingScreenComponent.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)LoadingScreenComponent_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiFadeManager.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiTimer.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)wiFont_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiSound.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)wiNetwork_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiClient.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
@@ -996,36 +936,12 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)wiNetwork.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)Renderable2DComponent_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)wiSprite_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)wiBackLog_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)wiRenderer_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)Vector_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)wiInputManager_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiInputManager.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)Matrix_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiMath.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)wiImageEffects_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)wiXInput.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
@@ -1038,24 +954,111 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)wiRawInput.h">
       <Filter>ENGINE</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)DeferredRenderableComponent_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)ForwardRenderableComponent_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)wiSound_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)wiResourceManager_BindLua.h">
-      <Filter>ENGINE</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)CommonInclude.h">
       <Filter>ENGINE\Common</Filter>
     </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)WickedEngine.h">
       <Filter>ENGINE\Common</Filter>
     </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)ConstantBufferMapping.h">
+      <Filter>ENGINE\ResourceMapping</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)DeferredRenderableComponent.h">
+      <Filter>ENGINE\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)ForwardRenderableComponent.h">
+      <Filter>ENGINE\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)LoadingScreenComponent.h">
+      <Filter>ENGINE\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)MainComponent.h">
+      <Filter>ENGINE\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)Renderable2DComponent.h">
+      <Filter>ENGINE\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)Renderable3DComponent.h">
+      <Filter>ENGINE\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)RenderableComponent.h">
+      <Filter>ENGINE\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)MainComponent_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)LoadingScreenComponent_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)ForwardRenderableComponent_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)DeferredRenderableComponent_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)Matrix_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)Renderable2DComponent_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)Renderable3DComponent_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)RenderableComponent_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)SpriteAnim_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)Texture_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)Vector_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)wiBackLog_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)SamplerMapping.h">
+      <Filter>ENGINE\ResourceMapping</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)ResourceMapping.h">
+      <Filter>ENGINE\ResourceMapping</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)wiFont_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)wiImageEffects_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)wiInputManager_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)wiLoader_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)wiNetwork_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)wiRenderer_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)wiResourceManager_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)wiSound_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)wiSprite_BindLua.h">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)wiGUI.h">
+      <Filter>ENGINE\GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)wiWidget.h">
+      <Filter>ENGINE\GUI</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(MSBuildThisFileDirectory)LUA\lapi.c">
@@ -1607,15 +1610,6 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)BULLET\BulletCollision\NarrowPhaseCollision\btVoronoiSimplexSolver.cpp">
       <Filter>BULLET</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)wiGUI.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)wiWidget.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)Renderable3DComponent.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)wiVersion.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
@@ -1625,27 +1619,12 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)wiTextureHelper.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)Renderable3DComponent_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)ForwardRenderableComponent_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)DeferredRenderableComponent_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)wiHelper.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)wiImage.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)wiRenderer_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)DeferredRenderableComponent.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)wiEmittedParticle.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
@@ -1676,27 +1655,12 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)wiRenderTarget.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)ForwardRenderableComponent.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)Renderable2DComponent.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)wiResourceManager_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)Texture_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)wiSprite.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)wiBackLog.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)MainComponent.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)wiSPTree.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
@@ -1706,42 +1670,12 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)wiFrustum.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)wiLoader_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)SpriteAnim_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)MainComponent_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)wiInputManager_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)RenderableComponent.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)LoadingScreenComponent.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)RenderableComponent_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)LoadingScreenComponent_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)Renderable2DComponent_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)wiThreadSafeManager.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)wiLua.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)Vector_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)wiCVars.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
@@ -1751,15 +1685,6 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)wiTimer.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)wiFont_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)Matrix_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)wiNetwork_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)wiServer.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
@@ -1769,18 +1694,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)wiNetwork.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)wiSprite_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)wiBackLog_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)wiInitializer.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)wiImageEffects_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)wiInputManager.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
@@ -1796,9 +1712,6 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)wiXInput.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)wiSound_BindLua.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)wiFrameRate.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
@@ -1814,12 +1727,6 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)wiCpuInfo.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)DirectInput.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)XInput.cpp">
-      <Filter>ENGINE</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)wiLensFlare.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
@@ -1829,6 +1736,96 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)wiRenderer.cpp">
       <Filter>ENGINE</Filter>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)ForwardRenderableComponent.cpp">
+      <Filter>ENGINE\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)DeferredRenderableComponent.cpp">
+      <Filter>ENGINE\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)LoadingScreenComponent.cpp">
+      <Filter>ENGINE\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)MainComponent.cpp">
+      <Filter>ENGINE\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)Renderable2DComponent.cpp">
+      <Filter>ENGINE\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)Renderable3DComponent.cpp">
+      <Filter>ENGINE\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)RenderableComponent.cpp">
+      <Filter>ENGINE\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)MainComponent_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)LoadingScreenComponent_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)ForwardRenderableComponent_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)DeferredRenderableComponent_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)Matrix_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)Renderable2DComponent_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)Renderable3DComponent_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)RenderableComponent_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)SpriteAnim_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)Texture_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)Vector_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)wiBackLog_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)wiFont_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)wiImageEffects_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)wiInputManager_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)wiLoader_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)wiNetwork_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)wiRenderer_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)wiResourceManager_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)wiSound_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)wiSprite_BindLua.cpp">
+      <Filter>ENGINE\LuaBindings</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)wiGUI.cpp">
+      <Filter>ENGINE\GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)wiWidget.cpp">
+      <Filter>ENGINE\GUI</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="$(MSBuildThisFileDirectory)fonts\basic.dds">
@@ -1839,5 +1836,12 @@
     <Text Include="$(MSBuildThisFileDirectory)fonts\basic.txt">
       <Filter>fonts</Filter>
     </Text>
+    <Text Include="$(MSBuildThisFileDirectory)..\features.txt" />
+    <Text Include="$(MSBuildThisFileDirectory)..\licenses.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)..\README.md" />
+    <None Include="$(MSBuildThisFileDirectory)..\ScriptingAPI-Documentation.md" />
+    <None Include="$(MSBuildThisFileDirectory)..\io_export_wicked_wi_bin.py" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WickedEngine/WickedEngine_UWP.vcxproj b/WickedEngine/WickedEngine_UWP.vcxproj
index 32ad36bf3..697e24242 100644
--- a/WickedEngine/WickedEngine_UWP.vcxproj
+++ b/WickedEngine/WickedEngine_UWP.vcxproj
@@ -100,21 +100,29 @@
   <PropertyGroup />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <GenerateManifest>false</GenerateManifest>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <GenerateManifest>false</GenerateManifest>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <GenerateManifest>false</GenerateManifest>
+    <IntDir>$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <GenerateManifest>false</GenerateManifest>
+    <IntDir>$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <GenerateManifest>false</GenerateManifest>
+    <IntDir>$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <GenerateManifest>false</GenerateManifest>
+    <IntDir>$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/WickedEngine/WickedEngine_Windows.vcxproj b/WickedEngine/WickedEngine_Windows.vcxproj
index fded1438e..6ee196275 100644
--- a/WickedEngine/WickedEngine_Windows.vcxproj
+++ b/WickedEngine/WickedEngine_Windows.vcxproj
@@ -70,7 +70,20 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
diff --git a/WickedEngine/XInput.cpp b/WickedEngine/XInput.cpp
deleted file mode 100644
index ebff7ef9b..000000000
--- a/WickedEngine/XInput.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "wiXInput.h"
-
-
-XInput::XInput(void)
-{
-	g_bDeadZoneOn = true;
-	for(int i=0;i<MAX_CONTROLLERS;++i){
-		controllers[i] = CONTROLLER_STATE();
-		controllers[i].bConnected=false;
-	}
-}
-
-HRESULT XInput::UpdateControllerState()
-{
-    DWORD dwResult = 0;
-    for( DWORD i = 0; i < MAX_CONTROLLERS; i++ )
-    {
-        // Simply get the state of the controller from XInput.
-		//dwResult = XInputGetState( i, &controllers[i].state );
-
-        if( dwResult == ERROR_SUCCESS )
-            controllers[i].bConnected = true;
-        else
-            controllers[i].bConnected = false;
-    }
-
-
-    return S_OK;
-}
-
-DWORD XInput::GetButtons(SHORT newPlayerIndex)
-{
-	//if(controllers[newPlayerIndex].bConnected)
-	//	return controllers[newPlayerIndex].state.Gamepad.wButtons;
-	return 0;
-}
-DWORD XInput::GetDirections(short newPlayerIndex){
-	//if(controllers[newPlayerIndex].bConnected)
-	//	return controllers[newPlayerIndex].state.Gamepad.wButtons;
-	return 0;
-}
-bool XInput::isButtonDown(short newPlayerIndex,DWORD checkforButton){
-	//if(controllers[newPlayerIndex].bConnected)
-	//	return controllers[newPlayerIndex].state.Gamepad.wButtons & checkforButton;
-	return false;
-}
-
-void XInput::CleanUp()
-{
-	delete(this);
-}
\ No newline at end of file