diff --git a/es/account/mapping.json b/es/account/mapping.json
new file mode 100644
index 000000000..5ddf17753
--- /dev/null
+++ b/es/account/mapping.json
@@ -0,0 +1,52 @@
+{
+    "dynamic": false,
+    "properties": {
+        "access_token": {
+            "dynamic": true,
+            "properties": {
+                "client": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "token": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                }
+            }
+        },
+        "code": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "id": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "identity": {
+            "dynamic": false,
+            "properties": {
+                "key": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "name": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                }
+            }
+        },
+        "looks_human": {
+            "type": "boolean"
+        },
+        "passed_captcha": {
+            "format": "strict_date_optional_time||epoch_millis",
+            "type": "date"
+        }
+    }
+}
diff --git a/es/account/settings.json b/es/account/settings.json
new file mode 100644
index 000000000..c90ef6cba
--- /dev/null
+++ b/es/account/settings.json
@@ -0,0 +1,8 @@
+{
+    "mapper": {
+        "dynamic": "false"
+    },
+    "number_of_replicas": 1,
+    "number_of_shards": 1,
+    "refresh_interval": "1s"
+}
diff --git a/es/author/mapping.json b/es/author/mapping.json
new file mode 100644
index 000000000..ad9278a7f
--- /dev/null
+++ b/es/author/mapping.json
@@ -0,0 +1,157 @@
+{
+    "dynamic": false,
+    "properties": {
+        "asciiname": {
+            "fields": {
+                "analyzed": {
+                    "analyzer": "standard",
+                    "fielddata": {
+                        "format": "disabled"
+                    },
+                    "store": true,
+                    "type": "string"
+                }
+            },
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "blog": {
+            "dynamic": true,
+            "properties": {
+                "feed": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "url": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                }
+            }
+        },
+        "city": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "country": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "donation": {
+            "dynamic": true,
+            "properties": {
+                "id": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "name": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                }
+            }
+        },
+        "email": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "gravatar_url": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "is_pause_custodial_account": {
+            "type": "boolean"
+        },
+        "location": {
+            "type": "geo_point"
+        },
+        "name": {
+            "fields": {
+                "analyzed": {
+                    "analyzer": "standard",
+                    "fielddata": {
+                        "format": "disabled"
+                    },
+                    "store": true,
+                    "type": "string"
+                }
+            },
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "pauseid": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "perlmongers": {
+            "dynamic": true,
+            "properties": {
+                "name": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "url": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                }
+            }
+        },
+        "profile": {
+            "dynamic": false,
+            "include_in_root": true,
+            "properties": {
+                "id": {
+                    "fields": {
+                        "analyzed": {
+                            "analyzer": "simple",
+                            "fielddata": {
+                                "format": "disabled"
+                            },
+                            "store": true,
+                            "type": "string"
+                        }
+                    },
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "name": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                }
+            },
+            "type": "nested"
+        },
+        "region": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "updated": {
+            "format": "strict_date_optional_time||epoch_millis",
+            "type": "date"
+        },
+        "user": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "website": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        }
+    }
+}
diff --git a/es/author/settings.json b/es/author/settings.json
new file mode 100644
index 000000000..c90ef6cba
--- /dev/null
+++ b/es/author/settings.json
@@ -0,0 +1,8 @@
+{
+    "mapper": {
+        "dynamic": "false"
+    },
+    "number_of_replicas": 1,
+    "number_of_shards": 1,
+    "refresh_interval": "1s"
+}
diff --git a/es/contributor/mapping.json b/es/contributor/mapping.json
new file mode 100644
index 000000000..605c8f923
--- /dev/null
+++ b/es/contributor/mapping.json
@@ -0,0 +1,25 @@
+{
+    "dynamic": false,
+    "properties": {
+        "distribution": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "pauseid": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "release_author": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "release_name": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        }
+    }
+}
diff --git a/es/contributor/settings.json b/es/contributor/settings.json
new file mode 100644
index 000000000..c90ef6cba
--- /dev/null
+++ b/es/contributor/settings.json
@@ -0,0 +1,8 @@
+{
+    "mapper": {
+        "dynamic": "false"
+    },
+    "number_of_replicas": 1,
+    "number_of_shards": 1,
+    "refresh_interval": "1s"
+}
diff --git a/es/cover/mapping.json b/es/cover/mapping.json
new file mode 100644
index 000000000..e0a6a6114
--- /dev/null
+++ b/es/cover/mapping.json
@@ -0,0 +1,40 @@
+{
+    "dynamic": false,
+    "properties": {
+        "criteria": {
+            "dynamic": true,
+            "properties": {
+                "branch": {
+                    "type": "float"
+                },
+                "condition": {
+                    "type": "float"
+                },
+                "statement": {
+                    "type": "float"
+                },
+                "subroutine": {
+                    "type": "float"
+                },
+                "total": {
+                    "type": "float"
+                }
+            }
+        },
+        "distribution": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "release": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "version": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        }
+    }
+}
diff --git a/es/cover/settings.json b/es/cover/settings.json
new file mode 100644
index 000000000..c90ef6cba
--- /dev/null
+++ b/es/cover/settings.json
@@ -0,0 +1,8 @@
+{
+    "mapper": {
+        "dynamic": "false"
+    },
+    "number_of_replicas": 1,
+    "number_of_shards": 1,
+    "refresh_interval": "1s"
+}
diff --git a/es/cve/mapping.json b/es/cve/mapping.json
new file mode 100644
index 000000000..4f3492037
--- /dev/null
+++ b/es/cve/mapping.json
@@ -0,0 +1,41 @@
+{
+    "dynamic": false,
+    "properties": {
+        "affected_versions": {
+            "type": "string"
+        },
+        "cpansa_id": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "cves": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "distribution": {
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "references": {
+            "type": "string"
+        },
+        "releases": {
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "reported": {
+            "format": "strict_date_optional_time||epoch_millis",
+            "type": "date"
+        },
+        "severity": {
+            "type": "string"
+        },
+        "versions": {
+            "index": "not_analyzed",
+            "type": "string"
+        }
+    }
+}
diff --git a/es/cve/settings.json b/es/cve/settings.json
new file mode 100644
index 000000000..c90ef6cba
--- /dev/null
+++ b/es/cve/settings.json
@@ -0,0 +1,8 @@
+{
+    "mapper": {
+        "dynamic": "false"
+    },
+    "number_of_replicas": 1,
+    "number_of_shards": 1,
+    "refresh_interval": "1s"
+}
diff --git a/es/distribution/mapping.json b/es/distribution/mapping.json
new file mode 100644
index 000000000..333927a24
--- /dev/null
+++ b/es/distribution/mapping.json
@@ -0,0 +1,121 @@
+{
+    "dynamic": false,
+    "properties": {
+        "bugs": {
+            "dynamic": true,
+            "properties": {
+                "github": {
+                    "dynamic": true,
+                    "properties": {
+                        "active": {
+                            "type": "integer"
+                        },
+                        "closed": {
+                            "type": "integer"
+                        },
+                        "open": {
+                            "type": "integer"
+                        },
+                        "source": {
+                            "ignore_above": 2048,
+                            "index": "not_analyzed",
+                            "type": "string"
+                        }
+                    }
+                },
+                "rt": {
+                    "dynamic": true,
+                    "properties": {
+                        "active": {
+                            "type": "integer"
+                        },
+                        "closed": {
+                            "type": "integer"
+                        },
+                        "new": {
+                            "type": "integer"
+                        },
+                        "open": {
+                            "type": "integer"
+                        },
+                        "patched": {
+                            "type": "integer"
+                        },
+                        "rejected": {
+                            "type": "integer"
+                        },
+                        "resolved": {
+                            "type": "integer"
+                        },
+                        "source": {
+                            "ignore_above": 2048,
+                            "index": "not_analyzed",
+                            "type": "string"
+                        },
+                        "stalled": {
+                            "type": "integer"
+                        }
+                    }
+                }
+            }
+        },
+        "external_package": {
+            "dynamic": true,
+            "properties": {
+                "cygwin": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "debian": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "fedora": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                }
+            }
+        },
+        "name": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "repo": {
+            "dynamic": true,
+            "properties": {
+                "github": {
+                    "dynamic": true,
+                    "properties": {
+                        "stars": {
+                            "type": "integer"
+                        },
+                        "watchers": {
+                            "type": "integer"
+                        }
+                    }
+                }
+            }
+        },
+        "river": {
+            "dynamic": true,
+            "properties": {
+                "bucket": {
+                    "type": "integer"
+                },
+                "bus_factor": {
+                    "type": "integer"
+                },
+                "immediate": {
+                    "type": "integer"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            }
+        }
+    }
+}
diff --git a/es/distribution/settings.json b/es/distribution/settings.json
new file mode 100644
index 000000000..c90ef6cba
--- /dev/null
+++ b/es/distribution/settings.json
@@ -0,0 +1,8 @@
+{
+    "mapper": {
+        "dynamic": "false"
+    },
+    "number_of_replicas": 1,
+    "number_of_shards": 1,
+    "refresh_interval": "1s"
+}
diff --git a/es/favorite/mapping.json b/es/favorite/mapping.json
new file mode 100644
index 000000000..aeff5b2cb
--- /dev/null
+++ b/es/favorite/mapping.json
@@ -0,0 +1,34 @@
+{
+    "dynamic": false,
+    "properties": {
+        "author": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "date": {
+            "format": "strict_date_optional_time||epoch_millis",
+            "type": "date"
+        },
+        "distribution": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "id": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "release": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "user": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        }
+    }
+}
diff --git a/es/favorite/settings.json b/es/favorite/settings.json
new file mode 100644
index 000000000..c90ef6cba
--- /dev/null
+++ b/es/favorite/settings.json
@@ -0,0 +1,8 @@
+{
+    "mapper": {
+        "dynamic": "false"
+    },
+    "number_of_replicas": 1,
+    "number_of_shards": 1,
+    "refresh_interval": "1s"
+}
diff --git a/es/file/mapping.json b/es/file/mapping.json
new file mode 100644
index 000000000..5374d9f41
--- /dev/null
+++ b/es/file/mapping.json
@@ -0,0 +1,293 @@
+{
+    "dynamic": false,
+    "properties": {
+        "abstract": {
+            "fields": {
+                "analyzed": {
+                    "analyzer": "standard",
+                    "fielddata": {
+                        "format": "disabled"
+                    },
+                    "store": true,
+                    "type": "string"
+                }
+            },
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "author": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "authorized": {
+            "type": "boolean"
+        },
+        "binary": {
+            "type": "boolean"
+        },
+        "date": {
+            "format": "strict_date_optional_time||epoch_millis",
+            "type": "date"
+        },
+        "deprecated": {
+            "type": "boolean"
+        },
+        "description": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "dir": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "directory": {
+            "type": "boolean"
+        },
+        "dist_fav_count": {
+            "type": "integer"
+        },
+        "distribution": {
+            "fields": {
+                "analyzed": {
+                    "analyzer": "standard",
+                    "fielddata": {
+                        "format": "disabled"
+                    },
+                    "store": true,
+                    "type": "string"
+                },
+                "camelcase": {
+                    "analyzer": "camelcase",
+                    "store": true,
+                    "type": "string"
+                },
+                "lowercase": {
+                    "analyzer": "lowercase",
+                    "store": true,
+                    "type": "string"
+                }
+            },
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "documentation": {
+            "fields": {
+                "analyzed": {
+                    "analyzer": "standard",
+                    "fielddata": {
+                        "format": "disabled"
+                    },
+                    "store": true,
+                    "type": "string"
+                },
+                "camelcase": {
+                    "analyzer": "camelcase",
+                    "store": true,
+                    "type": "string"
+                },
+                "edge": {
+                    "analyzer": "edge",
+                    "store": true,
+                    "type": "string"
+                },
+                "edge_camelcase": {
+                    "analyzer": "edge_camelcase",
+                    "store": true,
+                    "type": "string"
+                },
+                "lowercase": {
+                    "analyzer": "lowercase",
+                    "store": true,
+                    "type": "string"
+                }
+            },
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "documentation_length": {
+            "type": "integer"
+        },
+        "download_url": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "id": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "indexed": {
+            "type": "boolean"
+        },
+        "level": {
+            "type": "integer"
+        },
+        "maturity": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "mime": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "module": {
+            "dynamic": false,
+            "include_in_root": true,
+            "properties": {
+                "associated_pod": {
+                    "type": "string"
+                },
+                "authorized": {
+                    "type": "boolean"
+                },
+                "indexed": {
+                    "type": "boolean"
+                },
+                "name": {
+                    "fields": {
+                        "analyzed": {
+                            "analyzer": "standard",
+                            "fielddata": {
+                                "format": "disabled"
+                            },
+                            "store": true,
+                            "type": "string"
+                        },
+                        "camelcase": {
+                            "analyzer": "camelcase",
+                            "store": true,
+                            "type": "string"
+                        },
+                        "lowercase": {
+                            "analyzer": "lowercase",
+                            "store": true,
+                            "type": "string"
+                        }
+                    },
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "version": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "version_numified": {
+                    "type": "float"
+                }
+            },
+            "type": "nested"
+        },
+        "name": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "path": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "pod": {
+            "analyzer": "standard",
+            "doc_values": false,
+            "fields": {
+                "analyzed": {
+                    "analyzer": "standard",
+                    "doc_values": false,
+                    "index": "analyzed",
+                    "type": "string"
+                }
+            },
+            "index": "analyzed",
+            "type": "string"
+        },
+        "pod_lines": {
+            "doc_values": true,
+            "ignore_above": 2048,
+            "index": "no",
+            "type": "string"
+        },
+        "release": {
+            "fields": {
+                "analyzed": {
+                    "analyzer": "standard",
+                    "fielddata": {
+                        "format": "disabled"
+                    },
+                    "store": true,
+                    "type": "string"
+                },
+                "camelcase": {
+                    "analyzer": "camelcase",
+                    "store": true,
+                    "type": "string"
+                },
+                "lowercase": {
+                    "analyzer": "lowercase",
+                    "store": true,
+                    "type": "string"
+                }
+            },
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "sloc": {
+            "type": "integer"
+        },
+        "slop": {
+            "type": "integer"
+        },
+        "stat": {
+            "dynamic": true,
+            "properties": {
+                "gid": {
+                    "type": "long"
+                },
+                "mode": {
+                    "type": "integer"
+                },
+                "mtime": {
+                    "type": "integer"
+                },
+                "size": {
+                    "type": "integer"
+                },
+                "uid": {
+                    "type": "long"
+                }
+            }
+        },
+        "status": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "suggest": {
+            "analyzer": "simple",
+            "max_input_length": 50,
+            "preserve_position_increments": true,
+            "preserve_separators": true,
+            "type": "completion"
+        },
+        "version": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "version_numified": {
+            "type": "float"
+        }
+    }
+}
diff --git a/es/file/settings.json b/es/file/settings.json
new file mode 100644
index 000000000..1d4845446
--- /dev/null
+++ b/es/file/settings.json
@@ -0,0 +1,56 @@
+{
+    "analysis": {
+        "analyzer": {
+            "camelcase": {
+                "filter": [
+                    "lowercase",
+                    "unique"
+                ],
+                "tokenizer": "camelcase",
+                "type": "custom"
+            },
+            "edge": {
+                "filter": [
+                    "lowercase",
+                    "edge"
+                ],
+                "tokenizer": "standard",
+                "type": "custom"
+            },
+            "edge_camelcase": {
+                "filter": [
+                    "lowercase",
+                    "edge"
+                ],
+                "tokenizer": "camelcase",
+                "type": "custom"
+            },
+            "fulltext": {
+                "type": "english"
+            },
+            "lowercase": {
+                "filter": "lowercase",
+                "tokenizer": "keyword"
+            }
+        },
+        "filter": {
+            "edge": {
+                "max_gram": "20",
+                "min_gram": "1",
+                "type": "edge_ngram"
+            }
+        },
+        "tokenizer": {
+            "camelcase": {
+                "pattern": "([^\\p{L}\\d]+)|(?<=\\D)(?=\\d)|(?<=\\d)(?=\\D)|(?<=[\\p{L}&&[^\\p{Lu}]])(?=\\p{Lu})|(?<=\\p{Lu})(?=\\p{Lu}[\\p{L}&&[^\\p{Lu}]])",
+                "type": "pattern"
+            }
+        }
+    },
+    "mapper": {
+        "dynamic": "false"
+    },
+    "number_of_replicas": 1,
+    "number_of_shards": 1,
+    "refresh_interval": "1s"
+}
diff --git a/es/identity/mapping.json b/es/identity/mapping.json
new file mode 100644
index 000000000..340886289
--- /dev/null
+++ b/es/identity/mapping.json
@@ -0,0 +1,15 @@
+{
+    "dynamic": false,
+    "properties": {
+        "key": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "name": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        }
+    }
+}
diff --git a/es/identity/settings.json b/es/identity/settings.json
new file mode 100644
index 000000000..c90ef6cba
--- /dev/null
+++ b/es/identity/settings.json
@@ -0,0 +1,8 @@
+{
+    "mapper": {
+        "dynamic": "false"
+    },
+    "number_of_replicas": 1,
+    "number_of_shards": 1,
+    "refresh_interval": "1s"
+}
diff --git a/es/mirror/mapping.json b/es/mirror/mapping.json
new file mode 100644
index 000000000..09f2d85e1
--- /dev/null
+++ b/es/mirror/mapping.json
@@ -0,0 +1,166 @@
+{
+    "dynamic": false,
+    "properties": {
+        "A_or_CNAME": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "aka_name": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "ccode": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "city": {
+            "fields": {
+                "analyzed": {
+                    "analyzer": "standard",
+                    "fielddata": {
+                        "format": "disabled"
+                    },
+                    "store": true,
+                    "type": "string"
+                }
+            },
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "contact": {
+            "dynamic": false,
+            "properties": {
+                "contact_site": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "contact_user": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                }
+            }
+        },
+        "continent": {
+            "fields": {
+                "analyzed": {
+                    "analyzer": "standard",
+                    "fielddata": {
+                        "format": "disabled"
+                    },
+                    "store": true,
+                    "type": "string"
+                }
+            },
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "country": {
+            "fields": {
+                "analyzed": {
+                    "analyzer": "standard",
+                    "fielddata": {
+                        "format": "disabled"
+                    },
+                    "store": true,
+                    "type": "string"
+                }
+            },
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "dnsrr": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "freq": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "ftp": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "http": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "inceptdate": {
+            "format": "strict_date_optional_time||epoch_millis",
+            "type": "date"
+        },
+        "location": {
+            "type": "geo_point"
+        },
+        "name": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "note": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "org": {
+            "fields": {
+                "analyzed": {
+                    "analyzer": "standard",
+                    "fielddata": {
+                        "format": "disabled"
+                    },
+                    "store": true,
+                    "type": "string"
+                }
+            },
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "region": {
+            "fields": {
+                "analyzed": {
+                    "analyzer": "standard",
+                    "fielddata": {
+                        "format": "disabled"
+                    },
+                    "store": true,
+                    "type": "string"
+                }
+            },
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "reitredate": {
+            "format": "strict_date_optional_time||epoch_millis",
+            "type": "date"
+        },
+        "rsync": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "src": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "tz": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        }
+    }
+}
diff --git a/es/mirror/settings.json b/es/mirror/settings.json
new file mode 100644
index 000000000..c90ef6cba
--- /dev/null
+++ b/es/mirror/settings.json
@@ -0,0 +1,8 @@
+{
+    "mapper": {
+        "dynamic": "false"
+    },
+    "number_of_replicas": 1,
+    "number_of_shards": 1,
+    "refresh_interval": "1s"
+}
diff --git a/es/package/mapping.json b/es/package/mapping.json
new file mode 100644
index 000000000..82dacee1e
--- /dev/null
+++ b/es/package/mapping.json
@@ -0,0 +1,35 @@
+{
+    "dynamic": false,
+    "properties": {
+        "author": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "dist_version": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "distribution": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "file": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "module_name": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "version": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        }
+    }
+}
diff --git a/es/package/settings.json b/es/package/settings.json
new file mode 100644
index 000000000..c90ef6cba
--- /dev/null
+++ b/es/package/settings.json
@@ -0,0 +1,8 @@
+{
+    "mapper": {
+        "dynamic": "false"
+    },
+    "number_of_replicas": 1,
+    "number_of_shards": 1,
+    "refresh_interval": "1s"
+}
diff --git a/es/permission/mapping.json b/es/permission/mapping.json
new file mode 100644
index 000000000..688f56bcd
--- /dev/null
+++ b/es/permission/mapping.json
@@ -0,0 +1,20 @@
+{
+    "dynamic": false,
+    "properties": {
+        "co_maintainers": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "module_name": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "owner": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        }
+    }
+}
diff --git a/es/permission/settings.json b/es/permission/settings.json
new file mode 100644
index 000000000..c90ef6cba
--- /dev/null
+++ b/es/permission/settings.json
@@ -0,0 +1,8 @@
+{
+    "mapper": {
+        "dynamic": "false"
+    },
+    "number_of_replicas": 1,
+    "number_of_shards": 1,
+    "refresh_interval": "1s"
+}
diff --git a/es/release/mapping.json b/es/release/mapping.json
new file mode 100644
index 000000000..fb75ac875
--- /dev/null
+++ b/es/release/mapping.json
@@ -0,0 +1,271 @@
+{
+    "dynamic": false,
+    "properties": {
+        "abstract": {
+            "fields": {
+                "analyzed": {
+                    "analyzer": "standard",
+                    "fielddata": {
+                        "format": "disabled"
+                    },
+                    "store": true,
+                    "type": "string"
+                }
+            },
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "archive": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "author": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "authorized": {
+            "type": "boolean"
+        },
+        "changes_file": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "checksum_md5": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "checksum_sha256": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "date": {
+            "format": "strict_date_optional_time||epoch_millis",
+            "type": "date"
+        },
+        "dependency": {
+            "dynamic": false,
+            "include_in_root": true,
+            "properties": {
+                "module": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "phase": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "relationship": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "version": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                }
+            },
+            "type": "nested"
+        },
+        "deprecated": {
+            "type": "boolean"
+        },
+        "distribution": {
+            "fields": {
+                "analyzed": {
+                    "analyzer": "standard",
+                    "fielddata": {
+                        "format": "disabled"
+                    },
+                    "store": true,
+                    "type": "string"
+                },
+                "camelcase": {
+                    "analyzer": "camelcase",
+                    "store": true,
+                    "type": "string"
+                },
+                "lowercase": {
+                    "analyzer": "lowercase",
+                    "store": true,
+                    "type": "string"
+                }
+            },
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "download_url": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "first": {
+            "type": "boolean"
+        },
+        "id": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "license": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "main_module": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "maturity": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "name": {
+            "fields": {
+                "analyzed": {
+                    "analyzer": "standard",
+                    "fielddata": {
+                        "format": "disabled"
+                    },
+                    "store": true,
+                    "type": "string"
+                },
+                "camelcase": {
+                    "analyzer": "camelcase",
+                    "store": true,
+                    "type": "string"
+                },
+                "lowercase": {
+                    "analyzer": "lowercase",
+                    "store": true,
+                    "type": "string"
+                }
+            },
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "provides": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "resources": {
+            "dynamic": true,
+            "include_in_root": true,
+            "properties": {
+                "bugtracker": {
+                    "dynamic": "true",
+                    "include_in_root": true,
+                    "properties": {
+                        "mailto": {
+                            "ignore_above": 2048,
+                            "index": "not_analyzed",
+                            "type": "string"
+                        },
+                        "web": {
+                            "ignore_above": 2048,
+                            "index": "not_analyzed",
+                            "type": "string"
+                        }
+                    },
+                    "type": "nested"
+                },
+                "homepage": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "license": {
+                    "ignore_above": 2048,
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "repository": {
+                    "dynamic": "true",
+                    "include_in_root": true,
+                    "properties": {
+                        "type": {
+                            "ignore_above": 2048,
+                            "index": "not_analyzed",
+                            "type": "string"
+                        },
+                        "url": {
+                            "ignore_above": 2048,
+                            "index": "not_analyzed",
+                            "type": "string"
+                        },
+                        "web": {
+                            "ignore_above": 2048,
+                            "index": "not_analyzed",
+                            "type": "string"
+                        }
+                    },
+                    "type": "nested"
+                }
+            },
+            "type": "nested"
+        },
+        "stat": {
+            "dynamic": true,
+            "properties": {
+                "gid": {
+                    "type": "long"
+                },
+                "mode": {
+                    "type": "integer"
+                },
+                "mtime": {
+                    "type": "integer"
+                },
+                "size": {
+                    "type": "integer"
+                },
+                "uid": {
+                    "type": "long"
+                }
+            }
+        },
+        "status": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "tests": {
+            "dynamic": true,
+            "properties": {
+                "fail": {
+                    "type": "integer"
+                },
+                "na": {
+                    "type": "integer"
+                },
+                "pass": {
+                    "type": "integer"
+                },
+                "unknown": {
+                    "type": "integer"
+                }
+            }
+        },
+        "version": {
+            "ignore_above": 2048,
+            "index": "not_analyzed",
+            "type": "string"
+        },
+        "version_numified": {
+            "type": "float"
+        }
+    }
+}
diff --git a/es/release/settings.json b/es/release/settings.json
new file mode 100644
index 000000000..1d4845446
--- /dev/null
+++ b/es/release/settings.json
@@ -0,0 +1,56 @@
+{
+    "analysis": {
+        "analyzer": {
+            "camelcase": {
+                "filter": [
+                    "lowercase",
+                    "unique"
+                ],
+                "tokenizer": "camelcase",
+                "type": "custom"
+            },
+            "edge": {
+                "filter": [
+                    "lowercase",
+                    "edge"
+                ],
+                "tokenizer": "standard",
+                "type": "custom"
+            },
+            "edge_camelcase": {
+                "filter": [
+                    "lowercase",
+                    "edge"
+                ],
+                "tokenizer": "camelcase",
+                "type": "custom"
+            },
+            "fulltext": {
+                "type": "english"
+            },
+            "lowercase": {
+                "filter": "lowercase",
+                "tokenizer": "keyword"
+            }
+        },
+        "filter": {
+            "edge": {
+                "max_gram": "20",
+                "min_gram": "1",
+                "type": "edge_ngram"
+            }
+        },
+        "tokenizer": {
+            "camelcase": {
+                "pattern": "([^\\p{L}\\d]+)|(?<=\\D)(?=\\d)|(?<=\\d)(?=\\D)|(?<=[\\p{L}&&[^\\p{Lu}]])(?=\\p{Lu})|(?<=\\p{Lu})(?=\\p{Lu}[\\p{L}&&[^\\p{Lu}]])",
+                "type": "pattern"
+            }
+        }
+    },
+    "mapper": {
+        "dynamic": "false"
+    },
+    "number_of_replicas": 1,
+    "number_of_shards": 1,
+    "refresh_interval": "1s"
+}
diff --git a/es/session/mapping.json b/es/session/mapping.json
new file mode 100644
index 000000000..d4f130c22
--- /dev/null
+++ b/es/session/mapping.json
@@ -0,0 +1,3 @@
+{
+    "dynamic": false
+}
diff --git a/es/session/settings.json b/es/session/settings.json
new file mode 100644
index 000000000..c90ef6cba
--- /dev/null
+++ b/es/session/settings.json
@@ -0,0 +1,8 @@
+{
+    "mapper": {
+        "dynamic": "false"
+    },
+    "number_of_replicas": 1,
+    "number_of_shards": 1,
+    "refresh_interval": "1s"
+}
diff --git a/es/settings.json b/es/settings.json
new file mode 100644
index 000000000..1d4845446
--- /dev/null
+++ b/es/settings.json
@@ -0,0 +1,56 @@
+{
+    "analysis": {
+        "analyzer": {
+            "camelcase": {
+                "filter": [
+                    "lowercase",
+                    "unique"
+                ],
+                "tokenizer": "camelcase",
+                "type": "custom"
+            },
+            "edge": {
+                "filter": [
+                    "lowercase",
+                    "edge"
+                ],
+                "tokenizer": "standard",
+                "type": "custom"
+            },
+            "edge_camelcase": {
+                "filter": [
+                    "lowercase",
+                    "edge"
+                ],
+                "tokenizer": "camelcase",
+                "type": "custom"
+            },
+            "fulltext": {
+                "type": "english"
+            },
+            "lowercase": {
+                "filter": "lowercase",
+                "tokenizer": "keyword"
+            }
+        },
+        "filter": {
+            "edge": {
+                "max_gram": "20",
+                "min_gram": "1",
+                "type": "edge_ngram"
+            }
+        },
+        "tokenizer": {
+            "camelcase": {
+                "pattern": "([^\\p{L}\\d]+)|(?<=\\D)(?=\\d)|(?<=\\d)(?=\\D)|(?<=[\\p{L}&&[^\\p{Lu}]])(?=\\p{Lu})|(?<=\\p{Lu})(?=\\p{Lu}[\\p{L}&&[^\\p{Lu}]])",
+                "type": "pattern"
+            }
+        }
+    },
+    "mapper": {
+        "dynamic": "false"
+    },
+    "number_of_replicas": 1,
+    "number_of_shards": 1,
+    "refresh_interval": "1s"
+}
diff --git a/lib/MetaCPAN/ESConfig.pm b/lib/MetaCPAN/ESConfig.pm
index 801f09682..d06a53998 100644
--- a/lib/MetaCPAN/ESConfig.pm
+++ b/lib/MetaCPAN/ESConfig.pm
@@ -17,100 +17,105 @@ use Const::Fast               qw(const);
 
 const my %config => merge(
     {
-        aliases => {
-            'cpan' => 'cpan_v1_01',
-        },
-        indexes => {
-            _default => {
-                settings =>
-                    'MetaCPAN::Script::Mapping::DeployStatement::mapping()',
-            },
-        },
         documents => {
             author => {
-                index   => 'cpan_v1_01',
-                type    => 'author',
-                mapping => 'MetaCPAN::Script::Mapping::CPAN::Author',
-                model   => 'MetaCPAN::Document::Author',
+                index    => 'author',
+                type     => 'author',
+                mapping  => 'es/author/mapping.json',
+                settings => 'es/author/settings.json',
+                model    => 'MetaCPAN::Document::Author',
             },
             cve => {
-                index   => 'cve',
-                type    => 'cve',
-                mapping => 'MetaCPAN::Script::Mapping::CVE',
-                model   => 'MetaCPAN::Document::CVE',
+                index    => 'cve',
+                type     => 'cve',
+                mapping  => 'es/cve/mapping.json',
+                settings => 'es/cve/settings.json',
+                model    => 'MetaCPAN::Document::CVE',
             },
             contributor => {
-                index   => 'contributor',
-                type    => 'contributor',
-                mapping => 'MetaCPAN::Script::Mapping::Contributor',
-                model   => 'MetaCPAN::Document::Contributor',
+                index    => 'contributor',
+                type     => 'contributor',
+                mapping  => 'es/contributor/mapping.json',
+                settings => 'es/contributor/settings.json',
+                model    => 'MetaCPAN::Document::Contributor',
             },
             cover => {
-                index   => 'cover',
-                type    => 'cover',
-                mapping => 'MetaCPAN::Script::Mapping::Cover',
-                model   => 'MetaCPAN::Document::Cover',
+                index    => 'cover',
+                type     => 'cover',
+                mapping  => 'es/cover/mapping.json',
+                settings => 'es/cover/settings.json',
+                model    => 'MetaCPAN::Document::Cover',
             },
             distribution => {
-                index   => 'cpan_v1_01',
-                type    => 'distribution',
-                mapping => 'MetaCPAN::Script::Mapping::CPAN::Distribution',
-                model   => 'MetaCPAN::Document::Distribution',
+                index    => 'distribution',
+                type     => 'distribution',
+                mapping  => 'es/distribution/mapping.json',
+                settings => 'es/distribution/settings.json',
+                model    => 'MetaCPAN::Document::Distribution',
             },
             favorite => {
-                index   => 'cpan_v1_01',
-                type    => 'favorite',
-                mapping => 'MetaCPAN::Script::Mapping::CPAN::Favorite',
-                model   => 'MetaCPAN::Document::Favorite',
+                index    => 'favorite',
+                type     => 'favorite',
+                mapping  => 'es/favorite/mapping.json',
+                settings => 'es/favorite/settings.json',
+                model    => 'MetaCPAN::Document::Favorite',
             },
             file => {
-                index   => 'cpan_v1_01',
-                type    => 'file',
-                mapping => 'MetaCPAN::Script::Mapping::CPAN::File',
-                model   => 'MetaCPAN::Document::File',
+                index    => 'file',
+                type     => 'file',
+                mapping  => 'es/file/mapping.json',
+                settings => 'es/file/settings.json',
+                model    => 'MetaCPAN::Document::File',
             },
             mirror => {
-                index   => 'cpan_v1_01',
-                type    => 'mirror',
-                mapping => 'MetaCPAN::Script::Mapping::CPAN::Mirror',
-                model   => 'MetaCPAN::Document::Mirror',
+                index    => 'mirror',
+                type     => 'mirror',
+                mapping  => 'es/mirror/mapping.json',
+                settings => 'es/mirror/settings.json',
+                model    => 'MetaCPAN::Document::Mirror',
             },
             package => {
-                index   => 'cpan_v1_01',
-                type    => 'package',
-                mapping => 'MetaCPAN::Script::Mapping::CPAN::Package',
-                model   => 'MetaCPAN::Document::Package',
+                index    => 'package',
+                type     => 'package',
+                mapping  => 'es/package/mapping.json',
+                settings => 'es/package/settings.json',
+                model    => 'MetaCPAN::Document::Package',
             },
             permission => {
-                index   => 'cpan_v1_01',
-                type    => 'permission',
-                mapping => 'MetaCPAN::Script::Mapping::CPAN::Permission',
-                model   => 'MetaCPAN::Document::Permission',
+                index    => 'permission',
+                type     => 'permission',
+                mapping  => 'es/permission/mapping.json',
+                settings => 'es/permission/settings.json',
+                model    => 'MetaCPAN::Document::Permission',
             },
             release => {
-                index   => 'cpan_v1_01',
-                type    => 'release',
-                mapping => 'MetaCPAN::Script::Mapping::CPAN::Release',
-                model   => 'MetaCPAN::Document::Release',
+                index    => 'release',
+                type     => 'release',
+                mapping  => 'es/release/mapping.json',
+                settings => 'es/release/settings.json',
+                model    => 'MetaCPAN::Document::Release',
             },
 
             account => {
-                index   => 'user',
-                type    => 'account',
-                mapping => 'MetaCPAN::Script::Mapping::User::Account',
-                model   => 'MetaCPAN::Model::User::Account',
+                index    => 'account',
+                type     => 'account',
+                mapping  => 'es/account/mapping.json',
+                settings => 'es/account/settings.json',
+                model    => 'MetaCPAN::Model::User::Account',
             },
             identity => {
-                index   => 'user',
-                type    => 'identity',
-                mapping => 'MetaCPAN::Script::Mapping::User::Identity',
-                model   => 'MetaCPAN::Model::User::Identity',
+                index    => 'identity',
+                type     => 'identity',
+                mapping  => 'es/identity/mapping.json',
+                settings => 'es/identity/settings.json',
+                model    => 'MetaCPAN::Model::User::Identity',
             },
             session => {
-                index   => 'user',
-                type    => 'session',
-                mapping => 'MetaCPAN::Script::Mapping::User::Session',
-                model   => 'MetaCPAN::Model::User::Session',
+                index    => 'session',
+                type     => 'session',
+                mapping  => 'es/session/mapping.json',
+                settings => 'es/session/settings.json',
+                model    => 'MetaCPAN::Model::User::Session',
             },
         },
     },
@@ -121,11 +126,6 @@ const my %config => merge(
     use Moo;
 }
 
-has indexes => (
-    is       => 'ro',
-    required => 1,
-);
-
 has all_indexes => (
     is      => 'lazy',
     default => sub ($self) {
@@ -150,12 +150,6 @@ my $DefinedHash = ( HashRef [Defined] )->plus_coercions(
         };
     },
 );
-has aliases => (
-    is      => 'ro',
-    isa     => $DefinedHash,
-    coerce  => 1,
-    default => sub { {} },
-);
 
 has documents => (
     is       => 'ro',
@@ -164,7 +158,7 @@ has documents => (
     required => 1,
 );
 
-sub _load_es_data ( $location, $def_sub = 'mapping' ) {
+sub _load_es_data ( $location, $def_sub ) {
     my $data;
 
     if ( ref $location ) {
@@ -207,24 +201,13 @@ sub mapping ( $self, $doc ) {
     return _load_es_data( $doc_data->{mapping}, 'mapping' );
 }
 
-sub index_settings ( $self, $index ) {
-    my $indexes    = $self->indexes;
-    my $index_data = exists $indexes->{$index} && $indexes->{$index};
-    my $settings
-        = $index_data
-        && exists $index_data->{settings}
-        && $index_data->{settings};
-    if ( !$settings ) {
-        my $default_data
-            = exists $indexes->{_default} && $indexes->{_default};
-        $settings
-            = $default_data
-            && exists $default_data->{settings}
-            && $default_data->{settings};
-    }
-    return {}
-        if !$settings;
-    return _load_es_data($settings);
+sub index_settings ( $self, $doc ) {
+    my $documents = $self->documents;
+    my $doc_data  = exists $documents->{$doc} && $documents->{$doc}
+        or return {};
+    my $settings = exists $doc_data->{settings} && $doc_data->{settings}
+        or return {};
+    return _load_es_data( $settings, 'settings' );
 }
 
 sub doc_path ( $self, $doc ) {
diff --git a/lib/MetaCPAN/Model.pm b/lib/MetaCPAN/Model.pm
index 52a0cfdea..fd17cab71 100644
--- a/lib/MetaCPAN/Model.pm
+++ b/lib/MetaCPAN/Model.pm
@@ -21,18 +21,6 @@ for my $name ( sort keys %$docs ) {
     $indexes{$index}{types}{$name} = $model->meta;
 }
 
-my $aliases = es_config->aliases;
-for my $alias ( sort keys %$aliases ) {
-    my $index      = $aliases->{$alias};
-    my $index_data = $indexes{$index}
-        or die "unknown index $index";
-    if ( $index_data->{alias_for} ) {
-        die "duplicate alias for $index";
-    }
-    $index_data->{alias_for} = $index;
-    $indexes{$alias} = delete $indexes{$index};
-}
-
 for my $index ( sort keys %indexes ) {
     index $index => %{ $indexes{$index} };
 }
diff --git a/lib/MetaCPAN/Role/Script.pm b/lib/MetaCPAN/Role/Script.pm
index cd6c46053..7d604f4bb 100644
--- a/lib/MetaCPAN/Role/Script.pm
+++ b/lib/MetaCPAN/Role/Script.pm
@@ -4,7 +4,6 @@ use Moose::Role;
 
 use Carp                         ();
 use MooseX::Types::ElasticSearch qw( ES );
-use File::Path                   ();
 use IO::Prompt::Tiny             qw( prompt );
 use Log::Contextual              qw( :log :dlog );
 use MetaCPAN::Model              ();
@@ -48,15 +47,6 @@ has exit_code => (
     documentation => 'Exit Code to be returned on termination',
 );
 
-has arg_await_timeout => (
-    init_arg      => 'await',
-    is            => 'ro',
-    isa           => Int,
-    default       => 15,
-    documentation =>
-        'seconds before connection is considered failed with timeout',
-);
-
 has ua => (
     is      => 'ro',
     lazy    => 1,
@@ -86,29 +76,6 @@ has model => (
     traits   => ['NoGetopt'],
 );
 
-has cluster_info => (
-    isa     => HashRef,
-    traits  => ['Hash'],
-    is      => 'rw',
-    lazy    => 1,
-    default => sub { {} },
-);
-
-has indices_info => (
-    isa     => HashRef,
-    traits  => ['Hash'],
-    is      => 'rw',
-    lazy    => 1,
-    default => sub { {} },
-);
-
-has aliases_info => (
-    isa     => HashRef,
-    traits  => ['Hash'],
-    is      => 'rw',
-    default => sub { {} },
-);
-
 has port => (
     isa           => Int,
     is            => 'ro',
@@ -126,13 +93,6 @@ has home => (
     default => sub { root_dir() },
 );
 
-has quarantine => (
-    is      => 'ro',
-    isa     => Str,
-    lazy    => 1,
-    builder => '_build_quarantine',
-);
-
 has _minion => (
     is      => 'ro',
     isa     => 'Minion',
@@ -223,140 +183,12 @@ sub _build_cpan_file_map {
     return $cpan;
 }
 
-sub _build_quarantine {
-    my $path = "$ENV{HOME}/QUARANTINE";
-    if ( !-d $path ) {
-        File::Path::mkpath($path);
-    }
-    return $path;
-}
-
-sub remote {
-    shift->es->nodes->info->[0];
-}
-
 sub run { }
 before run => sub {
     my $self = shift;
     $self->set_logger_once;
 };
 
-sub _get_indices_info {
-    my ( $self, $irefresh ) = @_;
-
-    if ( $irefresh || scalar( keys %{ $self->indices_info } ) == 0 ) {
-        my $sinfo_rs = $self->es->cat->indices( h => [ 'index', 'health' ] );
-        my $sindices_parsing = qr/^([^[:space:]]+) +([^[:space:]]+)/m;
-
-        $self->indices_info( {} );
-
-        while ( $sinfo_rs =~ /$sindices_parsing/g ) {
-            $self->indices_info->{$1}
-                = { 'index_name' => $1, 'health' => $2 };
-        }
-    }
-}
-
-sub _get_aliases_info {
-    my ( $self, $irefresh ) = @_;
-
-    if ( $irefresh || scalar( keys %{ $self->aliases_info } ) == 0 ) {
-        my $sinfo_rs = $self->es->cat->aliases( h => [ 'alias', 'index' ] );
-        my $saliases_parsing = qr/^([^[:space:]]+) +([^[:space:]]+)/m;
-
-        $self->aliases_info( {} );
-
-        while ( $sinfo_rs =~ /$saliases_parsing/g ) {
-            $self->aliases_info->{$1} = { 'alias_name' => $1, 'index' => $2 };
-        }
-    }
-}
-
-sub check_health {
-    my ( $self, $irefresh ) = @_;
-    my $ihealth = 0;
-
-    $irefresh = 0 unless ( defined $irefresh );
-
-    $ihealth = $self->await;
-
-    if ($ihealth) {
-        $self->_get_indices_info($irefresh);
-
-        foreach ( keys %{ $self->indices_info } ) {
-            $ihealth = 0
-                if ( $self->indices_info->{$_}->{'health'} eq 'red' );
-        }
-    }
-
-    if ($ihealth) {
-        $self->_get_aliases_info($irefresh);
-
-        $ihealth = 0 if ( scalar( keys %{ $self->aliases_info } ) == 0 );
-    }
-
-    return $ihealth;
-}
-
-sub await {
-    my $self   = $_[0];
-    my $iready = 0;
-
-    if ( scalar( keys %{ $self->cluster_info } ) == 0 ) {
-        my $es       = $self->es;
-        my $iseconds = 0;
-
-        log_info {"Awaiting Elasticsearch ..."};
-
-        do {
-            eval {
-                $iready = $es->ping;
-
-                if ($iready) {
-                    log_info {
-                        "Awaiting $iseconds / "
-                            . $self->arg_await_timeout
-                            . " : ready"
-                    };
-
-                    $self->cluster_info( \%{ $es->info } );
-                }
-            };
-
-            if ($@) {
-                if ( $iseconds < $self->arg_await_timeout ) {
-                    log_info {
-                        "Awaiting $iseconds / "
-                            . $self->arg_await_timeout
-                            . " : unavailable - sleeping ..."
-                    };
-
-                    sleep(1);
-
-                    $iseconds++;
-                }
-                else {
-                    log_error {
-                        "Awaiting $iseconds / "
-                            . $self->arg_await_timeout
-                            . " : unavailable - timeout!"
-                    };
-
-                    #Set System Error: 112 - EHOSTDOWN - Host is down
-                    $self->exit_code(112);
-                    $self->handle_error( $@, 1 );
-                }
-            }
-        } while ( !$iready && $iseconds <= $self->arg_await_timeout );
-    }
-    else {
-        #ElasticSearch Service is available
-        $iready = 1;
-    }
-
-    return $iready;
-}
-
 sub are_you_sure {
     my ( $self, $msg ) = @_;
     my $iconfirmed = 0;
@@ -437,46 +269,6 @@ This Role provides the following methods
 
 =over 4
 
-=item C<await()>
-
-This method uses the
-L<C<Search::Elasticsearch::Client::2_0::Direct::ping()>|https://metacpan.org/pod/Search::Elasticsearch::Client::2_0::Direct#ping()>
-method to verify the service availabilty and wait for C<arg_await_timeout> seconds.
-When the service does not become available within C<arg_await_timeout> seconds it re-throws the
-Exception from the C<Search::Elasticsearch::Client> and sets B<Exit Code> to C< 112 >.
-The C<Search::Elasticsearch::Client> generates a C<"Search::Elasticsearch::Error::NoNodes"> Exception.
-When the service is available it will populate the C<cluster_info> C<HASH> structure with the basic information
-about the cluster.
-
-B<Exceptions:> It will throw an exceptions when the I<ElasticSearch> service does not become available
-within C<arg_await_timeout> seconds (as described above).
-
-See L<Option C<--await 15>>
-
-See L<Method C<check_health()>>
-
-=item C<check_health( [ refresh ] )>
-
-This method uses the
-L<C<Search::Elasticsearch::Client::2_0::Direct::cat()>|https://metacpan.org/pod/Search::Elasticsearch::Client::2_0::Direct#cat()>
-method to collect basic data about the cluster structure as the general information,
-the health state of the indices and the created aliases.
-This information is stored in C<cluster_info>, C<indices_info> and C<aliases_info> as C<HASH> structures.
-If the parameter C<refresh> is set to C< 1 > the structures C<indices_info> and C<aliases_info> will always
-be updated.
-If the C<cluster_info> structure is empty it calls first the C<await()> method.
-If the service is unavailable the C<await()> method will produce an exception and the structures will be empty
-The method returns C< 1 > when the C<cluster_info> is populated, none of the indices in C<indices_info> has
-the Health State I<red> and at least one alias is created in C<aliases_info>
-otherwise the method returns C< 0 >
-
-B<Parameters:>
-
-C<refresh> - Integer evaluated as boolean when set to C< 1 > the cluster info structures
-will always be updated.
-
-See L<Method C<await()>>
-
 =item C<are_you_sure()>
 
 Requests the user to confirm the operation with "I< YES >"
diff --git a/lib/MetaCPAN/Script/Mapping.pm b/lib/MetaCPAN/Script/Mapping.pm
index d5c35deda..04d9225a5 100644
--- a/lib/MetaCPAN/Script/Mapping.pm
+++ b/lib/MetaCPAN/Script/Mapping.pm
@@ -6,7 +6,7 @@ use Cpanel::JSON::XS          qw( decode_json );
 use DateTime                  ();
 use Log::Contextual           qw( :log );
 use MetaCPAN::ESConfig        qw( es_config );
-use MetaCPAN::Types::TypeTiny qw( Bool Str );
+use MetaCPAN::Types::TypeTiny qw( Bool HashRef Int Str );
 use Time::HiRes               qw( sleep time );
 
 use constant {
@@ -54,7 +54,7 @@ has arg_cluster_info => (
     is            => 'ro',
     isa           => Bool,
     default       => 0,
-    documentation => 'show basic info about cluster, indices and aliases',
+    documentation => 'show basic info about cluster and indices',
 );
 
 has arg_create_index => (
@@ -131,6 +131,15 @@ has arg_delete_index => (
     documentation => 'delete an existing index',
 );
 
+has arg_await_timeout => (
+    init_arg      => 'await',
+    is            => 'ro',
+    isa           => Int,
+    default       => 15,
+    documentation =>
+        'seconds before connection is considered failed with timeout',
+);
+
 has delete_from_type => (
     is            => 'ro',
     isa           => Str,
@@ -138,6 +147,22 @@ has delete_from_type => (
     documentation => 'delete data from an existing type',
 );
 
+has cluster_info => (
+    isa     => HashRef,
+    traits  => ['Hash'],
+    is      => 'rw',
+    lazy    => 1,
+    default => sub { {} },
+);
+
+has indices_info => (
+    isa     => HashRef,
+    traits  => ['Hash'],
+    is      => 'rw',
+    lazy    => 1,
+    default => sub { {} },
+);
+
 sub run {
     my $self = shift;
 
@@ -171,10 +196,7 @@ sub run {
 
         if ( $self->arg_verify_mapping ) {
             $self->check_health;
-            unless ( $self->mappings_valid(
-                $self->_build_mapping, $self->_build_aliases
-            ) )
-            {
+            unless ( $self->indices_valid( $self->_build_index_config ) ) {
                 $self->print_error("Indices Verification has failed!");
                 $self->exit_code(1);
             }
@@ -314,7 +336,12 @@ sub create_index {
 
     # create the new index with the copied settings
     log_info {"Creating index: $dst_idx"};
-    $self->es->indices->create( index => $dst_idx, body => $index_settings );
+    $self->es->indices->create(
+        index => $dst_idx,
+        body  => {
+            settings => $index_settings,
+        },
+    );
 
     # override with new type mapping
     if ( $self->patch_mapping ) {
@@ -478,123 +505,63 @@ sub show_info {
     my $info_rs = {
         'cluster_info' => \%{ $self->cluster_info },
         'indices_info' => \%{ $self->indices_info },
-        'aliases_info' => \%{ $self->aliases_info }
     };
     log_info { JSON->new->utf8->pretty->encode($info_rs) };
 }
 
-sub _build_mapping {
-    my $self     = $_[0];
-    my $docs     = es_config->documents;
-    my $mappings = {};
+sub _build_index_config {
+    my $self    = $_[0];
+    my $docs    = es_config->documents;
+    my $indices = {};
     for my $name ( sort keys %$docs ) {
         my $doc   = $docs->{$name};
         my $index = $doc->{index}
             or die "no index defined for $name documents";
         my $type = $doc->{type}
             or die "no type defined for $name documents";
-        my $mapping = es_config->mapping($name);
-        $mappings->{$index}{$type} = $mapping;
+        die "$index specified for multiple documents"
+            if $indices->{$index};
+        my $mapping  = es_config->mapping($name);
+        my $settings = es_config->index_settings($name);
+        $indices->{$index} = {
+            settings => $settings,
+            mappings => {
+                $type => $mapping,
+            },
+        };
     }
 
-    return $mappings;
-}
-
-sub _build_aliases {
-    my $self = $_[0];
-    es_config->aliases;
+    return $indices;
 }
 
 sub deploy_mapping {
-    my $self          = shift;
-    my $is_mapping_ok = 0;
+    my $self = shift;
 
     $self->are_you_sure(
         'this will delete EVERYTHING and re-create the (empty) indexes');
 
     # Deserialize the Index Mapping Structure
-    my $rmappings = $self->_build_mapping;
+    my $rindices = $self->_build_index_config;
 
     my $es = $self->es;
 
     # recreate the indices and apply the mapping
 
-    for my $idx ( sort keys %$rmappings ) {
-        $self->_delete_index($idx) if $es->indices->exists( index => $idx );
-        my $index_settings = es_config->index_settings($idx);
+    for my $idx ( sort keys %$rindices ) {
+        $self->_delete_index($idx)
+            if $es->indices->exists( index => $idx );
 
         log_info {"Creating index: $idx"};
-        $es->indices->create( index => $idx, body => $index_settings );
-
-        for my $type ( sort keys %{ $rmappings->{$idx} } ) {
-            log_info {"Adding mapping: $idx/$type"};
-            $es->indices->put_mapping(
-                index => $idx,
-                type  => $type,
-                body  => { $type => $rmappings->{$idx}{$type} },
-            );
-        }
-    }
-
-    # create aliases
 
-    my $raliases = $self->_build_aliases;
-    for my $alias ( sort keys %$raliases ) {
-        log_info {
-            "Creating alias: '$alias' -> '" . $raliases->{$alias} . "'"
-        };
-        $es->indices->put_alias(
-            index => $raliases->{$alias},
-            name  => $alias,
-        );
+        $es->indices->create( index => $idx, body => $rindices->{$idx} );
     }
 
     $self->check_health(1);
-    $is_mapping_ok = $self->mappings_valid( $rmappings, $raliases );
 
     # done
     log_info {"Done."};
 
-    return $is_mapping_ok;
-}
-
-sub aliases_valid {
-    my ( $self, $raliases ) = @_;
-    my $ivalid = 0;
-
-    if ( defined $raliases && ref $raliases eq 'HASH' ) {
-        my $ralias = undef;
-
-        $ivalid = 1;
-
-        for my $name ( sort keys %$raliases ) {
-            $ralias = $self->aliases_info->{$name};
-            if ( defined $ralias ) {
-                if ( $ralias->{'index'} eq $raliases->{$name} ) {
-                    log_info {
-                        "Correct alias: $name (index '"
-                            . $ralias->{'index'} . "')"
-                    };
-                }
-                else {
-                    log_error {
-                        "Broken alias: $name (index '"
-                            . $ralias->{'index'} . "')"
-                    };
-                    $ivalid = 0;
-                }
-            }
-            else {
-                log_error {"Missing alias: $name"};
-                $ivalid = 0;
-            }
-        }
-    }
-    else {
-        $ivalid = 0 if ( scalar( keys %{ $self->aliases_info } ) == 0 );
-    }
-
-    return $ivalid;
+    return $self->indices_valid($rindices);
 }
 
 sub _compare_mapping {
@@ -816,66 +783,149 @@ sub _compare_mapping {
     return $imatch;
 }
 
-sub mappings_valid {
-    my ( $self, $rmappings, $raliases ) = @_;
-    my $ivalid = 0;
+sub indices_valid {
+    my ( $self, $config_indices ) = @_;
+    my $valid = 0;
 
-    if ( defined $rmappings && ref $rmappings eq 'HASH' ) {
-        my $rindices = $self->es->indices->get_mapping();
-        my $iindexok = 0;
+    if ( defined $config_indices && ref $config_indices eq 'HASH' ) {
+        my $deploy_indices = $self->es->indices->get_mapping;
+        $valid = 1;
 
-        $ivalid = 1;
+        for my $idx ( sort keys %$config_indices ) {
+            my $config_mappings = $config_indices->{$idx}
+                && $config_indices->{$idx}->{'mappings'};
+            my $deploy_mappings = $deploy_indices->{$idx}
+                && $deploy_indices->{$idx}->{'mappings'};
+            if ( !$deploy_mappings ) {
+                log_error {"Missing index: $idx"};
+                $valid = 0;
+                next;
+            }
 
-        for my $idx ( sort keys %$rmappings ) {
-            if (   defined $rindices->{$idx}
-                && defined $rindices->{$idx}->{'mappings'} )
+            log_info {
+                "Verifying index: $idx"
+            };
+
+            if ( $self->_compare_mapping(
+                $idx, $deploy_mappings, $config_mappings
+            ) )
             {
                 log_info {
-                    "Verifying index: $idx"
+                    "Correct index: $idx (mapping deployed)"
                 };
-
-                $iindexok
-                    = $self->_compare_mapping( $idx,
-                    $rindices->{$idx}->{'mappings'},
-                    $rmappings->{$idx} );
-
-                if ($iindexok) {
-                    log_info {
-                        "Correct index: $idx (mapping deployed)"
-                    };
-                }
-                else {
-                    log_error {
-                        "Broken index: $idx (mapping does not match definition)"
-                    };
-                    $ivalid = 0;
-                }
-
-                $ivalid = ( $ivalid && $iindexok );
             }
             else {
-                log_error {"Missing index: $idx"};
-                $ivalid = 0;
+                log_error {
+                    "Broken index: $idx (mapping does not match definition)"
+                };
+                $valid = 0;
             }
         }
     }
-    if ($ivalid) {
+
+    if ($valid) {
         log_info {"Verification indices: ok"};
     }
     else {
         log_info {"Verification indices: failed"};
     }
 
-    $ivalid = ( $ivalid && $self->aliases_valid($raliases) );
+    return $valid;
+}
+
+sub _get_indices_info {
+    my ( $self, $irefresh ) = @_;
+
+    if ( $irefresh || scalar( keys %{ $self->indices_info } ) == 0 ) {
+        my $sinfo_rs = $self->es->cat->indices( h => [ 'index', 'health' ] );
+        my $sindices_parsing = qr/^([^[:space:]]+) +([^[:space:]]+)/m;
+
+        $self->indices_info( {} );
+
+        while ( $sinfo_rs =~ /$sindices_parsing/g ) {
+            $self->indices_info->{$1}
+                = { 'index_name' => $1, 'health' => $2 };
+        }
+    }
+}
+
+sub check_health {
+    my ( $self, $irefresh ) = @_;
+    my $ihealth = 0;
+
+    $irefresh = 0 unless ( defined $irefresh );
 
-    if ($ivalid) {
-        log_info {"Verification aliases: ok"};
+    $ihealth = $self->await;
+
+    if ($ihealth) {
+        $self->_get_indices_info($irefresh);
+
+        foreach ( keys %{ $self->indices_info } ) {
+            $ihealth = 0
+                if ( $self->indices_info->{$_}->{'health'} eq 'red' );
+        }
+    }
+
+    return $ihealth;
+}
+
+sub await {
+    my $self   = $_[0];
+    my $iready = 0;
+
+    if ( scalar( keys %{ $self->cluster_info } ) == 0 ) {
+        my $es       = $self->es;
+        my $iseconds = 0;
+
+        log_info {"Awaiting Elasticsearch ..."};
+
+        do {
+            eval {
+                $iready = $es->ping;
+
+                if ($iready) {
+                    log_info {
+                        "Awaiting $iseconds / "
+                            . $self->arg_await_timeout
+                            . " : ready"
+                    };
+
+                    $self->cluster_info( \%{ $es->info } );
+                }
+            };
+
+            if ($@) {
+                if ( $iseconds < $self->arg_await_timeout ) {
+                    log_info {
+                        "Awaiting $iseconds / "
+                            . $self->arg_await_timeout
+                            . " : unavailable - sleeping ..."
+                    };
+
+                    sleep(1);
+
+                    $iseconds++;
+                }
+                else {
+                    log_error {
+                        "Awaiting $iseconds / "
+                            . $self->arg_await_timeout
+                            . " : unavailable - timeout!"
+                    };
+
+                    #Set System Error: 112 - EHOSTDOWN - Host is down
+                    $self->exit_code(112);
+                    $self->handle_error( $@, 1 );
+                }
+            }
+        } while ( !$iready && $iseconds <= $self->arg_await_timeout );
     }
     else {
-        log_info {"Verification aliases: failed"};
+        #ElasticSearch Service is available
+        $iready = 1;
     }
 
-    return $ivalid;
+    return $iready;
 }
 
 __PACKAGE__->meta->make_immutable;
@@ -891,10 +941,10 @@ MetaCPAN::Script::Mapping - Script to set the index and mapping the types
 
 =head1 SYNOPSIS
 
- # bin/metacpan mapping --show_cluster_info   # show basic info about the cluster, indices and aliases
+ # bin/metacpan mapping --show_cluster_info   # show basic info about the cluster and indices
  # bin/metacpan mapping --delete
  # bin/metacpan mapping --delete --all        # deletes ALL indices in the cluster
- # bin/metacpan mapping --verify              # compare deployed indices and aliases with project definitions
+ # bin/metacpan mapping --verify              # compare deployed indices with project definitions
  # bin/metacpan mapping --list_types
  # bin/metacpan mapping --delete_index xxx
  # bin/metacpan mapping --create_index xxx --reindex
@@ -920,7 +970,7 @@ This Script accepts the following options
 =item Option C<--show_cluster_info>
 
 This option makes the Script show basic information about the I<ElasticSearch> Cluster
-and its indices and aliases.
+and its indices.
 This information has to be collected with the C<MetaCPAN::Role::Script::check_health()> Method.
 On Script start-up it is empty.
 
@@ -931,7 +981,7 @@ See L<Method C<MetaCPAN::Role::Script::check_health()>>
 =item Option C<--delete>
 
 This option makes the Script delete all indices configured in the project and re-create them emtpy.
-It verifies the index integrity of the indices and aliases calling the methods
+It verifies the index integrity of the indices calling the methods
 C<MetaCPAN::Role::Script::check_health()> and C<mappings_valid()>.
 If the C<mappings_valid()> Method fails it will report an error.
 
@@ -983,12 +1033,12 @@ This Package provides the following methods
 
 =item C<deploy_mapping()>
 
-Deletes and re-creates the indices and aliases defined in the Project.
+Deletes and re-creates the indices defined in the Project.
 The user will be requested for manual confirmation on the command line before the elemination.
-The integrity of the indices and aliases will be checked with the C<mappings_valid()> Method.
+The integrity of the indices will be checked with the C<mappings_valid()> Method.
 On successful creation it returns C< 1 >, otherwise it returns C< 0 >.
 
-B<Returns:> It returns C< 1 > when the indices and aliases are created and verified as correct.
+B<Returns:> It returns C< 1 > when the indices are created and verified as correct.
 Otherwise it returns C< 0 >.
 
 B<Exceptions:> It can throw exceptions when the connection to I<ElasticSearch> fails
@@ -1000,12 +1050,11 @@ See L<Method C<mappings_valid()>>
 
 See L<Method C<MetaCPAN::Role::Script::check_health()>>
 
-=item C<mappings_valid( \%indices, \%aliases )>
+=item C<mappings_valid( \%indices )>
 
 This method uses the
 L<C<Search::Elasticsearch::Client::2_0::Direct::get_mapping()>|https://metacpan.org/pod/Search::Elasticsearch::Client::2_0::Direct#get_mapping()>
 method to request the complete index mappings structure from the I<ElasticSearch> Cluster.
-It also uses the alias information gathered by the C<MetaCPAN::Role::Script::check_health()> method.
 Then it performs an in-depth structure match against the Project Definitions.
 Missing indices or any structure mismatch will be count as error.
 Errors will be reported in the activity log.
@@ -1014,9 +1063,7 @@ B<Parameters:>
 
 C<\%indices> - Reference to a hash that defines the indices required for the Project.
 
-C<\%aliases> - Reference to a hash that defines the aliases required for the Project.
-
-B<Returns:> It returns C< 1 > when the indices and aliases are created and match the defined structure.
+B<Returns:> It returns C< 1 > when the indices are created and match the defined structure.
 Otherwise it returns C< 0 >.
 
 See L<Option C<--delete>>
@@ -1025,6 +1072,45 @@ See L<Method C<mappings_valid()>>
 
 See L<Method C<MetaCPAN::Role::Script::check_health()>>
 
+=item C<await()>
+
+This method uses the
+L<C<Search::Elasticsearch::Client::2_0::Direct::ping()>|https://metacpan.org/pod/Search::Elasticsearch::Client::2_0::Direct#ping()>
+method to verify the service availabilty and wait for C<arg_await_timeout> seconds.
+When the service does not become available within C<arg_await_timeout> seconds it re-throws the
+Exception from the C<Search::Elasticsearch::Client> and sets B<Exit Code> to C< 112 >.
+The C<Search::Elasticsearch::Client> generates a C<"Search::Elasticsearch::Error::NoNodes"> Exception.
+When the service is available it will populate the C<cluster_info> C<HASH> structure with the basic information
+about the cluster.
+
+B<Exceptions:> It will throw an exceptions when the I<ElasticSearch> service does not become available
+within C<arg_await_timeout> seconds (as described above).
+
+See L<Option C<--await 15>>
+
+See L<Method C<check_health()>>
+
+=item C<check_health( [ refresh ] )>
+
+This method uses the
+L<C<Search::Elasticsearch::Client::2_0::Direct::cat()>|https://metacpan.org/pod/Search::Elasticsearch::Client::2_0::Direct#cat()>
+method to collect basic data about the cluster structure as the general information,
+the health state of the indices.
+This information is stored in C<cluster_info>, C<indices_info> as C<HASH> structures.
+If the parameter C<refresh> is set to C< 1 > the structure C<indices_info> will always
+be updated.
+If the C<cluster_info> structure is empty it calls first the C<await()> method.
+If the service is unavailable the C<await()> method will produce an exception and the structures will be empty
+The method returns C< 1 > when the C<cluster_info> is populated, none of the indices in C<indices_info> has
+the Health State I<red> otherwise the method returns C< 0 >
+
+B<Parameters:>
+
+C<refresh> - Integer evaluated as boolean when set to C< 1 > the cluster info structures
+will always be updated.
+
+See L<Method C<await()>>
+
 =back
 
 =cut
diff --git a/lib/MetaCPAN/Script/Mapping/CPAN/Author.pm b/lib/MetaCPAN/Script/Mapping/CPAN/Author.pm
deleted file mode 100644
index 7e7aa4a9e..000000000
--- a/lib/MetaCPAN/Script/Mapping/CPAN/Author.pm
+++ /dev/null
@@ -1,166 +0,0 @@
-package MetaCPAN::Script::Mapping::CPAN::Author;
-
-use strict;
-use warnings;
-
-sub mapping {
-    '{
-        "dynamic" : false,
-        "properties" : {
-           "asciiname" : {
-              "fields" : {
-                 "analyzed" : {
-                    "analyzer" : "standard",
-                    "fielddata" : {
-                       "format" : "disabled"
-                    },
-                    "store" : true,
-                    "type" : "string"
-                 }
-              },
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "blog" : {
-              "dynamic" : true,
-              "properties" : {
-                 "feed" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 },
-                 "url" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 }
-              }
-           },
-           "city" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "country" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "is_pause_custodial_account" : {
-              "type" : "boolean"
-           },
-           "donation" : {
-              "dynamic" : true,
-              "properties" : {
-                 "id" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 },
-                 "name" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 }
-              }
-           },
-           "email" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "gravatar_url" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "location" : {
-              "type" : "geo_point"
-           },
-           "name" : {
-              "fields" : {
-                 "analyzed" : {
-                    "analyzer" : "standard",
-                    "fielddata" : {
-                       "format" : "disabled"
-                    },
-                    "store" : true,
-                    "type" : "string"
-                 }
-              },
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "pauseid" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "perlmongers" : {
-              "dynamic" : true,
-              "properties" : {
-                 "name" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 },
-                 "url" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 }
-              }
-           },
-           "profile" : {
-              "dynamic" : false,
-              "include_in_root" : true,
-              "properties" : {
-                 "id" : {
-                    "fields" : {
-                       "analyzed" : {
-                          "analyzer" : "simple",
-                          "fielddata" : {
-                             "format" : "disabled"
-                          },
-                          "store" : true,
-                          "type" : "string"
-                       }
-                    },
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 },
-                 "name" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 }
-              },
-              "type" : "nested"
-           },
-           "region" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "updated" : {
-              "format" : "strict_date_optional_time||epoch_millis",
-              "type" : "date"
-           },
-           "user" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "website" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           }
-        }
-     }';
-}
-
-1;
diff --git a/lib/MetaCPAN/Script/Mapping/CPAN/Distribution.pm b/lib/MetaCPAN/Script/Mapping/CPAN/Distribution.pm
deleted file mode 100644
index e89a03c0e..000000000
--- a/lib/MetaCPAN/Script/Mapping/CPAN/Distribution.pm
+++ /dev/null
@@ -1,125 +0,0 @@
-package MetaCPAN::Script::Mapping::CPAN::Distribution;
-
-use strict;
-use warnings;
-
-sub mapping {
-    '{
-        "dynamic" : false,
-        "properties" : {
-           "bugs" : {
-              "dynamic" : true,
-              "properties" : {
-                 "github" : {
-                    "dynamic" : true,
-                    "properties" : {
-                       "active" : {
-                          "type" : "integer"
-                       },
-                       "closed" : {
-                          "type" : "integer"
-                       },
-                       "open" : {
-                          "type" : "integer"
-                       },
-                       "source" : {
-                          "ignore_above" : 2048,
-                          "index" : "not_analyzed",
-                          "type" : "string"
-                       }
-                    }
-                 },
-                 "rt" : {
-                    "dynamic" : true,
-                    "properties" : {
-                       "active" : {
-                          "type" : "integer"
-                       },
-                       "closed" : {
-                          "type" : "integer"
-                       },
-                       "new" : {
-                          "type" : "integer"
-                       },
-                       "open" : {
-                          "type" : "integer"
-                       },
-                       "patched" : {
-                          "type" : "integer"
-                       },
-                       "rejected" : {
-                          "type" : "integer"
-                       },
-                       "resolved" : {
-                          "type" : "integer"
-                       },
-                       "source" : {
-                          "ignore_above" : 2048,
-                          "index" : "not_analyzed",
-                          "type" : "string"
-                       },
-                       "stalled" : {
-                          "type" : "integer"
-                       }
-                    }
-                 }
-              }
-           },
-           "repo" : {
-              "dynamic" : true,
-              "properties" : {
-                 "github" : {
-                    "dynamic" : true,
-                    "properties" : {
-                       "stars" : {
-                          "type" : "integer"
-                       },
-                       "watchers" : {
-                          "type" : "integer"
-                       }
-                    }
-                 }
-              }
-           },
-           "name" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "external_package" : {
-              "dynamic" : true,
-              "properties" : {
-                 "cygwin" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 },
-                 "debian" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 }
-              }
-           },
-           "river" : {
-              "dynamic" : true,
-              "properties" : {
-                 "bucket" : {
-                    "type" : "integer"
-                 },
-                 "bus_factor" : {
-                    "type" : "integer"
-                 },
-                 "immediate" : {
-                    "type" : "integer"
-                 },
-                 "total" : {
-                    "type" : "integer"
-                 }
-              }
-           }
-        }
-     }';
-}
-
-1;
diff --git a/lib/MetaCPAN/Script/Mapping/CPAN/Favorite.pm b/lib/MetaCPAN/Script/Mapping/CPAN/Favorite.pm
deleted file mode 100644
index 12ff1b714..000000000
--- a/lib/MetaCPAN/Script/Mapping/CPAN/Favorite.pm
+++ /dev/null
@@ -1,43 +0,0 @@
-package MetaCPAN::Script::Mapping::CPAN::Favorite;
-
-use strict;
-use warnings;
-
-sub mapping {
-    '{
-        "dynamic" : false,
-        "properties" : {
-           "author" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "date" : {
-              "format" : "strict_date_optional_time||epoch_millis",
-              "type" : "date"
-           },
-           "distribution" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "id" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "release" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "user" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           }
-        }
-     }';
-}
-
-1;
diff --git a/lib/MetaCPAN/Script/Mapping/CPAN/File.pm b/lib/MetaCPAN/Script/Mapping/CPAN/File.pm
deleted file mode 100644
index 7c38501bc..000000000
--- a/lib/MetaCPAN/Script/Mapping/CPAN/File.pm
+++ /dev/null
@@ -1,302 +0,0 @@
-package MetaCPAN::Script::Mapping::CPAN::File;
-
-use strict;
-use warnings;
-
-sub mapping {
-    '{
-        "dynamic" : "false",
-        "properties" : {
-          "abstract" : {
-            "type" : "string",
-            "index" : "not_analyzed",
-            "fields" : {
-              "analyzed" : {
-                "type" : "string",
-                "store" : true,
-                "fielddata" : {
-                  "format" : "disabled"
-                },
-                "analyzer" : "standard"
-              }
-            },
-            "ignore_above" : 2048
-          },
-          "author" : {
-            "type" : "string",
-            "index" : "not_analyzed",
-            "ignore_above" : 2048
-          },
-          "authorized" : {
-            "type" : "boolean"
-          },
-          "binary" : {
-            "type" : "boolean"
-          },
-          "date" : {
-            "type" : "date",
-            "format" : "strict_date_optional_time||epoch_millis"
-          },
-          "deprecated" : {
-            "type" : "boolean"
-          },
-          "description" : {
-            "type" : "string",
-            "index" : "not_analyzed",
-            "ignore_above" : 2048
-          },
-          "dir" : {
-            "type" : "string",
-            "index" : "not_analyzed",
-            "ignore_above" : 2048
-          },
-          "directory" : {
-            "type" : "boolean"
-          },
-          "dist_fav_count" : {
-            "type" : "integer"
-          },
-          "distribution" : {
-            "type" : "string",
-            "index" : "not_analyzed",
-            "fields" : {
-              "analyzed" : {
-                "type" : "string",
-                "store" : true,
-                "fielddata" : {
-                  "format" : "disabled"
-                },
-                "analyzer" : "standard"
-              },
-              "camelcase" : {
-                "type" : "string",
-                "store" : true,
-                "analyzer" : "camelcase"
-              },
-              "lowercase" : {
-                "type" : "string",
-                "store" : true,
-                "analyzer" : "lowercase"
-              }
-            },
-            "ignore_above" : 2048
-          },
-          "documentation" : {
-            "type" : "string",
-            "index" : "not_analyzed",
-            "fields" : {
-              "analyzed" : {
-                "type" : "string",
-                "store" : true,
-                "fielddata" : {
-                  "format" : "disabled"
-                },
-                "analyzer" : "standard"
-              },
-              "camelcase" : {
-                "type" : "string",
-                "store" : true,
-                "analyzer" : "camelcase"
-              },
-              "edge" : {
-                "type" : "string",
-                "store" : true,
-                "analyzer" : "edge"
-              },
-              "edge_camelcase" : {
-                "type" : "string",
-                "store" : true,
-                "analyzer" : "edge_camelcase"
-              },
-              "lowercase" : {
-                "type" : "string",
-                "store" : true,
-                "analyzer" : "lowercase"
-              }
-            },
-            "ignore_above" : 2048
-          },
-          "documentation_length" : {
-            "type" : "integer"
-          },
-          "download_url" : {
-            "type" : "string",
-            "index" : "not_analyzed",
-            "ignore_above" : 2048
-          },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed",
-            "ignore_above" : 2048
-          },
-          "indexed" : {
-            "type" : "boolean"
-          },
-          "level" : {
-            "type" : "integer"
-          },
-          "maturity" : {
-            "type" : "string",
-            "index" : "not_analyzed",
-            "ignore_above" : 2048
-          },
-          "mime" : {
-            "type" : "string",
-            "index" : "not_analyzed",
-            "ignore_above" : 2048
-          },
-          "module" : {
-            "type" : "nested",
-            "include_in_root" : true,
-            "dynamic" : "false",
-            "properties" : {
-              "associated_pod" : {
-                "type" : "string"
-              },
-              "authorized" : {
-                "type" : "boolean"
-              },
-              "indexed" : {
-                "type" : "boolean"
-              },
-              "name" : {
-                "type" : "string",
-                "index" : "not_analyzed",
-                "fields" : {
-                  "analyzed" : {
-                    "type" : "string",
-                    "store" : true,
-                    "fielddata" : {
-                      "format" : "disabled"
-                    },
-                    "analyzer" : "standard"
-                  },
-                  "camelcase" : {
-                    "type" : "string",
-                    "store" : true,
-                    "analyzer" : "camelcase"
-                  },
-                  "lowercase" : {
-                    "type" : "string",
-                    "store" : true,
-                    "analyzer" : "lowercase"
-                  }
-                },
-                "ignore_above" : 2048
-              },
-              "version" : {
-                "type" : "string",
-                "index" : "not_analyzed",
-                "ignore_above" : 2048
-              },
-              "version_numified" : {
-                "type" : "float"
-              }
-            }
-          },
-          "name" : {
-            "type" : "string",
-            "index" : "not_analyzed",
-            "ignore_above" : 2048
-          },
-          "path" : {
-            "type" : "string",
-            "index" : "not_analyzed",
-            "ignore_above" : 2048
-          },
-          "pod" : {
-            "type" : "string",
-            "index" : "analyzed",
-            "analyzer" : "standard",
-            "doc_values" : false,
-            "fields" : {
-              "analyzed" : {
-                "type" : "string",
-                "index" : "analyzed",
-                "analyzer" : "standard",
-                "doc_values" : false
-              }
-            }
-          },
-          "pod_lines" : {
-            "type" : "string",
-            "index" : "no",
-            "doc_values" : true,
-            "ignore_above" : 2048
-          },
-          "release" : {
-            "type" : "string",
-            "index" : "not_analyzed",
-            "fields" : {
-              "analyzed" : {
-                "type" : "string",
-                "store" : true,
-                "fielddata" : {
-                  "format" : "disabled"
-                },
-                "analyzer" : "standard"
-              },
-              "camelcase" : {
-                "type" : "string",
-                "store" : true,
-                "analyzer" : "camelcase"
-              },
-              "lowercase" : {
-                "type" : "string",
-                "store" : true,
-                "analyzer" : "lowercase"
-              }
-            },
-            "ignore_above" : 2048
-          },
-          "sloc" : {
-            "type" : "integer"
-          },
-          "slop" : {
-            "type" : "integer"
-          },
-          "stat" : {
-            "dynamic" : "true",
-            "properties" : {
-              "gid" : {
-                "type" : "long"
-              },
-              "mode" : {
-                "type" : "integer"
-              },
-              "mtime" : {
-                "type" : "integer"
-              },
-              "size" : {
-                "type" : "integer"
-              },
-              "uid" : {
-                "type" : "long"
-              }
-            }
-          },
-          "status" : {
-            "type" : "string",
-            "index" : "not_analyzed",
-            "ignore_above" : 2048
-          },
-          "suggest" : {
-            "type" : "completion",
-            "analyzer" : "simple",
-            "preserve_separators" : true,
-            "preserve_position_increments" : true,
-            "max_input_length" : 50
-          },
-          "version" : {
-            "type" : "string",
-            "index" : "not_analyzed",
-            "ignore_above" : 2048
-          },
-          "version_numified" : {
-            "type" : "float"
-          }
-        }
-    }';
-}
-
-1;
diff --git a/lib/MetaCPAN/Script/Mapping/CPAN/Mirror.pm b/lib/MetaCPAN/Script/Mapping/CPAN/Mirror.pm
deleted file mode 100644
index afff8d2df..000000000
--- a/lib/MetaCPAN/Script/Mapping/CPAN/Mirror.pm
+++ /dev/null
@@ -1,175 +0,0 @@
-package MetaCPAN::Script::Mapping::CPAN::Mirror;
-
-use strict;
-use warnings;
-
-sub mapping {
-    '{
-        "dynamic" : false,
-        "properties" : {
-           "A_or_CNAME" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "aka_name" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "ccode" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "city" : {
-              "fields" : {
-                 "analyzed" : {
-                    "analyzer" : "standard",
-                    "fielddata" : {
-                       "format" : "disabled"
-                    },
-                    "store" : true,
-                    "type" : "string"
-                 }
-              },
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "contact" : {
-              "dynamic" : false,
-              "properties" : {
-                 "contact_site" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 },
-                 "contact_user" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 }
-              }
-           },
-           "continent" : {
-              "fields" : {
-                 "analyzed" : {
-                    "analyzer" : "standard",
-                    "fielddata" : {
-                       "format" : "disabled"
-                    },
-                    "store" : true,
-                    "type" : "string"
-                 }
-              },
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "country" : {
-              "fields" : {
-                 "analyzed" : {
-                    "analyzer" : "standard",
-                    "fielddata" : {
-                       "format" : "disabled"
-                    },
-                    "store" : true,
-                    "type" : "string"
-                 }
-              },
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "dnsrr" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "freq" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "ftp" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "http" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "inceptdate" : {
-              "format" : "strict_date_optional_time||epoch_millis",
-              "type" : "date"
-           },
-           "location" : {
-              "type" : "geo_point"
-           },
-           "name" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "note" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "org" : {
-              "fields" : {
-                 "analyzed" : {
-                    "analyzer" : "standard",
-                    "fielddata" : {
-                       "format" : "disabled"
-                    },
-                    "store" : true,
-                    "type" : "string"
-                 }
-              },
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "region" : {
-              "fields" : {
-                 "analyzed" : {
-                    "analyzer" : "standard",
-                    "fielddata" : {
-                       "format" : "disabled"
-                    },
-                    "store" : true,
-                    "type" : "string"
-                 }
-              },
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "reitredate" : {
-              "format" : "strict_date_optional_time||epoch_millis",
-              "type" : "date"
-           },
-           "rsync" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "src" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "tz" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           }
-        }
-    }';
-}
-
-1;
diff --git a/lib/MetaCPAN/Script/Mapping/CPAN/Package.pm b/lib/MetaCPAN/Script/Mapping/CPAN/Package.pm
deleted file mode 100644
index 2175771fd..000000000
--- a/lib/MetaCPAN/Script/Mapping/CPAN/Package.pm
+++ /dev/null
@@ -1,44 +0,0 @@
-package MetaCPAN::Script::Mapping::CPAN::Package;
-
-use strict;
-use warnings;
-
-sub mapping {
-    '{
-        "dynamic" : false,
-        "properties" : {
-           "module_name" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "distribution" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "dist_version" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "author" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "version" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "file" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           }
-        }
-     }';
-}
-
-1;
diff --git a/lib/MetaCPAN/Script/Mapping/CPAN/Permission.pm b/lib/MetaCPAN/Script/Mapping/CPAN/Permission.pm
deleted file mode 100644
index 56cb4af3f..000000000
--- a/lib/MetaCPAN/Script/Mapping/CPAN/Permission.pm
+++ /dev/null
@@ -1,29 +0,0 @@
-package MetaCPAN::Script::Mapping::CPAN::Permission;
-
-use strict;
-use warnings;
-
-sub mapping {
-    '{
-        "dynamic" : false,
-        "properties" : {
-           "module_name" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "owner" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "co_maintainers" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           }
-        }
-     }';
-}
-
-1;
diff --git a/lib/MetaCPAN/Script/Mapping/CPAN/Release.pm b/lib/MetaCPAN/Script/Mapping/CPAN/Release.pm
deleted file mode 100644
index 95b0440f9..000000000
--- a/lib/MetaCPAN/Script/Mapping/CPAN/Release.pm
+++ /dev/null
@@ -1,280 +0,0 @@
-package MetaCPAN::Script::Mapping::CPAN::Release;
-
-use strict;
-use warnings;
-
-sub mapping {
-    '{
-        "dynamic" : false,
-        "properties" : {
-           "abstract" : {
-              "fields" : {
-                 "analyzed" : {
-                    "analyzer" : "standard",
-                    "fielddata" : {
-                       "format" : "disabled"
-                    },
-                    "store" : true,
-                    "type" : "string"
-                 }
-              },
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "archive" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "author" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "authorized" : {
-              "type" : "boolean"
-           },
-           "changes_file" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "checksum_md5" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "checksum_sha256" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "date" : {
-              "format" : "strict_date_optional_time||epoch_millis",
-              "type" : "date"
-           },
-           "dependency" : {
-              "dynamic" : false,
-              "include_in_root" : true,
-              "properties" : {
-                 "module" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 },
-                 "phase" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 },
-                 "relationship" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 },
-                 "version" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 }
-              },
-              "type" : "nested"
-           },
-           "deprecated" : {
-              "type" : "boolean"
-           },
-           "distribution" : {
-              "fields" : {
-                 "analyzed" : {
-                    "analyzer" : "standard",
-                    "fielddata" : {
-                       "format" : "disabled"
-                    },
-                    "store" : true,
-                    "type" : "string"
-                 },
-                 "camelcase" : {
-                    "analyzer" : "camelcase",
-                    "store" : true,
-                    "type" : "string"
-                 },
-                 "lowercase" : {
-                    "analyzer" : "lowercase",
-                    "store" : true,
-                    "type" : "string"
-                 }
-              },
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "download_url" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "first" : {
-              "type" : "boolean"
-           },
-           "id" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "license" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "main_module" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "maturity" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "name" : {
-              "fields" : {
-                 "analyzed" : {
-                    "analyzer" : "standard",
-                    "fielddata" : {
-                       "format" : "disabled"
-                    },
-                    "store" : true,
-                    "type" : "string"
-                 },
-                 "camelcase" : {
-                    "analyzer" : "camelcase",
-                    "store" : true,
-                    "type" : "string"
-                 },
-                 "lowercase" : {
-                    "analyzer" : "lowercase",
-                    "store" : true,
-                    "type" : "string"
-                 }
-              },
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "provides" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "resources" : {
-              "dynamic" : true,
-              "include_in_root" : true,
-              "properties" : {
-                 "bugtracker" : {
-                    "dynamic" : true,
-                    "include_in_root" : true,
-                    "properties" : {
-                       "mailto" : {
-                          "ignore_above" : 2048,
-                          "index" : "not_analyzed",
-                          "type" : "string"
-                       },
-                       "web" : {
-                          "ignore_above" : 2048,
-                          "index" : "not_analyzed",
-                          "type" : "string"
-                       }
-                    },
-                    "type" : "nested"
-                 },
-                 "homepage" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 },
-                 "license" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 },
-                 "repository" : {
-                    "dynamic" : true,
-                    "include_in_root" : true,
-                    "properties" : {
-                       "type" : {
-                          "ignore_above" : 2048,
-                          "index" : "not_analyzed",
-                          "type" : "string"
-                       },
-                       "url" : {
-                          "ignore_above" : 2048,
-                          "index" : "not_analyzed",
-                          "type" : "string"
-                       },
-                       "web" : {
-                          "ignore_above" : 2048,
-                          "index" : "not_analyzed",
-                          "type" : "string"
-                       }
-                    },
-                    "type" : "nested"
-                 }
-              },
-              "type" : "nested"
-           },
-           "stat" : {
-              "dynamic" : true,
-              "properties" : {
-                 "gid" : {
-                    "type" : "long"
-                 },
-                 "mode" : {
-                    "type" : "integer"
-                 },
-                 "mtime" : {
-                    "type" : "integer"
-                 },
-                 "size" : {
-                    "type" : "integer"
-                 },
-                 "uid" : {
-                    "type" : "long"
-                 }
-              }
-           },
-           "status" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "tests" : {
-              "dynamic" : true,
-              "properties" : {
-                 "fail" : {
-                    "type" : "integer"
-                 },
-                 "na" : {
-                    "type" : "integer"
-                 },
-                 "pass" : {
-                    "type" : "integer"
-                 },
-                 "unknown" : {
-                    "type" : "integer"
-                 }
-              }
-           },
-           "version" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "version_numified" : {
-              "type" : "float"
-           }
-        }
-     }';
-}
-
-1;
diff --git a/lib/MetaCPAN/Script/Mapping/CVE.pm b/lib/MetaCPAN/Script/Mapping/CVE.pm
deleted file mode 100644
index 8450d33a5..000000000
--- a/lib/MetaCPAN/Script/Mapping/CVE.pm
+++ /dev/null
@@ -1,50 +0,0 @@
-package MetaCPAN::Script::Mapping::CVE;
-
-use strict;
-use warnings;
-
-sub mapping {
-    '{
-        "dynamic" : false,
-        "properties" : {
-          "affected_versions" : {
-            "type" : "string"
-          },
-          "cpansa_id" : {
-            "ignore_above" : 2048,
-            "index" : "not_analyzed",
-            "type" : "string"
-          },
-          "cves" : {
-            "type" : "string"
-          },
-          "description" : {
-            "type" : "string"
-          },
-          "distribution" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
-          "references" : {
-            "type" : "string"
-          },
-          "releases" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
-          "reported" : {
-            "type" : "date",
-            "format" : "strict_date_optional_time||epoch_millis"
-          },
-          "severity" : {
-            "type" : "string"
-          },
-          "versions" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          }
-        }
-      }';
-}
-
-1;
diff --git a/lib/MetaCPAN/Script/Mapping/Contributor.pm b/lib/MetaCPAN/Script/Mapping/Contributor.pm
deleted file mode 100644
index a5df69c88..000000000
--- a/lib/MetaCPAN/Script/Mapping/Contributor.pm
+++ /dev/null
@@ -1,34 +0,0 @@
-package MetaCPAN::Script::Mapping::Contributor;
-
-use strict;
-use warnings;
-
-sub mapping {
-    '{
-        "dynamic" : false,
-        "properties" : {
-           "release_author" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "release_name" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "distribution" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "pauseid" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           }
-        }
-     }';
-}
-
-1;
diff --git a/lib/MetaCPAN/Script/Mapping/Cover.pm b/lib/MetaCPAN/Script/Mapping/Cover.pm
deleted file mode 100644
index 885a439f1..000000000
--- a/lib/MetaCPAN/Script/Mapping/Cover.pm
+++ /dev/null
@@ -1,49 +0,0 @@
-package MetaCPAN::Script::Mapping::Cover;
-
-use strict;
-use warnings;
-
-sub mapping {
-    '{
-        "dynamic" : false,
-        "properties" : {
-           "distribution" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "version" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "release" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "criteria": {
-              "dynamic" : true,
-              "properties" : {
-                 "branch" : {
-                    "type" : "float"
-                 },
-                 "condition" : {
-                    "type" : "float"
-                 },
-                 "statement" : {
-                    "type" : "float"
-                 },
-                 "subroutine" : {
-                    "type" : "float"
-                 },
-                 "total" : {
-                    "type" : "float"
-                 }
-              }
-           }
-        }
-     }';
-}
-
-1;
diff --git a/lib/MetaCPAN/Script/Mapping/DeployStatement.pm b/lib/MetaCPAN/Script/Mapping/DeployStatement.pm
deleted file mode 100644
index 334510ff9..000000000
--- a/lib/MetaCPAN/Script/Mapping/DeployStatement.pm
+++ /dev/null
@@ -1,67 +0,0 @@
-package MetaCPAN::Script::Mapping::DeployStatement;
-
-use strict;
-use warnings;
-
-sub mapping {
-    '{
-        "analysis" : {
-           "filter" : {
-              "edge" : {
-                 "max_gram" : 20,
-                 "type" : "edge_ngram",
-                 "min_gram" : 1
-              }
-           },
-           "analyzer" : {
-              "lowercase" : {
-                 "tokenizer" : "keyword",
-                 "filter" : "lowercase"
-              },
-              "fulltext" : {
-                 "type" : "english"
-              },
-              "edge_camelcase" : {
-                 "filter" : [
-                    "lowercase",
-                    "edge"
-                 ],
-                 "tokenizer" : "camelcase",
-                 "type" : "custom"
-              },
-              "edge" : {
-                 "filter" : [
-                    "lowercase",
-                    "edge"
-                 ],
-                 "tokenizer" : "standard",
-                 "type" : "custom"
-              },
-              "camelcase" : {
-                 "filter" : [
-                    "lowercase",
-                    "unique"
-                 ],
-                 "type" : "custom",
-                 "tokenizer" : "camelcase"
-              }
-           },
-           "tokenizer" : {
-              "camelcase" : {
-                 "type" : "pattern",
-                 "pattern" : "([^\\\\p{L}\\\\d]+)|(?<=\\\\D)(?=\\\\d)|(?<=\\\\d)(?=\\\\D)|(?<=[\\\\p{L}&&[^\\\\p{Lu}]])(?=\\\\p{Lu})|(?<=\\\\p{Lu})(?=\\\\p{Lu}[\\\\p{L}&&[^\\\\p{Lu}]])"
-              }
-           }
-        },
-        "index" : {
-           "number_of_shards" : 1,
-           "mapper" : {
-              "dynamic" : false
-           },
-           "refresh_interval" : "1s",
-           "number_of_replicas":1
-        }
-    }'
-}
-
-1;
diff --git a/lib/MetaCPAN/Script/Mapping/User/Account.pm b/lib/MetaCPAN/Script/Mapping/User/Account.pm
deleted file mode 100644
index a510213cd..000000000
--- a/lib/MetaCPAN/Script/Mapping/User/Account.pm
+++ /dev/null
@@ -1,61 +0,0 @@
-package MetaCPAN::Script::Mapping::User::Account;
-
-use strict;
-use warnings;
-
-sub mapping {
-    '{
-        "dynamic" : "false",
-        "properties" : {
-           "access_token" : {
-              "dynamic" : "true",
-              "properties" : {
-                 "client" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 },
-                 "token" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 }
-              }
-           },
-           "code" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "id" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "identity" : {
-              "dynamic" : "false",
-              "properties" : {
-                 "key" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 },
-                 "name" : {
-                    "ignore_above" : 2048,
-                    "index" : "not_analyzed",
-                    "type" : "string"
-                 }
-              }
-           },
-           "looks_human" : {
-              "type" : "boolean"
-           },
-           "passed_captcha" : {
-              "format" : "strict_date_optional_time||epoch_millis",
-              "type" : "date"
-           }
-        }
-     }';
-}
-
-1;
diff --git a/lib/MetaCPAN/Script/Mapping/User/Identity.pm b/lib/MetaCPAN/Script/Mapping/User/Identity.pm
deleted file mode 100644
index a8ebfff71..000000000
--- a/lib/MetaCPAN/Script/Mapping/User/Identity.pm
+++ /dev/null
@@ -1,24 +0,0 @@
-package MetaCPAN::Script::Mapping::User::Identity;
-
-use strict;
-use warnings;
-
-sub mapping {
-    '{
-        "dynamic" : false,
-        "properties" : {
-           "key" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           },
-           "name" : {
-              "ignore_above" : 2048,
-              "index" : "not_analyzed",
-              "type" : "string"
-           }
-        }
-     }';
-}
-
-1;
diff --git a/lib/MetaCPAN/Script/Mapping/User/Session.pm b/lib/MetaCPAN/Script/Mapping/User/Session.pm
deleted file mode 100644
index 3dc8e078f..000000000
--- a/lib/MetaCPAN/Script/Mapping/User/Session.pm
+++ /dev/null
@@ -1,12 +0,0 @@
-package MetaCPAN::Script::Mapping::User::Session;
-
-use strict;
-use warnings;
-
-sub mapping {
-    '{
-        "dynamic" : "false"
-     }';
-}
-
-1;
diff --git a/lib/MetaCPAN/Script/Purge.pm b/lib/MetaCPAN/Script/Purge.pm
index c12ea3f8a..67d98ab0b 100644
--- a/lib/MetaCPAN/Script/Purge.pm
+++ b/lib/MetaCPAN/Script/Purge.pm
@@ -2,6 +2,7 @@ package MetaCPAN::Script::Purge;
 
 use Moose;
 
+use File::Path                ();
 use Log::Contextual           qw( :log );
 use MetaCPAN::ESConfig        qw( es_doc_path );
 use MetaCPAN::Types::TypeTiny qw( Bool HashRef Str );
@@ -49,6 +50,21 @@ sub _build_bulk {
     };
 }
 
+has quarantine => (
+    is      => 'ro',
+    isa     => Str,
+    lazy    => 1,
+    builder => '_build_quarantine',
+);
+
+sub _build_quarantine {
+    my $path = "$ENV{HOME}/QUARANTINE";
+    if ( !-d $path ) {
+        File::Path::mkpath($path);
+    }
+    return $path;
+}
+
 sub _get_scroller_release {
     my ( $self, $query ) = @_;
     return $self->es->scroll_helper(
diff --git a/t/lib/MetaCPAN/TestServer.pm b/t/lib/MetaCPAN/TestServer.pm
index 669fa638d..324fc935f 100644
--- a/t/lib/MetaCPAN/TestServer.pm
+++ b/t/lib/MetaCPAN/TestServer.pm
@@ -11,7 +11,6 @@ use MetaCPAN::Script::Favorite       ();
 use MetaCPAN::Script::First          ();
 use MetaCPAN::Script::Latest         ();
 use MetaCPAN::Script::Mapping        ();
-use MetaCPAN::Script::Mapping::Cover ();
 use MetaCPAN::Script::Mirrors        ();
 use MetaCPAN::Script::Package        ();
 use MetaCPAN::Script::Permission     ();
@@ -92,7 +91,6 @@ sub wait_for_es {
 sub check_mappings {
     my $self    = $_[0];
     my %indices = ( map +( $_ => 'yellow' ), @{ es_config->all_indexes } );
-    my %aliases = %{ es_config->aliases };
 
     local @ARGV = qw(mapping --show_cluster_info);
 
@@ -104,9 +102,6 @@ sub check_mappings {
     note( Test::More::explain(
         { 'indices_info' => \%{ $mapping->indices_info } }
     ) );
-    note( Test::More::explain(
-        { 'aliases_info' => \%{ $mapping->aliases_info } }
-    ) );
 
     subtest 'only configured indices' => sub {
         ok( defined $indices{$_}, "indice '$_' is configured" )
@@ -120,17 +115,6 @@ sub check_mappings {
                 $indices{$_}, "index '$_' correct state '$indices{$_}'" );
         }
     };
-    subtest 'verify aliases' => sub {
-        ok "no aliases to verify"
-            if !%aliases;
-        foreach ( keys %aliases ) {
-            ok( defined $mapping->aliases_info->{$_},
-                "alias '$_' was created" );
-            is( $mapping->aliases_info->{$_}->{'index'},
-                $aliases{$_},
-                "alias '$_' correctly assigned to '$aliases{$_}'" );
-        }
-    };
 }
 
 sub put_mappings {
diff --git a/t/script/load.t b/t/script/load.t
index 65754fca4..546510bd4 100644
--- a/t/script/load.t
+++ b/t/script/load.t
@@ -5,42 +5,28 @@ use lib 't/lib';
 use Test::More;
 
 ## no perlimports
-use MetaCPAN::Script::Author                      ();
-use MetaCPAN::Script::Backpan                     ();
-use MetaCPAN::Script::Backup                      ();
-use MetaCPAN::Script::Check                       ();
-use MetaCPAN::Script::Checksum                    ();
-use MetaCPAN::Script::Contributor                 ();
-use MetaCPAN::Script::Cover                       ();
-use MetaCPAN::Script::CPANTesters                 ();
-use MetaCPAN::Script::CPANTestersAPI              ();
-use MetaCPAN::Script::External                    ();
-use MetaCPAN::Script::Favorite                    ();
-use MetaCPAN::Script::First                       ();
-use MetaCPAN::Script::Latest                      ();
-use MetaCPAN::Script::Mapping                     ();
-use MetaCPAN::Script::Mapping::Contributor        ();
-use MetaCPAN::Script::Mapping::Cover              ();
-use MetaCPAN::Script::Mapping::CPAN::Author       ();
-use MetaCPAN::Script::Mapping::CPAN::Distribution ();
-use MetaCPAN::Script::Mapping::CPAN::Favorite     ();
-use MetaCPAN::Script::Mapping::CPAN::File         ();
-use MetaCPAN::Script::Mapping::CPAN::Mirror       ();
-use MetaCPAN::Script::Mapping::CPAN::Package      ();
-use MetaCPAN::Script::Mapping::CPAN::Permission   ();
-use MetaCPAN::Script::Mapping::CPAN::Release      ();
-use MetaCPAN::Script::Mapping::DeployStatement    ();
-use MetaCPAN::Script::Mapping::User::Account      ();
-use MetaCPAN::Script::Mapping::User::Identity     ();
-use MetaCPAN::Script::Mapping::User::Session      ();
-use MetaCPAN::Script::Mirrors                     ();
-use MetaCPAN::Script::Package                     ();
-use MetaCPAN::Script::Permission                  ();
-use MetaCPAN::Script::Purge                       ();
-use MetaCPAN::Script::Queue                       ();
-use MetaCPAN::Script::Release                     ();
-use MetaCPAN::Script::Restart                     ();
-use MetaCPAN::Script::River                       ();
+use MetaCPAN::Script::Author         ();
+use MetaCPAN::Script::Backpan        ();
+use MetaCPAN::Script::Backup         ();
+use MetaCPAN::Script::Check          ();
+use MetaCPAN::Script::Checksum       ();
+use MetaCPAN::Script::Contributor    ();
+use MetaCPAN::Script::Cover          ();
+use MetaCPAN::Script::CPANTesters    ();
+use MetaCPAN::Script::CPANTestersAPI ();
+use MetaCPAN::Script::External       ();
+use MetaCPAN::Script::Favorite       ();
+use MetaCPAN::Script::First          ();
+use MetaCPAN::Script::Latest         ();
+use MetaCPAN::Script::Mapping        ();
+use MetaCPAN::Script::Mirrors        ();
+use MetaCPAN::Script::Package        ();
+use MetaCPAN::Script::Permission     ();
+use MetaCPAN::Script::Purge          ();
+use MetaCPAN::Script::Queue          ();
+use MetaCPAN::Script::Release        ();
+use MetaCPAN::Script::Restart        ();
+use MetaCPAN::Script::River          ();
 require MetaCPAN::Script::Role::Contributor;
 require MetaCPAN::Script::Role::External::Cygwin;
 require MetaCPAN::Script::Role::External::Debian;