Remove structure and move references to the top