Fixed up basic working dir import paths. Still have more to do here, but its a start.