Move extra files into utils