Moved client utils folder to geometry