Renamed source files with diff register. Some code cleanup.