Move ES hosts to a separate config file + small imports cleanup