Some more tidying

No more hard coded paths!