Added Orders helper module
Refactor