Moved classes out of kevinland