diff --git a/src/main.rs b/src/main.rs
index 7187c03..0fc0692 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,17 +1,19 @@
 use clap::{App, Arg, SubCommand, crate_version};
-use console::{style, Emoji};
-use indicatif::ProgressBar;
 use syntect::easy::HighlightFile;
 use syntect::parsing::SyntaxSet;
 use syntect::highlighting::{ThemeSet, Style};
 use syntect::util::{as_24_bit_terminal_escaped};
-use std::fs::remove_file;
 use std::io::BufRead;
-use std::process::Command;
 use std::sync::mpsc::channel;
 use std::time::Duration;
 use notify::DebouncedEvent;
 use notify::{RecommendedWatcher, Watcher, RecursiveMode};
+use crate::verify::verify;
+use crate::run::run;
+
+mod run;
+mod verify;
+mod util;
 
 fn main() {
     let matches = App::new("rustlings")
@@ -38,48 +40,7 @@ fn main() {
     println!("");
 
     if let Some(matches) = matches.subcommand_matches("run") {
-        if let Some(filename) = matches.value_of("file") {
-            let bar = ProgressBar::new_spinner();
-            bar.set_message(format!("Compiling {}...", filename).as_str());
-            bar.enable_steady_tick(100);
-            let compilecmd = Command::new("rustc")
-                .args(&[filename, "-o", "temp"])
-                .output()
-                .expect("fail");
-            bar.set_message(format!("Running {}...", filename).as_str());
-            if compilecmd.status.success() {
-                let runcmd = Command::new("./temp").output().expect("fail");
-                bar.finish_and_clear();
-
-                if runcmd.status.success() {
-                    println!("{}", String::from_utf8_lossy(&runcmd.stdout));
-                    let formatstr =
-                        format!("{} Successfully ran {}", Emoji("✅", "✓"), filename);
-                    println!("{}", style(formatstr).green());
-                    clean();
-                } else {
-                    println!("{}", String::from_utf8_lossy(&runcmd.stdout));
-                    println!("{}", String::from_utf8_lossy(&runcmd.stderr));
-
-                    let formatstr =
-                        format!("{} Ran {} with errors", Emoji("⚠️ ", "!"), filename);
-                    println!("{}", style(formatstr).red());
-                    clean();
-                }
-            } else {
-                bar.finish_and_clear();
-                let formatstr = format!(
-                    "{} Compilation of {} failed! Compiler error message:\n",
-                    Emoji("⚠️ ", "!"),
-                    filename
-                );
-                println!("{}", style(formatstr).red());
-                println!("{}", String::from_utf8_lossy(&compilecmd.stderr));
-                clean();
-            }
-        } else {
-            panic!("Please supply a filename!");
-        }
+        run(matches.clone());
     }
 
     if let Some(_) = matches.subcommand_matches("verify") {
@@ -128,112 +89,3 @@ fn watch() -> notify::Result<()> {
         }
     }
 }
-
-fn verify() -> Result<(), ()> {
-    compile_only("exercises/ex1.rs")?;
-    compile_only("exercises/ex2.rs")?;
-    compile_only("exercises/ex3.rs")?;
-    compile_only("exercises/ex4.rs")?;
-    compile_only("exercises/ex5.rs")?;
-    compile_only("exercises/variables/variables1.rs")?;
-    compile_only("exercises/variables/variables2.rs")?;
-    compile_only("exercises/variables/variables3.rs")?;
-    compile_only("exercises/variables/variables4.rs")?;
-    compile_only("exercises/functions/functions1.rs")?;
-    compile_only("exercises/functions/functions2.rs")?;
-    compile_only("exercises/functions/functions3.rs")?;
-    compile_only("exercises/functions/functions4.rs")?;
-    compile_only("exercises/functions/functions5.rs")?;
-    compile_only("exercises/primitive_types/primitive_types1.rs")?;
-    compile_only("exercises/primitive_types/primitive_types2.rs")?;
-    compile_only("exercises/primitive_types/primitive_types3.rs")?;
-    compile_only("exercises/primitive_types/primitive_types4.rs")?;
-    compile_only("exercises/primitive_types/primitive_types5.rs")?;
-    compile_only("exercises/primitive_types/primitive_types6.rs")?;
-    test("exercises/tests/tests1.rs")?;
-    test("exercises/tests/tests2.rs")?;
-    test("exercises/tests/tests3.rs")?;
-    test("exercises/tests/tests4.rs")?;
-    test("exercises/if/if1.rs")?;
-    compile_only("exercises/strings/strings1.rs")?;
-    compile_only("exercises/strings/strings2.rs")?;
-    compile_only("exercises/strings/strings3.rs")?;
-    compile_only("exercises/move_semantics/move_semantics1.rs")?;
-    compile_only("exercises/move_semantics/move_semantics2.rs")?;
-    compile_only("exercises/move_semantics/move_semantics3.rs")?;
-    compile_only("exercises/move_semantics/move_semantics4.rs")?;
-    compile_only("exercises/modules/modules1.rs")?;
-    compile_only("exercises/modules/modules2.rs")?;
-    compile_only("exercises/macros/macros1.rs")?;
-    compile_only("exercises/macros/macros2.rs")?;
-    compile_only("exercises/macros/macros3.rs")?;
-    compile_only("exercises/macros/macros4.rs")?;
-    test("exercises/error_handling/errors1.rs")?;
-    test("exercises/error_handling/errors2.rs")?;
-    test("exercises/error_handling/errors3.rs")?;
-    test("exercises/error_handling/errorsn.rs")?;
-    compile_only("exercises/error_handling/option1.rs")?;
-    test("exercises/error_handling/result1.rs")?;
-    Ok(())
-}
-
-fn compile_only(filename: &str) -> Result<(), ()> {
-    let bar = ProgressBar::new_spinner();
-    bar.set_message(format!("Compiling {}...", filename).as_str());
-    bar.enable_steady_tick(100);
-    let compilecmd = Command::new("rustc")
-        .args(&[filename, "-o", "temp", "--color", "always"])
-        .output()
-        .expect("fail");
-    bar.finish_and_clear();
-    if compilecmd.status.success() {
-        let formatstr = format!(
-            "{} Successfully compiled {}!",
-            Emoji("✅", "✓"),
-            filename
-        );
-        println!("{}", style(formatstr).green());
-        clean();
-        Ok(())
-    } else {
-        let formatstr = format!(
-            "{} Compilation of {} failed! Compiler error message:\n",
-            Emoji("⚠️ ", "!"),
-            filename
-        );
-        println!("{}", style(formatstr).red());
-        println!("{}", String::from_utf8_lossy(&compilecmd.stderr));
-        clean();
-        Err(())
-    }
-}
-
-fn test(filename: &str) -> Result<(), ()> {
-    let bar = ProgressBar::new_spinner();
-    bar.set_message(format!("Testing {}...", filename).as_str());
-    bar.enable_steady_tick(100);
-    let testcmd = Command::new("rustc")
-        .args(&["--test", filename, "-o", "temp"])
-        .output()
-        .expect("fail");
-    bar.finish_and_clear();
-    if testcmd.status.success() {
-        let formatstr = format!("{} Successfully tested {}!", Emoji("✅", "✓"), filename);
-        println!("{}", style(formatstr).green());
-        clean();
-        Ok(())
-    } else {
-        let formatstr = format!(
-            "{} Testing of {} failed! Please try again.",
-            Emoji("⚠️ ", "!"),
-            filename
-        );
-        println!("{}", style(formatstr).red());
-        clean();
-        Err(())
-    }
-}
-
-fn clean() {
-    let _ignored = remove_file("temp");
-}
diff --git a/src/run.rs b/src/run.rs
new file mode 100644
index 0000000..9605370
--- /dev/null
+++ b/src/run.rs
@@ -0,0 +1,49 @@
+use console::{style, Emoji};
+use indicatif::ProgressBar;
+use std::process::Command;
+use crate::util::clean;
+
+pub fn run(matches: clap::ArgMatches) {
+    if let Some(filename) = matches.value_of("file") {
+        let bar = ProgressBar::new_spinner();
+        bar.set_message(format!("Compiling {}...", filename).as_str());
+        bar.enable_steady_tick(100);
+        let compilecmd = Command::new("rustc")
+            .args(&[filename, "-o", "temp"])
+            .output()
+            .expect("fail");
+        bar.set_message(format!("Running {}...", filename).as_str());
+        if compilecmd.status.success() {
+            let runcmd = Command::new("./temp").output().expect("fail");
+            bar.finish_and_clear();
+            
+            if runcmd.status.success() {
+                println!("{}", String::from_utf8_lossy(&runcmd.stdout));
+                let formatstr =
+                    format!("{} Successfully ran {}", Emoji("✅", "✓"), filename);
+                println!("{}", style(formatstr).green());
+                clean();
+            } else {
+                println!("{}", String::from_utf8_lossy(&runcmd.stdout));
+                println!("{}", String::from_utf8_lossy(&runcmd.stderr));
+                
+                let formatstr =
+                    format!("{} Ran {} with errors", Emoji("⚠️ ", "!"), filename);
+                println!("{}", style(formatstr).red());
+                clean();
+            }
+        } else {
+            bar.finish_and_clear();
+            let formatstr = format!(
+                "{} Compilation of {} failed! Compiler error message:\n",
+                Emoji("⚠️ ", "!"),
+                filename
+            );
+            println!("{}", style(formatstr).red());
+            println!("{}", String::from_utf8_lossy(&compilecmd.stderr));
+            clean();
+        }
+    } else {
+        panic!("Please supply a filename!");
+    }
+}
diff --git a/src/util.rs b/src/util.rs
new file mode 100644
index 0000000..37a2028
--- /dev/null
+++ b/src/util.rs
@@ -0,0 +1,5 @@
+use std::fs::remove_file;
+
+pub fn clean() {
+    let _ignored = remove_file("temp");
+}
diff --git a/src/verify.rs b/src/verify.rs
new file mode 100644
index 0000000..e4a1d2a
--- /dev/null
+++ b/src/verify.rs
@@ -0,0 +1,109 @@
+use console::{style, Emoji};
+use indicatif::ProgressBar;
+use std::process::Command;
+use crate::util::clean;
+
+pub fn verify() -> Result<(), ()> {
+    compile_only("exercises/ex1.rs")?;
+    compile_only("exercises/ex2.rs")?;
+    compile_only("exercises/ex3.rs")?;
+    compile_only("exercises/ex4.rs")?;
+    compile_only("exercises/ex5.rs")?;
+    compile_only("exercises/variables/variables1.rs")?;
+    compile_only("exercises/variables/variables2.rs")?;
+    compile_only("exercises/variables/variables3.rs")?;
+    compile_only("exercises/variables/variables4.rs")?;
+    compile_only("exercises/functions/functions1.rs")?;
+    compile_only("exercises/functions/functions2.rs")?;
+    compile_only("exercises/functions/functions3.rs")?;
+    compile_only("exercises/functions/functions4.rs")?;
+    compile_only("exercises/functions/functions5.rs")?;
+    compile_only("exercises/primitive_types/primitive_types1.rs")?;
+    compile_only("exercises/primitive_types/primitive_types2.rs")?;
+    compile_only("exercises/primitive_types/primitive_types3.rs")?;
+    compile_only("exercises/primitive_types/primitive_types4.rs")?;
+    compile_only("exercises/primitive_types/primitive_types5.rs")?;
+    compile_only("exercises/primitive_types/primitive_types6.rs")?;
+    test("exercises/tests/tests1.rs")?;
+    test("exercises/tests/tests2.rs")?;
+    test("exercises/tests/tests3.rs")?;
+    test("exercises/tests/tests4.rs")?;
+    test("exercises/if/if1.rs")?;
+    compile_only("exercises/strings/strings1.rs")?;
+    compile_only("exercises/strings/strings2.rs")?;
+    compile_only("exercises/strings/strings3.rs")?;
+    compile_only("exercises/move_semantics/move_semantics1.rs")?;
+    compile_only("exercises/move_semantics/move_semantics2.rs")?;
+    compile_only("exercises/move_semantics/move_semantics3.rs")?;
+    compile_only("exercises/move_semantics/move_semantics4.rs")?;
+    compile_only("exercises/modules/modules1.rs")?;
+    compile_only("exercises/modules/modules2.rs")?;
+    compile_only("exercises/macros/macros1.rs")?;
+    compile_only("exercises/macros/macros2.rs")?;
+    compile_only("exercises/macros/macros3.rs")?;
+    compile_only("exercises/macros/macros4.rs")?;
+    test("exercises/error_handling/errors1.rs")?;
+    test("exercises/error_handling/errors2.rs")?;
+    test("exercises/error_handling/errors3.rs")?;
+    test("exercises/error_handling/errorsn.rs")?;
+    compile_only("exercises/error_handling/option1.rs")?;
+    test("exercises/error_handling/result1.rs")?;
+    Ok(())
+}
+
+fn compile_only(filename: &str) -> Result<(), ()> {
+    let bar = ProgressBar::new_spinner();
+    bar.set_message(format!("Compiling {}...", filename).as_str());
+    bar.enable_steady_tick(100);
+    let compilecmd = Command::new("rustc")
+        .args(&[filename, "-o", "temp", "--color", "always"])
+        .output()
+        .expect("fail");
+    bar.finish_and_clear();
+    if compilecmd.status.success() {
+        let formatstr = format!(
+            "{} Successfully compiled {}!",
+            Emoji("✅", "✓"),
+            filename
+        );
+        println!("{}", style(formatstr).green());
+        clean();
+        Ok(())
+    } else {
+        let formatstr = format!(
+            "{} Compilation of {} failed! Compiler error message:\n",
+            Emoji("⚠️ ", "!"),
+            filename
+        );
+        println!("{}", style(formatstr).red());
+        println!("{}", String::from_utf8_lossy(&compilecmd.stderr));
+        clean();
+        Err(())
+    }
+}
+
+fn test(filename: &str) -> Result<(), ()> {
+    let bar = ProgressBar::new_spinner();
+    bar.set_message(format!("Testing {}...", filename).as_str());
+    bar.enable_steady_tick(100);
+    let testcmd = Command::new("rustc")
+        .args(&["--test", filename, "-o", "temp"])
+        .output()
+        .expect("fail");
+    bar.finish_and_clear();
+    if testcmd.status.success() {
+        let formatstr = format!("{} Successfully tested {}!", Emoji("✅", "✓"), filename);
+        println!("{}", style(formatstr).green());
+        clean();
+        Ok(())
+    } else {
+        let formatstr = format!(
+            "{} Testing of {} failed! Please try again.",
+            Emoji("⚠️ ", "!"),
+            filename
+        );
+        println!("{}", style(formatstr).red());
+        clean();
+        Err(())
+    }
+}