Moved some more classes