Revised setup files, added __init__.py versioning