Updated licensing, added a few new classes.