Restructuring working dir