Moved these classes into their own package.