Updated the CLI to work with the new file structure