Moved map related classes to Map directory