Moved classes to structs