9/23 class files consolidation