modified package structure, updated setup.py