#102 start refactoring of CLI