diff --git a/src/FILES b/src/FILES
index 48cf84888..2701481ff 100644
--- a/src/FILES
+++ b/src/FILES
@@ -1,4 +1,8 @@
-Code map for GF source files. AR 22/10/2004
+
+Code map for GF source files. 
+
+$Author: peb $
+$Date: 2005/02/07 10:58:08 $
 
 Directories:
 
@@ -8,16 +12,16 @@ canonical   GFC (= GF Canonical) basic functionalities
 cf          context-free skeleton used in parsing
 cfgm        multilingual context-free skeleton exported to Java
 compile     compilation phases from GF to GFC
-conversions formats used in parser generation
+conversions [OBSOLETE] formats used in parser generation
 for-ghc     GHC-specific files (Glasgow Haskell Compiler)
 for-hugs    Hugs-specific files (a Haskell interpreter)
 for-windows Windows-specific files (an operating system from Microsoft)
 grammar     basic functionalities of GF grammars used in compilation
 infra       GF-independent infrastructure and auxiliaries
-newparsing  parsing with GF grammars: forthcoming version (cf. parsing)
+newparsing  parsing with GF grammars: current version (cf. parsing)
 notrace     debugging utilities for parser development (cf. trace)
 parsers     parsers of GF and GFC files
-parsing     parsing with GF grammars: current version (cf. newparsing)
+parsing     [OBSOLETE] parsing with GF grammars: old version (cf. newparsing)
 shell       interaction shells
 source      utilities for reading in GF source files
 speech      generation of speech recognition grammars
@@ -30,8 +34,8 @@ Individual files:
 
 GF.hs                  the Main module
 GFModes.hs
-HelpFile.hs            help file generated by util/MkHelpFile
-Today.hs               file generated by "make today"
+HelpFile.hs            [AUTO] help file generated by util/MkHelpFile
+Today.hs               [AUTO] file generated by "make today"
 
 api/API.hs             high-level access to GF functionalities
 api/BatchTranslate.hs
@@ -40,12 +44,12 @@ api/GrammarToHaskell.hs
 api/IOGrammar.hs
 api/MyParser.hs        slot for defining your own parser
 
-canonical/AbsGFC.hs    abstract syntax of GFC
+canonical/AbsGFC.hs    [AUTO] abstract syntax of GFC
 canonical/CanonToGrammar.hs
 canonical/CMacros.hs
 canonical/ErrM.hs
 canonical/GetGFC.hs
-canonical/GFC.cf       LBNF source of GFC parser
+canonical/GFC.cf       [LBNF] source of GFC parser
 canonical/GFC.hs
 canonical/LexGFC.hs
 canonical/Look.hs
@@ -53,8 +57,8 @@ canonical/MkGFC.hs
 canonical/PrExp.hs
 canonical/PrintGFC.hs  pretty-printer of GFC
 canonical/Share.hs
-canonical/SkelGFC.hs
-canonical/TestGFC.hs
+canonical/SkelGFC.hs   [AUTO]
+canonical/TestGFC.hs   [AUTO]
 canonical/Unlex.hs
 
 cf/CanonToCF.hs
@@ -68,10 +72,11 @@ cf/PPrCF.hs
 cf/PrLBNF.hs
 cf/Profile.hs
 
-cfgm/AbsCFG.hs
-cfgm/LexCFG.hs
-cfgm/ParCFG.hs
-cfgm/PrintCFG.hs
+cfgm/CFG.cf             [LBNF] source
+cfgm/AbsCFG.hs          [AUTO]
+cfgm/LexCFG.hs          [AUTO]
+cfgm/ParCFG.hs          [AUTO]
+cfgm/PrintCFG.hs        [AUTO]
 cfgm/PrintCFGrammar.hs
 
 compile/CheckGrammar.hs
@@ -91,17 +96,6 @@ compile/Rename.hs
 compile/ShellState.hs   the run-time multilingual grammar datastructure
 compile/Update.hs
 
-conversions/CanonToTNF.hs
-conversions/ConversionUtils.hs
-conversions/ConvertGrammar.hs
-conversions/GrammarTypes.hs
-conversions/MCFGtoCFG.hs
-conversions/PrintSimplifiedTerm.hs
-conversions/TestConversions.hs
-conversions/TestGrammarHealth.hs
-conversions/TestGrammars.hs
-conversions/TNFtoMCFG.hs
-
 for-ghc/ArchEdit.hs
 for-ghc/Arch.hs
 
@@ -112,8 +106,19 @@ for-hugs/ArchEdit.hs
 for-hugs/Arch.hs
 for-hugs/JGF.hs
 for-hugs/MoreCustom.hs
+for-hugs/Unicode.hs
+
+for-hugs/Arch.hs
+for-hugs/ArchEdit.hs
+for-hugs/JGF.hs
+for-hugs/LexCFG.hs         dummy CFG lexer
+for-hugs/LexGF.hs          dummy GF lexer
+for-hugs/LexGFC.hs         dummy GFC lexer
+for-hugs/MoreCustom.hs
+for-hugs/ParCFG.hs         dummy CFG parser 
 for-hugs/ParGFC.hs         dummy GFC parser
 for-hugs/ParGF.hs          dummy GF parser
+for-hugs/Tracing.hs
 for-hugs/Unicode.hs
 
 for-windows/ArchEdit.hs
@@ -137,11 +142,11 @@ grammar/TypeCheck.hs
 grammar/Unify.hs
 grammar/Values.hs
 
-infra/Arabic.hs            ASCII coding of Arabic Unicode
-infra/Assoc.hs
+infra/Arabic.hs             ASCII coding of Arabic Unicode
+infra/Assoc.hs              finite maps/association lists as binary search trees
 infra/CheckM.hs
 infra/Comments.hs
-infra/Devanagari.hs        ASCII coding of Devanagari Unicode
+infra/Devanagari.hs         ASCII coding of Devanagari Unicode
 infra/ErrM.hs
 infra/Ethiopic.hs
 infra/EventF.hs
@@ -154,19 +159,19 @@ infra/Hebrew.hs
 infra/Hiragana.hs
 infra/Ident.hs
 infra/LatinASupplement.hs
-infra/Map.hs
+infra/Map.hs                finite maps as red black trees
 infra/Modules.hs
 infra/OCSCyrillic.hs
-infra/Operations.hs        library of strings, search trees, error monads
+infra/Operations.hs         library of strings, search trees, error monads
 infra/Option.hs
-infra/OrdMap2.hs
-infra/OrdSet.hs
+infra/OrdMap2.hs            abstract class of finite maps + implementation as association lists
+infra/OrdSet.hs             abstract class of sets + implementation as sorted lists
 infra/Parsers.hs
 infra/ReadFiles.hs
-infra/RedBlack.hs
-infra/RedBlackSet.hs
+infra/RedBlack.hs           red black trees
+infra/RedBlackSet.hs        sets and maps as red black trees
 infra/Russian.hs
-infra/SortedList.hs
+infra/SortedList.hs         sets as sorted lists
 infra/Str.hs
 infra/Tamil.hs
 infra/Text.hs
@@ -175,56 +180,33 @@ infra/Trie.hs
 infra/UnicodeF.hs
 infra/Unicode.hs
 infra/UseIO.hs
-infra/UTF8.hs              UTF3 en/decoding
+infra/UTF8.hs               UTF3 en/decoding
 infra/Zipper.hs
 
-newparsing/CFGrammar.hs
-newparsing/CFParserGeneral.hs
-newparsing/CFParserIncremental.hs
-newparsing/ConvertGFCtoMCFG.hs
-newparsing/ConvertGrammar.hs
-newparsing/ConvertMCFGtoCFG.hs
-newparsing/GeneralChart.hs
-newparsing/GrammarTypes.hs
-newparsing/IncrementalChart.hs
-newparsing/MCFGrammar.hs
-newparsing/MCFParserBasic.hs
-newparsing/MCFRange.hs
-newparsing/ParseCFG.hs
-newparsing/ParseCF.hs
-newparsing/ParseGFC.hs
-newparsing/ParseMCFG.hs
-newparsing/Parser.hs
-newparsing/PrintParser.hs
-newparsing/PrintSimplifiedTerm.hs
+newparsing/CFGrammar.hs                type definitions for context-free grammars
+newparsing/CFParserGeneral.hs          several variants of general CFG chart parsing
+newparsing/CFParserIncremental.hs      several variants of incremental (Earley-style) CFG chart parsing
+newparsing/ConvertGFCtoMCFG.hs         converting GFC to MCFG
+newparsing/ConvertGrammar.hs           conversions between different grammar formats
+newparsing/ConvertMCFGtoCFG.hs         converting MCFG to CFG
+newparsing/GeneralChart.hs             Haskell framework for "parsing as deduction"
+newparsing/GrammarTypes.hs             instantiations of grammar types
+newparsing/IncrementalChart.hs         Haskell framework for incremental chart parsing
+newparsing/MCFGrammar.hs               type definitions for multiple CFG
+newparsing/MCFParserBasic.hs           MCFG chart parser
+newparsing/MCFRange.hs                 ranges for MCFG parsing
+newparsing/ParseCFG.hs                 parsing of CFG
+newparsing/ParseCF.hs                  parsing of the CF format
+newparsing/ParseGFC.hs                 parsing of GFC
+newparsing/ParseMCFG.hs                parsing of MCFG
+newparsing/Parser.hs                   general definitions for parsers
+newparsing/PrintParser.hs              pretty-printing class for parsers
+newparsing/PrintSimplifiedTerm.hs      simplified pretty-printing for GFC terms
 
-notrace/Tracing.hs
+notrace/Tracing.hs          tracing predicates when we DON'T want tracing capabilities (normal case)
 
-parsers/ParGFC.hs
-parsers/ParGF.hs
-parsing/CFG.hs
-parsing/CFParserGeneral.hs
-parsing/CFParserIncremental.hs
-parsing/CFtoCFG.hs
-parsing/ExportParser.hs
-parsing/GeneralChart.hs
-parsing/IncrementalChart.hs
-parsing/MCFG.hs
-parsing/MCFParserGeneral.hs
-parsing/MCFParserSimple.hs
-parsing/MCFRange.hs
-parsing/NewChartParser.hs
-parsing/NewerChartParser.hs
-parsing/NewestChartParser.hs
-parsing/ParseCF.hs
-parsing/ParseGFC.hs
-parsing/Parser.hs
-parsing/ParserUtils.hs
-parsing/PrintParser.hs
-parsing/TestCFGrammar.hs
-parsing/TestCFParser.hs
-parsing/TestMCFGrammar.hs
-parsing/TestMCFParser.hs
+parsers/ParGFC.hs           [AUTO]
+parsers/ParGF.hs            [AUTO]
 
 shell/CommandF.hs
 shell/CommandL.hs           line-based syntax of editor commands
@@ -237,12 +219,12 @@ shell/Shell.hs
 shell/SubShell.hs
 shell/TeachYourself.hs
 
-source/AbsGF.hs
+source/AbsGF.hs             [AUTO]
 source/ErrM.hs
-source/GF.cf                LBNF source of GF parser
+source/GF.cf                [LBNF] source of GF parser
 source/GrammarToSource.hs
-source/LexGF.hs
-source/PrintGF.hs
+source/LexGF.hs             [AUTO]
+source/PrintGF.hs           [AUTO]
 source/SourceToGrammar.hs
 
 speech/PrGSL.hs
@@ -250,7 +232,7 @@ speech/PrJSGF.hs
 speech/SRG.hs
 speech/TransformCFG.hs
 
-trace/Tracing.hs
+trace/Tracing.hs            tracing predicates when we want tracing capabilities
 
 translate/GFT.hs            Main module of html-producing batch translator
 
@@ -272,7 +254,8 @@ useGrammar/Tokenize.hs      lexer definitions (listed in Custom)
 useGrammar/Transfer.hs
 
 util/GFDoc.hs              utility for producing LaTeX and HTML from GF
-util(HelpFile              source of ../HelpFile.hs
+util/HelpFile              source of ../HelpFile.hs
 util/Htmls.hs              utility for chopping a HTML document to slides
 util/MkHelpFile.hs
 util/WriteF.hs
+util/mktoday.sh            [SHELL-SCRIPT] utility for producing Today.hs