Moved Class to own file

And other things Gary Jones suggested.