diff --git a/src/config.c b/src/config.c
index 0671776..959a4c7 100644
--- a/src/config.c
+++ b/src/config.c
@@ -12,7 +12,7 @@
  *		it on Windows XP, and possibly also Vista. Use the
  *		-DANSI_CFG for use on these systems.
  *
- * Version:	@(#)config.c	1.0.18	2018/04/26
+ * Version:	@(#)config.c	1.0.19	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -57,8 +57,8 @@
 #include "ports/serial.h"
 #include "ports/parallel.h"
 #include "ports/parallel_dev.h"
-#include "mouse.h"
-#include "game/joystick.h"
+#include "input/mouse.h"
+#include "input/game/joystick.h"
 #include "floppy/fdd.h"
 #include "floppy/fdc.h"
 #include "disk/hdd.h"
diff --git a/src/cpu/808x.c b/src/cpu/808x.c
index e9cc36d..034dc76 100644
--- a/src/cpu/808x.c
+++ b/src/cpu/808x.c
@@ -18,7 +18,7 @@
  *		2 clocks - fetch opcode 1       2 clocks - execute
  *		2 clocks - fetch opcode 2  etc
  *
- * Version:	@(#)808x.c	1.0.2	2018/03/09
+ * Version:	@(#)808x.c	1.0.3	2018/04/26
  *
  * Authors:	Sarah Walker, <tommowalker@tommowalker.co.uk>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -53,13 +53,13 @@
 #include "x86.h"
 #include "../machine/machine.h"
 #include "../io.h"
+#include "../pic.h"
+#include "../nmi.h"
 #include "../mem.h"
 #include "../rom.h"
-#include "../nmi.h"
-#include "../pic.h"
 #include "../timer.h"
 #include "../device.h"		/* for scsi.h */
-#include "../keyboard.h"	/* its WRONG to have this in here!! --FvK */
+#include "../input/keyboard.h"	/* its WRONG to have this in here!! --FvK */
 #include "../scsi/scsi.h"	/* its WRONG to have this in here!! --FvK */
 #include "../plat.h"
 
diff --git a/src/game/joystick.c b/src/input/game/joystick.c
similarity index 100%
rename from src/game/joystick.c
rename to src/input/game/joystick.c
diff --git a/src/game/joystick.h b/src/input/game/joystick.h
similarity index 100%
rename from src/game/joystick.h
rename to src/input/game/joystick.h
diff --git a/src/game/js_ch_fs_pro.c b/src/input/game/js_ch_fs_pro.c
similarity index 100%
rename from src/game/js_ch_fs_pro.c
rename to src/input/game/js_ch_fs_pro.c
diff --git a/src/game/js_standard.c b/src/input/game/js_standard.c
similarity index 100%
rename from src/game/js_standard.c
rename to src/input/game/js_standard.c
diff --git a/src/game/js_sw_pad.c b/src/input/game/js_sw_pad.c
similarity index 100%
rename from src/game/js_sw_pad.c
rename to src/input/game/js_sw_pad.c
diff --git a/src/game/js_tm_fcs.c b/src/input/game/js_tm_fcs.c
similarity index 100%
rename from src/game/js_tm_fcs.c
rename to src/input/game/js_tm_fcs.c
diff --git a/src/keyboard.c b/src/input/keyboard.c
similarity index 98%
rename from src/keyboard.c
rename to src/input/keyboard.c
index eedd217..69e06a7 100644
--- a/src/keyboard.c
+++ b/src/input/keyboard.c
@@ -8,7 +8,7 @@
  *
  *		General keyboard driver interface.
  *
- * Version:	@(#)keyboard.c	1.0.4	2018/04/01
+ * Version:	@(#)keyboard.c	1.0.5	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -42,8 +42,8 @@
 #include <stdarg.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "emu.h"
-#include "machine/machine.h"
+#include "../emu.h"
+#include "../machine/machine.h"
 #include "keyboard.h"
 
 
diff --git a/src/keyboard.h b/src/input/keyboard.h
similarity index 100%
rename from src/keyboard.h
rename to src/input/keyboard.h
diff --git a/src/keyboard_at.c b/src/input/keyboard_at.c
similarity index 99%
rename from src/keyboard_at.c
rename to src/input/keyboard_at.c
index 92327a8..9817bc8 100644
--- a/src/keyboard_at.c
+++ b/src/input/keyboard_at.c
@@ -8,7 +8,7 @@
  *
  *		Intel 8042 (AT keyboard controller) emulation.
  *
- * Version:	@(#)keyboard_at.c	1.0.10	2018/04/02
+ * Version:	@(#)keyboard_at.c	1.0.11	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -41,25 +41,26 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "emu.h"
-#include "cpu/cpu.h"
-#include "io.h"
-#include "pic.h"
-#include "pit.h"
-#include "ppi.h"
-#include "mem.h"
-#include "device.h"
-#include "timer.h"
-#include "machine/machine.h"
-#include "machine/m_at_t3100e.h"
-#include "machine/m_xt_xi8088.h"
-#include "floppy/fdd.h"
-#include "floppy/fdc.h"
-#include "sound/sound.h"
-#include "sound/snd_speaker.h"
-#include "video/video.h"
+#include "../emu.h"
+#include "../cpu/cpu.h"
+#include "../machine/machine.h"
+#include "../io.h"
+#include "../pic.h"
+#include "../pit.h"
+#include "../ppi.h"
+#include "../mem.h"
+#include "../timer.h"
+#include "../device.h"
+#include "../floppy/fdd.h"
+#include "../floppy/fdc.h"
+#include "../sound/sound.h"
+#include "../sound/snd_speaker.h"
+#include "../video/video.h"
 #include "keyboard.h"
 
+#include "../machine/m_at_t3100e.h"
+#include "../machine/m_xt_xi8088.h"
+
 
 #define STAT_PARITY     0x80
 #define STAT_RTIMEOUT   0x40
diff --git a/src/keyboard_xt.c b/src/input/keyboard_xt.c
similarity index 98%
rename from src/keyboard_xt.c
rename to src/input/keyboard_xt.c
index c89d154..3807479 100644
--- a/src/keyboard_xt.c
+++ b/src/input/keyboard_xt.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of the XT-style keyboard.
  *
- * Version:	@(#)keyboard_xt.c	1.0.5	2018/04/01
+ * Version:	@(#)keyboard_xt.c	1.0.6	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -41,17 +41,17 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "emu.h"
-#include "machine/machine.h"
-#include "io.h"
-#include "pic.h"
-#include "pit.h"
-#include "ppi.h"
-#include "timer.h"
-#include "device.h"
-#include "sound/sound.h"
-#include "sound/snd_speaker.h"
-#include "video/video.h"
+#include "../emu.h"
+#include "../machine/machine.h"
+#include "../io.h"
+#include "../pic.h"
+#include "../pit.h"
+#include "../ppi.h"
+#include "../timer.h"
+#include "../device.h"
+#include "../sound/sound.h"
+#include "../sound/snd_speaker.h"
+#include "../video/video.h"
 #include "keyboard.h"
 
 
diff --git a/src/mouse.c b/src/input/mouse.c
similarity index 98%
rename from src/mouse.c
rename to src/input/mouse.c
index af69745..dab6c7e 100644
--- a/src/mouse.c
+++ b/src/input/mouse.c
@@ -10,7 +10,7 @@
  *
  * TODO:	Add the Genius bus- and serial mouse.
  *
- * Version:	@(#)mouse.c	1.0.8	2018/04/19
+ * Version:	@(#)mouse.c	1.0.9	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -52,8 +52,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
-#include "emu.h"
-#include "device.h"
+#include "../emu.h"
+#include "../device.h"
 #include "mouse.h"
 
 
diff --git a/src/mouse.h b/src/input/mouse.h
similarity index 100%
rename from src/mouse.h
rename to src/input/mouse.h
diff --git a/src/mouse_bus.c b/src/input/mouse_bus.c
similarity index 99%
rename from src/mouse_bus.c
rename to src/input/mouse_bus.c
index 3edcbc5..2d30b68 100644
--- a/src/mouse_bus.c
+++ b/src/input/mouse_bus.c
@@ -49,7 +49,7 @@
  *
  *		Based on an early driver for MINIX 1.5.
  *
- * Version:	@(#)mouse_bus.c	1.0.5	2018/04/20
+ * Version:	@(#)mouse_bus.c	1.0.6	2018/04/26
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *
@@ -90,13 +90,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include <inttypes.h>
-#include "emu.h"
-#include "config.h"
-#include "io.h"
-#include "pic.h"
-#include "timer.h"
-#include "device.h"
+#include "../emu.h"
+#include "../config.h"
+#include "../io.h"
+#include "../pic.h"
+#include "../timer.h"
+#include "../device.h"
 #include "mouse.h"
 
 
diff --git a/src/mouse_ps2.c b/src/input/mouse_ps2.c
similarity index 98%
rename from src/mouse_ps2.c
rename to src/input/mouse_ps2.c
index 6d856c9..a9f706b 100644
--- a/src/mouse_ps2.c
+++ b/src/input/mouse_ps2.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of PS/2 series Mouse devices.
  *
- * Version:	@(#)mouse_ps2.c	1.0.5	2018/04/20
+ * Version:	@(#)mouse_ps2.c	1.0.6	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -41,9 +41,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "emu.h"
-#include "config.h"
-#include "device.h"
+#include "../emu.h"
+#include "../config.h"
+#include "../device.h"
 #include "keyboard.h"
 #include "mouse.h"
 
diff --git a/src/mouse_serial.c b/src/input/mouse_serial.c
similarity index 97%
rename from src/mouse_serial.c
rename to src/input/mouse_serial.c
index 9e8b403..3b2e670 100644
--- a/src/mouse_serial.c
+++ b/src/input/mouse_serial.c
@@ -10,7 +10,7 @@
  *
  * TODO:	Add the Genius Serial Mouse.
  *
- * Version:	@(#)mouse_serial.c	1.0.7	2018/04/26
+ * Version:	@(#)mouse_serial.c	1.0.8	2018/04/26
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *
@@ -51,11 +51,11 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "emu.h"
-#include "config.h"
-#include "device.h"
-#include "timer.h"
-#include "ports/serial.h"
+#include "../emu.h"
+#include "../config.h"
+#include "../device.h"
+#include "../timer.h"
+#include "../ports/serial.h"
 #include "mouse.h"
 
 
diff --git a/src/intel_piix.c b/src/intel_piix.c
index f584022..583b92e 100644
--- a/src/intel_piix.c
+++ b/src/intel_piix.c
@@ -12,7 +12,7 @@
  *		    word 0 - base address
  *		    word 1 - bits 1-15 = byte count, bit 31 = end of transfer
  *
- * Version:	@(#)intel_piix.c	1.0.2	2018/03/04
+ * Version:	@(#)intel_piix.c	1.0.3	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -47,10 +47,10 @@
 #include "emu.h"
 #include "dma.h"
 #include "io.h"
-#include "device.h"
-#include "keyboard.h"
-#include "mem.h"
 #include "pci.h"
+#include "mem.h"
+#include "device.h"
+#include "input/keyboard.h"
 #include "disk/hdc.h"
 #include "disk/hdc_ide.h"
 #include "intel_piix.h"
diff --git a/src/intel_piix4.c b/src/intel_piix4.c
index d6406e1..e376afb 100644
--- a/src/intel_piix4.c
+++ b/src/intel_piix4.c
@@ -12,7 +12,7 @@
  *		    word 0 - base address
  *		    word 1 - bits 1-15 = byte count, bit 31 = end of transfer
  *
- * Version:	@(#)intel_piix4.c	1.0.1	2018/02/14
+ * Version:	@(#)intel_piix4.c	1.0.2	2018/04/26
  *
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *
@@ -41,12 +41,12 @@
 #include <string.h>
 #include <wchar.h>
 #include "emu.h"
-#include "dma.h"
 #include "io.h"
-#include "device.h"
-#include "keyboard.h"
-#include "mem.h"
+#include "dma.h"
 #include "pci.h"
+#include "mem.h"
+#include "device.h"
+#include "input/keyboard.h"
 #include "disk/hdc.h"
 #include "disk/hdc_ide.h"
 #include "intel_piix.h"
diff --git a/src/machine/m_amstrad.c b/src/machine/m_amstrad.c
index 343056e..c67bb4a 100644
--- a/src/machine/m_amstrad.c
+++ b/src/machine/m_amstrad.c
@@ -32,7 +32,7 @@
  *  BIOSES:	I need to re-do the bios.txt format so we can load non-BIOS
  *		ROM files for a given machine, such as font roms here..
  *
- * Version:	@(#)m_amstrad.c	1.0.14	2018/04/26
+ * Version:	@(#)m_amstrad.c	1.0.15	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -77,9 +77,9 @@
 #include "../timer.h"
 #include "../device.h"
 #include "../nvr.h"
-#include "../keyboard.h"
-#include "../mouse.h"
 #include "../ports/parallel.h"
+#include "../input/keyboard.h"
+#include "../input/mouse.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "../sound/sound.h"
diff --git a/src/machine/m_at.c b/src/machine/m_at.c
index 8fb88b0..83125a9 100644
--- a/src/machine/m_at.c
+++ b/src/machine/m_at.c
@@ -8,7 +8,7 @@
  *
  *		Standard PC/AT implementation.
  *
- * Version:	@(#)m_at.c	1.0.7	2018/04/26
+ * Version:	@(#)m_at.c	1.0.8	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -47,7 +47,7 @@
 #include "../mem.h"
 #include "../device.h"
 #include "../nvr.h"
-#include "../keyboard.h"
+#include "../input/keyboard.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "../disk/hdc.h"
diff --git a/src/machine/m_at_430fx.c b/src/machine/m_at_430fx.c
index 53090c0..7538c80 100644
--- a/src/machine/m_at_430fx.c
+++ b/src/machine/m_at_430fx.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of the Intel 430FX PCISet chip.
  *
- * Version:	@(#)m_at_430fx.c	1.0.10	2018/04/25
+ * Version:	@(#)m_at_430fx.c	1.0.11	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -41,15 +41,15 @@
 #include <string.h>
 #include <wchar.h>
 #include "../emu.h"
+#include "../pci.h"
 #include "../mem.h"
 #include "../memregs.h"
 #include "../rom.h"
-#include "../pci.h"
 #include "../device.h"
-#include "../keyboard.h"
+#include "../input/keyboard.h"
+#include "../sio/sio.h"
 #include "../intel_piix.h"
 #include "../intel_flash.h"
-#include "../sio/sio.h"
 #include "../video/video.h"
 #include "machine.h"
 
diff --git a/src/machine/m_at_430hx.c b/src/machine/m_at_430hx.c
index 8981f6e..fa5e325 100644
--- a/src/machine/m_at_430hx.c
+++ b/src/machine/m_at_430hx.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of the Intel 430HX PCISet chip.
  *
- * Version:	@(#)m_at_430hx.c	1.0.4	2018/03/21
+ * Version:	@(#)m_at_430hx.c	1.0.5	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -46,10 +46,10 @@
 #include "../memregs.h"
 #include "../pci.h"
 #include "../device.h"
-#include "../keyboard.h"
+#include "../sio/sio.h"
+#include "../input/keyboard.h"
 #include "../intel_piix.h"
 #include "../intel_flash.h"
-#include "../sio/sio.h"
 #include "machine.h"
 
 
diff --git a/src/machine/m_at_430lx_nx.c b/src/machine/m_at_430lx_nx.c
index 4e7d2d6..b67d936 100644
--- a/src/machine/m_at_430lx_nx.c
+++ b/src/machine/m_at_430lx_nx.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of the Intel 430LX and 430NX PCISet chips.
  *
- * Version:	@(#)m_at_430lx_nx.c	1.0.4	2018/03/21
+ * Version:	@(#)m_at_430lx_nx.c	1.0.5	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -41,16 +41,16 @@
 #include <string.h>
 #include <wchar.h>
 #include "../emu.h"
+#include "../pci.h"
 #include "../mem.h"
 #include "../memregs.h"
 #include "../rom.h"
-#include "../pci.h"
 #include "../device.h"
-#include "../keyboard.h"
+#include "../input/keyboard.h"
+#include "../sio/sio.h"
 #include "../intel.h"
 #include "../intel_flash.h"
 #include "../intel_sio.h"
-#include "../sio/sio.h"
 #include "machine.h"
 
 
diff --git a/src/machine/m_at_ali1429.c b/src/machine/m_at_ali1429.c
index f88babf..5c27544 100644
--- a/src/machine/m_at_ali1429.c
+++ b/src/machine/m_at_ali1429.c
@@ -8,7 +8,7 @@
  *
  *		Implementation the ALI M1429 mainboard.
  *
- * Version:	@(#)m_at_ali1429.c	1.0.3	2018/03/21
+ * Version:	@(#)m_at_ali1429.c	1.0.4	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -45,7 +45,7 @@
 #include "../io.h"
 #include "../mem.h"
 #include "../device.h"
-#include "../keyboard.h"
+#include "../input/keyboard.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "../disk/hdc.h"
diff --git a/src/machine/m_at_headland.c b/src/machine/m_at_headland.c
index a691fff..1fef80b 100644
--- a/src/machine/m_at_headland.c
+++ b/src/machine/m_at_headland.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of the HEADLAND AT286 chipset.
  *
- * Version:	@(#)m_at_headland.c	1.0.3	2018/03/21
+ * Version:	@(#)m_at_headland.c	1.0.4	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -44,9 +44,9 @@
 #include "../cpu/cpu.h"
 #include "../cpu/x86.h"
 #include "../io.h"
-#include "../device.h"
-#include "../keyboard.h"
 #include "../mem.h"
+#include "../device.h"
+#include "../input/keyboard.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "machine.h"
diff --git a/src/machine/m_at_neat.c b/src/machine/m_at_neat.c
index 87d0d7f..4c0a53b 100644
--- a/src/machine/m_at_neat.c
+++ b/src/machine/m_at_neat.c
@@ -10,7 +10,7 @@
  *
  *		This is the chipset used in the AMI 286 clone model.
  *
- * Version:	@(#)m_at_neat.c	1.0.3	2018/03/21
+ * Version:	@(#)m_at_neat.c	1.0.4	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -43,9 +43,9 @@
 #include <string.h>
 #include <wchar.h>
 #include "../emu.h"
-#include "../device.h"
 #include "../io.h"
-#include "../keyboard.h"
+#include "../device.h"
+#include "../input/keyboard.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "machine.h"
diff --git a/src/machine/m_at_opti495.c b/src/machine/m_at_opti495.c
index cb09731..1c05345 100644
--- a/src/machine/m_at_opti495.c
+++ b/src/machine/m_at_opti495.c
@@ -260,7 +260,7 @@ Note:	the block address is forced to be a multiple of the block size by
 	  ignoring the appropriate number of the least-significant bits
 SeeAlso: #P0178,#P0187
  *
- * Version:	@(#)m_at_opti495.c	1.0.3	2018/03/21
+ * Version:	@(#)m_at_opti495.c	1.0.4	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -295,9 +295,9 @@ SeeAlso: #P0178,#P0187
 #include "../emu.h"
 #include "../cpu/cpu.h"
 #include "../io.h"
-#include "../device.h"
-#include "../keyboard.h"
 #include "../mem.h"
+#include "../device.h"
+#include "../input/keyboard.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "machine.h"
diff --git a/src/machine/m_at_scat.c b/src/machine/m_at_scat.c
index 9d7de44..e392cbd 100644
--- a/src/machine/m_at_scat.c
+++ b/src/machine/m_at_scat.c
@@ -10,7 +10,7 @@
  *
  *		Re-worked version based on the 82C235 datasheet and errata.
  *
- * Version:	@(#)m_at_scat.c	1.0.6	2018/03/27
+ * Version:	@(#)m_at_scat.c	1.0.7	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Original by GreatPsycho for PCem.
@@ -44,11 +44,11 @@
 #include "../emu.h"
 #include "../cpu/cpu.h"
 #include "../cpu/x86.h"
-#include "../nmi.h"
 #include "../io.h"
+#include "../nmi.h"
 #include "../mem.h"
 #include "../device.h"
-#include "../keyboard.h"
+#include "../input/keyboard.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "machine.h"
diff --git a/src/machine/m_at_t3100e.c b/src/machine/m_at_t3100e.c
index 7f5ec1d..dcac8a8 100644
--- a/src/machine/m_at_t3100e.c
+++ b/src/machine/m_at_t3100e.c
@@ -117,7 +117,7 @@
  *                       bit 2 set for single-pixel LCD font
  *                       bits 0,1 for display font
  *
- * Version:	@(#)m_at_t3100e.c	1.0.5	2018/03/21
+ * Version:	@(#)m_at_t3100e.c	1.0.6	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -151,12 +151,12 @@
 #include <string.h>
 #include <wchar.h>
 #include "../emu.h"
+#include "../cpu/cpu.h"
 #include "../io.h"
-#include "../mouse.h"
 #include "../mem.h"
 #include "../device.h"
-#include "../keyboard.h"
-#include "../cpu/cpu.h"
+#include "../input/keyboard.h"
+#include "../input/mouse.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "machine.h"
diff --git a/src/machine/m_at_wd76c10.c b/src/machine/m_at_wd76c10.c
index 57b602a..c09e754 100644
--- a/src/machine/m_at_wd76c10.c
+++ b/src/machine/m_at_wd76c10.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of the WD76C10 system controller.
  *
- * Version:	@(#)m_at_wd76c10.c	1.0.6	2018/04/26
+ * Version:	@(#)m_at_wd76c10.c	1.0.7	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -44,8 +44,8 @@
 #include "../io.h"
 #include "../mem.h"
 #include "../device.h"
-#include "../keyboard.h"
 #include "../ports/serial.h"
+#include "../input/keyboard.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "machine.h"
diff --git a/src/machine/m_europc.c b/src/machine/m_europc.c
index 9c7c04c..816cf7f 100644
--- a/src/machine/m_europc.c
+++ b/src/machine/m_europc.c
@@ -66,7 +66,7 @@
  *				bit 1: b8000 memory available
  *		  0000:046a:	00 jim 250 01 jim 350
  *
- * Version:	@(#)m_europc.c	1.0.10	2018/04/26
+ * Version:	@(#)m_europc.c	1.0.11	2018/04/26
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *
@@ -120,9 +120,9 @@
 #include "../rom.h"
 #include "../nvr.h"
 #include "../device.h"
-#include "../keyboard.h"
-#include "../mouse.h"
 #include "../ports/parallel.h"
+#include "../input/keyboard.h"
+#include "../input/mouse.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "../disk/hdc.h"
diff --git a/src/machine/m_olivetti_m24.c b/src/machine/m_olivetti_m24.c
index 91ae9bd..af15e1f 100644
--- a/src/machine/m_olivetti_m24.c
+++ b/src/machine/m_olivetti_m24.c
@@ -8,7 +8,7 @@
  *
  *		Emulation of the Olivetti M24.
  *
- * Version:	@(#)m_olivetti_m24.c	1.0.9	2018/04/26
+ * Version:	@(#)m_olivetti_m24.c	1.0.10	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -52,8 +52,8 @@
 #include "../timer.h"
 #include "../device.h"
 #include "../nvr.h"
-#include "../keyboard.h"
-#include "../mouse.h"
+#include "../input/keyboard.h"
+#include "../input/mouse.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "../sound/sound.h"
diff --git a/src/machine/m_pcjr.c b/src/machine/m_pcjr.c
index 8cb076d..e802345 100644
--- a/src/machine/m_pcjr.c
+++ b/src/machine/m_pcjr.c
@@ -8,7 +8,7 @@
  *
  *		Emulation of the IBM PCjr.
  *
- * Version:	@(#)m_pcjr.c	1.0.6	2018/04/26
+ * Version:	@(#)m_pcjr.c	1.0.7	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -51,7 +51,7 @@
 #include "../timer.h"
 #include "../device.h"
 #include "../ports/serial.h"
-#include "../keyboard.h"
+#include "../input/keyboard.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "../sound/sound.h"
diff --git a/src/machine/m_ps1.c b/src/machine/m_ps1.c
index f24cfe9..3c57e18 100644
--- a/src/machine/m_ps1.c
+++ b/src/machine/m_ps1.c
@@ -22,7 +22,7 @@
  *		The reserved 384K is remapped to the top of extended memory.
  *		If this is not done then you get an error on startup.
  *
- * Version:	@(#)m_ps1.c	1.0.16	2018/04/26
+ * Version:	@(#)m_ps1.c	1.0.17	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -67,11 +67,11 @@
 #include "../timer.h"
 #include "../device.h"
 #include "../nvr.h"
-#include "../keyboard.h"
-#include "../mouse.h"
 #include "../ports/game.h"
 #include "../ports/parallel.h"
 #include "../ports/serial.h"
+#include "../input/keyboard.h"
+#include "../input/mouse.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "../disk/hdc.h"
diff --git a/src/machine/m_ps2_isa.c b/src/machine/m_ps2_isa.c
index 58a09f4..b88e587 100644
--- a/src/machine/m_ps2_isa.c
+++ b/src/machine/m_ps2_isa.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of ISA-based PS/2 machines.
  *
- * Version:	@(#)m_ps2_isa.c	1.0.10	2018/04/26
+ * Version:	@(#)m_ps2_isa.c	1.0.11	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -50,9 +50,9 @@
 #include "../rom.h"
 #include "../device.h"
 #include "../nvr.h"
-#include "../keyboard.h"
 #include "../ports/parallel.h"
 #include "../ports/serial.h"
+#include "../input/keyboard.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "machine.h"
diff --git a/src/machine/m_ps2_mca.c b/src/machine/m_ps2_mca.c
index 09207e4..87e0456 100644
--- a/src/machine/m_ps2_mca.c
+++ b/src/machine/m_ps2_mca.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of MCA-based PS/2 machines.
  *
- * Version:	@(#)m_ps2_mca.c	1.0.12	2018/04/26
+ * Version:	@(#)m_ps2_mca.c	1.0.13	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -54,10 +54,10 @@
 #include "../device.h"
 #include "../nvr.h"
 #include "../nvr_ps2.h"
-#include "../keyboard.h"
-#include "../mouse.h"
 #include "../ports/parallel.h"
 #include "../ports/serial.h"
+#include "../input/keyboard.h"
+#include "../input/mouse.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "machine.h"
diff --git a/src/machine/m_tandy.c b/src/machine/m_tandy.c
index b83c36e..a502c02 100644
--- a/src/machine/m_tandy.c
+++ b/src/machine/m_tandy.c
@@ -8,7 +8,7 @@
  *
  *		Emulation of Tandy models 1000, 1000HX and 1000SL2.
  *
- * Version:	@(#)m_tandy.c	1.0.9	2018/04/26
+ * Version:	@(#)m_tandy.c	1.0.10	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -53,7 +53,7 @@
 #include "../timer.h"
 #include "../device.h"
 #include "../nvr.h"
-#include "../keyboard.h"
+#include "../input/keyboard.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "../sound/sound.h"
diff --git a/src/machine/m_xt.c b/src/machine/m_xt.c
index dcae598..0c62301 100644
--- a/src/machine/m_xt.c
+++ b/src/machine/m_xt.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of standard IBM PC/XT class machine.
  *
- * Version:	@(#)m_xt.c	1.0.8	2018/04/26
+ * Version:	@(#)m_xt.c	1.0.9	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -45,7 +45,7 @@
 #include "../pit.h"
 #include "../mem.h"
 #include "../device.h"
-#include "../keyboard.h"
+#include "../input/keyboard.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "machine.h"
diff --git a/src/machine/m_xt_compaq.c b/src/machine/m_xt_compaq.c
index 2e492f1..a72540e 100644
--- a/src/machine/m_xt_compaq.c
+++ b/src/machine/m_xt_compaq.c
@@ -8,7 +8,7 @@
  *
  *		Emulation of various Compaq XT-class PC's.
  *
- * Version:	@(#)m_xt_compaq.c	1.0.9	2018/04/26
+ * Version:	@(#)m_xt_compaq.c	1.0.10	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -49,7 +49,7 @@
 #include "../rom.h"
 #include "../device.h"
 #include "../ports/parallel.h"
-#include "../keyboard.h"
+#include "../input/keyboard.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "machine.h"
diff --git a/src/machine/m_xt_t1000.c b/src/machine/m_xt_t1000.c
index 811bc9d..2fbf8c3 100644
--- a/src/machine/m_xt_t1000.c
+++ b/src/machine/m_xt_t1000.c
@@ -50,7 +50,7 @@
  *
  * FIXME:	The ROM drive should be re-done using the "option file".
  *
- * Version:	@(#)m_xt_t1000.c	1.0.10	2018/04/26
+ * Version:	@(#)m_xt_t1000.c	1.0.11	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -94,7 +94,7 @@
 #include "../nvr.h"
 #include "../device.h"
 #include "../ports/parallel.h"
-#include "../keyboard.h"
+#include "../input/keyboard.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
 #include "../video/video.h"
diff --git a/src/machine/m_xt_xi8088.c b/src/machine/m_xt_xi8088.c
index bb2202d..1e49aef 100644
--- a/src/machine/m_xt_xi8088.c
+++ b/src/machine/m_xt_xi8088.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of the Xi8088 open-source machine.
  *
- * Version:	@(#)m_xt_xi8088.c	1.0.8	2018/04/26
+ * Version:	@(#)m_xt_xi8088.c	1.0.9	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -49,7 +49,7 @@
 #include "../nmi.h"
 #include "../device.h"
 #include "../nvr.h"
-#include "../keyboard.h"
+#include "../input/keyboard.h"
 #include "../ports/parallel.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
diff --git a/src/pc.c b/src/pc.c
index 01f45b5..770f257 100644
--- a/src/pc.c
+++ b/src/pc.c
@@ -8,7 +8,7 @@
  *
  *		Main emulator module where most things are controlled.
  *
- * Version:	@(#)pc.c	1.0.28	2018/04/26
+ * Version:	@(#)pc.c	1.0.29	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -68,9 +68,9 @@
 #include "ports/game.h"
 #include "ports/serial.h"
 #include "ports/parallel.h"
-#include "keyboard.h"
-#include "mouse.h"
-#include "game/joystick.h"
+#include "input/keyboard.h"
+#include "input/mouse.h"
+#include "input/game/joystick.h"
 #include "floppy/fdd.h"
 #include "floppy/fdd_common.h"
 #include "disk/hdd.h"
diff --git a/src/pci.c b/src/pci.c
index 6705be6..b474e5b 100644
--- a/src/pci.c
+++ b/src/pci.c
@@ -8,7 +8,7 @@
  *
  *		Implement the PCI bus.
  *
- * Version:	@(#)pci.c	1.0.2	2018/03/20
+ * Version:	@(#)pci.c	1.0.3	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -47,14 +47,14 @@
 #include "cpu/cpu.h"
 #include "io.h"
 #include "pic.h"
+#include "pci.h"
 #include "mem.h"
 #include "device.h"
-#include "pci.h"
-#include "keyboard.h"
-#include "cdrom/cdrom.h"
+#include "input/keyboard.h"
 #include "disk/hdc.h"
 #include "disk/hdc_ide.h"
 #include "disk/zip.h"
+#include "cdrom/cdrom.h"
 
 
 static uint64_t pci_irq_hold[16];
diff --git a/src/ports/game.c b/src/ports/game.c
index 06c0e0e..921d0e3 100644
--- a/src/ports/game.c
+++ b/src/ports/game.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of a generic Game Port.
  *
- * Version:	@(#)game.c	1.0.8	2018/04/26
+ * Version:	@(#)game.c	1.0.9	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -42,12 +42,12 @@
 #include "../emu.h"
 #include "../machine/machine.h"
 #include "../cpu/cpu.h"
-#include "../device.h"
 #include "../io.h"
 #include "../timer.h"
+#include "../device.h"
+#include "../input/game/joystick.h"
 #include "game.h"
 #include "game_dev.h"
-#include "../game/joystick.h"
 
 
 typedef struct {
diff --git a/src/win/mingw/Makefile.MinGW b/src/win/mingw/Makefile.MinGW
index 2fdb89d..714fc77 100644
--- a/src/win/mingw/Makefile.MinGW
+++ b/src/win/mingw/Makefile.MinGW
@@ -8,7 +8,7 @@
 #
 #		Makefile for Windows systems using the MinGW32 environment.
 #
-# Version:	@(#)Makefile.mingw	1.0.33	2018/04/26
+# Version:	@(#)Makefile.mingw	1.0.34	2018/04/26
 #
 # Author:	Fred N. van Kempen, <decwiz@yahoo.com>
 #
@@ -202,7 +202,8 @@ endif
 #		Nothing should need changing from here on..		#
 #########################################################################
 VPATH		:= $(EXPATH) . cpu \
-		   cdrom disk floppy floppy/lzf ports game sio machine \
+		   machine sio ports input input/game \
+		   cdrom disk floppy floppy/lzf \
 		   sound \
 		    sound/munt sound/munt/c_interface sound/munt/sha1 \
 		    sound/munt/srchelper \
diff --git a/src/win/msvc/Makefile.VC b/src/win/msvc/Makefile.VC
index 39e1b76..97b2f6f 100644
--- a/src/win/msvc/Makefile.VC
+++ b/src/win/msvc/Makefile.VC
@@ -8,7 +8,7 @@
 #
 #		Makefile for Windows using Visual Studio 2015.
 #
-# Version:	@(#)Makefile.VC	1.0.20	2018/04/26
+# Version:	@(#)Makefile.VC	1.0.21	2018/04/26
 #
 # Author:	Fred N. van Kempen, <decwiz@yahoo.com>
 #
@@ -207,7 +207,8 @@ endif
 #		Nothing should need changing from here on..		#
 #########################################################################
 VPATH		:= $(EXPATH) . cpu \
-		   cdrom disk floppy floppy/lzf ports game sio machine \
+		   machine sio ports input input/game \
+		   cdrom disk floppy floppy/lzf \
 		   sound \
 		    sound/munt sound/munt/c_interface sound/munt/sha1 \
 		    sound/munt/srchelper \
diff --git a/src/win/win.c b/src/win/win.c
index 28e4e71..3d804e1 100644
--- a/src/win/win.c
+++ b/src/win/win.c
@@ -8,7 +8,7 @@
  *
  *		Platform main support module for Windows.
  *
- * Version:	@(#)win.c	1.0.13	2018/04/14
+ * Version:	@(#)win.c	1.0.14	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -50,7 +50,7 @@
 #include "../version.h"
 #include "../config.h"
 #include "../device.h"
-#include "../mouse.h"
+#include "../input/mouse.h"
 #include "../video/video.h"
 #define GLOBAL
 #include "../plat.h"
diff --git a/src/win/win_joystick.cpp b/src/win/win_joystick.cpp
index 701f609..107560e 100644
--- a/src/win/win_joystick.cpp
+++ b/src/win/win_joystick.cpp
@@ -13,7 +13,7 @@
  * NOTE:	Hacks currently needed to compile with MSVC; DX needs to
  *		be updated to 11 or 12 or so.  --FvK
  *
- * Version:	@(#)win_joystick.cpp	1.0.9	2018/04/26
+ * Version:	@(#)win_joystick.cpp	1.0.10	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -60,7 +60,7 @@
 #include "../config.h"
 #include "../device.h"
 #include "../ports/game_dev.h"
-#include "../game/joystick.h"
+#include "../input/game/joystick.h"
 #include "../plat.h"
 #include "win.h"
 
diff --git a/src/win/win_keyboard.c b/src/win/win_keyboard.c
index 1b88fd6..ffd0e28 100644
--- a/src/win/win_keyboard.c
+++ b/src/win/win_keyboard.c
@@ -8,7 +8,7 @@
  *
  *		Windows raw keyboard input handler.
  *
- * Version:	@(#)win_keyboard.c	1.0.3	2018/03/07
+ * Version:	@(#)win_keyboard.c	1.0.4	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -44,7 +44,7 @@
 #include <stdlib.h>
 #include "../emu.h"
 #include "../device.h"
-#include "../keyboard.h"
+#include "../input/keyboard.h"
 #include "../plat.h"
 #include "win.h"
 
diff --git a/src/win/win_mouse.cpp b/src/win/win_mouse.cpp
index 684b05b..e1a2511 100644
--- a/src/win/win_mouse.cpp
+++ b/src/win/win_mouse.cpp
@@ -8,7 +8,7 @@
  *
  *		Mouse interface to host device.
  *
- * Version:	@(#)win_mouse.cpp	1.0.3	2018/04/14
+ * Version:	@(#)win_mouse.cpp	1.0.4	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -42,7 +42,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include "../emu.h"
-#include "../mouse.h"
+#include "../input/mouse.h"
 #include "../plat.h"
 #include "win.h"
 
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
index 6d615bd..246b213 100644
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of the Settings dialog.
  *
- * Version:	@(#)win_settings.c	1.0.23	2018/04/26
+ * Version:	@(#)win_settings.c	1.0.24	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -52,18 +52,18 @@
 #include "../device.h"
 #include "../nvr.h"
 #include "../machine/machine.h"
-#include "../mouse.h"
 #include "../ports/game_dev.h"
 #include "../ports/parallel.h"
 #include "../ports/parallel_dev.h"
 #include "../ports/serial.h"
-#include "../game/joystick.h"
+#include "../input/mouse.h"
+#include "../input/game/joystick.h"
+#include "../floppy/fdd.h"
 #include "../disk/hdd.h"
 #include "../disk/hdc.h"
 #include "../disk/hdc_ide.h"
 #include "../disk/zip.h"
 #include "../cdrom/cdrom.h"
-#include "../floppy/fdd.h"
 #include "../scsi/scsi.h"
 #include "../network/network.h"
 #include "../sound/sound.h"
diff --git a/src/win/win_ui.c b/src/win/win_ui.c
index 2599ab4..2942a39 100644
--- a/src/win/win_ui.c
+++ b/src/win/win_ui.c
@@ -8,7 +8,7 @@
  *
  *		Implement the user Interface module.
  *
- * Version:	@(#)win_ui.c	1.0.12	2018/04/14
+ * Version:	@(#)win_ui.c	1.0.13	2018/04/26
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -49,8 +49,8 @@
 #include "../version.h"
 #include "../config.h"
 #include "../device.h"
-#include "../keyboard.h"
-#include "../mouse.h"
+#include "../input/keyboard.h"
+#include "../input/mouse.h"
 #include "../video/video.h"
 #include "../plat.h"
 #include "../ui.h"