diff --git a/src/app_state.rs b/src/app_state.rs
index 765425a9..a566e14b 100644
--- a/src/app_state.rs
+++ b/src/app_state.rs
@@ -106,8 +106,8 @@ impl AppState {
                 });
 
                 Exercise {
-                    dir: exercise_info.dir,
                     name: exercise_info.name,
+                    dir: exercise_info.dir,
                     path: exercise_info.path(),
                     canonical_path,
                     test: exercise_info.test,
@@ -592,8 +592,8 @@ mod tests {
 
     fn dummy_exercise() -> Exercise {
         Exercise {
-            dir: None,
             name: "0",
+            dir: None,
             path: String::from("exercises/0.rs"),
             canonical_path: None,
             test: false,
diff --git a/src/exercise.rs b/src/exercise.rs
index ee1f42f9..c07a94e8 100644
--- a/src/exercise.rs
+++ b/src/exercise.rs
@@ -66,8 +66,8 @@ fn run_bin(
 
 /// See `info_file::ExerciseInfo`
 pub struct Exercise {
-    pub dir: Option<&'static str>,
     pub name: &'static str,
+    pub dir: Option<&'static str>,
     /// Path of the exercise file starting with the `exercises/` directory.
     pub path: String,
     pub canonical_path: Option<String>,