restructure service to be more restyishy