more changes to structure

Signed-off-by: Danny <dannyholt@me.com>