Cleanup, refactor new folder creation/editing.

Necessary for supporting multiple non-email collection folders in
the same class. Add notes/todos for where this needs to be cleaned up
further in H6.