More file structure cleaning