[Cosmetic] This is a refactoring of most Struct in order to eliminate any reference to the old DSM terminology 

This will lead the way to a more in depth refactoring of the function names and obvious code cleanup / optimization