Clean and reorganise of Samples folder, see #10144