Refactoring the Request world. Put each sub class of Request into it's relevant module.