diff --git a/src-2.9/FILES b/src-3.0/FILES
similarity index 100%
rename from src-2.9/FILES
rename to src-3.0/FILES
diff --git a/src-2.9/GF-embed.cabal b/src-3.0/GF-embed.cabal
similarity index 100%
rename from src-2.9/GF-embed.cabal
rename to src-3.0/GF-embed.cabal
diff --git a/src-2.9/GF.hs b/src-3.0/GF.hs
similarity index 100%
rename from src-2.9/GF.hs
rename to src-3.0/GF.hs
diff --git a/src-2.9/GF/API.hs b/src-3.0/GF/API.hs
similarity index 100%
rename from src-2.9/GF/API.hs
rename to src-3.0/GF/API.hs
diff --git a/src-2.9/GF/API/BatchTranslate.hs b/src-3.0/GF/API/BatchTranslate.hs
similarity index 100%
rename from src-2.9/GF/API/BatchTranslate.hs
rename to src-3.0/GF/API/BatchTranslate.hs
diff --git a/src-2.9/GF/API/GrammarToHaskell.hs b/src-3.0/GF/API/GrammarToHaskell.hs
similarity index 100%
rename from src-2.9/GF/API/GrammarToHaskell.hs
rename to src-3.0/GF/API/GrammarToHaskell.hs
diff --git a/src-2.9/GF/API/GrammarToTransfer.hs b/src-3.0/GF/API/GrammarToTransfer.hs
similarity index 100%
rename from src-2.9/GF/API/GrammarToTransfer.hs
rename to src-3.0/GF/API/GrammarToTransfer.hs
diff --git a/src-2.9/GF/API/IOGrammar.hs b/src-3.0/GF/API/IOGrammar.hs
similarity index 100%
rename from src-2.9/GF/API/IOGrammar.hs
rename to src-3.0/GF/API/IOGrammar.hs
diff --git a/src-2.9/GF/API/MyParser.hs b/src-3.0/GF/API/MyParser.hs
similarity index 100%
rename from src-2.9/GF/API/MyParser.hs
rename to src-3.0/GF/API/MyParser.hs
diff --git a/src-2.9/GF/CF/CF.hs b/src-3.0/GF/CF/CF.hs
similarity index 100%
rename from src-2.9/GF/CF/CF.hs
rename to src-3.0/GF/CF/CF.hs
diff --git a/src-2.9/GF/CF/CFIdent.hs b/src-3.0/GF/CF/CFIdent.hs
similarity index 100%
rename from src-2.9/GF/CF/CFIdent.hs
rename to src-3.0/GF/CF/CFIdent.hs
diff --git a/src-2.9/GF/CF/CFtoGrammar.hs b/src-3.0/GF/CF/CFtoGrammar.hs
similarity index 100%
rename from src-2.9/GF/CF/CFtoGrammar.hs
rename to src-3.0/GF/CF/CFtoGrammar.hs
diff --git a/src-2.9/GF/CF/CanonToCF.hs b/src-3.0/GF/CF/CanonToCF.hs
similarity index 100%
rename from src-2.9/GF/CF/CanonToCF.hs
rename to src-3.0/GF/CF/CanonToCF.hs
diff --git a/src-2.9/GF/CF/ChartParser.hs b/src-3.0/GF/CF/ChartParser.hs
similarity index 100%
rename from src-2.9/GF/CF/ChartParser.hs
rename to src-3.0/GF/CF/ChartParser.hs
diff --git a/src-2.9/GF/CF/EBNF.hs b/src-3.0/GF/CF/EBNF.hs
similarity index 100%
rename from src-2.9/GF/CF/EBNF.hs
rename to src-3.0/GF/CF/EBNF.hs
diff --git a/src-2.9/GF/CF/PPrCF.hs b/src-3.0/GF/CF/PPrCF.hs
similarity index 100%
rename from src-2.9/GF/CF/PPrCF.hs
rename to src-3.0/GF/CF/PPrCF.hs
diff --git a/src-2.9/GF/CF/PrLBNF.hs b/src-3.0/GF/CF/PrLBNF.hs
similarity index 100%
rename from src-2.9/GF/CF/PrLBNF.hs
rename to src-3.0/GF/CF/PrLBNF.hs
diff --git a/src-2.9/GF/CF/Profile.hs b/src-3.0/GF/CF/Profile.hs
similarity index 100%
rename from src-2.9/GF/CF/Profile.hs
rename to src-3.0/GF/CF/Profile.hs
diff --git a/src-2.9/GF/CFGM/AbsCFG.hs b/src-3.0/GF/CFGM/AbsCFG.hs
similarity index 100%
rename from src-2.9/GF/CFGM/AbsCFG.hs
rename to src-3.0/GF/CFGM/AbsCFG.hs
diff --git a/src-2.9/GF/CFGM/CFG.cf b/src-3.0/GF/CFGM/CFG.cf
similarity index 100%
rename from src-2.9/GF/CFGM/CFG.cf
rename to src-3.0/GF/CFGM/CFG.cf
diff --git a/src-2.9/GF/CFGM/LexCFG.hs b/src-3.0/GF/CFGM/LexCFG.hs
similarity index 100%
rename from src-2.9/GF/CFGM/LexCFG.hs
rename to src-3.0/GF/CFGM/LexCFG.hs
diff --git a/src-2.9/GF/CFGM/LexCFG.x b/src-3.0/GF/CFGM/LexCFG.x
similarity index 100%
rename from src-2.9/GF/CFGM/LexCFG.x
rename to src-3.0/GF/CFGM/LexCFG.x
diff --git a/src-2.9/GF/CFGM/ParCFG.hs b/src-3.0/GF/CFGM/ParCFG.hs
similarity index 100%
rename from src-2.9/GF/CFGM/ParCFG.hs
rename to src-3.0/GF/CFGM/ParCFG.hs
diff --git a/src-2.9/GF/CFGM/ParCFG.y b/src-3.0/GF/CFGM/ParCFG.y
similarity index 100%
rename from src-2.9/GF/CFGM/ParCFG.y
rename to src-3.0/GF/CFGM/ParCFG.y
diff --git a/src-2.9/GF/CFGM/PrintCFG.hs b/src-3.0/GF/CFGM/PrintCFG.hs
similarity index 100%
rename from src-2.9/GF/CFGM/PrintCFG.hs
rename to src-3.0/GF/CFGM/PrintCFG.hs
diff --git a/src-2.9/GF/CFGM/PrintCFGrammar.hs b/src-3.0/GF/CFGM/PrintCFGrammar.hs
similarity index 100%
rename from src-2.9/GF/CFGM/PrintCFGrammar.hs
rename to src-3.0/GF/CFGM/PrintCFGrammar.hs
diff --git a/src-2.9/GF/Canon/AbsGFC.hs b/src-3.0/GF/Canon/AbsGFC.hs
similarity index 100%
rename from src-2.9/GF/Canon/AbsGFC.hs
rename to src-3.0/GF/Canon/AbsGFC.hs
diff --git a/src-2.9/GF/Canon/AbsToBNF.hs b/src-3.0/GF/Canon/AbsToBNF.hs
similarity index 100%
rename from src-2.9/GF/Canon/AbsToBNF.hs
rename to src-3.0/GF/Canon/AbsToBNF.hs
diff --git a/src-2.9/GF/Canon/CMacros.hs b/src-3.0/GF/Canon/CMacros.hs
similarity index 100%
rename from src-2.9/GF/Canon/CMacros.hs
rename to src-3.0/GF/Canon/CMacros.hs
diff --git a/src-2.9/GF/Canon/CanonToGFCC.hs b/src-3.0/GF/Canon/CanonToGFCC.hs
similarity index 100%
rename from src-2.9/GF/Canon/CanonToGFCC.hs
rename to src-3.0/GF/Canon/CanonToGFCC.hs
diff --git a/src-2.9/GF/Canon/CanonToGrammar.hs b/src-3.0/GF/Canon/CanonToGrammar.hs
similarity index 100%
rename from src-2.9/GF/Canon/CanonToGrammar.hs
rename to src-3.0/GF/Canon/CanonToGrammar.hs
diff --git a/src-2.9/GF/Canon/GFC.cf b/src-3.0/GF/Canon/GFC.cf
similarity index 100%
rename from src-2.9/GF/Canon/GFC.cf
rename to src-3.0/GF/Canon/GFC.cf
diff --git a/src-2.9/GF/Canon/GFC.hs b/src-3.0/GF/Canon/GFC.hs
similarity index 100%
rename from src-2.9/GF/Canon/GFC.hs
rename to src-3.0/GF/Canon/GFC.hs
diff --git a/src-2.9/GF/Canon/GetGFC.hs b/src-3.0/GF/Canon/GetGFC.hs
similarity index 100%
rename from src-2.9/GF/Canon/GetGFC.hs
rename to src-3.0/GF/Canon/GetGFC.hs
diff --git a/src-2.9/GF/Canon/LexGFC.hs b/src-3.0/GF/Canon/LexGFC.hs
similarity index 100%
rename from src-2.9/GF/Canon/LexGFC.hs
rename to src-3.0/GF/Canon/LexGFC.hs
diff --git a/src-2.9/GF/Canon/LexGFC.x b/src-3.0/GF/Canon/LexGFC.x
similarity index 100%
rename from src-2.9/GF/Canon/LexGFC.x
rename to src-3.0/GF/Canon/LexGFC.x
diff --git a/src-2.9/GF/Canon/Look.hs b/src-3.0/GF/Canon/Look.hs
similarity index 100%
rename from src-2.9/GF/Canon/Look.hs
rename to src-3.0/GF/Canon/Look.hs
diff --git a/src-2.9/GF/Canon/MkGFC.hs b/src-3.0/GF/Canon/MkGFC.hs
similarity index 100%
rename from src-2.9/GF/Canon/MkGFC.hs
rename to src-3.0/GF/Canon/MkGFC.hs
diff --git a/src-2.9/GF/Canon/ParGFC.hs b/src-3.0/GF/Canon/ParGFC.hs
similarity index 100%
rename from src-2.9/GF/Canon/ParGFC.hs
rename to src-3.0/GF/Canon/ParGFC.hs
diff --git a/src-2.9/GF/Canon/ParGFC.y b/src-3.0/GF/Canon/ParGFC.y
similarity index 100%
rename from src-2.9/GF/Canon/ParGFC.y
rename to src-3.0/GF/Canon/ParGFC.y
diff --git a/src-2.9/GF/Canon/PrExp.hs b/src-3.0/GF/Canon/PrExp.hs
similarity index 100%
rename from src-2.9/GF/Canon/PrExp.hs
rename to src-3.0/GF/Canon/PrExp.hs
diff --git a/src-2.9/GF/Canon/PrintGFC.hs b/src-3.0/GF/Canon/PrintGFC.hs
similarity index 100%
rename from src-2.9/GF/Canon/PrintGFC.hs
rename to src-3.0/GF/Canon/PrintGFC.hs
diff --git a/src-2.9/GF/Canon/Share.hs b/src-3.0/GF/Canon/Share.hs
similarity index 100%
rename from src-2.9/GF/Canon/Share.hs
rename to src-3.0/GF/Canon/Share.hs
diff --git a/src-2.9/GF/Canon/SkelGFC.hs b/src-3.0/GF/Canon/SkelGFC.hs
similarity index 100%
rename from src-2.9/GF/Canon/SkelGFC.hs
rename to src-3.0/GF/Canon/SkelGFC.hs
diff --git a/src-2.9/GF/Canon/Subexpressions.hs b/src-3.0/GF/Canon/Subexpressions.hs
similarity index 100%
rename from src-2.9/GF/Canon/Subexpressions.hs
rename to src-3.0/GF/Canon/Subexpressions.hs
diff --git a/src-2.9/GF/Canon/TestGFC.hs b/src-3.0/GF/Canon/TestGFC.hs
similarity index 100%
rename from src-2.9/GF/Canon/TestGFC.hs
rename to src-3.0/GF/Canon/TestGFC.hs
diff --git a/src-2.9/GF/Canon/Unlex.hs b/src-3.0/GF/Canon/Unlex.hs
similarity index 100%
rename from src-2.9/GF/Canon/Unlex.hs
rename to src-3.0/GF/Canon/Unlex.hs
diff --git a/src-2.9/GF/Canon/Unparametrize.hs b/src-3.0/GF/Canon/Unparametrize.hs
similarity index 100%
rename from src-2.9/GF/Canon/Unparametrize.hs
rename to src-3.0/GF/Canon/Unparametrize.hs
diff --git a/src-2.9/GF/Canon/log.txt b/src-3.0/GF/Canon/log.txt
similarity index 100%
rename from src-2.9/GF/Canon/log.txt
rename to src-3.0/GF/Canon/log.txt
diff --git a/src-2.9/GF/Command/AbsGFShell.hs b/src-3.0/GF/Command/AbsGFShell.hs
similarity index 100%
rename from src-2.9/GF/Command/AbsGFShell.hs
rename to src-3.0/GF/Command/AbsGFShell.hs
diff --git a/src-2.9/GF/Command/Commands.hs b/src-3.0/GF/Command/Commands.hs
similarity index 100%
rename from src-2.9/GF/Command/Commands.hs
rename to src-3.0/GF/Command/Commands.hs
diff --git a/src-2.9/GF/Command/GFShell.cf b/src-3.0/GF/Command/GFShell.cf
similarity index 100%
rename from src-2.9/GF/Command/GFShell.cf
rename to src-3.0/GF/Command/GFShell.cf
diff --git a/src-2.9/GF/Command/Importing.hs b/src-3.0/GF/Command/Importing.hs
similarity index 100%
rename from src-2.9/GF/Command/Importing.hs
rename to src-3.0/GF/Command/Importing.hs
diff --git a/src-2.9/GF/Command/Interpreter.hs b/src-3.0/GF/Command/Interpreter.hs
similarity index 100%
rename from src-2.9/GF/Command/Interpreter.hs
rename to src-3.0/GF/Command/Interpreter.hs
diff --git a/src-2.9/GF/Command/LexGFShell.hs b/src-3.0/GF/Command/LexGFShell.hs
similarity index 100%
rename from src-2.9/GF/Command/LexGFShell.hs
rename to src-3.0/GF/Command/LexGFShell.hs
diff --git a/src-2.9/GF/Command/PPrTree.hs b/src-3.0/GF/Command/PPrTree.hs
similarity index 100%
rename from src-2.9/GF/Command/PPrTree.hs
rename to src-3.0/GF/Command/PPrTree.hs
diff --git a/src-2.9/GF/Command/ParGFShell.hs b/src-3.0/GF/Command/ParGFShell.hs
similarity index 100%
rename from src-2.9/GF/Command/ParGFShell.hs
rename to src-3.0/GF/Command/ParGFShell.hs
diff --git a/src-2.9/GF/Command/PrintGFShell.hs b/src-3.0/GF/Command/PrintGFShell.hs
similarity index 100%
rename from src-2.9/GF/Command/PrintGFShell.hs
rename to src-3.0/GF/Command/PrintGFShell.hs
diff --git a/src-2.9/GF/Compile/API.hs b/src-3.0/GF/Compile/API.hs
similarity index 100%
rename from src-2.9/GF/Compile/API.hs
rename to src-3.0/GF/Compile/API.hs
diff --git a/src-2.9/GF/Compile/BackOpt.hs b/src-3.0/GF/Compile/BackOpt.hs
similarity index 100%
rename from src-2.9/GF/Compile/BackOpt.hs
rename to src-3.0/GF/Compile/BackOpt.hs
diff --git a/src-2.9/GF/Compile/CheckGrammar.hs b/src-3.0/GF/Compile/CheckGrammar.hs
similarity index 100%
rename from src-2.9/GF/Compile/CheckGrammar.hs
rename to src-3.0/GF/Compile/CheckGrammar.hs
diff --git a/src-2.9/GF/Compile/Compile.hs b/src-3.0/GF/Compile/Compile.hs
similarity index 100%
rename from src-2.9/GF/Compile/Compile.hs
rename to src-3.0/GF/Compile/Compile.hs
diff --git a/src-2.9/GF/Compile/Evaluate.hs b/src-3.0/GF/Compile/Evaluate.hs
similarity index 100%
rename from src-2.9/GF/Compile/Evaluate.hs
rename to src-3.0/GF/Compile/Evaluate.hs
diff --git a/src-2.9/GF/Compile/Extend.hs b/src-3.0/GF/Compile/Extend.hs
similarity index 100%
rename from src-2.9/GF/Compile/Extend.hs
rename to src-3.0/GF/Compile/Extend.hs
diff --git a/src-2.9/GF/Compile/Flatten.hs b/src-3.0/GF/Compile/Flatten.hs
similarity index 100%
rename from src-2.9/GF/Compile/Flatten.hs
rename to src-3.0/GF/Compile/Flatten.hs
diff --git a/src-2.9/GF/Compile/GetGrammar.hs b/src-3.0/GF/Compile/GetGrammar.hs
similarity index 100%
rename from src-2.9/GF/Compile/GetGrammar.hs
rename to src-3.0/GF/Compile/GetGrammar.hs
diff --git a/src-2.9/GF/Compile/GrammarToCanon.hs b/src-3.0/GF/Compile/GrammarToCanon.hs
similarity index 100%
rename from src-2.9/GF/Compile/GrammarToCanon.hs
rename to src-3.0/GF/Compile/GrammarToCanon.hs
diff --git a/src-2.9/GF/Compile/MkConcrete.hs b/src-3.0/GF/Compile/MkConcrete.hs
similarity index 100%
rename from src-2.9/GF/Compile/MkConcrete.hs
rename to src-3.0/GF/Compile/MkConcrete.hs
diff --git a/src-2.9/GF/Compile/MkResource.hs b/src-3.0/GF/Compile/MkResource.hs
similarity index 100%
rename from src-2.9/GF/Compile/MkResource.hs
rename to src-3.0/GF/Compile/MkResource.hs
diff --git a/src-2.9/GF/Compile/MkUnion.hs b/src-3.0/GF/Compile/MkUnion.hs
similarity index 100%
rename from src-2.9/GF/Compile/MkUnion.hs
rename to src-3.0/GF/Compile/MkUnion.hs
diff --git a/src-2.9/GF/Compile/ModDeps.hs b/src-3.0/GF/Compile/ModDeps.hs
similarity index 100%
rename from src-2.9/GF/Compile/ModDeps.hs
rename to src-3.0/GF/Compile/ModDeps.hs
diff --git a/src-2.9/GF/Compile/NewRename.hs b/src-3.0/GF/Compile/NewRename.hs
similarity index 100%
rename from src-2.9/GF/Compile/NewRename.hs
rename to src-3.0/GF/Compile/NewRename.hs
diff --git a/src-2.9/GF/Compile/NoParse.hs b/src-3.0/GF/Compile/NoParse.hs
similarity index 100%
rename from src-2.9/GF/Compile/NoParse.hs
rename to src-3.0/GF/Compile/NoParse.hs
diff --git a/src-2.9/GF/Compile/Optimize.hs b/src-3.0/GF/Compile/Optimize.hs
similarity index 100%
rename from src-2.9/GF/Compile/Optimize.hs
rename to src-3.0/GF/Compile/Optimize.hs
diff --git a/src-2.9/GF/Compile/PGrammar.hs b/src-3.0/GF/Compile/PGrammar.hs
similarity index 100%
rename from src-2.9/GF/Compile/PGrammar.hs
rename to src-3.0/GF/Compile/PGrammar.hs
diff --git a/src-2.9/GF/Compile/PrOld.hs b/src-3.0/GF/Compile/PrOld.hs
similarity index 100%
rename from src-2.9/GF/Compile/PrOld.hs
rename to src-3.0/GF/Compile/PrOld.hs
diff --git a/src-2.9/GF/Compile/Rebuild.hs b/src-3.0/GF/Compile/Rebuild.hs
similarity index 100%
rename from src-2.9/GF/Compile/Rebuild.hs
rename to src-3.0/GF/Compile/Rebuild.hs
diff --git a/src-2.9/GF/Compile/RemoveLiT.hs b/src-3.0/GF/Compile/RemoveLiT.hs
similarity index 100%
rename from src-2.9/GF/Compile/RemoveLiT.hs
rename to src-3.0/GF/Compile/RemoveLiT.hs
diff --git a/src-2.9/GF/Compile/Rename.hs b/src-3.0/GF/Compile/Rename.hs
similarity index 100%
rename from src-2.9/GF/Compile/Rename.hs
rename to src-3.0/GF/Compile/Rename.hs
diff --git a/src-2.9/GF/Compile/ShellState.hs b/src-3.0/GF/Compile/ShellState.hs
similarity index 100%
rename from src-2.9/GF/Compile/ShellState.hs
rename to src-3.0/GF/Compile/ShellState.hs
diff --git a/src-2.9/GF/Compile/Update.hs b/src-3.0/GF/Compile/Update.hs
similarity index 100%
rename from src-2.9/GF/Compile/Update.hs
rename to src-3.0/GF/Compile/Update.hs
diff --git a/src-2.9/GF/Compile/Wordlist.hs b/src-3.0/GF/Compile/Wordlist.hs
similarity index 100%
rename from src-2.9/GF/Compile/Wordlist.hs
rename to src-3.0/GF/Compile/Wordlist.hs
diff --git a/src-2.9/GF/Conversion/GFC.hs b/src-3.0/GF/Conversion/GFC.hs
similarity index 100%
rename from src-2.9/GF/Conversion/GFC.hs
rename to src-3.0/GF/Conversion/GFC.hs
diff --git a/src-2.9/GF/Conversion/GFCtoSimple.hs b/src-3.0/GF/Conversion/GFCtoSimple.hs
similarity index 100%
rename from src-2.9/GF/Conversion/GFCtoSimple.hs
rename to src-3.0/GF/Conversion/GFCtoSimple.hs
diff --git a/src-2.9/GF/Conversion/Haskell.hs b/src-3.0/GF/Conversion/Haskell.hs
similarity index 100%
rename from src-2.9/GF/Conversion/Haskell.hs
rename to src-3.0/GF/Conversion/Haskell.hs
diff --git a/src-2.9/GF/Conversion/MCFGtoCFG.hs b/src-3.0/GF/Conversion/MCFGtoCFG.hs
similarity index 100%
rename from src-2.9/GF/Conversion/MCFGtoCFG.hs
rename to src-3.0/GF/Conversion/MCFGtoCFG.hs
diff --git a/src-2.9/GF/Conversion/MCFGtoFCFG.hs b/src-3.0/GF/Conversion/MCFGtoFCFG.hs
similarity index 100%
rename from src-2.9/GF/Conversion/MCFGtoFCFG.hs
rename to src-3.0/GF/Conversion/MCFGtoFCFG.hs
diff --git a/src-2.9/GF/Conversion/Prolog.hs b/src-3.0/GF/Conversion/Prolog.hs
similarity index 100%
rename from src-2.9/GF/Conversion/Prolog.hs
rename to src-3.0/GF/Conversion/Prolog.hs
diff --git a/src-2.9/GF/Conversion/RemoveEpsilon.hs b/src-3.0/GF/Conversion/RemoveEpsilon.hs
similarity index 100%
rename from src-2.9/GF/Conversion/RemoveEpsilon.hs
rename to src-3.0/GF/Conversion/RemoveEpsilon.hs
diff --git a/src-2.9/GF/Conversion/RemoveErasing.hs b/src-3.0/GF/Conversion/RemoveErasing.hs
similarity index 100%
rename from src-2.9/GF/Conversion/RemoveErasing.hs
rename to src-3.0/GF/Conversion/RemoveErasing.hs
diff --git a/src-2.9/GF/Conversion/RemoveSingletons.hs b/src-3.0/GF/Conversion/RemoveSingletons.hs
similarity index 100%
rename from src-2.9/GF/Conversion/RemoveSingletons.hs
rename to src-3.0/GF/Conversion/RemoveSingletons.hs
diff --git a/src-2.9/GF/Conversion/SimpleToFCFG.hs b/src-3.0/GF/Conversion/SimpleToFCFG.hs
similarity index 100%
rename from src-2.9/GF/Conversion/SimpleToFCFG.hs
rename to src-3.0/GF/Conversion/SimpleToFCFG.hs
diff --git a/src-2.9/GF/Conversion/SimpleToFinite.hs b/src-3.0/GF/Conversion/SimpleToFinite.hs
similarity index 100%
rename from src-2.9/GF/Conversion/SimpleToFinite.hs
rename to src-3.0/GF/Conversion/SimpleToFinite.hs
diff --git a/src-2.9/GF/Conversion/SimpleToMCFG.hs b/src-3.0/GF/Conversion/SimpleToMCFG.hs
similarity index 100%
rename from src-2.9/GF/Conversion/SimpleToMCFG.hs
rename to src-3.0/GF/Conversion/SimpleToMCFG.hs
diff --git a/src-2.9/GF/Conversion/SimpleToMCFG/Coercions.hs b/src-3.0/GF/Conversion/SimpleToMCFG/Coercions.hs
similarity index 100%
rename from src-2.9/GF/Conversion/SimpleToMCFG/Coercions.hs
rename to src-3.0/GF/Conversion/SimpleToMCFG/Coercions.hs
diff --git a/src-2.9/GF/Conversion/SimpleToMCFG/Nondet.hs b/src-3.0/GF/Conversion/SimpleToMCFG/Nondet.hs
similarity index 100%
rename from src-2.9/GF/Conversion/SimpleToMCFG/Nondet.hs
rename to src-3.0/GF/Conversion/SimpleToMCFG/Nondet.hs
diff --git a/src-2.9/GF/Conversion/SimpleToMCFG/Strict.hs b/src-3.0/GF/Conversion/SimpleToMCFG/Strict.hs
similarity index 100%
rename from src-2.9/GF/Conversion/SimpleToMCFG/Strict.hs
rename to src-3.0/GF/Conversion/SimpleToMCFG/Strict.hs
diff --git a/src-2.9/GF/Conversion/TypeGraph.hs b/src-3.0/GF/Conversion/TypeGraph.hs
similarity index 100%
rename from src-2.9/GF/Conversion/TypeGraph.hs
rename to src-3.0/GF/Conversion/TypeGraph.hs
diff --git a/src-2.9/GF/Conversion/Types.hs b/src-3.0/GF/Conversion/Types.hs
similarity index 100%
rename from src-2.9/GF/Conversion/Types.hs
rename to src-3.0/GF/Conversion/Types.hs
diff --git a/src-2.9/GF/Data/Assoc.hs b/src-3.0/GF/Data/Assoc.hs
similarity index 100%
rename from src-2.9/GF/Data/Assoc.hs
rename to src-3.0/GF/Data/Assoc.hs
diff --git a/src-2.9/GF/Data/BacktrackM.hs b/src-3.0/GF/Data/BacktrackM.hs
similarity index 100%
rename from src-2.9/GF/Data/BacktrackM.hs
rename to src-3.0/GF/Data/BacktrackM.hs
diff --git a/src-2.9/GF/Data/Compos.hs b/src-3.0/GF/Data/Compos.hs
similarity index 100%
rename from src-2.9/GF/Data/Compos.hs
rename to src-3.0/GF/Data/Compos.hs
diff --git a/src-2.9/GF/Data/ErrM.hs b/src-3.0/GF/Data/ErrM.hs
similarity index 100%
rename from src-2.9/GF/Data/ErrM.hs
rename to src-3.0/GF/Data/ErrM.hs
diff --git a/src-2.9/GF/Data/GeneralDeduction.hs b/src-3.0/GF/Data/GeneralDeduction.hs
similarity index 100%
rename from src-2.9/GF/Data/GeneralDeduction.hs
rename to src-3.0/GF/Data/GeneralDeduction.hs
diff --git a/src-2.9/GF/Data/Glue.hs b/src-3.0/GF/Data/Glue.hs
similarity index 100%
rename from src-2.9/GF/Data/Glue.hs
rename to src-3.0/GF/Data/Glue.hs
diff --git a/src-2.9/GF/Data/IncrementalDeduction.hs b/src-3.0/GF/Data/IncrementalDeduction.hs
similarity index 100%
rename from src-2.9/GF/Data/IncrementalDeduction.hs
rename to src-3.0/GF/Data/IncrementalDeduction.hs
diff --git a/src-2.9/GF/Data/Map.hs b/src-3.0/GF/Data/Map.hs
similarity index 100%
rename from src-2.9/GF/Data/Map.hs
rename to src-3.0/GF/Data/Map.hs
diff --git a/src-2.9/GF/Data/Operations.hs b/src-3.0/GF/Data/Operations.hs
similarity index 100%
rename from src-2.9/GF/Data/Operations.hs
rename to src-3.0/GF/Data/Operations.hs
diff --git a/src-2.9/GF/Data/OrdMap2.hs b/src-3.0/GF/Data/OrdMap2.hs
similarity index 100%
rename from src-2.9/GF/Data/OrdMap2.hs
rename to src-3.0/GF/Data/OrdMap2.hs
diff --git a/src-2.9/GF/Data/OrdSet.hs b/src-3.0/GF/Data/OrdSet.hs
similarity index 100%
rename from src-2.9/GF/Data/OrdSet.hs
rename to src-3.0/GF/Data/OrdSet.hs
diff --git a/src-2.9/GF/Data/Parsers.hs b/src-3.0/GF/Data/Parsers.hs
similarity index 100%
rename from src-2.9/GF/Data/Parsers.hs
rename to src-3.0/GF/Data/Parsers.hs
diff --git a/src-2.9/GF/Data/RedBlack.hs b/src-3.0/GF/Data/RedBlack.hs
similarity index 100%
rename from src-2.9/GF/Data/RedBlack.hs
rename to src-3.0/GF/Data/RedBlack.hs
diff --git a/src-2.9/GF/Data/RedBlackSet.hs b/src-3.0/GF/Data/RedBlackSet.hs
similarity index 100%
rename from src-2.9/GF/Data/RedBlackSet.hs
rename to src-3.0/GF/Data/RedBlackSet.hs
diff --git a/src-2.9/GF/Data/SharedString.hs b/src-3.0/GF/Data/SharedString.hs
similarity index 100%
rename from src-2.9/GF/Data/SharedString.hs
rename to src-3.0/GF/Data/SharedString.hs
diff --git a/src-2.9/GF/Data/SortedList.hs b/src-3.0/GF/Data/SortedList.hs
similarity index 100%
rename from src-2.9/GF/Data/SortedList.hs
rename to src-3.0/GF/Data/SortedList.hs
diff --git a/src-2.9/GF/Data/Str.hs b/src-3.0/GF/Data/Str.hs
similarity index 100%
rename from src-2.9/GF/Data/Str.hs
rename to src-3.0/GF/Data/Str.hs
diff --git a/src-2.9/GF/Data/Trie.hs b/src-3.0/GF/Data/Trie.hs
similarity index 100%
rename from src-2.9/GF/Data/Trie.hs
rename to src-3.0/GF/Data/Trie.hs
diff --git a/src-2.9/GF/Data/Trie2.hs b/src-3.0/GF/Data/Trie2.hs
similarity index 100%
rename from src-2.9/GF/Data/Trie2.hs
rename to src-3.0/GF/Data/Trie2.hs
diff --git a/src-2.9/GF/Data/Utilities.hs b/src-3.0/GF/Data/Utilities.hs
similarity index 100%
rename from src-2.9/GF/Data/Utilities.hs
rename to src-3.0/GF/Data/Utilities.hs
diff --git a/src-2.9/GF/Data/XML.hs b/src-3.0/GF/Data/XML.hs
similarity index 100%
rename from src-2.9/GF/Data/XML.hs
rename to src-3.0/GF/Data/XML.hs
diff --git a/src-2.9/GF/Data/Zipper.hs b/src-3.0/GF/Data/Zipper.hs
similarity index 100%
rename from src-2.9/GF/Data/Zipper.hs
rename to src-3.0/GF/Data/Zipper.hs
diff --git a/src-2.9/GF/Devel/AbsCompute.hs b/src-3.0/GF/Devel/AbsCompute.hs
similarity index 100%
rename from src-2.9/GF/Devel/AbsCompute.hs
rename to src-3.0/GF/Devel/AbsCompute.hs
diff --git a/src-2.9/GF/Devel/Arch.hs b/src-3.0/GF/Devel/Arch.hs
similarity index 100%
rename from src-2.9/GF/Devel/Arch.hs
rename to src-3.0/GF/Devel/Arch.hs
diff --git a/src-2.9/GF/Devel/CheckGrammar.hs b/src-3.0/GF/Devel/CheckGrammar.hs
similarity index 100%
rename from src-2.9/GF/Devel/CheckGrammar.hs
rename to src-3.0/GF/Devel/CheckGrammar.hs
diff --git a/src-2.9/GF/Devel/CheckM.hs b/src-3.0/GF/Devel/CheckM.hs
similarity index 100%
rename from src-2.9/GF/Devel/CheckM.hs
rename to src-3.0/GF/Devel/CheckM.hs
diff --git a/src-2.9/GF/Devel/Compile.hs b/src-3.0/GF/Devel/Compile.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile.hs
rename to src-3.0/GF/Devel/Compile.hs
diff --git a/src-2.9/GF/Devel/Compile/AbsGF.hs b/src-3.0/GF/Devel/Compile/AbsGF.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/AbsGF.hs
rename to src-3.0/GF/Devel/Compile/AbsGF.hs
diff --git a/src-2.9/GF/Devel/Compile/CheckGrammar.hs b/src-3.0/GF/Devel/Compile/CheckGrammar.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/CheckGrammar.hs
rename to src-3.0/GF/Devel/Compile/CheckGrammar.hs
diff --git a/src-2.9/GF/Devel/Compile/Compile.hs b/src-3.0/GF/Devel/Compile/Compile.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/Compile.hs
rename to src-3.0/GF/Devel/Compile/Compile.hs
diff --git a/src-2.9/GF/Devel/Compile/ErrM.hs b/src-3.0/GF/Devel/Compile/ErrM.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/ErrM.hs
rename to src-3.0/GF/Devel/Compile/ErrM.hs
diff --git a/src-2.9/GF/Devel/Compile/Extend.hs b/src-3.0/GF/Devel/Compile/Extend.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/Extend.hs
rename to src-3.0/GF/Devel/Compile/Extend.hs
diff --git a/src-2.9/GF/Devel/Compile/Factorize.hs b/src-3.0/GF/Devel/Compile/Factorize.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/Factorize.hs
rename to src-3.0/GF/Devel/Compile/Factorize.hs
diff --git a/src-2.9/GF/Devel/Compile/GF.cf b/src-3.0/GF/Devel/Compile/GF.cf
similarity index 100%
rename from src-2.9/GF/Devel/Compile/GF.cf
rename to src-3.0/GF/Devel/Compile/GF.cf
diff --git a/src-2.9/GF/Devel/Compile/GFC.hs b/src-3.0/GF/Devel/Compile/GFC.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/GFC.hs
rename to src-3.0/GF/Devel/Compile/GFC.hs
diff --git a/src-2.9/GF/Devel/Compile/GFtoGFCC.hs b/src-3.0/GF/Devel/Compile/GFtoGFCC.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/GFtoGFCC.hs
rename to src-3.0/GF/Devel/Compile/GFtoGFCC.hs
diff --git a/src-2.9/GF/Devel/Compile/GetGrammar.hs b/src-3.0/GF/Devel/Compile/GetGrammar.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/GetGrammar.hs
rename to src-3.0/GF/Devel/Compile/GetGrammar.hs
diff --git a/src-2.9/GF/Devel/Compile/LexGF.hs b/src-3.0/GF/Devel/Compile/LexGF.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/LexGF.hs
rename to src-3.0/GF/Devel/Compile/LexGF.hs
diff --git a/src-2.9/GF/Devel/Compile/Optimize.hs b/src-3.0/GF/Devel/Compile/Optimize.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/Optimize.hs
rename to src-3.0/GF/Devel/Compile/Optimize.hs
diff --git a/src-2.9/GF/Devel/Compile/ParGF.hs b/src-3.0/GF/Devel/Compile/ParGF.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/ParGF.hs
rename to src-3.0/GF/Devel/Compile/ParGF.hs
diff --git a/src-2.9/GF/Devel/Compile/PrintGF.hs b/src-3.0/GF/Devel/Compile/PrintGF.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/PrintGF.hs
rename to src-3.0/GF/Devel/Compile/PrintGF.hs
diff --git a/src-2.9/GF/Devel/Compile/Refresh.hs b/src-3.0/GF/Devel/Compile/Refresh.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/Refresh.hs
rename to src-3.0/GF/Devel/Compile/Refresh.hs
diff --git a/src-2.9/GF/Devel/Compile/Rename.hs b/src-3.0/GF/Devel/Compile/Rename.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/Rename.hs
rename to src-3.0/GF/Devel/Compile/Rename.hs
diff --git a/src-2.9/GF/Devel/Compile/SourceToGF.hs b/src-3.0/GF/Devel/Compile/SourceToGF.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compile/SourceToGF.hs
rename to src-3.0/GF/Devel/Compile/SourceToGF.hs
diff --git a/src-2.9/GF/Devel/Compute.hs b/src-3.0/GF/Devel/Compute.hs
similarity index 100%
rename from src-2.9/GF/Devel/Compute.hs
rename to src-3.0/GF/Devel/Compute.hs
diff --git a/src-2.9/GF/Devel/GF.hs b/src-3.0/GF/Devel/GF.hs
similarity index 100%
rename from src-2.9/GF/Devel/GF.hs
rename to src-3.0/GF/Devel/GF.hs
diff --git a/src-2.9/GF/Devel/GFC.hs b/src-3.0/GF/Devel/GFC.hs
similarity index 100%
rename from src-2.9/GF/Devel/GFC.hs
rename to src-3.0/GF/Devel/GFC.hs
diff --git a/src-2.9/GF/Devel/GFC/Main.hs b/src-3.0/GF/Devel/GFC/Main.hs
similarity index 100%
rename from src-2.9/GF/Devel/GFC/Main.hs
rename to src-3.0/GF/Devel/GFC/Main.hs
diff --git a/src-2.9/GF/Devel/GFCCInterpreter.hs b/src-3.0/GF/Devel/GFCCInterpreter.hs
similarity index 100%
rename from src-2.9/GF/Devel/GFCCInterpreter.hs
rename to src-3.0/GF/Devel/GFCCInterpreter.hs
diff --git a/src-2.9/GF/Devel/GFCCtoHaskell.hs b/src-3.0/GF/Devel/GFCCtoHaskell.hs
similarity index 100%
rename from src-2.9/GF/Devel/GFCCtoHaskell.hs
rename to src-3.0/GF/Devel/GFCCtoHaskell.hs
diff --git a/src-2.9/GF/Devel/GFCCtoJS.hs b/src-3.0/GF/Devel/GFCCtoJS.hs
similarity index 100%
rename from src-2.9/GF/Devel/GFCCtoJS.hs
rename to src-3.0/GF/Devel/GFCCtoJS.hs
diff --git a/src-2.9/GF/Devel/GFI.hs b/src-3.0/GF/Devel/GFI.hs
similarity index 100%
rename from src-2.9/GF/Devel/GFI.hs
rename to src-3.0/GF/Devel/GFI.hs
diff --git a/src-2.9/GF/Devel/GetGrammar.hs b/src-3.0/GF/Devel/GetGrammar.hs
similarity index 100%
rename from src-2.9/GF/Devel/GetGrammar.hs
rename to src-3.0/GF/Devel/GetGrammar.hs
diff --git a/src-2.9/GF/Devel/Grammar/AppPredefined.hs b/src-3.0/GF/Devel/Grammar/AppPredefined.hs
similarity index 100%
rename from src-2.9/GF/Devel/Grammar/AppPredefined.hs
rename to src-3.0/GF/Devel/Grammar/AppPredefined.hs
diff --git a/src-2.9/GF/Devel/Grammar/Compute.hs b/src-3.0/GF/Devel/Grammar/Compute.hs
similarity index 100%
rename from src-2.9/GF/Devel/Grammar/Compute.hs
rename to src-3.0/GF/Devel/Grammar/Compute.hs
diff --git a/src-2.9/GF/Devel/Grammar/Construct.hs b/src-3.0/GF/Devel/Grammar/Construct.hs
similarity index 100%
rename from src-2.9/GF/Devel/Grammar/Construct.hs
rename to src-3.0/GF/Devel/Grammar/Construct.hs
diff --git a/src-2.9/GF/Devel/Grammar/GFtoSource.hs b/src-3.0/GF/Devel/Grammar/GFtoSource.hs
similarity index 100%
rename from src-2.9/GF/Devel/Grammar/GFtoSource.hs
rename to src-3.0/GF/Devel/Grammar/GFtoSource.hs
diff --git a/src-2.9/GF/Devel/Grammar/Grammar.hs b/src-3.0/GF/Devel/Grammar/Grammar.hs
similarity index 100%
rename from src-2.9/GF/Devel/Grammar/Grammar.hs
rename to src-3.0/GF/Devel/Grammar/Grammar.hs
diff --git a/src-2.9/GF/Devel/Grammar/Lookup.hs b/src-3.0/GF/Devel/Grammar/Lookup.hs
similarity index 100%
rename from src-2.9/GF/Devel/Grammar/Lookup.hs
rename to src-3.0/GF/Devel/Grammar/Lookup.hs
diff --git a/src-2.9/GF/Devel/Grammar/Macros.hs b/src-3.0/GF/Devel/Grammar/Macros.hs
similarity index 100%
rename from src-2.9/GF/Devel/Grammar/Macros.hs
rename to src-3.0/GF/Devel/Grammar/Macros.hs
diff --git a/src-2.9/GF/Devel/Grammar/PatternMatch.hs b/src-3.0/GF/Devel/Grammar/PatternMatch.hs
similarity index 100%
rename from src-2.9/GF/Devel/Grammar/PatternMatch.hs
rename to src-3.0/GF/Devel/Grammar/PatternMatch.hs
diff --git a/src-2.9/GF/Devel/Grammar/PrGF.hs b/src-3.0/GF/Devel/Grammar/PrGF.hs
similarity index 100%
rename from src-2.9/GF/Devel/Grammar/PrGF.hs
rename to src-3.0/GF/Devel/Grammar/PrGF.hs
diff --git a/src-2.9/GF/Devel/GrammarToGFCC.hs b/src-3.0/GF/Devel/GrammarToGFCC.hs
similarity index 100%
rename from src-2.9/GF/Devel/GrammarToGFCC.hs
rename to src-3.0/GF/Devel/GrammarToGFCC.hs
diff --git a/src-2.9/GF/Devel/Infra/ReadFiles.hs b/src-3.0/GF/Devel/Infra/ReadFiles.hs
similarity index 100%
rename from src-2.9/GF/Devel/Infra/ReadFiles.hs
rename to src-3.0/GF/Devel/Infra/ReadFiles.hs
diff --git a/src-2.9/GF/Devel/ModDeps.hs b/src-3.0/GF/Devel/ModDeps.hs
similarity index 100%
rename from src-2.9/GF/Devel/ModDeps.hs
rename to src-3.0/GF/Devel/ModDeps.hs
diff --git a/src-2.9/GF/Devel/Optimize.hs b/src-3.0/GF/Devel/Optimize.hs
similarity index 100%
rename from src-2.9/GF/Devel/Optimize.hs
rename to src-3.0/GF/Devel/Optimize.hs
diff --git a/src-2.9/GF/Devel/OptimizeGF.hs b/src-3.0/GF/Devel/OptimizeGF.hs
similarity index 100%
rename from src-2.9/GF/Devel/OptimizeGF.hs
rename to src-3.0/GF/Devel/OptimizeGF.hs
diff --git a/src-2.9/GF/Devel/Options.hs b/src-3.0/GF/Devel/Options.hs
similarity index 100%
rename from src-2.9/GF/Devel/Options.hs
rename to src-3.0/GF/Devel/Options.hs
diff --git a/src-2.9/GF/Devel/PrGrammar.hs b/src-3.0/GF/Devel/PrGrammar.hs
similarity index 100%
rename from src-2.9/GF/Devel/PrGrammar.hs
rename to src-3.0/GF/Devel/PrGrammar.hs
diff --git a/src-2.9/GF/Devel/PrintGFCC.hs b/src-3.0/GF/Devel/PrintGFCC.hs
similarity index 100%
rename from src-2.9/GF/Devel/PrintGFCC.hs
rename to src-3.0/GF/Devel/PrintGFCC.hs
diff --git a/src-2.9/GF/Devel/README-testgf3 b/src-3.0/GF/Devel/README-testgf3
similarity index 100%
rename from src-2.9/GF/Devel/README-testgf3
rename to src-3.0/GF/Devel/README-testgf3
diff --git a/src-2.9/GF/Devel/ReadFiles.hs b/src-3.0/GF/Devel/ReadFiles.hs
similarity index 100%
rename from src-2.9/GF/Devel/ReadFiles.hs
rename to src-3.0/GF/Devel/ReadFiles.hs
diff --git a/src-2.9/GF/Devel/TC.hs b/src-3.0/GF/Devel/TC.hs
similarity index 100%
rename from src-2.9/GF/Devel/TC.hs
rename to src-3.0/GF/Devel/TC.hs
diff --git a/src-2.9/GF/Devel/TestGF3.hs b/src-3.0/GF/Devel/TestGF3.hs
similarity index 100%
rename from src-2.9/GF/Devel/TestGF3.hs
rename to src-3.0/GF/Devel/TestGF3.hs
diff --git a/src-2.9/GF/Devel/TypeCheck.hs b/src-3.0/GF/Devel/TypeCheck.hs
similarity index 100%
rename from src-2.9/GF/Devel/TypeCheck.hs
rename to src-3.0/GF/Devel/TypeCheck.hs
diff --git a/src-2.9/GF/Devel/UseIO.hs b/src-3.0/GF/Devel/UseIO.hs
similarity index 100%
rename from src-2.9/GF/Devel/UseIO.hs
rename to src-3.0/GF/Devel/UseIO.hs
diff --git a/src-2.9/GF/Devel/gf-code.txt b/src-3.0/GF/Devel/gf-code.txt
similarity index 100%
rename from src-2.9/GF/Devel/gf-code.txt
rename to src-3.0/GF/Devel/gf-code.txt
diff --git a/src-2.9/GF/Devel/gf3.txt b/src-3.0/GF/Devel/gf3.txt
similarity index 100%
rename from src-2.9/GF/Devel/gf3.txt
rename to src-3.0/GF/Devel/gf3.txt
diff --git a/src-2.9/GF/Embed/EmbedAPI.hs b/src-3.0/GF/Embed/EmbedAPI.hs
similarity index 100%
rename from src-2.9/GF/Embed/EmbedAPI.hs
rename to src-3.0/GF/Embed/EmbedAPI.hs
diff --git a/src-2.9/GF/Embed/EmbedCustom.hs b/src-3.0/GF/Embed/EmbedCustom.hs
similarity index 100%
rename from src-2.9/GF/Embed/EmbedCustom.hs
rename to src-3.0/GF/Embed/EmbedCustom.hs
diff --git a/src-2.9/GF/Embed/EmbedParsing.hs b/src-3.0/GF/Embed/EmbedParsing.hs
similarity index 100%
rename from src-2.9/GF/Embed/EmbedParsing.hs
rename to src-3.0/GF/Embed/EmbedParsing.hs
diff --git a/src-2.9/GF/Embed/TemplateApp.hs b/src-3.0/GF/Embed/TemplateApp.hs
similarity index 100%
rename from src-2.9/GF/Embed/TemplateApp.hs
rename to src-3.0/GF/Embed/TemplateApp.hs
diff --git a/src-2.9/GF/Formalism/CFG.hs b/src-3.0/GF/Formalism/CFG.hs
similarity index 100%
rename from src-2.9/GF/Formalism/CFG.hs
rename to src-3.0/GF/Formalism/CFG.hs
diff --git a/src-2.9/GF/Formalism/FCFG.hs b/src-3.0/GF/Formalism/FCFG.hs
similarity index 100%
rename from src-2.9/GF/Formalism/FCFG.hs
rename to src-3.0/GF/Formalism/FCFG.hs
diff --git a/src-2.9/GF/Formalism/GCFG.hs b/src-3.0/GF/Formalism/GCFG.hs
similarity index 100%
rename from src-2.9/GF/Formalism/GCFG.hs
rename to src-3.0/GF/Formalism/GCFG.hs
diff --git a/src-2.9/GF/Formalism/MCFG.hs b/src-3.0/GF/Formalism/MCFG.hs
similarity index 100%
rename from src-2.9/GF/Formalism/MCFG.hs
rename to src-3.0/GF/Formalism/MCFG.hs
diff --git a/src-2.9/GF/Formalism/SimpleGFC.hs b/src-3.0/GF/Formalism/SimpleGFC.hs
similarity index 100%
rename from src-2.9/GF/Formalism/SimpleGFC.hs
rename to src-3.0/GF/Formalism/SimpleGFC.hs
diff --git a/src-2.9/GF/Formalism/Utilities.hs b/src-3.0/GF/Formalism/Utilities.hs
similarity index 100%
rename from src-2.9/GF/Formalism/Utilities.hs
rename to src-3.0/GF/Formalism/Utilities.hs
diff --git a/src-2.9/GF/Fudgets/ArchEdit.hs b/src-3.0/GF/Fudgets/ArchEdit.hs
similarity index 100%
rename from src-2.9/GF/Fudgets/ArchEdit.hs
rename to src-3.0/GF/Fudgets/ArchEdit.hs
diff --git a/src-2.9/GF/Fudgets/CommandF.hs b/src-3.0/GF/Fudgets/CommandF.hs
similarity index 100%
rename from src-2.9/GF/Fudgets/CommandF.hs
rename to src-3.0/GF/Fudgets/CommandF.hs
diff --git a/src-2.9/GF/Fudgets/EventF.hs b/src-3.0/GF/Fudgets/EventF.hs
similarity index 100%
rename from src-2.9/GF/Fudgets/EventF.hs
rename to src-3.0/GF/Fudgets/EventF.hs
diff --git a/src-2.9/GF/Fudgets/FudgetOps.hs b/src-3.0/GF/Fudgets/FudgetOps.hs
similarity index 100%
rename from src-2.9/GF/Fudgets/FudgetOps.hs
rename to src-3.0/GF/Fudgets/FudgetOps.hs
diff --git a/src-2.9/GF/Fudgets/UnicodeF.hs b/src-3.0/GF/Fudgets/UnicodeF.hs
similarity index 100%
rename from src-2.9/GF/Fudgets/UnicodeF.hs
rename to src-3.0/GF/Fudgets/UnicodeF.hs
diff --git a/src-2.9/GF/GFCC/API.hs b/src-3.0/GF/GFCC/API.hs
similarity index 100%
rename from src-2.9/GF/GFCC/API.hs
rename to src-3.0/GF/GFCC/API.hs
diff --git a/src-2.9/GF/GFCC/CId.hs b/src-3.0/GF/GFCC/CId.hs
similarity index 100%
rename from src-2.9/GF/GFCC/CId.hs
rename to src-3.0/GF/GFCC/CId.hs
diff --git a/src-2.9/GF/GFCC/CheckGFCC.hs b/src-3.0/GF/GFCC/CheckGFCC.hs
similarity index 100%
rename from src-2.9/GF/GFCC/CheckGFCC.hs
rename to src-3.0/GF/GFCC/CheckGFCC.hs
diff --git a/src-2.9/GF/GFCC/ComposOp.hs b/src-3.0/GF/GFCC/ComposOp.hs
similarity index 100%
rename from src-2.9/GF/GFCC/ComposOp.hs
rename to src-3.0/GF/GFCC/ComposOp.hs
diff --git a/src-2.9/GF/GFCC/DataGFCC.hs b/src-3.0/GF/GFCC/DataGFCC.hs
similarity index 100%
rename from src-2.9/GF/GFCC/DataGFCC.hs
rename to src-3.0/GF/GFCC/DataGFCC.hs
diff --git a/src-2.9/GF/GFCC/GFCC.cf b/src-3.0/GF/GFCC/GFCC.cf
similarity index 100%
rename from src-2.9/GF/GFCC/GFCC.cf
rename to src-3.0/GF/GFCC/GFCC.cf
diff --git a/src-2.9/GF/GFCC/Generate.hs b/src-3.0/GF/GFCC/Generate.hs
similarity index 100%
rename from src-2.9/GF/GFCC/Generate.hs
rename to src-3.0/GF/GFCC/Generate.hs
diff --git a/src-2.9/GF/GFCC/LexGFCC.hs b/src-3.0/GF/GFCC/LexGFCC.hs
similarity index 100%
rename from src-2.9/GF/GFCC/LexGFCC.hs
rename to src-3.0/GF/GFCC/LexGFCC.hs
diff --git a/src-2.9/GF/GFCC/Linearize.hs b/src-3.0/GF/GFCC/Linearize.hs
similarity index 100%
rename from src-2.9/GF/GFCC/Linearize.hs
rename to src-3.0/GF/GFCC/Linearize.hs
diff --git a/src-2.9/GF/GFCC/Macros.hs b/src-3.0/GF/GFCC/Macros.hs
similarity index 100%
rename from src-2.9/GF/GFCC/Macros.hs
rename to src-3.0/GF/GFCC/Macros.hs
diff --git a/src-2.9/GF/GFCC/OptimizeGFCC.hs b/src-3.0/GF/GFCC/OptimizeGFCC.hs
similarity index 100%
rename from src-2.9/GF/GFCC/OptimizeGFCC.hs
rename to src-3.0/GF/GFCC/OptimizeGFCC.hs
diff --git a/src-2.9/GF/GFCC/Raw/AbsGFCCRaw.hs b/src-3.0/GF/GFCC/Raw/AbsGFCCRaw.hs
similarity index 100%
rename from src-2.9/GF/GFCC/Raw/AbsGFCCRaw.hs
rename to src-3.0/GF/GFCC/Raw/AbsGFCCRaw.hs
diff --git a/src-2.9/GF/GFCC/Raw/ConvertGFCC.hs b/src-3.0/GF/GFCC/Raw/ConvertGFCC.hs
similarity index 100%
rename from src-2.9/GF/GFCC/Raw/ConvertGFCC.hs
rename to src-3.0/GF/GFCC/Raw/ConvertGFCC.hs
diff --git a/src-2.9/GF/GFCC/Raw/GFCCRaw.cf b/src-3.0/GF/GFCC/Raw/GFCCRaw.cf
similarity index 100%
rename from src-2.9/GF/GFCC/Raw/GFCCRaw.cf
rename to src-3.0/GF/GFCC/Raw/GFCCRaw.cf
diff --git a/src-2.9/GF/GFCC/Raw/ParGFCCRaw.hs b/src-3.0/GF/GFCC/Raw/ParGFCCRaw.hs
similarity index 100%
rename from src-2.9/GF/GFCC/Raw/ParGFCCRaw.hs
rename to src-3.0/GF/GFCC/Raw/ParGFCCRaw.hs
diff --git a/src-2.9/GF/GFCC/Raw/PrintGFCCRaw.hs b/src-3.0/GF/GFCC/Raw/PrintGFCCRaw.hs
similarity index 100%
rename from src-2.9/GF/GFCC/Raw/PrintGFCCRaw.hs
rename to src-3.0/GF/GFCC/Raw/PrintGFCCRaw.hs
diff --git a/src-2.9/GF/GFCC/ShowLinearize.hs b/src-3.0/GF/GFCC/ShowLinearize.hs
similarity index 100%
rename from src-2.9/GF/GFCC/ShowLinearize.hs
rename to src-3.0/GF/GFCC/ShowLinearize.hs
diff --git a/src-2.9/GF/GFCC/SkelGFCC.hs b/src-3.0/GF/GFCC/SkelGFCC.hs
similarity index 100%
rename from src-2.9/GF/GFCC/SkelGFCC.hs
rename to src-3.0/GF/GFCC/SkelGFCC.hs
diff --git a/src-2.9/GF/GFCC/TestGFCC.hs b/src-3.0/GF/GFCC/TestGFCC.hs
similarity index 100%
rename from src-2.9/GF/GFCC/TestGFCC.hs
rename to src-3.0/GF/GFCC/TestGFCC.hs
diff --git a/src-2.9/GF/GFCC/doc/Eng.gf b/src-3.0/GF/GFCC/doc/Eng.gf
similarity index 100%
rename from src-2.9/GF/GFCC/doc/Eng.gf
rename to src-3.0/GF/GFCC/doc/Eng.gf
diff --git a/src-2.9/GF/GFCC/doc/Ex.gf b/src-3.0/GF/GFCC/doc/Ex.gf
similarity index 100%
rename from src-2.9/GF/GFCC/doc/Ex.gf
rename to src-3.0/GF/GFCC/doc/Ex.gf
diff --git a/src-2.9/GF/GFCC/doc/Swe.gf b/src-3.0/GF/GFCC/doc/Swe.gf
similarity index 100%
rename from src-2.9/GF/GFCC/doc/Swe.gf
rename to src-3.0/GF/GFCC/doc/Swe.gf
diff --git a/src-2.9/GF/GFCC/doc/Test.gf b/src-3.0/GF/GFCC/doc/Test.gf
similarity index 100%
rename from src-2.9/GF/GFCC/doc/Test.gf
rename to src-3.0/GF/GFCC/doc/Test.gf
diff --git a/src-2.9/GF/GFCC/doc/gfcc.html b/src-3.0/GF/GFCC/doc/gfcc.html
similarity index 100%
rename from src-2.9/GF/GFCC/doc/gfcc.html
rename to src-3.0/GF/GFCC/doc/gfcc.html
diff --git a/src-2.9/GF/GFCC/doc/gfcc.txt b/src-3.0/GF/GFCC/doc/gfcc.txt
similarity index 100%
rename from src-2.9/GF/GFCC/doc/gfcc.txt
rename to src-3.0/GF/GFCC/doc/gfcc.txt
diff --git a/src-2.9/GF/GFCC/doc/old-GFCC.cf b/src-3.0/GF/GFCC/doc/old-GFCC.cf
similarity index 100%
rename from src-2.9/GF/GFCC/doc/old-GFCC.cf
rename to src-3.0/GF/GFCC/doc/old-GFCC.cf
diff --git a/src-2.9/GF/GFCC/doc/old-gfcc.txt b/src-3.0/GF/GFCC/doc/old-gfcc.txt
similarity index 100%
rename from src-2.9/GF/GFCC/doc/old-gfcc.txt
rename to src-3.0/GF/GFCC/doc/old-gfcc.txt
diff --git a/src-2.9/GF/GFCC/doc/syntax.txt b/src-3.0/GF/GFCC/doc/syntax.txt
similarity index 100%
rename from src-2.9/GF/GFCC/doc/syntax.txt
rename to src-3.0/GF/GFCC/doc/syntax.txt
diff --git a/src-2.9/GF/GFModes.hs b/src-3.0/GF/GFModes.hs
similarity index 100%
rename from src-2.9/GF/GFModes.hs
rename to src-3.0/GF/GFModes.hs
diff --git a/src-2.9/GF/Grammar/AbsCompute.hs b/src-3.0/GF/Grammar/AbsCompute.hs
similarity index 100%
rename from src-2.9/GF/Grammar/AbsCompute.hs
rename to src-3.0/GF/Grammar/AbsCompute.hs
diff --git a/src-2.9/GF/Grammar/Abstract.hs b/src-3.0/GF/Grammar/Abstract.hs
similarity index 100%
rename from src-2.9/GF/Grammar/Abstract.hs
rename to src-3.0/GF/Grammar/Abstract.hs
diff --git a/src-2.9/GF/Grammar/AppPredefined.hs b/src-3.0/GF/Grammar/AppPredefined.hs
similarity index 100%
rename from src-2.9/GF/Grammar/AppPredefined.hs
rename to src-3.0/GF/Grammar/AppPredefined.hs
diff --git a/src-2.9/GF/Grammar/Compute.hs b/src-3.0/GF/Grammar/Compute.hs
similarity index 100%
rename from src-2.9/GF/Grammar/Compute.hs
rename to src-3.0/GF/Grammar/Compute.hs
diff --git a/src-2.9/GF/Grammar/Grammar.hs b/src-3.0/GF/Grammar/Grammar.hs
similarity index 100%
rename from src-2.9/GF/Grammar/Grammar.hs
rename to src-3.0/GF/Grammar/Grammar.hs
diff --git a/src-2.9/GF/Grammar/Lockfield.hs b/src-3.0/GF/Grammar/Lockfield.hs
similarity index 100%
rename from src-2.9/GF/Grammar/Lockfield.hs
rename to src-3.0/GF/Grammar/Lockfield.hs
diff --git a/src-2.9/GF/Grammar/LookAbs.hs b/src-3.0/GF/Grammar/LookAbs.hs
similarity index 100%
rename from src-2.9/GF/Grammar/LookAbs.hs
rename to src-3.0/GF/Grammar/LookAbs.hs
diff --git a/src-2.9/GF/Grammar/Lookup.hs b/src-3.0/GF/Grammar/Lookup.hs
similarity index 100%
rename from src-2.9/GF/Grammar/Lookup.hs
rename to src-3.0/GF/Grammar/Lookup.hs
diff --git a/src-2.9/GF/Grammar/MMacros.hs b/src-3.0/GF/Grammar/MMacros.hs
similarity index 100%
rename from src-2.9/GF/Grammar/MMacros.hs
rename to src-3.0/GF/Grammar/MMacros.hs
diff --git a/src-2.9/GF/Grammar/Macros.hs b/src-3.0/GF/Grammar/Macros.hs
similarity index 100%
rename from src-2.9/GF/Grammar/Macros.hs
rename to src-3.0/GF/Grammar/Macros.hs
diff --git a/src-2.9/GF/Grammar/PatternMatch.hs b/src-3.0/GF/Grammar/PatternMatch.hs
similarity index 100%
rename from src-2.9/GF/Grammar/PatternMatch.hs
rename to src-3.0/GF/Grammar/PatternMatch.hs
diff --git a/src-2.9/GF/Grammar/PrGrammar.hs b/src-3.0/GF/Grammar/PrGrammar.hs
similarity index 100%
rename from src-2.9/GF/Grammar/PrGrammar.hs
rename to src-3.0/GF/Grammar/PrGrammar.hs
diff --git a/src-2.9/GF/Grammar/Refresh.hs b/src-3.0/GF/Grammar/Refresh.hs
similarity index 100%
rename from src-2.9/GF/Grammar/Refresh.hs
rename to src-3.0/GF/Grammar/Refresh.hs
diff --git a/src-2.9/GF/Grammar/ReservedWords.hs b/src-3.0/GF/Grammar/ReservedWords.hs
similarity index 100%
rename from src-2.9/GF/Grammar/ReservedWords.hs
rename to src-3.0/GF/Grammar/ReservedWords.hs
diff --git a/src-2.9/GF/Grammar/SGrammar.hs b/src-3.0/GF/Grammar/SGrammar.hs
similarity index 100%
rename from src-2.9/GF/Grammar/SGrammar.hs
rename to src-3.0/GF/Grammar/SGrammar.hs
diff --git a/src-2.9/GF/Grammar/TC.hs b/src-3.0/GF/Grammar/TC.hs
similarity index 100%
rename from src-2.9/GF/Grammar/TC.hs
rename to src-3.0/GF/Grammar/TC.hs
diff --git a/src-2.9/GF/Grammar/TypeCheck.hs b/src-3.0/GF/Grammar/TypeCheck.hs
similarity index 100%
rename from src-2.9/GF/Grammar/TypeCheck.hs
rename to src-3.0/GF/Grammar/TypeCheck.hs
diff --git a/src-2.9/GF/Grammar/Unify.hs b/src-3.0/GF/Grammar/Unify.hs
similarity index 100%
rename from src-2.9/GF/Grammar/Unify.hs
rename to src-3.0/GF/Grammar/Unify.hs
diff --git a/src-2.9/GF/Grammar/Values.hs b/src-3.0/GF/Grammar/Values.hs
similarity index 100%
rename from src-2.9/GF/Grammar/Values.hs
rename to src-3.0/GF/Grammar/Values.hs
diff --git a/src-2.9/GF/IDE/IDECommands.hs b/src-3.0/GF/IDE/IDECommands.hs
similarity index 100%
rename from src-2.9/GF/IDE/IDECommands.hs
rename to src-3.0/GF/IDE/IDECommands.hs
diff --git a/src-2.9/GF/Infra/CheckM.hs b/src-3.0/GF/Infra/CheckM.hs
similarity index 100%
rename from src-2.9/GF/Infra/CheckM.hs
rename to src-3.0/GF/Infra/CheckM.hs
diff --git a/src-2.9/GF/Infra/Comments.hs b/src-3.0/GF/Infra/Comments.hs
similarity index 100%
rename from src-2.9/GF/Infra/Comments.hs
rename to src-3.0/GF/Infra/Comments.hs
diff --git a/src-2.9/GF/Infra/CompactPrint.hs b/src-3.0/GF/Infra/CompactPrint.hs
similarity index 100%
rename from src-2.9/GF/Infra/CompactPrint.hs
rename to src-3.0/GF/Infra/CompactPrint.hs
diff --git a/src-2.9/GF/Infra/Ident.hs b/src-3.0/GF/Infra/Ident.hs
similarity index 100%
rename from src-2.9/GF/Infra/Ident.hs
rename to src-3.0/GF/Infra/Ident.hs
diff --git a/src-2.9/GF/Infra/Modules.hs b/src-3.0/GF/Infra/Modules.hs
similarity index 100%
rename from src-2.9/GF/Infra/Modules.hs
rename to src-3.0/GF/Infra/Modules.hs
diff --git a/src-2.9/GF/Infra/Option.hs b/src-3.0/GF/Infra/Option.hs
similarity index 100%
rename from src-2.9/GF/Infra/Option.hs
rename to src-3.0/GF/Infra/Option.hs
diff --git a/src-2.9/GF/Infra/Print.hs b/src-3.0/GF/Infra/Print.hs
similarity index 100%
rename from src-2.9/GF/Infra/Print.hs
rename to src-3.0/GF/Infra/Print.hs
diff --git a/src-2.9/GF/Infra/PrintClass.hs b/src-3.0/GF/Infra/PrintClass.hs
similarity index 100%
rename from src-2.9/GF/Infra/PrintClass.hs
rename to src-3.0/GF/Infra/PrintClass.hs
diff --git a/src-2.9/GF/Infra/ReadFiles.hs b/src-3.0/GF/Infra/ReadFiles.hs
similarity index 100%
rename from src-2.9/GF/Infra/ReadFiles.hs
rename to src-3.0/GF/Infra/ReadFiles.hs
diff --git a/src-2.9/GF/Infra/UseIO.hs b/src-3.0/GF/Infra/UseIO.hs
similarity index 100%
rename from src-2.9/GF/Infra/UseIO.hs
rename to src-3.0/GF/Infra/UseIO.hs
diff --git a/src-2.9/GF/JavaScript/AbsJS.hs b/src-3.0/GF/JavaScript/AbsJS.hs
similarity index 100%
rename from src-2.9/GF/JavaScript/AbsJS.hs
rename to src-3.0/GF/JavaScript/AbsJS.hs
diff --git a/src-2.9/GF/JavaScript/JS.cf b/src-3.0/GF/JavaScript/JS.cf
similarity index 100%
rename from src-2.9/GF/JavaScript/JS.cf
rename to src-3.0/GF/JavaScript/JS.cf
diff --git a/src-2.9/GF/JavaScript/LexJS.hs b/src-3.0/GF/JavaScript/LexJS.hs
similarity index 100%
rename from src-2.9/GF/JavaScript/LexJS.hs
rename to src-3.0/GF/JavaScript/LexJS.hs
diff --git a/src-2.9/GF/JavaScript/LexJS.x b/src-3.0/GF/JavaScript/LexJS.x
similarity index 100%
rename from src-2.9/GF/JavaScript/LexJS.x
rename to src-3.0/GF/JavaScript/LexJS.x
diff --git a/src-2.9/GF/JavaScript/Makefile b/src-3.0/GF/JavaScript/Makefile
similarity index 100%
rename from src-2.9/GF/JavaScript/Makefile
rename to src-3.0/GF/JavaScript/Makefile
diff --git a/src-2.9/GF/JavaScript/ParJS.hs b/src-3.0/GF/JavaScript/ParJS.hs
similarity index 100%
rename from src-2.9/GF/JavaScript/ParJS.hs
rename to src-3.0/GF/JavaScript/ParJS.hs
diff --git a/src-2.9/GF/JavaScript/ParJS.y b/src-3.0/GF/JavaScript/ParJS.y
similarity index 100%
rename from src-2.9/GF/JavaScript/ParJS.y
rename to src-3.0/GF/JavaScript/ParJS.y
diff --git a/src-2.9/GF/JavaScript/PrintJS.hs b/src-3.0/GF/JavaScript/PrintJS.hs
similarity index 100%
rename from src-2.9/GF/JavaScript/PrintJS.hs
rename to src-3.0/GF/JavaScript/PrintJS.hs
diff --git a/src-2.9/GF/JavaScript/SkelJS.hs b/src-3.0/GF/JavaScript/SkelJS.hs
similarity index 100%
rename from src-2.9/GF/JavaScript/SkelJS.hs
rename to src-3.0/GF/JavaScript/SkelJS.hs
diff --git a/src-2.9/GF/JavaScript/TestJS.hs b/src-3.0/GF/JavaScript/TestJS.hs
similarity index 100%
rename from src-2.9/GF/JavaScript/TestJS.hs
rename to src-3.0/GF/JavaScript/TestJS.hs
diff --git a/src-2.9/GF/OldParsing/CFGrammar.hs b/src-3.0/GF/OldParsing/CFGrammar.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/CFGrammar.hs
rename to src-3.0/GF/OldParsing/CFGrammar.hs
diff --git a/src-2.9/GF/OldParsing/ConvertFiniteGFC.hs b/src-3.0/GF/OldParsing/ConvertFiniteGFC.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ConvertFiniteGFC.hs
rename to src-3.0/GF/OldParsing/ConvertFiniteGFC.hs
diff --git a/src-2.9/GF/OldParsing/ConvertFiniteSimple.hs b/src-3.0/GF/OldParsing/ConvertFiniteSimple.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ConvertFiniteSimple.hs
rename to src-3.0/GF/OldParsing/ConvertFiniteSimple.hs
diff --git a/src-2.9/GF/OldParsing/ConvertGFCtoMCFG.hs b/src-3.0/GF/OldParsing/ConvertGFCtoMCFG.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ConvertGFCtoMCFG.hs
rename to src-3.0/GF/OldParsing/ConvertGFCtoMCFG.hs
diff --git a/src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs b/src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs
rename to src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs
diff --git a/src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Nondet.hs b/src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Nondet.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Nondet.hs
rename to src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Nondet.hs
diff --git a/src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Old.hs b/src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Old.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Old.hs
rename to src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Old.hs
diff --git a/src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs b/src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs
rename to src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs
diff --git a/src-2.9/GF/OldParsing/ConvertGFCtoSimple.hs b/src-3.0/GF/OldParsing/ConvertGFCtoSimple.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ConvertGFCtoSimple.hs
rename to src-3.0/GF/OldParsing/ConvertGFCtoSimple.hs
diff --git a/src-2.9/GF/OldParsing/ConvertGrammar.hs b/src-3.0/GF/OldParsing/ConvertGrammar.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ConvertGrammar.hs
rename to src-3.0/GF/OldParsing/ConvertGrammar.hs
diff --git a/src-2.9/GF/OldParsing/ConvertMCFGtoCFG.hs b/src-3.0/GF/OldParsing/ConvertMCFGtoCFG.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ConvertMCFGtoCFG.hs
rename to src-3.0/GF/OldParsing/ConvertMCFGtoCFG.hs
diff --git a/src-2.9/GF/OldParsing/ConvertSimpleToMCFG.hs b/src-3.0/GF/OldParsing/ConvertSimpleToMCFG.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ConvertSimpleToMCFG.hs
rename to src-3.0/GF/OldParsing/ConvertSimpleToMCFG.hs
diff --git a/src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs b/src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs
rename to src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs
diff --git a/src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs b/src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs
rename to src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs
diff --git a/src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Old.hs b/src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Old.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Old.hs
rename to src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Old.hs
diff --git a/src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs b/src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs
rename to src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs
diff --git a/src-2.9/GF/OldParsing/GCFG.hs b/src-3.0/GF/OldParsing/GCFG.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/GCFG.hs
rename to src-3.0/GF/OldParsing/GCFG.hs
diff --git a/src-2.9/GF/OldParsing/GeneralChart.hs b/src-3.0/GF/OldParsing/GeneralChart.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/GeneralChart.hs
rename to src-3.0/GF/OldParsing/GeneralChart.hs
diff --git a/src-2.9/GF/OldParsing/GrammarTypes.hs b/src-3.0/GF/OldParsing/GrammarTypes.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/GrammarTypes.hs
rename to src-3.0/GF/OldParsing/GrammarTypes.hs
diff --git a/src-2.9/GF/OldParsing/IncrementalChart.hs b/src-3.0/GF/OldParsing/IncrementalChart.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/IncrementalChart.hs
rename to src-3.0/GF/OldParsing/IncrementalChart.hs
diff --git a/src-2.9/GF/OldParsing/MCFGrammar.hs b/src-3.0/GF/OldParsing/MCFGrammar.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/MCFGrammar.hs
rename to src-3.0/GF/OldParsing/MCFGrammar.hs
diff --git a/src-2.9/GF/OldParsing/ParseCF.hs b/src-3.0/GF/OldParsing/ParseCF.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ParseCF.hs
rename to src-3.0/GF/OldParsing/ParseCF.hs
diff --git a/src-2.9/GF/OldParsing/ParseCFG.hs b/src-3.0/GF/OldParsing/ParseCFG.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ParseCFG.hs
rename to src-3.0/GF/OldParsing/ParseCFG.hs
diff --git a/src-2.9/GF/OldParsing/ParseCFG/General.hs b/src-3.0/GF/OldParsing/ParseCFG/General.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ParseCFG/General.hs
rename to src-3.0/GF/OldParsing/ParseCFG/General.hs
diff --git a/src-2.9/GF/OldParsing/ParseCFG/Incremental.hs b/src-3.0/GF/OldParsing/ParseCFG/Incremental.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ParseCFG/Incremental.hs
rename to src-3.0/GF/OldParsing/ParseCFG/Incremental.hs
diff --git a/src-2.9/GF/OldParsing/ParseGFC.hs b/src-3.0/GF/OldParsing/ParseGFC.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ParseGFC.hs
rename to src-3.0/GF/OldParsing/ParseGFC.hs
diff --git a/src-2.9/GF/OldParsing/ParseMCFG.hs b/src-3.0/GF/OldParsing/ParseMCFG.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ParseMCFG.hs
rename to src-3.0/GF/OldParsing/ParseMCFG.hs
diff --git a/src-2.9/GF/OldParsing/ParseMCFG/Basic.hs b/src-3.0/GF/OldParsing/ParseMCFG/Basic.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/ParseMCFG/Basic.hs
rename to src-3.0/GF/OldParsing/ParseMCFG/Basic.hs
diff --git a/src-2.9/GF/OldParsing/SimpleGFC.hs b/src-3.0/GF/OldParsing/SimpleGFC.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/SimpleGFC.hs
rename to src-3.0/GF/OldParsing/SimpleGFC.hs
diff --git a/src-2.9/GF/OldParsing/Utilities.hs b/src-3.0/GF/OldParsing/Utilities.hs
similarity index 100%
rename from src-2.9/GF/OldParsing/Utilities.hs
rename to src-3.0/GF/OldParsing/Utilities.hs
diff --git a/src-2.9/GF/Parsing/CF.hs b/src-3.0/GF/Parsing/CF.hs
similarity index 100%
rename from src-2.9/GF/Parsing/CF.hs
rename to src-3.0/GF/Parsing/CF.hs
diff --git a/src-2.9/GF/Parsing/CFG.hs b/src-3.0/GF/Parsing/CFG.hs
similarity index 100%
rename from src-2.9/GF/Parsing/CFG.hs
rename to src-3.0/GF/Parsing/CFG.hs
diff --git a/src-2.9/GF/Parsing/CFG/General.hs b/src-3.0/GF/Parsing/CFG/General.hs
similarity index 100%
rename from src-2.9/GF/Parsing/CFG/General.hs
rename to src-3.0/GF/Parsing/CFG/General.hs
diff --git a/src-2.9/GF/Parsing/CFG/Incremental.hs b/src-3.0/GF/Parsing/CFG/Incremental.hs
similarity index 100%
rename from src-2.9/GF/Parsing/CFG/Incremental.hs
rename to src-3.0/GF/Parsing/CFG/Incremental.hs
diff --git a/src-2.9/GF/Parsing/CFG/PInfo.hs b/src-3.0/GF/Parsing/CFG/PInfo.hs
similarity index 100%
rename from src-2.9/GF/Parsing/CFG/PInfo.hs
rename to src-3.0/GF/Parsing/CFG/PInfo.hs
diff --git a/src-2.9/GF/Parsing/FCFG.hs b/src-3.0/GF/Parsing/FCFG.hs
similarity index 100%
rename from src-2.9/GF/Parsing/FCFG.hs
rename to src-3.0/GF/Parsing/FCFG.hs
diff --git a/src-2.9/GF/Parsing/FCFG/Active.hs b/src-3.0/GF/Parsing/FCFG/Active.hs
similarity index 100%
rename from src-2.9/GF/Parsing/FCFG/Active.hs
rename to src-3.0/GF/Parsing/FCFG/Active.hs
diff --git a/src-2.9/GF/Parsing/FCFG/Incremental.hs b/src-3.0/GF/Parsing/FCFG/Incremental.hs
similarity index 100%
rename from src-2.9/GF/Parsing/FCFG/Incremental.hs
rename to src-3.0/GF/Parsing/FCFG/Incremental.hs
diff --git a/src-2.9/GF/Parsing/FCFG/PInfo.hs b/src-3.0/GF/Parsing/FCFG/PInfo.hs
similarity index 100%
rename from src-2.9/GF/Parsing/FCFG/PInfo.hs
rename to src-3.0/GF/Parsing/FCFG/PInfo.hs
diff --git a/src-2.9/GF/Parsing/FCFG/Range.hs b/src-3.0/GF/Parsing/FCFG/Range.hs
similarity index 100%
rename from src-2.9/GF/Parsing/FCFG/Range.hs
rename to src-3.0/GF/Parsing/FCFG/Range.hs
diff --git a/src-2.9/GF/Parsing/GFC.hs b/src-3.0/GF/Parsing/GFC.hs
similarity index 100%
rename from src-2.9/GF/Parsing/GFC.hs
rename to src-3.0/GF/Parsing/GFC.hs
diff --git a/src-2.9/GF/Parsing/MCFG.hs b/src-3.0/GF/Parsing/MCFG.hs
similarity index 100%
rename from src-2.9/GF/Parsing/MCFG.hs
rename to src-3.0/GF/Parsing/MCFG.hs
diff --git a/src-2.9/GF/Parsing/MCFG/Active.hs b/src-3.0/GF/Parsing/MCFG/Active.hs
similarity index 100%
rename from src-2.9/GF/Parsing/MCFG/Active.hs
rename to src-3.0/GF/Parsing/MCFG/Active.hs
diff --git a/src-2.9/GF/Parsing/MCFG/Active2.hs b/src-3.0/GF/Parsing/MCFG/Active2.hs
similarity index 100%
rename from src-2.9/GF/Parsing/MCFG/Active2.hs
rename to src-3.0/GF/Parsing/MCFG/Active2.hs
diff --git a/src-2.9/GF/Parsing/MCFG/FastActive.hs b/src-3.0/GF/Parsing/MCFG/FastActive.hs
similarity index 100%
rename from src-2.9/GF/Parsing/MCFG/FastActive.hs
rename to src-3.0/GF/Parsing/MCFG/FastActive.hs
diff --git a/src-2.9/GF/Parsing/MCFG/Incremental.hs b/src-3.0/GF/Parsing/MCFG/Incremental.hs
similarity index 100%
rename from src-2.9/GF/Parsing/MCFG/Incremental.hs
rename to src-3.0/GF/Parsing/MCFG/Incremental.hs
diff --git a/src-2.9/GF/Parsing/MCFG/Incremental2.hs b/src-3.0/GF/Parsing/MCFG/Incremental2.hs
similarity index 100%
rename from src-2.9/GF/Parsing/MCFG/Incremental2.hs
rename to src-3.0/GF/Parsing/MCFG/Incremental2.hs
diff --git a/src-2.9/GF/Parsing/MCFG/Naive.hs b/src-3.0/GF/Parsing/MCFG/Naive.hs
similarity index 100%
rename from src-2.9/GF/Parsing/MCFG/Naive.hs
rename to src-3.0/GF/Parsing/MCFG/Naive.hs
diff --git a/src-2.9/GF/Parsing/MCFG/PInfo.hs b/src-3.0/GF/Parsing/MCFG/PInfo.hs
similarity index 100%
rename from src-2.9/GF/Parsing/MCFG/PInfo.hs
rename to src-3.0/GF/Parsing/MCFG/PInfo.hs
diff --git a/src-2.9/GF/Parsing/MCFG/Range.hs b/src-3.0/GF/Parsing/MCFG/Range.hs
similarity index 100%
rename from src-2.9/GF/Parsing/MCFG/Range.hs
rename to src-3.0/GF/Parsing/MCFG/Range.hs
diff --git a/src-2.9/GF/Parsing/MCFG/ViaCFG.hs b/src-3.0/GF/Parsing/MCFG/ViaCFG.hs
similarity index 100%
rename from src-2.9/GF/Parsing/MCFG/ViaCFG.hs
rename to src-3.0/GF/Parsing/MCFG/ViaCFG.hs
diff --git a/src-2.9/GF/Printing/PrintParser.hs b/src-3.0/GF/Printing/PrintParser.hs
similarity index 100%
rename from src-2.9/GF/Printing/PrintParser.hs
rename to src-3.0/GF/Printing/PrintParser.hs
diff --git a/src-2.9/GF/Printing/PrintSimplifiedTerm.hs b/src-3.0/GF/Printing/PrintSimplifiedTerm.hs
similarity index 100%
rename from src-2.9/GF/Printing/PrintSimplifiedTerm.hs
rename to src-3.0/GF/Printing/PrintSimplifiedTerm.hs
diff --git a/src-2.9/GF/Probabilistic/Probabilistic.hs b/src-3.0/GF/Probabilistic/Probabilistic.hs
similarity index 100%
rename from src-2.9/GF/Probabilistic/Probabilistic.hs
rename to src-3.0/GF/Probabilistic/Probabilistic.hs
diff --git a/src-2.9/GF/Shell.hs b/src-3.0/GF/Shell.hs
similarity index 100%
rename from src-2.9/GF/Shell.hs
rename to src-3.0/GF/Shell.hs
diff --git a/src-2.9/GF/Shell/CommandL.hs b/src-3.0/GF/Shell/CommandL.hs
similarity index 100%
rename from src-2.9/GF/Shell/CommandL.hs
rename to src-3.0/GF/Shell/CommandL.hs
diff --git a/src-2.9/GF/Shell/Commands.hs b/src-3.0/GF/Shell/Commands.hs
similarity index 100%
rename from src-2.9/GF/Shell/Commands.hs
rename to src-3.0/GF/Shell/Commands.hs
diff --git a/src-2.9/GF/Shell/HelpFile.hs b/src-3.0/GF/Shell/HelpFile.hs
similarity index 100%
rename from src-2.9/GF/Shell/HelpFile.hs
rename to src-3.0/GF/Shell/HelpFile.hs
diff --git a/src-2.9/GF/Shell/JGF.hs b/src-3.0/GF/Shell/JGF.hs
similarity index 100%
rename from src-2.9/GF/Shell/JGF.hs
rename to src-3.0/GF/Shell/JGF.hs
diff --git a/src-2.9/GF/Shell/PShell.hs b/src-3.0/GF/Shell/PShell.hs
similarity index 100%
rename from src-2.9/GF/Shell/PShell.hs
rename to src-3.0/GF/Shell/PShell.hs
diff --git a/src-2.9/GF/Shell/ShellCommands.hs b/src-3.0/GF/Shell/ShellCommands.hs
similarity index 100%
rename from src-2.9/GF/Shell/ShellCommands.hs
rename to src-3.0/GF/Shell/ShellCommands.hs
diff --git a/src-2.9/GF/Shell/SubShell.hs b/src-3.0/GF/Shell/SubShell.hs
similarity index 100%
rename from src-2.9/GF/Shell/SubShell.hs
rename to src-3.0/GF/Shell/SubShell.hs
diff --git a/src-2.9/GF/Shell/TeachYourself.hs b/src-3.0/GF/Shell/TeachYourself.hs
similarity index 100%
rename from src-2.9/GF/Shell/TeachYourself.hs
rename to src-3.0/GF/Shell/TeachYourself.hs
diff --git a/src-2.9/GF/Source/AbsGF.hs b/src-3.0/GF/Source/AbsGF.hs
similarity index 100%
rename from src-2.9/GF/Source/AbsGF.hs
rename to src-3.0/GF/Source/AbsGF.hs
diff --git a/src-2.9/GF/Source/ErrM.hs b/src-3.0/GF/Source/ErrM.hs
similarity index 100%
rename from src-2.9/GF/Source/ErrM.hs
rename to src-3.0/GF/Source/ErrM.hs
diff --git a/src-2.9/GF/Source/GF.cf b/src-3.0/GF/Source/GF.cf
similarity index 100%
rename from src-2.9/GF/Source/GF.cf
rename to src-3.0/GF/Source/GF.cf
diff --git a/src-2.9/GF/Source/GrammarToSource.hs b/src-3.0/GF/Source/GrammarToSource.hs
similarity index 100%
rename from src-2.9/GF/Source/GrammarToSource.hs
rename to src-3.0/GF/Source/GrammarToSource.hs
diff --git a/src-2.9/GF/Source/LexGF.hs b/src-3.0/GF/Source/LexGF.hs
similarity index 100%
rename from src-2.9/GF/Source/LexGF.hs
rename to src-3.0/GF/Source/LexGF.hs
diff --git a/src-2.9/GF/Source/LexGF.x b/src-3.0/GF/Source/LexGF.x
similarity index 100%
rename from src-2.9/GF/Source/LexGF.x
rename to src-3.0/GF/Source/LexGF.x
diff --git a/src-2.9/GF/Source/ParGF.hs b/src-3.0/GF/Source/ParGF.hs
similarity index 100%
rename from src-2.9/GF/Source/ParGF.hs
rename to src-3.0/GF/Source/ParGF.hs
diff --git a/src-2.9/GF/Source/ParGF.y b/src-3.0/GF/Source/ParGF.y
similarity index 100%
rename from src-2.9/GF/Source/ParGF.y
rename to src-3.0/GF/Source/ParGF.y
diff --git a/src-2.9/GF/Source/PrintGF.hs b/src-3.0/GF/Source/PrintGF.hs
similarity index 100%
rename from src-2.9/GF/Source/PrintGF.hs
rename to src-3.0/GF/Source/PrintGF.hs
diff --git a/src-2.9/GF/Source/SkelGF.hs b/src-3.0/GF/Source/SkelGF.hs
similarity index 100%
rename from src-2.9/GF/Source/SkelGF.hs
rename to src-3.0/GF/Source/SkelGF.hs
diff --git a/src-2.9/GF/Source/SourceToGrammar.hs b/src-3.0/GF/Source/SourceToGrammar.hs
similarity index 100%
rename from src-2.9/GF/Source/SourceToGrammar.hs
rename to src-3.0/GF/Source/SourceToGrammar.hs
diff --git a/src-2.9/GF/Source/TestGF.hs b/src-3.0/GF/Source/TestGF.hs
similarity index 100%
rename from src-2.9/GF/Source/TestGF.hs
rename to src-3.0/GF/Source/TestGF.hs
diff --git a/src-2.9/GF/Speech/CFGToFiniteState.hs b/src-3.0/GF/Speech/CFGToFiniteState.hs
similarity index 100%
rename from src-2.9/GF/Speech/CFGToFiniteState.hs
rename to src-3.0/GF/Speech/CFGToFiniteState.hs
diff --git a/src-2.9/GF/Speech/FiniteState.hs b/src-3.0/GF/Speech/FiniteState.hs
similarity index 100%
rename from src-2.9/GF/Speech/FiniteState.hs
rename to src-3.0/GF/Speech/FiniteState.hs
diff --git a/src-2.9/GF/Speech/GrammarToVoiceXML.hs b/src-3.0/GF/Speech/GrammarToVoiceXML.hs
similarity index 100%
rename from src-2.9/GF/Speech/GrammarToVoiceXML.hs
rename to src-3.0/GF/Speech/GrammarToVoiceXML.hs
diff --git a/src-2.9/GF/Speech/Graph.hs b/src-3.0/GF/Speech/Graph.hs
similarity index 100%
rename from src-2.9/GF/Speech/Graph.hs
rename to src-3.0/GF/Speech/Graph.hs
diff --git a/src-2.9/GF/Speech/PrFA.hs b/src-3.0/GF/Speech/PrFA.hs
similarity index 100%
rename from src-2.9/GF/Speech/PrFA.hs
rename to src-3.0/GF/Speech/PrFA.hs
diff --git a/src-2.9/GF/Speech/PrGSL.hs b/src-3.0/GF/Speech/PrGSL.hs
similarity index 100%
rename from src-2.9/GF/Speech/PrGSL.hs
rename to src-3.0/GF/Speech/PrGSL.hs
diff --git a/src-2.9/GF/Speech/PrJSGF.hs b/src-3.0/GF/Speech/PrJSGF.hs
similarity index 100%
rename from src-2.9/GF/Speech/PrJSGF.hs
rename to src-3.0/GF/Speech/PrJSGF.hs
diff --git a/src-2.9/GF/Speech/PrRegExp.hs b/src-3.0/GF/Speech/PrRegExp.hs
similarity index 100%
rename from src-2.9/GF/Speech/PrRegExp.hs
rename to src-3.0/GF/Speech/PrRegExp.hs
diff --git a/src-2.9/GF/Speech/PrSLF.hs b/src-3.0/GF/Speech/PrSLF.hs
similarity index 100%
rename from src-2.9/GF/Speech/PrSLF.hs
rename to src-3.0/GF/Speech/PrSLF.hs
diff --git a/src-2.9/GF/Speech/PrSRGS.hs b/src-3.0/GF/Speech/PrSRGS.hs
similarity index 100%
rename from src-2.9/GF/Speech/PrSRGS.hs
rename to src-3.0/GF/Speech/PrSRGS.hs
diff --git a/src-2.9/GF/Speech/PrSRGS_ABNF.hs b/src-3.0/GF/Speech/PrSRGS_ABNF.hs
similarity index 100%
rename from src-2.9/GF/Speech/PrSRGS_ABNF.hs
rename to src-3.0/GF/Speech/PrSRGS_ABNF.hs
diff --git a/src-2.9/GF/Speech/RegExp.hs b/src-3.0/GF/Speech/RegExp.hs
similarity index 100%
rename from src-2.9/GF/Speech/RegExp.hs
rename to src-3.0/GF/Speech/RegExp.hs
diff --git a/src-2.9/GF/Speech/Relation.hs b/src-3.0/GF/Speech/Relation.hs
similarity index 100%
rename from src-2.9/GF/Speech/Relation.hs
rename to src-3.0/GF/Speech/Relation.hs
diff --git a/src-2.9/GF/Speech/RelationQC.hs b/src-3.0/GF/Speech/RelationQC.hs
similarity index 100%
rename from src-2.9/GF/Speech/RelationQC.hs
rename to src-3.0/GF/Speech/RelationQC.hs
diff --git a/src-2.9/GF/Speech/SISR.hs b/src-3.0/GF/Speech/SISR.hs
similarity index 100%
rename from src-2.9/GF/Speech/SISR.hs
rename to src-3.0/GF/Speech/SISR.hs
diff --git a/src-2.9/GF/Speech/SRG.hs b/src-3.0/GF/Speech/SRG.hs
similarity index 100%
rename from src-2.9/GF/Speech/SRG.hs
rename to src-3.0/GF/Speech/SRG.hs
diff --git a/src-2.9/GF/Speech/TransformCFG.hs b/src-3.0/GF/Speech/TransformCFG.hs
similarity index 100%
rename from src-2.9/GF/Speech/TransformCFG.hs
rename to src-3.0/GF/Speech/TransformCFG.hs
diff --git a/src-2.9/GF/System/ATKSpeechInput.hs b/src-3.0/GF/System/ATKSpeechInput.hs
similarity index 100%
rename from src-2.9/GF/System/ATKSpeechInput.hs
rename to src-3.0/GF/System/ATKSpeechInput.hs
diff --git a/src-2.9/GF/System/Arch.hs b/src-3.0/GF/System/Arch.hs
similarity index 100%
rename from src-2.9/GF/System/Arch.hs
rename to src-3.0/GF/System/Arch.hs
diff --git a/src-2.9/GF/System/ArchEdit.hs b/src-3.0/GF/System/ArchEdit.hs
similarity index 100%
rename from src-2.9/GF/System/ArchEdit.hs
rename to src-3.0/GF/System/ArchEdit.hs
diff --git a/src-2.9/GF/System/NoReadline.hs b/src-3.0/GF/System/NoReadline.hs
similarity index 100%
rename from src-2.9/GF/System/NoReadline.hs
rename to src-3.0/GF/System/NoReadline.hs
diff --git a/src-2.9/GF/System/NoSignal.hs b/src-3.0/GF/System/NoSignal.hs
similarity index 100%
rename from src-2.9/GF/System/NoSignal.hs
rename to src-3.0/GF/System/NoSignal.hs
diff --git a/src-2.9/GF/System/NoSpeechInput.hs b/src-3.0/GF/System/NoSpeechInput.hs
similarity index 100%
rename from src-2.9/GF/System/NoSpeechInput.hs
rename to src-3.0/GF/System/NoSpeechInput.hs
diff --git a/src-2.9/GF/System/Readline.hs b/src-3.0/GF/System/Readline.hs
similarity index 100%
rename from src-2.9/GF/System/Readline.hs
rename to src-3.0/GF/System/Readline.hs
diff --git a/src-2.9/GF/System/Signal.hs b/src-3.0/GF/System/Signal.hs
similarity index 100%
rename from src-2.9/GF/System/Signal.hs
rename to src-3.0/GF/System/Signal.hs
diff --git a/src-2.9/GF/System/SpeechInput.hs b/src-3.0/GF/System/SpeechInput.hs
similarity index 100%
rename from src-2.9/GF/System/SpeechInput.hs
rename to src-3.0/GF/System/SpeechInput.hs
diff --git a/src-2.9/GF/System/Tracing.hs b/src-3.0/GF/System/Tracing.hs
similarity index 100%
rename from src-2.9/GF/System/Tracing.hs
rename to src-3.0/GF/System/Tracing.hs
diff --git a/src-2.9/GF/System/UseReadline.hs b/src-3.0/GF/System/UseReadline.hs
similarity index 100%
rename from src-2.9/GF/System/UseReadline.hs
rename to src-3.0/GF/System/UseReadline.hs
diff --git a/src-2.9/GF/System/UseSignal.hs b/src-3.0/GF/System/UseSignal.hs
similarity index 100%
rename from src-2.9/GF/System/UseSignal.hs
rename to src-3.0/GF/System/UseSignal.hs
diff --git a/src-2.9/GF/Text/Arabic.hs b/src-3.0/GF/Text/Arabic.hs
similarity index 100%
rename from src-2.9/GF/Text/Arabic.hs
rename to src-3.0/GF/Text/Arabic.hs
diff --git a/src-2.9/GF/Text/Devanagari.hs b/src-3.0/GF/Text/Devanagari.hs
similarity index 100%
rename from src-2.9/GF/Text/Devanagari.hs
rename to src-3.0/GF/Text/Devanagari.hs
diff --git a/src-2.9/GF/Text/Ethiopic.hs b/src-3.0/GF/Text/Ethiopic.hs
similarity index 100%
rename from src-2.9/GF/Text/Ethiopic.hs
rename to src-3.0/GF/Text/Ethiopic.hs
diff --git a/src-2.9/GF/Text/ExtendedArabic.hs b/src-3.0/GF/Text/ExtendedArabic.hs
similarity index 100%
rename from src-2.9/GF/Text/ExtendedArabic.hs
rename to src-3.0/GF/Text/ExtendedArabic.hs
diff --git a/src-2.9/GF/Text/ExtraDiacritics.hs b/src-3.0/GF/Text/ExtraDiacritics.hs
similarity index 100%
rename from src-2.9/GF/Text/ExtraDiacritics.hs
rename to src-3.0/GF/Text/ExtraDiacritics.hs
diff --git a/src-2.9/GF/Text/Greek.hs b/src-3.0/GF/Text/Greek.hs
similarity index 100%
rename from src-2.9/GF/Text/Greek.hs
rename to src-3.0/GF/Text/Greek.hs
diff --git a/src-2.9/GF/Text/Hebrew.hs b/src-3.0/GF/Text/Hebrew.hs
similarity index 100%
rename from src-2.9/GF/Text/Hebrew.hs
rename to src-3.0/GF/Text/Hebrew.hs
diff --git a/src-2.9/GF/Text/Hiragana.hs b/src-3.0/GF/Text/Hiragana.hs
similarity index 100%
rename from src-2.9/GF/Text/Hiragana.hs
rename to src-3.0/GF/Text/Hiragana.hs
diff --git a/src-2.9/GF/Text/LatinASupplement.hs b/src-3.0/GF/Text/LatinASupplement.hs
similarity index 100%
rename from src-2.9/GF/Text/LatinASupplement.hs
rename to src-3.0/GF/Text/LatinASupplement.hs
diff --git a/src-2.9/GF/Text/OCSCyrillic.hs b/src-3.0/GF/Text/OCSCyrillic.hs
similarity index 100%
rename from src-2.9/GF/Text/OCSCyrillic.hs
rename to src-3.0/GF/Text/OCSCyrillic.hs
diff --git a/src-2.9/GF/Text/Russian.hs b/src-3.0/GF/Text/Russian.hs
similarity index 100%
rename from src-2.9/GF/Text/Russian.hs
rename to src-3.0/GF/Text/Russian.hs
diff --git a/src-2.9/GF/Text/Tamil.hs b/src-3.0/GF/Text/Tamil.hs
similarity index 100%
rename from src-2.9/GF/Text/Tamil.hs
rename to src-3.0/GF/Text/Tamil.hs
diff --git a/src-2.9/GF/Text/Text.hs b/src-3.0/GF/Text/Text.hs
similarity index 100%
rename from src-2.9/GF/Text/Text.hs
rename to src-3.0/GF/Text/Text.hs
diff --git a/src-2.9/GF/Text/Thai.hs b/src-3.0/GF/Text/Thai.hs
similarity index 100%
rename from src-2.9/GF/Text/Thai.hs
rename to src-3.0/GF/Text/Thai.hs
diff --git a/src-2.9/GF/Text/UTF8.hs b/src-3.0/GF/Text/UTF8.hs
similarity index 100%
rename from src-2.9/GF/Text/UTF8.hs
rename to src-3.0/GF/Text/UTF8.hs
diff --git a/src-2.9/GF/Text/Unicode.hs b/src-3.0/GF/Text/Unicode.hs
similarity index 100%
rename from src-2.9/GF/Text/Unicode.hs
rename to src-3.0/GF/Text/Unicode.hs
diff --git a/src-2.9/GF/Translate/GFT.hs b/src-3.0/GF/Translate/GFT.hs
similarity index 100%
rename from src-2.9/GF/Translate/GFT.hs
rename to src-3.0/GF/Translate/GFT.hs
diff --git a/src-2.9/GF/UseGrammar/Custom.hs b/src-3.0/GF/UseGrammar/Custom.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/Custom.hs
rename to src-3.0/GF/UseGrammar/Custom.hs
diff --git a/src-2.9/GF/UseGrammar/Editing.hs b/src-3.0/GF/UseGrammar/Editing.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/Editing.hs
rename to src-3.0/GF/UseGrammar/Editing.hs
diff --git a/src-2.9/GF/UseGrammar/Generate.hs b/src-3.0/GF/UseGrammar/Generate.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/Generate.hs
rename to src-3.0/GF/UseGrammar/Generate.hs
diff --git a/src-2.9/GF/UseGrammar/GetTree.hs b/src-3.0/GF/UseGrammar/GetTree.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/GetTree.hs
rename to src-3.0/GF/UseGrammar/GetTree.hs
diff --git a/src-2.9/GF/UseGrammar/Information.hs b/src-3.0/GF/UseGrammar/Information.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/Information.hs
rename to src-3.0/GF/UseGrammar/Information.hs
diff --git a/src-2.9/GF/UseGrammar/Linear.hs b/src-3.0/GF/UseGrammar/Linear.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/Linear.hs
rename to src-3.0/GF/UseGrammar/Linear.hs
diff --git a/src-2.9/GF/UseGrammar/MatchTerm.hs b/src-3.0/GF/UseGrammar/MatchTerm.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/MatchTerm.hs
rename to src-3.0/GF/UseGrammar/MatchTerm.hs
diff --git a/src-2.9/GF/UseGrammar/Morphology.hs b/src-3.0/GF/UseGrammar/Morphology.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/Morphology.hs
rename to src-3.0/GF/UseGrammar/Morphology.hs
diff --git a/src-2.9/GF/UseGrammar/Paraphrases.hs b/src-3.0/GF/UseGrammar/Paraphrases.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/Paraphrases.hs
rename to src-3.0/GF/UseGrammar/Paraphrases.hs
diff --git a/src-2.9/GF/UseGrammar/Parsing.hs b/src-3.0/GF/UseGrammar/Parsing.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/Parsing.hs
rename to src-3.0/GF/UseGrammar/Parsing.hs
diff --git a/src-2.9/GF/UseGrammar/Randomized.hs b/src-3.0/GF/UseGrammar/Randomized.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/Randomized.hs
rename to src-3.0/GF/UseGrammar/Randomized.hs
diff --git a/src-2.9/GF/UseGrammar/Session.hs b/src-3.0/GF/UseGrammar/Session.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/Session.hs
rename to src-3.0/GF/UseGrammar/Session.hs
diff --git a/src-2.9/GF/UseGrammar/Statistics.hs b/src-3.0/GF/UseGrammar/Statistics.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/Statistics.hs
rename to src-3.0/GF/UseGrammar/Statistics.hs
diff --git a/src-2.9/GF/UseGrammar/Tokenize.hs b/src-3.0/GF/UseGrammar/Tokenize.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/Tokenize.hs
rename to src-3.0/GF/UseGrammar/Tokenize.hs
diff --git a/src-2.9/GF/UseGrammar/Transfer.hs b/src-3.0/GF/UseGrammar/Transfer.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/Transfer.hs
rename to src-3.0/GF/UseGrammar/Transfer.hs
diff --git a/src-2.9/GF/UseGrammar/TreeSelections.hs b/src-3.0/GF/UseGrammar/TreeSelections.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/TreeSelections.hs
rename to src-3.0/GF/UseGrammar/TreeSelections.hs
diff --git a/src-2.9/GF/UseGrammar/Treebank.hs b/src-3.0/GF/UseGrammar/Treebank.hs
similarity index 100%
rename from src-2.9/GF/UseGrammar/Treebank.hs
rename to src-3.0/GF/UseGrammar/Treebank.hs
diff --git a/src-2.9/GF/Visualization/Graphviz.hs b/src-3.0/GF/Visualization/Graphviz.hs
similarity index 100%
rename from src-2.9/GF/Visualization/Graphviz.hs
rename to src-3.0/GF/Visualization/Graphviz.hs
diff --git a/src-2.9/GF/Visualization/VisualizeGrammar.hs b/src-3.0/GF/Visualization/VisualizeGrammar.hs
similarity index 100%
rename from src-2.9/GF/Visualization/VisualizeGrammar.hs
rename to src-3.0/GF/Visualization/VisualizeGrammar.hs
diff --git a/src-2.9/GF/Visualization/VisualizeTree.hs b/src-3.0/GF/Visualization/VisualizeTree.hs
similarity index 100%
rename from src-2.9/GF/Visualization/VisualizeTree.hs
rename to src-3.0/GF/Visualization/VisualizeTree.hs
diff --git a/src-2.9/HelpFile b/src-3.0/HelpFile
similarity index 100%
rename from src-2.9/HelpFile
rename to src-3.0/HelpFile
diff --git a/src-2.9/INSTALL b/src-3.0/INSTALL
similarity index 100%
rename from src-2.9/INSTALL
rename to src-3.0/INSTALL
diff --git a/src-2.9/INSTALL.binary b/src-3.0/INSTALL.binary
similarity index 100%
rename from src-2.9/INSTALL.binary
rename to src-3.0/INSTALL.binary
diff --git a/src-2.9/JavaGUI/DynamicTree.java b/src-3.0/JavaGUI/DynamicTree.java
similarity index 100%
rename from src-2.9/JavaGUI/DynamicTree.java
rename to src-3.0/JavaGUI/DynamicTree.java
diff --git a/src-2.9/JavaGUI/DynamicTree2.java b/src-3.0/JavaGUI/DynamicTree2.java
similarity index 100%
rename from src-2.9/JavaGUI/DynamicTree2.java
rename to src-3.0/JavaGUI/DynamicTree2.java
diff --git a/src-2.9/JavaGUI/GFEditor.java b/src-3.0/JavaGUI/GFEditor.java
similarity index 100%
rename from src-2.9/JavaGUI/GFEditor.java
rename to src-3.0/JavaGUI/GFEditor.java
diff --git a/src-2.9/JavaGUI/GFEditor2.java b/src-3.0/JavaGUI/GFEditor2.java
similarity index 100%
rename from src-2.9/JavaGUI/GFEditor2.java
rename to src-3.0/JavaGUI/GFEditor2.java
diff --git a/src-2.9/JavaGUI/GrammarFilter.java b/src-3.0/JavaGUI/GrammarFilter.java
similarity index 100%
rename from src-2.9/JavaGUI/GrammarFilter.java
rename to src-3.0/JavaGUI/GrammarFilter.java
diff --git a/src-2.9/JavaGUI/LinPosition.java b/src-3.0/JavaGUI/LinPosition.java
similarity index 100%
rename from src-2.9/JavaGUI/LinPosition.java
rename to src-3.0/JavaGUI/LinPosition.java
diff --git a/src-2.9/JavaGUI/MarkedArea.java b/src-3.0/JavaGUI/MarkedArea.java
similarity index 100%
rename from src-2.9/JavaGUI/MarkedArea.java
rename to src-3.0/JavaGUI/MarkedArea.java
diff --git a/src-2.9/JavaGUI/Numerals.java b/src-3.0/JavaGUI/Numerals.java
similarity index 100%
rename from src-2.9/JavaGUI/Numerals.java
rename to src-3.0/JavaGUI/Numerals.java
diff --git a/src-2.9/JavaGUI/Utils.java b/src-3.0/JavaGUI/Utils.java
similarity index 100%
rename from src-2.9/JavaGUI/Utils.java
rename to src-3.0/JavaGUI/Utils.java
diff --git a/src-2.9/JavaGUI/manifest.txt b/src-3.0/JavaGUI/manifest.txt
similarity index 100%
rename from src-2.9/JavaGUI/manifest.txt
rename to src-3.0/JavaGUI/manifest.txt
diff --git a/src-2.9/JavaGUI/runNumerals b/src-3.0/JavaGUI/runNumerals
similarity index 100%
rename from src-2.9/JavaGUI/runNumerals
rename to src-3.0/JavaGUI/runNumerals
diff --git a/src-2.9/JavaGUI2/LICENCE_jargs b/src-3.0/JavaGUI2/LICENCE_jargs
similarity index 100%
rename from src-2.9/JavaGUI2/LICENCE_jargs
rename to src-3.0/JavaGUI2/LICENCE_jargs
diff --git a/src-2.9/JavaGUI2/ManifestMain.txt b/src-3.0/JavaGUI2/ManifestMain.txt
similarity index 100%
rename from src-2.9/JavaGUI2/ManifestMain.txt
rename to src-3.0/JavaGUI2/ManifestMain.txt
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/AstNodeData.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/AstNodeData.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/AstNodeData.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/AstNodeData.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ChainCommandTuple.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ChainCommandTuple.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ChainCommandTuple.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ChainCommandTuple.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Display.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Display.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Display.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Display.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ExportFormatMenu.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ExportFormatMenu.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ExportFormatMenu.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ExportFormatMenu.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfCapsule.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfCapsule.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfCapsule.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfCapsule.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfeditResult.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfeditResult.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfeditResult.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfeditResult.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GrammarFilter.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GrammarFilter.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GrammarFilter.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GrammarFilter.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Hmsg.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Hmsg.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Hmsg.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Hmsg.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/LanguageManager.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LanguageManager.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/LanguageManager.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LanguageManager.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinPosition.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinPosition.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinPosition.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinPosition.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Linearization.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Linearization.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Linearization.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Linearization.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinkCommand.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinkCommand.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinkCommand.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinkCommand.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedArea.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedArea.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedArea.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedArea.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedAreaHighlightingStatus.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedAreaHighlightingStatus.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedAreaHighlightingStatus.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedAreaHighlightingStatus.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/NewCategoryMenuResult.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/NewCategoryMenuResult.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/NewCategoryMenuResult.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/NewCategoryMenuResult.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/NoLineBreakFormatter.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/NoLineBreakFormatter.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/NoLineBreakFormatter.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/NoLineBreakFormatter.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenu.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenu.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenu.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenu.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuCollector.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuCollector.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuCollector.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuCollector.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuTransformer.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuTransformer.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuTransformer.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuTransformer.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfPropertiesCommand.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfPropertiesCommand.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfPropertiesCommand.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfPropertiesCommand.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfResultProber.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfResultProber.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfResultProber.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfResultProber.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/StringTuple.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/StringTuple.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/StringTuple.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/StringTuple.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/SubtypingProber.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SubtypingProber.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/SubtypingProber.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SubtypingProber.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalyser.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalyser.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalyser.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalyser.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalysisResult.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalysisResult.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalysisResult.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalysisResult.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java
similarity index 100%
rename from src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java
rename to src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java
diff --git a/src-2.9/JavaGUI2/gf-icon.gif b/src-3.0/JavaGUI2/gf-icon.gif
similarity index 100%
rename from src-2.9/JavaGUI2/gf-icon.gif
rename to src-3.0/JavaGUI2/gf-icon.gif
diff --git a/src-2.9/JavaGUI2/jargs-1.0.jar b/src-3.0/JavaGUI2/jargs-1.0.jar
similarity index 100%
rename from src-2.9/JavaGUI2/jargs-1.0.jar
rename to src-3.0/JavaGUI2/jargs-1.0.jar
diff --git a/src-2.9/Makefile b/src-3.0/Makefile
similarity index 100%
rename from src-2.9/Makefile
rename to src-3.0/Makefile
diff --git a/src-2.9/Makefile.binary b/src-3.0/Makefile.binary
similarity index 100%
rename from src-2.9/Makefile.binary
rename to src-3.0/Makefile.binary
diff --git a/src-2.9/ReleaseProcedure b/src-3.0/ReleaseProcedure
similarity index 100%
rename from src-2.9/ReleaseProcedure
rename to src-3.0/ReleaseProcedure
diff --git a/src-2.9/Setup.lhs b/src-3.0/Setup.lhs
similarity index 100%
rename from src-2.9/Setup.lhs
rename to src-3.0/Setup.lhs
diff --git a/src-2.9/Transfer/CompilerAPI.hs b/src-3.0/Transfer/CompilerAPI.hs
similarity index 100%
rename from src-2.9/Transfer/CompilerAPI.hs
rename to src-3.0/Transfer/CompilerAPI.hs
diff --git a/src-2.9/Transfer/Core/Abs.hs b/src-3.0/Transfer/Core/Abs.hs
similarity index 100%
rename from src-2.9/Transfer/Core/Abs.hs
rename to src-3.0/Transfer/Core/Abs.hs
diff --git a/src-2.9/Transfer/Core/Core.cf b/src-3.0/Transfer/Core/Core.cf
similarity index 100%
rename from src-2.9/Transfer/Core/Core.cf
rename to src-3.0/Transfer/Core/Core.cf
diff --git a/src-2.9/Transfer/Core/Doc.tex b/src-3.0/Transfer/Core/Doc.tex
similarity index 100%
rename from src-2.9/Transfer/Core/Doc.tex
rename to src-3.0/Transfer/Core/Doc.tex
diff --git a/src-2.9/Transfer/Core/Lex.hs b/src-3.0/Transfer/Core/Lex.hs
similarity index 100%
rename from src-2.9/Transfer/Core/Lex.hs
rename to src-3.0/Transfer/Core/Lex.hs
diff --git a/src-2.9/Transfer/Core/Lex.x b/src-3.0/Transfer/Core/Lex.x
similarity index 100%
rename from src-2.9/Transfer/Core/Lex.x
rename to src-3.0/Transfer/Core/Lex.x
diff --git a/src-2.9/Transfer/Core/Par.hs b/src-3.0/Transfer/Core/Par.hs
similarity index 100%
rename from src-2.9/Transfer/Core/Par.hs
rename to src-3.0/Transfer/Core/Par.hs
diff --git a/src-2.9/Transfer/Core/Par.y b/src-3.0/Transfer/Core/Par.y
similarity index 100%
rename from src-2.9/Transfer/Core/Par.y
rename to src-3.0/Transfer/Core/Par.y
diff --git a/src-2.9/Transfer/Core/Print.hs b/src-3.0/Transfer/Core/Print.hs
similarity index 100%
rename from src-2.9/Transfer/Core/Print.hs
rename to src-3.0/Transfer/Core/Print.hs
diff --git a/src-2.9/Transfer/Core/Skel.hs b/src-3.0/Transfer/Core/Skel.hs
similarity index 100%
rename from src-2.9/Transfer/Core/Skel.hs
rename to src-3.0/Transfer/Core/Skel.hs
diff --git a/src-2.9/Transfer/Core/Test.hs b/src-3.0/Transfer/Core/Test.hs
similarity index 100%
rename from src-2.9/Transfer/Core/Test.hs
rename to src-3.0/Transfer/Core/Test.hs
diff --git a/src-2.9/Transfer/ErrM.hs b/src-3.0/Transfer/ErrM.hs
similarity index 100%
rename from src-2.9/Transfer/ErrM.hs
rename to src-3.0/Transfer/ErrM.hs
diff --git a/src-2.9/Transfer/Interpreter.hs b/src-3.0/Transfer/Interpreter.hs
similarity index 100%
rename from src-2.9/Transfer/Interpreter.hs
rename to src-3.0/Transfer/Interpreter.hs
diff --git a/src-2.9/Transfer/InterpreterAPI.hs b/src-3.0/Transfer/InterpreterAPI.hs
similarity index 100%
rename from src-2.9/Transfer/InterpreterAPI.hs
rename to src-3.0/Transfer/InterpreterAPI.hs
diff --git a/src-2.9/Transfer/PathUtil.hs b/src-3.0/Transfer/PathUtil.hs
similarity index 100%
rename from src-2.9/Transfer/PathUtil.hs
rename to src-3.0/Transfer/PathUtil.hs
diff --git a/src-2.9/Transfer/Syntax/Abs.hs b/src-3.0/Transfer/Syntax/Abs.hs
similarity index 100%
rename from src-2.9/Transfer/Syntax/Abs.hs
rename to src-3.0/Transfer/Syntax/Abs.hs
diff --git a/src-2.9/Transfer/Syntax/Doc.tex b/src-3.0/Transfer/Syntax/Doc.tex
similarity index 100%
rename from src-2.9/Transfer/Syntax/Doc.tex
rename to src-3.0/Transfer/Syntax/Doc.tex
diff --git a/src-2.9/Transfer/Syntax/Layout.hs b/src-3.0/Transfer/Syntax/Layout.hs
similarity index 100%
rename from src-2.9/Transfer/Syntax/Layout.hs
rename to src-3.0/Transfer/Syntax/Layout.hs
diff --git a/src-2.9/Transfer/Syntax/Lex.hs b/src-3.0/Transfer/Syntax/Lex.hs
similarity index 100%
rename from src-2.9/Transfer/Syntax/Lex.hs
rename to src-3.0/Transfer/Syntax/Lex.hs
diff --git a/src-2.9/Transfer/Syntax/Lex.x b/src-3.0/Transfer/Syntax/Lex.x
similarity index 100%
rename from src-2.9/Transfer/Syntax/Lex.x
rename to src-3.0/Transfer/Syntax/Lex.x
diff --git a/src-2.9/Transfer/Syntax/Par.hs b/src-3.0/Transfer/Syntax/Par.hs
similarity index 100%
rename from src-2.9/Transfer/Syntax/Par.hs
rename to src-3.0/Transfer/Syntax/Par.hs
diff --git a/src-2.9/Transfer/Syntax/Par.y b/src-3.0/Transfer/Syntax/Par.y
similarity index 100%
rename from src-2.9/Transfer/Syntax/Par.y
rename to src-3.0/Transfer/Syntax/Par.y
diff --git a/src-2.9/Transfer/Syntax/Print.hs b/src-3.0/Transfer/Syntax/Print.hs
similarity index 100%
rename from src-2.9/Transfer/Syntax/Print.hs
rename to src-3.0/Transfer/Syntax/Print.hs
diff --git a/src-2.9/Transfer/Syntax/ResolveLayout.hs b/src-3.0/Transfer/Syntax/ResolveLayout.hs
similarity index 100%
rename from src-2.9/Transfer/Syntax/ResolveLayout.hs
rename to src-3.0/Transfer/Syntax/ResolveLayout.hs
diff --git a/src-2.9/Transfer/Syntax/Skel.hs b/src-3.0/Transfer/Syntax/Skel.hs
similarity index 100%
rename from src-2.9/Transfer/Syntax/Skel.hs
rename to src-3.0/Transfer/Syntax/Skel.hs
diff --git a/src-2.9/Transfer/Syntax/Syntax.cf b/src-3.0/Transfer/Syntax/Syntax.cf
similarity index 100%
rename from src-2.9/Transfer/Syntax/Syntax.cf
rename to src-3.0/Transfer/Syntax/Syntax.cf
diff --git a/src-2.9/Transfer/Syntax/Test.hs b/src-3.0/Transfer/Syntax/Test.hs
similarity index 100%
rename from src-2.9/Transfer/Syntax/Test.hs
rename to src-3.0/Transfer/Syntax/Test.hs
diff --git a/src-2.9/Transfer/SyntaxToCore.hs b/src-3.0/Transfer/SyntaxToCore.hs
similarity index 100%
rename from src-2.9/Transfer/SyntaxToCore.hs
rename to src-3.0/Transfer/SyntaxToCore.hs
diff --git a/src-2.9/config.guess b/src-3.0/config.guess
similarity index 100%
rename from src-2.9/config.guess
rename to src-3.0/config.guess
diff --git a/src-2.9/config.mk.in b/src-3.0/config.mk.in
similarity index 100%
rename from src-2.9/config.mk.in
rename to src-3.0/config.mk.in
diff --git a/src-2.9/config.sub b/src-3.0/config.sub
similarity index 100%
rename from src-2.9/config.sub
rename to src-3.0/config.sub
diff --git a/src-2.9/configure.ac b/src-3.0/configure.ac
similarity index 100%
rename from src-2.9/configure.ac
rename to src-3.0/configure.ac
diff --git a/src-2.9/exper/Evaluate.hs b/src-3.0/exper/Evaluate.hs
similarity index 100%
rename from src-2.9/exper/Evaluate.hs
rename to src-3.0/exper/Evaluate.hs
diff --git a/src-2.9/exper/Optimize.hs b/src-3.0/exper/Optimize.hs
similarity index 100%
rename from src-2.9/exper/Optimize.hs
rename to src-3.0/exper/Optimize.hs
diff --git a/src-2.9/gf.spec b/src-3.0/gf.spec
similarity index 100%
rename from src-2.9/gf.spec
rename to src-3.0/gf.spec
diff --git a/src-2.9/gf.wxs.in b/src-3.0/gf.wxs.in
similarity index 100%
rename from src-2.9/gf.wxs.in
rename to src-3.0/gf.wxs.in
diff --git a/src-2.9/gf_atk.cfg b/src-3.0/gf_atk.cfg
similarity index 100%
rename from src-2.9/gf_atk.cfg
rename to src-3.0/gf_atk.cfg
diff --git a/src-2.9/gfc.in b/src-3.0/gfc.in
similarity index 100%
rename from src-2.9/gfc.in
rename to src-3.0/gfc.in
diff --git a/src-2.9/gfeditor.in b/src-3.0/gfeditor.in
similarity index 100%
rename from src-2.9/gfeditor.in
rename to src-3.0/gfeditor.in
diff --git a/src-2.9/haddock/haddock-check.perl b/src-3.0/haddock/haddock-check.perl
similarity index 100%
rename from src-2.9/haddock/haddock-check.perl
rename to src-3.0/haddock/haddock-check.perl
diff --git a/src-2.9/haddock/haddock-script.csh b/src-3.0/haddock/haddock-script.csh
similarity index 100%
rename from src-2.9/haddock/haddock-script.csh
rename to src-3.0/haddock/haddock-script.csh
diff --git a/src-2.9/haddock/resources/blank.html b/src-3.0/haddock/resources/blank.html
similarity index 100%
rename from src-2.9/haddock/resources/blank.html
rename to src-3.0/haddock/resources/blank.html
diff --git a/src-2.9/haddock/resources/index.html b/src-3.0/haddock/resources/index.html
similarity index 100%
rename from src-2.9/haddock/resources/index.html
rename to src-3.0/haddock/resources/index.html
diff --git a/src-2.9/install-sh b/src-3.0/install-sh
similarity index 100%
rename from src-2.9/install-sh
rename to src-3.0/install-sh
diff --git a/src-2.9/jgf.bat b/src-3.0/jgf.bat
similarity index 100%
rename from src-2.9/jgf.bat
rename to src-3.0/jgf.bat
diff --git a/src-2.9/jgf.in b/src-3.0/jgf.in
similarity index 100%
rename from src-2.9/jgf.in
rename to src-3.0/jgf.in
diff --git a/src-2.9/module-structure.txt b/src-3.0/module-structure.txt
similarity index 100%
rename from src-2.9/module-structure.txt
rename to src-3.0/module-structure.txt
diff --git a/src-2.9/tools/AlphaConvGF.hs b/src-3.0/tools/AlphaConvGF.hs
similarity index 100%
rename from src-2.9/tools/AlphaConvGF.hs
rename to src-3.0/tools/AlphaConvGF.hs
diff --git a/src-2.9/tools/GFDoc.hs b/src-3.0/tools/GFDoc.hs
similarity index 100%
rename from src-2.9/tools/GFDoc.hs
rename to src-3.0/tools/GFDoc.hs
diff --git a/src-2.9/tools/Htmls.hs b/src-3.0/tools/Htmls.hs
similarity index 100%
rename from src-2.9/tools/Htmls.hs
rename to src-3.0/tools/Htmls.hs
diff --git a/src-2.9/tools/MkHelpFile.hs b/src-3.0/tools/MkHelpFile.hs
similarity index 100%
rename from src-2.9/tools/MkHelpFile.hs
rename to src-3.0/tools/MkHelpFile.hs
diff --git a/src-2.9/tools/WriteF.hs b/src-3.0/tools/WriteF.hs
similarity index 100%
rename from src-2.9/tools/WriteF.hs
rename to src-3.0/tools/WriteF.hs
diff --git a/src-2.9/tools/c++/README b/src-3.0/tools/c++/README
similarity index 100%
rename from src-2.9/tools/c++/README
rename to src-3.0/tools/c++/README
diff --git a/src-2.9/tools/c++/exgf.gft b/src-3.0/tools/c++/exgf.gft
similarity index 100%
rename from src-2.9/tools/c++/exgf.gft
rename to src-3.0/tools/c++/exgf.gft
diff --git a/src-2.9/tools/c++/gfex.cpp b/src-3.0/tools/c++/gfex.cpp
similarity index 100%
rename from src-2.9/tools/c++/gfex.cpp
rename to src-3.0/tools/c++/gfex.cpp
diff --git a/src-2.9/tools/c++/peace.gft b/src-3.0/tools/c++/peace.gft
similarity index 100%
rename from src-2.9/tools/c++/peace.gft
rename to src-3.0/tools/c++/peace.gft
diff --git a/src-2.9/tools/c/GFCC/Abs.hs b/src-3.0/tools/c/GFCC/Abs.hs
similarity index 100%
rename from src-2.9/tools/c/GFCC/Abs.hs
rename to src-3.0/tools/c/GFCC/Abs.hs
diff --git a/src-2.9/tools/c/GFCC/ComposOp.hs b/src-3.0/tools/c/GFCC/ComposOp.hs
similarity index 100%
rename from src-2.9/tools/c/GFCC/ComposOp.hs
rename to src-3.0/tools/c/GFCC/ComposOp.hs
diff --git a/src-2.9/tools/c/GFCC/ErrM.hs b/src-3.0/tools/c/GFCC/ErrM.hs
similarity index 100%
rename from src-2.9/tools/c/GFCC/ErrM.hs
rename to src-3.0/tools/c/GFCC/ErrM.hs
diff --git a/src-2.9/tools/c/GFCC/Lex.hs b/src-3.0/tools/c/GFCC/Lex.hs
similarity index 100%
rename from src-2.9/tools/c/GFCC/Lex.hs
rename to src-3.0/tools/c/GFCC/Lex.hs
diff --git a/src-2.9/tools/c/GFCC/Lex.x b/src-3.0/tools/c/GFCC/Lex.x
similarity index 100%
rename from src-2.9/tools/c/GFCC/Lex.x
rename to src-3.0/tools/c/GFCC/Lex.x
diff --git a/src-2.9/tools/c/GFCC/Par.hs b/src-3.0/tools/c/GFCC/Par.hs
similarity index 100%
rename from src-2.9/tools/c/GFCC/Par.hs
rename to src-3.0/tools/c/GFCC/Par.hs
diff --git a/src-2.9/tools/c/GFCC/Par.y b/src-3.0/tools/c/GFCC/Par.y
similarity index 100%
rename from src-2.9/tools/c/GFCC/Par.y
rename to src-3.0/tools/c/GFCC/Par.y
diff --git a/src-2.9/tools/c/GFCC/Print.hs b/src-3.0/tools/c/GFCC/Print.hs
similarity index 100%
rename from src-2.9/tools/c/GFCC/Print.hs
rename to src-3.0/tools/c/GFCC/Print.hs
diff --git a/src-2.9/tools/c/GFCC/Test.hs b/src-3.0/tools/c/GFCC/Test.hs
similarity index 100%
rename from src-2.9/tools/c/GFCC/Test.hs
rename to src-3.0/tools/c/GFCC/Test.hs
diff --git a/src-2.9/tools/c/Makefile b/src-3.0/tools/c/Makefile
similarity index 100%
rename from src-2.9/tools/c/Makefile
rename to src-3.0/tools/c/Makefile
diff --git a/src-2.9/tools/c/examples/bronzeage/Makefile b/src-3.0/tools/c/examples/bronzeage/Makefile
similarity index 100%
rename from src-2.9/tools/c/examples/bronzeage/Makefile
rename to src-3.0/tools/c/examples/bronzeage/Makefile
diff --git a/src-2.9/tools/c/examples/bronzeage/bronzeage-test.c b/src-3.0/tools/c/examples/bronzeage/bronzeage-test.c
similarity index 100%
rename from src-2.9/tools/c/examples/bronzeage/bronzeage-test.c
rename to src-3.0/tools/c/examples/bronzeage/bronzeage-test.c
diff --git a/src-2.9/tools/c/gfcc2c.hs b/src-3.0/tools/c/gfcc2c.hs
similarity index 100%
rename from src-2.9/tools/c/gfcc2c.hs
rename to src-3.0/tools/c/gfcc2c.hs
diff --git a/src-2.9/tools/mkHelpFile.perl b/src-3.0/tools/mkHelpFile.perl
similarity index 100%
rename from src-2.9/tools/mkHelpFile.perl
rename to src-3.0/tools/mkHelpFile.perl