Moved some more code from esigate-servlet to esigate-core