refactoring due to server component split off