refactored working dir