restructuring code, moving event listener furhter down
restructuring code, moving event listener furhter down

protwis/protwis,protwis/protwis,protwis/protwis,cmunk/protwis,cmunk/protwis,cmunk/protwis,cmunk/protwis