Correct folder name
Remove ServiceUnloaded event handler