Cha-cha-chaanges
Added setup.py, reorganized a bit