Moved some classes out of Functions