diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt
index 31b252ca4..73d368eb1 100644
--- a/src/platform/qt/CMakeLists.txt
+++ b/src/platform/qt/CMakeLists.txt
@@ -26,6 +26,7 @@ endif()
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/input)
 
 find_package(Qt5Multimedia)
 find_package(Qt5OpenGL)
@@ -76,11 +77,6 @@ set(SOURCE_FILES
 	GamepadButtonEvent.cpp
 	GamepadHatEvent.cpp
 	IOViewer.cpp
-	InputController.cpp
-	InputItem.cpp
-	InputIndex.cpp
-	InputModel.cpp
-	InputProfile.cpp
 	KeyEditor.cpp
 	LoadSaveState.cpp
 	LogController.cpp
@@ -105,7 +101,12 @@ set(SOURCE_FILES
 	utils.cpp
 	Window.cpp
 	VFileDevice.cpp
-	VideoView.cpp)
+	VideoView.cpp
+	input/InputController.cpp
+	input/InputIndex.cpp
+	input/InputItem.cpp
+	input/InputModel.cpp
+	input/InputProfile.cpp)
 
 set(UI_FILES
 	AboutScreen.ui
diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/input/InputController.cpp
similarity index 100%
rename from src/platform/qt/InputController.cpp
rename to src/platform/qt/input/InputController.cpp
diff --git a/src/platform/qt/InputController.h b/src/platform/qt/input/InputController.h
similarity index 100%
rename from src/platform/qt/InputController.h
rename to src/platform/qt/input/InputController.h
diff --git a/src/platform/qt/InputIndex.cpp b/src/platform/qt/input/InputIndex.cpp
similarity index 100%
rename from src/platform/qt/InputIndex.cpp
rename to src/platform/qt/input/InputIndex.cpp
diff --git a/src/platform/qt/InputIndex.h b/src/platform/qt/input/InputIndex.h
similarity index 100%
rename from src/platform/qt/InputIndex.h
rename to src/platform/qt/input/InputIndex.h
diff --git a/src/platform/qt/InputItem.cpp b/src/platform/qt/input/InputItem.cpp
similarity index 100%
rename from src/platform/qt/InputItem.cpp
rename to src/platform/qt/input/InputItem.cpp
diff --git a/src/platform/qt/InputItem.h b/src/platform/qt/input/InputItem.h
similarity index 100%
rename from src/platform/qt/InputItem.h
rename to src/platform/qt/input/InputItem.h
diff --git a/src/platform/qt/InputModel.cpp b/src/platform/qt/input/InputModel.cpp
similarity index 100%
rename from src/platform/qt/InputModel.cpp
rename to src/platform/qt/input/InputModel.cpp
diff --git a/src/platform/qt/InputModel.h b/src/platform/qt/input/InputModel.h
similarity index 100%
rename from src/platform/qt/InputModel.h
rename to src/platform/qt/input/InputModel.h
diff --git a/src/platform/qt/InputProfile.cpp b/src/platform/qt/input/InputProfile.cpp
similarity index 100%
rename from src/platform/qt/InputProfile.cpp
rename to src/platform/qt/input/InputProfile.cpp
diff --git a/src/platform/qt/InputProfile.h b/src/platform/qt/input/InputProfile.h
similarity index 100%
rename from src/platform/qt/InputProfile.h
rename to src/platform/qt/input/InputProfile.h