Update reveal, reorganize.
Merge branch 'update'