diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index bfae90681..ae0dd1423 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -2,6 +2,8 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SRCS
+            config/inputs.cpp
+            config/QLineEditKeyConfig.cpp
             config/controller_config.cpp
             config/controller_config_util.cpp
             config.cpp
@@ -19,14 +21,14 @@ set(SRCS
             debugger/registers.cpp
             util/spinbox.cpp
             bootmanager.cpp
-            hotkeys.cpp
-            inputs.cpp
-            QLineEditKeyConfig.cpp
+            hotkeys.cpp            
             main.cpp
             citra-qt.rc
             )
 
 set(HEADERS
+            config/inputs.h
+            config/QLineEditKeyConfig.h
             config/controller_config.h
             config/controller_config_util.h
             config.h
@@ -45,21 +47,19 @@ set(HEADERS
             debugger/registers.h
             util/spinbox.h
             bootmanager.h
-            hotkeys.h
-            inputs.h
-            QLineEditKeyConfig.h
+            hotkeys.h            
             main.h
             version.h
             )
 
 set(UIS
             config/controller_config.ui
+            config/inputs.ui
             debugger/callstack.ui
             debugger/disassembler.ui
             debugger/profiler.ui
             debugger/registers.ui
-            hotkeys.ui
-            inputs.ui
+            hotkeys.ui            
             main.ui
             )
 
diff --git a/src/citra_qt/QLineEditKeyConfig.cpp b/src/citra_qt/config/QLineEditKeyConfig.cpp
similarity index 97%
rename from src/citra_qt/QLineEditKeyConfig.cpp
rename to src/citra_qt/config/QLineEditKeyConfig.cpp
index dd5839e3f..8f52fbe52 100644
--- a/src/citra_qt/QLineEditKeyConfig.cpp
+++ b/src/citra_qt/config/QLineEditKeyConfig.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <QLineEditKeyConfig.h>
-#include <inputs.h>
+#include "QLineEditKeyConfig.h"
+#include "inputs.h"
 #include <QKeyEvent>
 #include <QLineEdit>
 
@@ -72,4 +72,4 @@ void QLineEditKeyConfig::keyPressEvent(QKeyEvent* event) {
     default:
         break;
     }
-}
\ No newline at end of file
+}
diff --git a/src/citra_qt/QLineEditKeyConfig.h b/src/citra_qt/config/QLineEditKeyConfig.h
similarity index 100%
rename from src/citra_qt/QLineEditKeyConfig.h
rename to src/citra_qt/config/QLineEditKeyConfig.h
diff --git a/src/citra_qt/inputs.cpp b/src/citra_qt/config/inputs.cpp
similarity index 100%
rename from src/citra_qt/inputs.cpp
rename to src/citra_qt/config/inputs.cpp
diff --git a/src/citra_qt/inputs.h b/src/citra_qt/config/inputs.h
similarity index 96%
rename from src/citra_qt/inputs.h
rename to src/citra_qt/config/inputs.h
index e95f1fb9b..f3205e372 100644
--- a/src/citra_qt/inputs.h
+++ b/src/citra_qt/config/inputs.h
@@ -6,7 +6,7 @@
 
 #include <QDialog>
 
-#include "core/settings.h"
+#include "../core/settings.h"
 #include "ui_inputs.h"
 
 /// The input configuration dialog
diff --git a/src/citra_qt/inputs.ui b/src/citra_qt/config/inputs.ui
similarity index 99%
rename from src/citra_qt/inputs.ui
rename to src/citra_qt/config/inputs.ui
index ae9edd78b..10de21a3d 100644
--- a/src/citra_qt/inputs.ui
+++ b/src/citra_qt/config/inputs.ui
@@ -544,7 +544,7 @@
   <customwidget>
    <class>QLineEditKeyConfig</class>
    <extends>QLineEdit</extends>
-   <header>QLineEditKeyConfig.h</header>
+   <header>config/QLineEditKeyConfig.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 2b654f3e1..1856beb1e 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -22,7 +22,7 @@
 
 #include "bootmanager.h"
 #include "hotkeys.h"
-#include "inputs.h"
+#include "config/inputs.h"
 
 //debugger
 #include "debugger/disassembler.h"