Restructure core to be instance based class