diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddc2dad2..01e933ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,8 +85,8 @@ else()
 
 	find_package(X11 REQUIRED)
 	set(PLATFORM_TARGET_FILES
-		sunshine/platform/linux.cpp
-		sunshine/platform/linux_evdev.cpp)
+		sunshine/platform/linux/display.cpp
+		sunshine/platform/linux/input.cpp)
 	
 	set(PLATFORM_LIBRARIES
 		Xfixes
diff --git a/sunshine/platform/linux.cpp b/sunshine/platform/linux/display.cpp
similarity index 99%
rename from sunshine/platform/linux.cpp
rename to sunshine/platform/linux/display.cpp
index 137ae0e4..17ef98a1 100644
--- a/sunshine/platform/linux.cpp
+++ b/sunshine/platform/linux/display.cpp
@@ -2,7 +2,7 @@
 // Created by loki on 6/21/19.
 //
 
-#include "common.h"
+#include "sunshine/platform/common.h"
 
 #include <fstream>
 #include <bitset>
diff --git a/sunshine/platform/linux_evdev.cpp b/sunshine/platform/linux/input.cpp
similarity index 99%
rename from sunshine/platform/linux_evdev.cpp
rename to sunshine/platform/linux/input.cpp
index af9e39ed..9de79069 100644
--- a/sunshine/platform/linux_evdev.cpp
+++ b/sunshine/platform/linux/input.cpp
@@ -9,7 +9,7 @@
 #include <cstring>
 #include <filesystem>
 
-#include "common.h"
+#include "sunshine/platform/common.h"
 #include "sunshine/main.h"
 #include "sunshine/utility.h"