Restructured Map System and Began Work on Map Parser