Implement the domain model version of KWIC & add some missing files