Servlet2 module

Old references replaced by new ones