Reorganize example, add missing articles