refactor(use extracted modules):  use newly created modules and clean up cli code