Refactored servlets ,etc.