Moved classes to a structures header file