Fixing layout differences between directories

Compared the files with BeyondCompare, and made them equal between the
directories (except for the line that comments out the character ROM).
This results in many duplicate files, which I will attempt to fix.