File / directory restructuring to fix composer / Drupal library issue