Point Maven to 2.0
Port everything to 2.0