Still trying to come up with a decent structure

Signed-off-by: Arne Schreuder <arne@consulta.co.za>