moved map classes