diff --git a/galaxys2.mk b/galaxys2.mk
index 9a68ed6..d933b41 100644
--- a/galaxys2.mk
+++ b/galaxys2.mk
@@ -109,7 +109,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_TAGS += dalvik.gc.type-precise
 
 # kernel modules for ramdisk
-RAMDISK_MODULES = $(addprefix device/samsung/galaxys2/,bthid.ko dhd.ko gspca_main.ko j4fs.ko \
+RAMDISK_MODULES = $(addprefix device/samsung/galaxys2/modules/,bthid.ko dhd.ko gspca_main.ko j4fs.ko \
 	scsi_wait_scan.ko Si4709_driver.ko vibrator.ko)
 PRODUCT_COPY_FILES += $(foreach module,\
 	$(RAMDISK_MODULES),\
@@ -117,12 +117,12 @@ PRODUCT_COPY_FILES += $(foreach module,\
 
 # other kernel modules not in ramdisk
 PRODUCT_COPY_FILES += $(foreach module,\
-	$(filter-out $(RAMDISK_MODULES),$(wildcard device/samsung/galaxys2/*.ko)),\
+	$(filter-out $(RAMDISK_MODULES),$(wildcard device/samsung/galaxys2/modules/*.ko)),\
 	$(module):system/lib/modules/$(notdir $(module)))
 
 # kernel modules for recovery ramdisk
 PRODUCT_COPY_FILES += \
-    device/samsung/galaxys2/j4fs.ko:recovery/root/lib/modules/j4fs.ko
+    device/samsung/galaxys2/modules/j4fs.ko:recovery/root/lib/modules/j4fs.ko
 
 ifeq ($(TARGET_PREBUILT_KERNEL),)
     LOCAL_KERNEL := device/samsung/galaxys2/kernel
diff --git a/Si4709_driver.ko b/modules/Si4709_driver.ko
similarity index 100%
rename from Si4709_driver.ko
rename to modules/Si4709_driver.ko
diff --git a/bthid.ko b/modules/bthid.ko
similarity index 100%
rename from bthid.ko
rename to modules/bthid.ko
diff --git a/cifs.ko b/modules/cifs.ko
similarity index 100%
rename from cifs.ko
rename to modules/cifs.ko
diff --git a/dhd.ko b/modules/dhd.ko
similarity index 100%
rename from dhd.ko
rename to modules/dhd.ko
diff --git a/gspca_main.ko b/modules/gspca_main.ko
similarity index 100%
rename from gspca_main.ko
rename to modules/gspca_main.ko
diff --git a/j4fs.ko b/modules/j4fs.ko
similarity index 100%
rename from j4fs.ko
rename to modules/j4fs.ko
diff --git a/scsi_wait_scan.ko b/modules/scsi_wait_scan.ko
similarity index 100%
rename from scsi_wait_scan.ko
rename to modules/scsi_wait_scan.ko
diff --git a/vibrator.ko b/modules/vibrator.ko
similarity index 100%
rename from vibrator.ko
rename to modules/vibrator.ko