Restructure
Add new WorkingDirectory.