Big servlet refactor