Moved core to separate project