Add comments in the example, rename some packages