Moving and removing unneeded classes