Moved classes to header file