Merged query/command/event definitions to single project.