Move everything under a parent CLI class