Re-organize the servlet project.