move util files around
fixes