Fix the file system.
Move the CLI code to a module.
Add tests around the cli module.