Fixed capes, reorganized some classes.