Created new map class in separate file and general main class