refactoring, added folders, better tooltip button