Requests/Response Files loading and TODOs cleanup