Change folders name, fix wacom bug

fix bugs with wacom after restoring the service