Adds if section and re-organize the section list

This pull request adds if section.
Also, re-organize the section list.
Plus, minor fix.