Maps cleanup

everything under /maps