psi_stream now reads .psi file.  psi_file_generator creates the .psi file.