Split off defs into its own file