Reorganize sections to make them more intuitive

Signed-off-by: Eric Amundson <eric@ivycat.com>