Update contracts for SQL builders; refactor packages