Move event definitions to a new file
s/primitive/listeral/