Moving the map related libs too