diff --git a/src/cli/commands/day005.rs b/src/cli/commands/day005.rs
index 99e11ae..07647df 100644
--- a/src/cli/commands/day005.rs
+++ b/src/cli/commands/day005.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day005(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day006.rs b/src/cli/commands/day006.rs
index 18923be..2a82c3d 100644
--- a/src/cli/commands/day006.rs
+++ b/src/cli/commands/day006.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day006(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day007.rs b/src/cli/commands/day007.rs
index 21a9f06..7523079 100644
--- a/src/cli/commands/day007.rs
+++ b/src/cli/commands/day007.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day007(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day008.rs b/src/cli/commands/day008.rs
index cffcef2..690f129 100644
--- a/src/cli/commands/day008.rs
+++ b/src/cli/commands/day008.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day008(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day009.rs b/src/cli/commands/day009.rs
index 71b54e1..d892f90 100644
--- a/src/cli/commands/day009.rs
+++ b/src/cli/commands/day009.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day009(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day010.rs b/src/cli/commands/day010.rs
index 00c7d54..9de6222 100644
--- a/src/cli/commands/day010.rs
+++ b/src/cli/commands/day010.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day010(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day011.rs b/src/cli/commands/day011.rs
index 92b7741..c4d87ce 100644
--- a/src/cli/commands/day011.rs
+++ b/src/cli/commands/day011.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day011(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day012.rs b/src/cli/commands/day012.rs
index 6a88711..b0881d1 100644
--- a/src/cli/commands/day012.rs
+++ b/src/cli/commands/day012.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day012(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day013.rs b/src/cli/commands/day013.rs
index 62ca037..5d6928e 100644
--- a/src/cli/commands/day013.rs
+++ b/src/cli/commands/day013.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day013(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day014.rs b/src/cli/commands/day014.rs
index fa807d2..91537f6 100644
--- a/src/cli/commands/day014.rs
+++ b/src/cli/commands/day014.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day014(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day015.rs b/src/cli/commands/day015.rs
index 7032f2b..a5f85aa 100644
--- a/src/cli/commands/day015.rs
+++ b/src/cli/commands/day015.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day015(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day016.rs b/src/cli/commands/day016.rs
index 4384145..a81868d 100644
--- a/src/cli/commands/day016.rs
+++ b/src/cli/commands/day016.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day016(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day017.rs b/src/cli/commands/day017.rs
index e1ebc60..5324bd9 100644
--- a/src/cli/commands/day017.rs
+++ b/src/cli/commands/day017.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day017(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day018.rs b/src/cli/commands/day018.rs
index d4bce8d..c0a4792 100644
--- a/src/cli/commands/day018.rs
+++ b/src/cli/commands/day018.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day018(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day019.rs b/src/cli/commands/day019.rs
index 599aa5c..7384c26 100644
--- a/src/cli/commands/day019.rs
+++ b/src/cli/commands/day019.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day019(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day020.rs b/src/cli/commands/day020.rs
index e946dd1..a8d2e8c 100644
--- a/src/cli/commands/day020.rs
+++ b/src/cli/commands/day020.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day020(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day021.rs b/src/cli/commands/day021.rs
index 9083a33..a5db81a 100644
--- a/src/cli/commands/day021.rs
+++ b/src/cli/commands/day021.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day021(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day022.rs b/src/cli/commands/day022.rs
index 8dcd9d5..b8380f9 100644
--- a/src/cli/commands/day022.rs
+++ b/src/cli/commands/day022.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day022(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day023.rs b/src/cli/commands/day023.rs
index 7274cd7..e02ddb7 100644
--- a/src/cli/commands/day023.rs
+++ b/src/cli/commands/day023.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day023(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day024.rs b/src/cli/commands/day024.rs
index 4be87f6..4df9e7a 100644
--- a/src/cli/commands/day024.rs
+++ b/src/cli/commands/day024.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day024(file: &Option<PathBuf>, alt: &bool) {
diff --git a/src/cli/commands/day025.rs b/src/cli/commands/day025.rs
index e543a08..709bb8f 100644
--- a/src/cli/commands/day025.rs
+++ b/src/cli/commands/day025.rs
@@ -1,4 +1,6 @@
-use crate::cli::PathBuf;
+use std::path::PathBuf;
+use std::fs::File;
+use std::io::{BufReader,Lines};
 use crate::util::read_lines;
 
 pub fn subcmd_day025(file: &Option<PathBuf>, alt: &bool) {