Moved Class from cpp to header