Structure update

Updated the structure of the file.