Change tools dir & improve CRUD helper