Splitting out Thor into its own CLI class