restructured mapping sample to fit samples format