Added Map and Tileset classes. Some minor changes