Remove contribs and examples

Everything has now been moved to a separate repository at
https://github.com/GrammaticalFramework/gf-contrib
The contents of the examples folder are build during SetupWeb

33 files changed, 0 insertions, 4992 deletions

diff --git a/examples/query/LexQuery.gf b/examples/query/LexQuery.gf
deleted file mode 100644
index 83bfeeaef..000000000
--- a/examples/query/LexQuery.gf
+++ /dev/null
@@ -1,36 +0,0 @@
-interface LexQuery = open Syntax in {
-
-oper
-  located_A : A ;
-  giveMe : NP -> VP ;
-  know_V2 : V2 ;
-
--- structural words
-  about_Prep : Prep ;
-  all_NP : NP ;
-  also_AdV : AdV ;
-  also_AdA : AdA ;
-  as_Prep : Prep ;
-  at_Prep : Prep ;
-  that_RP : RP ;
-
-  called_A : A ;
-
-  participlePropCN : Prop -> CN -> CN ;
-
-  vpAP : VP -> AP ;
-
-  information_N : N ;
-  other_A : A ;
-  otherwise_AdV : AdV ;
-  otherwise_AdA : AdA ;
-  what_IQuant : IQuant ;
-
--- lincats
-  Fun = {cn : CN ; prep : Prep} ;
-  Prop = {ap : AP ; vp : VP} ;
-  Rel = {ap : AP ; vp : VP ; prep : Prep} ;
-
-
-
-}
diff --git a/examples/query/LexQueryEng.gf b/examples/query/LexQueryEng.gf
deleted file mode 100644
index b1afc765e..000000000
--- a/examples/query/LexQueryEng.gf
+++ /dev/null
@@ -1,32 +0,0 @@
-instance LexQueryEng of LexQuery = 
-  open SyntaxEng, (M = MakeStructuralEng), ParadigmsEng, ExtraEng, IrregEng in {
-
-oper
-  located_A : A = mkA "located" | mkA "situated" ;
-
-  giveMe : NP -> VP = \np -> mkVP (mkV3 give_V) (mkNP i_Pron) np ; 
-  know_V2 = mkV2 know_V ;
-
--- structural words
-  about_Prep : Prep = mkPrep "about" ;
-  all_NP : NP = mkNP (mkPN "all") ; ---
-  also_AdV : AdV = mkAdV "also" ;
-  also_AdA : AdA = mkAdA "also" ;
-  as_Prep : Prep = mkPrep "as" ;
-  at_Prep : Prep = mkPrep "at" ;
-  that_RP = ExtraEng.that_RP ;
-
-  participlePropCN : Prop -> CN -> CN = \p,k -> mkCN p.ap k ;
-
-  vpAP = PartVP ;
-
-  called_A : A = mkA "called" | mkA "named" ;
-
-  information_N : N = mkN "information" ;
-  other_A : A = mkA "other" ;
-  otherwise_AdV : AdV = mkAdV "otherwise" ;
-  otherwise_AdA : AdA = mkAdA "otherwise" ;
-  what_IQuant : IQuant = M.mkIQuant "what" "what" ;
-
-
-}
diff --git a/examples/query/LexQueryFre.gf b/examples/query/LexQueryFre.gf
deleted file mode 100644
index 85d42ff0d..000000000
--- a/examples/query/LexQueryFre.gf
+++ /dev/null
@@ -1,32 +0,0 @@
-instance LexQueryFre of LexQuery = 
-  open SyntaxFre, (M = MakeStructuralFre), ParadigmsFre, ExtraFre, IrregFre in {
-
-oper
-  located_A : A = mkA "situé" ;
-
-  giveMe = \np -> mkVP (mkV2 (mkV "montrer")) np ; ---
-  know_V2 = IrregFre.savoir_V2 ;
-
--- structural words
-  about_Prep : Prep = mkPrep "sur" ;
-  all_NP : NP = mkNP (mkPN "tout") ; ---
-  also_AdV : AdV = mkAdV "aussi" ;
-  also_AdA : AdA = mkAdA "aussi" ;
-  as_Prep : Prep = mkPrep "pour" ; --- only used for "vad har X för Y"
-  at_Prep : Prep = mkPrep "chez" ; --- | mkPrep "hos" | mkPrep "vid" ;
-  that_RP = which_RP ;
-
-  participlePropCN : Prop -> CN -> CN = variants {} ;
-
-  vpAP _ = mkAP (mkA "nonexistant") ; --- not used, see LexQuery.participlePropCN
-
-  called_A : A = mkA "appelé" ;
-
-  information_N : N = mkN "information" feminine ;
-  other_A : A = prefixA (mkA "autre") ;
-  otherwise_AdV : AdV = mkAdV "autrement" ;
-  otherwise_AdA : AdA = mkAdA "autrement" ;
-  what_IQuant : IQuant = which_IQuant ;
-
-
-}
diff --git a/examples/query/LexQuerySwe.gf b/examples/query/LexQuerySwe.gf
deleted file mode 100644
index 733f2e959..000000000
--- a/examples/query/LexQuerySwe.gf
+++ /dev/null
@@ -1,32 +0,0 @@
-instance LexQuerySwe of LexQuery = 
-  open SyntaxSwe, (M = MakeStructuralSwe), ParadigmsSwe, ExtraSwe, IrregSwe in {
-
-oper
-  located_A : A = compoundA (mkA "belägen" "beläget" "belägna" [] []) ;
-
-  giveMe : NP -> VP = \np -> mkVP (mkV3 giva_V) (mkNP i_Pron) np ; 
-  know_V2 = mkV2 veta_V ;
-
--- structural words
-  about_Prep : Prep = mkPrep "om" ;
-  all_NP : NP = mkNP (mkPN "allt") ; ---
-  also_AdV : AdV = mkAdV "också" ;
-  also_AdA : AdA = mkAdA "även" ;
-  as_Prep : Prep = mkPrep "för" ; --- only used for "vad har X för Y"
-  at_Prep : Prep = mkPrep "på" ; --- | mkPrep "hos" | mkPrep "vid" ;
-  that_RP = which_RP ;
-
-  participlePropCN : Prop -> CN -> CN = variants {} ;
-
-  vpAP _ = mkAP (mkA "obefintlig") ; --- not used, see LexQuery.participlePropCN
-
-  called_A : A = compoundA (mkA "kallad" "kallat" "kallade" "kallade" "kallade") ;
-
-  information_N : N = mkN "information" "informationer" ;
-  other_A : A = compoundA (mkA "annan" "annat" "andra" "andra" "andra") ;
-  otherwise_AdV : AdV = mkAdV "annars" ;
-  otherwise_AdA : AdA = mkAdA "annars" ;
-  what_IQuant : IQuant = which_IQuant ;
-
-
-}
diff --git a/examples/query/Query.gf b/examples/query/Query.gf
deleted file mode 100644
index 6f6dab6bc..000000000
--- a/examples/query/Query.gf
+++ /dev/null
@@ -1,166 +0,0 @@
-abstract Query = {

-

-flags

-  startcat = Move ;

-

--- general query language, which can be specialized with any lexicon

-

-cat

-  Move ;     -- top-level utterance,    e.g. "give me all Bulgarian persons that work at Google"

-  Query ;   

-  Answer ;

-  Set ;           -- the set requested,      e.g. "all persons"

-  Interrogative ; -- interrog. pron.         e.g. "who" 

-  Function ;      -- something of something, e.g. "subregion of Bulgaria"

-  Kind ;          -- type of things,         e.g. "person"

-  Relation ;      -- relation between things,e.g. "employed at"

-  Property ;      -- property of things,     e.g. "employed at Google"

-  Individual ;    -- one entity,             e.g. "Google"

---  Activity ;      -- action property,        e.g. "work at Google"

-  Name ;          -- person, company...      e.g. "Eric Schmidt"

-  Loc ;

-  Org ;

-  Pers ;

-  [Individual] {2} ; -- list of entities, e.g. "Larry Page, Sergey Brin"

-

-fun

-  MQuery  : Query -> Move ;

-  MAnswer : Answer -> Move ;

- 

-  QSet    : Set  -> Query ;  -- (give me | what are | which are | ) (S | the names of S | S's names)

-  QWhere     : Set  -> Query ;  -- where are S

-  QWhat      : Interrogative -> Property -> Query ; -- who P

-  QWhatWhat  : Interrogative -> Interrogative -> Relation -> Query ; -- who R what

-  QWhatWhere : Interrogative -> Relation -> Query ; -- who R where --- overgenerating

-  QRelWhere  : Set -> Relation -> Query ; -- where does S R --- overgenerating

-  QFun       : Function -> Set -> Query ; -- what R does S have

-  QFunPair   : Set -> Function -> Query ; -- S and their R's

-  QInfo      : Set  -> Query ;  -- (give me | ) (information about | all about) S

-  QCalled    : Individual -> Query ; -- how is X (also | otherwise) (called | named | known) ;

-  QWhether   : Answer -> Query ; -- is S P --- not in the corpus, but should be ??

-

-  AKind  : Set  -> Kind     -> Answer ; -- S is a K

-  AInd   : Set  -> Individual -> Answer ; -- S is I

-  AName  : Set  -> Name     -> Answer ; -- N is the name of S

-  AProp  : Set  -> Property -> Answer ; -- S is P

---  AAct   : Set  -> Activity -> Answer ; -- S As --+

-

-  SAll   : Kind -> Set ;  -- all Ks | the Ks

-  SFun   : Set  -> Function -> Set ;  -- S's Rs

-  SOne   : Kind -> Set ;  -- one K

-  SIndef : Kind -> Set ;  -- a K

-  SDef   : Kind -> Set ;  -- the K

-  SPlural : Kind -> Set ;  -- Ks

-  SOther : Kind -> Set ;  -- other Ks

-  SInd   : Individual  -> Set ;  -- X

-  SInds  : [Individual] -> Set ; -- X and Y

-

-  IWho   : Interrogative ; -- who

-  IWhat  : Interrogative ; -- what

-  IWhich : Kind -> Interrogative ; -- which K | what K | which Ks | what Ks

-

-  KFunSet  : Function -> Set -> Kind ; -- R of S | S's R

-  KFunsSet : Function -> Function -> Set -> Kind ; -- R and Q of S

-  KFunKind : Kind -> Function -> Set -> Kind ; -- K that is R of S

-  KFunPair : Kind -> Function -> Kind ; -- S's with their R's

-  KProp    : Property -> Kind -> Kind ; -- P K | K that is P

---  KAct     : Activity -> Kind -> Kind ; -- K that Ps

-  KFun     : Function -> Kind ; -- R ---??

-

-  IName    : Name -> Individual ;

-

-  NLoc : Loc -> Name ;

-  NOrg : Org -> Name ;

-  NPers : Pers -> Name ;

-

-  PCalled  : Individual   -> Property ;  -- also called I

-  PCalleds : [Individual] -> Property ;  -- also called I or J

-

-  PIs      : Individual -> Property ;

-

-  PRelation : Relation -> Set -> Property ;

-

--- the test lexicon

-

-cat

-  Country ;

-  JobTitle ;

-fun

-  NCountry : Country -> Name ;

-  PCountry : Country -> Property ;

-

-  Located : Relation ;

-

-  In : Relation ;

-  HaveTitleAt : JobTitle -> Relation ;

-  EmployedAt : Set -> Relation ;

-  HaveTitle : Relation ;

-  Employed : Relation ;

-

-  Named : Name -> Property ;

-

-  Start : Name -> Property ;

-

-  Organization : Kind ;

-  Company : Kind ;

-  Place : Kind ;

-  Person : Kind ;

-

-  Location : Function ;

-  Region : Function ;

-  Subregion : Function ;

-

---  USA : Country ;

---  California : Country ;

---  Bulgaria : Country ;

---  OblastSofiya : Name ;

-

-  FName     : Function ;

-  FNickname : Function ;

-  FJobTitle : Function ;

-

-  SJobTitle : JobTitle -> Set ; -- a programmer

-

--- JobTitles

-   JobTitle1 : JobTitle ;

-   JobTitle2 : JobTitle ;

-   JobTitle3 : JobTitle ;

-   JobTitle4 : JobTitle ;

-

--- Locations

-   Location1 : Loc ;

-   Location2 : Loc ;

-   Location3 : Loc ;

-   Location4 : Loc ;

-

--- Organizations

-   Organization1 : Org ;

-   Organization2 : Org ;

-   Organization3 : Org ;

-   Organization4 : Org ;

-

--- Persons

-   Person1 : Pers ;

-   Person2 : Pers ;

-   Person3 : Pers ;

-   Person4 : Pers ;

-

---  CEO : JobTitle ;

---  ChiefInformationOfficer : JobTitle ;

-  

---  Microsoft : Name ;

---  Google : Name ;

-

---  SergeyBrin : Name ;

---  LarryPage : Name ;

---  EricSchmidt : Name ;

---  MarissaMayer : Name ;

---  UdiManber : Name ;

---  CarlGustavJung : Name ;

---  Jung : Name ;

---  BenFried : Name ;

-

-

-}

-

-

diff --git a/examples/query/QueryEng.gf b/examples/query/QueryEng.gf
deleted file mode 100644
index 77f2cfda8..000000000
--- a/examples/query/QueryEng.gf
+++ /dev/null
@@ -1,111 +0,0 @@
---# -path=.:present
-
-concrete QueryEng of Query = QueryI with 
-  (Syntax = SyntaxEng),
-  (Lang = LangEng),
-  (LexQuery = LexQueryEng) **
-open
-  LexQueryEng,
-  ParadigmsEng,
-  IrregEng,
-  SyntaxEng,
-  ExtraEng,
-  (L = LangEng),
-  (M = MakeStructuralEng),
-  Prelude
-in {
-
--- lexicon
-
-lin
-  Located = relAP (mkAP located_A) in_Prep ;
-
-  In = relVP UseCopula in_Prep ;
-
-  Employed = 
-      relAP (mkAP (mkA "employed")) at_Prep
---    | relAP (mkAP (mkA "employed")) by8agent_Prep
-    | relAP (mkAP (mkA "paid")) by8agent_Prep
-    | relAP (mkAP (mkA "active")) at_Prep
-    | relAP (mkAP (mkA "professionally active")) at_Prep
-    | relVP (mkVP (mkV "work")) at_Prep
-    | relVP (mkVP (mkV "collaborate")) in_Prep
-    ;
-
-  HaveTitle = 
-      relAP (mkAP (mkA "employed")) as_Prep
---    | relVP UseCopula noPrep
-    | relVP (mkVP (mkV "work")) as_Prep
---    | relVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "title"))))) possess_Prep
-    ;
-
-  EmployedAt s = 
-      relAP (mkAP (mkA2 (mkA "employed") at_Prep) s) as_Prep
---    | relAP (mkAP (mkA2 (mkA "employed") by8agent_Prep) s) as_Prep
-    | relVP (mkVP (mkV2 (mkV "work") at_Prep) s) as_Prep 
-    ;
-
-  HaveTitleAt t = 
-      relAP (mkAP (mkA2 (mkA "employed") as_Prep) (mkNP t)) at_Prep
---    | relAP (mkAP (mkA2 (mkA "employed") as_Prep) (mkNP t)) by8agent_Prep
-    | relVP (mkVP (mkNP a_Det t)) at_Prep
-    | relVP (mkVP (mkV2 (mkV "work") as_Prep) (mkNP t)) at_Prep 
---    | relVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "title")) (mkNP t)))) at_Prep 
-    ;
-
-  Named n = propAP  (mkAP (mkA2 (mkA "named") []) n) ;
-  Start n = propVP (mkVP (mkV2 "start" with_Prep) n) ;
-
-  Organization = mkCN (mkN "organization") ;
-  Company = mkCN (mkN "company") ;
-  Place = mkCN (mkN "place") ;
-  Person = 
-      mkCN (mkN "person" "people")
-    | mkCN (mkN "person") ;
-
-  Location = mkFunction "location" ;
-  Region = mkFunction "region" ;
-  Subregion = mkFunction "subregion" | mkFunction "sub-region" ;
-  FName = mkFunction "name" ;
-  FNickname = mkFunction "nickname" ;
-  FJobTitle = mkFunction "job title" | mkFunction "job" | mkFunction "position" |
-    mkFunction "appointment" | mkFunction "job position" | mkFunction "mandate" |
-    mkFunction "title" | mkFunction "capacity" ;
-
-  SJobTitle t = mkNP a_Det t ;
-
-oper
-  mkCountry : Str -> Str -> {np : NP ; a : A} = 
-    \n,a -> {np = mkNP (mkPN n) ; a = mkA a} ;
-
-  mkName : Str -> NP = 
-    \s -> mkNP (mkPN s) ;
-  mkFunction : Str -> Fun =
-    \s -> {cn = mkCN (mkN s) ; prep = possess_Prep} ;
-
-lin
--- JobTitles
-  JobTitle1 = mkCN (mkN "'JobTitle1") ;
-  JobTitle2 = mkCN (mkN "'JobTitle2") ;
-  JobTitle3 = mkCN (mkN "'JobTitle3") ;
-  JobTitle4 = mkCN (mkN "'JobTitle4") ;
-
--- Locations
-  Location1 = mkName "'Location1" ;
-  Location2 = mkName "'Location2" ;
-  Location3 = mkName "'Location3" ;
-  Location4 = mkName "'Location4" ;
-
--- Organizations
-  Organization1 = mkName "'Organization1" ;
-  Organization2 = mkName "'Organization2" ;
-  Organization3 = mkName "'Organization3" ;
-  Organization4 = mkName "'Organization4" ;
-
--- Persons
-  Person1 = mkName "'Person1" ;
-  Person2 = mkName "'Person2" ;
-  Person3 = mkName "'Person3" ;
-  Person4 = mkName "'Person4" ;
-
-}
diff --git a/examples/query/QueryFre.gf b/examples/query/QueryFre.gf
deleted file mode 100644
index 8fd24473b..000000000
--- a/examples/query/QueryFre.gf
+++ /dev/null
@@ -1,135 +0,0 @@
---# -path=.:present
-
-concrete QueryFre of Query = QueryI - 
-  [namePrep, propCalled, SFun, SAll, IWhat] 
-with 
-  (Syntax = SyntaxFre),
-  (Lang = LangFre),
-  (LexQuery = LexQueryFre) **
-open
-  LexQueryFre,
-  ParadigmsFre,
-  IrregFre,
-  SyntaxFre,
-  ExtraFre,
-  (L = LangFre),
-  (M = MakeStructuralFre),
-  Prelude
-in {
-
--- deviations from functor
-oper
--- prep not "av"
-  namePrep = possess_Prep ;
--- verb "heta"
-  propCalled : NP -> Prop = \i -> 
-      propVP (mkVP (mkAdV "aussi") (mkVP (mkV2 (reflV (mkV "appeler"))) i)) ;
-
-lin
-  SAll k = mkNP all_Predet (mkNP thePl_Det k) | mkNP thePl_Det k ;
-  SFun s r = mkNP (mkNP the_Quant plNum r.cn) (mkAdv r.prep s) ;
-  IWhat = mkIP (mkIDet which_IQuant) | mkIP (mkIDet which_IQuant pluralNum) ;
-
-
--- lexicon
-
-lin
-  Located = relAP (mkAP located_A) in_Prep ;
-
-  In = relVP useCopula in_Prep ;
-
-  Employed = 
-      relAP (mkAP (mkA "employé")) by8agent_Prep
-    | relAP (mkAP (mkA "payé")) by8agent_Prep
-    | relAP (mkAP (mkA "actif")) at_Prep
-    | relAP (mkAP (mkA "professionnellement actif")) at_Prep
-    | relVP (mkVP (mkV "travailler")) at_Prep
-    ;
-
-  HaveTitle = 
-      relAP (mkAP (mkA "employé")) som_Prep
-    | relVP useCopula noPrep
-    | relVP (mkVP (mkV "travailler")) som_Prep
-    | relVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "titre" masculine) noPrep)))) 
-        possess_Prep
-    ;
-
-  EmployedAt s = 
-      relAP (mkAP (mkA2 (mkA "employé") at_Prep) s) som_Prep
-    | relAP (mkAP (mkA2 (mkA "employé") by8agent_Prep) s) som_Prep
-    | relVP (mkVP (mkV2 (mkV "travailler") at_Prep) s) som_Prep 
-    ;
-
-  HaveTitleAt t = 
-      relAP (mkAP (mkA2 (mkA "employé") som_Prep) (mkNP t)) at_Prep
-    | relAP (mkAP (mkA2 (mkA "employé") som_Prep) (mkNP t)) by8agent_Prep
-    | relVP (mkVP (mkNP a_Det t)) at_Prep
-    | relVP (mkVP (mkV2 (mkV "travailler") som_Prep) (mkNP t)) at_Prep 
-    | relVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "titre") noPrep) 
-        (mkNP t)))) at_Prep 
-    ;
-
-  Named n = propAP  (mkAP (mkA2 called_A (mkPrep [])) n) ;
-  Start n = propVP (mkVP (mkV2 (mkV "commencer") with_Prep) n) ;
-
-  Organization = mkCN (mkN "organisation" feminine) ;
-  Company = mkCN (mkN "entreprise") ;
-  Place = mkCN (mkN "lieu") | mkCN (mkN "endroit") ;
-  Person = 
-      mkCN (mkN "personne")
-    | mkCN (mkN "personne" "gens" feminine) ;
-
-  Location = mkFunctionP (mkN "localité") possess_Prep ;
-  Region = mkFunctionP (mkN "région" feminine) possess_Prep ;
-  Subregion = mkFunctionP (mkN "sous-région" feminine) possess_Prep ;
-  FName = mkFunctionP (mkN "nom") possess_Prep ;
-  FNickname = mkFunctionP (mkN "surnom") possess_Prep ;
-  FJobTitle = 
-     mkFunctionP (mkN "titre" masculine) possess_Prep
-   | mkFunctionP (mkN "position" feminine) possess_Prep ;
-
-  SJobTitle t = mkNP a_Det t ;
-
-oper
-  mkCountry : Str -> Str -> {np : NP ; a : A} = 
-    \n,a -> {np = mkNP (mkPN n) ; a = mkA a} ;
-
-  mkName : Str -> NP = 
-    \s -> mkNP (mkPN s) ;
-  mkFunction : Str -> Fun =
-    \s -> {cn = mkCN (mkN s) ; prep = possess_Prep} ;
-  mkFunctionP : N -> Prep -> Fun =
-    \n,p -> {cn = mkCN n ; prep = p} ;
-
-  som_Prep = mkPrep "comme" ;
-
-  noPrep = mkPrep [] ;
-
-  useCopula = mkVP être_V ;
-
-lin
--- JobTitles
-  JobTitle1 = mkCN (mkN "'JobTitle1") ;
-  JobTitle2 = mkCN (mkN "'JobTitle2") ;
-  JobTitle3 = mkCN (mkN "'JobTitle3") ;
-  JobTitle4 = mkCN (mkN "'JobTitle4") ;
-
--- Locations
-  Location1 = mkName "'Location1" ;
-  Location2 = mkName "'Location2" ;
-  Location3 = mkName "'Location3" ;
-  Location4 = mkName "'Location4" ;
-
--- Organizations
-  Organization1 = mkName "'Organization1" ;
-  Organization2 = mkName "'Organization2" ;
-  Organization3 = mkName "'Organization3" ;
-  Organization4 = mkName "'Organization4" ;
-
--- Persons
-  Person1 = mkName "'Person1" ;
-  Person2 = mkName "'Person2" ;
-  Person3 = mkName "'Person3" ;
-  Person4 = mkName "'Person4" ;
-
-}
diff --git a/examples/query/QueryI.gf b/examples/query/QueryI.gf
deleted file mode 100644
index 05d3ee938..000000000
--- a/examples/query/QueryI.gf
+++ /dev/null
@@ -1,185 +0,0 @@
-incomplete concrete QueryI of Query = open
-  Syntax,
-  LexQuery,
-  Lang,
-  Prelude
-in {
-
-lincat
-  Move = Utt ; ---- Text ;
-  Query = Utt ;
-  Answer = Cl ; -- Utt ;
-  Set = NP ;
-  Interrogative = IP ;
-  Function = Fun ; -- = {cn : CN ; prep : Prep} ;
-  Kind = CN ;
-  Property = Prop ; -- = {ap : AP ; vp : VP} ;
-  Relation = Rel ; -- = {ap : AP ; vp : VP ; prep : Prep} ;
-  Individual = NP ;
-  Name = NP ;
-  Loc = NP ;
-  Org = NP ;
-  Pers = NP ;
-  [Individual] = [NP] ;
-
-lin
-  MQuery  q = q ; ---- mkText (mkPhr q) questMarkPunct ;
-  MAnswer a = mkUtt a ; ---- mkText (mkPhr a) fullStopPunct ;
- 
-  QSet s = 
-    let 
-     ss : NP = s 
-        | mkNP (mkNP theSg_Det Lang.name_N) (mkAdv namePrep s)
-        | mkNP (mkNP thePl_Det Lang.name_N) (mkAdv namePrep s)
-----        | mkNP (GenNP s) sgNum Lang.name_N 
-----        | mkNP (GenNP s) plNum Lang.name_N ;
-    in 
-      mkUtt (mkImp (giveMe ss))
-    | mkUtt (mkQS (mkQCl (Lang.CompIP whatSg_IP) ss))
-    | mkUtt (mkQS (mkQCl (Lang.CompIP (Lang.IdetIP (mkIDet which_IQuant))) ss))
-    | mkUtt ss ;
-
-  QWhere s = 
-      mkUtt (mkQS (mkQCl where_IAdv s))
-    | mkUtt (mkQS (mkQCl where_IAdv (mkCl s located_A))) ;
-  QWhat i p = mkUtt (mkQS (mkQCl i p.vp)) ;
-  QRelWhere s p = mkUtt (mkQS (mkQCl where_IAdv (mkCl s p.vp))) ;
-
-  QFun r s = 
-      mkUtt 
-        (mkImp (giveMe (mkNP and_Conj s (detSet s r.cn))))
-    | mkUtt (mkQS (mkQCl (mkIP what_IQuant plNum r.cn) s have_V2))
-    | mkUtt (mkQS (mkQCl whatSg_IP 
-        (mkClSlash (mkClSlash s have_V2) (mkAdv LexQuery.as_Prep (mkNP aPl_Det r.cn))))) ; 
-
-  QFunPair s f = 
-    let 
-     ss0 : NP = s 
-              | mkNP (mkNP thePl_Det Lang.name_N) (mkAdv namePrep s) ;
-     ss  : NP = mkNP and_Conj ss0 (mkNP (mkQuant they_Pron) plNum f.cn)
-              | mkNP ss0 (mkAdv with_Prep (mkNP (mkQuant they_Pron) plNum f.cn))
-    in 
-      mkUtt (mkImp (giveMe ss))
-    | mkUtt (mkQS (mkQCl (Lang.CompIP whatPl_IP) ss))
-    | mkUtt (mkQS (mkQCl (Lang.CompIP (Lang.IdetIP (mkIDet which_IQuant))) ss))
-    | mkUtt ss ;
-
-  QInfo  s = 
-    let
-      info : NP = mkNP (all_NP | (mkNP information_N)) (mkAdv about_Prep s) ;
-    in
-      mkUtt (mkImp (giveMe info))
-    | mkUtt (mkQCl whatSg_IP 
-        (mkClSlash (mkClSlash (mkNP youSg_Pron) LexQuery.know_V2) (mkAdv about_Prep s)))
-    | mkUtt info ;
-
-  QCalled i = mkUtt (mkQS (mkQCl how_IAdv (mkCl i 
-    (mkVP (also_AdV | otherwise_AdV) (mkVP called_A))))) ;
-
-  QWhether a = mkUtt (mkQS a) ;
-
-  AInd s i = (mkCl s i) ;
-  AName s n = (mkCl n (mkNP the_Det (mkCN Lang.name_N (mkAdv namePrep s)))) ;
-  AProp s p = (mkCl s p.vp) ;
-
-  SAll k = mkNP all_Predet (mkNP aPl_Det k) | mkNP thePl_Det k ;
-  SOne k = mkNP n1_Numeral k ;
-  SIndef k = mkNP a_Det k ;
-  SDef k = mkNP the_Det k ;
-  SPlural k = mkNP aPl_Det k ;
-  SOther k = mkNP aPl_Det (mkCN other_A k) ;
-  SInd i = i ;
-  SInds is = mkNP and_Conj is ;
-
-  IWhich k = 
-      mkIP what_IQuant  (sgNum | plNum) k
-    | mkIP which_IQuant (sgNum | plNum) k ;
-
-  IWho = whoSg_IP | whoPl_IP ;
-  IWhat = whatSg_IP | whatPl_IP ;
-
-  KFunSet r s = 
-     mkCN r.cn (mkAdv r.prep s) ;
-
-  KFunKind k r s = 
-     mkCN k (mkRS (mkRCl which_RP (mkVP (mkNP aPl_Det (mkCN r.cn (mkAdv r.prep s))))))
-   | mkCN k (mkRS (mkRCl that_RP (mkVP (mkNP aPl_Det (mkCN r.cn (mkAdv r.prep s)))))) 
-   ;
-  
-  KFunPair k r = mkCN k (mkAdv with_Prep (mkNP (mkQuant they_Pron) plNum r.cn)) ;
-  KProp p k = 
-      participlePropCN p k
-    | mkCN k (mkRS (mkRCl which_RP p.vp)) 
-    | mkCN k (mkRS (mkRCl that_RP p.vp)) 
-     ;
-  KFun r = r.cn ;
-
-  IName n = n ;
-
-  PCalled  i  = propCalled i ;
-  PCalleds is = propCalled (mkNP or_Conj is) ;
-
-  BaseIndividual = mkListNP ;
-  ConsIndividual = mkListNP ;
-
--- these need new things in resource
-lin
-  KFunsSet r q s = 
-     mkCN (ConjCN and_Conj (BaseCN r.cn q.cn)) (mkAdv r.prep s) ;
-  SFun s r = mkNP (GenNP s) plNum r.cn | mkNP (GenNP s) sgNum r.cn ;
-  QWhatWhat i j p = mkUtt (mkQS (QuestQVP i (AdvQVP p.vp (mkIAdv p.prep j)))) ;
-  QWhatWhere i p = mkUtt (mkQS (QuestQVP i (AdvQVP p.vp where_IAdv))) ;
-  PIs i = propVP (mkVP i) ;
-  AKind s k = (mkCl s (Lang.UseComp (Lang.CompCN k))) ;
-
-  PRelation r s = {
-    ap = AdvAP r.ap (mkAdv r.prep s) ; 
-    vp = mkVP r.vp (mkAdv r.prep s)
-    } ;
-
-oper
-  namePrep : Prep = possess_Prep ;
-
-  relVP : VP -> Prep -> Rel = \vp,p -> {
-    ap = vpAP vp ;
-    vp = vp ;
-    prep = p
-    } ;
-
-  propVP : VP -> Prop = \vp -> {
-    ap = vpAP vp ;
-    vp = vp
-    } ;
-
-  propAP : AP -> Prop = \ap -> {
-    ap = ap ;
-    vp = mkVP ap
-    } ;
-
-  relAP : AP -> Prep -> Rel = \ap,p -> {
-    ap = ap ;
-    vp = mkVP ap ;
-    prep = p
-    } ;
-
-  propCalled : NP -> Prop = \i -> 
-    propAP (mkAP (also_AdA | otherwise_AdA) (mkAP (mkA2 called_A (mkPrep [])) i)) ;
-
-  detSet : NP -> CN -> NP = \s,c -> 
-    mkNP (mkQuant they_Pron) plNum c ;
-
-
--- lexicon
-
-lincat
-  Country = {np : NP ; a : A} ;
-  JobTitle = CN ;
-lin
-  NCountry c = c.np ;
-  PCountry c = propAP (mkAP c.a) ;
-
-  NLoc n = n ;
-  NOrg n = n ;
-  NPers n = n;
-}
-
diff --git a/examples/query/QuerySwe.gf b/examples/query/QuerySwe.gf
deleted file mode 100644
index c02615da8..000000000
--- a/examples/query/QuerySwe.gf
+++ /dev/null
@@ -1,134 +0,0 @@
---# -path=.:present
-
-concrete QuerySwe of Query = QueryI - [namePrep, propCalled, KFunPair] with 
-  (Syntax = SyntaxSwe),
-  (Lang = LangSwe),
-  (LexQuery = LexQuerySwe) **
-open
-  LexQuerySwe,
-  ParadigmsSwe,
-  IrregSwe,
-  SyntaxSwe,
-  ExtraSwe,
-  (L = LangSwe),
-  (M = MakeStructuralSwe),
-  Prelude
-in {
-
--- deviations from functor
-oper
--- prep not "av"
-  namePrep = on_Prep ;
--- verb "heta"
-  propCalled : NP -> Prop = \i -> 
-      propVP (mkVP (mkAdV "även") (mkVP (mkV2 (depV (mkV "kalla")) for_Prep) i))
-    | propVP (mkVP (mkAdV "även") (mkVP (mkV2 "heter") i)) ;
-
-lin
-  KFunPair k r = mkCN k (mkAdv with_Prep (sina r.cn)) ;
-
-oper
-  sina : CN -> NP = \cn -> mkNP (M.mkPredet "sin" "sitt" "sina") (mkNP a_Quant plNum cn) ; ---- should be in ExtraSwe
-
--- lexicon
-
-lin
-  Located = relAP (mkAP located_A) in_Prep ;
-
-  In = relVP UseCopula in_Prep ;
-
-  Employed = 
-      relAP (mkAP (mkA "anställd" "anställt")) at_Prep
---    | relAP (mkAP (mkA "anställd" "anställt")) by8agent_Prep
---    | relAP (mkAP (mkA "betald" "betalt")) by8agent_Prep
-    | relAP (mkAP (mkA "aktiv")) at_Prep
-    | relAP (mkAP (mkA "professionellt aktiv")) at_Prep
-    | relVP (mkVP (mkV "arbeta")) at_Prep
-    | relVP (mkVP (mkV "jobba")) at_Prep
-    | relVP (mkVP (mkV "medarbeta")) at_Prep
-    ;
-
-  HaveTitle = 
-      relAP (mkAP (mkA "anställd" "anställt")) som_Prep
---    | relVP UseCopula noPrep
-    | relVP (mkVP (mkV "arbeta")) som_Prep
-    | relVP (mkVP (mkV "jobba")) som_Prep
---    | relVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "titel" "titlar") noPrep)))) possess_Prep
-    ;
-
-  EmployedAt s = 
-      relAP (mkAP (mkA2 (mkA "anställd" "anställt") at_Prep) s) som_Prep
---    | relAP (mkAP (mkA2 (mkA "anställd" "anställt") by8agent_Prep) s) som_Prep
-    | relVP (mkVP (mkV2 (mkV "arbeta") at_Prep) s) som_Prep 
-    | relVP (mkVP (mkV2 (mkV "jobba") at_Prep) s) som_Prep 
-    ;
-
-  HaveTitleAt t = 
-      relAP (mkAP (mkA2 (mkA "anställd" "anställt") som_Prep) (mkNP t)) at_Prep
---    | relAP (mkAP (mkA2 (mkA "anställd" "anställt") som_Prep) (mkNP t)) by8agent_Prep
-    | relVP (mkVP (mkNP a_Det t)) at_Prep
-    | relVP (mkVP (mkV2 (mkV "arbeta") som_Prep) (mkNP t)) at_Prep 
-    | relVP (mkVP (mkV2 (mkV "jobba") som_Prep) (mkNP t)) at_Prep 
---    | relVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "titel" "titlar") noPrep) (mkNP t)))) at_Prep 
-    ;
-
-  Named n = propAP  (mkAP (mkA2 called_A (mkPrep [])) n) ;
-  Start n = propVP (mkVP (mkV2 "börja" with_Prep) n) ;
-
-  Organization = mkCN (mkN "organisation" "organisationer") ;
-  Company = mkCN (mkN "företag" "företag") ;
-  Place = mkCN (mkN "plats" "platser") | mkCN (mkN "ställe" "ställen") ;
-  Person = 
-      mkCN (mkN "person" "personen" "folk" "folket")
-    | mkCN (mkN "person" "personer") ;
-
-  Location = mkFunctionP (mkN "läge" "lägen") possess_Prep ;
-  Region = mkFunctionP (mkN "region" "regioner") possess_Prep ;
-  Subregion = mkFunctionP (mkN "delregion" "delregioner") possess_Prep ;
-  FName = mkFunctionP (mkN "namn" "namn") on_Prep ;
-  FNickname = mkFunctionP (mkN "tilläggsnamn" "tilläggsnamn") on_Prep ;
-  FJobTitle = 
-     mkFunctionP (mkN "jobb" "jobb") possess_Prep
-   | mkFunction "befattning" ;
-
-  SJobTitle t = mkNP a_Det t ;
-
-oper
-  mkCountry : Str -> Str -> {np : NP ; a : A} = 
-    \n,a -> {np = mkNP (mkPN n) ; a = mkA a} ;
-
-  mkName : Str -> NP = 
-    \s -> mkNP (mkPN s) ;
-  mkFunction : Str -> Fun =
-    \s -> {cn = mkCN (mkN s) ; prep = possess_Prep} ;
-  mkFunctionP : N -> Prep -> Fun =
-    \n,p -> {cn = mkCN n ; prep = p} ;
-
-  som_Prep = mkPrep "som" ;
-
-lin
--- JobTitles
-  JobTitle1 = mkCN (mkN "'JobTitle1") ;
-  JobTitle2 = mkCN (mkN "'JobTitle2") ;
-  JobTitle3 = mkCN (mkN "'JobTitle3") ;
-  JobTitle4 = mkCN (mkN "'JobTitle4") ;
-
--- Locations
-  Location1 = mkName "'Location1" ;
-  Location2 = mkName "'Location2" ;
-  Location3 = mkName "'Location3" ;
-  Location4 = mkName "'Location4" ;
-
--- Organizations
-  Organization1 = mkName "'Organization1" ;
-  Organization2 = mkName "'Organization2" ;
-  Organization3 = mkName "'Organization3" ;
-  Organization4 = mkName "'Organization4" ;
-
--- Persons
-  Person1 = mkName "'Person1" ;
-  Person2 = mkName "'Person2" ;
-  Person3 = mkName "'Person3" ;
-  Person4 = mkName "'Person4" ;
-
-}
diff --git a/examples/query/README b/examples/query/README
deleted file mode 100644
index 94ead32e7..000000000
--- a/examples/query/README
+++ /dev/null
@@ -1,57 +0,0 @@
-Copyright (c) 2010 Aarne Ranta, under LGPL(3).
-Part of MOLTO Project, WP 4.
-
-Query language, based on the corpus from Ontotext.
-
-Purpose: natural language queries to an ontology database.
-
-Work in progress: 
-- 19 June parsing 28% 160/562
-- 17 June 2010 first version, parsing under 10%
-
-
-The corpus contains misspellings and ungrammatical sentences; these will (mostly) not
-be covered by the grammar.
-
-Test:
-
-  -- start GF with the grammar; notice that lib/present/ must have latest Eng libraries,
-  -- which can be provided by 'runghc Make present lang api langs=Eng' in lib/src/
-  % gf QueryEng.gf
-  -- parse a sentence and see all variants
-  > p "Bulgarian people working at Google" | l -all
-
-Regression test:
-
-  -- run the parser on the corpus
-  % gf QueryEng.gf <test.gfs > test.results8
-  -- compute the number of sentences not covered
-  % grep "no tree" test.results8 | wc
-
-
-Semantics: generic logical semantics, that could be mapped to many query languages.
-The denotations of the main categories are, assuming a domain of individuals:
-
-  Set ;           P(P(D)) (generalized quantifier) -- the set requested, e.g. "all persons"
-  Function ;      D -> P(D)   -- something of something, e.g. "subregion of Bulgaria"
-  Kind ;          P(D)        -- type of things,         e.g. "person"
-  Relation ;      D -> D -> T -- relation between things,e.g. "employed at"
-  Property ;      D -> T      -- property of things,     e.g. "employed at Google"
-  Individual ;    D           -- one entity,             e.g. "Google"
-  Name ;          D           -- person, company...      e.g. "Eric Schmidt"
-
-
-Characteristics:
-- simple AST's, lots of variants (easily hundreds per query)
-- semantic overgeneration, e.g. "Google works at Larry Page"
-- some ambiguities, e.g.
-
-    > give me the organizations and their locations
-    MQuery (QFun Location (SAll Organization))
-    MQuery (QFunPair (SAll Organization) Location)
-   
-  Maybe harmless?
-
-Resource grammar was not quite enough; added for instance multiple interrogatives
-("who is employed as what where") in Extra and ExtraEng
-
diff --git a/examples/query/TestQuery.gf b/examples/query/TestQuery.gf
deleted file mode 100644
index a91f256b1..000000000
--- a/examples/query/TestQuery.gf
+++ /dev/null
@@ -1,26 +0,0 @@
-abstract TestQuery = Query ** {

-

-fun

-  USA : Country ;

-  California : Country ;

-  Bulgaria : Country ;

-  OblastSofiya : Name ;

-

-  CEO : JobTitle ;

-  ChiefInformationOfficer : JobTitle ;

-  

-  Microsoft : Name ;

-  Google : Name ;

-

-  SergeyBrin : Name ;

-  LarryPage : Name ;

-  EricSchmidt : Name ;

-  MarissaMayer : Name ;

-  UdiManber : Name ;

-  CarlGustavJung : Name ;

-  Jung : Name ;

-  BenFried : Name ;

-

-}

-

-

diff --git a/examples/query/TestQueryEng.gf b/examples/query/TestQueryEng.gf
deleted file mode 100644
index 898a5b03a..000000000
--- a/examples/query/TestQueryEng.gf
+++ /dev/null
@@ -1,38 +0,0 @@
---# -path=.:present
-
-concrete TestQueryEng of TestQuery = QueryEng **
-open
-  LexQueryEng,
-  ParadigmsEng,
-  IrregEng,
-  SyntaxEng,
-  ExtraEng,
-  (L = LangEng),
-  (M = MakeStructuralEng),
-  Prelude
-in {
-
--- test lexicon
-
-lin
-  USA = mkCountry "USA" "American" ;
-  Bulgaria = mkCountry "Bulgaria" "Bulgarian" ;
-  California = mkCountry "California" "Californian" ;
-  OblastSofiya = mkName "Oblast Sofiya" ;
-
-  CEO = mkCN (mkN "CEO") ;
-  ChiefInformationOfficer = mkCN (mkN "Chief Information Officer") ;
-
-  Microsoft = mkName "Microsoft" ;
-  Google = mkName "Google" ;
-
-  SergeyBrin = mkName "Sergey Brin" ;
-  LarryPage = mkName "Larry Page" ;
-  EricSchmidt = mkName "Eric Schmidt" ;
-  MarissaMayer = mkName "Marissa Mayer" ;
-  UdiManber = mkName "Udi Manber" ;
-  CarlGustavJung = mkName "Carl Gustav Jung" ;
-  Jung = mkName "Jung" ;
-  BenFried = mkName "Ben Fried" ;
-
-}
diff --git a/examples/query/TestQuerySwe.gf b/examples/query/TestQuerySwe.gf
deleted file mode 100644
index da20230e9..000000000
--- a/examples/query/TestQuerySwe.gf
+++ /dev/null
@@ -1,38 +0,0 @@
---# -path=.:present
-
-concrete TestQuerySwe of TestQuery = QuerySwe **
-open
-  LexQuerySwe,
-  ParadigmsSwe,
-  IrregSwe,
-  SyntaxSwe,
-  ExtraSwe,
-  (L = LangSwe),
-  (M = MakeStructuralSwe),
-  Prelude
-in {
-
--- test lexicon
-
-lin
-  USA = mkCountry "USA" "amerikansk" ;
-  Bulgaria = mkCountry "Bulgarien" "bulgarisk" ;
-  California = mkCountry "Kalifornien" "Kalifornisk" ;
-  OblastSofiya = mkName "Oblast Sofiya" ;
-
-  CEO = mkCN (mkN "VD" "VD:ar") ;
-  ChiefInformationOfficer = mkCN (mkN "chefsinformatör" "chefsinformatörer") ;
-
-  Microsoft = mkName "Microsoft" ;
-  Google = mkName "Google" ;
-
-  SergeyBrin = mkName "Sergey Brin" ;
-  LarryPage = mkName "Larry Page" ;
-  EricSchmidt = mkName "Eric Schmidt" ;
-  MarissaMayer = mkName "Marissa Mayer" ;
-  UdiManber = mkName "Udi Manber" ;
-  CarlGustavJung = mkName "Carl Gustav Jung" ;
-  Jung = mkName "Jung" ;
-  BenFried = mkName "Ben Fried" ;
-
-}
diff --git a/examples/query/small/Makefile b/examples/query/small/Makefile
deleted file mode 100644
index 351850274..000000000
--- a/examples/query/small/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-all: pgf treebank
-
-pgf: 
-	gf -make -optimize-pgf Query???.gf
-
-treebank:
-	gf --run Query.pgf <tests.gfs >treebank.txt
-
-
-
diff --git a/examples/query/small/Query.gf b/examples/query/small/Query.gf
deleted file mode 100644
index 14bca9e53..000000000
--- a/examples/query/small/Query.gf
+++ /dev/null
@@ -1,106 +0,0 @@
-abstract Query = {

-

-flags

-  startcat = Move ;

-

--- general query language, which can be specialized with any lexicon

-

-cat

-  Move ;     -- top-level utterance,    e.g. "give me all Bulgarian persons that work at Google"

-  Query ;

-  Answer ;

-  Set ;      -- the set requested,      e.g. "all persons"

-  Relation ; -- something of something, e.g. "subregion of Bulgaria"

-  Kind ;     -- type of things,         e.g. "person"

-  Property ; -- property of things,     e.g. "employed at Google"

-  Individual ; -- one entity,           e.g. "Google"

-  Activity ;   -- action property,      e.g. "work at Google"

-  Name ;       -- person, company...    e.g. "Eric Schmidt"

-  Loc ;

-  Org ;

-  Pers ;

-  [Individual] {2} ; -- list of entities, e.g. "Larry Page, Sergey Brin"

-

-fun

-  MQuery  : Query -> Move ;

-  MAnswer : Answer -> Move ;

-

-  QSet    : Set  -> Query ;  -- (give me | what are | which are | ) (S | the names of S | S's names)

-  QWhere  : Set  -> Query ;  -- where are S

-  QInfo   : Set  -> Query ;  -- (give me | ) (information about | all about) S

-  QCalled : Individual -> Query ; -- how is X (also | otherwise) (called | named | known) ;

-

-  AKind  : Set  -> Kind     -> Answer ; -- S is a K

-  AProp  : Set  -> Property -> Answer ; -- S is P

-  AAct   : Set  -> Activity -> Answer ; -- S As

-

-  SAll   : Kind -> Set ;  -- all Ks | the Ks

-  SOne   : Kind -> Set ;  -- one K

-  SIndef : Kind -> Set ;  -- a K

-  SPlural : Kind -> Set ;  -- Ks

-  SOther : Kind -> Set ;  -- other Ks

-  SInd   : Individual  -> Set ;  -- X

-  SInds  : [Individual] -> Set ; -- X and Y

-

-  KRelSet  : Relation -> Set -> Kind ; -- R of S | S's R

-  KRelKind : Kind -> Relation -> Set -> Kind ; -- K that is R of S

-  KRelPair : Kind -> Relation -> Kind ; -- S's with their R's

-  KProp    : Property -> Kind -> Kind ; -- P K | K that is P

-  KAct     : Activity -> Kind -> Kind ; -- K that Ps

-  KRel     : Relation -> Kind ; -- R ---??

-

-  IName    : Name -> Individual ;

-

-  NLoc : Loc -> Name ;

-  NOrg : Org -> Name ;

-  NPers : Pers -> Name ;

-

-  ACalled  : [Individual] -> Activity ;

-

--- the test lexicon

-

-cat

-  JobTitle ;

-fun

-  Located : Loc -> Property ;

-  Employed : Org -> Property ;

-

-  Work : Org -> Activity ;

-  HaveTitle : JobTitle -> Activity ;

-  HaveTitleOrg : JobTitle -> Org -> Activity ;

-

-  Organization : Kind ;

-  Place : Kind ;

-  Person : Kind ;

-

-  Location : Relation ;

-  Region : Relation ;

-  Subregion : Relation ;

-

-  RName     : Relation ;

-  RNickname : Relation ;

-

--- JobTitles

-   JobTitle1 : JobTitle ;

-   JobTitle2 : JobTitle ;

-   JobTitle3 : JobTitle ;

-   JobTitle4 : JobTitle ;

-

--- Locations

-   Location1 : Loc ;

-   Location2 : Loc ;

-   Location3 : Loc ;

-   Location4 : Loc ;

-

--- Organizations

-   Organization1 : Org ;

-   Organization2 : Org ;

-   Organization3 : Org ;

-   Organization4 : Org ;

-

--- Persons

-   Person1 : Pers ;

-   Person2 : Pers ;

-   Person3 : Pers ;

-   Person4 : Pers ;

-}

diff --git a/examples/query/small/QueryEng.gf b/examples/query/small/QueryEng.gf
deleted file mode 100644
index 207e56483..000000000
--- a/examples/query/small/QueryEng.gf
+++ /dev/null
@@ -1,180 +0,0 @@
---# -path=.:alltenses
-
-concrete QueryEng of Query = open
-  ParadigmsEng,
-  IrregEng,
-  SyntaxEng,
-  ExtraEng,
-  (L = GrammarEng),
-  Prelude
-in {
-
-lincat
-  Move = Utt ; ---- Text ;
-  Query = Utt ;
-  Answer = Utt ;
-  Set = NP ;
-  Relation = {cn : CN ; prep : Prep} ;
-  Kind = CN ;
-  Property = AP ; ---- {vp : VP ; typ : PropTyp} ;
-  Individual = NP ;
-  Activity = VP ;
-  Name = NP ;
-  Loc = NP ;
-  Org = NP ;
-  Pers = NP ;
-  [Individual] = [NP] ;
-
-lin
-  MQuery  q = q ; ---- mkText (mkPhr q) questMarkPunct ;
-  MAnswer a = a ; ---- mkText (mkPhr a) fullStopPunct ;
-
-  QSet s =
-    let
-     ss : NP = s
-        | mkNP (mkNP thePl_Det name_N) (mkAdv possess_Prep s)
-        ---- s's names
-    in
-      mkUtt (mkImp (mkVP give_V3 (mkNP i_Pron) ss))
-    | mkUtt (mkQS (mkQCl (L.CompIP whatSg_IP) ss))
-    | mkUtt (mkQS (mkQCl (L.CompIP (L.IdetIP (mkIDet which_IQuant))) ss))
-    | mkUtt ss ;
-
-  QWhere s = mkUtt (mkQS (mkQCl where_IAdv s)) ;
-  QInfo  s =
-    let
-      info : NP = mkNP all_Predet (mkNP (mkNP information_N) (mkAdv about_Prep s)) ;
-    in
-      mkUtt (mkImp (mkVP give_V3 (mkNP i_Pron) info))
-    | mkUtt info ;
-
-  QCalled i = mkUtt (mkQS (mkQCl how_IAdv (mkCl i (mkVP also_AdV (mkVP called_A))))) ;
-
-  AKind s k = mkUtt (mkCl s (mkNP aPl_Det k)) ; ---- a, fun of s
-  AProp s p = mkUtt (mkCl s p) ;
-  AAct s p = mkUtt (mkCl s p) ;
-
-  SAll k = mkNP all_Predet (mkNP aPl_Det k) | mkNP thePl_Det k ;
-  SOne k = mkNP n1_Numeral k ;
-  SIndef k = mkNP a_Det k ;
-  SPlural k = mkNP aPl_Det k ;
-  SOther k = mkNP aPl_Det (mkCN other_A k) ;
-  SInd i = i ;
-  SInds is = mkNP and_Conj is ;
-
-  KRelSet r s =
-     mkCN r.cn (mkAdv r.prep s) ;
-     ---- | S's R
-
-----  KRelsSet r q s =
-----     mkCN r.cn (mkAdv r.prep s) ;
-
-  KRelKind k r s =
-    mkCN k (mkRS (mkRCl that_RP (mkVP (mkNP aPl_Det (mkCN r.cn (mkAdv r.prep s)))))) ;
-
-  KRelPair k r = mkCN k (mkAdv with_Prep (mkNP (mkQuant they_Pron) plNum r.cn)) ;
-  KProp p k =
-     mkCN p k
-   | mkCN k (mkRS (mkRCl that_RP (mkVP p))) ;
-  KAct p k =
-     mkCN k (mkRS (mkRCl that_RP p)) ;
-  KRel r = r.cn ;
-
-  IName n = n ;
-  NLoc n = n ;
-  NOrg n = n ;
-  NPers n = n;
-
-  ACalled is = mkVP also_AdV (mkVP (mkAP (mkA2 called_A []) (mkNP or_Conj is))) ;
-
-  BaseIndividual = mkListNP ;
-  ConsIndividual = mkListNP ;
-
-oper
--- structural words
-  about_Prep = mkPrep "about" ;
-  all_NP = mkNP (mkPN "all") ; ---
-  also_AdV = mkAdV "also" | mkAdV "otherwise" ;
-  as_Prep = mkPrep "as" ;
-  at_Prep = mkPrep "at" ;
-  called_A = mkA "called" | mkA "named" ;
-  give_V3 = mkV3 give_V ;
-  information_N = mkN "information" ;
-  other_A = mkA "other" ;
-  name_N = mkN "name" ;
-
--- lexical constructors
-  mkName : Str -> NP =
-    \s -> mkNP (mkPN s) ;
-  mkRelation : Str -> {cn : CN ; prep : Prep} =
-    \s -> {cn = mkCN (mkN s) ; prep = possess_Prep} ;
-
--- lexicon
-
-lincat
-  JobTitle = CN ;
-lin
-  Located i =
-      mkAP (mkA2 (mkA "located") in_Prep) i
-    | mkAP (mkA2 (mkA "situated") in_Prep) i ;
-
-  Employed i =
-      mkAP (mkA2 (mkA "employed") by8agent_Prep) i
-    | mkAP (mkA2 (mkA "paid") by8agent_Prep) i
-    | mkAP (mkA2 (mkA "active") at_Prep) i
-    | mkAP (mkA2 (mkA "professionally active") at_Prep) i ;
-
-  Work i =
-      mkVP (mkV2 (mkV "work") at_Prep) i
-    | mkVP (mkV2 (mkV "collaborate") in_Prep) i ;
-
-  HaveTitle t =
-      mkVP (mkAP (mkA2 (mkA "employed") as_Prep) (mkNP t))
-    | mkVP (mkV2 (mkV "work") as_Prep) (mkNP t) ;
-
-  HaveTitleOrg t i =
-      mkVP (mkVP (mkAP (mkA2 (mkA "employed") as_Prep) (mkNP t))) (mkAdv at_Prep i)
-    | mkVP (mkVP (mkV2 (mkV "work") as_Prep) (mkNP t)) (mkAdv at_Prep i) ;
---    | mkVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "title")) (mkNP t)))) (mkAdv at_Prep i) ;
-
-  Organization = mkCN (mkN "organization") ;
-  Place = mkCN (mkN "place") ;
-  Person =
-      mkCN (mkN "person" "people")
-    | mkCN (mkN "person") ;
-
-  Location = mkRelation "location" ;
-  Region = mkRelation "region" ;
-  Subregion = mkRelation "subregion" ;
-  RName = mkRelation "name" ;
-  RNickname = mkRelation "nickname" ;
-
--- JobTitles
-  JobTitle1 = mkCN (mkN "'JobTitle1") ;
-  JobTitle2 = mkCN (mkN "'JobTitle2") ;
-  JobTitle3 = mkCN (mkN "'JobTitle3") ;
-  JobTitle4 = mkCN (mkN "'JobTitle4") ;
-
--- Locations
-  Location1 = mkName "'Location1" ;
-  Location2 = mkName "'Location2" ;
-  Location3 = mkName "'Location3" ;
-  Location4 = mkName "'Location4" ;
-
--- Organizations
-  Organization1 = mkName "'Organization1" ;
-  Organization2 = mkName "'Organization2" ;
-  Organization3 = mkName "'Organization3" ;
-  Organization4 = mkName "'Organization4" ;
-
--- Persons
-  Person1 = mkName "'Person1" ;
-  Person2 = mkName "'Person2" ;
-  Person3 = mkName "'Person3" ;
-  Person4 = mkName "'Person4" ;
-
-oper
-  mkCountry : Str -> Str -> {np : NP ; a : A} =
-    \n,a -> {np = mkNP (mkPN n) ; a = mkA a} ;
-
-}
diff --git a/examples/query/small/QueryFin.gf b/examples/query/small/QueryFin.gf
deleted file mode 100644
index b7b5c7b4d..000000000
--- a/examples/query/small/QueryFin.gf
+++ /dev/null
@@ -1,144 +0,0 @@
---# -path=.:alltenses
-
-concrete QueryFin of Query = open
-  ParadigmsFin,
-  SyntaxFin,
-  ExtraFin,
-  (G = GrammarFin),
-  SymbolicFin,
-  Prelude
-in {
-
-flags coding = utf8 ;
-
-lincat
-  Move = Utt ; ---- Text ;
-  Query = Utt ;
-  Answer = Utt ;
-  Set = NP ;
-  Relation = {cn : CN ; prep : Prep} ;
-  Kind = CN ;
-  Property = AP ; ---- {vp : VP ; typ : PropTyp} ;
-  Individual = NP ;
-  Activity = VP ;
-  Name = NP ;
-  Loc = NP ;
-  Org = NP ;
-  Pers = NP ;
-  [Individual] = [NP] ;
-
-lin
-  MQuery  q = q ;
-  MAnswer a = a ;
-
-  QSet s = mkUtt (mkImp (mkV2 (mkV "näyttää")) s) ;
-
-  QWhere s = mkUtt (mkQS (ICompExistNP (mkIComp where_IAdv) s)) ;
-  QInfo s = mkUtt (mkImp (mkVP (mkV2 (mkV "antaa")) 
-              (mkNP all_Predet (mkNP thePl_Det (mkCN (mkN "tieto") (mkAdv about_Prep s)))))) ;
-
-  QCalled i = mkUtt (mkQS (mkQCl what_IP (mkNP (GenNP i) (mkCN (mkA "toinen") (mkN "nimi" "nimiä"))))) ;
-
-  AKind s k = mkUtt (mkCl s (mkNP aPl_Det k)) ; ---- a, fun of s
-  AProp s p = mkUtt (mkCl s p) ;
-  AAct s p = mkUtt (mkCl s p) ;
-
-  SAll k = mkNP all_Predet (mkNP thePl_Det k) ;
-  SOne k = mkNP n1_Numeral k ;
-  SIndef k = mkNP someSg_Det k ;
-  SPlural k = mkNP aPl_Det k ;
-  SOther k = mkNP aPl_Det (mkCN other_A k) ;
-  SInd i = i ;
-  SInds is = mkNP and_Conj is ;
-
-  KRelSet r s = GenCN s r.cn ;
-
-  KRelKind k r s = mkCN k (mkRS (mkRCl that_RP (mkVP (mkNP aPl_Det (GenCN s r.cn))))) ;
-
-  KRelPair k r = G.ConjCN and_Conj (G.BaseCN k (GenCN these_NP r.cn)) ;
-  KProp p k = mkCN p k ;
-  KAct p k = mkCN k (mkRS (mkRCl that_RP p)) ;
-  KRel r = r.cn ;
-
-  IName n = n ;
-  NLoc n = n ;
-  NOrg n = n ;
-  NPers n = n;
-
-  ACalled is = mkVP also_AdV (mkVP (mkAP (mkA2 called_A (casePrep translative)) (mkNP or_Conj is))) ;
-
-  BaseIndividual = mkListNP ;
-  ConsIndividual = mkListNP ;
-
-oper
--- structural words
-  about_Prep = casePrep elative ;
-  all_NP = mkNP (mkPN (mkN "kaikki" "kaiken" "kaikkia")) ; ---
-  also_AdV = ss "myös" ;
-  as_Prep = casePrep essive ;
-  at_Prep = casePrep adessive ;
-  called_A = mkA "kutsuttu" ;
-  give_V3 = mkV3 (mkV "antaa") (casePrep allative) (casePrep nominative) ;
-  information_N = mkN "tieto" ;
-  other_A = mkA "muu" ;
-  that_RP = which_RP ;
-
--- lexical constructors
-  mkName : N -> Str -> NP =
-    \n,s -> mkNP the_Det (mkCN n (symb s)) ;
-  mkRelation : N -> {cn : CN ; prep : Prep} =
-    \s -> {cn = mkCN s ; prep = possess_Prep} ;
-
--- lexicon
-
-lincat
-  JobTitle = CN ;
-lin
-  NCountry c = c.np ;
-  PCountry c = mkAP c.a ;
-
-  Located i = mkAP (mkA2 (mkA "sijaitseva") in_Prep) i ;
-
-  Employed i = mkAP (mkA2 (mkA (mkN "työssä" (mkN "oleva"))) in_Prep) i ;
-
-  Work i = mkVP (mkV2 (mkV "työskennellä") in_Prep) i ;
-
-  HaveTitle t = mkVP have_V2 (mkNP the_Det (mkCN (mkN "asema") (mkNP the_Det t))) ;
-  HaveTitleOrg t i = mkVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN "asema") (mkNP the_Det t)))) (mkAdv in_Prep i) ;
-
-  Organization = mkCN (mkN "organisaatio" "organisaatioita") ;
-  Place = mkCN (mkN "paikka") ;
-  Person = mkCN (mkN "henkilö" "henkilöitä") ;
-
-  Location = mkRelation (mkN "sijainti") ;
-  Region = mkRelation (mkN "alue") ;
-  Subregion = mkRelation (mkN "osa") ;
-  RName = mkRelation (mkN "nimi" "nimiä") ;
-  RNickname = mkRelation (mkN "lisänimi" "lisänimiä") ;
-
--- JobTitles
-  JobTitle1 = mkCN (mkN "'JobTitle1") ;
-  JobTitle2 = mkCN (mkN "'JobTitle2") ;
-  JobTitle3 = mkCN (mkN "'JobTitle3") ;
-  JobTitle4 = mkCN (mkN "'JobTitle4") ;
-
--- Locations
-  Location1 = mkName (mkN "paikka") "'Location1" ;
-  Location2 = mkName (mkN "paikka") "'Location2" ;
-  Location3 = mkName (mkN "paikka") "'Location3" ;
-  Location4 = mkName (mkN "paikka") "'Location4" ;
-
--- Organizations
-  Organization1 = mkName (mkN "organisaatio") "'Organization1" ;
-  Organization2 = mkName (mkN "organisaatio") "'Organization2" ;
-  Organization3 = mkName (mkN "organisaatio") "'Organization3" ;
-  Organization4 = mkName (mkN "organisaatio") "'Organization4" ;
-
--- Persons
-  Person1 = mkName (mkN "henkilö") "'Person1" ;
-  Person2 = mkName (mkN "henkilö") "'Person2" ;
-  Person3 = mkName (mkN "henkilö") "'Person3" ;
-  Person4 = mkName (mkN "henkilö") "'Person4" ;
-
-
-}
diff --git a/examples/query/small/QueryFre.gf b/examples/query/small/QueryFre.gf
deleted file mode 100644
index d0451832e..000000000
--- a/examples/query/small/QueryFre.gf
+++ /dev/null
@@ -1,150 +0,0 @@
---# -path=.:alltenses
-
-concrete QueryFre of Query = open
-  ParadigmsFre,
-  SyntaxFre,
-  ExtraFre,
-  (G = GrammarFre),
-  SymbolicFre,
-  Prelude
-in {
-
-flags coding = utf8 ;
-
--- for a baseline: just change these lexical entries
-oper
-  about_Prep = on_Prep ;
-  also_AdV = lin AdV (ss "aussi") ;
-  as_Prep = mkPrep "comme" ;
-  at_Prep = mkPrep "chez" ;
-  called_A = mkA "appelé" ;
-  give_V = mkV "montrer" ;
-  information_N = mkN "information" ;
-  other_A = prefixA (mkA "autre") ;
-  name_N = mkN "nom" ;
-  nickname_N = mkN "surnom" ;
-  located_A = mkA "situé" ;
-  employed_A = mkA "employé" ;
-  work_V = mkV "travailler" ;
-  position_N = mkN "poste" masculine ;
-  organization_N =  mkN "organisation" ;
-  place_N = mkN "endroit" ;
-  person_N = mkN "personne" ;
-  location_N = mkN "position" ;
-  region_N = mkN "région" ;
-  subregion_N = mkN "sous-région" ;
-
-lincat
-  Move = Utt ; ---- Text ;
-  Query = Utt ;
-  Answer = Utt ;
-  Set = NP ;
-  Relation = {cn : CN ; prep : Prep} ;
-  Kind = CN ;
-  Property = AP ; ---- {vp : VP ; typ : PropTyp} ;
-  Individual = NP ;
-  Activity = VP ;
-  Name = NP ;
-  Loc = NP ;
-  Org = NP ;
-  Pers = NP ;
-  [Individual] = [NP] ;
-
-lin
-  MQuery  q = q ;
-  MAnswer a = a ;
-
-  QSet s = mkUtt (mkVP (mkV2 give_V) s) ;
-
-  QWhere s = mkUtt (mkQS (mkQCl where_IAdv s)) ;
-  QInfo s = mkUtt (mkVP (mkV2 give_V) 
-              (mkNP all_Predet (mkNP thePl_Det (mkCN information_N (mkAdv on_Prep s))))) ;
-
-  QCalled i = mkUtt (mkQS (mkQCl (mkIP whichSg_IDet (mkCN other_A name_N)) i have_V2)) ; 
-
-  AKind s k = mkUtt (mkCl s (mkNP aPl_Det k)) ;
-  AProp s p = mkUtt (mkCl s p) ;
-  AAct s p = mkUtt (mkCl s p) ;
-
-  SAll k = mkNP all_Predet (mkNP thePl_Det k) ;
-  SOne k = mkNP n1_Numeral k ;
-  SIndef k = mkNP someSg_Det k ;
-  SPlural k = mkNP aPl_Det k ;
-  SOther k = mkNP aPl_Det (mkCN other_A k) ;
-  SInd i = i ;
-  SInds is = mkNP and_Conj is ;
-
-  KRelSet r s = mkCN r.cn (mkAdv r.prep s) ;
-  KRelKind k r s = mkCN k (mkRS (mkRCl which_RP (mkVP (mkNP aPl_Det (mkCN r.cn (mkAdv r.prep s)))))) ;
-
-  KRelPair k r = mkCN k (mkAdv with_Prep (mkNP (mkQuant they_Pron) plNum r.cn)) ;
-  KProp p k = mkCN p k ;
-  KAct p k = mkCN k (mkRS (mkRCl which_RP p)) ;
-  KRel r = r.cn ;
-
-  IName n = n ;
-  NLoc n = n ;
-  NOrg n = n ;
-  NPers n = n;
-
-  ACalled is = mkVP also_AdV (mkVP (mkAP (mkA2 called_A (mkPrep "")) (mkNP or_Conj is))) ;
-
-  BaseIndividual = mkListNP ;
-  ConsIndividual = mkListNP ;
-
-oper
-
--- lexical constructors
-  mkName : Str -> NP =
-    \s -> mkNP (mkPN s) ;
-  mkRelation : N -> {cn : CN ; prep : Prep} =
-    \s -> {cn = mkCN s ; prep = possess_Prep} ;
-
--- lexicon
-
-lincat
-  JobTitle = CN ;
-lin
-  Located i = mkAP (mkA2 located_A in_Prep) i ;
-  Employed i = mkAP (mkA2 employed_A at_Prep) i ;
-  Work i = mkVP (mkV2 work_V at_Prep) i ;
-
-  HaveTitle t = mkVP have_V2 (mkNP the_Det (mkCN position_N (mkAdv possess_Prep (mkNP t)))) ;
-  HaveTitleOrg t i = mkVP (mkVP have_V2 (mkNP the_Det (mkCN position_N (mkAdv possess_Prep (mkNP t))))) (mkAdv in_Prep i) ;
-
-  Organization = mkCN organization_N ;
-  Place = mkCN place_N ;
-  Person = mkCN person_N ;
-
-  Location = mkRelation location_N ;
-  Region = mkRelation region_N ;
-  Subregion = mkRelation subregion_N ;
-  RName = mkRelation name_N ;
-  RNickname = mkRelation nickname_N ;
-
--- JobTitles
-  JobTitle1 = mkCN (mkN "'JobTitle1") ;
-  JobTitle2 = mkCN (mkN "'JobTitle2") ;
-  JobTitle3 = mkCN (mkN "'JobTitle3") ;
-  JobTitle4 = mkCN (mkN "'JobTitle4") ;
-
--- Locations
-  Location1 = mkName "'Location1" ;
-  Location2 = mkName "'Location2" ;
-  Location3 = mkName "'Location3" ;
-  Location4 = mkName "'Location4" ;
-
--- Organizations
-  Organization1 = mkName "'Organization1" ;
-  Organization2 = mkName "'Organization2" ;
-  Organization3 = mkName "'Organization3" ;
-  Organization4 = mkName "'Organization4" ;
-
--- Persons
-  Person1 = mkName "'Person1" ;
-  Person2 = mkName "'Person2" ;
-  Person3 = mkName "'Person3" ;
-  Person4 = mkName "'Person4" ;
-
-
-}
diff --git a/examples/query/small/QueryGer.gf b/examples/query/small/QueryGer.gf
deleted file mode 100644
index 72c77ed68..000000000
--- a/examples/query/small/QueryGer.gf
+++ /dev/null
@@ -1,150 +0,0 @@
---# -path=.:alltenses
-
-concrete QueryGer of Query = open
-  ParadigmsGer,
-  SyntaxGer,
-  ExtraGer,
-  (G = GrammarGer),
-  SymbolicGer,
-  Prelude
-in {
-
-flags coding = utf8 ;
-
--- for a baseline: just change these lexical entries
-oper
-  about_Prep = on_Prep ;
-  also_AdV = lin AdV (ss "auch") ;
-  as_Prep = mkPrep "als" nominative ;
-  at_Prep = mkPrep "bei" dative ;
-  called_A = mkA "gekannt" ;
-  give_V = mkV "zeigen" ;
-  information_N = mkN "Information" ;
-  other_A = mkA "ander" ;
-  name_N = mkN "Name" "Namen" masculine ;
-  nickname_N = mkN "Spitzname" "Spitznamen" masculine ;
-  located_A = mkA "situiert" ;
-  employed_A = mkA "beschäftigt" ; 
-  work_V = mkV "arbeiten" ;
-  position_N = mkN "Position" ;
-  organization_N =  mkN "Organisation" ;
-  place_N = mkN "Stelle" ;
-  person_N = mkN "Persone" ;
-  location_N = mkN "Lage" ;
-  region_N = mkN "Region" ;
-  subregion_N = mkN "Teilbereich" "Teilbereiche" masculine ;
-
-lincat
-  Move = Utt ; ---- Text ;
-  Query = Utt ;
-  Answer = Utt ;
-  Set = NP ;
-  Relation = {cn : CN ; prep : Prep} ;
-  Kind = CN ;
-  Property = AP ; ---- {vp : VP ; typ : PropTyp} ;
-  Individual = NP ;
-  Activity = VP ;
-  Name = NP ;
-  Loc = NP ;
-  Org = NP ;
-  Pers = NP ;
-  [Individual] = [NP] ;
-
-lin
-  MQuery  q = q ;
-  MAnswer a = a ;
-
-  QSet s = mkUtt politeImpForm (mkImp (mkVP (mkV2 give_V) s)) ;
-
-  QWhere s = mkUtt (mkQS (mkQCl where_IAdv s)) ;
-  QInfo s = mkUtt politeImpForm (mkImp (mkVP (mkV2 give_V) 
-              (mkNP all_Predet (mkNP aPl_Det (mkCN information_N (mkAdv (mkPrep "über" accusative) s)))))) ;
-
-  QCalled i = mkUtt (mkQS (mkQCl (mkIP whichSg_IDet (mkCN other_A name_N)) i have_V2)) ; 
-
-  AKind s k = mkUtt (mkCl s (mkNP aPl_Det k)) ;
-  AProp s p = mkUtt (mkCl s p) ;
-  AAct s p = mkUtt (mkCl s p) ;
-
-  SAll k = mkNP all_Predet (mkNP aPl_Det k) ;
-  SOne k = mkNP a_Det k ;
-  SIndef k = mkNP someSg_Det k ;
-  SPlural k = mkNP aPl_Det k ;
-  SOther k = mkNP aPl_Det (mkCN other_A k) ;
-  SInd i = i ;
-  SInds is = mkNP and_Conj is ;
-
-  KRelSet r s = mkCN r.cn (mkAdv r.prep s) ;
-  KRelKind k r s = mkCN k (mkRS (mkRCl which_RP (mkVP (mkNP aPl_Det (mkCN r.cn (mkAdv r.prep s)))))) ;
-
-  KRelPair k r = mkCN k (mkAdv with_Prep (mkNP (mkQuant they_Pron) plNum r.cn)) ;
-  KProp p k = mkCN p k ;
-  KAct p k = mkCN k (mkRS (mkRCl which_RP p)) ;
-  KRel r = r.cn ;
-
-  IName n = n ;
-  NLoc n = n ;
-  NOrg n = n ;
-  NPers n = n;
-
-  ACalled is = mkVP also_AdV (mkVP (mkAP (mkA2 called_A (mkPrep "" nominative)) (mkNP or_Conj is))) ;
-
-  BaseIndividual = mkListNP ;
-  ConsIndividual = mkListNP ;
-
-oper
-
--- lexical constructors
-  mkName : Str -> NP =
-    \s -> mkNP (mkPN s) ;
-  mkRelation : N -> {cn : CN ; prep : Prep} =
-    \s -> {cn = mkCN s ; prep = possess_Prep} ;
-
--- lexicon
-
-lincat
-  JobTitle = CN ;
-lin
-  Located i = mkAP (mkA2 located_A in_Prep) i ;
-  Employed i = mkAP (mkA2 employed_A at_Prep) i ;
-  Work i = mkVP (mkV2 work_V at_Prep) i ;
-
-  HaveTitle t = mkVP have_V2 (mkNP the_Det (mkCN position_N (mkAdv possess_Prep (mkNP t)))) ;
-  HaveTitleOrg t i = mkVP (mkVP have_V2 (mkNP the_Det (mkCN position_N (mkAdv possess_Prep (mkNP t))))) (mkAdv in_Prep i) ;
-
-  Organization = mkCN organization_N ;
-  Place = mkCN place_N ;
-  Person = mkCN person_N ;
-
-  Location = mkRelation location_N ;
-  Region = mkRelation region_N ;
-  Subregion = mkRelation subregion_N ;
-  RName = mkRelation name_N ;
-  RNickname = mkRelation nickname_N ;
-
--- JobTitles
-  JobTitle1 = mkCN (mkN "'JobTitle1") ;
-  JobTitle2 = mkCN (mkN "'JobTitle2") ;
-  JobTitle3 = mkCN (mkN "'JobTitle3") ;
-  JobTitle4 = mkCN (mkN "'JobTitle4") ;
-
--- Locations
-  Location1 = mkName "'Location1" ;
-  Location2 = mkName "'Location2" ;
-  Location3 = mkName "'Location3" ;
-  Location4 = mkName "'Location4" ;
-
--- Organizations
-  Organization1 = mkName "'Organization1" ;
-  Organization2 = mkName "'Organization2" ;
-  Organization3 = mkName "'Organization3" ;
-  Organization4 = mkName "'Organization4" ;
-
--- Persons
-  Person1 = mkName "'Person1" ;
-  Person2 = mkName "'Person2" ;
-  Person3 = mkName "'Person3" ;
-  Person4 = mkName "'Person4" ;
-
-
-}
diff --git a/examples/query/small/QueryIta.gf b/examples/query/small/QueryIta.gf
deleted file mode 100644
index dd5cd14b5..000000000
--- a/examples/query/small/QueryIta.gf
+++ /dev/null
@@ -1,150 +0,0 @@
---# -path=.:alltenses
-
-concrete QueryIta of Query = open
-  ParadigmsIta,
-  SyntaxIta,
-  ExtraIta,
-  (G = GrammarIta),
-  SymbolicIta,
-  Prelude
-in {
-
-flags coding = utf8 ;
-
--- for a baseline: just change these lexical entries
-oper
-  about_Prep = on_Prep ;
-  also_AdV = lin AdV (ss "anche") ;
-  as_Prep = mkPrep "come" ;
-  at_Prep = mkPrep "presso" ;
-  called_A = mkA "chiamato" ;
-  give_V = mkV "mostrare" ;
-  information_N = mkN "informazione" feminine ;
-  other_A = prefixA (mkA "altro") ;
-  name_N = mkN "nome" ;
-  nickname_N = mkN "soprannome" ; 
-  located_A = mkA "situato" ;
-  employed_A = mkA "impiegato" ; 
-  work_V = mkV "lavorare" ;
-  position_N = mkN "posto" ;
-  organization_N =  mkN "organizzazione" feminine ;
-  place_N = mkN "luogo" ;
-  person_N = mkN "persona" ;
-  location_N = mkN "posizione" feminine ;
-  region_N = mkN "regione" feminine ;
-  subregion_N = mkN "sottoregione" feminine ;
-
-lincat
-  Move = Utt ; ---- Text ;
-  Query = Utt ;
-  Answer = Utt ;
-  Set = NP ;
-  Relation = {cn : CN ; prep : Prep} ;
-  Kind = CN ;
-  Property = AP ; ---- {vp : VP ; typ : PropTyp} ;
-  Individual = NP ;
-  Activity = VP ;
-  Name = NP ;
-  Loc = NP ;
-  Org = NP ;
-  Pers = NP ;
-  [Individual] = [NP] ;
-
-lin
-  MQuery  q = q ;
-  MAnswer a = a ;
-
-  QSet s = mkUtt (mkVP (mkV2 give_V) s) ;
-
-  QWhere s = mkUtt (mkQS (mkQCl where_IAdv s)) ;
-  QInfo s = mkUtt (mkVP (mkV2 give_V) 
-              (mkNP all_Predet (mkNP thePl_Det (mkCN information_N (mkAdv on_Prep s))))) ;
-
-  QCalled i = mkUtt (mkQS (mkQCl (mkIP whichSg_IDet (mkCN other_A name_N)) i have_V2)) ; 
-
-  AKind s k = mkUtt (mkCl s (mkNP aPl_Det k)) ;
-  AProp s p = mkUtt (mkCl s p) ;
-  AAct s p = mkUtt (mkCl s p) ;
-
-  SAll k = mkNP all_Predet (mkNP thePl_Det k) ;
-  SOne k = mkNP a_Det k ;
-  SIndef k = mkNP someSg_Det k ;
-  SPlural k = mkNP aPl_Det k ;
-  SOther k = mkNP aPl_Det (mkCN other_A k) ;
-  SInd i = i ;
-  SInds is = mkNP and_Conj is ;
-
-  KRelSet r s = mkCN r.cn (mkAdv r.prep s) ;
-  KRelKind k r s = mkCN k (mkRS (mkRCl which_RP (mkVP (mkNP aPl_Det (mkCN r.cn (mkAdv r.prep s)))))) ;
-
-  KRelPair k r = mkCN k (mkAdv with_Prep (mkNP (mkQuant they_Pron) plNum r.cn)) ;
-  KProp p k = mkCN p k ;
-  KAct p k = mkCN k (mkRS (mkRCl which_RP p)) ;
-  KRel r = r.cn ;
-
-  IName n = n ;
-  NLoc n = n ;
-  NOrg n = n ;
-  NPers n = n;
-
-  ACalled is = mkVP also_AdV (mkVP (mkAP (mkA2 called_A (mkPrep "")) (mkNP or_Conj is))) ;
-
-  BaseIndividual = mkListNP ;
-  ConsIndividual = mkListNP ;
-
-oper
-
--- lexical constructors
-  mkName : Str -> NP =
-    \s -> mkNP (mkPN s) ;
-  mkRelation : N -> {cn : CN ; prep : Prep} =
-    \s -> {cn = mkCN s ; prep = possess_Prep} ;
-
--- lexicon
-
-lincat
-  JobTitle = CN ;
-lin
-  Located i = mkAP (mkA2 located_A in_Prep) i ;
-  Employed i = mkAP (mkA2 employed_A at_Prep) i ;
-  Work i = mkVP (mkV2 work_V at_Prep) i ;
-
-  HaveTitle t = mkVP have_V2 (mkNP the_Det (mkCN position_N (mkAdv possess_Prep (mkNP t)))) ;
-  HaveTitleOrg t i = mkVP (mkVP have_V2 (mkNP the_Det (mkCN position_N (mkAdv possess_Prep (mkNP t))))) (mkAdv in_Prep i) ;
-
-  Organization = mkCN organization_N ;
-  Place = mkCN place_N ;
-  Person = mkCN person_N ;
-
-  Location = mkRelation location_N ;
-  Region = mkRelation region_N ;
-  Subregion = mkRelation subregion_N ;
-  RName = mkRelation name_N ;
-  RNickname = mkRelation nickname_N ;
-
--- JobTitles
-  JobTitle1 = mkCN (mkN "'JobTitle1") ;
-  JobTitle2 = mkCN (mkN "'JobTitle2") ;
-  JobTitle3 = mkCN (mkN "'JobTitle3") ;
-  JobTitle4 = mkCN (mkN "'JobTitle4") ;
-
--- Locations
-  Location1 = mkName "'Location1" ;
-  Location2 = mkName "'Location2" ;
-  Location3 = mkName "'Location3" ;
-  Location4 = mkName "'Location4" ;
-
--- Organizations
-  Organization1 = mkName "'Organization1" ;
-  Organization2 = mkName "'Organization2" ;
-  Organization3 = mkName "'Organization3" ;
-  Organization4 = mkName "'Organization4" ;
-
--- Persons
-  Person1 = mkName "'Person1" ;
-  Person2 = mkName "'Person2" ;
-  Person3 = mkName "'Person3" ;
-  Person4 = mkName "'Person4" ;
-
-
-}
diff --git a/examples/query/small/QuerySwe.gf b/examples/query/small/QuerySwe.gf
deleted file mode 100644
index f56ee6b53..000000000
--- a/examples/query/small/QuerySwe.gf
+++ /dev/null
@@ -1,174 +0,0 @@
---# -path=.:alltenses
-
-concrete QuerySwe of Query = open
-  ParadigmsSwe,
-  IrregSwe,
-  SyntaxSwe,
-  ExtraSwe,
-  (M = MakeStructuralSwe),
-  (L = GrammarSwe),
-  Prelude
-in {
-
-flags coding = utf8 ;
-
-lincat
-  Move = Utt ; ---- Text ;
-  Query = Utt ;
-  Answer = Utt ;
-  Set = NP ;
-  Relation = {cn : CN ; prep : Prep} ;
-  Kind = CN ;
-  Property = AP ; ---- {vp : VP ; typ : PropTyp} ;
-  Individual = NP ;
-  Activity = VP ;
-  Name = NP ;
-  Loc = NP ;
-  Org = NP ;
-  Pers = NP ;
-  [Individual] = [NP] ;
-
-lin
-  MQuery  q = q ; ---- mkText (mkPhr q) questMarkPunct ;
-  MAnswer a = a ; ---- mkText (mkPhr a) fullStopPunct ;
-
-  QSet s =
-    let
-     ss : NP = s
-        | mkNP (mkNP thePl_Det name_N) (mkAdv on_Prep s)
-        ---- s's names
-    in
-      mkUtt (mkImp (mkVP give_V3 (mkNP i_Pron) ss))
-    | mkUtt (mkQS (mkQCl (L.CompIP whatSg_IP) ss))
-    | mkUtt (mkQS (mkQCl (L.CompIP (L.IdetIP (mkIDet which_IQuant))) ss))
-    | mkUtt ss ;
-
-  QWhere s = mkUtt (mkQS (mkQCl where_IAdv s)) ;
-  QInfo  s =
-    let
-      info : NP = mkNP all_Predet (mkNP (mkNP information_N) (mkAdv about_Prep s)) ;
-    in
-      mkUtt (mkImp (mkVP give_V3 (mkNP i_Pron) info))
-    | mkUtt info ;
-
-  QCalled i = mkUtt (mkQS (mkQCl (mkIP whichSg_IDet (mkCN other_A name_N)) i have_V2)) ; 
-
-  AKind s k = mkUtt (mkCl s (mkNP aPl_Det k)) ; ---- a, fun of s
-  AProp s p = mkUtt (mkCl s p) ;
-  AAct s p = mkUtt (mkCl s p) ;
-
-  SAll k = mkNP all_Predet (mkNP aPl_Det k) | mkNP thePl_Det k ;
-  SOne k = mkNP n1_Numeral k ;
-  SIndef k = mkNP a_Det k ;
-  SPlural k = mkNP aPl_Det k ;
-  SOther k = mkNP aPl_Det (mkCN other_A k) ;
-  SInd i = i ;
-  SInds is = mkNP and_Conj is ;
-
-  KRelSet r s =
-     mkCN r.cn (mkAdv r.prep s) ;
-     ---- | S's R
-
-----  KRelsSet r q s =
-----     mkCN r.cn (mkAdv r.prep s) ;
-
-  KRelKind k r s =
-    mkCN k (mkRS (mkRCl that_RP (mkVP (mkNP aPl_Det (mkCN r.cn (mkAdv r.prep s)))))) ;
-
-  KRelPair k r = mkCN k (mkAdv with_Prep (mkNP (mkQuant they_Pron) plNum r.cn)) ;
-  KProp p k =
-     mkCN p k
-   | mkCN k (mkRS (mkRCl that_RP (mkVP p))) ;
-  KAct p k =
-     mkCN k (mkRS (mkRCl that_RP p)) ;
-  KRel r = r.cn ;
-
-  IName n = n ;
-  NLoc n = n ;
-  NOrg n = n ;
-  NPers n = n;
-
-  ACalled is = mkVP also_AdV (mkVP (mkAP (mkA2 called_A for_Prep) (mkNP or_Conj is))) ;
-
-  BaseIndividual = mkListNP ;
-  ConsIndividual = mkListNP ;
-
-oper
--- structural words
-  about_Prep = mkPrep "om" ;
-  all_NP = mkNP (mkPN "allt" neutrum) ; ---
-  also_AdV = mkAdV "också" | mkAdV "annars" ;
-  as_Prep = mkPrep "som" ;
-  at_Prep = mkPrep "på" ;
-  called_A = mkA "kallad" "kallat" "kallade" ;
-  give_V3 = mkV3 giva_V ;
-  information_N = mkN "information" "informationer" ;
-  other_A = compoundA (mkA "annan" "annat" "andra" "andra" "andra") ;
-  that_RP = which_RP ;
-  name_N = mkN "namn" "namn" ;
-
--- lexical constructors
-  mkName : Str -> NP =
-    \s -> mkNP (mkPN s) ;
-  mkRelation : N -> Prep -> {cn : CN ; prep : Prep} =
-    \s,p -> {cn = mkCN s ; prep = p} ;
-
--- lexicon
-
-lincat
-  JobTitle = CN ;
-lin
-  Located i = mkAP (mkA2 (mkA "belägen" "beläget") in_Prep) i ;
-
-  Employed i = mkAP (mkA2 (mkA "anställd") by8agent_Prep) i ;
-
-  Work i =
-      mkVP (mkV2 (mkV "jobba") at_Prep) i
-    | mkVP (mkV2 (mkV "arbeta") in_Prep) i ;
-
-  HaveTitle t =
-      mkVP (mkAP (mkA2 (mkA "anställd") as_Prep) (mkNP t))
-    | mkVP (mkV2 (mkV "jobba") as_Prep) (mkNP t) ;
-
-  HaveTitleOrg t i =
-      mkVP (mkVP (mkAP (mkA2 (mkA "anställd") as_Prep) (mkNP t))) (mkAdv at_Prep i)
-    | mkVP (mkVP (mkV2 (mkV "jobba") as_Prep) (mkNP t)) (mkAdv at_Prep i) ;
---    | mkVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "titel" "titlar") po) (mkNP t)))) (mkAdv at_Prep i) ;
-
-  Organization = mkCN (mkN "organisation" "organisationer") ;
-  Place = mkCN (mkN "plats" "platser") ;
-  Person =
-      mkCN (mkN "person" "personer") ;
---    | mkCN (mkN "person" "folk") ;
-
-  Location = mkRelation (mkN "läge" "lägen") possess_Prep ;
-  Region = mkRelation (mkN "region" "regioner") in_Prep ;
-  Subregion = mkRelation (mkN "delregion" "delregioner") in_Prep ;
-  RName = mkRelation (mkN "namn" "namn") on_Prep ;
-  RNickname = mkRelation (mkN "tilläggsnamn" "tilläggsnamn")  on_Prep ;
-
--- JobTitles
-  JobTitle1 = mkCN (mkN "'JobTitle1") ;
-  JobTitle2 = mkCN (mkN "'JobTitle2") ;
-  JobTitle3 = mkCN (mkN "'JobTitle3") ;
-  JobTitle4 = mkCN (mkN "'JobTitle4") ;
-
--- Locations
-  Location1 = mkName "'Location1" ;
-  Location2 = mkName "'Location2" ;
-  Location3 = mkName "'Location3" ;
-  Location4 = mkName "'Location4" ;
-
--- Organizations
-  Organization1 = mkName "'Organization1" ;
-  Organization2 = mkName "'Organization2" ;
-  Organization3 = mkName "'Organization3" ;
-  Organization4 = mkName "'Organization4" ;
-
--- Persons
-  Person1 = mkName "'Person1" ;
-  Person2 = mkName "'Person2" ;
-  Person3 = mkName "'Person3" ;
-  Person4 = mkName "'Person4" ;
-
-}
diff --git a/examples/query/small/README b/examples/query/small/README
deleted file mode 100644
index 9e3997e00..000000000
--- a/examples/query/small/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Query language for MOLTO KRI.
-(c) Aarne Ranta 2011 for the gf files 
-
-To compile and test: make
-
-To build a new language, use QueryGer or QueryIta as starting point: 
-they are the simplest and cleanest implementations. As baseline, just change
-the lexical oper's in the beginning of the file.
-
-
-
diff --git a/examples/query/small/patentsQuery/LexQueryPats.gf b/examples/query/small/patentsQuery/LexQueryPats.gf
deleted file mode 100644
index 466e924c3..000000000
--- a/examples/query/small/patentsQuery/LexQueryPats.gf
+++ /dev/null
@@ -1,111 +0,0 @@
-interface LexQueryPats = open Syntax, QueryPats, Query in 
-{
-
-oper
-
--------------------------------------------------------------- 
--- structural words and extra grammar constructs
-
-   about_Prep : Prep ;
-
-   all_NP : NP ;
-
-   vpAP : VP -> AP ;
-   
-   what_IQuant : IQuant ;
-
-   massInfoSg : CN -> NP ;
- 
-   massInfoPl : CN -> NP ;
- 
-   PatsAdvVPSlash : VPSlash -> Adv -> VPSlash ;  
-
-   selectIP : NP -> IP ; -- selecting the right agreement : what are the ingredients ? / what is the expiration date ? (not obvious in English, but will make a difference in other languages) 
-
-
---------------------------------------------------------------
--- kinds 
-
-   patent_number_CN : Kind ;
-
-   claim_N : Kind ;
-
-
---------------------------------------------------------------
--- activities 
-
-   expire_V : Adv -> Activity ;
-
-   simp_expire_V : Activity ;
-
-   apply_V : NP -> Activity ;
-
-   compound_CN : Activity ;
-  
-   use_V2 : Set -> Activity ;
-
-   approve_V2 : Adv -> Activity ;
- 
-   mention_V2 : NP -> Activity ;
-
-   contain_V2 : NP -> Activity ;
-
-
---------------------------------------------------------------
--- properties 
-
-   approve_prop_V2 : Adv -> Property ;
-
-   use_prop_V2 : Set -> Property ;
-
---------------------------------------------------------------
--- relations  
- 
-   active_ingredient_CN : Relation ;
-
-   dosage_form_CN : Relation ;
-
-   route_of_administration_CN : Relation ;
-
-   patent_number_Rel : Relation ;  
-
-   patent_N : Relation ;
-  
-   patent_with_N : Relation ;
-
-   expiration_date_CN : Relation ;
-
-   use_code_CN : Relation ;
-
-   application_number_CN : Relation ;
-
-   application_number_no_CN : Relation ;
-  
-   applicant_CN : Relation ;
-
-   applicant_no_CN : Relation ;
-
-   approval_date_CN : Relation ;
-
-   chemical_composition_CN : Relation ;
- 
-   chemical_substance_CN : Relation ;
-
-   drug_N : Relation ;
- 
-   use_N : Relation ;  
-
-   method_N : Relation ;
-
-   drug_with_usage_form_CN : Relation ;
-
-   drug_preparation_CN : Relation ;
-  
-   strength_N : Relation ;
-
-   name_N : Relation ;   
-  
-   usage_form_CN : Relation ; 
-
-
-}
\ No newline at end of file
diff --git a/examples/query/small/patentsQuery/LexQueryPatsEng.gf b/examples/query/small/patentsQuery/LexQueryPatsEng.gf
deleted file mode 100644
index 09206388e..000000000
--- a/examples/query/small/patentsQuery/LexQueryPatsEng.gf
+++ /dev/null
@@ -1,136 +0,0 @@
-instance LexQueryPatsEng of LexQueryPats = open
-  SyntaxEng,
-  (M=MakeStructuralEng),
-  ParadigmsEng,
-  ExtraEng,
-  IrregEng, 
-  LangEng,
-  ResEng,
-  QueryEng
-   in 
-{
-
-oper 
--------------------------------------------------------------- 
--- structural words and extra grammar constructs
-
-   about_Prep : Prep  = mkPrep "about" ;
-
-   all_NP : NP = SyntaxEng.mkNP (mkPN "all") ;
-
-   vpAP : VP -> AP = PartVP ;
-   
-   what_IQuant : IQuant = M.mkIQuant "what" "what" ;
-
-   massInfoSg : CN -> NP = \cn -> SyntaxEng.mkNP cn ;
- 
-   massInfoPl : CN -> NP = \cn -> SyntaxEng.mkNP aPl_Det cn ;
- 
-   PatsAdvVPSlash : VPSlash -> Adv -> VPSlash = LangEng.AdvVPSlash ;  
-
-   selectIP : NP -> IP = \np -> case np.a of 
-     {AgP3Sg _ => whatSg_IP ;
-      _        => whatPl_IP
-     };
-
-
---------------------------------------------------------------
--- kinds 
-
-   patent_number_CN : Kind = lin Kind  (mkCN (mkN "patent" (mkN "number"))) ;
-
-   claim_N : Kind = lin Kind (mkCN (mkN "claim")) ;
-
- 
---------------------------------------------------------------
--- activities 
-
-   expire_V : Adv -> Activity = \pdate -> 
-        lin Activity (mkVP (mkVP (mkV "expire")) pdate) ;
-
-   simp_expire_V : Activity =  
-        lin Activity (mkVP (mkV "expire")) ;
-
-   apply_V : NP -> Activity = \pat ->  lin Activity ( mkVP (mkVP (mkV "apply" "applies" "applied" "applied" "applying")) (SyntaxEng.mkAdv for_Prep pat)) ;
-
-   compound_CN : Activity = let vp : VP = mkVP (mkCN (mkN "compound"))
-            in  lin Activity vp ;
-  
-   use_V2 : Set -> Activity = \s -> lin Activity (mkVP (passiveVP (mkV2 (mkV "use" "uses" "used" "used" "using"))) (SyntaxEng.mkAdv in_Prep s));
-
-   approve_V2 : Adv -> Activity = \pdate -> lin Activity (mkVP (passiveVP (mkV2 (mkV "approve" "approves" "approved" "approved" "approving"))) pdate) ;
- 
-   mention_V2 : NP -> Activity = \drug -> 
-    lin Activity ( mkVP (mkVPSlash (mkV2 (mkV "mention" "mentions" "mentioned" "mentioned" "mentioning"))) drug) ;
-
-   contain_V2 : NP -> Activity  = \chem ->
-    lin Activity (mkVP (mkVPSlash (mkV2 (mkV "contain" "contains" "contained" "contained" "containing"))) chem) ;
-
-
---------------------------------------------------------------
--- properties 
-
-   approve_prop_V2 : Adv -> Property  = \pdate -> lin Property (vpAP (mkVP (passiveVP (mkV2 (mkV "approve" "approves" "approved" "approved" "approving"))) pdate)) ;
-
-   use_prop_V2 : Set -> Property = \s -> lin Property (vpAP (mkVP (passiveVP (mkV2 (mkV "use" "uses" "used" "used" "using"))) (SyntaxEng.mkAdv in_Prep s))) ;
-  
-  
-
---------------------------------------------------------------
--- relations  
- 
-   active_ingredient_CN : Relation = makeRelation (mkCN (mkA "active")  (mkN "ingredient")) ;
-
-   dosage_form_CN : Relation = makeRelation (mkCN (mkN "dosage" (mkN "form"))) ;
-
-   route_of_administration_CN : Relation = makeRelation (mkCN (mkN "route") (SyntaxEng.mkAdv (mkPrep "of") (SyntaxEng.mkNP (mkN "administration")))) ;
-
-   patent_number_Rel : Relation  = makeRelation (mkCN (mkN "patent" (mkN "number"))) ;
-
-   patent_N : Relation = lin Relation {cn = mkCN (mkN "patent") ; prep = for_Prep } ;
-  
-   patent_with_N : Relation = lin Relation {cn = mkCN (mkN "patent"); prep = with_Prep} ;
-
-   expiration_date_CN : Relation  = makeRelation (mkCN (mkN "expiration" (mkN "date"))) ;
-
-   use_code_CN : Relation = makeRelation (SyntaxEng.mkCN (mkN "use" (mkN "code"))) ; 
-
-   application_number_CN : Relation  = makeRelation ((mkCN (mkN "application" (mkN  "number"))) | (mkCN (mkN ["patent application"] (mkN  "number")))) ;
-
-
-   application_number_no_CN : Relation  = lin Relation {cn = ((mkCN (mkN "application" (mkN  "number"))) | (mkCN (mkN ["patent application"] (mkN  "number")))); prep = noPrep} ;
-  
-   applicant_CN : Relation = lin Relation { cn = mkCN (mkN "applicant") ; prep = for_Prep } ;
-
-
-   applicant_no_CN : Relation = lin Relation {cn = mkCN (mkN "applicant"); prep = noPrep} ;
-
-   approval_date_CN : Relation = makeRelation (mkCN (mkN "approval" (mkN "date"))) ;
-
-
-   chemical_composition_CN : Relation = makeRelation (mkCN (mkA "chemical") (mkN "composition")) ;
- 
-   chemical_substance_CN : Relation = lin Relation {cn = (mkCN (mkA "chemical") (mkN "substance")) ; prep = from_Prep | part_Prep } ;
-
-   drug_N : Relation = lin Relation {cn = mkCN (mkN "drug") ; prep = with_Prep} ;
- 
-   use_N : Relation = makeRelation (mkCN (mkN "use")) ;  
-
-   method_N : Relation  = makeRelation (mkCN (mkN "method")) ;
-
-   drug_with_usage_form_CN : Relation = lin Relation {cn = mkCN (mkN "drug") ; prep = noPrep } ;
-
-   drug_preparation_CN : Relation = lin Relation {cn = mkCN (mkN "drug" (mkN "preparation")) ; prep = for_Prep} ; 
-  
-   strength_N : Relation  = makeRelation (mkCN (mkN "strength")) ;
-
-   name_N : Relation = makeRelation (mkCN (mkN "name")) ;
-
-   usage_form_CN = makeRelation (mkCN (mkN "usage" (mkN "form"))) ;
-
-----------------------------------------------------------------------------
-oper makeRelation : CN -> Relation =
-    \s -> lin Relation {cn = s ; prep = possess_Prep} ;
-
-
-}
\ No newline at end of file
diff --git a/examples/query/small/patentsQuery/LexQueryPatsFre.gf b/examples/query/small/patentsQuery/LexQueryPatsFre.gf
deleted file mode 100644
index 7577e1d66..000000000
--- a/examples/query/small/patentsQuery/LexQueryPatsFre.gf
+++ /dev/null
@@ -1,159 +0,0 @@
-instance LexQueryPatsFre of LexQueryPats = open
-  SyntaxFre,
-  ParadigmsFre,
-  ExtraFre,
-  IrregFre, 
-  DiffFre,
-  StructuralFre,
-  (CR=CommonRomance),
-  ParamX,
-  QueryFre,
-  Prelude
-   in 
-{
-
-oper 
--------------------------------------------------------------- 
--- structural words and extra grammar constructs
-
-   about_Prep : Prep  = mkPreposition ["à propos de"] ;
-
-   all_NP : NP = mkNP (mkPN "tout") ;
-
-   vpAP : VP -> AP = variants {} ;
-   
-   what_IQuant : IQuant = which_IQuant ;
-
-   massInfoSg : CN -> NP = \cn ->  
-              let g = cn.g ;
-                   n = Sg
-              in  lin NP {
-                   s = \\c => {comp,ton = cn.s ! n ; c1,c2 = []} ;
-                   a = CR.agrP3 g n ;
-                   hasClit = False ;
-                  isPol = False
-                 } ;
- 
-   massInfoPl : CN -> NP = \cn -> SyntaxFre.mkNP aPl_Det cn ;
- 
-   PatsAdvVPSlash : VPSlash -> Adv -> VPSlash = \vp, adv -> lin VPSlash 
-    { 
-    s     = vp.s ;
-    agr   = vp.agr ;
-    clit1 = vp.clit1 ; 
-    clit2 = vp.clit2 ; 
-    clit3 = vp.clit3 ; 
-    neg   = vp.neg ;
-    comp  = \\a => vp.comp ! a ++ adv.s ;
-    ext   = vp.ext ;
-    c2 = vp.c2 ;
-    }  ; 
-
-   selectIP : NP -> IP = \np -> case np.a.n of 
-     {Sg       => whatSg_IP ;
-      _        => whatPl_IP
-     };
-
-
---------------------------------------------------------------
--- kinds 
-
-   patent_number_CN : Kind = 
-     let pn : CN = mkCN  (mkCN (mkN "numéro")) (SyntaxFre.mkAdv possess_Prep (mkNP (mkN "brevet")))
-        in lin Kind  pn ;
-
-   claim_N : Kind = lin Kind (mkCN (mkN "revendication")) ;
-
- 
---------------------------------------------------------------
--- activities 
-
-   expire_V : Adv -> Activity = \pdate -> 
-        lin Activity (mkVP (mkVP (mkV "expire")) pdate) ;
-
-   simp_expire_V : Activity =  
-        lin Activity (mkVP (regV "expirer")) ;
-
-   apply_V : NP -> Activity = \pat ->  lin Activity ( mkVP (mkVP (regV "appliquer")) (SyntaxFre.mkAdv for_Prep pat)) ;
-
-   compound_CN : Activity = let vp : VP = mkVP (mkCN (mkN "composé"))
-            in  lin Activity vp ;
-  
-   use_V2 : Set -> Activity = \s -> lin Activity (mkVP (passiveVP (dirV2 (regV "utiliser"))) (SyntaxFre.mkAdv in_Prep s));
-
-   approve_V2 : Adv -> Activity = \pdate -> lin Activity (mkVP (passiveVP (dirV2 (regV "approuver"))) pdate) ;
- 
-   mention_V2 : NP -> Activity = \drug -> 
-    lin Activity ( mkVP (mkVPSlash (dirV2 (regV "mentionner"))) drug) ;
-
-   contain_V2 : NP -> Activity  = \chem ->
-    lin Activity (mkVP (mkVPSlash IrregFre.contenir_V2) chem) ;
-
-
---------------------------------------------------------------
--- properties 
-
-   approve_prop_V2 : Adv -> Property  = \pdate -> lin Property (vpAP (mkVP (passiveVP  (dirV2 (regV "approuver"))) pdate)) ;
-
-   use_prop_V2 : Set -> Property = \s -> lin Property (vpAP (mkVP (passiveVP (dirV2 (regV "utiliser"))) (SyntaxFre.mkAdv in_Prep s))) ;
-  
-  
-
---------------------------------------------------------------
--- relations  
- 
-   active_ingredient_CN : Relation = makeRelation (mkCN (mkA "actif")  (mkN "ingrédient")) ;
-
-   dosage_form_CN : Relation = makeRelation (mkCN (mkA "posologique") (mkN "forme")) ;
-
-   route_of_administration_CN : Relation = makeRelation (mkCN (mkCN (mkN "voie")) (SyntaxFre.mkAdv possess_Prep (mkNP (mkN "administration")))) ;
-
-   patent_number_Rel : Relation  = makeRelation (mkCN  (mkCN (mkN "numéro")) (SyntaxFre.mkAdv possess_Prep (mkNP (mkN "brevet")))) ;
-
-   patent_N : Relation = lin Relation {cn = mkCN (mkN "brevet") ; prep = for_Prep } ;
-  
-   patent_with_N : Relation = lin Relation {cn = mkCN (mkN "brevet"); prep = with_Prep} ;
-
-   expiration_date_CN : Relation  = makeRelation (mkCN (mkCN (mkN "date")) (SyntaxFre.mkAdv possess_Prep (mkNP (mkN "expiration")))) ;
-
-   use_code_CN : Relation = makeRelation (mkCN (mkCN (mkN "code"))  (SyntaxFre.mkAdv possess_Prep (mkNP (mkN "utilisation")))) ; 
-
-   application_number_CN : Relation  = makeRelation (mkCN (mkCN (mkN "numéro")) (SyntaxFre.mkAdv possess_Prep  (mkNP (mkN "demande")))) ;
-
-
-   application_number_no_CN : Relation  = lin Relation {cn = (mkCN (mkCN (mkN "numéro")) (SyntaxFre.mkAdv possess_Prep  (mkNP (mkN "demande")))); prep = mkPrep ""} ;
-  
-   applicant_CN : Relation = lin Relation { cn = mkCN (mkN "demandeur") ; prep = for_Prep } ;
-
-
-   applicant_no_CN : Relation = lin Relation {cn = mkCN (mkN "demandeur"); prep = mkPrep ""} ;
-
-   approval_date_CN : Relation = makeRelation (mkCN (mkCN (mkN "date")) (SyntaxFre.mkAdv possess_Prep (mkNP (mkN "approbation")))) ;
-
-
-   chemical_composition_CN : Relation = makeRelation (mkCN (mkA "chemique") (mkN "composition")) ;
- 
-   chemical_substance_CN : Relation = lin Relation {cn = (mkCN (mkA "chimique") (mkN "substance")) ; prep = from_Prep | part_Prep } ;
-
-   drug_N : Relation = lin Relation {cn = mkCN (mkN "médicament") ; prep = with_Prep} ;
- 
-   use_N : Relation = makeRelation (mkCN (mkN "utilisation")) ;  
-
-   method_N : Relation  = makeRelation (mkCN (mkN "méthode")) ;
-
-   drug_with_usage_form_CN : Relation = lin Relation {cn = mkCN (mkN "médicament") ; prep = mkPrep "" } ;
-
-   drug_preparation_CN : Relation = lin Relation {cn =  mkCN (mkN "préparation") ; prep = for_Prep} ; 
-  
-   strength_N : Relation  = makeRelation (mkCN (mkN "dosage")) ;
-
-   name_N : Relation = makeRelation (mkCN (mkN "nom")) ;
-
-   usage_form_CN = makeRelation ( mkCN (mkCN (mkN "formulaire")) (SyntaxFre.mkAdv possess_Prep (mkNP (mkN "utilisation")))) ;
-
-----------------------------------------------------------------------------
-oper makeRelation : CN -> Relation =
-    \s -> lin Relation {cn = s ; prep = possess_Prep} ;
-
-
-}
diff --git a/examples/query/small/patentsQuery/QueryPats.gf b/examples/query/small/patentsQuery/QueryPats.gf
deleted file mode 100644
index b66950d20..000000000
--- a/examples/query/small/patentsQuery/QueryPats.gf
+++ /dev/null
@@ -1,194 +0,0 @@
---# -path=.:..:alltenses
-
-abstract QueryPats = Query ** open Syntax in {
--------------------------------------------------------------------------------------
--- additions to the general Query grammar
-
-
-fun 
- 
- SThe : Kind -> Set ; -- the route of administration
-
- SMassSg : Kind -> Set ; -- route of administration 
-
- QWho : Activity -> Query ; -- who applied for the patent ? 
- 
--- QWhen : Set -> Activity -> Query ; -- when was the patent approved ? 
-
- QMass : Set -> Query ; -- expiration date of the patent
- 
- QExist : Kind -> Query ; -- what dosage forms of DRUG are there ? 
-  -- maybe merge with QSet
-
- 
-
-
--------------------------------------------------------------------------------------
--- categories and example functions for the Patent Query grammar
-
-cat 
-  Drug ; 
-  Patent ; 
-  ChemicalSubstance ;
-  DrugUsageForm ;
-  PatentNumber ;
-  Applicant ;
-  ApplicationNumber ;
-  PatsDate ;
-  SimpDate ;
-
---------------------------------------------------------------------------------
--- simple coercions
-
-fun DrugToSet : Drug -> Set ; 
-fun PatentToSet : Patent -> Set ;
-fun ChemToSet : ChemicalSubstance -> Set ;
-fun UsageToSet : DrugUsageForm -> Set ;
-fun PatNumToSet : PatentNumber -> Set ; 
-fun AppToSet : Applicant -> Set ;
-fun AppNumToSet : ApplicationNumber -> Set ;
---fun DateToSet : PatsDate -> Set ;
-
-
-fun 
-  OnDate : SimpDate ->  PatsDate ;
-  BeforeDate : SimpDate -> PatsDate ;
-  AfterDate : SimpDate ->  PatsDate ;
-  FromSimpDate : SimpDate -> PatsDate ; 
-
-
--------------------------------------------------------------------------------------
--- main functions for the Patents Query grammar 
-
-fun 
-
-  PQInfo : Drug -> Query ; -- what information do you have about DRUG | give me all information about DRUG ...
-
-  PQActive : Drug -> Query ; -- what active ingredients are in DRUG
-
-  PQDosage : Drug -> Query ; -- what are the dosage forms of DRUG
-
-  PQRoute : Drug -> Query ; -- what is the route of administration of DRUG
-
-  PQPatentNo : Query ; -- give me all the patent numbers
-  
-  PQPatentDrug : Drug -> Query ; -- give me the patent number of DRUG
-  
-  PQPatentPat : Patent -> Query ; -- give me the patent number for PATENT
-
-  PQExpPat : Patent -> Query ; -- when does PATENT expire
-   
-  PQExpDrug : Drug -> Query ;  -- when does the patent for DRUG expire
-   
-  PQUseCode : Patent -> Query ; -- what is the use code of PATENT
-   
-  PQAppNumber : Patent -> Query ; -- what is the application number for PATENT
-  
-  PQApplicant : Patent -> Query ; -- who applied for PATENT
-
-  PQAppDayDrug : Drug -> Query ; -- what is the approval date of the patent for DRUG
-  
-  PQAppDayPat : Patent -> Query ; -- what is the approval date of PATENT
-   
-  PQAppDayPatApp : Patent -> Applicant -> Query ; -- what is the approval date of PATENT with APPLICANT
-
-  PQAppDayNo : ApplicationNumber -> Query ; -- what is the approval date for the patent with APPLICATION_NUMBER
- 
-  PQChemComp : Drug -> Query ;  -- what is the chemical composition of DRUG
-
-  PQCompounds : Query ; -- what are the drugs that are compounds
-
-  PQPrep : Query ; -- what drug preparations are there  
-
-  PQDrugPrep : Drug -> Query ; -- the drug preparation for DRUG
-
-  PQPrepDate : Drug -> PatsDate -> Query ; -- the drug preparation for DRUG with a patent that expires after DATE
-
-  PQName : Drug -> Query ; -- the name of DRUG
- 
-  PQNameDate : Drug -> PatsDate -> Query ;  -- the name of drug with approval date DATE
-
-  PQNameApp : Applicant -> Query ; -- the name of drug with a patent from applicant APPLICANT
-
-  PQMethods : Patent -> Query ; -- what methods are used for PATENT
-
-  PQDateMeth : PatsDate -> Query ;  -- what methods are used in patents with approval date before DATE 
-
-  PQMethNo : PatentNumber -> Query ; -- what methods are used in the patent with patent number PATENT_NUMBER
-
-  PQUse : Patent -> Query ; -- what is the use of PATENT
-
-  PQUseDate : PatsDate -> Query ; -- what is the use of PATENT approved before DATE
-
-  PQUseExp : Patent -> PatsDate -> Query ; -- what is the use of PATENT that expires on DATE 
-  
-  PQDateUse : PatsDate -> Query ; -- give me all patents approved on DATE
-
-  PQUseDrug : Drug -> Query ; -- what is the use of DRUG
-
-  PQUseChem : ChemicalSubstance -> Query ; -- what is the use of drugs that contain CHEMICAL_SUBSTANCE 
-
-  PQUseForm : DrugUsageForm -> Query ; -- what is the use of drugs with usage form DRUG_USAGE_FORM   
-
-  PQStrength : Drug -> Query ; -- what is the strength of DRUG
-
-  PQStrengthChem : ChemicalSubstance -> Query ; -- what is the strenght of drugs that contain CHEMICAL_SUBSTANCE
-
-  PQClaims  : Drug -> Query ; -- what are the claims that mention DRUG 
-
-
-
-fun 
----------------------
-  Aspirin : Drug ;
----------------------
--- put all other drug names here !
-
-
----------------------
-  Pats1230 : Patent ; 
----------------------
--- put all other patent names here !
-
-
----------------------
-  Hydrogen : ChemicalSubstance ;
----------------------
--- put all chemical substances here !
-
-
---------------------
-  Inhalation : DrugUsageForm ;
---------------------
--- put all drug usage forms here !
-
-
-
--------------------
-  P123 : PatentNumber ;
--------------------
--- put all patent numbers here !
-
-
-
--------------------
-  JohnDoe : Applicant ;
--------------------
--- put all applicants here !
-
-
-
--------------------
-   A123 : ApplicationNumber ;
-------------------
--- put all application numbers here
-
-
--------------------
-   Today : PatsDate ;
-   A20June : SimpDate ; 
--------------------
--- put all dates here (maybe use Date grammar instead)
-
-
-}
\ No newline at end of file
diff --git a/examples/query/small/patentsQuery/QueryPatsEng.gf b/examples/query/small/patentsQuery/QueryPatsEng.gf
deleted file mode 100644
index f3800d9fd..000000000
--- a/examples/query/small/patentsQuery/QueryPatsEng.gf
+++ /dev/null
@@ -1,387 +0,0 @@
---# -path=.:..:alltenses
-
-concrete QueryPatsEng of QueryPats = QueryEng ** open
-    LexQueryPatsEng,
-    ParadigmsEng,
-    IrregEng,
-    SyntaxEng,
-    ExtraEng,
-    (L=LangEng),
-    (M=MakeStructuralEng),
-    Prelude
-in {
-
-
---------------------------------------------------------
--- additions to the original query grammar 
-
-lin
-
- SThe k = SyntaxEng.mkNP the_Det k ; 
-
- SMassSg k = SyntaxEng.mkNP k ;  
-
- QWho a = mkUtt (mkQCl whoSg_IP a) ; 
- 
--- QWhen : Set -> Activity -> Query ;  
-
- QMass s = mkUtt s ; 
-
- QExist s =  mkUtt (L.ExistIP (L.IdetCN (L.IdetQuant what_IQuant L.NumPl) s))
-              | mkUtt (mkNP all_NP (SyntaxEng.mkAdv about_Prep (mkNP s))) ;
-
-
----------------------------------------------------------
--- from the patent query grammar 
-
-lincat 
-  Drug = NP ;
-  Patent = NP ; 
-  ChemicalSubstance = NP ;
-  DrugUsageForm = NP ;
-  PatentNumber = NP ;
-  Applicant = NP ;
-  ApplicationNumber = NP ;
-  PatsDate = Adv ;  
-  SimpDate = Adv ; 
-
-
-lin
-PQInfo drug = QInfo (DrugToSet drug) ;  
-     
-PQActive drug = 
-      let ai : Kind = KRelSet active_ingredient_CN (DrugToSet drug) 
-   in 
-    basicPlur ai  ;
- 
-
-PQDosage drug = 
-       let df : Kind = KRelSet dosage_form_CN (DrugToSet drug)          
-   in 
-    basicBoth df | QExist df ;
-   
-
-PQRoute drug = 
-      let df : Kind = KRelSet route_of_administration_CN (DrugToSet drug)  
-   in 
-    basicBoth df | QExist df ;
-
-
-PQPatentNo =  
-      let bu : Query = basicPlur patent_number_CN 
-        in 
-  bu | QExist patent_number_CN ;
-    
-
-PQPatentDrug drug = 
-        let df : Kind = KRelSet patent_number_Rel (DrugToSet drug)  
-  in 
-    basicSing df ;
-
-
-
-PQPatentPat  patent = 
-       let ai : Kind = KRelSet patent_number_Rel (PatentToSet patent) 
-   in 
-    basicSing ai ;
-
-
-PQExpPat patent = 
-       let 
-          ai : Kind = KRelSet expiration_date_CN (PatentToSet patent) ;
-          bu : Query = basicSing ai 
-   in 
-    bu ; 
-  -- KAct when_IAdv (mkCl patent (mkVP expire_V))) ;
-
-
-PQExpDrug drug = 
-      let 
-          ai : Kind = KRelSet expiration_date_CN (SThe (KRelSet patent_N (DrugToSet drug))) 
-   in 
-  basicSing ai ;
---   | mkUtt (mkQCl when_IAdv (mkCl (mkNP the_Art ai) (mkVP expire_V)));
-
-
-PQUseCode patent = 
-       let df : Kind = KRelSet use_code_CN (PatentToSet patent) 
-  in 
-   basicBoth df  ;
-
-
-PQAppNumber patent = 
-     let df : Kind = KRelSet application_number_CN (PatentToSet patent) 
-  in 
-  basicSing df  ;
-
-
-PQApplicant patent = 
-    let df : Kind = KRelSet applicant_CN (PatentToSet patent) ;
-         bu : Query = basicSing df 
-   in 
-   bu ;
---   | mkUtt (mkQS (mkQCl whoSg_IP (mkVP (mkVP apply_V) (SyntaxEng.mkAdv for_Prep patent)))) 
---   | mkUtt (mkQS pastTense (mkQCl whoSg_IP (mkVP (mkVP apply_V) (SyntaxEng.mkAdv for_Prep patent))));
-
-
-PQAppDayDrug drug =
-    let df : Kind = KRelSet approval_date_CN (SThe (KRelSet patent_N (DrugToSet drug)))
-    in 
-     basicSing df  ; 
-
- 
-PQAppDayPat patent =
-    let df : Kind = KRelSet approval_date_CN (PatentToSet patent) 
-    in
-     basicSing df  ;
- 
-
-PQAppDayPatApp patent applicant =
-       let df : Kind = KRelSet approval_date_CN (SThe (KRelSet patent_with_N (SThe (KRelSet applicant_CN (AppToSet applicant))))) 
-        in 
-        basicSing df  ;
-
-
-PQAppDayNo appno = 
-     let df : Kind = KRelSet approval_date_CN (SThe (KRelSet  patent_with_N (SThe (KRelSet application_number_CN (AppNumToSet appno))))) 
-   in 
-     basicSing df ;
-
- 
-PQChemComp drug = 
-     let 
-         df : Kind = KRelSet chemical_substance_CN (DrugToSet drug) ;
-         cc : Kind = KRelSet chemical_composition_CN (DrugToSet drug)         
-   in 
-    basicPlur df | basicSing cc ; 
-
-
-PQCompounds  =
-       let cc : Kind = KAct compound_CN (KRel drug_N)          
-        in 
-          basicPlur cc  ;
-
-
-PQPrep = 
-     basicPlur (KRel drug_preparation_CN)
-   | QExist (KRel drug_preparation_CN) ;
-
-
-PQDrugPrep drug = 
-        let df : Kind = KRelSet drug_preparation_CN (DrugToSet drug) 
-  in 
-      basicSing df ;
-
------
-
-PQName drug = 
-    let 
-         df : CN = KRelSet name_N (DrugToSet drug) 
-   in 
-     basicSing df ;
-
-
-PQNameApp applicant = 
-        let   pt2 : Set = SIndef (KRelSet  patent_with_N (SThe (KRelSet applicant_CN applicant))) ;
-              df : Kind = KRelSet drug_N pt2 
-   in 
-     basicSing df ; 
-
-----
- 
-PQMethods patent = 
-        let  pt1 : Kind = KProp (use_prop_V2 (PatentToSet patent)) (KRel method_N) ;
-             pt2 : Kind = KRelSet method_N (PatentToSet patent) ;
-             pt : Kind = pt1 | pt2               
-   in 
-    basicPlur pt ; 
-
-
-PQDateMeth date  =  
-       let pdate : Set = SAll (KAct (expire_V date) (KRel patent_N)) ;
-            pt1 : Kind = KAct  (use_V2 pdate) (KRel method_N) ;
-            pt2 : Kind = KProp (use_prop_V2 pdate) (KRel method_N) ;
-            pt3 : Kind = KRelSet method_N pdate ;
-             pt : Kind = pt1 | pt2 | pt3              
-   in 
-    basicPlur pt ;
-
- 
-PQMethNo appno = 
-        let pdate : Set = SThe (KRelSet patent_with_N (SThe (KRelSet application_number_no_CN appno))) ;
-           pt1 : Kind = KProp (use_prop_V2 (SThe (KRel patent_N))) (KRel method_N) ;
-           pt2 : Kind = KRelSet method_N (SThe (KRel patent_N)) ;
-           pt : Kind = pt1 | pt2               
-   in 
-     basicPlur pt ;
-
-----
-
-PQUse patent =   
-   let df : Kind = KRelSet use_N (PatentToSet patent) 
-  in 
-    basicSing df ;   
-
-
-PQUseDate date = 
-       let pdate : Set =  SThe (KAct (approve_V2 date) (KRel patent_N))  ;
-           pt : Kind = KRelSet use_N pdate              
-   in 
-     basicSing pt ;
-
-PQDateUse date =
-      let  patent : Kind = KRel patent_N ;
-           pdate : Set = SAll (KProp (approve_prop_V2 date) patent) ;
-           pt : Kind = KRelSet use_N pdate 
-              
-   in 
-     basicPlur pt ;
-
-
-PQUseDrug drug = 
-    let df : Kind = KRelSet use_N (DrugToSet drug) 
-   in 
-      basicSing df  ;
-
-
-PQUseChem chem = 
-   let  drug : Kind = KAct (contain_V2 chem) (KRel drug_N) ;
-        drugs : Set = SAll drug ;
-        df : Kind = KRelSet use_N drugs         
-   in 
-     basicSing df  ;    
-
-
-PQUseForm uform = 
-   let  drug : Kind = KRelSet usage_form_CN (UsageToSet uform) ;
-        drugs : Set = SAll drug ;
-        df : Kind = KRelSet use_N drugs 
-   in 
-      basicSing df  ;
-
----
-
-PQStrength drug =
-    let df : Kind = KRelSet strength_N (DrugToSet drug) 
-   in 
-      basicSing df  ;
-      
-
-PQStrengthChem chem = 
-   let  drug : Kind = KAct (contain_V2 chem) (KRel drug_N) ;
-        drugs : Set = SAll drug ;
-        df : Kind = KRelSet strength_N (DrugToSet drugs) 
-  in 
-     basicSing df  ; 
-
----
-
-PQClaims  drug = 
-       let cc : Kind =  KAct (mention_V2 drug) (mkCN claim_N) 
-            in 
-       basicPlur cc ;
-
-
-
---------------------------------------------------------------------------------
- oper basicSing : CN -> Utt =
-    \df -> 
-       let  sg_df : NP = SThe df ;
-            massdf : NP = SMassSg df 
-     in 
-      QSet sg_df
-   | QMass massdf
-   | QMass sg_df ;
-   
-
-oper basicPlur : CN -> Utt = 
-    \df -> 
-       let  sg_df : NP = SAll df ;
-            massdf : NP = SPlural df
-     in 
-      QInfo sg_df
-   | QMass massdf
-   | QMass sg_df ;
-   
-
-oper basicBoth : CN -> Utt = 
-  \df ->
-     let sg_df : NP = SThe df ;
-          the_df : NP = SAll df ; 
-          mass_sg_df : NP = SMassSg df ;
-          mass_pl_df : NP = SPlural df
-   in
-     QInfo the_df 
-   | QInfo sg_df
-   | QMass mass_sg_df
-   | QMass sg_df
-   | QMass mass_pl_df
-   | QMass the_df ;
-
---------------------------------------------------------------------------
--- coercions
-
-lin DrugToSet d = d ; 
-lin PatentToSet d = d ;
-lin ChemToSet d = d ;
-lin UsageToSet d = d ;
-lin PatNumToSet d = d ; 
-lin AppToSet d = d ;
-lin AppNumToSet d = d ;
---lin DateToSet : PatsDate -> Set ;
-
-
-
- OnDate d = mkPatsDate on_Prep ;
- BeforeDate d = mkPatsDate before_Prep ;
- AfterDate d = mkPatsDate after_Prep ;
-
- oper mkPatsDate : Prep -> Adv = \prep -> SyntaxEng.mkAdv prep (mkNP (mkPN "DATE")) ;
-
-
-
-
--- lexicon
-
-oper mkDrug : Str -> NP = 
-    \p -> SyntaxEng.mkNP  (mkPN p) ;
-
-oper mkPatents : Str -> NP = 
-   \p -> SyntaxEng.mkNP (mkPN p) ;
-
-oper mkChemicalSubstance : Str -> NP = 
-   \p -> SyntaxEng.mkNP (mkPN p) ;
-
-oper mkDrugUsageForm : Str -> NP =
-   \p -> SyntaxEng.mkNP (mkPN p) ;
-
-oper  mkPatentNumber : Str -> NP = 
-   \p -> SyntaxEng.mkNP (mkPN p) ;
-
-oper  mkApplicant : Str -> NP = 
-   \p -> SyntaxEng.mkNP (mkPN p) ;
-
-oper  mkApplicationNumber : Str -> NP = 
-   \p -> SyntaxEng.mkNP (mkPN p);
-
-
-
-
-lin
-
-Aspirin = mkDrug "DRUG" ;
-
-Pats1230 = mkPatents "PATENT" ;
-
-Hydrogen = mkChemicalSubstance "CHEMICAL_SUBSTANCE" ;
-
-Inhalation = mkDrugUsageForm "DRUG_USAGE_FORM" ;
-
-P123 = mkPatentNumber "PATENT_NUMBER" ;
-
-JohnDoe = mkApplicant "APPLICANT" ;
-
-A123 = mkApplicationNumber "APPLICATION_NUMBER" ;
-
-
-}
\ No newline at end of file
diff --git a/examples/query/small/patentsQuery/QueryPatsFre.gf b/examples/query/small/patentsQuery/QueryPatsFre.gf
deleted file mode 100644
index f4808fbf1..000000000
--- a/examples/query/small/patentsQuery/QueryPatsFre.gf
+++ /dev/null
@@ -1,386 +0,0 @@
---# -path=.:..:alltenses
-
-concrete QueryPatsFre of QueryPats = QueryFre ** open
-    LexQueryPatsFre,
-    ParadigmsFre,
-    IrregFre,
-    SyntaxFre,
-    ExtraFre,
-    (L=LangFre),
-    Prelude
-in {
-
-
---------------------------------------------------------
--- additions to the original query grammar 
-
-lin
-
- SThe k = SyntaxFre.mkNP the_Det k ; 
-
- SMassSg k = SyntaxFre.mkNP k ;  
-
- QWho a = mkUtt (mkQCl whoSg_IP a) ; 
- 
--- QWhen : Set -> Activity -> Query ;  
-
- QMass s = mkUtt s ; 
-
- QExist s =  mkUtt (L.ExistIP (L.IdetCN (L.IdetQuant what_IQuant L.NumPl) s))
-              | mkUtt (mkNP all_NP (SyntaxFre.mkAdv about_Prep (mkNP s))) ;
-
-
----------------------------------------------------------
--- from the patent query grammar 
-
-lincat 
-  Drug = NP ;
-  Patent = NP ; 
-  ChemicalSubstance = NP ;
-  DrugUsageForm = NP ;
-  PatentNumber = NP ;
-  Applicant = NP ;
-  ApplicationNumber = NP ;
-  PatsDate = Adv ;  
-  SimpDate = Adv ; 
-
-
-lin
-PQInfo drug = QInfo (DrugToSet drug) ;  
-     
-PQActive drug = 
-      let ai : Kind = KRelSet active_ingredient_CN (DrugToSet drug) 
-   in 
-    basicPlur ai  ;
- 
-
-PQDosage drug = 
-       let df : Kind = KRelSet dosage_form_CN (DrugToSet drug)          
-   in 
-    basicBoth df | QExist df ;
-   
-
-PQRoute drug = 
-      let df : Kind = KRelSet route_of_administration_CN (DrugToSet drug)  
-   in 
-    basicBoth df | QExist df ;
-
-
-PQPatentNo =  
-      let bu : Query = basicPlur patent_number_CN 
-        in 
-  bu | QExist patent_number_CN ;
-    
-
-PQPatentDrug drug = 
-        let df : Kind = KRelSet patent_number_Rel (DrugToSet drug)  
-  in 
-    basicSing df ;
-
-
-
-PQPatentPat  patent = 
-       let ai : Kind = KRelSet patent_number_Rel (PatentToSet patent) 
-   in 
-    basicSing ai ;
-
-
-PQExpPat patent = 
-       let 
-          ai : Kind = KRelSet expiration_date_CN (PatentToSet patent) ;
-          bu : Query = basicSing ai 
-   in 
-    bu ; 
-  -- KAct when_IAdv (mkCl patent (mkVP expire_V))) ;
-
-
-PQExpDrug drug = 
-      let 
-          ai : Kind = KRelSet expiration_date_CN (SThe (KRelSet patent_N (DrugToSet drug))) 
-   in 
-  basicSing ai ;
---   | mkUtt (mkQCl when_IAdv (mkCl (mkNP the_Art ai) (mkVP expire_V)));
-
-
-PQUseCode patent = 
-       let df : Kind = KRelSet use_code_CN (PatentToSet patent) 
-  in 
-   basicBoth df  ;
-
-
-PQAppNumber patent = 
-     let df : Kind = KRelSet application_number_CN (PatentToSet patent) 
-  in 
-  basicSing df  ;
-
-
-PQApplicant patent = 
-    let df : Kind = KRelSet applicant_CN (PatentToSet patent) ;
-         bu : Query = basicSing df 
-   in 
-   bu ;
---   | mkUtt (mkQS (mkQCl whoSg_IP (mkVP (mkVP apply_V) (SyntaxFre.mkAdv for_Prep patent)))) 
---   | mkUtt (mkQS pastTense (mkQCl whoSg_IP (mkVP (mkVP apply_V) (SyntaxFre.mkAdv for_Prep patent))));
-
-
-PQAppDayDrug drug =
-    let df : Kind = KRelSet approval_date_CN (SThe (KRelSet patent_N (DrugToSet drug)))
-    in 
-     basicSing df  ; 
-
- 
-PQAppDayPat patent =
-    let df : Kind = KRelSet approval_date_CN (PatentToSet patent) 
-    in
-     basicSing df  ;
- 
-
-PQAppDayPatApp patent applicant =
-       let df : Kind = KRelSet approval_date_CN (SThe (KRelSet patent_with_N (SThe (KRelSet applicant_CN (AppToSet applicant))))) 
-        in 
-        basicSing df  ;
-
-
-PQAppDayNo appno = 
-     let df : Kind = KRelSet approval_date_CN (SThe (KRelSet  patent_with_N (SThe (KRelSet application_number_CN (AppNumToSet appno))))) 
-   in 
-     basicSing df ;
-
- 
-PQChemComp drug = 
-     let 
-         df : Kind = KRelSet chemical_substance_CN (DrugToSet drug) ;
-         cc : Kind = KRelSet chemical_composition_CN (DrugToSet drug)         
-   in 
-    basicPlur df | basicSing cc ; 
-
-
-PQCompounds  =
-       let cc : Kind = KAct compound_CN (KRel drug_N)          
-        in 
-          basicPlur cc  ;
-
-
-PQPrep = 
-     basicPlur (KRel drug_preparation_CN)
-   | QExist (KRel drug_preparation_CN) ;
-
-
-PQDrugPrep drug = 
-        let df : Kind = KRelSet drug_preparation_CN (DrugToSet drug) 
-  in 
-      basicSing df ;
-
------
-
-PQName drug = 
-    let 
-         df : CN = KRelSet name_N (DrugToSet drug) 
-   in 
-     basicSing df ;
-
-
-PQNameApp applicant = 
-        let   pt2 : Set = SIndef (KRelSet  patent_with_N (SThe (KRelSet applicant_CN applicant))) ;
-              df : Kind = KRelSet drug_N pt2 
-   in 
-     basicSing df ; 
-
-----
- 
-PQMethods patent = 
-        let  pt1 : Kind = KProp (use_prop_V2 (PatentToSet patent)) (KRel method_N) ;
-             pt2 : Kind = KRelSet method_N (PatentToSet patent) ;
-             pt : Kind = pt1 | pt2               
-   in 
-    basicPlur pt ; 
-
-
-PQDateMeth date  =  
-       let pdate : Set = SAll (KAct (expire_V date) (KRel patent_N)) ;
-            pt1 : Kind = KAct  (use_V2 pdate) (KRel method_N) ;
-            pt2 : Kind = KProp (use_prop_V2 pdate) (KRel method_N) ;
-            pt3 : Kind = KRelSet method_N pdate ;
-             pt : Kind = pt1 | pt2 | pt3              
-   in 
-    basicPlur pt ;
-
- 
-PQMethNo appno = 
-        let pdate : Set = SThe (KRelSet patent_with_N (SThe (KRelSet application_number_no_CN appno))) ;
-           pt1 : Kind = KProp (use_prop_V2 (SThe (KRel patent_N))) (KRel method_N) ;
-           pt2 : Kind = KRelSet method_N (SThe (KRel patent_N)) ;
-           pt : Kind = pt1 | pt2               
-   in 
-     basicPlur pt ;
-
-----
-
-PQUse patent =   
-   let df : Kind = KRelSet use_N (PatentToSet patent) 
-  in 
-    basicSing df ;   
-
-
-PQUseDate date = 
-       let pdate : Set =  SThe (KAct (approve_V2 date) (KRel patent_N))  ;
-           pt : Kind = KRelSet use_N pdate              
-   in 
-     basicSing pt ;
-
-PQDateUse date =
-      let  patent : Kind = KRel patent_N ;
-           pdate : Set = SAll (KProp (approve_prop_V2 date) patent) ;
-           pt : Kind = KRelSet use_N pdate 
-              
-   in 
-     basicPlur pt ;
-
-
-PQUseDrug drug = 
-    let df : Kind = KRelSet use_N (DrugToSet drug) 
-   in 
-      basicSing df  ;
-
-
-PQUseChem chem = 
-   let  drug : Kind = KAct (contain_V2 chem) (KRel drug_N) ;
-        drugs : Set = SAll drug ;
-        df : Kind = KRelSet use_N drugs         
-   in 
-     basicSing df  ;    
-
-
-PQUseForm uform = 
-   let  drug : Kind = KRelSet usage_form_CN (UsageToSet uform) ;
-        drugs : Set = SAll drug ;
-        df : Kind = KRelSet use_N drugs 
-   in 
-      basicSing df  ;
-
----
-
-PQStrength drug =
-    let df : Kind = KRelSet strength_N (DrugToSet drug) 
-   in 
-      basicSing df  ;
-      
-
-PQStrengthChem chem = 
-   let  drug : Kind = KAct (contain_V2 chem) (KRel drug_N) ;
-        drugs : Set = SAll drug ;
-        df : Kind = KRelSet strength_N (DrugToSet drugs) 
-  in 
-     basicSing df  ; 
-
----
-
-PQClaims  drug = 
-       let cc : Kind =  KAct (mention_V2 drug) (mkCN claim_N) 
-            in 
-       basicPlur cc ;
-
-
-
---------------------------------------------------------------------------------
- oper basicSing : CN -> Utt =
-    \df -> 
-       let  sg_df : NP = SThe df ;
-            massdf : NP = SMassSg df 
-     in 
-      QSet sg_df
-   | QMass massdf
-   | QMass sg_df ;
-   
-
-oper basicPlur : CN -> Utt = 
-    \df -> 
-       let  sg_df : NP = SAll df ;
-            massdf : NP = SPlural df
-     in 
-      QInfo sg_df
-   | QMass massdf
-   | QMass sg_df ;
-   
-
-oper basicBoth : CN -> Utt = 
-  \df ->
-     let sg_df : NP = SThe df ;
-          the_df : NP = SAll df ; 
-          mass_sg_df : NP = SMassSg df ;
-          mass_pl_df : NP = SPlural df
-   in
-     QInfo the_df 
-   | QInfo sg_df
-   | QMass mass_sg_df
-   | QMass sg_df
-   | QMass mass_pl_df
-   | QMass the_df ;
-
---------------------------------------------------------------------------
--- coercions
-
-lin DrugToSet d = d ; 
-lin PatentToSet d = d ;
-lin ChemToSet d = d ;
-lin UsageToSet d = d ;
-lin PatNumToSet d = d ; 
-lin AppToSet d = d ;
-lin AppNumToSet d = d ;
---lin DateToSet : PatsDate -> Set ;
-
-
-
- OnDate d = mkPatsDate on_Prep ;
- BeforeDate d = mkPatsDate before_Prep ;
- AfterDate d = mkPatsDate after_Prep ;
-
- oper mkPatsDate : Prep -> Adv = \prep -> SyntaxFre.mkAdv prep (mkNP (mkPN "DATE")) ;
-
-
-
-
--- lexicon
-
-oper mkDrug : Str -> NP = 
-    \p -> mkNP  (mkPN p) ;
-
-oper mkPatents : Str -> NP = 
-   \p -> mkNP (mkPN p) ;
-
-oper mkChemicalSubstance : Str -> NP = 
-   \p -> mkNP (mkPN p) ;
-
-oper mkDrugUsageForm : Str -> NP =
-   \p -> mkNP (mkPN p) ;
-
-oper  mkPatentNumber : Str -> NP = 
-   \p -> mkNP (mkPN p) ;
-
-oper  mkApplicant : Str -> NP = 
-   \p -> mkNP (mkPN p) ;
-
-oper  mkApplicationNumber : Str -> NP = 
-   \p -> mkNP (mkPN p);
-
-
-
-
-lin
-
-Aspirin = mkDrug "DRUG" ;
-
-Pats1230 = mkPatents "PATENT" ;
-
-Hydrogen = mkChemicalSubstance "CHEMICAL_SUBSTANCE" ;
-
-Inhalation = mkDrugUsageForm "DRUG_USAGE_FORM" ;
-
-P123 = mkPatentNumber "PATENT_NUMBER" ;
-
-JohnDoe = mkApplicant "APPLICANT" ;
-
-A123 = mkApplicationNumber "APPLICATION_NUMBER" ;
-
-
-}
\ No newline at end of file
diff --git a/examples/query/small/patentsQuery/QueryProton.gf b/examples/query/small/patentsQuery/QueryProton.gf
deleted file mode 100644
index 4c1bd7237..000000000
--- a/examples/query/small/patentsQuery/QueryProton.gf
+++ /dev/null
@@ -1,59 +0,0 @@
-abstract QueryProton = Query ** {
-
-fun
-  QCalled : Individual -> Query ; -- how is X (also | otherwise) (called | named | known) ;
-
-  NLoc : Loc -> Name ;
-  NOrg : Org -> Name ;
-  NPers : Pers -> Name ;
-
-  IName    : Name -> Individual ;
-  ACalled  : [Individual] -> Activity ;
-
--- the test lexicon
-
-cat
-  JobTitle ;
-fun
-  Located : Loc -> Property ;
-  Employed : Org -> Property ;
-
-  Work : Org -> Activity ;
-  HaveTitle : JobTitle -> Activity ;
-  HaveTitleOrg : JobTitle -> Org -> Activity ;
-
-  Organization : Kind ;
-  Place : Kind ;
-  Person : Kind ;
-
-  Location : Relation ;
-  Region : Relation ;
-  Subregion : Relation ;
-
-  RName     : Relation ;
-  RNickname : Relation ;
-
--- JobTitles
-   JobTitle1 : JobTitle ;
-   JobTitle2 : JobTitle ;
-   JobTitle3 : JobTitle ;
-   JobTitle4 : JobTitle ;
-
--- Locations
-   Location1 : Loc ;
-   Location2 : Loc ;
-   Location3 : Loc ;
-   Location4 : Loc ;
-
--- Organizations
-   Organization1 : Org ;
-   Organization2 : Org ;
-   Organization3 : Org ;
-   Organization4 : Org ;
-
--- Persons
-   Person1 : Pers ;
-   Person2 : Pers ;
-   Person3 : Pers ;
-   Person4 : Pers ;
-}
\ No newline at end of file
diff --git a/examples/query/small/tests.gfs b/examples/query/small/tests.gfs
deleted file mode 100644
index 3c80fc99b..000000000
--- a/examples/query/small/tests.gfs
+++ /dev/null
@@ -1,36 +0,0 @@
-l -treebank MQuery (QSet (SAll Person))
-l -treebank MQuery (QSet (SAll (KRel Location)))
-l -treebank MQuery (QSet (SAll Organization))
-l -treebank MQuery (QInfo (SInd (IName (NOrg Organization1))))
-l -treebank MQuery (QInfo (SInd (IName (NPers Person1))))
-l -treebank MQuery (QInfo (SInd (IName (NLoc Location1))))
-l -treebank MQuery (QSet (SInd (IName (NOrg Organization1))))
-l -treebank MQuery (QSet (SInd (IName (NPers Person1))))
-l -treebank MQuery (QSet (SInd (IName (NLoc Location1))))
-l -treebank MQuery (QInfo (SAll Person))
-l -treebank MQuery (QInfo (SAll (KRel Location)))
-l -treebank MQuery (QInfo (SAll Organization))
-l -treebank MQuery (QSet (SAll (KRelSet Subregion (SAll (KRel Location)))))
-l -treebank MQuery (QSet (SAll (KRelKind (KRel Location) Subregion (SOther (KRel Location)))))
-l -treebank MQuery (QSet (SAll (KRelSet Subregion (SInd (IName (NLoc Location1))))))
-l -treebank MQuery (QSet (SPlural (KProp (Located Location1) Organization)))
-l -treebank MQuery (QSet (SPlural (KProp (Located Location1) Person)))
-l -treebank MQuery (QSet (SPlural (KProp (Located Location1) (KRel Location))))
-l -treebank MQuery (QWhere (SInd (IName (NLoc Location1))))
-l -treebank MQuery (QWhere (SInd (IName (NOrg Organization1))))
-l -treebank MQuery (QWhere (SInd (IName (NPers Person1))))
-l -treebank MQuery (QSet (SAll (KRelPair Organization Location)))
-l -treebank MQuery (QWhere (SAll Organization))
-l -treebank MQuery (QWhere (SAll Person))
-l -treebank MQuery (QWhere (SAll (KRel Location)))
-l -treebank MQuery (QSet (SPlural (KRelPair (KRel Region) Subregion)))
-l -treebank MQuery (QSet (SAll (KAct (HaveTitleOrg JobTitle1 Organization1) Person))) ---
-l -treebank MQuery (QSet (SAll (KAct (Work Organization1) Person)))
-l -treebank MQuery (QSet (SAll (KRelSet RNickname (SInd (IName (NPers Person1))))))
-l -treebank MQuery (QSet (SAll (KRelSet RNickname (SInd (IName (NLoc Location1))))))
-l -treebank MQuery (QSet (SAll (KRelSet RNickname (SInd (IName (NOrg Organization1))))))
-l -treebank MQuery (QCalled (IName (NPers Person1)))
-l -treebank MQuery (QCalled (IName (NLoc Location1)))
-l -treebank MQuery (QCalled (IName (NOrg Organization1)))
-l -treebank MQuery (QSet (SAll (KAct (HaveTitle JobTitle1) Person))) ---
-
diff --git a/examples/query/small/treebank.txt b/examples/query/small/treebank.txt
deleted file mode 100644
index 028a667bf..000000000
--- a/examples/query/small/treebank.txt
+++ /dev/null
@@ -1,299 +0,0 @@
-Query: MQuery (QSet (SAll Person))
-QueryEng: give me all people
-QueryFin: näytä kaikki henkilöt
-QueryFre: montrer toutes les personnes
-QueryGer: zeigen Sie alle Personen
-QueryIta: mostrare tutte le persone
-QuerySwe: ge mig alla personer
-
-
-Query: MQuery (QSet (SAll (KRel Location)))
-QueryEng: give me all locations
-QueryFin: näytä kaikki sijainnit
-QueryFre: montrer toutes les positions
-QueryGer: zeigen Sie alle Lagen
-QueryIta: mostrare tutte le posizioni
-QuerySwe: ge mig alla lägen
-
-
-Query: MQuery (QSet (SAll Organization))
-QueryEng: give me all organizations
-QueryFin: näytä kaikki organisaatiot
-QueryFre: montrer toutes les organisations
-QueryGer: zeigen Sie alle Organisationen
-QueryIta: mostrare tutte le organizzazioni
-QuerySwe: ge mig alla organisationer
-
-
-Query: MQuery (QInfo (SInd (IName (NOrg Organization1))))
-QueryEng: give me all information about 'Organization1
-QueryFin: anna kaikki tiedot organisaatiosta 'Organization1
-QueryFre: montrer toutes les informations sur 'Organization1
-QueryGer: zeigen Sie alle Informationen über 'Organization1
-QueryIta: mostrare tutte le informazioni su 'Organization1
-QuerySwe: ge mig all information om 'Organization1
-
-
-Query: MQuery (QInfo (SInd (IName (NPers Person1))))
-QueryEng: give me all information about 'Person1
-QueryFin: anna kaikki tiedot henkilöstä 'Person1
-QueryFre: montrer toutes les informations sur 'Person1
-QueryGer: zeigen Sie alle Informationen über 'Person1
-QueryIta: mostrare tutte le informazioni su 'Person1
-QuerySwe: ge mig all information om 'Person1
-
-
-Query: MQuery (QInfo (SInd (IName (NLoc Location1))))
-QueryEng: give me all information about 'Location1
-QueryFin: anna kaikki tiedot paikasta 'Location1
-QueryFre: montrer toutes les informations sur 'Location1
-QueryGer: zeigen Sie alle Informationen über 'Location1
-QueryIta: mostrare tutte le informazioni su 'Location1
-QuerySwe: ge mig all information om 'Location1
-
-
-Query: MQuery (QSet (SInd (IName (NOrg Organization1))))
-QueryEng: give me 'Organization1
-QueryFin: näytä organisaatio 'Organization1
-QueryFre: montrer 'Organization1
-QueryGer: zeigen Sie 'Organization1
-QueryIta: mostrare 'Organization1
-QuerySwe: ge mig 'Organization1
-
-
-Query: MQuery (QSet (SInd (IName (NPers Person1))))
-QueryEng: give me 'Person1
-QueryFin: näytä henkilö 'Person1
-QueryFre: montrer 'Person1
-QueryGer: zeigen Sie 'Person1
-QueryIta: mostrare 'Person1
-QuerySwe: ge mig 'Person1
-
-
-Query: MQuery (QSet (SInd (IName (NLoc Location1))))
-QueryEng: give me 'Location1
-QueryFin: näytä paikka 'Location1
-QueryFre: montrer 'Location1
-QueryGer: zeigen Sie 'Location1
-QueryIta: mostrare 'Location1
-QuerySwe: ge mig 'Location1
-
-
-Query: MQuery (QInfo (SAll Person))
-QueryEng: give me all information about all people
-QueryFin: anna kaikki tiedot kaikista henkilöistä
-QueryFre: montrer toutes les informations sur toutes les personnes
-QueryGer: zeigen Sie alle Informationen über alle Personen
-QueryIta: mostrare tutte le informazioni su tutte le persone
-QuerySwe: ge mig all information om alla personer
-
-
-Query: MQuery (QInfo (SAll (KRel Location)))
-QueryEng: give me all information about all locations
-QueryFin: anna kaikki tiedot kaikista sijainneista
-QueryFre: montrer toutes les informations sur toutes les positions
-QueryGer: zeigen Sie alle Informationen über alle Lagen
-QueryIta: mostrare tutte le informazioni su tutte le posizioni
-QuerySwe: ge mig all information om alla lägen
-
-
-Query: MQuery (QInfo (SAll Organization))
-QueryEng: give me all information about all organizations
-QueryFin: anna kaikki tiedot kaikista organisaatioista
-QueryFre: montrer toutes les informations sur toutes les organisations
-QueryGer: zeigen Sie alle Informationen über alle Organisationen
-QueryIta: mostrare tutte le informazioni su tutte le organizzazioni
-QuerySwe: ge mig all information om alla organisationer
-
-
-Query: MQuery (QSet (SAll (KRelSet Subregion (SAll (KRel Location)))))
-QueryEng: give me all subregions of all locations
-QueryFin: näytä kaikki kaikkien sijaintien osat
-QueryFre: montrer toutes les sous-régions de toutes les positions
-QueryGer: zeigen Sie alle Teilbereiche von allen Lagen
-QueryIta: mostrare tutte le sottoregioni di tutte le posizioni
-QuerySwe: ge mig alla delregioner i alla lägen
-
-
-Query: MQuery (QSet (SAll (KRelKind (KRel Location) Subregion (SOther (KRel Location)))))
-QueryEng: give me all locations that are subregions of other locations
-QueryFin: näytä kaikki sijainnit jotka ovat muiden sijaintien osia
-QueryFre: montrer toutes les positions qui sont des sous-régions d' autres positions
-QueryGer: zeigen Sie alle Lagen die Teilbereiche von anderen Lagen sind
-QueryIta: mostrare tutte le posizioni che sono sottoregioni di altre posizioni
-QuerySwe: ge mig alla lägen som är delregioner i andra lägen
-
-
-Query: MQuery (QSet (SAll (KRelSet Subregion (SInd (IName (NLoc Location1))))))
-QueryEng: give me all subregions of 'Location1
-QueryFin: näytä kaikki paikan 'Location1 osat
-QueryFre: montrer toutes les sous-régions de 'Location1
-QueryGer: zeigen Sie alle Teilbereiche von 'Location1
-QueryIta: mostrare tutte le sottoregioni di 'Location1
-QuerySwe: ge mig alla delregioner i 'Location1
-
-
-Query: MQuery (QSet (SPlural (KProp (Located Location1) Organization)))
-QueryEng: give me organizations located in 'Location1
-QueryFin: näytä paikassa 'Location1 sijaitsevia organisaatioita
-QueryFre: montrer des organisations situées dans 'Location1
-QueryGer: zeigen Sie in 'Location1 situierte Organisationen
-QueryIta: mostrare organizzazioni situate in 'Location1
-QuerySwe: ge mig organisationer belägna i 'Location1
-
-
-Query: MQuery (QSet (SPlural (KProp (Located Location1) Person)))
-QueryEng: give me people located in 'Location1
-QueryFin: näytä paikassa 'Location1 sijaitsevia henkilöitä
-QueryFre: montrer des personnes situées dans 'Location1
-QueryGer: zeigen Sie in 'Location1 situierte Personen
-QueryIta: mostrare persone situate in 'Location1
-QuerySwe: ge mig personer belägna i 'Location1
-
-
-Query: MQuery (QSet (SPlural (KProp (Located Location1) (KRel Location))))
-QueryEng: give me locations located in 'Location1
-QueryFin: näytä paikassa 'Location1 sijaitsevia sijainteja
-QueryFre: montrer des positions situées dans 'Location1
-QueryGer: zeigen Sie in 'Location1 situierte Lagen
-QueryIta: mostrare posizioni situate in 'Location1
-QuerySwe: ge mig lägen belägna i 'Location1
-
-
-Query: MQuery (QWhere (SInd (IName (NLoc Location1))))
-QueryEng: where is 'Location1
-QueryFin: missä on paikka 'Location1
-QueryFre: où est 'Location1
-QueryGer: wo ist 'Location1
-QueryIta: dove è 'Location1
-QuerySwe: var är 'Location1
-
-
-Query: MQuery (QWhere (SInd (IName (NOrg Organization1))))
-QueryEng: where is 'Organization1
-QueryFin: missä on organisaatio 'Organization1
-QueryFre: où est 'Organization1
-QueryGer: wo ist 'Organization1
-QueryIta: dove è 'Organization1
-QuerySwe: var är 'Organization1
-
-
-Query: MQuery (QWhere (SInd (IName (NPers Person1))))
-QueryEng: where is 'Person1
-QueryFin: missä on henkilö 'Person1
-QueryFre: où est 'Person1
-QueryGer: wo ist 'Person1
-QueryIta: dove è 'Person1
-QuerySwe: var är 'Person1
-
-
-Query: MQuery (QSet (SAll (KRelPair Organization Location)))
-QueryEng: give me all organizations with their locations
-QueryFin: näytä kaikki organisaatiot ja näiden sijainnit
-QueryFre: montrer toutes les organisations avec leurs positions
-QueryGer: zeigen Sie alle Organisationen mit ihren Lagen
-QueryIta: mostrare tutte le organizzazioni colle loro posizioni
-QuerySwe: ge mig alla organisationer med deras lägen
-
-
-Query: MQuery (QWhere (SAll Organization))
-QueryEng: where are all organizations
-QueryFin: missä ovat kaikki organisaatiot
-QueryFre: où sont toutes les organisations
-QueryGer: wo sind alle Organisationen
-QueryIta: dove sono tutte le organizzazioni
-QuerySwe: var är alla organisationer
-
-
-Query: MQuery (QWhere (SAll Person))
-QueryEng: where are all people
-QueryFin: missä ovat kaikki henkilöt
-QueryFre: où sont toutes les personnes
-QueryGer: wo sind alle Personen
-QueryIta: dove sono tutte le persone
-QuerySwe: var är alla personer
-
-
-Query: MQuery (QWhere (SAll (KRel Location)))
-QueryEng: where are all locations
-QueryFin: missä ovat kaikki sijainnit
-QueryFre: où sont toutes les positions
-QueryGer: wo sind alle Lagen
-QueryIta: dove sono tutte le posizioni
-QuerySwe: var är alla lägen
-
-
-Query: MQuery (QSet (SPlural (KRelPair (KRel Region) Subregion)))
-QueryEng: give me regions with their subregions
-QueryFin: näytä alueita ja näiden osia
-QueryFre: montrer des régions avec leurs sous-régions
-QueryGer: zeigen Sie Regionen mit ihren Teilbereichen
-QueryIta: mostrare regioni colle loro sottoregioni
-QuerySwe: ge mig regioner med deras delregioner
-
-
-command not parsed
-Query: MQuery (QSet (SAll (KAct (Work Organization1) Person)))
-QueryEng: give me all people that work at 'Organization1
-QueryFin: näytä kaikki henkilöt jotka työskentelevät organisaatiossa 'Organization1
-QueryFre: montrer toutes les personnes qui travaillent chez 'Organization1
-QueryGer: zeigen Sie alle Personen die bei 'Organization1 arbeiten
-QueryIta: mostrare tutte le persone che lavorano presso 'Organization1
-QuerySwe: ge mig alla personer som jobbar på 'Organization1
-
-
-Query: MQuery (QSet (SAll (KRelSet RNickname (SInd (IName (NPers Person1))))))
-QueryEng: give me all nicknames of 'Person1
-QueryFin: näytä kaikki henkilön 'Person1 lisänimet
-QueryFre: montrer tous les surnoms de 'Person1
-QueryGer: zeigen Sie alle Spitznamen von 'Person1
-QueryIta: mostrare tutti i soprannomi di 'Person1
-QuerySwe: ge mig alla tilläggsnamn på 'Person1
-
-
-Query: MQuery (QSet (SAll (KRelSet RNickname (SInd (IName (NLoc Location1))))))
-QueryEng: give me all nicknames of 'Location1
-QueryFin: näytä kaikki paikan 'Location1 lisänimet
-QueryFre: montrer tous les surnoms de 'Location1
-QueryGer: zeigen Sie alle Spitznamen von 'Location1
-QueryIta: mostrare tutti i soprannomi di 'Location1
-QuerySwe: ge mig alla tilläggsnamn på 'Location1
-
-
-Query: MQuery (QSet (SAll (KRelSet RNickname (SInd (IName (NOrg Organization1))))))
-QueryEng: give me all nicknames of 'Organization1
-QueryFin: näytä kaikki organisaation 'Organization1 lisänimet
-QueryFre: montrer tous les surnoms de 'Organization1
-QueryGer: zeigen Sie alle Spitznamen von 'Organization1
-QueryIta: mostrare tutti i soprannomi di 'Organization1
-QuerySwe: ge mig alla tilläggsnamn på 'Organization1
-
-
-Query: MQuery (QCalled (IName (NPers Person1)))
-QueryEng: how is 'Person1 also called
-QueryFin: mikä on henkilön 'Person1 toinen nimi
-QueryFre: quel autre nom a 'Person1
-QueryGer: welchen anderen Namen hat 'Person1
-QueryIta: quale altro nome ha 'Person1
-QuerySwe: vilket annat namn har 'Person1
-
-
-Query: MQuery (QCalled (IName (NLoc Location1)))
-QueryEng: how is 'Location1 also called
-QueryFin: mikä on paikan 'Location1 toinen nimi
-QueryFre: quel autre nom a 'Location1
-QueryGer: welchen anderen Namen hat 'Location1
-QueryIta: quale altro nome ha 'Location1
-QuerySwe: vilket annat namn har 'Location1
-
-
-Query: MQuery (QCalled (IName (NOrg Organization1)))
-QueryEng: how is 'Organization1 also called
-QueryFin: mikä on organisaation 'Organization1 toinen nimi
-QueryFre: quel autre nom a 'Organization1
-QueryGer: welchen anderen Namen hat 'Organization1
-QueryIta: quale altro nome ha 'Organization1
-QuerySwe: vilket annat namn har 'Organization1
-
-
-command not parsed
diff --git a/examples/query/test.gfs b/examples/query/test.gfs
deleted file mode 100644
index e7e4deaba..000000000
--- a/examples/query/test.gfs
+++ /dev/null
@@ -1,562 +0,0 @@
-ps -tr "what are the names of all locations that are subregions of other locations" | p
-ps -tr "give me the names of all locations that are subregions of other locations" | p
-ps -tr "give me the sub-regions of all locations" | p
-ps -tr "give me all locations with their sub-regions" | p
-ps -tr "give me all locations' sub-regions" | p
-ps -tr "give me all locations and their subregions" | p
-ps -tr "give me all subregions and their locations" | p
-ps -tr "what are the subregions of all locations" | p
-ps -tr "what subregions do all locations have" | p
-ps -tr "what do all locations have as subregions" | p
-ps -tr "what are the names of all locations that are subregions of Bulgaria" | p
-ps -tr "give me the sub-regions of Bulgaria" | p
-ps -tr "give me the Bulgarian sub-regions" | p
-ps -tr "what are the Bulgarian sub-regions" | p
-ps -tr "what are the names of the Bulgarian sub-regions" | p
-ps -tr "what are the names of all subregions of Bulgaria" | p
-ps -tr "what are the subregions of Bulgaria" | p
-ps -tr "what subregions does Bulgaria have" | p
-ps -tr "Bulgarian subregions" | p
-ps -tr "subregions of Bulgaria" | p
-ps -tr "where is Oblast Sofiya" | p
-ps -tr "give me the location of Oblast Sofiya" | p
-ps -tr "the location of Oblast Sofiya" | p
-ps -tr "what country is Oblast Sofiya in" | p
-ps -tr "Oblast Sofiya is in Bulgaria" | p
-ps -tr "Oblast Sofiya is located in Bulgaria" | p
-ps -tr "Oblast Sofiya is a subregion of Bulgaria" | p
-ps -tr "Oblast Sofiya's location is Bulgaria" | p
-ps -tr "Oblast Sofiya's location is in Bulgaria" | p
-ps -tr "one subregion of Bulgaria is Oblast Sofiya" | p
-ps -tr "a subregion of Bulgaria is Oblast Sofiya" | p
-ps -tr "Oblast Sofiya is the name of a subregion of Bulgaria" | p
-ps -tr "Bulgaria has a subregion - Oblast Sofiya" | p
-ps -tr "Oblast Sofiya is a Bulgarian subregion" | p
-ps -tr "Oblast Sofiya is a Bulgarian location" | p
-ps -tr "which are all organizations" | p
-ps -tr "what are the organizations" | p
-ps -tr "all organizations" | p
-ps -tr "give me all organizations" | p
-ps -tr "the organizations" | p
-ps -tr "what are the names of all organizations" | p
-ps -tr "give me all organizations' names" | p
-ps -tr "the names of all organizations" | p
-ps -tr "all organizations' names" | p
-ps -tr "organizations" | p
-ps -tr "what is Microsoft" | p
-ps -tr "what organization is Microsoft" | p
-ps -tr "give me information about Microsoft" | p
-ps -tr "all about Microsoft" | p
-ps -tr "give me all organizations named Microsoft" | p
-ps -tr "give me all organizations that start with Microsoft" | p
-ps -tr "all organizations' names starting with Microsoft" | p
-ps -tr "what are the organizations starting with Microsoft" | p
-ps -tr "what are the organizations that start with Microsoft" | p
-ps -tr "organizations starting with Microsoft" | p
-ps -tr "all organizations and their locations" | p
-ps -tr "give me all organizations with their locations" | p
-ps -tr "which organizations with their locations do you have" | p
-ps -tr "which organizations are located where" | p
-ps -tr "organizations with their locations" | p
-ps -tr "give me the organizations and their locations" | p
-ps -tr "what are the organizations and their locations" | p
-ps -tr "what organizations are located in what locations" | p
-ps -tr "the names of organizations and their locations" | p
-ps -tr "what are the names of all organizations and their locations" | p
-ps -tr "all organizations in Bulgaria" | p
-ps -tr "give me all organizations in Bulgaria" | p
-ps -tr "organizations located in Bulgaria" | p
-ps -tr "organizations in Bulgaria" | p
-ps -tr "organizations from Bulgaria" | p
-ps -tr "which organizations are from Bulgaria" | p
-ps -tr "which organizations are in Bulgaria" | p
-ps -tr "which organizations are located in Bulgaria" | p
-ps -tr "organizations that are located in Bulgaria" | p
-ps -tr "organizations that are in Bulgaria" | p
-ps -tr "organizations which are in Bulgaria" | p
-ps -tr "organizations which are located in Bulgaria" | p
-ps -tr "where is Google located" | p
-ps -tr "where is Google" | p
-ps -tr "what is Google's location" | p
-ps -tr "the location of Google" | p
-ps -tr "give me the location of Google" | p
-ps -tr "give me where is Google" | p
-ps -tr "give me where Google is located" | p
-ps -tr "what is the location of Google" | p
-ps -tr "Google's location" | p
-ps -tr "Google is in California" | p
-ps -tr "Google is located in California" | p
-ps -tr "Google's location is California" | p
-ps -tr "Google's in California" | p
-ps -tr "Google's location is in California" | p
-ps -tr "Google has a location California" | p
-ps -tr "California is Google's location" | p
-ps -tr "California is where Google is located" | p
-ps -tr "california is the location of Google" | p
-ps -tr "Google is situated in california" | p
-ps -tr "California is where Google is situated" | p
-ps -tr "organizations located in a subregion of a location" | p
-ps -tr "give me all organizations and in what subregion of what location they are located in" | p
-ps -tr "which organizations are located in a place which is the subregion of which location" | p
-ps -tr "where are the organizations located , in what subregion and region" | p
-ps -tr "which organizations are in which subregion and location" | p
-ps -tr "what organization is located in what subregion of which location" | p
-ps -tr "what are the organizations' locations by region and subregion" | p
-ps -tr "all organizations and their locations with their subregions" | p
-ps -tr "all organizations and the subregions of the locations they are located in" | p
-ps -tr "give me all organizations and the regions they are located in , with their subregions" | p
-ps -tr "the locations and subregions of all organizations" | p
-ps -tr "organizations which a located in subregions of Bulgaria" | p
-ps -tr "which organizations are located in subregions of Bulgaria" | p
-ps -tr "give me the organizations located in subregions of Bulgaria" | p
-ps -tr "give me all organizations that are located in subregions of Bulgaria" | p
-ps -tr "all organizations located in subregions of Bulgaria" | p
-ps -tr "all organizations which are in subregions of Bulgaria" | p
-ps -tr "the organizations which are in subregions of Bulgaria" | p
-ps -tr "the orgnaizations and the subregions of Bulgaria they are located in" | p
-ps -tr "the organizations and the subregions of Bulgaria they are in" | p
-ps -tr  "(simple} all organizations and the subregions of Bulgaria they are located in" | p
-ps -tr "all organizations in Sofia and a subregion of what area is Sofia" | p
-ps -tr "give me all organizations in Sofia and a subregion of which country it is" | p
-ps -tr "which organizations are located in Sofia , and where is Sofia" | p
-ps -tr "which organizations are located in Sofia and where is Sofia located" | p
-ps -tr "which organizations are located in Sofia and where is Sofia situated" | p
-ps -tr "all organizations located in Sofia and the region Sofia is subregion of" | p
-ps -tr "which organizations are located in Sofia , and Sofia is the subregion of which area" | p
-ps -tr "which organizations are in Sofia and a subregion of which country it is" | p
-ps -tr "all organizations in Sofia , a subregion of which country it is" | p
-ps -tr "all organizations in Sofia and the country of Sofia" | p
-ps -tr "which organizations are located in Sofia Bulgaria" | p
-ps -tr "all organizations located in Sofia Bulgaria" | p
-ps -tr "all organizations in Sofia Bulgaria" | p
-ps -tr "organizations which are in Sofia Bulgaria" | p
-ps -tr "organizations that are in Sofia Bulgaria" | p
-ps -tr "organizations located in Sofia , a subregion of Bulgaria" | p
-ps -tr "all organizations in Sofia , a subregion of Bulgaria" | p
-ps -tr "organizations that are in Sofia , which is a subregion of Bulgaria" | p
-ps -tr "organizations which are located in Sofia , which is in Bulgaria" | p
-ps -tr "organizations located in Sofia which is in Bulgaria" | p
-ps -tr "which organizations are situated in Sofia Bulgaria" | p
-ps -tr "all organizations situated in Sofia Bulgaria" | p
-ps -tr "organizations situated in Sofia , a subregion of Bulgaria" | p
-ps -tr "organizations which are situated in Sofia , which is in Bulgaria" | p
-ps -tr "organizations situated in Sofia which is in Bulgaria" | p
-ps -tr "what are the region and subregion where Google is located" | p
-ps -tr "what region and subregion Google is located in" | p
-ps -tr "the region and subregion Google is located in" | p
-ps -tr "the region and subregion of Google" | p
-ps -tr "the subregion of which region Google is located in" | p
-ps -tr "the subregion of which region is located Google in" | p
-ps -tr "which subregion and region Google is in" | p
-ps -tr "which are the region and subregion of Google" | p
-ps -tr "which are the locations of Google - region and subregion" | p
-ps -tr "give me the region and subregion Google is located in" | p
-ps -tr "where in the USA is Google" | p
-ps -tr "where in the USA is located Google" | p
-ps -tr "which subregion of the USA is Google located in" | p
-ps -tr "which subregion of the USA is Google in" | p
-ps -tr "which area in the USA is Google located in" | p
-ps -tr "which area of the USA is Google located in" | p
-ps -tr "the area of the USA Google is located in" | p
-ps -tr "the subregion of the USA where Google is located" | p
-ps -tr "the subregion of the USA Google is located in" | p
-ps -tr "give me the area of the USA Google is located in" | p
-ps -tr "give me the subregion of the USA where Google is located" | p
-ps -tr "give me the US state where Google is located" | p
-ps -tr "which country is located Google California in" | p
-ps -tr "where is located Google , California" | p
-ps -tr "what country is located Google , California in" | p
-ps -tr "what is the country of California , where Google is located" | p
-ps -tr "where is California , where Google is located in" | p
-ps -tr "give me the country of California , where Google is located in " | p
-ps -tr "what country is California located in , and Google" | p
-ps -tr "Google is located in California , USA" | p
-ps -tr "Google is located in California in the USA" | p
-ps -tr "Google is in California , the USA" | p
-ps -tr "Google is in California in the USA" | p
-ps -tr "Google's location is California , USA" | p
-ps -tr "Google's located in California in the USA" | p
-ps -tr "Google's location is California , which is in the USA" | p
-ps -tr "Google is located in California , which is in the USA" | p
-ps -tr "give me all people" | p
-ps -tr "give me all about all people" | p
-ps -tr "give me the names of all people" | p
-ps -tr "give me all people's names" | p
-ps -tr "person" | p
-ps -tr "all people" | p
-ps -tr "all about Marissa Mayer" | p
-ps -tr "give me all people named Marissa Mayer" | p
-ps -tr "who is Marissa Mayer" | p
-ps -tr "what person is Marissa Mayer" | p
-ps -tr "give me information about Marissa Mayer" | p
-ps -tr "what do you know about Marissa Mayer" | p
-ps -tr "all people named Marissa Mayer" | p
-ps -tr "give me all names and nicknames of all people" | p
-ps -tr "give me all names of all people" | p
-ps -tr "what are the names and the nicknames of all people" | p
-ps -tr "give me the names and nicknames of all people" | p
-ps -tr "give me the names of all people" | p
-ps -tr "the names and the nicknames of all people" | p
-ps -tr "all names and nicknames of all people" | p
-ps -tr "who is also known as Jung " | p
-ps -tr "who is also called Jung" | p
-ps -tr "who is otherwise known as Jung " | p
-ps -tr "who is otherwise called Jung " | p
-ps -tr "who is also named Jung" | p
-ps -tr "who is otherwise named Jung" | p
-ps -tr "who is famous with the name Jung" | p
-ps -tr "what is the full name of a person also known as Jung" | p
-ps -tr "what is the full name of a person otherwise known as Jung" | p
-ps -tr "what is the full name of a person also named Jung" | p
-ps -tr "what is the full name of a person otherwise named Jung" | p
-ps -tr "what is the full name of a person also called Jung" | p
-ps -tr "what is the full name of a person otherwise called Jung" | p
-ps -tr "give me all people with a nickname Jung" | p
-ps -tr "give me all people also named Jung" | p
-ps -tr "give me all people also known as Jung" | p
-ps -tr "give me all people otherwise known as Jung" | p
-ps -tr "give me all people also called Jung" | p
-ps -tr "give me all people otherwise called Jung" | p
-ps -tr "how is Carl Gustav Jung also known " | p
-ps -tr "how is Carl Gustav Jung also called" | p
-ps -tr "how is Carl Gustav Jung otherwise known" | p
-ps -tr "how is Carl Gustav Jung otherwise called" | p
-ps -tr "how is Carl Gustav Jung also named" | p
-ps -tr "how is Carl Gustav Jung otherwise named" | p
-ps -tr "what name is Carl Gustav Jung famous with" | p
-ps -tr "what name is Carl Gustav Jung known with" | p
-ps -tr "what name is Carl Gustav Jung called with" | p
-ps -tr "what name is Carl Gustav Jung also called with" | p
-ps -tr "give me the nickname of Carl Gustav Jung" | p
-ps -tr "give me Carl Gustav Jung's nickname" | p
-ps -tr "Carl Gustav Jung is also known as Jung" | p
-ps -tr "Carl Gustav Jung also called Jung" | p
-ps -tr "Carl Gustav Jung otherwise known as Jung" | p
-ps -tr "Carl Gustav Jung otherwise called Jung" | p
-ps -tr "Carl Gustav Jung also named Jung" | p
-ps -tr "Carl Gustav Jung otherwise named Jung" | p
-ps -tr "Carl Gustav Jung famous with the name Jung" | p
-ps -tr "Carl Gustav Jung known with the name Jung" | p
-ps -tr "Carl Gustav Jung called with the name Jung" | p
-ps -tr "Carl Gustav Jung also called with the name Jung" | p
-ps -tr "the nickname of Carl Gustav Jung is Jung" | p
-ps -tr "Carl Gustav Jung's nickname is Jung" | p
-ps -tr "who works as what" | p
-ps -tr "give me all people with their job titles" | p
-ps -tr "give me all job titles with their holders" | p
-ps -tr "give me all people with their job positions" | p
-ps -tr "give me all job positions with their holders" | p
-ps -tr "give me all people with their occupation" | p
-ps -tr "give me all people with their occupations" | p
-ps -tr "give me all occupations with their holders" | p
-ps -tr "what are all people by occupation" | p
-ps -tr "what are the jobs of all people" | p
-ps -tr "what are all people's occupations" | p
-ps -tr "give me all job positions and the people occupying them" | p
-ps -tr "who is appointed to work as what" | p
-ps -tr "whose appointment is what" | p
-ps -tr "who is paid for what" | p
-ps -tr "who is appointed for what" | p
-ps -tr "who is active as what" | p
-ps -tr "whose mandate is what" | p
-ps -tr "which person works as what" | p
-ps -tr "which person is appointed as what" | p
-ps -tr "what are the job positions of all people" | p
-ps -tr "what is everybody's job" | p
-ps -tr "who works as a CEO" | p
-ps -tr "whose job position is CEO" | p
-ps -tr "whose job title is CEO" | p
-ps -tr "whose occupation is CEO" | p
-ps -tr "who is CEO by occupation" | p
-ps -tr "who holds the position CEO" | p
-ps -tr "all people working as CEO" | p
-ps -tr "give me all CEOs" | p
-ps -tr "give me all people with the job position CEO" | p
-ps -tr "who has a job title CEO" | p
-ps -tr "who has a job position CEO" | p
-ps -tr "who is appointed as CEO" | p
-ps -tr "who is active as CEO" | p
-ps -tr "who has a mandate to be a CEO" | p
-ps -tr "whose mandate is to be a CEO" | p
-ps -tr "whose appointment is to be a CEO" | p
-ps -tr "who operates as CEO" | p
-ps -tr "who is paid to be a CEO" | p
-ps -tr "which person is mandated to be a CEO" | p
-ps -tr "who is a CEO" | p
-ps -tr "what does Udi Manber work" | p
-ps -tr "what's Udi Manber's job position" | p
-ps -tr "what's Udi Manber's job title" | p
-ps -tr "what does Udi Manber do" | p
-ps -tr "what is Udi Manber's job" | p
-ps -tr "what's the job of Udi Manber" | p
-ps -tr "what's the job title of Udi Manber" | p
-ps -tr "what's Udi Manber's occupation" | p
-ps -tr "what is Udi Manber by occupation" | p
-ps -tr "what job position does Udi Manber hold" | p
-ps -tr "what is the position of Udi Manber" | p
-ps -tr "what is the appointment of Udi Manber" | p
-ps -tr "what is the mandate of Udi Manber" | p
-ps -tr "what is Udi Manber paid for" | p
-ps -tr "what is Udi Manber's title" | p
-ps -tr "what is Udi Manber working as" | p
-ps -tr "what is Udi Manber appointed as" | p
-ps -tr "Ben Fried works as a Chief Information Officer" | p
-ps -tr "Ben Fried's job position is Chief Information Officer" | p
-ps -tr "Ben Fried is a Chief Information Officer" | p
-ps -tr "Ben Fried's job title is Chief Information Officer" | p
-ps -tr "Ben Fried's occupation is Chief Information Officer" | p
-ps -tr "Ben Fried is Cheif Information Officer by occupation" | p
-ps -tr "the Chief Information Officer is Ben Fried" | p
-ps -tr "Ben Fried holds the position of Chief Information Officer" | p
-ps -tr "Ben Fried is Chief Information Officer" | p
-ps -tr "Ben Fried is appointed as Chief Information Officer" | p
-ps -tr "Ben Fried is mandated as Chief Information Officer" | p
-ps -tr "Ben Fried has the title of Chief Information Officer" | p
-ps -tr "the title of Ben Fried is Chief Information Officer" | p
-ps -tr "Ben Fried works in a position of Chief Information Officer" | p
-ps -tr "the position of Ben Fried is Chief Information Officer" | p
-ps -tr "Ben Fried's title is Chief Information Officer" | p
-ps -tr "Ben Fried's position is Chief Information Officer" | p
-ps -tr "where do all people work and what is their occupation" | p
-ps -tr "who do all people work for and what's their occupation" | p
-ps -tr "give me all people with their job titles and the organization they work for" | p
-ps -tr "give me all job titles with their holders and the organization they work for" | p
-ps -tr "give me all people with their job positions and the organization they work for" | p
-ps -tr "give me all job positions with their holders and the organization they work for" | p
-ps -tr "give me all people with their occupation and where they work" | p
-ps -tr "give me all people with their occupations and where they work" | p
-ps -tr "what are all people by occupation and who do they work for" | p
-ps -tr "what are all people by occupation and what is the name of the organization they work for" | p
-ps -tr "what are the jobs of all people and who do they work for" | p
-ps -tr "what are the jobs of all people and what is the name of the organization they work for" | p
-ps -tr "what are all people's occupations and what is the name of the organizations they work for" | p
-ps -tr "who is employed where as what" | p
-ps -tr "who is employed at what organization in what position" | p
-ps -tr "who operates where and in what position" | p
-ps -tr "who is active at what organization in what capacity" | p
-ps -tr "who is paid by which organization for what work" | p
-ps -tr "who is appointed by which organization as in what capacity" | p
-ps -tr "which organization does employ whom as what" | p
-ps -tr "which organization appoints whom in what position" | p
-ps -tr "what is the job title of which person at what organization" | p
-ps -tr "what is the occupation of all people and who do they work for" | p
-ps -tr "which people work for what organization in what capacity" | p
-ps -tr "who works in what company and in what capacity" | p
-ps -tr "who works at Microsoft as what " | p
-ps -tr "who is who at Microsoft" | p
-ps -tr "who is appointed as what at Microsoft" | p
-ps -tr "who is employed by Microsoft as what" | p
-ps -tr "who is mandated by Microsoft as what" | p
-ps -tr "which position is occupied by whom at Microsoft" | p
-ps -tr "who occupies which position at Microsoft" | p
-ps -tr "who works at what position at Microsoft" | p
-ps -tr "who is active as what at Microsoft" | p
-ps -tr "who has what title at Microsoft" | p
-ps -tr "give me the names of the people that work for Microsoft with their job positions" | p
-ps -tr "give me the Microsoft employees names with their job titles" | p
-ps -tr "give me the names of the people that work for Microsoft with their job titles" | p
-ps -tr "give me the Microsoft employees names with their job positions" | p
-ps -tr "give me the Microsoft employees names with their occupations" | p
-ps -tr "give me the names of the people that work for Microsoft with their occupations" | p
-ps -tr "give me the names of the people that are active at Microsoft with their job positions" | p
-ps -tr "give me the names of the people that are active at Microsoft with their job titles" | p
-ps -tr "give me the names of the people that are active at Microsoft with their occupations" | p
-ps -tr "who works where as a CEO" | p
-ps -tr "who is apopinted at which oranigzation as a CEO" | p
-ps -tr "which organization employs whom as a CEO" | p
-ps -tr "which orgnization appoints whom as a CEO" | p
-ps -tr "which organization gives the mandate to whom to be the CEO" | p
-ps -tr "which organization has whom as the CEO" | p
-ps -tr "who is a CEO of which organization" | p
-ps -tr "who and where is CEO" | p
-ps -tr "who is a CEO of which organization" | p
-ps -tr "who is employed as CEO and in which organization" | p
-ps -tr "who is appointed as CEO and in which organization" | p
-ps -tr "who is mandated as CEO and in which organization" | p
-ps -tr "who is appointed as a CEO and where" | p
-ps -tr "who is a CEO and where" | p
-ps -tr "give me the names of all CEOs and the organizations they work for" | p
-ps -tr "give me the names of the people that work as a CEO and in which organization" | p
-ps -tr "give me the names of the people that have a job position CEO and in which organization" | p
-ps -tr "give me the names of the people that have a job title CEO and in which organization" | p
-ps -tr "give me the names of the people that have an occupation CEO and in which organization" | p
-ps -tr "give me the names of the people that occupy the the position CEO and in which organization" | p
-ps -tr "who is the president of Microsoft" | p
-ps -tr "who works as president of Microsoft" | p
-ps -tr "which person has the title president of Microsoft" | p
-ps -tr "who has the title president of Microsoft" | p
-ps -tr "who is employed as president of Microsoft" | p
-ps -tr "who is appointed as president of Microsoft" | p
-ps -tr "who has Microsoft employed as president" | p
-ps -tr "who is employed as president by Microsoft" | p
-ps -tr "who does Microsoft appoint as its president" | p
-ps -tr "who has the mandate to be the president of Microsoft" | p
-ps -tr "who acts as president of Microsoft" | p
-ps -tr "who acts as Microsoft's president" | p
-ps -tr "where does Eric Schmidt work and as what" | p
-ps -tr "where is Eric Schmidt apopinted and as what" | p
-ps -tr "what is the position of Eric Schmidt and at which organization does he work" | p
-ps -tr "what is the title of Eric Schmidt and where does he work" | p
-ps -tr "where does Eric Schmidt work and in what capacity" | p
-ps -tr "which organization has employed Eric Schmidt and as what" | p
-ps -tr "which organization has employed Eric Schmidt and in what capacity" | p
-ps -tr "where is Eric Schmidt appointed and as what" | p
-ps -tr "what is the title of Eric Schmidt at Google" | p
-ps -tr "what position does Eric Schmidt occupy at Google" | p
-ps -tr "what position does Eric Schmidt have at Google" | p
-ps -tr "what title does Eric Schmidt have at Google" | p
-ps -tr "Eric Schmidt is appointed at Google as what" | p
-ps -tr "Eric Schidt works for Google in what position" | p
-ps -tr "what is Eric Schmidt at Google" | p
-ps -tr "what mandate has Eric Schmidt at Google" | p
-ps -tr "the CEO of which organization is Eric Schmidt" | p
-ps -tr "Eric Schmidt is the CEO of which organization" | p
-ps -tr "Eric Schmidt is employed as CEO of which organization" | p
-ps -tr "where is Eric Schmidt the CEO" | p
-ps -tr "who employs Eric Schmidt as  CEO" | p
-ps -tr "where is Eric Schmidt appointed as CEO" | p
-ps -tr "which organization has employed Eric Schmidt as CEO" | p
-ps -tr "Eric Schmidt has the mandate of CEO for which organization" | p
-ps -tr "which organization gave Eric Schmidt the mandate to be the CEO" | p
-ps -tr "who appointed Eric Schmidt to be the CEO" | p
-ps -tr "which organization apopinted Eric Schmidt as the CEO" | p
-ps -tr "Eric Schmidt is CEO at Google" | p
-ps -tr "Eric Schmidt is the CEO of Google" | p
-ps -tr "Eric Schmidt has the title of CEO at Google" | p
-ps -tr "Eric Schmidt occupies the position of CEO at Google" | p
-ps -tr "Eric Schmidt acts as a CEO of Google" | p
-ps -tr "Eric Schmidt is employed as the CEO of Google" | p
-ps -tr "Eric Schmidt has the mandate of CEO of Google" | p
-ps -tr "Google has Eric Schmidt as its CEO" | p
-ps -tr "Google has employed Eric Schmidt as CEO" | p
-ps -tr "Google assigned Eric Schmidt to be the CEO" | p
-ps -tr "Google assigned the title of CEO to Eric Schmidt" | p
-ps -tr "Google gave the mandate of Eric Schmidt to be its CEO" | p
-ps -tr "Eric Schmidt's position is CEO at Google" | p
-ps -tr "Eric Schmidt's title is CEO at Google" | p
-ps -tr "who works where" | p
-ps -tr "who occupies position in which organization" | p
-ps -tr "which person works where" | p
-ps -tr "who is employed where" | p
-ps -tr "who is employed in what organization" | p
-ps -tr "what person has what workplace" | p
-ps -tr "who operates in what organization" | p
-ps -tr "which person operates in which organization" | p
-ps -tr "who occupies position where" | p
-ps -tr "who works at Google" | p
-ps -tr "all people working for Google" | p
-ps -tr "who is an employee of Google" | p
-ps -tr "all Google's employees" | p
-ps -tr "what are the names of the people working for Google" | p
-ps -tr "what are the names of all people working for Google" | p
-ps -tr "who operates at Google" | p
-ps -tr "what person exercises position at Google" | p
-ps -tr "who is active at Google" | p
-ps -tr "who works for Google" | p
-ps -tr "which person occupies position at Google" | p
-ps -tr "who has a job at Google" | p
-ps -tr "who is employed by Google" | p
-ps -tr "who is paid by Google" | p
-ps -tr "where does Sergey Brin work" | p
-ps -tr "what is the organization that employs Sergey Brin" | p
-ps -tr "which organization does Sergey Brin work for" | p
-ps -tr "who employes Sergey Brin" | p
-ps -tr "who does Sergey Brin work for" | p
-ps -tr "which organization is Sergey Brin employed by" | p
-ps -tr "which organization is Sergey Brin active in " | p
-ps -tr "Sergey Brin occupies position in which organizaton" | p
-ps -tr "where does Sergey Brin go to work" | p
-ps -tr "where is Sergey Brin professionally occupied" | p
-ps -tr "who is Sergey Brin's employer" | p
-ps -tr "who is the employer of Sergey Brin" | p
-ps -tr "Sergey Brin works at Google" | p
-ps -tr "Sergey Brin has position at Google" | p
-ps -tr "Sergey Brin is professionally occupied at Google" | p
-ps -tr "Sergey Brin is active at Google" | p
-ps -tr "Google has employed Sergey Brin" | p
-ps -tr "Google is the employer of Sergey Brin" | p
-ps -tr "Sergey Brin does work for Google" | p
-ps -tr "Sergey Brin is employed by Google" | p
-ps -tr "Sergey Brin has a work contract with Google" | p
-ps -tr "Sergey Brin has a job contract with Google" | p
-ps -tr "Sergey Brin is a professional at Google" | p
-ps -tr "who is also known as Jung and as Carl G Jung" | p
-ps -tr "who is also called Jung , or Carl G Jung" | p
-ps -tr "who is otherwise known as Jung , or Carl G Jung " | p
-ps -tr "who is otherwise called Jung , or Carl G Jung " | p
-ps -tr "who is also named Jung , or Carl G Jung" | p
-ps -tr "who is otherwise named Jung , or Carl G Jung" | p
-ps -tr "who is famous with the name Jung , or Carl G Jung" | p
-ps -tr "what is the full name of a person also known as Jung , or Carl G Jung" | p
-ps -tr "what is the full name of a person otherwise known as Jung , or Carl G Jung" | p
-ps -tr "what is the full name of a person also named Jung , or Carl G Jung" | p
-ps -tr "what is the full name of a person otherwise named Jung , or Carl G Jung" | p
-ps -tr "what is the full name of a person also called Jung , or Carl G Jung" | p
-ps -tr "what is the full name of a person otherwise called Jung , or Carl G Jung" | p
-ps -tr "give me all people with a nickname Jung , or Carl G Jung" | p
-ps -tr "give me all people also named Jung , or Carl G Jung" | p
-ps -tr "give me all people also known as Jung , or Carl G Jung" | p
-ps -tr "give me all people otherwise known as Jung , or Carl G Jung" | p
-ps -tr "give me all people also called Jung , or Carl G Jung" | p
-ps -tr "give me all people otherwise called Jung , or Carl G Jung" | p
-ps -tr "how is Carl Gustav Jung also known" | p
-ps -tr "how is Carl Gustav Jung also called" | p
-ps -tr "how is Carl Gustav Jung otherwise known" | p
-ps -tr "how is Carl Gustav Jung otherwise called" | p
-ps -tr "how is Carl Gustav Jung also named" | p
-ps -tr "how is Carl Gustav Jung otherwise named" | p
-ps -tr "what names is Carl Gustav Jung famous with" | p
-ps -tr "what names is Carl Gustav Jung known with" | p
-ps -tr "what names is Carl Gustav Jung called with" | p
-ps -tr "what names is Carl Gustav Jung also called with" | p
-ps -tr "give me the nicknames of Carl Gustav Jung" | p
-ps -tr "give me Carl Gustav Jung's nicknames" | p
-ps -tr "Carl Gustav Jung is also known as Jung and Carl G Jung" | p
-ps -tr "Carl Gustav Jung also called Jung and Carl G Jung" | p
-ps -tr "Carl Gustav Jung otherwise known as Jung and Carl G Jung" | p
-ps -tr "Carl Gustav Jung otherwise called Jung and Carl G Jung" | p
-ps -tr "Carl Gustav Jung also named Jung and Carl G Jung" | p
-ps -tr "Carl Gustav Jung otherwise named Jung and Carl G Jung" | p
-ps -tr "Carl Gustav Jung famous with the names Jung and Carl G Jung" | p
-ps -tr "Carl Gustav Jung known with the names Jung and Carl G Jung" | p
-ps -tr "Carl Gustav Jung called with the names Jung and Carl G Jung" | p
-ps -tr "Carl Gustav Jung also called with the names Jung and Carl G Jung" | p
-ps -tr "the nicknames of Carl Gustav Jung are Jung and Carl G Jung" | p
-ps -tr "Carl Gustav Jung's nicknames are Jung and Carl G Jung" | p
-ps -tr "Jung and Carl G Jung are names of Carl Gustav Jung" | p
-ps -tr "Jung and Carl G Jung are aliases of Carl Gustav Jung" | p
-ps -tr "Larry Page and Sergey Brin are co-founders of Google" | p
-ps -tr "co-founders of Google are Larry Page and Sergey Brin" | p
-ps -tr "Larry Page is co-founder of Google and Sergey Brin is co-founder of Google" | p
-ps -tr "Larry Page with Sergey Brin is co-founder of Google" | p
-ps -tr "Larry Page and Sergey Brin co-founded Google" | p
-ps -tr "Larry Page and Sergey Brin founded Google together" | p
-ps -tr "Larry Page co-founded Google with Sergey Brin" | p
-ps -tr "Larry Page and Sergey Brin estabslished Google together" | p
-ps -tr "Larry Page and Sergey Brin set up Google together" | p
-ps -tr "Larry Page established Google with Sergey Brin" | p
-ps -tr "Larry Page set up Google with Sergey Brin" | p
-ps -tr "Larry Page launched Google with Sergey Brin" | p
-ps -tr "Larry Page and Sergey Brin launched Google" | p
-ps -tr "Larry Page and Sergey Brin created Google" | p
-ps -tr "Larry Page and Sergey Brin constituted Google together" | p
-ps -tr "Sergey Brin and Larry Page work at Google" | p
-ps -tr "Sergey Brin works with Larry Page at Google" | p
-ps -tr "Sergey Brin and Larry Page are colleagues at Google" | p
-ps -tr "Sergey Brin and Larry Page are occupied at Google" | p
-ps -tr "Google has employed Sergey Brin and Larry Page" | p
-ps -tr "Sergey Brin and Larry Page are employed by Google" | p
-ps -tr "Sergey Brin and Larry Page have positions at Google" | p
-ps -tr "Sergey Brin and Larry Page are professionally active at Google" | p
-ps -tr "Sergey Brin and Larry Page get sallaries from Google" | p
-ps -tr "Sergey Brin and Larry Page are paid by Google" | p
-ps -tr "Sergey Brin , Larry Page and Eric Schmidt work at Google" | p
-ps -tr "Sergey Brin , Larry Page and Eric Schmidt are colleagues at Google" | p
-ps -tr "Sergey Brin , Larry Page and Eric Schmidt are employed by Google" | p
-ps -tr "Sergey Brin , Larry Page and Eric Schmidt collaborate in Google" | p
-ps -tr "Sergey Brin , Larry Page and Eric Schmidt are paid by Google" | p
-ps -tr "Sergey Brin , Larry Page and Eric Schmidt get sallaries at Google" | p
-ps -tr "Sergey Brin , Larry Page and Eric Schmidt are professionally active at Google" | p
-ps -tr "Google has employed Sergey Brin , Larry Page and Eric Schmidt" | p
-ps -tr "Sergey Brin , Larry Page and Eric Schmidt are appointed by Google" | p
-ps -tr "Sergey Brin , Larry Page and Eric Schmidt do work for Google" | p
diff --git a/examples/query/test.txt b/examples/query/test.txt
deleted file mode 100644
index 9e4925f61..000000000
--- a/examples/query/test.txt
+++ /dev/null
@@ -1,566 +0,0 @@
-
-
- What are the names of all locations that are subregions of other locations
- give me the names of all locations that are subregions of other locations
- give me the sub-regions of all locations
- give me all locations with their sub-regions
- give me all locations' sub-regions
- give me all locations and their subregions
- give me all subregions and their locations
- what are the subregions of all locations
- what subregions do all locations have
- what do all locations have as subregions
- What are the names of all locations that are subregion of Bulgaria
- give me the sub-regions of Bulgaria
- give me the Bulgarian sub-regions
- What are the Bulgarian sub-regions
- What are the names of the Bulgarian sub-regions
- what are the names of all subregions of Bulgaria
- what are the subregions of Bulgaria
- what subregions does Bulgaria have
- Bulgarian subregions
- subregions of Bulgaria
- Where is Oblast Sofiya
- give me the location of Oblast Sofiya
- the location of Oblast Sofyia
- what country is Oblast Sofyia in
- Oblast Sofyia is in Bulgaria
- Oblast Sofyia is located in Bulgaria
- Oblast Sofyia is a subregion of Bulgaria
- Oblast Sofyia's location is Bulgaria
- Oblast Sofyia's location is in Bulgaria
- One subregion of Bulgaria is Oblast Sofyia
- A subregion of Bulgaria is Oblast Sofyia
- Oblast SOfyia is the name of a subregion of Bulgaria
- Bulgaria has a subregion - Oblast Sofyia
- Oblast Sofyia is a Bulgarian subregion
- Oblast Sofyia is a Bulgarian location
- Which are all organizations
- What are the organizations
- all organizations
- give me all organizations
- the organizations
- what are the names of all organizations
- give me all organizations' names
- the names of all organizations
- all organizations' names
- organizations
- What is Microsoft
- What organization is Microsoft
- Give me information about Microsoft
- all about Microsoft
- give me all organizations named Microsoft
- give me all organizations that start with Microsoft
- all organizations' names starting with Microsoft
- what are the organizations starting with Microsoft
- what are the organizations that start with Microsoft
- organizations starting with Microsoft
- all organizations and their locations
- give me all organizations with their locations
- which organizations with their locations do you have
- which organizations are located where
- organizations with their locations
- give me the organizations and their locations
- what are the organizations and their locations
- what organizations are located in what locations
- the names of organizations and their locations
- what are the names of all organizations and their locations
- all organizations in Bulgaria
- give me all organizations in Bulgaria
- organizations located in Bulgaria
- organizations in Bulgaria
- organizations from Bulgaria
- which organizations are from Bulgaria
- which organizations are in Bulgaria
- which organizations are located in Bulgaria
- organizations that are located in Bulgaria
- organizations that are in Bulgaria
- organizations which are in Bulgaria
- organizations which are located in Bulgaria
- Where is Google located
- Where is Google
- What is Google's location
- the location of Google
- give me the location of Google
- give me where is Google
- give me where Google is located
- what is the location of Google
- Google's location
- Google is in California
- Google is located in California
- Google's location is California
- Google's in California
- Google's location is in California
- Google has a location California
- California is Google's location
- California is where Google is located
- california is the location of Google
- Google is situated in california
- California is where Google is situated
- Organizations located in a subregion of a location
- give me all organizations and in what subregion of what location they are located in
- which organizations are located in a place which is the subregion of which location
- where are the organizations located, in what subregion and region
- which organizations are in which subregion and location
- what organization is located in what subregion of which location
- what are the organizations' locations by region and subregion
- all organizations and their locations with their subregions
- all organizations and the subregions of the locations they are located in
- give me all organizations and the regions they are located in, with their subregions
- the locations and subregions of all oragnizations
- Orgnaizations which a located in subregions of Bulgaria
- which organizations are located in subregions of Bulgaria
- give me the organizations located in subregions of Bulgaria
- give me all organizations that are located in subregions of Bulgaria
- all organizations located in subregions of Bulgaria
- all organizations which are in subregions of Bulgaria
- the organizations which are in subregions of Bulgaria
- the orgnaizations and the subregions of Bulgaria they are located in
- the organizations and the subregions of Bulgaria they are in
-(simple} all organizations and the subregions of Bulgaria they are located in
- all organizations in Sofia and a subregion of what area is Sofia
- give me all organizations in Sofia and a subregion of which country it is
- which organizations are located in Sofia, and where is Sofia
- Which organizations are located in Sofia and where is Sofia located
- which organizations are located in Sofia and where is Sofia situated
- all organizations located in Sofia and the region Sofia is subregion of
- which organizations are located in Sofia, and Sofia is the subregion of which area
- which organizations are in Sofia and a subregion of which country it is
- all organizations in Sofia, a subregion of which country it is
- all organizations in Sofia and the country of Sofia
- Which organizations are located in Sofia Bulgaria
- all organizations located in Sofia Bulgaria
- all organizations in Sofia Bulgaria
- organizations which are in Sofia Bulgaria
- organizations that are in Sofia Bulgaria
- organizations located in Sofia, a subregion of Bulgaria
- all organizations in Sofia, a subregion of Bulgaria
- organizations that are in Sofia, which is a subregion of Bulgaria
- organizations which are located in Sofia, which is in Bulgaria
- organizations located in Sofia which is in Bulgaria
- Which organizations are situated in Sofia Bulgaria
- all organizations situated in Sofia Bulgaria
- organizations situated in Sofia, a subregion of Bulgaria
- organizations which are situated in Sofia, which is in Bulgaria
- organizations situated in Sofia which is in Bulgaria
- What are the region and subregion where Google is located
- What region and subregion Google is located in
- the region and subregion Google is located in
- the region and subregion of Google
- the subregion of which region Google is located in
- the subregion of which region is located Google in
- which subregion and region Google is in
- which are the region and subregion of Google
- which are the locations of Google - region and subregion
- give me the region and subregion Google is located in
- Where in the USA is Google
- Where in the USA is located Google
- Which subregion of the USA is Google located in
- Which subregion of the USA is Google in
- Which area in the USA is Google located in
- Which area of the USA is Google located in
- the area of the USA Google is located in
- the subregion of the USA where Google is located
- the subregion of the USA Google is located in
- give me the area of the USA Google is located in
- give me the subregion of the USA where Google is located
- give me the US state where Google is located
- Which country is located Google California in
- Where is located Google, California
- What country is located Google, California in
- What is the country of California, where Google is located
- Where is California, where Google is located in
- give me the country of California, where Google is located in 
- what country is California located in, and Google
- Google is located in California, USA
- Google is located in California in the USA
- Google is in California, the USA
- Google is in California in the USA
- Google's location is California, USA
- Google's located in California in the USA
- Google's location is California, which is in the USA
- Google is located in California, which is in the USA
- give me all people
- give me all about all people
-{simples} give me the names of all people
- give me all people's names
- person
- all people
- all about Marissa Mayer
- give me all people named Marissa Mayer
- who is Marissa Mayer
- what person is Marissa Mayer
- give me information about Marissa Mayer
- what do you know about Marissa Mayer
- all people named Marissa Mayer
- give me all names and nicknames of all people
- give me all names of all people
- What are the names and the nicknames of all people
- give me the names and nicknames of all people
- give me the names of all people
- the names and the nicknames of all people
- all names and nicknames of all people
- Who is also known as Jung 
- Who is also called Jung
- Who is otherwise known as Jung 
- Who is otherwise called Jung 
- Who is also named Jung
- Who is otherwise named Jung
- Who is famous with the name Jung
- What is the full name of a person also known as Jung
- What is the full name of a person otherwise known as Jung
- What is the full name of a person also named Jung
- What is the full name of a person otherwise named Jung
- What is the full name of a person also called Jung
- What is the full name of a person otherwise called Jung
- give me all people with a nickname Jung
- give me all people also named Jung
- give me all people also known as Jung
- give me all people otherwise known as Jung
- give me all people also called Jung
- give me all people otherwise called Jung
- How is Carl Gustav Jung also known 
- How is Carl Gustav Jung also called
- How is Carl Gustav Jung otherwise known
- How is Carl Gustav Jung otherwise called
- How is Carl Gustav Jung also named
- How is Carl Gustav Jung otherwise named
- What name is Carl Gustav Jung famous with
- What name is Carl Gustav Jung known with
- What name is Carl Gustav Jung called with
- What name is Carl Gustav Jung also called with
- give me the nickname of Carl Gustav Jung
- give me Carl Gustav Jung's nickname
- Carl Gustav Jung is also known as Jung
- Carl Gustav Jung also called Jung
- Carl Gustav Jung otherwise known as Jung
- Carl Gustav Jung otherwise called Jung
- Carl Gustav Jung also named Jung
- Carl Gustav Jung otherwise named Jung
- Carl Gustav Jung famous with the name Jung
- Carl Gustav Jung known with the name Jung
- Carl Gustav Jung called with the name Jung
- Carl Gustav Jung also called with the name Jung
- the nickname of Carl Gustav Jung is Jung
- Carl Gustav Jung's nickname is Jung
- Who works as what
- give me all people with their job titles
- give me all job titles with their holders
- give me all people with their job positions
- give me all job positions with their holders
- give me all people with their occupation
- give me all people with their occupations
- give me all occupations with their holders
- What are all people by occupation
- What are the jobs of all people
- What are all people's occupations
- give me all job positions and the people occupying them
- who is appointed to work as what
- whose appointment is what
- who is paid for what
- who is appointed for what
- who is active as what
- whose mandate is what
- which person works as what
- which person is appointed as what
- what are the job positions of all people
- what is everybody's job
- Who works as a CEO
- Whose job position is CEO
- Whose job title is CEO
- Whose occupation is CEO
- Who is CEO by occupation
- Who holds the position CEO
- all people working as CEO
- give me all CEOs
- give me all people with the job position CEO
- Who has a job title CEO
- Who has a job position CEO
- who is appointed as CEO
- who is active as CEO
- who has a mandate to be a CEO
- whose mandate is to be a CEO
- whose appointment is to be a CEO
- who operates as CEO
- who is paid to be a CEO
- which person is mandated to be a CEO
- who is a CEO
- What does Udi Manber work
- What's Udi Manber's job position
- What's Udi Manber's job title
- What does Udi Manber do
- What is Udi Manber's job
- What's the job of Udi Manber
- What's the job title of Udi Manber
- What's Udi Manber's occupation
- What is Udi Manber by occupation
- What job position does Udi Manber hold
- What is the position of Udi Manber
- What is the appointment of Udi Manber
- What is the mandate of Udi Manber
- What is Udi Manber paid for
- What is Udi Manber's title
- What is Udi Manber working as
- What is Udi Manber apopinted as
- Ben Fried works as a Chief Information Officer
- Ben Fried's job position is Chief Information Officer
- Ben Fried is a Chief Information Officer
- Ben Fried's job title is Chief Information Officer
- Ben Fried's occupation is Chief Information Officer
- Ben Fried is Cheif Information Officer by occupation
- The Chief Information Officer is Ben Fried
- Ben Fried holds the position of Chief Information Officer
- Ben Fried is Chief Information Officer
- Ben Fried is appointed as Chief Information Officer
- Ben Fried is mandated as Chief Information Officer
- Ben Fried has the title of Chief Information Officer
- The title of Ben Fried is Chief Information Officer
- Ben Fried works in a position of Chief Information Officer
- The position of Ben Fried is Chief Information Officer
- Ben Fried's title is Chief Information Officer
- Ben fried's position is Chief Information Officer
- Where do all people work and what is their occupation
- Who do all people work for and what's their occupation
- give me all people with their job titles and the Organization they work for
- give me all job titles with their holders and the Organization they work for
- give me all people with their job positions and the Organization they work for
- give me all job positions with their holders and the Organization they work for
- give me all people with their occupation and where they work
- give me all people with their occupations and where they work
- What are all people by occupation and who do they work for
- What are all people by occupation and what is the name of the organization they work for
- What are the jobs of all people and who do they work for
- What are the jobs of all people and what is the name of the organization they work for
- What are all people's occupations and what is the name of the organizations they work for
- Who is employed where as what
- Who is employed at what organization in what position
- Who operates where and in what position
- who is active at what organization in what capacity
- who is paid by which organization for what work
- who is appointed by which organization as in what capacity
- which orgniazation does employ whom as what
- which organization appoints whom in what position
- what is the job title of which person at what organization
- what is the occupation of all people and who do they work for
- which people work for what organization in what capacity
- who works in what company and in what capacity
- Who works at Microsoft as what 
- Who is who at Microsoft
- Who is appointed as what at Microsoft
- Who is employed by Microsoft as what
- Who is mandated by Microsoft as what
- Which position is occupied by whom at Microsoft
- Who occupies which position at Microsoft
- Who works at what position at Microsoft
- who is active as what at Microsoft
- who has what title at Microsoft
- give me the names of the people that work for Microsoft with their job positions
- give me the Microsoft employees names with their job titles
- give me the names of the people that work for Microsoft with their job titles
- give me the Microsoft employees names with their job positions
- give me the Microsoft employees names with their occupations
- give me the names of the people that work for Microsoft with their occupations
- give me the names of the people that are active at Microsoft with their job positions
- give me the names of the people that are active at Microsoft with their job titles
- give me the names of the people that are active at Microsoft with their occupations
- Who works where as a CEO
- Who is apopinted at which oranigzation as a CEO
- Which organization employs whom as a CEO
- Which orgnization appoints whom as a CEO
- Which organization gives the mandate to whom to be the CEO
- Which organization has whom as the CEO
- who is a CEO of which organization
- who and where is CEO
- who is a CEO of which organization
- who is employed as CEO and in which organization
- who is appointed as CEO and in which organization
- who is mandated as CEO and in which organization
- who is appointed as a CEO and where
- who is a CEO and where
- give me the names of all CEOs and the organizations they work for
- give me the names of the people that work as a CEO and in which organization
- give me the names of the people that have a job position CEO and in which organization
- give me the names of the people that have a job title CEO and in which organization
- give me the names of the people that have an occupation CEO and in which organization
- give me the names of the people that occupy the the position CEO and in which organization
- Who is the president of Microsoft
- Who works as president of Microsoft
- Which person has the title president of Microsoft
- who has the title president of Microsoft
- who is employed as president of Microsoft
- who is appointed as president of Microsoft
- who has Microsoft employed as president
- who is employed as president by Microsoft
- who does Microsoft appoint as its president
- who has the mandate to be the president of Microsoft
- who acts as president of Microsoft
- who acts as Microsoft's president
- Where does Eric Schmidt work and as what
- Where is Eric Schmidt apopinted and as what
- What is the position of Eric Schmidt and at which organization does he work
- What is the title of Eric Schmidt and where does he work
- Where does Eric Schmidt work and in what capacity
- Which organization has employed Eric Schmidt and as what
- Which organization has employed Eric Schmidt and in what capacity
- Where is Eric Schmidt appointed and as what
- What is the title of Eric Schmidt at Google
- What position does Eric Schmidt occupy at Google
- What position does Eric Schmidt have at Google
- What title does Eric Schmidt have at Google
- Eric Schmidt is appointed at Google as what
- Eric Schidt works for Google in what position
- What is Eric Schmidt at Google
- What mandate has Eric Schmidt at Google
- The CEO of which organization is Eric Schmidt
- Eric Schmidt is the CEO of which organization
- Eric Schmidt is employed as CEO of which organization
- where is Eric Schmidt the CEO
- Who employs Eric Schmidt as  CEO
- where is Eric Schmidt appointed as CEO
- which organization has employed Eric Schmidt as CEO
- Eric Schmidt has the mandate of CEO for which organization
- Which organization gave Eric Schmidt the mandate to be the CEO
- Who appointed Eric Schmidt to be the CEO
- which organization apopinted Eric Schmidt as the CEO
- Eric Schmidt is CEO at Google
- Eric Schmidt is the CEO of Google
- Eric Schmidt has the title of CEO at Google
- Eric Schmidt occupies the position of CEO at Google
- Eric Schmidt acts as a CEO of Google
- Eric Schmidt is employed as the CEO of Google
- Eric Schmidt has the mandate of CEO of Google
- Google has Eric Schmidt as its CEO
- Google has employed Eric Schmidt as CEO
- Google assigned Eric Schmidt to be the CEO
- Google assigned the title of CEO to Eric Schmidt
- Google gave the mandate of Eric Schmidt to be its CEO
- Eric Schmidt's position is CEO at Google
- Eric Schmidt's title is CEO at Google
- Who works where
- who occupies position in which organization
- which person works where
- who is employed where
- who is employed in what organization
- what person has what workplace
- who operates in what organization
- which person operates in which organization
- who occupies position where
- Who works at Google
- all people working for Google
- who is an employee of Google
- all Google's employees
- what are the names of the people working for Google
- what are the names of all people working for Google
- who operates at Google
- what person exercises position at Google
- who is active at Google
- who works for Google
- which person occupies position at Google
- who has a job at Google
- who is employed by Google
- who is paid by Google
- Where does Sergey Brin work
- What is the organization that employs Sergey Brin
- Which organization does Sergey Brin work for
- Who employes Sergey Brin
- Who does Sergey Brin work for
- Which organization is Sergey Brin employed by
- Which organization is Sergey Brin active in 
- Sergey Brin occupies position in which organizaton
- Where does Sergey Brin go to work
- Where is Sergey Brin professionally occupied
- Who is Sergey Brin's employer
- Who is the employer of Sergey Brin
- Sergey Brin works at Google
- Sergey Brin has position at Google
- Sergey Brin is professionally occupied at Google
- Sergey Brin is active at Google
- Google has employed Sergey Brin
- Google is the employer of Sergey Brin
- Sergey Brin does work for Google
- Sergey Brin is employed by Google
- Sergey Brin has a work contract with Google
- Sergey Brin has a job contract with Google
- Sergey Brin is a professional at Google
- Who is also known as Jung and as Carl G Jung
- Who is also called Jung, or Carl G Jung
- Who is otherwise known as Jung, or Carl G Jung 
- Who is otherwise called Jung, or Carl G Jung 
- Who is also named Jung, or Carl G Jung
- Who is otherwise named Jung, or Carl G Jung
- Who is famous with the name Jung, or Carl G Jung
- What is the full name of a person also known as Jung, or Carl G Jung
- What is the full name of a person otherwise known as Jung, or Carl G Jung
- What is the full name of a person also named Jung, or Carl G Jung
- What is the full name of a person otherwise named Jung, or Carl G Jung
- What is the full name of a person also called Jung, or Carl G Jung
- What is the full name of a person otherwise called Jung, or Carl G Jung
- give me all people with a nickname Jung, or Carl G Jung
- give me all people also named Jung, or Carl G Jung
- give me all people also known as Jung, or Carl G Jung
- give me all people otherwise known as Jung, or Carl G Jung
- give me all people also called Jung, or Carl G Jung
- give me all people otherwise called Jung, or Carl G Jung
- How is Carl Gustav Jung also known
- How is Carl Gustav Jung also called
- How is Carl Gustav Jung otherwise known
- How is Carl Gustav Jung otherwise called
- How is Carl Gustav Jung also named
- How is Carl Gustav Jung otherwise named
- What names is Carl Gustav Jung famous with
- What names is Carl Gustav Jung known with
- What names is Carl Gustav Jung called with
- What names is Carl Gustav Jung also called with
- give me the nicknames of Carl Gustav Jung
- give me Carl Gustav Jung's nicknames
- Carl Gustav Jung is also known as Jung and Carl G Jung
- Carl Gustav Jung also called Jung and Carl G Jung
- Carl Gustav Jung otherwise known as Jung and Carl G Jung
- Carl Gustav Jung otherwise called Jung and Carl G Jung
- Carl Gustav Jung also named Jung and Carl G Jung
- Carl Gustav Jung otherwise named Jung and Carl G Jung
- Carl Gustav Jung famous with the names Jung and Carl G Jung
- Carl Gustav Jung known with the names Jung and Carl G Jung
- Carl Gustav Jung called with the names Jung and Carl G Jung
- Carl Gustav Jung also called with the names Jung and Carl G Jung
- the nicknames of Carl Gustav Jung are Jung and Carl G Jung
- Carl Gustav Jung's nicknames are Jung and Carl G Jung
- Jung and Carl G Jung are names of Carl Gustav Jung
- Jung and Carl G Jung are aliases of Carl Gustav Jung
- Larry Page and Sergey Brin are co-founders of Google
- Co-founders of Google are Larry Page and Sergey Brin
- Larry Page is co-founder of Google and Sergey Brin is co-founder of Google
- Larry Page with Sergey Brin is co-founder of Google
- Larry Page and Sergey Brin co-founded Google
- Larry Page and Sergey Brin founded Google together
- Larry Page co-founded Google with Sergey Brin
- Larry Page and Sergey Brin estabslished Google together
- Larry Page and Sergey Brin set up Google together
- Larry Page established Google with Sergey Brin
- Larry Page set up Google with Sergey Brin
- Larry Page launched Google with Sergey Brin
- Larry Page and Sergey Brin launched Google
- Larry Page and Sergey Brin created Google
- Larry Page and Sergey Brin constituted Google together
- Sergey Brin and Larry Page work at Google
- Sergey Brin works with Larry Page at Google
- Sergey Brin and Larry Page are colleagues at Google
- Sergey Brin and Larry Page are occupied at Google
- Google has employed Sergey Brin and Larry Page
- Sergey Brin and Larry Page are employed by Google
- Sergey Brin and Larry Page have positions at Google
- Sergey Brin and Larry Page are professionally active at Google
- Sergey Brin and Larry Page get sallaries from Google
- Sergey Brin and Larry Page are paid by Google
- Sergey Brin, Larry Page and Eric Schmidt work at Google
- Sergey Brin, Larry Page and Eric Schmidt are colleagues at Google
- Sergey Brin, Larry Page and Eric Schmidt are employed by Google
- Sergey Brin, Larry Page and Eric Schmidt collaborate in Google
- Sergey Brin, Larry Page and Eric Schmidt are paid by Google
- Sergey Brin, Larry Page and Eric Schmidt get sallaries at Google
- Sergey Brin, Larry Page and Eric Schmidt are professionally active at Google
- Google has employed Sergey Brin, Larry Page and Eric Schmidt
- Sergey Brin, Larry Page and Eric Schmidt are appointed by Google
- Sergey Brin, Larry Page and Eric Schmidt do work for Google
-
-