Changes on SiteMap2Class

this is done, started to work on other part.