TODO For the future: the final directory for Parser-related classes should be "Parser", not "ParserNS". However, moving all classes now would make it harder to rebase changes etc. Change-Id: Ice335f4723e74f4e5fbe8dcc76ff8ea16310962c