Refactored "Request" objects into a flatter heirarchy