cleaned up for psr4 and to work with a latest version of Drupal8.