Clean up. Unify source. Update version info.