Remove package objects and move the member to packages and plain objects
Modify scalatest version from 2.0 to 2.0+
Add support for 2.11.0-M7