Moved two classes into the correct package.