Adding required packages to requirements.txt and setup.py, some cleaning up