Cleanup.
Added initial cmake support.