Reorganized all models, and controllers to be more consistent with their method names. Various other work.