map stuff moved to map dir