Restructuring project dirs