Issue #2 - remove virtualenv from source control as setup.py can bootstrap now.
Correct imports to reflect new package structure.
Conform to PEP-8.