Separate out sections

Signed-off-by: Jonathan Dieter <jdieter@lesbg.com>