Refactor coffee app. Updated content.
Fixes #2