Changed project structure & created client project