cleanup of classes moved to new packages