Restructored working directory