Moved utilities to their own project