setting version numbers to 2.0 for next version
removing old modules as part of 2.x cleanup