Update to structure of files