Minor refactor to move docaddr gen to read_files