Changed project folder layout