Moving ES specific code into separate package.
Fixing imports after moving with git.