Refactored box and cli commands to CFC convention