front: Consolidated map classes and simplified a bit.