Reorganization of files. New object, events.