Move remaining outer packages into mapbox. Fixes #108