diff --git a/c_os/user/bmp_hhu.cc b/c_os/user/bmp/bmp_hhu.cc
similarity index 100%
rename from c_os/user/bmp_hhu.cc
rename to c_os/user/bmp/bmp_hhu.cc
diff --git a/c_os/user/VBEdemo.cc b/c_os/user/demo/VBEdemo.cc
similarity index 98%
rename from c_os/user/VBEdemo.cc
rename to c_os/user/demo/VBEdemo.cc
index f37f67b..9acf9d6 100644
--- a/c_os/user/VBEdemo.cc
+++ b/c_os/user/demo/VBEdemo.cc
@@ -8,12 +8,11 @@
  * Autor:           Michael Schoettner, HHU, 26.12.2016                      *
  *****************************************************************************/
 
-#include "user/VBEdemo.h"
+#include "user/demo/VBEdemo.h"
 #include "devices/fonts/Fonts.h"
-#include "kernel/Globals.h"
 
 // Bitmap
-#include "bmp_hhu.cc"
+#include "user/bmp/bmp_hhu.cc"
 
 /*****************************************************************************
  * Methode:         VBEdemo::linInterPol1D                                   *
diff --git a/c_os/user/VBEdemo.h b/c_os/user/demo/VBEdemo.h
similarity index 93%
rename from c_os/user/VBEdemo.h
rename to c_os/user/demo/VBEdemo.h
index c0d6411..51cb37e 100644
--- a/c_os/user/VBEdemo.h
+++ b/c_os/user/demo/VBEdemo.h
@@ -11,6 +11,7 @@
 #define __VBEdemo_include__
 
 #include "kernel/threads/Thread.h"
+#include "kernel/Globals.h"
 
 class VBEdemo : public Thread {
 
@@ -23,7 +24,9 @@ private:
 
 public:
     // Gib dem Anwendungsthread einen Stack.
-    VBEdemo() {}
+    VBEdemo() {
+        kout << "Initialized VBEdemo" << endl;
+    }
 
     // Thread-Startmethode
     void run() override;