changed to import core classes from new core.py file