Refactoring the Request-classes into a separate file.