Moved methods to root package.