Added a bit of packaging details, cleaned up possible namespace issues.