Restructure of the util package - it's now its own project/jarfile