Refactored to move /lib in as /apps/util