Further simplifying CDM; removing a bunch of "this->"

Making one add/edit/remove function each; task/folder distinction was
largely unnecessary, except for a few cases.