Updated structure of files