REFACTOR es requestbuilder and listener module