Clean up the file structure