update: more test servlets and file organization