Moved some classes to new package.