moving more servlets to new OO model