|#536 | +Anshul| Refactoring, Adding RnrDTO as part of Order, moving convertToOrder to OrderController