Moved uncooked classes out of core