Move utilities to separate repo