New files after refactoring.