Removed old event and added classes to enable new window mgmt/persistence arch