Move cli code