Add binary
CLI class
Refactoring and cleanup