Refactor workingdir to be one object per working dir
Clean up variable names, use new workingdir signature
Update specs