refactor; add client and clients objects