about to remove DSample.h
DSample.h gone.
adding a header for each class.
include and rename updates.