Merge class/struct code