Some reorganization, events controller