Restructuring files to switch to class-based queues instead of class-containing-struct based queues