diff --git a/c_os/user/KeyEventListener.cc b/c_os/user/event/KeyEventListener.cc
similarity index 56%
rename from c_os/user/KeyEventListener.cc
rename to c_os/user/event/KeyEventListener.cc
index 95b77a2..75abcd3 100644
--- a/c_os/user/KeyEventListener.cc
+++ b/c_os/user/event/KeyEventListener.cc
@@ -1,4 +1,4 @@
-#include "user/KeyEventListener.h"
+#include "user/event/KeyEventListener.h"
 #include "kernel/Globals.h"
 
 void KeyEventListener::trigger(char c) {
@@ -7,5 +7,5 @@ void KeyEventListener::trigger(char c) {
 
 char KeyEventListener::waitForKeyEvent() const {
     scheduler.block();
-    return this->lastChar;
+    return this->lastChar;  // This is only executed after thread is woken up by manager
 }
diff --git a/c_os/user/KeyEventListener.h b/c_os/user/event/KeyEventListener.h
similarity index 100%
rename from c_os/user/KeyEventListener.h
rename to c_os/user/event/KeyEventListener.h
diff --git a/c_os/user/KeyEventManager.cc b/c_os/user/event/KeyEventManager.cc
similarity index 91%
rename from c_os/user/KeyEventManager.cc
rename to c_os/user/event/KeyEventManager.cc
index fea5b8c..7137a57 100644
--- a/c_os/user/KeyEventManager.cc
+++ b/c_os/user/event/KeyEventManager.cc
@@ -1,4 +1,4 @@
-#include "user/KeyEventManager.h"
+#include "user/event/KeyEventManager.h"
 #include "kernel/Globals.h"
 
 void KeyEventManager::subscribe(KeyEventListener& listener) {
diff --git a/c_os/user/KeyEventManager.h b/c_os/user/event/KeyEventManager.h
similarity index 77%
rename from c_os/user/KeyEventManager.h
rename to c_os/user/event/KeyEventManager.h
index 08f8b1a..a3b0b0b 100644
--- a/c_os/user/KeyEventManager.h
+++ b/c_os/user/event/KeyEventManager.h
@@ -1,7 +1,7 @@
 #ifndef __KeyEventManager_Include_H_
 #define __KeyEventManager_Include_H_
 
-#include "user/KeyEventListener.h"
+#include "user/event/KeyEventListener.h"
 
 // NOTE: Could do this more generally but we only have key events
 
@@ -17,7 +17,7 @@ public:
     KeyEventManager() {}
 
     void subscribe(KeyEventListener& listener);
-    void broadcast(char c); // Unblocks all input waiting threads, I don't have a method to direct input
+    void broadcast(char c);  // Unblocks all input waiting threads, I don't have a method to direct input
 };
 
 #endif