Move JSPs to subfolder; combine servlets into one.