Structure structure structure

Signed-off-by: Dan Scott <dan@coffeecode.net>