diff --git a/src/drivers/AHCI.pas b/src/driver/AHCI.pas
similarity index 100%
rename from src/drivers/AHCI.pas
rename to src/driver/AHCI.pas
diff --git a/src/drivers/PCI.pas b/src/driver/PCI.pas
similarity index 100%
rename from src/drivers/PCI.pas
rename to src/driver/PCI.pas
diff --git a/src/drivers/keyboard.pas b/src/driver/keyboard.pas
similarity index 100%
rename from src/drivers/keyboard.pas
rename to src/driver/keyboard.pas
diff --git a/src/drivers/isr0.pas b/src/isr/isr0.pas
similarity index 100%
rename from src/drivers/isr0.pas
rename to src/isr/isr0.pas
diff --git a/src/drivers/isr1.pas b/src/isr/isr1.pas
similarity index 100%
rename from src/drivers/isr1.pas
rename to src/isr/isr1.pas
diff --git a/src/drivers/isr10.pas b/src/isr/isr10.pas
similarity index 100%
rename from src/drivers/isr10.pas
rename to src/isr/isr10.pas
diff --git a/src/drivers/isr11.pas b/src/isr/isr11.pas
similarity index 100%
rename from src/drivers/isr11.pas
rename to src/isr/isr11.pas
diff --git a/src/drivers/isr12.pas b/src/isr/isr12.pas
similarity index 100%
rename from src/drivers/isr12.pas
rename to src/isr/isr12.pas
diff --git a/src/drivers/isr13.pas b/src/isr/isr13.pas
similarity index 100%
rename from src/drivers/isr13.pas
rename to src/isr/isr13.pas
diff --git a/src/drivers/isr14.pas b/src/isr/isr14.pas
similarity index 100%
rename from src/drivers/isr14.pas
rename to src/isr/isr14.pas
diff --git a/src/drivers/isr15.pas b/src/isr/isr15.pas
similarity index 100%
rename from src/drivers/isr15.pas
rename to src/isr/isr15.pas
diff --git a/src/drivers/isr16.pas b/src/isr/isr16.pas
similarity index 100%
rename from src/drivers/isr16.pas
rename to src/isr/isr16.pas
diff --git a/src/drivers/isr17.pas b/src/isr/isr17.pas
similarity index 100%
rename from src/drivers/isr17.pas
rename to src/isr/isr17.pas
diff --git a/src/drivers/isr18.pas b/src/isr/isr18.pas
similarity index 100%
rename from src/drivers/isr18.pas
rename to src/isr/isr18.pas
diff --git a/src/drivers/isr2.pas b/src/isr/isr2.pas
similarity index 100%
rename from src/drivers/isr2.pas
rename to src/isr/isr2.pas
diff --git a/src/drivers/isr3.pas b/src/isr/isr3.pas
similarity index 100%
rename from src/drivers/isr3.pas
rename to src/isr/isr3.pas
diff --git a/src/drivers/isr32.pas b/src/isr/isr32.pas
similarity index 100%
rename from src/drivers/isr32.pas
rename to src/isr/isr32.pas
diff --git a/src/drivers/isr33.pas b/src/isr/isr33.pas
similarity index 100%
rename from src/drivers/isr33.pas
rename to src/isr/isr33.pas
diff --git a/src/drivers/isr4.pas b/src/isr/isr4.pas
similarity index 100%
rename from src/drivers/isr4.pas
rename to src/isr/isr4.pas
diff --git a/src/drivers/isr40.pas b/src/isr/isr40.pas
similarity index 100%
rename from src/drivers/isr40.pas
rename to src/isr/isr40.pas
diff --git a/src/drivers/isr46.pas b/src/isr/isr46.pas
similarity index 100%
rename from src/drivers/isr46.pas
rename to src/isr/isr46.pas
diff --git a/src/drivers/isr5.pas b/src/isr/isr5.pas
similarity index 100%
rename from src/drivers/isr5.pas
rename to src/isr/isr5.pas
diff --git a/src/drivers/isr6.pas b/src/isr/isr6.pas
similarity index 100%
rename from src/drivers/isr6.pas
rename to src/isr/isr6.pas
diff --git a/src/drivers/isr7.pas b/src/isr/isr7.pas
similarity index 100%
rename from src/drivers/isr7.pas
rename to src/isr/isr7.pas
diff --git a/src/drivers/isr8.pas b/src/isr/isr8.pas
similarity index 100%
rename from src/drivers/isr8.pas
rename to src/isr/isr8.pas
diff --git a/src/drivers/isr9.pas b/src/isr/isr9.pas
similarity index 100%
rename from src/drivers/isr9.pas
rename to src/isr/isr9.pas
diff --git a/src/drivers/isr_types.pas b/src/isr/isr_types.pas
similarity index 100%
rename from src/drivers/isr_types.pas
rename to src/isr/isr_types.pas