Starting servlet from servletcontextinitalizer.

Rearranged some classes.