Roerganized project properly
Added setup.py
Merged setup.py