Restructure project dirs