Made map data more structured
Got normals working.