Move util and version to shared + header cleanup