Revert "new shape"

This reverts commit c47f6e36bc20fac6c0543e6fa4c63bb5abd88f72.
Merge branch 'master' of https://github.com/remysanfeliu/Travelr