refactored, added servlets