refactor project + add replace comp + sql uchet