Move things around, improve es-index function, load up default-mappings.json.