Refactor and generalize servlets
Merge remote-tracking branch 'origin/master'