diff --git a/src/interrupts.rs b/src/interrupts.rs
index 35ab3d66..089d0884 100644
--- a/src/interrupts.rs
+++ b/src/interrupts.rs
@@ -77,7 +77,7 @@ extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: &mut InterruptSt
         PICS.lock()
             .notify_end_of_interrupt(InterruptIndex::Timer.as_u8());
     }
-    crate::multitasking::scheduler();
+    crate::threads::scheduler();
 }
 
 extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: &mut InterruptStackFrame) {
diff --git a/src/lib.rs b/src/lib.rs
index 8670e75e..ca194021 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -22,8 +22,8 @@ pub mod allocator;
 pub mod gdt;
 pub mod interrupts;
 pub mod memory;
-pub mod multitasking;
 pub mod serial;
+pub mod threads;
 pub mod vga_buffer;
 
 pub fn init() {
diff --git a/src/main.rs b/src/main.rs
index 5da8d70f..999bb2cf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -54,7 +54,7 @@ fn kernel_main(boot_info: &'static BootInfo) -> ! {
     #[cfg(test)]
     test_main();
 
-    use blog_os::multitasking::{create_thread, create_thread_from_closure};
+    use blog_os::threads::{create_thread, create_thread_from_closure};
 
     create_thread(thread_1, 1, &mut mapper, &mut frame_allocator);
     create_thread(thread_2, 1, &mut mapper, &mut frame_allocator);
diff --git a/src/multitasking.rs b/src/threads.rs
similarity index 93%
rename from src/multitasking.rs
rename to src/threads.rs
index 9be2a0bd..97b17bbb 100644
--- a/src/multitasking.rs
+++ b/src/threads.rs
@@ -17,7 +17,9 @@ pub unsafe fn context_switch(stack_pointer: VirtAddr) {
 
 pub fn scheduler() {
     let next = PAUSED_THREADS.try_lock().and_then(|mut paused_threads| {
-        paused_threads.as_mut().and_then(|threads| threads.pop_front())
+        paused_threads
+            .as_mut()
+            .and_then(|threads| threads.pop_front())
     });
     if let Some(next) = next {
         unsafe { context_switch(next) };
@@ -32,7 +34,10 @@ fn add_paused_thread(stack_pointer: VirtAddr) {
 }
 
 fn add_thread(stack_pointer: VirtAddr) {
-    PAUSED_THREADS.lock().get_or_insert_with(VecDeque::new).push_back(stack_pointer);
+    PAUSED_THREADS
+        .lock()
+        .get_or_insert_with(VecDeque::new)
+        .push_back(stack_pointer);
 }
 
 pub fn create_thread(