changed package structure so you can setup.py install it.