modularize
rename sample