Fix alignment, bizarre code splurge. Update copyrights.
Rename the core file.