New structure

Updated code to support new generic structure and to support
implementation configuration
configuration changes