moving things around to solve issues #5 and #6
updated setup.py and tests.py with src dir structure
fix for #5 and #6 tested working