reorganized and repackaged