Not everything here is bad. This change is good. Maybe you should split the commits by type rather than by file.