move servlets into servlet folder