Revert "Remove Fileinfo and adjust several thing"