web-context: internal re-organisation
Update README