File architecture cleaning