Adding setup.py and some changes