Fixing the file structure