MAde util package, renamed some classes