Refactor into order module
Merge branch 'master' of https://github.com/unexpectedprofit-org/muzza