Reorganize servlets