Updating CLI.
Renaming file
Removing unused imports