One-line request process now + reorganization
Re-organization of file