Moved map code into the map screen class, also started tidying up some
naming convention things.