revised structure

Signed-off-by: Christina Lafferty <christina.lafferty@cadient.com>