Reorganize request handlers.