* Source file cleanup and renaming.