Clean up the file structure
[#82160500]