Some classes were moved to a better fitting package.