Moves cores to a Core class. Probably breaks most other things.