Put definitions in the correct place