Various naming/structural changes, using Drupal.behaviors in JS