Started refactor of httprequestfiles