Cleaned up organization of classes.
Incidental commit to test screen size on various laptops.