Move utils to scripts.
Update to newest core changes.