Ultimate update

All classes updated, jars ordered correctly.