Move cli bits into different modules, use autoload to load