Rearrangement of files.
More code cleanup.
Harmonized license headers.