refactoring tray icon & contextmenu
moving files