Removed some classes to other packages.