Removed core.py and updated setup.py