changing to psr4 and to working with a very current version of Drupal8.