Updated setup.py and moved class to package