[samjsharpe] more reorganisation