Changed folder structure to add Elasticsearch as a submodule