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