Move utils to within server