Split cmd and reports into own pkgs