refctor working directory