Fixed some refactoring

Updated Readme
Added setup.py