Switched model package over to utils package and fixed references