Seperate old structure defines and new structure defines