diff --git a/c_os/user/KeyboardDemo.cc b/c_os/user/demo/KeyboardDemo.cc
similarity index 93%
rename from c_os/user/KeyboardDemo.cc
rename to c_os/user/demo/KeyboardDemo.cc
index e9fd311..a58b465 100755
--- a/c_os/user/KeyboardDemo.cc
+++ b/c_os/user/demo/KeyboardDemo.cc
@@ -8,10 +8,10 @@
  * Autor:           Michael Schoettner, HHU, 26.10.2018                      *
  *****************************************************************************/
 
-#include "kernel/Globals.h"
 #include "lib/Input.h"
+#include "user/demo/KeyboardDemo.h"
 
-void keyboard_demo() {
+void KeyboardDemo::run() {
 
     /* Hier muess Code eingefuegt werden */
 
diff --git a/c_os/user/KeyboardDemo.h b/c_os/user/demo/KeyboardDemo.h
similarity index 75%
rename from c_os/user/KeyboardDemo.h
rename to c_os/user/demo/KeyboardDemo.h
index 4e2bd38..7c65668 100755
--- a/c_os/user/KeyboardDemo.h
+++ b/c_os/user/demo/KeyboardDemo.h
@@ -11,6 +11,19 @@
 #ifndef __KeyboardDemo_include__
 #define __KeyboardDemo_include__
 
-void keyboard_demo();
+#include "kernel/Globals.h"
+#include "kernel/threads/Thread.h"
+
+class KeyboardDemo : public Thread {
+private:
+    KeyboardDemo(const KeyboardDemo& copy) = delete;
+
+public:
+    KeyboardDemo() {
+        kout << "Initialized KeyboardDemo" << endl;
+    }
+
+    void run() override;
+};
 
 #endif