Simplifiying util package structure.
Reorganizing the demo code.