#7 moved servlets to own module