Files renamed and cleaned