Factored a few builtin modules out to common bundle, and improved events against