moved to new util structure from refresh
Merge branch 'develop' into refresh