Update folder structure and add Listener implement to event monitor classes