improving the structure

Signed-off-by: Jonathan Haslett <jon@dashmedia.com.au>