Adjust README to match new structure
Merge remote-tracking branch 'origin/webapp'