Restructured code, added new map data