Moved util/ classes to service/