Starting version 2.0
Removed old packages
Completed first draft of 2.0.