Move (web)/static into web/static dir.

Also recover contrib.staticfiles