Changed structure of all servlets: simplified ridiculously