Re-organize example to prepare for more.