Changed package structure of project to add Mark's work to default


Signed-off-by: DCRichards <dcr24@sussex.ac.uk>