Moved classes to different package.