Moved util classes to new package