Refactor to packages for 2.0-SNAPSHOT