Added setup.py and moved things around to accomodate