Include classifier and type as necessary
Import cleanup
1.0.0.Beta3 release
Next development version