Code cleanup and license update.
Incorrect file added.