Re-reference Signal.core and remove usages of Events.core
Fix merge conflicts