reorganize the directories under src, and rescue the JavaScript interpreter from deprecated

189 files changed, 2 insertions, 2 deletions

diff --git a/GF.cabal b/GF.cabal
index 2137f2113..7d77f2b6b 100644
--- a/GF.cabal
+++ b/GF.cabal
@@ -29,7 +29,7 @@ library
                  bytestring,
                  random
   ghc-options: -O2
-  hs-source-dirs: src
+  hs-source-dirs: src\compiler src\runtime\haskell
   extensions: 
   exposed-modules: 
     PGF
@@ -92,7 +92,7 @@ executable gf
   else
     build-depends: unix
   ghc-options: -O2
-  hs-source-dirs: src
+  hs-source-dirs: src\compiler src\runtime\haskell
   extensions:
   main-is: GF.hs
   other-modules:
diff --git a/src/FILES b/deprecated/FILES
index 1311108b6..1311108b6 100644
--- a/src/FILES
+++ b/deprecated/FILES
diff --git a/src/HelpFile b/deprecated/HelpFile
index c6b38b313..c6b38b313 100644
--- a/src/HelpFile
+++ b/deprecated/HelpFile
diff --git a/src/Makefile b/deprecated/Makefile
index e4c6bb728..e4c6bb728 100644
--- a/src/Makefile
+++ b/deprecated/Makefile
diff --git a/src/Makefile.binary b/deprecated/Makefile.binary
index 0ae18a2e7..0ae18a2e7 100644
--- a/src/Makefile.binary
+++ b/deprecated/Makefile.binary
diff --git a/src/PGF/doc/Eng.gf b/deprecated/PGF/doc/Eng.gf
index c64f46313..c64f46313 100644
--- a/src/PGF/doc/Eng.gf
+++ b/deprecated/PGF/doc/Eng.gf
diff --git a/src/PGF/doc/Ex.gf b/deprecated/PGF/doc/Ex.gf
index bd0b03483..bd0b03483 100644
--- a/src/PGF/doc/Ex.gf
+++ b/deprecated/PGF/doc/Ex.gf
diff --git a/src/PGF/doc/Swe.gf b/deprecated/PGF/doc/Swe.gf
index 1d6672371..1d6672371 100644
--- a/src/PGF/doc/Swe.gf
+++ b/deprecated/PGF/doc/Swe.gf
diff --git a/src/PGF/doc/Test.gf b/deprecated/PGF/doc/Test.gf
index 5cd4c5474..5cd4c5474 100644
--- a/src/PGF/doc/Test.gf
+++ b/deprecated/PGF/doc/Test.gf
diff --git a/src/PGF/doc/gfcc.html b/deprecated/PGF/doc/gfcc.html
index 8f8c478c0..8f8c478c0 100644
--- a/src/PGF/doc/gfcc.html
+++ b/deprecated/PGF/doc/gfcc.html
diff --git a/src/PGF/doc/gfcc.txt b/deprecated/PGF/doc/gfcc.txt
index 5dcf2fbdc..5dcf2fbdc 100644
--- a/src/PGF/doc/gfcc.txt
+++ b/deprecated/PGF/doc/gfcc.txt
diff --git a/src/PGF/doc/old-GFCC.cf b/deprecated/PGF/doc/old-GFCC.cf
index 65657a259..65657a259 100644
--- a/src/PGF/doc/old-GFCC.cf
+++ b/deprecated/PGF/doc/old-GFCC.cf
diff --git a/src/PGF/doc/old-gfcc.txt b/deprecated/PGF/doc/old-gfcc.txt
index 6ffd9bd64..6ffd9bd64 100644
--- a/src/PGF/doc/old-gfcc.txt
+++ b/deprecated/PGF/doc/old-gfcc.txt
diff --git a/src/PGF/doc/syntax.txt b/deprecated/PGF/doc/syntax.txt
index db8f7c149..db8f7c149 100644
--- a/src/PGF/doc/syntax.txt
+++ b/deprecated/PGF/doc/syntax.txt
diff --git a/src/ReleaseProcedure b/deprecated/ReleaseProcedure
index c04f2a065..c04f2a065 100644
--- a/src/ReleaseProcedure
+++ b/deprecated/ReleaseProcedure
diff --git a/src/config.guess b/deprecated/config.guess
index c085f4f51..c085f4f51 100644
--- a/src/config.guess
+++ b/deprecated/config.guess
diff --git a/src/config.mk.in b/deprecated/config.mk.in
index e8a8ab567..e8a8ab567 100644
--- a/src/config.mk.in
+++ b/deprecated/config.mk.in
diff --git a/src/config.sub b/deprecated/config.sub
index 4d936e239..4d936e239 100644
--- a/src/config.sub
+++ b/deprecated/config.sub
diff --git a/src/configure.ac b/deprecated/configure.ac
index c38acbff5..c38acbff5 100644
--- a/src/configure.ac
+++ b/deprecated/configure.ac
diff --git a/src/exper/EditShell.hs b/deprecated/exper/EditShell.hs
index dd7fd8eea..dd7fd8eea 100644
--- a/src/exper/EditShell.hs
+++ b/deprecated/exper/EditShell.hs
diff --git a/src/exper/Evaluate.hs b/deprecated/exper/Evaluate.hs
index 413c82402..413c82402 100644
--- a/src/exper/Evaluate.hs
+++ b/deprecated/exper/Evaluate.hs
diff --git a/src/exper/Optimize.hs b/deprecated/exper/Optimize.hs
index 7cf88554f..7cf88554f 100644
--- a/src/exper/Optimize.hs
+++ b/deprecated/exper/Optimize.hs
diff --git a/src/gf.spec b/deprecated/gf.spec
index 8dfbee6f5..8dfbee6f5 100644
--- a/src/gf.spec
+++ b/deprecated/gf.spec
diff --git a/src/gf.wxs.in b/deprecated/gf.wxs.in
index e2b21f12b..e2b21f12b 100644
--- a/src/gf.wxs.in
+++ b/deprecated/gf.wxs.in
diff --git a/src/gf_atk.cfg b/deprecated/gf_atk.cfg
index 37bb2c4f5..37bb2c4f5 100644
--- a/src/gf_atk.cfg
+++ b/deprecated/gf_atk.cfg
diff --git a/src/gfc.in b/deprecated/gfc.in
index bd08db0b8..bd08db0b8 100644
--- a/src/gfc.in
+++ b/deprecated/gfc.in
diff --git a/src/haddock/haddock-check.perl b/deprecated/haddock/haddock-check.perl
index 93647bac7..93647bac7 100644
--- a/src/haddock/haddock-check.perl
+++ b/deprecated/haddock/haddock-check.perl
diff --git a/src/haddock/haddock-script.csh b/deprecated/haddock/haddock-script.csh
index 77b3761f8..77b3761f8 100644
--- a/src/haddock/haddock-script.csh
+++ b/deprecated/haddock/haddock-script.csh
diff --git a/src/haddock/resources/blank.html b/deprecated/haddock/resources/blank.html
index 63ab0b172..63ab0b172 100644
--- a/src/haddock/resources/blank.html
+++ b/deprecated/haddock/resources/blank.html
diff --git a/src/haddock/resources/index.html b/deprecated/haddock/resources/index.html
index 5d8822dc5..5d8822dc5 100644
--- a/src/haddock/resources/index.html
+++ b/deprecated/haddock/resources/index.html
diff --git a/src/install-sh b/deprecated/install-sh
index e9de23842..e9de23842 100644
--- a/src/install-sh
+++ b/deprecated/install-sh
diff --git a/src/server/Makefile b/deprecated/server/Makefile
index 7dcf29215..7dcf29215 100644
--- a/src/server/Makefile
+++ b/deprecated/server/Makefile
diff --git a/src/server/README b/deprecated/server/README
index a22c596f4..a22c596f4 100644
--- a/src/server/README
+++ b/deprecated/server/README
diff --git a/src/GF.hs b/src/compiler/GF.hs
index 32a95ca1f..32a95ca1f 100644
--- a/src/GF.hs
+++ b/src/compiler/GF.hs
diff --git a/src/GF/Command/Abstract.hs b/src/compiler/GF/Command/Abstract.hs
index 1f7c4014e..1f7c4014e 100644
--- a/src/GF/Command/Abstract.hs
+++ b/src/compiler/GF/Command/Abstract.hs
diff --git a/src/GF/Command/Commands.hs b/src/compiler/GF/Command/Commands.hs
index d8e2a3023..d8e2a3023 100644
--- a/src/GF/Command/Commands.hs
+++ b/src/compiler/GF/Command/Commands.hs
diff --git a/src/GF/Command/Importing.hs b/src/compiler/GF/Command/Importing.hs
index 06deab6c6..06deab6c6 100644
--- a/src/GF/Command/Importing.hs
+++ b/src/compiler/GF/Command/Importing.hs
diff --git a/src/GF/Command/Interpreter.hs b/src/compiler/GF/Command/Interpreter.hs
index ff84da8a3..ff84da8a3 100644
--- a/src/GF/Command/Interpreter.hs
+++ b/src/compiler/GF/Command/Interpreter.hs
diff --git a/src/GF/Command/Messages.hs b/src/compiler/GF/Command/Messages.hs
index 8dda92d49..8dda92d49 100644
--- a/src/GF/Command/Messages.hs
+++ b/src/compiler/GF/Command/Messages.hs
diff --git a/src/GF/Command/Parse.hs b/src/compiler/GF/Command/Parse.hs
index 44366c472..44366c472 100644
--- a/src/GF/Command/Parse.hs
+++ b/src/compiler/GF/Command/Parse.hs
diff --git a/src/GF/Command/TreeOperations.hs b/src/compiler/GF/Command/TreeOperations.hs
index 941f03782..941f03782 100644
--- a/src/GF/Command/TreeOperations.hs
+++ b/src/compiler/GF/Command/TreeOperations.hs
diff --git a/src/GF/Compile.hs b/src/compiler/GF/Compile.hs
index e0c60178e..e0c60178e 100644
--- a/src/GF/Compile.hs
+++ b/src/compiler/GF/Compile.hs
diff --git a/src/GF/Compile/Abstract/Compute.hs b/src/compiler/GF/Compile/Abstract/Compute.hs
index d5c9a163c..d5c9a163c 100644
--- a/src/GF/Compile/Abstract/Compute.hs
+++ b/src/compiler/GF/Compile/Abstract/Compute.hs
diff --git a/src/GF/Compile/Abstract/TC.hs b/src/compiler/GF/Compile/Abstract/TC.hs
index 163301838..163301838 100644
--- a/src/GF/Compile/Abstract/TC.hs
+++ b/src/compiler/GF/Compile/Abstract/TC.hs
diff --git a/src/GF/Compile/Abstract/TypeCheck.hs b/src/compiler/GF/Compile/Abstract/TypeCheck.hs
index 2632c54dd..2632c54dd 100644
--- a/src/GF/Compile/Abstract/TypeCheck.hs
+++ b/src/compiler/GF/Compile/Abstract/TypeCheck.hs
diff --git a/src/GF/Compile/CheckGrammar.hs b/src/compiler/GF/Compile/CheckGrammar.hs
index f4765eb26..f4765eb26 100644
--- a/src/GF/Compile/CheckGrammar.hs
+++ b/src/compiler/GF/Compile/CheckGrammar.hs
diff --git a/src/GF/Compile/Coding.hs b/src/compiler/GF/Compile/Coding.hs
index 49538bd35..49538bd35 100644
--- a/src/GF/Compile/Coding.hs
+++ b/src/compiler/GF/Compile/Coding.hs
diff --git a/src/GF/Compile/Concrete/AppPredefined.hs b/src/compiler/GF/Compile/Concrete/AppPredefined.hs
index c05127191..c05127191 100644
--- a/src/GF/Compile/Concrete/AppPredefined.hs
+++ b/src/compiler/GF/Compile/Concrete/AppPredefined.hs
diff --git a/src/GF/Compile/Concrete/Compute.hs b/src/compiler/GF/Compile/Concrete/Compute.hs
index 9c016116b..9c016116b 100644
--- a/src/GF/Compile/Concrete/Compute.hs
+++ b/src/compiler/GF/Compile/Concrete/Compute.hs
diff --git a/src/GF/Compile/Concrete/TypeCheck.hs b/src/compiler/GF/Compile/Concrete/TypeCheck.hs
index 670f36625..670f36625 100644
--- a/src/GF/Compile/Concrete/TypeCheck.hs
+++ b/src/compiler/GF/Compile/Concrete/TypeCheck.hs
diff --git a/src/GF/Compile/Export.hs b/src/compiler/GF/Compile/Export.hs
index d03eb947e..d03eb947e 100644
--- a/src/GF/Compile/Export.hs
+++ b/src/compiler/GF/Compile/Export.hs
diff --git a/src/GF/Compile/GFCCtoHaskell.hs b/src/compiler/GF/Compile/GFCCtoHaskell.hs
index d44d6705c..d44d6705c 100644
--- a/src/GF/Compile/GFCCtoHaskell.hs
+++ b/src/compiler/GF/Compile/GFCCtoHaskell.hs
diff --git a/src/GF/Compile/GFCCtoJS.hs b/src/compiler/GF/Compile/GFCCtoJS.hs
index 312701e3b..312701e3b 100644
--- a/src/GF/Compile/GFCCtoJS.hs
+++ b/src/compiler/GF/Compile/GFCCtoJS.hs
diff --git a/src/GF/Compile/GFCCtoProlog.hs b/src/compiler/GF/Compile/GFCCtoProlog.hs
index 702d4afe5..702d4afe5 100644
--- a/src/GF/Compile/GFCCtoProlog.hs
+++ b/src/compiler/GF/Compile/GFCCtoProlog.hs
diff --git a/src/GF/Compile/GenerateFCFG.hs b/src/compiler/GF/Compile/GenerateFCFG.hs
index 52e95f686..52e95f686 100644
--- a/src/GF/Compile/GenerateFCFG.hs
+++ b/src/compiler/GF/Compile/GenerateFCFG.hs
diff --git a/src/GF/Compile/GeneratePMCFG.hs b/src/compiler/GF/Compile/GeneratePMCFG.hs
index 458cf3f5c..458cf3f5c 100644
--- a/src/GF/Compile/GeneratePMCFG.hs
+++ b/src/compiler/GF/Compile/GeneratePMCFG.hs
diff --git a/src/GF/Compile/GeneratePMCFGOld.hs b/src/compiler/GF/Compile/GeneratePMCFGOld.hs
index 244ed68fe..244ed68fe 100644
--- a/src/GF/Compile/GeneratePMCFGOld.hs
+++ b/src/compiler/GF/Compile/GeneratePMCFGOld.hs
diff --git a/src/GF/Compile/GetGrammar.hs b/src/compiler/GF/Compile/GetGrammar.hs
index c85f9588f..c85f9588f 100644
--- a/src/GF/Compile/GetGrammar.hs
+++ b/src/compiler/GF/Compile/GetGrammar.hs
diff --git a/src/GF/Compile/GrammarToGFCC.hs b/src/compiler/GF/Compile/GrammarToGFCC.hs
index fb92ef74c..fb92ef74c 100644
--- a/src/GF/Compile/GrammarToGFCC.hs
+++ b/src/compiler/GF/Compile/GrammarToGFCC.hs
diff --git a/src/GF/Compile/ModDeps.hs b/src/compiler/GF/Compile/ModDeps.hs
index 1e689aabc..1e689aabc 100644
--- a/src/GF/Compile/ModDeps.hs
+++ b/src/compiler/GF/Compile/ModDeps.hs
diff --git a/src/GF/Compile/Optimize.hs b/src/compiler/GF/Compile/Optimize.hs
index 2c556b36f..2c556b36f 100644
--- a/src/GF/Compile/Optimize.hs
+++ b/src/compiler/GF/Compile/Optimize.hs
diff --git a/src/GF/Compile/OptimizeGFCC.hs b/src/compiler/GF/Compile/OptimizeGFCC.hs
index 2a218e1bb..2a218e1bb 100644
--- a/src/GF/Compile/OptimizeGFCC.hs
+++ b/src/compiler/GF/Compile/OptimizeGFCC.hs
diff --git a/src/GF/Compile/PGFPretty.hs b/src/compiler/GF/Compile/PGFPretty.hs
index 679714db5..679714db5 100644
--- a/src/GF/Compile/PGFPretty.hs
+++ b/src/compiler/GF/Compile/PGFPretty.hs
diff --git a/src/GF/Compile/ReadFiles.hs b/src/compiler/GF/Compile/ReadFiles.hs
index b96d3127b..b96d3127b 100644
--- a/src/GF/Compile/ReadFiles.hs
+++ b/src/compiler/GF/Compile/ReadFiles.hs
diff --git a/src/GF/Compile/Refresh.hs b/src/compiler/GF/Compile/Refresh.hs
index 04800fcce..04800fcce 100644
--- a/src/GF/Compile/Refresh.hs
+++ b/src/compiler/GF/Compile/Refresh.hs
diff --git a/src/GF/Compile/Rename.hs b/src/compiler/GF/Compile/Rename.hs
index 30616b4cb..30616b4cb 100644
--- a/src/GF/Compile/Rename.hs
+++ b/src/compiler/GF/Compile/Rename.hs
diff --git a/src/GF/Compile/SubExOpt.hs b/src/compiler/GF/Compile/SubExOpt.hs
index c7dbb5d3d..c7dbb5d3d 100644
--- a/src/GF/Compile/SubExOpt.hs
+++ b/src/compiler/GF/Compile/SubExOpt.hs
diff --git a/src/GF/Compile/Update.hs b/src/compiler/GF/Compile/Update.hs
index 1e39a2e03..1e39a2e03 100644
--- a/src/GF/Compile/Update.hs
+++ b/src/compiler/GF/Compile/Update.hs
diff --git a/src/GF/Data/Assoc.hs b/src/compiler/GF/Data/Assoc.hs
index f775319ea..f775319ea 100644
--- a/src/GF/Data/Assoc.hs
+++ b/src/compiler/GF/Data/Assoc.hs
diff --git a/src/GF/Data/BacktrackM.hs b/src/compiler/GF/Data/BacktrackM.hs
index 36317ebb6..36317ebb6 100644
--- a/src/GF/Data/BacktrackM.hs
+++ b/src/compiler/GF/Data/BacktrackM.hs
diff --git a/src/GF/Data/ErrM.hs b/src/compiler/GF/Data/ErrM.hs
index e8cea12d4..e8cea12d4 100644
--- a/src/GF/Data/ErrM.hs
+++ b/src/compiler/GF/Data/ErrM.hs
diff --git a/src/GF/Data/Graph.hs b/src/compiler/GF/Data/Graph.hs
index bfb289860..bfb289860 100644
--- a/src/GF/Data/Graph.hs
+++ b/src/compiler/GF/Data/Graph.hs
diff --git a/src/GF/Data/Graphviz.hs b/src/compiler/GF/Data/Graphviz.hs
index 411f76898..411f76898 100644
--- a/src/GF/Data/Graphviz.hs
+++ b/src/compiler/GF/Data/Graphviz.hs
diff --git a/src/GF/Data/MultiMap.hs b/src/compiler/GF/Data/MultiMap.hs
index e565f433b..e565f433b 100644
--- a/src/GF/Data/MultiMap.hs
+++ b/src/compiler/GF/Data/MultiMap.hs
diff --git a/src/GF/Data/Operations.hs b/src/compiler/GF/Data/Operations.hs
index 7b2afc9fe..7b2afc9fe 100644
--- a/src/GF/Data/Operations.hs
+++ b/src/compiler/GF/Data/Operations.hs
diff --git a/src/GF/Data/Relation.hs b/src/compiler/GF/Data/Relation.hs
index 7024a482c..7024a482c 100644
--- a/src/GF/Data/Relation.hs
+++ b/src/compiler/GF/Data/Relation.hs
diff --git a/src/GF/Data/SortedList.hs b/src/compiler/GF/Data/SortedList.hs
index d77ff68d4..d77ff68d4 100644
--- a/src/GF/Data/SortedList.hs
+++ b/src/compiler/GF/Data/SortedList.hs
diff --git a/src/GF/Data/Str.hs b/src/compiler/GF/Data/Str.hs
index 6f65764c7..6f65764c7 100644
--- a/src/GF/Data/Str.hs
+++ b/src/compiler/GF/Data/Str.hs
diff --git a/src/GF/Data/TrieMap.hs b/src/compiler/GF/Data/TrieMap.hs
index a6749d641..a6749d641 100644
--- a/src/GF/Data/TrieMap.hs
+++ b/src/compiler/GF/Data/TrieMap.hs
diff --git a/src/GF/Data/Utilities.hs b/src/compiler/GF/Data/Utilities.hs
index 74d3ef81e..74d3ef81e 100644
--- a/src/GF/Data/Utilities.hs
+++ b/src/compiler/GF/Data/Utilities.hs
diff --git a/src/GF/Data/XML.hs b/src/compiler/GF/Data/XML.hs
index bdc6f98a1..bdc6f98a1 100644
--- a/src/GF/Data/XML.hs
+++ b/src/compiler/GF/Data/XML.hs
diff --git a/src/GF/Data/Zipper.hs b/src/compiler/GF/Data/Zipper.hs
index a4491f76e..a4491f76e 100644
--- a/src/GF/Data/Zipper.hs
+++ b/src/compiler/GF/Data/Zipper.hs
diff --git a/src/GF/Grammar.hs b/src/compiler/GF/Grammar.hs
index c540f77b8..c540f77b8 100644
--- a/src/GF/Grammar.hs
+++ b/src/compiler/GF/Grammar.hs
diff --git a/src/GF/Grammar/Binary.hs b/src/compiler/GF/Grammar/Binary.hs
index fbad5ac7e..fbad5ac7e 100644
--- a/src/GF/Grammar/Binary.hs
+++ b/src/compiler/GF/Grammar/Binary.hs
diff --git a/src/GF/Grammar/CF.hs b/src/compiler/GF/Grammar/CF.hs
index a1d716994..a1d716994 100644
--- a/src/GF/Grammar/CF.hs
+++ b/src/compiler/GF/Grammar/CF.hs
diff --git a/src/GF/Grammar/Grammar.hs b/src/compiler/GF/Grammar/Grammar.hs
index 8d1468d9d..8d1468d9d 100644
--- a/src/GF/Grammar/Grammar.hs
+++ b/src/compiler/GF/Grammar/Grammar.hs
diff --git a/src/GF/Grammar/Lexer.hs b/src/compiler/GF/Grammar/Lexer.hs
index 7cacb0588..7cacb0588 100644
--- a/src/GF/Grammar/Lexer.hs
+++ b/src/compiler/GF/Grammar/Lexer.hs
diff --git a/src/GF/Grammar/Lexer.x b/src/compiler/GF/Grammar/Lexer.x
index d6f49bbb1..d6f49bbb1 100644
--- a/src/GF/Grammar/Lexer.x
+++ b/src/compiler/GF/Grammar/Lexer.x
diff --git a/src/GF/Grammar/Lockfield.hs b/src/compiler/GF/Grammar/Lockfield.hs
index 3e78a48b6..3e78a48b6 100644
--- a/src/GF/Grammar/Lockfield.hs
+++ b/src/compiler/GF/Grammar/Lockfield.hs
diff --git a/src/GF/Grammar/Lookup.hs b/src/compiler/GF/Grammar/Lookup.hs
index 074f0c5ec..074f0c5ec 100644
--- a/src/GF/Grammar/Lookup.hs
+++ b/src/compiler/GF/Grammar/Lookup.hs
diff --git a/src/GF/Grammar/MMacros.hs b/src/compiler/GF/Grammar/MMacros.hs
index a7f746b66..a7f746b66 100644
--- a/src/GF/Grammar/MMacros.hs
+++ b/src/compiler/GF/Grammar/MMacros.hs
diff --git a/src/GF/Grammar/Macros.hs b/src/compiler/GF/Grammar/Macros.hs
index 799cd9ec5..799cd9ec5 100644
--- a/src/GF/Grammar/Macros.hs
+++ b/src/compiler/GF/Grammar/Macros.hs
diff --git a/src/GF/Grammar/Parser.y b/src/compiler/GF/Grammar/Parser.y
index 320053674..320053674 100644
--- a/src/GF/Grammar/Parser.y
+++ b/src/compiler/GF/Grammar/Parser.y
diff --git a/src/GF/Grammar/PatternMatch.hs b/src/compiler/GF/Grammar/PatternMatch.hs
index b8f7eff7d..b8f7eff7d 100644
--- a/src/GF/Grammar/PatternMatch.hs
+++ b/src/compiler/GF/Grammar/PatternMatch.hs
diff --git a/src/GF/Grammar/Predef.hs b/src/compiler/GF/Grammar/Predef.hs
index 045df06ca..045df06ca 100644
--- a/src/GF/Grammar/Predef.hs
+++ b/src/compiler/GF/Grammar/Predef.hs
diff --git a/src/GF/Grammar/Printer.hs b/src/compiler/GF/Grammar/Printer.hs
index 06cac9705..06cac9705 100644
--- a/src/GF/Grammar/Printer.hs
+++ b/src/compiler/GF/Grammar/Printer.hs
diff --git a/src/GF/Grammar/Unify.hs b/src/compiler/GF/Grammar/Unify.hs
index 9bb49cfe2..9bb49cfe2 100644
--- a/src/GF/Grammar/Unify.hs
+++ b/src/compiler/GF/Grammar/Unify.hs
diff --git a/src/GF/Grammar/Values.hs b/src/compiler/GF/Grammar/Values.hs
index 1a68ddc89..1a68ddc89 100644
--- a/src/GF/Grammar/Values.hs
+++ b/src/compiler/GF/Grammar/Values.hs
diff --git a/src/GF/Infra/CheckM.hs b/src/compiler/GF/Infra/CheckM.hs
index 8a1b42cdf..8a1b42cdf 100644
--- a/src/GF/Infra/CheckM.hs
+++ b/src/compiler/GF/Infra/CheckM.hs
diff --git a/src/GF/Infra/CompactPrint.hs b/src/compiler/GF/Infra/CompactPrint.hs
index 486c9e183..486c9e183 100644
--- a/src/GF/Infra/CompactPrint.hs
+++ b/src/compiler/GF/Infra/CompactPrint.hs
diff --git a/src/GF/Infra/Dependencies.hs b/src/compiler/GF/Infra/Dependencies.hs
index af2088711..af2088711 100644
--- a/src/GF/Infra/Dependencies.hs
+++ b/src/compiler/GF/Infra/Dependencies.hs
diff --git a/src/GF/Infra/GetOpt.hs b/src/compiler/GF/Infra/GetOpt.hs
index ede561c90..ede561c90 100644
--- a/src/GF/Infra/GetOpt.hs
+++ b/src/compiler/GF/Infra/GetOpt.hs
diff --git a/src/GF/Infra/Ident.hs b/src/compiler/GF/Infra/Ident.hs
index efe6f9261..efe6f9261 100644
--- a/src/GF/Infra/Ident.hs
+++ b/src/compiler/GF/Infra/Ident.hs
diff --git a/src/GF/Infra/Modules.hs b/src/compiler/GF/Infra/Modules.hs
index 0710b8f40..0710b8f40 100644
--- a/src/GF/Infra/Modules.hs
+++ b/src/compiler/GF/Infra/Modules.hs
diff --git a/src/GF/Infra/Option.hs b/src/compiler/GF/Infra/Option.hs
index dc15d1929..dc15d1929 100644
--- a/src/GF/Infra/Option.hs
+++ b/src/compiler/GF/Infra/Option.hs
diff --git a/src/GF/Infra/UseIO.hs b/src/compiler/GF/Infra/UseIO.hs
index bb1a75b6e..bb1a75b6e 100644
--- a/src/GF/Infra/UseIO.hs
+++ b/src/compiler/GF/Infra/UseIO.hs
diff --git a/src/GF/JavaScript/AbsJS.hs b/src/compiler/GF/JavaScript/AbsJS.hs
index 2632ade48..2632ade48 100644
--- a/src/GF/JavaScript/AbsJS.hs
+++ b/src/compiler/GF/JavaScript/AbsJS.hs
diff --git a/src/GF/JavaScript/JS.cf b/src/compiler/GF/JavaScript/JS.cf
index fe31a2074..fe31a2074 100644
--- a/src/GF/JavaScript/JS.cf
+++ b/src/compiler/GF/JavaScript/JS.cf
diff --git a/src/GF/JavaScript/LexJS.x b/src/compiler/GF/JavaScript/LexJS.x
index 10ba66d69..10ba66d69 100644
--- a/src/GF/JavaScript/LexJS.x
+++ b/src/compiler/GF/JavaScript/LexJS.x
diff --git a/src/GF/JavaScript/Makefile b/src/compiler/GF/JavaScript/Makefile
index 10f867b06..10f867b06 100644
--- a/src/GF/JavaScript/Makefile
+++ b/src/compiler/GF/JavaScript/Makefile
diff --git a/src/GF/JavaScript/ParJS.y b/src/compiler/GF/JavaScript/ParJS.y
index bf0614757..bf0614757 100644
--- a/src/GF/JavaScript/ParJS.y
+++ b/src/compiler/GF/JavaScript/ParJS.y
diff --git a/src/GF/JavaScript/PrintJS.hs b/src/compiler/GF/JavaScript/PrintJS.hs
index 4e04e3cbf..4e04e3cbf 100644
--- a/src/GF/JavaScript/PrintJS.hs
+++ b/src/compiler/GF/JavaScript/PrintJS.hs
diff --git a/src/GF/Quiz.hs b/src/compiler/GF/Quiz.hs
index 52d9dee6b..52d9dee6b 100644
--- a/src/GF/Quiz.hs
+++ b/src/compiler/GF/Quiz.hs
diff --git a/src/GF/Speech/CFG.hs b/src/compiler/GF/Speech/CFG.hs
index 9ec8416c5..9ec8416c5 100644
--- a/src/GF/Speech/CFG.hs
+++ b/src/compiler/GF/Speech/CFG.hs
diff --git a/src/GF/Speech/CFGToFA.hs b/src/compiler/GF/Speech/CFGToFA.hs
index 3045ac842..3045ac842 100644
--- a/src/GF/Speech/CFGToFA.hs
+++ b/src/compiler/GF/Speech/CFGToFA.hs
diff --git a/src/GF/Speech/FiniteState.hs b/src/compiler/GF/Speech/FiniteState.hs
index 136d773a2..136d773a2 100644
--- a/src/GF/Speech/FiniteState.hs
+++ b/src/compiler/GF/Speech/FiniteState.hs
diff --git a/src/GF/Speech/GSL.hs b/src/compiler/GF/Speech/GSL.hs
index 8f26ea64c..8f26ea64c 100644
--- a/src/GF/Speech/GSL.hs
+++ b/src/compiler/GF/Speech/GSL.hs
diff --git a/src/GF/Speech/JSGF.hs b/src/compiler/GF/Speech/JSGF.hs
index 2cfeea5f5..2cfeea5f5 100644
--- a/src/GF/Speech/JSGF.hs
+++ b/src/compiler/GF/Speech/JSGF.hs
diff --git a/src/GF/Speech/PGFToCFG.hs b/src/compiler/GF/Speech/PGFToCFG.hs
index d22a4ea8d..d22a4ea8d 100644
--- a/src/GF/Speech/PGFToCFG.hs
+++ b/src/compiler/GF/Speech/PGFToCFG.hs
diff --git a/src/GF/Speech/PrRegExp.hs b/src/compiler/GF/Speech/PrRegExp.hs
index 0fc35d541..0fc35d541 100644
--- a/src/GF/Speech/PrRegExp.hs
+++ b/src/compiler/GF/Speech/PrRegExp.hs
diff --git a/src/GF/Speech/RegExp.hs b/src/compiler/GF/Speech/RegExp.hs
index 2592b3d57..2592b3d57 100644
--- a/src/GF/Speech/RegExp.hs
+++ b/src/compiler/GF/Speech/RegExp.hs
diff --git a/src/GF/Speech/SISR.hs b/src/compiler/GF/Speech/SISR.hs
index f966d96b9..f966d96b9 100644
--- a/src/GF/Speech/SISR.hs
+++ b/src/compiler/GF/Speech/SISR.hs
diff --git a/src/GF/Speech/SLF.hs b/src/compiler/GF/Speech/SLF.hs
index 84633149b..84633149b 100644
--- a/src/GF/Speech/SLF.hs
+++ b/src/compiler/GF/Speech/SLF.hs
diff --git a/src/GF/Speech/SRG.hs b/src/compiler/GF/Speech/SRG.hs
index 2270ec7a1..2270ec7a1 100644
--- a/src/GF/Speech/SRG.hs
+++ b/src/compiler/GF/Speech/SRG.hs
diff --git a/src/GF/Speech/SRGS_ABNF.hs b/src/compiler/GF/Speech/SRGS_ABNF.hs
index 2df1316a8..2df1316a8 100644
--- a/src/GF/Speech/SRGS_ABNF.hs
+++ b/src/compiler/GF/Speech/SRGS_ABNF.hs
diff --git a/src/GF/Speech/SRGS_XML.hs b/src/compiler/GF/Speech/SRGS_XML.hs
index 1f94de66d..1f94de66d 100644
--- a/src/GF/Speech/SRGS_XML.hs
+++ b/src/compiler/GF/Speech/SRGS_XML.hs
diff --git a/src/GF/Speech/VoiceXML.hs b/src/compiler/GF/Speech/VoiceXML.hs
index 134964062..134964062 100644
--- a/src/GF/Speech/VoiceXML.hs
+++ b/src/compiler/GF/Speech/VoiceXML.hs
diff --git a/src/GF/System/NoReadline.hs b/src/compiler/GF/System/NoReadline.hs
index 1f1050e8c..1f1050e8c 100644
--- a/src/GF/System/NoReadline.hs
+++ b/src/compiler/GF/System/NoReadline.hs
diff --git a/src/GF/System/NoSignal.hs b/src/compiler/GF/System/NoSignal.hs
index 5d82a431e..5d82a431e 100644
--- a/src/GF/System/NoSignal.hs
+++ b/src/compiler/GF/System/NoSignal.hs
diff --git a/src/GF/System/Readline.hs b/src/compiler/GF/System/Readline.hs
index ee38cdc0b..ee38cdc0b 100644
--- a/src/GF/System/Readline.hs
+++ b/src/compiler/GF/System/Readline.hs
diff --git a/src/GF/System/Signal.hs b/src/compiler/GF/System/Signal.hs
index fe8a12483..fe8a12483 100644
--- a/src/GF/System/Signal.hs
+++ b/src/compiler/GF/System/Signal.hs
diff --git a/src/GF/System/UseEditline.hs b/src/compiler/GF/System/UseEditline.hs
index 6d51a1be3..6d51a1be3 100644
--- a/src/GF/System/UseEditline.hs
+++ b/src/compiler/GF/System/UseEditline.hs
diff --git a/src/GF/System/UseHaskeline.hs b/src/compiler/GF/System/UseHaskeline.hs
index 140407439..140407439 100644
--- a/src/GF/System/UseHaskeline.hs
+++ b/src/compiler/GF/System/UseHaskeline.hs
diff --git a/src/GF/System/UseReadline.hs b/src/compiler/GF/System/UseReadline.hs
index a0e051601..a0e051601 100644
--- a/src/GF/System/UseReadline.hs
+++ b/src/compiler/GF/System/UseReadline.hs
diff --git a/src/GF/System/UseSignal.hs b/src/compiler/GF/System/UseSignal.hs
index 20c70a568..20c70a568 100644
--- a/src/GF/System/UseSignal.hs
+++ b/src/compiler/GF/System/UseSignal.hs
diff --git a/src/GF/Text/CP1250.hs b/src/compiler/GF/Text/CP1250.hs
index 474c04ace..474c04ace 100644
--- a/src/GF/Text/CP1250.hs
+++ b/src/compiler/GF/Text/CP1250.hs
diff --git a/src/GF/Text/CP1251.hs b/src/compiler/GF/Text/CP1251.hs
index 7c277abab..7c277abab 100644
--- a/src/GF/Text/CP1251.hs
+++ b/src/compiler/GF/Text/CP1251.hs
diff --git a/src/GF/Text/CP1252.hs b/src/compiler/GF/Text/CP1252.hs
index 1e5affe53..1e5affe53 100644
--- a/src/GF/Text/CP1252.hs
+++ b/src/compiler/GF/Text/CP1252.hs
diff --git a/src/GF/Text/Coding.hs b/src/compiler/GF/Text/Coding.hs
index e3cd7b0ea..e3cd7b0ea 100644
--- a/src/GF/Text/Coding.hs
+++ b/src/compiler/GF/Text/Coding.hs
diff --git a/src/GF/Text/Lexing.hs b/src/compiler/GF/Text/Lexing.hs
index 3300d311e..3300d311e 100644
--- a/src/GF/Text/Lexing.hs
+++ b/src/compiler/GF/Text/Lexing.hs
diff --git a/src/GF/Text/Transliterations.hs b/src/compiler/GF/Text/Transliterations.hs
index e2747f506..e2747f506 100644
--- a/src/GF/Text/Transliterations.hs
+++ b/src/compiler/GF/Text/Transliterations.hs
diff --git a/src/GF/Text/UTF8.hs b/src/compiler/GF/Text/UTF8.hs
index 5e9687684..5e9687684 100644
--- a/src/GF/Text/UTF8.hs
+++ b/src/compiler/GF/Text/UTF8.hs
diff --git a/src/GFC.hs b/src/compiler/GFC.hs
index 8037d4f1a..8037d4f1a 100644
--- a/src/GFC.hs
+++ b/src/compiler/GFC.hs
diff --git a/src/GFI.hs b/src/compiler/GFI.hs
index 2ea22efa6..2ea22efa6 100644
--- a/src/GFI.hs
+++ b/src/compiler/GFI.hs
diff --git a/deprecated/old-lib/c/Makefile b/src/runtime/c/Makefile
index 72ac7ea79..72ac7ea79 100644
--- a/deprecated/old-lib/c/Makefile
+++ b/src/runtime/c/Makefile
diff --git a/deprecated/old-lib/c/gfcc-term.c b/src/runtime/c/gfcc-term.c
index b427479e6..b427479e6 100644
--- a/deprecated/old-lib/c/gfcc-term.c
+++ b/src/runtime/c/gfcc-term.c
diff --git a/deprecated/old-lib/c/gfcc-term.h b/src/runtime/c/gfcc-term.h
index d1307259d..d1307259d 100644
--- a/deprecated/old-lib/c/gfcc-term.h
+++ b/src/runtime/c/gfcc-term.h
diff --git a/deprecated/old-lib/c/gfcc-tree.c b/src/runtime/c/gfcc-tree.c
index 6cd8759be..6cd8759be 100644
--- a/deprecated/old-lib/c/gfcc-tree.c
+++ b/src/runtime/c/gfcc-tree.c
diff --git a/deprecated/old-lib/c/gfcc-tree.h b/src/runtime/c/gfcc-tree.h
index cc8f0fcab..cc8f0fcab 100644
--- a/deprecated/old-lib/c/gfcc-tree.h
+++ b/src/runtime/c/gfcc-tree.h
diff --git a/src/Data/Binary.hs b/src/runtime/haskell/Data/Binary.hs
index 786f5a09e..786f5a09e 100644
--- a/src/Data/Binary.hs
+++ b/src/runtime/haskell/Data/Binary.hs
diff --git a/src/Data/Binary/Builder.hs b/src/runtime/haskell/Data/Binary/Builder.hs
index cccbe6fa4..cccbe6fa4 100644
--- a/src/Data/Binary/Builder.hs
+++ b/src/runtime/haskell/Data/Binary/Builder.hs
diff --git a/src/Data/Binary/Get.hs b/src/runtime/haskell/Data/Binary/Get.hs
index 51062ad31..51062ad31 100644
--- a/src/Data/Binary/Get.hs
+++ b/src/runtime/haskell/Data/Binary/Get.hs
diff --git a/src/Data/Binary/Put.hs b/src/runtime/haskell/Data/Binary/Put.hs
index a1f78dfba..a1f78dfba 100644
--- a/src/Data/Binary/Put.hs
+++ b/src/runtime/haskell/Data/Binary/Put.hs
diff --git a/src/PGF.hs b/src/runtime/haskell/PGF.hs
index 6c192095d..6c192095d 100644
--- a/src/PGF.hs
+++ b/src/runtime/haskell/PGF.hs
diff --git a/src/PGF/Binary.hs b/src/runtime/haskell/PGF/Binary.hs
index e4ed98424..e4ed98424 100644
--- a/src/PGF/Binary.hs
+++ b/src/runtime/haskell/PGF/Binary.hs
diff --git a/src/PGF/BuildParser.hs b/src/runtime/haskell/PGF/BuildParser.hs
index 23e0725c6..23e0725c6 100644
--- a/src/PGF/BuildParser.hs
+++ b/src/runtime/haskell/PGF/BuildParser.hs
diff --git a/src/PGF/CId.hs b/src/runtime/haskell/PGF/CId.hs
index fea304d9d..fea304d9d 100644
--- a/src/PGF/CId.hs
+++ b/src/runtime/haskell/PGF/CId.hs
diff --git a/src/PGF/Check.hs b/src/runtime/haskell/PGF/Check.hs
index 58b66cfe4..58b66cfe4 100644
--- a/src/PGF/Check.hs
+++ b/src/runtime/haskell/PGF/Check.hs
diff --git a/src/PGF/Data.hs b/src/runtime/haskell/PGF/Data.hs
index 38027e96e..38027e96e 100644
--- a/src/PGF/Data.hs
+++ b/src/runtime/haskell/PGF/Data.hs
diff --git a/src/PGF/Editor.hs b/src/runtime/haskell/PGF/Editor.hs
index 3f69da170..3f69da170 100644
--- a/src/PGF/Editor.hs
+++ b/src/runtime/haskell/PGF/Editor.hs
diff --git a/src/PGF/Expr.hs b/src/runtime/haskell/PGF/Expr.hs
index cf0cb79aa..cf0cb79aa 100644
--- a/src/PGF/Expr.hs
+++ b/src/runtime/haskell/PGF/Expr.hs
diff --git a/src/PGF/Expr.hs-boot b/src/runtime/haskell/PGF/Expr.hs-boot
index 34a62a410..34a62a410 100644
--- a/src/PGF/Expr.hs-boot
+++ b/src/runtime/haskell/PGF/Expr.hs-boot
diff --git a/src/PGF/Generate.hs b/src/runtime/haskell/PGF/Generate.hs
index 5add00a78..5add00a78 100644
--- a/src/PGF/Generate.hs
+++ b/src/runtime/haskell/PGF/Generate.hs
diff --git a/src/PGF/Linearize.hs b/src/runtime/haskell/PGF/Linearize.hs
index fdd4cecb5..fdd4cecb5 100644
--- a/src/PGF/Linearize.hs
+++ b/src/runtime/haskell/PGF/Linearize.hs
diff --git a/src/PGF/Macros.hs b/src/runtime/haskell/PGF/Macros.hs
index af25de025..af25de025 100644
--- a/src/PGF/Macros.hs
+++ b/src/runtime/haskell/PGF/Macros.hs
diff --git a/src/PGF/Morphology.hs b/src/runtime/haskell/PGF/Morphology.hs
index 9eee71a97..9eee71a97 100644
--- a/src/PGF/Morphology.hs
+++ b/src/runtime/haskell/PGF/Morphology.hs
diff --git a/src/PGF/PMCFG.hs b/src/runtime/haskell/PGF/PMCFG.hs
index c657e3d17..c657e3d17 100644
--- a/src/PGF/PMCFG.hs
+++ b/src/runtime/haskell/PGF/PMCFG.hs
diff --git a/src/PGF/Paraphrase.hs b/src/runtime/haskell/PGF/Paraphrase.hs
index 58d15b2e8..58d15b2e8 100644
--- a/src/PGF/Paraphrase.hs
+++ b/src/runtime/haskell/PGF/Paraphrase.hs
diff --git a/src/PGF/Parsing/FCFG/Active.hs b/src/runtime/haskell/PGF/Parsing/FCFG/Active.hs
index e88926f6e..e88926f6e 100644
--- a/src/PGF/Parsing/FCFG/Active.hs
+++ b/src/runtime/haskell/PGF/Parsing/FCFG/Active.hs
diff --git a/src/PGF/Parsing/FCFG/Incremental.hs b/src/runtime/haskell/PGF/Parsing/FCFG/Incremental.hs
index 296a0d33b..296a0d33b 100644
--- a/src/PGF/Parsing/FCFG/Incremental.hs
+++ b/src/runtime/haskell/PGF/Parsing/FCFG/Incremental.hs
diff --git a/src/PGF/Parsing/FCFG/Utilities.hs b/src/runtime/haskell/PGF/Parsing/FCFG/Utilities.hs
index dc0b2dc4a..dc0b2dc4a 100644
--- a/src/PGF/Parsing/FCFG/Utilities.hs
+++ b/src/runtime/haskell/PGF/Parsing/FCFG/Utilities.hs
diff --git a/src/PGF/ShowLinearize.hs b/src/runtime/haskell/PGF/ShowLinearize.hs
index dd3b997a6..dd3b997a6 100644
--- a/src/PGF/ShowLinearize.hs
+++ b/src/runtime/haskell/PGF/ShowLinearize.hs
diff --git a/src/PGF/Tree.hs b/src/runtime/haskell/PGF/Tree.hs
index cb2052cd7..cb2052cd7 100644
--- a/src/PGF/Tree.hs
+++ b/src/runtime/haskell/PGF/Tree.hs
diff --git a/src/PGF/Type.hs b/src/runtime/haskell/PGF/Type.hs
index 013754a45..013754a45 100644
--- a/src/PGF/Type.hs
+++ b/src/runtime/haskell/PGF/Type.hs
diff --git a/src/PGF/TypeCheck.hs b/src/runtime/haskell/PGF/TypeCheck.hs
index 937c21786..937c21786 100644
--- a/src/PGF/TypeCheck.hs
+++ b/src/runtime/haskell/PGF/TypeCheck.hs
diff --git a/src/PGF/VisualizeTree.hs b/src/runtime/haskell/PGF/VisualizeTree.hs
index 429551f54..429551f54 100644
--- a/src/PGF/VisualizeTree.hs
+++ b/src/runtime/haskell/PGF/VisualizeTree.hs
diff --git a/deprecated/old-lib/javascript/editor.html b/src/runtime/javascript/editor.html
index dd189d9ab..dd189d9ab 100644
--- a/deprecated/old-lib/javascript/editor.html
+++ b/src/runtime/javascript/editor.html
diff --git a/deprecated/old-lib/javascript/editorGrammar.js b/src/runtime/javascript/editorGrammar.js
index a4cc01ea5..a4cc01ea5 100644
--- a/deprecated/old-lib/javascript/editorGrammar.js
+++ b/src/runtime/javascript/editorGrammar.js
diff --git a/deprecated/old-lib/javascript/empty.png b/src/runtime/javascript/empty.png
index 35d9875df..35d9875df 100644
--- a/deprecated/old-lib/javascript/empty.png
+++ b/src/runtime/javascript/empty.png
diff --git a/deprecated/old-lib/javascript/gfjseditor.js b/src/runtime/javascript/gfjseditor.js
index 5deb86160..5deb86160 100644
--- a/deprecated/old-lib/javascript/gfjseditor.js
+++ b/src/runtime/javascript/gfjseditor.js
diff --git a/deprecated/old-lib/javascript/gflib-xhtml-voice.js b/src/runtime/javascript/gflib-xhtml-voice.js
index fd8660100..fd8660100 100644
--- a/deprecated/old-lib/javascript/gflib-xhtml-voice.js
+++ b/src/runtime/javascript/gflib-xhtml-voice.js
diff --git a/deprecated/old-lib/javascript/gflib.js b/src/runtime/javascript/gflib.js
index 728655469..728655469 100644
--- a/deprecated/old-lib/javascript/gflib.js
+++ b/src/runtime/javascript/gflib.js
diff --git a/deprecated/old-lib/javascript/grammar.js b/src/runtime/javascript/grammar.js
index 69175bba4..69175bba4 100644
--- a/deprecated/old-lib/javascript/grammar.js
+++ b/src/runtime/javascript/grammar.js
diff --git a/deprecated/old-lib/javascript/minus.png b/src/runtime/javascript/minus.png
index 84cc2a9ba..84cc2a9ba 100644
--- a/deprecated/old-lib/javascript/minus.png
+++ b/src/runtime/javascript/minus.png
diff --git a/deprecated/old-lib/javascript/plus.png b/src/runtime/javascript/plus.png
index 4d2e8ee83..4d2e8ee83 100644
--- a/deprecated/old-lib/javascript/plus.png
+++ b/src/runtime/javascript/plus.png
diff --git a/deprecated/old-lib/javascript/style.css b/src/runtime/javascript/style.css
index 962c3701f..962c3701f 100644
--- a/deprecated/old-lib/javascript/style.css
+++ b/src/runtime/javascript/style.css
diff --git a/deprecated/old-lib/javascript/translator.css b/src/runtime/javascript/translator.css
index f7f771927..f7f771927 100644
--- a/deprecated/old-lib/javascript/translator.css
+++ b/src/runtime/javascript/translator.css
diff --git a/deprecated/old-lib/javascript/translator.html b/src/runtime/javascript/translator.html
index b6fd37086..b6fd37086 100644
--- a/deprecated/old-lib/javascript/translator.html
+++ b/src/runtime/javascript/translator.html
diff --git a/deprecated/old-lib/javascript/translator.js b/src/runtime/javascript/translator.js
index 31da04290..31da04290 100644
--- a/deprecated/old-lib/javascript/translator.js
+++ b/src/runtime/javascript/translator.js