Adapted for my home laptop.
Renaming files for consistency
Finished reviewing the solution.