"De-I/O'd" the Control classes as part of fixing up the ModelView model.
Also refactored some packages that I had neglected to name fully.