Preliminary 2.0 revision

First steps towards the 2.0 release.