restructured classes
map prototype now visible