Move Util.java to new package