Reorganizing for setup.py.
Setup script now working!