Re-organization and update of requirements in setup.py

@RyanGWU82