Finished refactoring rest of CLI
Removed unnecessary build file.