Code review
Changed project package