Refactor for orders, deals and position

Signed-off-by: Thomas <Thomas@tommyt.com.au>