DMapBuilder Changes

    * New Code for Restructured DMap file
    * Added Tests scenarios for Builder