Updates to add file structures and nls file details along with other cleanup.