Moved extract classes to their own package.