Moved Class info to new header file