Updates to structure and styles

Signed-off-by: Jon Yardley <jonyardley@me.com>