Did a bit of refactoring. Trying to keep most gui-related stuff on classes
under the top-level package.