Adding setup.py and fixing dir structure