Changed structure into separate files. Added all the required field for an order.