(refactor) Refactored Request into Request and HttpRequest.

Much cleaner!