change in structure files
working on event handlers