Extensive set of changes to packages. updated setup.py and Changes to reflect 2.0.0 development