Tidied up the location of the work directory so it can be configured via System property.