--- microwin/src/drivers/Objects.rules	2005-04-27 22:23:32.000000000 +0900
+++ microwin_new/src/drivers/Objects.rules	2005-05-01 10:58:02.000000000 +0900
@@ -97,12 +124,12 @@
 	$(MW_DIR_OBJ)/drivers/fblin24.o \
 	$(MW_DIR_OBJ)/drivers/fblin32.o \
 	$(MW_DIR_OBJ)/drivers/fblin32alpha.o \
-	$(MW_DIR_OBJ)/drivers/mou_x11.o 
+	$(MW_DIR_OBJ)/drivers/mouse/mou_x11.o 
 
 ifneq ($(PIPEKBD), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_x11.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_x11.o
 else
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_pipe.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_pipe.o
 endif
 
 ifeq ($(NOFONTSORCLIPPING), Y)
@@ -147,82 +174,82 @@
 
 ### Desktop GPM mouse driver
 ifeq ($(GPMMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_gpm.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_gpm.o
 endif
 
 ### serial mouse driver
 ifeq ($(SERMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_ser.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_ser.o
 endif
 
 ### Generic touchscreen driver
 ifeq ($(ADSMOUSE), Y)
 CFLAGS += -DTOUCHSCREEN_ADS=1
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_touchscreen.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_touchscreen.o
 endif
 
 ifeq ($(ADS7846MOUSE), Y)
 CFLAGS += -DTOUCHSCREEN_ADS7846=1
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_touchscreen.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_touchscreen.o
 endif
 
 ifeq ($(IPAQMOUSE), Y)
 CFLAGS += -DTOUCHSCREEN_IPAQ=1
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_touchscreen.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_touchscreen.o
 endif
 
 ifeq ($(TUXMOUSE), Y)
 CFLAGS += -DTOUCHSCREEN_TUXSCREEN=1
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_touchscreen.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_touchscreen.o
 endif
 
 ifeq ($(ZAURUSMOUSE), Y)
 CFLAGS += -DTOUCHSCREEN_ZAURUS=1
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_touchscreen.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_touchscreen.o
 endif
 
 ### Embedded Planet touchscreen
 ifeq ($(EPMOUSE), Y)
 CFLAGS += -DTOUCHSCREEN_EPLANET
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_vrlinux.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_vrlinux.o
 endif
 
 ### Vtech Helio touchscreen
 ifeq ($(VHMOUSE), Y)
 CFLAGS += -DTOUCHSCREEN_HELIO=1
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_vrlinux.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_vrlinux.o
 endif
 
 #### Yopy touchscreen
 ifeq ($(YOPYMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_yopy.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_yopy.o
 endif
 
 #### Psion 5 touchscreen
 ifeq ($(PSIONMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_ps5.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_ps5.o
 endif
 
 #### NEC Harrier touchscreen
 ifeq ($(HARRIERMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_harrier.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_harrier.o
 endif
 
 #### MicroTouch serial touchscreen
 ifeq ($(MTMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_mt.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_mt.o
 endif
 
 ifeq ($(SUNMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_sun.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_sun.o
 endif
 
 ifeq ($(ARCH), FREEBSD-X86)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_fbsd.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_fbsd.o
 endif
 
 ifeq ($(NOMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_null.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_null.o
 endif
 
 #
@@ -231,46 +258,46 @@
 ifneq ($(PIPEKBD), Y)
 
 ifeq ($(TTYKBD), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_tty.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_tty.o
 endif
 
 ifeq ($(IPAQKBD), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_ipaq.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_ipaq.o
 endif
 
 ifeq ($(ZAURUSKBD),Y)
 CFLAGS += -DKBD_ZAURUS=1
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_ttyscan.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_ttyscan.o
 endif
 
 ifeq ($(SCANKBD), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_ttyscan.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_ttyscan.o
 endif
 
 ifeq ($(ARCH), FREEBSD-X86)
-#MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_fbsd.o
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_tty.o
+#MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_fbsd.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_tty.o
 endif
 
 ifeq ($(LIRCKBD), Y)
 MW_CORE_OBJS += \
-	$(MW_DIR_OBJ)/drivers/mwlirc.o \
-	$(MW_DIR_OBJ)/drivers/kbd_lirc.o
+	$(MW_DIR_OBJ)/drivers/keyb/mwlirc.o \
+	$(MW_DIR_OBJ)/drivers/keyb/kbd_lirc.o
 endif
 
 ifeq ($(NOKBD), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_null.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_null.o
 endif
 
 else
 
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_pipe.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_pipe.o
 
 endif # PIPEKBD != Y
 
 ifeq ($(ARCH), RTEMS)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_rtems.o
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_rtems.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_rtems.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_rtems.o
 endif # RTEMS architecture
 
 
@@ -278,8 +305,8 @@
 
 ifeq ($(LIRCKBD2), Y)
 MW_CORE_OBJS += \
-	$(MW_DIR_OBJ)/drivers/mwlirc.o \
-	$(MW_DIR_OBJ)/drivers/kbd_lirc.o
+	$(MW_DIR_OBJ)/drivers/keyb/mwlirc.o \
+	$(MW_DIR_OBJ)/drivers/keyb/kbd_lirc.o
 endif
 
 endif # !DJGPP
@@ -291,8 +318,8 @@
 MW_CORE_OBJS += \
 	$(MW_DIR_OBJ)/drivers/scr_djgr.o \
 	$(MW_DIR_OBJ)/drivers/genfont.o \
-	$(MW_DIR_OBJ)/drivers/mou_dos.o \
-	$(MW_DIR_OBJ)/drivers/kbd_djgr.o
+	$(MW_DIR_OBJ)/drivers/mouse/mou_dos.o \
+	$(MW_DIR_OBJ)/drivers/keyb/kbd_djgr.o
 
 endif
 
@@ -331,10 +358,10 @@
 endif
 
 ifeq ($(SERMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_ser.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_ser.o
 endif
 
-MW_CORE_OBJS +=	$(MW_DIR_OBJ)/drivers/kbd_tty.o
+MW_CORE_OBJS +=	$(MW_DIR_OBJ)/drivers/keyb/kbd_tty.o
 
 endif