adding pypy classifier, minor import refactoring