Update util package structure