refactor fs-datepicker to meet new FS conventions