Moved Class file functions into Class file type.