Reorganized and added setup.py