Cleanup of the parser's text RE, moved format* to a separate directory.