Moved some classes from root package to .utils