Bumping version to 2.0 and removing intermediate modules