Reorganization and numerous simplifications; bump to 2.0.0.0