Renamed files to look more pretty
Moved Map things around so that they will be easier to add to / maintain