Small changes in structure

Signed-off-by: Nicke Forsberg <nickeforsberg@rockheart.se>