Moved some new classes into their own package.