Moved classes out of core util package