Updated the file structure