Slight restructure of utils package - it is now a separate jar file.