Changed lexing to use 'directory' and 'file' instead of 'module' and 'file'.  It breaks up the module def into individual directory tokens