diff --git a/reactos/subsystems/ntvdm/CMakeLists.txt b/reactos/subsystems/ntvdm/CMakeLists.txt
index add151f4985..747bd92c969 100644
--- a/reactos/subsystems/ntvdm/CMakeLists.txt
+++ b/reactos/subsystems/ntvdm/CMakeLists.txt
@@ -1,5 +1,8 @@
 
+PROJECT(NTVDM)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fast486)
+
 spec2def(ntvdm.exe ntvdm.spec)
 
 list(APPEND SOURCE
@@ -19,10 +22,10 @@ list(APPEND SOURCE
     hardware/keyboard.c
     hardware/mouse.c
     hardware/pic.c
+    hardware/pit.c
     hardware/ps2.c
-    hardware/speaker.c
-    hardware/timer.c
-    hardware/vga.c
+    hardware/sound/speaker.c
+    hardware/video/vga.c
     dos/dos32krnl/bios.c
     dos/dos32krnl/dos.c
     dos/dos32krnl/dosfiles.c
diff --git a/reactos/subsystems/ntvdm/bios/bios32/bios32.c b/reactos/subsystems/ntvdm/bios/bios32/bios32.c
index bff238ba54e..87d8172b976 100644
--- a/reactos/subsystems/ntvdm/bios/bios32/bios32.c
+++ b/reactos/subsystems/ntvdm/bios/bios32/bios32.c
@@ -29,7 +29,7 @@
 #include "io.h"
 #include "hardware/cmos.h"
 #include "hardware/pic.h"
-#include "hardware/timer.h"
+#include "hardware/pit.h"
 
 /* Extra PSDK/NDK Headers */
 #include <ndk/kefuncs.h>
diff --git a/reactos/subsystems/ntvdm/bios/vidbios.c b/reactos/subsystems/ntvdm/bios/vidbios.c
index 6fd8cf8d587..ca6ad1be477 100644
--- a/reactos/subsystems/ntvdm/bios/vidbios.c
+++ b/reactos/subsystems/ntvdm/bios/vidbios.c
@@ -19,7 +19,7 @@
 // #include "vidbios.h"
 
 #include "io.h"
-#include "hardware/vga.h"
+#include "hardware/video/vga.h"
 
 /* DEFINES ********************************************************************/
 
diff --git a/reactos/subsystems/ntvdm/clock.c b/reactos/subsystems/ntvdm/clock.c
index 14f67d55064..305ccc2226a 100644
--- a/reactos/subsystems/ntvdm/clock.c
+++ b/reactos/subsystems/ntvdm/clock.c
@@ -18,8 +18,8 @@
 
 #include "hardware/cmos.h"
 #include "hardware/ps2.h"
-#include "hardware/timer.h"
-#include "hardware/vga.h"
+#include "hardware/pit.h"
+#include "hardware/video/vga.h"
 
 /* Extra PSDK/NDK Headers */
 #include <ndk/kefuncs.h>
diff --git a/reactos/subsystems/ntvdm/cpu/cpu.c b/reactos/subsystems/ntvdm/cpu/cpu.c
index 7b56e083ef8..6666978cf2a 100644
--- a/reactos/subsystems/ntvdm/cpu/cpu.c
+++ b/reactos/subsystems/ntvdm/cpu/cpu.c
@@ -24,9 +24,9 @@
 #include "hardware/mouse.h"
 #include "hardware/pic.h"
 #include "hardware/ps2.h"
-#include "hardware/speaker.h"
-#include "hardware/timer.h"
-#include "hardware/vga.h"
+#include "hardware/sound/speaker.h"
+#include "hardware/pit.h"
+#include "hardware/video/vga.h"
 
 #include "io.h"
 
diff --git a/reactos/subsystems/ntvdm/emulator.c b/reactos/subsystems/ntvdm/emulator.c
index 2d22307df20..983e4dd8a57 100644
--- a/reactos/subsystems/ntvdm/emulator.c
+++ b/reactos/subsystems/ntvdm/emulator.c
@@ -26,9 +26,9 @@
 #include "hardware/mouse.h"
 #include "hardware/pic.h"
 #include "hardware/ps2.h"
-#include "hardware/speaker.h"
-#include "hardware/timer.h"
-#include "hardware/vga.h"
+#include "hardware/sound/speaker.h"
+#include "hardware/pit.h"
+#include "hardware/video/vga.h"
 
 #include "vddsup.h"
 #include "io.h"
diff --git a/reactos/subsystems/ntvdm/hardware/timer.c b/reactos/subsystems/ntvdm/hardware/pit.c
similarity index 99%
rename from reactos/subsystems/ntvdm/hardware/timer.c
rename to reactos/subsystems/ntvdm/hardware/pit.c
index 839ea3cf00a..037e06240f4 100644
--- a/reactos/subsystems/ntvdm/hardware/timer.c
+++ b/reactos/subsystems/ntvdm/hardware/pit.c
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       GPL - See COPYING in the top level directory
  * PROJECT:         ReactOS Virtual DOS Machine
- * FILE:            timer.c
+ * FILE:            pit.c
  * PURPOSE:         Programmable Interval Timer emulation -
  *                  i82C54/8254 compatible
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
@@ -14,7 +14,7 @@
 
 #include "emulator.h"
 #include "io.h"
-#include "timer.h"
+#include "pit.h"
 #include "pic.h"
 
 /* PRIVATE VARIABLES **********************************************************/
diff --git a/reactos/subsystems/ntvdm/hardware/timer.h b/reactos/subsystems/ntvdm/hardware/pit.h
similarity index 96%
rename from reactos/subsystems/ntvdm/hardware/timer.h
rename to reactos/subsystems/ntvdm/hardware/pit.h
index b25f5cf26db..8d32938405d 100644
--- a/reactos/subsystems/ntvdm/hardware/timer.h
+++ b/reactos/subsystems/ntvdm/hardware/pit.h
@@ -1,15 +1,15 @@
 /*
  * COPYRIGHT:       GPL - See COPYING in the top level directory
  * PROJECT:         ReactOS Virtual DOS Machine
- * FILE:            timer.h
+ * FILE:            pit.h
  * PURPOSE:         Programmable Interval Timer emulation -
  *                  i82C54/8254 compatible
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-#ifndef _TIMER_H_
-#define _TIMER_H_
+#ifndef _PIT_H_
+#define _PIT_H_
 
 /* INCLUDES *******************************************************************/
 
@@ -84,6 +84,6 @@ VOID PitClock(DWORD Count);
 
 VOID PitInitialize(VOID);
 
-#endif // _TIMER_H_
+#endif // _PIT_H_
 
 /* EOF */
diff --git a/reactos/subsystems/ntvdm/hardware/speaker.c b/reactos/subsystems/ntvdm/hardware/sound/speaker.c
similarity index 99%
rename from reactos/subsystems/ntvdm/hardware/speaker.c
rename to reactos/subsystems/ntvdm/hardware/sound/speaker.c
index 2f6d017f8d5..5f00b2ce56a 100644
--- a/reactos/subsystems/ntvdm/hardware/speaker.c
+++ b/reactos/subsystems/ntvdm/hardware/sound/speaker.c
@@ -12,7 +12,7 @@
 
 #include "emulator.h"
 #include "speaker.h"
-#include "timer.h"
+#include "hardware/pit.h"
 
 /* Extra PSDK/NDK Headers */
 #include <ndk/iofuncs.h>
diff --git a/reactos/subsystems/ntvdm/hardware/speaker.h b/reactos/subsystems/ntvdm/hardware/sound/speaker.h
similarity index 100%
rename from reactos/subsystems/ntvdm/hardware/speaker.h
rename to reactos/subsystems/ntvdm/hardware/sound/speaker.h
diff --git a/reactos/subsystems/ntvdm/hardware/vga.c b/reactos/subsystems/ntvdm/hardware/video/vga.c
similarity index 100%
rename from reactos/subsystems/ntvdm/hardware/vga.c
rename to reactos/subsystems/ntvdm/hardware/video/vga.c
diff --git a/reactos/subsystems/ntvdm/hardware/vga.h b/reactos/subsystems/ntvdm/hardware/video/vga.h
similarity index 100%
rename from reactos/subsystems/ntvdm/hardware/vga.h
rename to reactos/subsystems/ntvdm/hardware/video/vga.h
diff --git a/reactos/subsystems/ntvdm/ntvdm.c b/reactos/subsystems/ntvdm/ntvdm.c
index fb81ec1153e..54b868a6c6e 100644
--- a/reactos/subsystems/ntvdm/ntvdm.c
+++ b/reactos/subsystems/ntvdm/ntvdm.c
@@ -14,11 +14,7 @@
 #include "emulator.h"
 #include "cpu/cpu.h"
 
-#include "clock.h"
-#include "hardware/ps2.h"
-#include "hardware/vga.h"
 #include "bios/bios.h"
-#include "dos/dem.h"
 
 #include "resource.h"