More structure.

Similar tweaks to previous commit. Throwing in placeholder stuff for
Screen class, pending actual implementation.