Rearrange maptiles, tilefactory et al to be in their more or less rightful places.