Changed read structure of files