This moves out common definitions in a separate file. This patch also updates the execution schema to reflect that.