Moved utility services from Model to Service directory