Changing the structure
Fixing action from drupal module