Smaller reorganization. Added contactor service (needs to be finished). Fixed ordering of the events & add automatic sorting after adding an event.