Clean the file structure again