Refactored computer, core, and events