Move methods from CLI into Resources and remove CLI