New license model and some bug fixes. Also moved MapBuilder from core