Order model, storage and mapper separate
Merge branch 'master' of heroku.com:el-pasher