fix compile errors, get rid of unnecessary utility classes, package refactoring to favor cohesion