diff --git a/src/args.rs b/src/args.rs
new file mode 100644
index 0000000..daca627
--- /dev/null
+++ b/src/args.rs
@@ -0,0 +1,56 @@
+use std::path::PathBuf;
+use structopt::StructOpt;
+
+#[derive(StructOpt)]
+#[structopt(name = "alma", about = "Arch Linux Mobile Appliance")]
+pub struct App {
+    /// Verbose output
+    #[structopt(short = "v", long = "verbose")]
+    pub verbose: bool,
+
+    #[structopt(subcommand)]
+    pub cmd: Command,
+}
+
+#[derive(StructOpt)]
+pub enum Command {
+    #[structopt(name = "create", about = "Create a new Arch Linux USB")]
+    Create(CreateCommand),
+
+    #[structopt(name = "chroot", about = "Chroot into exiting Live USB")]
+    Chroot(ChrootCommand),
+}
+
+#[derive(StructOpt)]
+pub struct CreateCommand {
+    /// Path starting with /dev/disk/by-id for the USB drive
+    #[structopt(parse(from_os_str))]
+    pub block_device: PathBuf,
+
+    /// Additional pacakges to install
+    #[structopt(short = "p", long = "extra-packages", value_name = "package")]
+    pub extra_packages: Vec<String>,
+
+    /// Enter interactive chroot before unmounting the drive
+    #[structopt(short = "i", long = "interactive")]
+    pub interactive: bool,
+
+    /// Encrypt the root partition
+    #[structopt(short = "e", long = "encrypted-root")]
+    pub encrypted_root: bool,
+}
+
+#[derive(StructOpt)]
+pub struct ChrootCommand {
+    /// Path starting with /dev/disk/by-id for the USB drive
+    #[structopt(parse(from_os_str))]
+    pub block_device: PathBuf,
+
+    /// Open an encrypted root partition
+    #[structopt(short = "e", long = "encrypted-root")]
+    pub encrypted_root: bool,
+
+    /// Optional command to run
+    #[structopt()]
+    pub command: Vec<String>,
+}
diff --git a/src/main.rs b/src/main.rs
index 0a49460..c6de174 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,10 @@
+mod args;
 mod error;
 mod process;
 mod storage;
 mod tool;
 
+use crate::args::*;
 use crate::error::*;
 use crate::process::CommandExt;
 use crate::storage::*;
@@ -13,7 +15,7 @@ use nix::sys::signal;
 use simplelog::*;
 use std::fs;
 use std::io::Write;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::process::exit;
 use std::thread;
 use std::time::Duration;
@@ -34,60 +36,6 @@ Storage=volatile
 SystemMaxUse=16M
 ";
 
-#[derive(StructOpt)]
-#[structopt(name = "alma", about = "Arch Linux Mobile Appliance")]
-struct App {
-    /// Verbose output
-    #[structopt(short = "v", long = "verbose")]
-    verbose: bool,
-
-    #[structopt(subcommand)]
-    cmd: Command,
-}
-
-#[derive(StructOpt)]
-enum Command {
-    #[structopt(name = "create", about = "Create a new Arch Linux USB")]
-    Create(CreateCommand),
-
-    #[structopt(name = "chroot", about = "Chroot into exiting Live USB")]
-    Chroot(ChrootCommand),
-}
-
-#[derive(StructOpt)]
-struct CreateCommand {
-    /// Path starting with /dev/disk/by-id for the USB drive
-    #[structopt(parse(from_os_str))]
-    block_device: PathBuf,
-
-    /// Additional pacakges to install
-    #[structopt(short = "p", long = "extra-packages", value_name = "package")]
-    extra_packages: Vec<String>,
-
-    /// Enter interactive chroot before unmounting the drive
-    #[structopt(short = "i", long = "interactive")]
-    interactive: bool,
-
-    /// Encrypt the root partition
-    #[structopt(short = "e", long = "encrypted-root")]
-    encrypted_root: bool,
-}
-
-#[derive(StructOpt)]
-struct ChrootCommand {
-    /// Path starting with /dev/disk/by-id for the USB drive
-    #[structopt(parse(from_os_str))]
-    block_device: PathBuf,
-
-    /// Open an encrypted root partition
-    #[structopt(short = "e", long = "encrypted-root")]
-    encrypted_root: bool,
-
-    /// Optional command to run
-    #[structopt()]
-    command: Vec<String>,
-}
-
 fn mount<'a>(
     mount_path: &Path,
     boot_filesystem: &'a Filesystem,