fixing rename & move resource + refactoring method onEvent