Moved map markup to proper package