Merged into fewer files