Remove all references to directory hierarchy

Removes the rest of the references to the reportFormatVersion hierarchy.