fix make install problem for metals samples
More cvs changing.
More changes to directory structure.
More Directory changes...