Uncommented code
Moved utility classes to util package