Separate Elasticsearch log & storage services into separate features
Fix dependency issues