Reorganization, and requests framework