Rename data files from dat to json
Clean up redundant code in mapper
Add code to test canvas map implementation