Cleanup: renamings, eliminating separate servlet for calbacks