Refactor servlet module integration