Setup.py and layout changes to support python setup.py develop