fix #122 - updated setup.py to deal with new directory structure