Moved classes into new package.