Restored some utility scripts and files from v2