Updated remaining modules to 2.0-SNAPSHOT