diff --git a/src/add-ons/kernel/bus_managers/ata/ide/Jamfile b/src/add-ons/kernel/bus_managers/ata/Jamfile
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/Jamfile
rename to src/add-ons/kernel/bus_managers/ata/Jamfile
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/KernelExport_ext.h b/src/add-ons/kernel/bus_managers/ata/KernelExport_ext.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/KernelExport_ext.h
rename to src/add-ons/kernel/bus_managers/ata/KernelExport_ext.h
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/ata.c b/src/add-ons/kernel/bus_managers/ata/ata.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/ata.c
rename to src/add-ons/kernel/bus_managers/ata/ata.c
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/atapi.c b/src/add-ons/kernel/bus_managers/ata/atapi.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/atapi.c
rename to src/add-ons/kernel/bus_managers/ata/atapi.c
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/basic_protocol.c b/src/add-ons/kernel/bus_managers/ata/basic_protocol.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/basic_protocol.c
rename to src/add-ons/kernel/bus_managers/ata/basic_protocol.c
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/channels.c b/src/add-ons/kernel/bus_managers/ata/channels.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/channels.c
rename to src/add-ons/kernel/bus_managers/ata/channels.c
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/devices.c b/src/add-ons/kernel/bus_managers/ata/devices.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/devices.c
rename to src/add-ons/kernel/bus_managers/ata/devices.c
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/dma.c b/src/add-ons/kernel/bus_managers/ata/dma.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/dma.c
rename to src/add-ons/kernel/bus_managers/ata/dma.c
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/emulation.c b/src/add-ons/kernel/bus_managers/ata/emulation.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/emulation.c
rename to src/add-ons/kernel/bus_managers/ata/emulation.c
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/ide.c b/src/add-ons/kernel/bus_managers/ata/ide.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/ide.c
rename to src/add-ons/kernel/bus_managers/ata/ide.c
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/ide_cmds.h b/src/add-ons/kernel/bus_managers/ata/ide_cmds.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/ide_cmds.h
rename to src/add-ons/kernel/bus_managers/ata/ide_cmds.h
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/ide_device_infoblock.h b/src/add-ons/kernel/bus_managers/ata/ide_device_infoblock.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/ide_device_infoblock.h
rename to src/add-ons/kernel/bus_managers/ata/ide_device_infoblock.h
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/ide_internal.h b/src/add-ons/kernel/bus_managers/ata/ide_internal.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/ide_internal.h
rename to src/add-ons/kernel/bus_managers/ata/ide_internal.h
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/ide_sim.c b/src/add-ons/kernel/bus_managers/ata/ide_sim.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/ide_sim.c
rename to src/add-ons/kernel/bus_managers/ata/ide_sim.c
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/ide_sim.h b/src/add-ons/kernel/bus_managers/ata/ide_sim.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/ide_sim.h
rename to src/add-ons/kernel/bus_managers/ata/ide_sim.h
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/pio.c b/src/add-ons/kernel/bus_managers/ata/pio.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/pio.c
rename to src/add-ons/kernel/bus_managers/ata/pio.c
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/queuing.c b/src/add-ons/kernel/bus_managers/ata/queuing.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/queuing.c
rename to src/add-ons/kernel/bus_managers/ata/queuing.c
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/scsi2ata.c b/src/add-ons/kernel/bus_managers/ata/scsi2ata.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/scsi2ata.c
rename to src/add-ons/kernel/bus_managers/ata/scsi2ata.c
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/sync.c b/src/add-ons/kernel/bus_managers/ata/sync.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/sync.c
rename to src/add-ons/kernel/bus_managers/ata/sync.c
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/virtual_memory.c b/src/add-ons/kernel/bus_managers/ata/virtual_memory.c
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/virtual_memory.c
rename to src/add-ons/kernel/bus_managers/ata/virtual_memory.c
diff --git a/src/add-ons/kernel/bus_managers/ata/ide/wrapper.h b/src/add-ons/kernel/bus_managers/ata/wrapper.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/ata/ide/wrapper.h
rename to src/add-ons/kernel/bus_managers/ata/wrapper.h