Changed directory structure and setup.py to support install using pip -e