Moving to utility package. No actual dependence on the rest of the app.